Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id B79161A9246 for ; Fri, 6 Nov 2020 18:04:31 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 20C0884D7A; Fri, 6 Nov 2020 18:04:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 58B6B84D5B for ; Fri, 6 Nov 2020 18:04:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id moXyLWqG5HOo for ; Fri, 6 Nov 2020 18:04:28 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6AE2284CE1 for ; Fri, 6 Nov 2020 18:04:28 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 63FFBFB28; Fri, 6 Nov 2020 18:04:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_160468586826840" MIME-Version: 1.0 Date: Fri, 6 Nov 2020 18:04:28 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20201106180428.63FFBFB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_160468586826840 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Fri Nov 6 18:04:28 UTC 2020 Modified Files: pkgsrc/fonts/UnifrakturMaguntia-ttf: Makefile pkgsrc/fonts/alee-ttf: Makefile pkgsrc/fonts/cantarell-fonts: Makefile pkgsrc/fonts/cascadia-ttf: Makefile pkgsrc/fonts/comic-neue: Makefile pkgsrc/fonts/culmus: Makefile pkgsrc/fonts/cyberbit-ttf: Makefile pkgsrc/fonts/evermono-ttf: Makefile pkgsrc/fonts/ibm-plex-otf: Makefile pkgsrc/fonts/ibm-plex-ttf: Makefile pkgsrc/fonts/inconsolata-ttf: Makefile pkgsrc/fonts/koruri-ttf: Makefile pkgsrc/fonts/linux-libertine-ttf: Makefile pkgsrc/fonts/montserrat: Makefile pkgsrc/fonts/ms-ttf: Makefile pkgsrc/fonts/overpass: Makefile pkgsrc/fonts/paratype-ttf: Makefile pkgsrc/fonts/public-sans: Makefile pkgsrc/fonts/recursive-ttf: Makefile pkgsrc/fonts/roboto-fonts: Makefile pkgsrc/fonts/symbola-ttf: Makefile pkgsrc/fonts/twemoji-color-font-ttf: Makefile pkgsrc/fonts/ubuntu-fonts: Makefile pkgsrc/fonts/umefont-ttf: Makefile pkgsrc/fonts/un-core-ttf: Makefile pkgsrc/fonts/un-extra-ttf: Makefile pkgsrc/fonts/uralic-ttf: Makefile pkgsrc/fonts/urbanrenewal-ttf: Makefile pkgsrc/fonts/vera-ttf: Makefile pkgsrc/fonts/vlgothic-ttf: Makefile pkgsrc/mk: fonts.mk Log Message: mk/fonts.mk: don't add NO_CONFIGURE and NO_BUILD, have packages set it. This makes it easier to use the mk fragment with fonts that need a build step, like new liberation-ttf. While here switch some fonts using post-install unnecessarily to do-install (Committed at the same time as it wasn't tested separately) No PLIST changes to the packages/build breakage, so no changes expected to the packages. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/UnifrakturMaguntia-ttf/Makefile cvs rdiff -u -r1.25 -r1.26 pkgsrc/fonts/alee-ttf/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/fonts/cantarell-fonts/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/cascadia-ttf/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/comic-neue/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/culmus/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/fonts/cyberbit-ttf/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/evermono-ttf/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/ibm-plex-otf/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/ibm-plex-ttf/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/fonts/inconsolata-ttf/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/fonts/koruri-ttf/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/fonts/linux-libertine-ttf/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/montserrat/Makefile cvs rdiff -u -r1.26 -r1.27 pkgsrc/fonts/ms-ttf/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/overpass/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/paratype-ttf/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/public-sans/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/recursive-ttf/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/roboto-fonts/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/symbola-ttf/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/twemoji-color-font-ttf/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/ubuntu-fonts/Makefile cvs rdiff -u -r1.60 -r1.61 pkgsrc/fonts/umefont-ttf/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/fonts/un-core-ttf/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/fonts/un-extra-ttf/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/uralic-ttf/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/urbanrenewal-ttf/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/fonts/vera-ttf/Makefile cvs rdiff -u -r1.31 -r1.32 pkgsrc/fonts/vlgothic-ttf/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/mk/fonts.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_160468586826840 Content-Disposition: inline Content-Length: 20867 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/fonts/UnifrakturMaguntia-ttf/Makefile diff -u pkgsrc/fonts/UnifrakturMaguntia-ttf/Makefile:1.3 pkgsrc/fonts/UnifrakturMaguntia-ttf/Makefile:1.4 --- pkgsrc/fonts/UnifrakturMaguntia-ttf/Makefile:1.3 Fri Mar 20 11:57:38 2020 +++ pkgsrc/fonts/UnifrakturMaguntia-ttf/Makefile Fri Nov 6 18:04:24 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/03/20 11:57:38 nia Exp $ +# $NetBSD: Makefile,v 1.4 2020/11/06 18:04:24 maya Exp $ DISTNAME= UnifrakturMaguntia.2017-03-19 PKGNAME= ${DISTNAME:S/-//g:S/./-ttf-0./} @@ -11,5 +11,8 @@ HOMEPAGE= http://unifraktur.sourceforge. COMMENT= Unicode Fraktur Font LICENSE= ofl-v1.1 +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/alee-ttf/Makefile diff -u pkgsrc/fonts/alee-ttf/Makefile:1.25 pkgsrc/fonts/alee-ttf/Makefile:1.26 --- pkgsrc/fonts/alee-ttf/Makefile:1.25 Tue Mar 24 14:01:18 2020 +++ pkgsrc/fonts/alee-ttf/Makefile Fri Nov 6 18:04:24 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2020/03/24 14:01:18 nia Exp $ +# $NetBSD: Makefile,v 1.26 2020/11/06 18:04:24 maya Exp $ DISTNAME= fonts-alee_13.3 PKGNAME= ${DISTNAME:S/fonts-alee_/alee-ttf-/1} @@ -13,5 +13,8 @@ LICENSE= artistic WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/g} +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/cantarell-fonts/Makefile diff -u pkgsrc/fonts/cantarell-fonts/Makefile:1.11 pkgsrc/fonts/cantarell-fonts/Makefile:1.12 --- pkgsrc/fonts/cantarell-fonts/Makefile:1.11 Sun Mar 22 09:48:36 2020 +++ pkgsrc/fonts/cantarell-fonts/Makefile Fri Nov 6 18:04:24 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2020/03/22 09:48:36 nia Exp $ +# $NetBSD: Makefile,v 1.12 2020/11/06 18:04:24 maya Exp $ DISTNAME= cantarell-fonts-0.201 CATEGORIES= fonts gnome @@ -10,5 +10,8 @@ HOMEPAGE= https://wiki.gnome.org/Project COMMENT= Contemporary Humanist sans serif font designed for on-screen reading LICENSE= ofl-v1.1 +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/cascadia-ttf/Makefile diff -u pkgsrc/fonts/cascadia-ttf/Makefile:1.4 pkgsrc/fonts/cascadia-ttf/Makefile:1.5 --- pkgsrc/fonts/cascadia-ttf/Makefile:1.4 Thu Oct 8 12:41:10 2020 +++ pkgsrc/fonts/cascadia-ttf/Makefile Fri Nov 6 18:04:24 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/10/08 12:41:10 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2020/11/06 18:04:24 maya Exp $ DISTNAME= CascadiaCode-2009.22 PKGNAME= ${DISTNAME:S/CascadiaCode/cascadia-ttf/} @@ -15,5 +15,8 @@ LICENSE= ofl-v1.1 WRKSRC= ${WRKDIR} +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/comic-neue/Makefile diff -u pkgsrc/fonts/comic-neue/Makefile:1.1 pkgsrc/fonts/comic-neue/Makefile:1.2 --- pkgsrc/fonts/comic-neue/Makefile:1.1 Thu Mar 5 14:14:27 2020 +++ pkgsrc/fonts/comic-neue/Makefile Fri Nov 6 18:04:25 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2020/03/05 14:14:27 nia Exp $ +# $NetBSD: Makefile,v 1.2 2020/11/06 18:04:25 maya Exp $ DISTNAME= comic-neue-2.3 CATEGORIES= fonts @@ -12,6 +12,9 @@ LICENSE= ofl-v1.1 WRKSRC= ${WRKDIR} +NO_CONFIGURE= yes +NO_BUILD= yes + post-install: ${FIND} ${DESTDIR}${PREFIX} -name '.*' -print0 | ${XARGS} -0 rm -f Index: pkgsrc/fonts/culmus/Makefile diff -u pkgsrc/fonts/culmus/Makefile:1.6 pkgsrc/fonts/culmus/Makefile:1.7 --- pkgsrc/fonts/culmus/Makefile:1.6 Thu Nov 5 08:31:29 2020 +++ pkgsrc/fonts/culmus/Makefile Fri Nov 6 18:04:25 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2020/11/05 08:31:29 maya Exp $ +# $NetBSD: Makefile,v 1.7 2020/11/06 18:04:25 maya Exp $ DISTNAME= culmus-0.133 CATEGORIES= fonts @@ -9,5 +9,8 @@ HOMEPAGE= http://culmus.sourceforge.net/ COMMENT= Culmus Hebrew fonts LICENSE= gnu-gpl-v2 +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/cyberbit-ttf/Makefile diff -u pkgsrc/fonts/cyberbit-ttf/Makefile:1.11 pkgsrc/fonts/cyberbit-ttf/Makefile:1.12 --- pkgsrc/fonts/cyberbit-ttf/Makefile:1.11 Sat Apr 6 08:44:07 2019 +++ pkgsrc/fonts/cyberbit-ttf/Makefile Fri Nov 6 18:04:25 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/04/06 08:44:07 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2020/11/06 18:04:25 maya Exp $ PKGNAME= cyberbit-ttf-2.0 PKGREVISION= 8 @@ -8,5 +8,8 @@ COMMENT= Multilingual TrueType font from CONFLICTS= cyberbase-ttf-[0-9]* +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../fonts/cyberbit-ttf/Makefile.common" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/evermono-ttf/Makefile diff -u pkgsrc/fonts/evermono-ttf/Makefile:1.5 pkgsrc/fonts/evermono-ttf/Makefile:1.6 --- pkgsrc/fonts/evermono-ttf/Makefile:1.5 Sat Apr 6 08:46:04 2019 +++ pkgsrc/fonts/evermono-ttf/Makefile Fri Nov 6 18:04:25 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/04/06 08:46:04 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2020/11/06 18:04:25 maya Exp $ DISTNAME= evermono VERSION= 7.0.0 @@ -17,9 +17,12 @@ DIST_SUBDIR= evermono-ttf-${VERSION} WRKSRC= ${WRKDIR}/evermono-${VERSION} USE_LANGUAGES= # none +NO_CONFIGURE= yes +NO_BUILD= yes + INSTALLATION_DIRS+= ${FONTDIR} share/doc/evermono-ttf -post-install: +do-install: ${INSTALL_DATA} ${WRKSRC}/emono-licence.txt ${DESTDIR}${PREFIX}/share/doc/evermono-ttf/ .include "../../mk/fonts.mk" Index: pkgsrc/fonts/ibm-plex-otf/Makefile diff -u pkgsrc/fonts/ibm-plex-otf/Makefile:1.4 pkgsrc/fonts/ibm-plex-otf/Makefile:1.5 --- pkgsrc/fonts/ibm-plex-otf/Makefile:1.4 Tue Apr 28 11:46:29 2020 +++ pkgsrc/fonts/ibm-plex-otf/Makefile Fri Nov 6 18:04:25 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/04/28 11:46:29 nikita Exp $ +# $NetBSD: Makefile,v 1.5 2020/11/06 18:04:25 maya Exp $ PKGNAME= ibm-plex-otf-4.0.2 GITHUB_PROJECT= plex @@ -16,5 +16,8 @@ LICENSE= ofl-v1.1 USE_LANGUAGES= # none +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/ibm-plex-ttf/Makefile diff -u pkgsrc/fonts/ibm-plex-ttf/Makefile:1.5 pkgsrc/fonts/ibm-plex-ttf/Makefile:1.6 --- pkgsrc/fonts/ibm-plex-ttf/Makefile:1.5 Tue Apr 28 11:46:29 2020 +++ pkgsrc/fonts/ibm-plex-ttf/Makefile Fri Nov 6 18:04:25 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2020/04/28 11:46:29 nikita Exp $ +# $NetBSD: Makefile,v 1.6 2020/11/06 18:04:25 maya Exp $ PKGNAME= ibm-plex-ttf-4.0.2 GITHUB_PROJECT= plex @@ -16,5 +16,8 @@ LICENSE= ofl-v1.1 USE_LANGUAGES= # none +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/inconsolata-ttf/Makefile diff -u pkgsrc/fonts/inconsolata-ttf/Makefile:1.14 pkgsrc/fonts/inconsolata-ttf/Makefile:1.15 --- pkgsrc/fonts/inconsolata-ttf/Makefile:1.14 Mon Jul 29 08:43:17 2019 +++ pkgsrc/fonts/inconsolata-ttf/Makefile Fri Nov 6 18:04:25 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/07/29 08:43:17 nia Exp $ +# $NetBSD: Makefile,v 1.15 2020/11/06 18:04:25 maya Exp $ PKGNAME= inconsolata-ttf-2.001 CATEGORIES= fonts @@ -25,5 +25,8 @@ do-extract: ${CP} ${_DISTDIR}/${file} ${WRKSRC}/${file} .endfor +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/koruri-ttf/Makefile diff -u pkgsrc/fonts/koruri-ttf/Makefile:1.14 pkgsrc/fonts/koruri-ttf/Makefile:1.15 --- pkgsrc/fonts/koruri-ttf/Makefile:1.14 Sat Jul 27 15:02:55 2019 +++ pkgsrc/fonts/koruri-ttf/Makefile Fri Nov 6 18:04:25 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/07/27 15:02:55 nia Exp $ +# $NetBSD: Makefile,v 1.15 2020/11/06 18:04:25 maya Exp $ DISTNAME= Koruri-${KORURI_VERSION} PKGNAME= koruri-ttf-${KORURI_VERSION} @@ -17,5 +17,8 @@ KORURI_VERSION= 20180915 USE_LANGUAGES= # none +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/linux-libertine-ttf/Makefile diff -u pkgsrc/fonts/linux-libertine-ttf/Makefile:1.9 pkgsrc/fonts/linux-libertine-ttf/Makefile:1.10 --- pkgsrc/fonts/linux-libertine-ttf/Makefile:1.9 Tue Mar 24 14:06:49 2020 +++ pkgsrc/fonts/linux-libertine-ttf/Makefile Fri Nov 6 18:04:25 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2020/03/24 14:06:49 nia Exp $ +# $NetBSD: Makefile,v 1.10 2020/11/06 18:04:25 maya Exp $ DISTNAME= LinLibertineTTF_5.3.0_2012_07_02 PKGNAME= ${DISTNAME:S/LinLibertineTTF_/linux-libertine-ttf-/:C/_[^_].*$//} @@ -13,5 +13,8 @@ LICENSE= gnu-gpl-v2 OR ofl-v1.0 WRKSRC= ${WRKDIR} +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/montserrat/Makefile diff -u pkgsrc/fonts/montserrat/Makefile:1.1 pkgsrc/fonts/montserrat/Makefile:1.2 --- pkgsrc/fonts/montserrat/Makefile:1.1 Thu Aug 6 11:06:42 2020 +++ pkgsrc/fonts/montserrat/Makefile Fri Nov 6 18:04:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2020/08/06 11:06:42 pin Exp $ +# $NetBSD: Makefile,v 1.2 2020/11/06 18:04:26 maya Exp $ DISTNAME= Montserrat-7.210 PKGNAME= ${DISTNAME:tl} @@ -16,7 +16,10 @@ WRKSRC= ${WRKDIR}/${DISTNAME} DOCDIR= ${PREFIX}/share/doc/${PKGBASE} INSTALLATION_DIRS+= ${DOCDIR} -post-install: +NO_CONFIGURE= yes +NO_BUILD= yes + +do-install: ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${DOCDIR} .include "../../mk/fonts.mk" Index: pkgsrc/fonts/ms-ttf/Makefile diff -u pkgsrc/fonts/ms-ttf/Makefile:1.26 pkgsrc/fonts/ms-ttf/Makefile:1.27 --- pkgsrc/fonts/ms-ttf/Makefile:1.26 Fri Mar 20 11:57:39 2020 +++ pkgsrc/fonts/ms-ttf/Makefile Fri Nov 6 18:04:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2020/03/20 11:57:39 nia Exp $ +# $NetBSD: Makefile,v 1.27 2020/11/06 18:04:26 maya Exp $ DISTNAME= # empty PKGNAME= ms-ttf-20020306 @@ -26,6 +26,9 @@ DIST_SUBDIR= ms-ttf EXTRACT_CMD= ${LOCALBASE}/bin/cabextract -q $${extract_file} DOCDIR= ${PREFIX}/share/doc/ms-ttf +NO_CONFIGURE= yes +NO_BUILD= yes + INSTALLATION_DIRS+= ${DOCDIR} post-extract: Index: pkgsrc/fonts/overpass/Makefile diff -u pkgsrc/fonts/overpass/Makefile:1.5 pkgsrc/fonts/overpass/Makefile:1.6 --- pkgsrc/fonts/overpass/Makefile:1.5 Thu Nov 5 08:31:29 2020 +++ pkgsrc/fonts/overpass/Makefile Fri Nov 6 18:04:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2020/11/05 08:31:29 maya Exp $ +# $NetBSD: Makefile,v 1.6 2020/11/06 18:04:26 maya Exp $ DISTNAME= Overpass-3.0.4 CATEGORIES= fonts @@ -9,5 +9,8 @@ HOMEPAGE= https://github.com/RedHatBrand COMMENT= Font family inspired by Highway Gothic LICENSE= ofl-v1.1 AND gnu-lgpl-v2.1 +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/paratype-ttf/Makefile diff -u pkgsrc/fonts/paratype-ttf/Makefile:1.4 pkgsrc/fonts/paratype-ttf/Makefile:1.5 --- pkgsrc/fonts/paratype-ttf/Makefile:1.4 Sat Apr 6 08:56:01 2019 +++ pkgsrc/fonts/paratype-ttf/Makefile Fri Nov 6 18:04:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/04/06 08:56:01 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2020/11/06 18:04:26 maya Exp $ DISTNAME= paratype-ttf-20140616 CATEGORIES= fonts @@ -14,6 +14,9 @@ LICENSE= paratype WRKSRC= ${WRKDIR} +NO_CONFIGURE= yes +NO_BUILD= yes + INSTALLATION_DIRS+= share/doc/paratype-ttf do-install: Index: pkgsrc/fonts/public-sans/Makefile diff -u pkgsrc/fonts/public-sans/Makefile:1.3 pkgsrc/fonts/public-sans/Makefile:1.4 --- pkgsrc/fonts/public-sans/Makefile:1.3 Sun Jan 12 15:21:10 2020 +++ pkgsrc/fonts/public-sans/Makefile Fri Nov 6 18:04:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/01/12 15:21:10 mef Exp $ +# $NetBSD: Makefile,v 1.4 2020/11/06 18:04:26 maya Exp $ VERSION= 1.008 DISTNAME= public-sans-v${VERSION} @@ -12,5 +12,8 @@ HOMEPAGE= https://github.com/uswds/publi COMMENT= Strong, neutral typeface for text or display LICENSE= ofl-v1.1 +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/recursive-ttf/Makefile diff -u pkgsrc/fonts/recursive-ttf/Makefile:1.1 pkgsrc/fonts/recursive-ttf/Makefile:1.2 --- pkgsrc/fonts/recursive-ttf/Makefile:1.1 Fri Jan 17 16:17:21 2020 +++ pkgsrc/fonts/recursive-ttf/Makefile Fri Nov 6 18:04:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2020/01/17 16:17:21 ng0 Exp $ +# $NetBSD: Makefile,v 1.2 2020/11/06 18:04:26 maya Exp $ GITHUB_PROJECT= recursive GITHUB_RELEASE= 1.030 @@ -16,5 +16,8 @@ LICENSE= ofl-v1.1 # \todo: Build from source. # \todo: Build OTF (current static source choice only includes TTF) +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/roboto-fonts/Makefile diff -u pkgsrc/fonts/roboto-fonts/Makefile:1.8 pkgsrc/fonts/roboto-fonts/Makefile:1.9 --- pkgsrc/fonts/roboto-fonts/Makefile:1.8 Sat Apr 6 08:57:04 2019 +++ pkgsrc/fonts/roboto-fonts/Makefile Fri Nov 6 18:04:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/04/06 08:57:04 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2020/11/06 18:04:26 maya Exp $ DISTNAME= roboto-fonts-20150923 CATEGORIES= fonts @@ -9,5 +9,8 @@ HOMEPAGE= https://www.google.com/fonts/s COMMENT= Roboto font family from Google's Android LICENSE= apache-2.0 +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/symbola-ttf/Makefile diff -u pkgsrc/fonts/symbola-ttf/Makefile:1.4 pkgsrc/fonts/symbola-ttf/Makefile:1.5 --- pkgsrc/fonts/symbola-ttf/Makefile:1.4 Sat Apr 6 09:29:23 2019 +++ pkgsrc/fonts/symbola-ttf/Makefile Fri Nov 6 18:04:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/04/06 09:29:23 maya Exp $ +# $NetBSD: Makefile,v 1.5 2020/11/06 18:04:26 maya Exp $ DISTNAME= Symbola PKGNAME= symbola-ttf-9.17 @@ -17,5 +17,8 @@ LICENSE= public-domain WRKSRC= ${WRKDIR} +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/twemoji-color-font-ttf/Makefile diff -u pkgsrc/fonts/twemoji-color-font-ttf/Makefile:1.4 pkgsrc/fonts/twemoji-color-font-ttf/Makefile:1.5 --- pkgsrc/fonts/twemoji-color-font-ttf/Makefile:1.4 Sat Oct 3 09:12:06 2020 +++ pkgsrc/fonts/twemoji-color-font-ttf/Makefile Fri Nov 6 18:04:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/10/03 09:12:06 nia Exp $ +# $NetBSD: Makefile,v 1.5 2020/11/06 18:04:26 maya Exp $ PKGNAME= twemoji-color-font-ttf-13.0.1 DISTNAME= TwitterColorEmoji-SVGinOT-Linux-${PKGVERSION_NOREV} @@ -12,5 +12,8 @@ HOMEPAGE= https://github.com/eosrei/twem COMMENT= Twitter color emoji SVGinOT font LICENSE= cc-by-v4.0 AND mit +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/ubuntu-fonts/Makefile diff -u pkgsrc/fonts/ubuntu-fonts/Makefile:1.5 pkgsrc/fonts/ubuntu-fonts/Makefile:1.6 --- pkgsrc/fonts/ubuntu-fonts/Makefile:1.5 Sat Apr 6 08:58:11 2019 +++ pkgsrc/fonts/ubuntu-fonts/Makefile Fri Nov 6 18:04:27 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/04/06 08:58:11 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2020/11/06 18:04:27 maya Exp $ VERSION= 0.83 PKGNAME= ubuntu-fonts-${VERSION} @@ -12,6 +12,9 @@ HOMEPAGE= http://font.ubuntu.com/ COMMENT= TrueType font family from Ubuntu LICENSE= ubuntu-font-license +NO_CONFIGURE= yes +NO_BUILD= yes + DOCDIR= ${PREFIX}/share/doc/${PKGBASE} INSTALLATION_DIRS+= ${DOCDIR} @@ -23,7 +26,7 @@ INSTALL_DOCS= CONTRIBUTING.txt \ TRADEMARKS.txt \ copyright.txt -post-install: +do-install: .for docfile in ${INSTALL_DOCS} ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DESTDIR}${DOCDIR} .endfor Index: pkgsrc/fonts/umefont-ttf/Makefile diff -u pkgsrc/fonts/umefont-ttf/Makefile:1.60 pkgsrc/fonts/umefont-ttf/Makefile:1.61 --- pkgsrc/fonts/umefont-ttf/Makefile:1.60 Thu Apr 4 11:15:24 2019 +++ pkgsrc/fonts/umefont-ttf/Makefile Fri Nov 6 18:04:27 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2019/04/04 11:15:24 maya Exp $ +# $NetBSD: Makefile,v 1.61 2020/11/06 18:04:27 maya Exp $ # DISTNAME= umefont_610 @@ -17,6 +17,9 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/([a-z]+) CONFLICTS= umefont<=0.421 SUPERSEDES= umefont<=0.421 +NO_CONFIGURE= yes +NO_BUILD= yes + INSTALLATION_DIRS+= ${PREFIX}/share/doc/${PKGBASE} do-install: Index: pkgsrc/fonts/un-core-ttf/Makefile diff -u pkgsrc/fonts/un-core-ttf/Makefile:1.11 pkgsrc/fonts/un-core-ttf/Makefile:1.12 --- pkgsrc/fonts/un-core-ttf/Makefile:1.11 Sat Jan 18 23:31:58 2020 +++ pkgsrc/fonts/un-core-ttf/Makefile Fri Nov 6 18:04:27 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2020/01/18 23:31:58 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2020/11/06 18:04:27 maya Exp $ DISTNAME= un-fonts-core-1.0.2-080608 PKGNAME= ${DISTNAME:S/fonts-core/core-ttf/:S/-0/.200/} @@ -14,5 +14,8 @@ CONFLICTS+= un-ttf-[0-9]* WRKSRC= ${WRKDIR}/un-fonts +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/un-extra-ttf/Makefile diff -u pkgsrc/fonts/un-extra-ttf/Makefile:1.11 pkgsrc/fonts/un-extra-ttf/Makefile:1.12 --- pkgsrc/fonts/un-extra-ttf/Makefile:1.11 Sat Jan 18 23:31:58 2020 +++ pkgsrc/fonts/un-extra-ttf/Makefile Fri Nov 6 18:04:27 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2020/01/18 23:31:58 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2020/11/06 18:04:27 maya Exp $ DISTNAME= un-fonts-extra-1.0.2-080608 PKGNAME= ${DISTNAME:S/fonts-extra/extra-ttf/:S/-0/.200/} @@ -14,5 +14,8 @@ CONFLICTS+= un-ttf-[0-9]* WRKSRC= ${WRKDIR}/un-fonts +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/uralic-ttf/Makefile diff -u pkgsrc/fonts/uralic-ttf/Makefile:1.4 pkgsrc/fonts/uralic-ttf/Makefile:1.5 --- pkgsrc/fonts/uralic-ttf/Makefile:1.4 Thu Apr 4 10:28:53 2019 +++ pkgsrc/fonts/uralic-ttf/Makefile Fri Nov 6 18:04:27 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/04/04 10:28:53 maya Exp $ +# $NetBSD: Makefile,v 1.5 2020/11/06 18:04:27 maya Exp $ # DISTNAME= uralic-ttf-0.0.20040603 @@ -16,5 +16,8 @@ LICENSE= gnu-gpl-v2 WRKSRC= ${WRKDIR} +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/urbanrenewal-ttf/Makefile diff -u pkgsrc/fonts/urbanrenewal-ttf/Makefile:1.6 pkgsrc/fonts/urbanrenewal-ttf/Makefile:1.7 --- pkgsrc/fonts/urbanrenewal-ttf/Makefile:1.6 Sun Jan 26 17:31:12 2020 +++ pkgsrc/fonts/urbanrenewal-ttf/Makefile Fri Nov 6 18:04:27 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2020/01/26 17:31:12 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2020/11/06 18:04:27 maya Exp $ # DISTNAME= urbanrenewal @@ -26,6 +26,9 @@ INSTALLATION_DIRS+= share/doc/${PKGBASE} TOOLS_PLATFORM.unzip= # empty .endif +NO_CONFIGURE= yes +NO_BUILD= yes + do-install: ${INSTALL_DATA} ${WRKSRC}/*.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} ${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} Index: pkgsrc/fonts/vera-ttf/Makefile diff -u pkgsrc/fonts/vera-ttf/Makefile:1.20 pkgsrc/fonts/vera-ttf/Makefile:1.21 --- pkgsrc/fonts/vera-ttf/Makefile:1.20 Thu Apr 4 07:35:18 2019 +++ pkgsrc/fonts/vera-ttf/Makefile Fri Nov 6 18:04:27 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/04/04 07:35:18 maya Exp $ +# $NetBSD: Makefile,v 1.21 2020/11/06 18:04:27 maya Exp $ # # The "vera-ttf" package must always contain unmodified TTF files according @@ -20,6 +20,9 @@ LICENSE= vera-ttf-license INSTALLATION_DIRS+= share/doc/vera-ttf share/examples/vera-ttf +NO_CONFIGURE= yes +NO_BUILD= yes + do-install: ${INSTALL_DATA} ${WRKSRC}/local.conf ${DESTDIR}${PREFIX}/share/examples/vera-ttf cd ${WRKSRC} && ${INSTALL_DATA} *.TXT ${DESTDIR}${PREFIX}/share/doc/vera-ttf Index: pkgsrc/fonts/vlgothic-ttf/Makefile diff -u pkgsrc/fonts/vlgothic-ttf/Makefile:1.31 pkgsrc/fonts/vlgothic-ttf/Makefile:1.32 --- pkgsrc/fonts/vlgothic-ttf/Makefile:1.31 Sat Sep 12 10:03:22 2020 +++ pkgsrc/fonts/vlgothic-ttf/Makefile Fri Nov 6 18:04:27 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2020/09/12 10:03:22 tsutsui Exp $ +# $NetBSD: Makefile,v 1.32 2020/11/06 18:04:27 maya Exp $ DISTNAME= VLGothic-20200720 PKGNAME= ${DISTNAME:tl:S/-/-ttf-/} @@ -13,5 +13,8 @@ LICENSE= modified-bsd AND mplusfont WRKSRC= ${WRKDIR}/VLGothic +NO_CONFIGURE= yes +NO_BUILD= yes + .include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/mk/fonts.mk diff -u pkgsrc/mk/fonts.mk:1.16 pkgsrc/mk/fonts.mk:1.17 --- pkgsrc/mk/fonts.mk:1.16 Sun Mar 22 09:46:10 2020 +++ pkgsrc/mk/fonts.mk Fri Nov 6 18:04:27 2020 @@ -1,4 +1,4 @@ -# $NetBSD: fonts.mk,v 1.16 2020/03/22 09:46:10 nia Exp $ +# $NetBSD: fonts.mk,v 1.17 2020/11/06 18:04:27 maya Exp $ # # Install .otf and .ttf font files. # @@ -8,8 +8,6 @@ # # OTF_FONTS_DIR is the install directory for .otf files -NO_CONFIGURE?= yes -NO_BUILD?= yes USE_LANGUAGES?= # none TTF_FONTS_DIR?= ${PREFIX}/share/fonts/X11/TTF --_----------=_160468586826840--