pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/fonts



Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Nov  2 22:24:44 UTC 2019

Modified Files:
        pkgsrc/fonts/AnonymousPro: Makefile
        pkgsrc/fonts/CamingoCode: Makefile
        pkgsrc/fonts/Code-New-Roman: Makefile
        pkgsrc/fonts/CutiveFont: Makefile
        pkgsrc/fonts/EB-Garamond: Makefile
        pkgsrc/fonts/FiraCode: Makefile
        pkgsrc/fonts/Hasklig: Makefile
        pkgsrc/fonts/Merriweather-ttf: Makefile
        pkgsrc/fonts/Office-Code-Pro: Makefile
        pkgsrc/fonts/Xft2: Makefile builtin.mk
        pkgsrc/fonts/adobe-cmaps: Makefile
        pkgsrc/fonts/aegyptus-ttf: Makefile
        pkgsrc/fonts/chkfontpath: Makefile
        pkgsrc/fonts/courier-prime: Makefile
        pkgsrc/fonts/cyberbit-ttf: Makefile.common
        pkgsrc/fonts/cyr-rfx-bulgarian-mik: Makefile
        pkgsrc/fonts/cyr-rfx-ibm-cp866: Makefile
        pkgsrc/fonts/cyr-rfx-iso10646_0400: Makefile
        pkgsrc/fonts/cyr-rfx-iso8859_15: Makefile
        pkgsrc/fonts/cyr-rfx-iso8859_5: Makefile
        pkgsrc/fonts/cyr-rfx-koi8-o: Makefile
        pkgsrc/fonts/cyr-rfx-koi8-ru: Makefile
        pkgsrc/fonts/cyr-rfx-koi8-ub: Makefile
        pkgsrc/fonts/cyr-rfx-koi8_1: Makefile
        pkgsrc/fonts/cyr-rfx-mac-cyrillic: Makefile
        pkgsrc/fonts/cyr-rfx-windows_1251: Makefile
        pkgsrc/fonts/cyr-rfx-winlatin_1: Makefile
        pkgsrc/fonts/dbz-ttf: Makefile
        pkgsrc/fonts/fntsample: Makefile
        pkgsrc/fonts/font-bh-ttf: Makefile
        pkgsrc/fonts/font-misc-ethiopic: Makefile
        pkgsrc/fonts/fontconfig: Makefile builtin.mk
        pkgsrc/fonts/ghostscript-cidfonts-ryumin: Makefile options.mk
        pkgsrc/fonts/intlfonts: Makefile
        pkgsrc/fonts/ja-elisat: Makefile
        pkgsrc/fonts/jisx0208fonts: Makefile
        pkgsrc/fonts/ko-mizi: Makefile
        pkgsrc/fonts/libfontenc: builtin.mk
        pkgsrc/fonts/migu-ttf: Makefile
        pkgsrc/fonts/mkfontalias: Makefile
        pkgsrc/fonts/monoid: Makefile
        pkgsrc/fonts/mothanna-ttf: Makefile
        pkgsrc/fonts/mozilla-fonts: Makefile
        pkgsrc/fonts/mplayer-fonts: Makefile
        pkgsrc/fonts/oxygen-fonts: Makefile
        pkgsrc/fonts/pixel-sagas-startrek: Makefile
        pkgsrc/fonts/py-TTFQuery: Makefile
        pkgsrc/fonts/ricty-ttf: Makefile
        pkgsrc/fonts/sourcecodepro-fonts: Makefile
        pkgsrc/fonts/sourcesans-fonts: Makefile
        pkgsrc/fonts/t1lib: Makefile options.mk
        pkgsrc/fonts/tex-concrete-doc: Makefile
        pkgsrc/fonts/tex-gnu-freefont-doc: Makefile
        pkgsrc/fonts/tex-gothic-doc: Makefile
        pkgsrc/fonts/tex-luaotfload: Makefile
        pkgsrc/fonts/tex-mathdesign: Makefile
        pkgsrc/fonts/thaixfonts: Makefile
        pkgsrc/fonts/urw-fonts: Makefile

Log Message:
fonts: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

No manual corrections.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/fonts/AnonymousPro/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/CamingoCode/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/Code-New-Roman/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/CutiveFont/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/EB-Garamond/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/FiraCode/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/Hasklig/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/Merriweather-ttf/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/Office-Code-Pro/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/fonts/Xft2/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/fonts/Xft2/builtin.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/fonts/adobe-cmaps/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/fonts/aegyptus-ttf/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/fonts/chkfontpath/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/courier-prime/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/fonts/cyberbit-ttf/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/cyr-rfx-bulgarian-mik/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/cyr-rfx-ibm-cp866/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/cyr-rfx-iso10646_0400/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/cyr-rfx-iso8859_15/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/cyr-rfx-iso8859_5/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/cyr-rfx-koi8-o/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/cyr-rfx-koi8-ru/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/cyr-rfx-koi8-ub/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/cyr-rfx-koi8_1/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/cyr-rfx-mac-cyrillic/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/cyr-rfx-windows_1251/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/cyr-rfx-winlatin_1/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/fonts/dbz-ttf/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/fonts/fntsample/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/fonts/font-bh-ttf/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/font-misc-ethiopic/Makefile
cvs rdiff -u -r1.116 -r1.117 pkgsrc/fonts/fontconfig/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/fonts/fontconfig/builtin.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/ghostscript-cidfonts-ryumin/options.mk
cvs rdiff -u -r1.34 -r1.35 pkgsrc/fonts/intlfonts/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/fonts/ja-elisat/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/fonts/jisx0208fonts/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/fonts/ko-mizi/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/libfontenc/builtin.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/fonts/migu-ttf/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/fonts/mkfontalias/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/monoid/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/mothanna-ttf/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/fonts/mozilla-fonts/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/fonts/mplayer-fonts/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/oxygen-fonts/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/pixel-sagas-startrek/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/fonts/py-TTFQuery/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/fonts/ricty-ttf/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/sourcecodepro-fonts/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/sourcesans-fonts/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/fonts/t1lib/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/t1lib/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/tex-concrete-doc/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/tex-gnu-freefont-doc/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/tex-gothic-doc/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/tex-luaotfload/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/tex-mathdesign/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/fonts/thaixfonts/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/urw-fonts/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/fonts/AnonymousPro/Makefile
diff -u pkgsrc/fonts/AnonymousPro/Makefile:1.7 pkgsrc/fonts/AnonymousPro/Makefile:1.8
--- pkgsrc/fonts/AnonymousPro/Makefile:1.7      Tue Aug  1 14:58:57 2017
+++ pkgsrc/fonts/AnonymousPro/Makefile  Sat Nov  2 22:24:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/08/01 14:58:57 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/02 22:24:37 rillig Exp $
 #
 
 DISTNAME=      AnonymousPro-1.002
@@ -28,7 +28,7 @@ INSTALL_FONTS=        AnonymousProB.ttf \
                AnonymousProBI.ttf \
                AnonymousProI.ttf \
                AnonymousPro.ttf
-INSTALL_DOCS=   FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt
+INSTALL_DOCS=  FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt
 
 post-extract:
        cd ${WRKSRC} && for i in *.ttf; do \

Index: pkgsrc/fonts/CamingoCode/Makefile
diff -u pkgsrc/fonts/CamingoCode/Makefile:1.3 pkgsrc/fonts/CamingoCode/Makefile:1.4
--- pkgsrc/fonts/CamingoCode/Makefile:1.3       Mon Jun 24 10:59:40 2019
+++ pkgsrc/fonts/CamingoCode/Makefile   Sat Nov  2 22:24:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/06/24 10:59:40 nia Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/02 22:24:37 rillig Exp $
 
 DISTNAME=      CamingoCode-v1.0
 PKGNAME=       ${DISTNAME:S/-v/-/}
@@ -14,7 +14,7 @@ LICENSE=      cc-by-nd-v3.0-license
 WRKSRC=                ${WRKDIR}
 USE_LANGUAGES= # none
 
-FONTS_DIRS.ttf=        ${PREFIX}/share/fonts/X11/TTF
+FONTS_DIRS.ttf=                ${PREFIX}/share/fonts/X11/TTF
 INSTALLATION_DIRS=     share/fonts/X11/TTF share/doc/CamingoCode
 
 do-build:

Index: pkgsrc/fonts/Code-New-Roman/Makefile
diff -u pkgsrc/fonts/Code-New-Roman/Makefile:1.2 pkgsrc/fonts/Code-New-Roman/Makefile:1.3
--- pkgsrc/fonts/Code-New-Roman/Makefile:1.2    Tue Aug  1 14:58:57 2017
+++ pkgsrc/fonts/Code-New-Roman/Makefile        Sat Nov  2 22:24:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/08/01 14:58:57 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/02 22:24:37 rillig Exp $
 
 DISTNAME=      cnr_BETA
 PKGNAME=       Code-New-Roman-2.1beta1
@@ -11,11 +11,11 @@ HOMEPAGE=   https://sourceforge.net/projec
 COMMENT=       Programming font
 LICENSE=       ofl-v1.1
 
-DIST_SUBDIR=   ${PKGNAME_NOREV}
-USE_LANGUAGES= # none
-WRKSRC=                ${WRKDIR}
-NO_BUILD=      yes
-FONTS_DIR=     ${PREFIX}/share/fonts/X11/OTF
+DIST_SUBDIR=           ${PKGNAME_NOREV}
+USE_LANGUAGES=         # none
+WRKSRC=                        ${WRKDIR}
+NO_BUILD=              yes
+FONTS_DIR=             ${PREFIX}/share/fonts/X11/OTF
 INSTALLATION_DIRS=     share/fonts/X11/OTF
 
 do-install:

Index: pkgsrc/fonts/CutiveFont/Makefile
diff -u pkgsrc/fonts/CutiveFont/Makefile:1.1 pkgsrc/fonts/CutiveFont/Makefile:1.2
--- pkgsrc/fonts/CutiveFont/Makefile:1.1        Wed Jan 20 11:40:13 2016
+++ pkgsrc/fonts/CutiveFont/Makefile    Sat Nov  2 22:24:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/01/20 11:40:13 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 22:24:37 rillig Exp $
 
 DISTNAME=      CutiveFont-0.0.20121026
 CATEGORIES=    fonts
@@ -10,12 +10,12 @@ HOMEPAGE=   https://www.google.com/fonts/s
 COMMENT=       Classic typewriter typeface
 LICENSE=       ofl-v1.1
 
-USE_TOOLS+=    bsdtar
-EXTRACT_USING= bsdtar
-USE_LANGUAGES= # none
-NO_BUILD=      yes
+USE_TOOLS+=            bsdtar
+EXTRACT_USING=         bsdtar
+USE_LANGUAGES=         # none
+NO_BUILD=              yes
 #WRKSRC=               ${WRKDIR}
-FONTS_DIRS.ttf=        ${PREFIX}/share/fonts/X11/OTF
+FONTS_DIRS.ttf=                ${PREFIX}/share/fonts/X11/OTF
 INSTALLATION_DIRS=     share/fonts/X11/OTF
 
 do-install:

Index: pkgsrc/fonts/EB-Garamond/Makefile
diff -u pkgsrc/fonts/EB-Garamond/Makefile:1.6 pkgsrc/fonts/EB-Garamond/Makefile:1.7
--- pkgsrc/fonts/EB-Garamond/Makefile:1.6       Sun Jun  1 16:35:31 2014
+++ pkgsrc/fonts/EB-Garamond/Makefile   Sat Nov  2 22:24:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:31 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/02 22:24:37 rillig Exp $
 
 DISTNAME=      EBGaramond-0.016
 PKGREVISION=   1
@@ -12,10 +12,10 @@ COMMENT=    Egenolff-Berner Garamond font
 LICENSE=       ofl-v1.1
 
 FONTS_DIRS.ttf=                share/fonts/X11/OTF
-DOCDIR=                share/doc/EBGaramond
+DOCDIR=                        share/doc/EBGaramond
 INSTALLATION_DIRS=     ${FONTS_DIRS.ttf} ${DOCDIR}
-NO_CONFIGURE=  yes
-NO_BUILD=      yes
+NO_CONFIGURE=          yes
+NO_BUILD=              yes
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/otf/* ${DESTDIR}${PREFIX}/${FONTS_DIRS.ttf}

Index: pkgsrc/fonts/FiraCode/Makefile
diff -u pkgsrc/fonts/FiraCode/Makefile:1.4 pkgsrc/fonts/FiraCode/Makefile:1.5
--- pkgsrc/fonts/FiraCode/Makefile:1.4  Wed Nov 30 14:24:47 2016
+++ pkgsrc/fonts/FiraCode/Makefile      Sat Nov  2 22:24:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/11/30 14:24:47 mef Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/02 22:24:37 rillig Exp $
 
 DISTNAME=      FiraCode_1.204
 PKGNAME=       ${DISTNAME:S/_/-/}
@@ -12,11 +12,11 @@ HOMEPAGE=   https://github.com/tonsky/Fira
 COMMENT=       Monospaced font with programming ligatures
 LICENSE=       ofl-v1.1
 
-USE_LANGUAGES= # none
-NO_BUILD=      yes
-FONTS_DIRS.ttf=        ${PREFIX}/share/fonts/X11/OTF ${PREFIX}/share/fonts/X11/TTF
+USE_LANGUAGES=         # none
+NO_BUILD=              yes
+FONTS_DIRS.ttf=                ${PREFIX}/share/fonts/X11/OTF ${PREFIX}/share/fonts/X11/TTF
 INSTALLATION_DIRS=     share/fonts/X11/OTF share/fonts/X11/TTF
-WRKSRC=                ${WRKDIR}
+WRKSRC=                        ${WRKDIR}
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/otf/*.otf  ${DESTDIR}${PREFIX}/share/fonts/X11/OTF

Index: pkgsrc/fonts/Hasklig/Makefile
diff -u pkgsrc/fonts/Hasklig/Makefile:1.2 pkgsrc/fonts/Hasklig/Makefile:1.3
--- pkgsrc/fonts/Hasklig/Makefile:1.2   Sat May  6 01:06:43 2017
+++ pkgsrc/fonts/Hasklig/Makefile       Sat Nov  2 22:24:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/05/06 01:06:43 mef Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/02 22:24:38 rillig Exp $
 
 DISTNAME=      Hasklig-1.1
 CATEGORIES=    fonts
@@ -11,10 +11,10 @@ HOMEPAGE=   https://github.com/i-tu/Haskli
 COMMENT=       Code font with monospaced ligatures
 LICENSE=       ofl-v1.1
 
-USE_LANGUAGES= # none
-NO_BUILD=      yes
-WRKSRC=                ${WRKDIR}
-FONTS_DIRS.ttf=        ${PREFIX}/share/fonts/X11/OTF
+USE_LANGUAGES=         # none
+NO_BUILD=              yes
+WRKSRC=                        ${WRKDIR}
+FONTS_DIRS.ttf=                ${PREFIX}/share/fonts/X11/OTF
 INSTALLATION_DIRS=     share/fonts/X11/OTF
 
 do-install:

Index: pkgsrc/fonts/Merriweather-ttf/Makefile
diff -u pkgsrc/fonts/Merriweather-ttf/Makefile:1.2 pkgsrc/fonts/Merriweather-ttf/Makefile:1.3
--- pkgsrc/fonts/Merriweather-ttf/Makefile:1.2  Wed Nov 22 13:41:20 2017
+++ pkgsrc/fonts/Merriweather-ttf/Makefile      Sat Nov  2 22:24:38 2019
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2017/11/22 13:41:20 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/02 22:24:38 rillig Exp $
 
-DISTNAME=      Merriweather-2.002
-PKGNAME=       ${DISTNAME:S/her/her-ttf/}
-CATEGORIES=    fonts
+DISTNAME=              Merriweather-2.002
+PKGNAME=               ${DISTNAME:S/her/her-ttf/}
+CATEGORIES=            fonts
 # does not provide distfile for versions > 1.584; 2.002 is from fontsquirrel
-#MASTER_SITES= ${MASTER_SITE_GITHUB:=EbenSorkin/}
+#MASTER_SITES=         ${MASTER_SITE_GITHUB:=EbenSorkin/}
 #GITHUB_PROJECT=       Merriweather
 #GITHUB_RELEASE=       ${PKGVERSION_NOREV}
-EXTRACT_SUFX=  .zip
+EXTRACT_SUFX=          .zip
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ebensorkin.wordpress.com/

Index: pkgsrc/fonts/Office-Code-Pro/Makefile
diff -u pkgsrc/fonts/Office-Code-Pro/Makefile:1.1 pkgsrc/fonts/Office-Code-Pro/Makefile:1.2
--- pkgsrc/fonts/Office-Code-Pro/Makefile:1.1   Wed Jan 20 11:37:52 2016
+++ pkgsrc/fonts/Office-Code-Pro/Makefile       Sat Nov  2 22:24:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/01/20 11:37:52 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 22:24:38 rillig Exp $
 
 DISTNAME=      Office-Code-Pro-1.004
 CATEGORIES=    fonts
@@ -9,8 +9,8 @@ HOMEPAGE=       https://github.com/nathco/Offi
 COMMENT=       Customized version of Source Code Pro
 LICENSE=       ofl-v1.1
 
-USE_LANGUAGES= # none
-NO_BUILD=      yes
+USE_LANGUAGES=         # none
+NO_BUILD=              yes
 FONTS_DIRS.ttf=                ${PREFIX}/share/fonts/X11/OTF
 INSTALLATION_DIRS=     share/fonts/X11/OTF
 

Index: pkgsrc/fonts/Xft2/Makefile
diff -u pkgsrc/fonts/Xft2/Makefile:1.58 pkgsrc/fonts/Xft2/Makefile:1.59
--- pkgsrc/fonts/Xft2/Makefile:1.58     Mon Mar 12 11:15:32 2018
+++ pkgsrc/fonts/Xft2/Makefile  Sat Nov  2 22:24:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2018/03/12 11:15:32 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2019/11/02 22:24:38 rillig Exp $
 
 DISTNAME=      libXft-2.1.7
 PKGNAME=       Xft2-2.1.7
@@ -20,7 +20,7 @@ USE_TOOLS+=           gmake pkg-config
 PKGCONFIG_OVERRIDE=    xft.pc.in
 MAKE_ENV+=             EGREP=${EGREP:Q}
 
-BUILDLINK_API_DEPENDS.Xrender+=        Xrender>=0.9.0nb2
+BUILDLINK_API_DEPENDS.Xrender+=                Xrender>=0.9.0nb2
 BUILDLINK_API_DEPENDS.fontconfig+=     fontconfig>=2.2
 
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/fonts/Xft2/builtin.mk
diff -u pkgsrc/fonts/Xft2/builtin.mk:1.20 pkgsrc/fonts/Xft2/builtin.mk:1.21
--- pkgsrc/fonts/Xft2/builtin.mk:1.20   Fri Jun  7 17:43:40 2013
+++ pkgsrc/fonts/Xft2/builtin.mk        Sat Nov  2 22:24:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.20 2013/06/07 17:43:40 dholland Exp $
+# $NetBSD: builtin.mk,v 1.21 2019/11/02 22:24:38 rillig Exp $
 
 BUILTIN_PKG:=  Xft2
 
@@ -18,7 +18,7 @@ IS_BUILTIN.Xft2=      yes
 IS_BUILTIN.Xft2=       no
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.Xft2
+MAKEVARS+=             IS_BUILTIN.Xft2
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -40,7 +40,7 @@ BUILTIN_VERSION.Xft2!=                                                        \
                ${H_XFT2}
 BUILTIN_PKG.Xft2=      Xft2-${BUILTIN_VERSION.Xft2}
 .endif
-MAKEVARS+=     BUILTIN_PKG.Xft2
+MAKEVARS+=             BUILTIN_PKG.Xft2
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -68,7 +68,7 @@ USE_BUILTIN.Xft2!=                                                    \
 .    endif
 .  endif  # PREFER.Xft2
 .endif
-MAKEVARS+=     USE_BUILTIN.Xft2
+MAKEVARS+=             USE_BUILTIN.Xft2
 
 ###
 ### The section below only applies if we are not including this file

Index: pkgsrc/fonts/adobe-cmaps/Makefile
diff -u pkgsrc/fonts/adobe-cmaps/Makefile:1.26 pkgsrc/fonts/adobe-cmaps/Makefile:1.27
--- pkgsrc/fonts/adobe-cmaps/Makefile:1.26      Tue Sep 24 15:15:35 2019
+++ pkgsrc/fonts/adobe-cmaps/Makefile   Sat Nov  2 22:24:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/09/24 15:15:35 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/02 22:24:38 rillig Exp $
 
 DISTNAME=      adobe-cmaps-20060615
 CATEGORIES=    fonts print
@@ -13,12 +13,12 @@ SITES.${f}+=        ftp://ftp.oreilly.com/pub/e
 DISTFILES+=    ${CMAP_DISTFILES}
 EXTRACT_ONLY=  ${CMAP_DISTFILES}
 
-PDFCORE=       chinese_s chinese_t japanese korean
+PDFCORE=               chinese_s chinese_t japanese korean
 PDFCORE_DISTFILES=     ${PDFCORE:S/$/.zip/}
 .for f in ${PDFCORE_DISTFILES}
-SITES.${f}+=   http://partners.adobe.com/public/developer/en/pdf/
+SITES.${f}+=           http://partners.adobe.com/public/developer/en/pdf/
 .endfor
-DISTFILES+=    ${PDFCORE_DISTFILES}
+DISTFILES+=            ${PDFCORE_DISTFILES}
 
 MAINTAINER=    minskim%NetBSD.org@localhost
 #HOMEPAGE=     https://partners.adobe.com/public/developer/opentype/

Index: pkgsrc/fonts/aegyptus-ttf/Makefile
diff -u pkgsrc/fonts/aegyptus-ttf/Makefile:1.1.1.1 pkgsrc/fonts/aegyptus-ttf/Makefile:1.2
--- pkgsrc/fonts/aegyptus-ttf/Makefile:1.1.1.1  Sat Aug  9 16:21:27 2014
+++ pkgsrc/fonts/aegyptus-ttf/Makefile  Sat Nov  2 22:24:38 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2014/08/09 16:21:27 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 22:24:38 rillig Exp $
 
 DISTNAME=      Aegyptus
 PKGNAME=       aegyptus-ttf-5.03
 CATEGORIES=    fonts
 MASTER_SITES=  http://users.teilar.gr/~g1951d/
 EXTRACT_SUFX=  .zip
-DISTFILES+=     ${DISTNAME}.zip Nilus.zip Gardiner.zip
+DISTFILES+=    ${DISTNAME}.zip Nilus.zip Gardiner.zip
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://users.teilar.gr/~g1951d/

Index: pkgsrc/fonts/chkfontpath/Makefile
diff -u pkgsrc/fonts/chkfontpath/Makefile:1.23 pkgsrc/fonts/chkfontpath/Makefile:1.24
--- pkgsrc/fonts/chkfontpath/Makefile:1.23      Wed Oct  3 18:28:17 2012
+++ pkgsrc/fonts/chkfontpath/Makefile   Sat Nov  2 22:24:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2012/10/03 18:28:17 asau Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/02 22:24:38 rillig Exp $
 #
 
 DISTNAME=      chkfontpath-1.9.7
@@ -17,11 +17,11 @@ USE_TOOLS+= gmake tar gzcat
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man8
 
 post-extract:
-               ${RUN}cd ${WRKDIR};${EXTRACTOR} ${DISTNAME}.tar.gz
+       ${RUN}cd ${WRKDIR};${EXTRACTOR} ${DISTNAME}.tar.gz
 
 do-install:
-               ${INSTALL_PROGRAM} ${WRKSRC}/chkfontpath ${DESTDIR}${PREFIX}/bin
-               ${INSTALL_MAN} ${WRKSRC}/man/en/chkfontpath.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+       ${INSTALL_PROGRAM} ${WRKSRC}/chkfontpath ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/man/en/chkfontpath.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../devel/popt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/courier-prime/Makefile
diff -u pkgsrc/fonts/courier-prime/Makefile:1.4 pkgsrc/fonts/courier-prime/Makefile:1.5
--- pkgsrc/fonts/courier-prime/Makefile:1.4     Tue Aug  1 14:58:58 2017
+++ pkgsrc/fonts/courier-prime/Makefile Sat Nov  2 22:24:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/08/01 14:58:58 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/02 22:24:38 rillig Exp $
 #
 
 DISTNAME=      courier-prime
@@ -18,7 +18,7 @@ DIST_SUBDIR=  ${PKGNAME_NOREV}
 
 USE_LANGUAGES= # none
 
-FONTS_DIRS.ttf=        ${PREFIX}/share/fonts/X11/TTF
+FONTS_DIRS.ttf=                ${PREFIX}/share/fonts/X11/TTF
 INSTALLATION_DIRS=     ${FONTS_DIRS.ttf}
 INSTALLATION_DIRS+=    share/doc/courier-prime
 

Index: pkgsrc/fonts/cyberbit-ttf/Makefile.common
diff -u pkgsrc/fonts/cyberbit-ttf/Makefile.common:1.30 pkgsrc/fonts/cyberbit-ttf/Makefile.common:1.31
--- pkgsrc/fonts/cyberbit-ttf/Makefile.common:1.30      Sat Apr  6 08:44:07 2019
+++ pkgsrc/fonts/cyberbit-ttf/Makefile.common   Sat Nov  2 22:24:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2019/04/06 08:44:07 wiz Exp $
+# $NetBSD: Makefile.common,v 1.31 2019/11/02 22:24:38 rillig Exp $
 #
 # used by fonts/cyberbit-ttf/Makefile
 # used by fonts/cyberbase-ttf/Makefile
@@ -12,13 +12,13 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.bitstream.com/
 LICENSE=       cyberbit-ttf-license
 
-RESTRICTED=    Redistribution not permitted; single user license only.
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
+RESTRICTED=            Redistribution not permitted; single user license only.
+NO_SRC_ON_CDROM=       ${RESTRICTED}
+NO_SRC_ON_FTP=         ${RESTRICTED}
+NO_BIN_ON_CDROM=       ${RESTRICTED}
+NO_BIN_ON_FTP=         ${RESTRICTED}
 
-USE_TOOLS+=     unzip
+USE_TOOLS+=    unzip
 
 DIST_SUBDIR=   cyberbit-ttf
 

Index: pkgsrc/fonts/cyr-rfx-bulgarian-mik/Makefile
diff -u pkgsrc/fonts/cyr-rfx-bulgarian-mik/Makefile:1.5 pkgsrc/fonts/cyr-rfx-bulgarian-mik/Makefile:1.6
--- pkgsrc/fonts/cyr-rfx-bulgarian-mik/Makefile:1.5     Sun Jun  1 16:35:32 2014
+++ pkgsrc/fonts/cyr-rfx-bulgarian-mik/Makefile Sat Nov  2 22:24:39 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 22:24:39 rillig Exp $
 
-CYR_RFX_ENCODING=bulgarian-mik
-PKGREVISION=   4
+CYR_RFX_ENCODING=      bulgarian-mik
+PKGREVISION=           4
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"

Index: pkgsrc/fonts/cyr-rfx-ibm-cp866/Makefile
diff -u pkgsrc/fonts/cyr-rfx-ibm-cp866/Makefile:1.5 pkgsrc/fonts/cyr-rfx-ibm-cp866/Makefile:1.6
--- pkgsrc/fonts/cyr-rfx-ibm-cp866/Makefile:1.5 Sun Jun  1 16:35:32 2014
+++ pkgsrc/fonts/cyr-rfx-ibm-cp866/Makefile     Sat Nov  2 22:24:39 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 22:24:39 rillig Exp $
 
-CYR_RFX_ENCODING=ibm-cp866
-PKGREVISION=   4
+CYR_RFX_ENCODING=      ibm-cp866
+PKGREVISION=           4
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"

Index: pkgsrc/fonts/cyr-rfx-iso10646_0400/Makefile
diff -u pkgsrc/fonts/cyr-rfx-iso10646_0400/Makefile:1.6 pkgsrc/fonts/cyr-rfx-iso10646_0400/Makefile:1.7
--- pkgsrc/fonts/cyr-rfx-iso10646_0400/Makefile:1.6     Sun Jun  1 16:35:32 2014
+++ pkgsrc/fonts/cyr-rfx-iso10646_0400/Makefile Sat Nov  2 22:24:39 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/02 22:24:39 rillig Exp $
 
-CYR_RFX_ENCODING=iso10646-0400
-PKGNAME=       ${DISTNAME:S/6-0/6_0/}
-PKGREVISION=   4
+CYR_RFX_ENCODING=      iso10646-0400
+PKGNAME=               ${DISTNAME:S/6-0/6_0/}
+PKGREVISION=           4
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"

Index: pkgsrc/fonts/cyr-rfx-iso8859_15/Makefile
diff -u pkgsrc/fonts/cyr-rfx-iso8859_15/Makefile:1.6 pkgsrc/fonts/cyr-rfx-iso8859_15/Makefile:1.7
--- pkgsrc/fonts/cyr-rfx-iso8859_15/Makefile:1.6        Sun Jun  1 16:35:32 2014
+++ pkgsrc/fonts/cyr-rfx-iso8859_15/Makefile    Sat Nov  2 22:24:39 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/02 22:24:39 rillig Exp $
 
-CYR_RFX_ENCODING=iso8859-15
-PKGNAME=       ${DISTNAME:S/9-1/9_1/}
-PKGREVISION=   4
+CYR_RFX_ENCODING=      iso8859-15
+PKGNAME=               ${DISTNAME:S/9-1/9_1/}
+PKGREVISION=           4
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"

Index: pkgsrc/fonts/cyr-rfx-iso8859_5/Makefile
diff -u pkgsrc/fonts/cyr-rfx-iso8859_5/Makefile:1.6 pkgsrc/fonts/cyr-rfx-iso8859_5/Makefile:1.7
--- pkgsrc/fonts/cyr-rfx-iso8859_5/Makefile:1.6 Sun Jun  1 16:35:33 2014
+++ pkgsrc/fonts/cyr-rfx-iso8859_5/Makefile     Sat Nov  2 22:24:39 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:33 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/02 22:24:39 rillig Exp $
 
-CYR_RFX_ENCODING=iso8859-5
-PKGNAME=       ${DISTNAME:S/9-5/9_5/}
-PKGREVISION=   4
+CYR_RFX_ENCODING=      iso8859-5
+PKGNAME=               ${DISTNAME:S/9-5/9_5/}
+PKGREVISION=           4
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"

Index: pkgsrc/fonts/cyr-rfx-koi8-o/Makefile
diff -u pkgsrc/fonts/cyr-rfx-koi8-o/Makefile:1.5 pkgsrc/fonts/cyr-rfx-koi8-o/Makefile:1.6
--- pkgsrc/fonts/cyr-rfx-koi8-o/Makefile:1.5    Sun Jun  1 16:35:33 2014
+++ pkgsrc/fonts/cyr-rfx-koi8-o/Makefile        Sat Nov  2 22:24:39 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:33 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 22:24:39 rillig Exp $
 
-CYR_RFX_ENCODING=koi8-o
-PKGREVISION=   4
+CYR_RFX_ENCODING=      koi8-o
+PKGREVISION=           4
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"

Index: pkgsrc/fonts/cyr-rfx-koi8-ru/Makefile
diff -u pkgsrc/fonts/cyr-rfx-koi8-ru/Makefile:1.5 pkgsrc/fonts/cyr-rfx-koi8-ru/Makefile:1.6
--- pkgsrc/fonts/cyr-rfx-koi8-ru/Makefile:1.5   Sun Jun  1 16:35:33 2014
+++ pkgsrc/fonts/cyr-rfx-koi8-ru/Makefile       Sat Nov  2 22:24:39 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:33 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 22:24:39 rillig Exp $
 
-CYR_RFX_ENCODING=koi8-ru
-PKGREVISION=   4
+CYR_RFX_ENCODING=      koi8-ru
+PKGREVISION=           4
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"

Index: pkgsrc/fonts/cyr-rfx-koi8-ub/Makefile
diff -u pkgsrc/fonts/cyr-rfx-koi8-ub/Makefile:1.5 pkgsrc/fonts/cyr-rfx-koi8-ub/Makefile:1.6
--- pkgsrc/fonts/cyr-rfx-koi8-ub/Makefile:1.5   Sun Jun  1 16:35:33 2014
+++ pkgsrc/fonts/cyr-rfx-koi8-ub/Makefile       Sat Nov  2 22:24:39 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:33 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 22:24:39 rillig Exp $
 
-CYR_RFX_ENCODING=koi8-ub
-PKGREVISION=   4
+CYR_RFX_ENCODING=      koi8-ub
+PKGREVISION=           4
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"

Index: pkgsrc/fonts/cyr-rfx-koi8_1/Makefile
diff -u pkgsrc/fonts/cyr-rfx-koi8_1/Makefile:1.6 pkgsrc/fonts/cyr-rfx-koi8_1/Makefile:1.7
--- pkgsrc/fonts/cyr-rfx-koi8_1/Makefile:1.6    Sun Jun  1 16:35:33 2014
+++ pkgsrc/fonts/cyr-rfx-koi8_1/Makefile        Sat Nov  2 22:24:39 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:33 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/02 22:24:39 rillig Exp $
 
-CYR_RFX_ENCODING=koi8-1
-PKGNAME=       ${DISTNAME:S/8-1/8_1/}
-PKGREVISION=   4
+CYR_RFX_ENCODING=      koi8-1
+PKGNAME=               ${DISTNAME:S/8-1/8_1/}
+PKGREVISION=           4
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"

Index: pkgsrc/fonts/cyr-rfx-mac-cyrillic/Makefile
diff -u pkgsrc/fonts/cyr-rfx-mac-cyrillic/Makefile:1.5 pkgsrc/fonts/cyr-rfx-mac-cyrillic/Makefile:1.6
--- pkgsrc/fonts/cyr-rfx-mac-cyrillic/Makefile:1.5      Sun Jun  1 16:35:33 2014
+++ pkgsrc/fonts/cyr-rfx-mac-cyrillic/Makefile  Sat Nov  2 22:24:40 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:33 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 22:24:40 rillig Exp $
 
-CYR_RFX_ENCODING=mac-cyrillic
-PKGREVISION=   4
+CYR_RFX_ENCODING=      mac-cyrillic
+PKGREVISION=           4
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"

Index: pkgsrc/fonts/cyr-rfx-windows_1251/Makefile
diff -u pkgsrc/fonts/cyr-rfx-windows_1251/Makefile:1.6 pkgsrc/fonts/cyr-rfx-windows_1251/Makefile:1.7
--- pkgsrc/fonts/cyr-rfx-windows_1251/Makefile:1.6      Sun Jun  1 16:35:33 2014
+++ pkgsrc/fonts/cyr-rfx-windows_1251/Makefile  Sat Nov  2 22:24:40 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:33 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/02 22:24:40 rillig Exp $
 
-CYR_RFX_ENCODING=windows-1251
-PKGNAME=       ${DISTNAME:S/s-1/s_1/}
-PKGREVISION=   4
+CYR_RFX_ENCODING=      windows-1251
+PKGNAME=               ${DISTNAME:S/s-1/s_1/}
+PKGREVISION=           4
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"

Index: pkgsrc/fonts/cyr-rfx-winlatin_1/Makefile
diff -u pkgsrc/fonts/cyr-rfx-winlatin_1/Makefile:1.6 pkgsrc/fonts/cyr-rfx-winlatin_1/Makefile:1.7
--- pkgsrc/fonts/cyr-rfx-winlatin_1/Makefile:1.6        Sun Jun  1 16:35:33 2014
+++ pkgsrc/fonts/cyr-rfx-winlatin_1/Makefile    Sat Nov  2 22:24:40 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:33 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/02 22:24:40 rillig Exp $
 
-CYR_RFX_ENCODING=winlatin-1
-PKGNAME=       ${DISTNAME:S/n-1/n_1/}
-PKGREVISION=   4
+CYR_RFX_ENCODING=      winlatin-1
+PKGNAME=               ${DISTNAME:S/n-1/n_1/}
+PKGREVISION=           4
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"

Index: pkgsrc/fonts/dbz-ttf/Makefile
diff -u pkgsrc/fonts/dbz-ttf/Makefile:1.20 pkgsrc/fonts/dbz-ttf/Makefile:1.21
--- pkgsrc/fonts/dbz-ttf/Makefile:1.20  Sun Jun  1 16:35:33 2014
+++ pkgsrc/fonts/dbz-ttf/Makefile       Sat Nov  2 22:24:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/06/01 16:35:33 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/02 22:24:40 rillig Exp $
 #
 
 DISTNAME=      dbz
@@ -13,11 +13,11 @@ HOMEPAGE=   http://fonts.tom7.com/
 COMMENT=       Divide By Zero TrueType fonts created by Tom Murphy 7
 LICENSE=       dbz-ttf-license
 
-RESTRICTED=    Resale prohibited.
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
+RESTRICTED=            Resale prohibited.
+NO_SRC_ON_CDROM=       ${RESTRICTED}
+NO_BIN_ON_CDROM=       ${RESTRICTED}
 
-DIST_SUBDIR=   ${PKGNAME_NOREV}
+DIST_SUBDIR=           ${PKGNAME_NOREV}
 EXTRACT_OPTS_ZIP=      -Laqo
 
 USE_X11=       YES

Index: pkgsrc/fonts/fntsample/Makefile
diff -u pkgsrc/fonts/fntsample/Makefile:1.34 pkgsrc/fonts/fntsample/Makefile:1.35
--- pkgsrc/fonts/fntsample/Makefile:1.34        Sun Aug 11 13:21:00 2019
+++ pkgsrc/fonts/fntsample/Makefile     Sat Nov  2 22:24:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/08/11 13:21:00 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/02 22:24:40 rillig Exp $
 #
 
 DISTNAME=      fntsample-5.2
@@ -7,8 +7,8 @@ CATEGORIES=     fonts
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=eugmes/}
 GITHUB_TAG=    release/${PKGVERSION_NOREV}
 
-BLOCKS_TXT=    Blocks-20190308.txt
-DISTFILES=     ${DEFAULT_DISTFILES} ${BLOCKS_TXT}
+BLOCKS_TXT=            Blocks-20190308.txt
+DISTFILES=             ${DEFAULT_DISTFILES} ${BLOCKS_TXT}
 SITES.${BLOCKS_TXT}=   -http://unicode.org/Public/UNIDATA/Blocks.txt
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/fonts/font-bh-ttf/Makefile
diff -u pkgsrc/fonts/font-bh-ttf/Makefile:1.9 pkgsrc/fonts/font-bh-ttf/Makefile:1.10
--- pkgsrc/fonts/font-bh-ttf/Makefile:1.9       Wed Oct  3 18:28:20 2012
+++ pkgsrc/fonts/font-bh-ttf/Makefile   Sat Nov  2 22:24:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/03 18:28:20 asau Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/02 22:24:40 rillig Exp $
 #
 
 DISTNAME=              font-bh-ttf-1.0.3
@@ -19,7 +19,7 @@ FONTS_DIRS.x11=               share/fonts/X11/TTF
 INSTALLATION_DIRS=     share/doc/font-bh-ttf
 
 PKG_SYSCONFSUBDIR=     fontconfig
-CONF_FILES=    ${PREFIX}/share/fontconfig/conf.avail/42-luxi-mono.conf \
+CONF_FILES=            ${PREFIX}/share/fontconfig/conf.avail/42-luxi-mono.conf \
                ${PKG_SYSCONFDIR}/conf.d/42-luxi-mono.conf
 
 post-install:

Index: pkgsrc/fonts/font-misc-ethiopic/Makefile
diff -u pkgsrc/fonts/font-misc-ethiopic/Makefile:1.3 pkgsrc/fonts/font-misc-ethiopic/Makefile:1.4
--- pkgsrc/fonts/font-misc-ethiopic/Makefile:1.3        Wed Oct  3 18:28:21 2012
+++ pkgsrc/fonts/font-misc-ethiopic/Makefile    Sat Nov  2 22:24:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/03 18:28:21 asau Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/02 22:24:40 rillig Exp $
 #
 
 DISTNAME=      font-misc-ethiopic-1.0.3
@@ -13,7 +13,7 @@ LICENSE=      mit
 
 GNU_CONFIGURE= yes
 
-FONTS_DIRS.ttf=        share/fonts/X11/OTF
-FONTS_DIRS.ttf+=share/fonts/X11/TTF
+FONTS_DIRS.ttf=                share/fonts/X11/OTF
+FONTS_DIRS.ttf+=       share/fonts/X11/TTF
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/fontconfig/Makefile
diff -u pkgsrc/fonts/fontconfig/Makefile:1.116 pkgsrc/fonts/fontconfig/Makefile:1.117
--- pkgsrc/fonts/fontconfig/Makefile:1.116      Tue Jul  9 15:46:10 2019
+++ pkgsrc/fonts/fontconfig/Makefile    Sat Nov  2 22:24:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2019/07/09 15:46:10 riastradh Exp $
+# $NetBSD: Makefile,v 1.117 2019/11/02 22:24:40 rillig Exp $
 
 DISTNAME=      fontconfig-2.13.1
 CATEGORIES=    fonts
@@ -50,12 +50,12 @@ ADDFONTS:=  ${LOCALBASE}/share/fonts/X11,
 .endif
 
 .if ${OPSYS} == "Darwin"
-ADDFONTS:=     ~/Library/Fonts,/Library/Fonts,/System/Library/Fonts,${ADDFONTS}
+ADDFONTS:=             ~/Library/Fonts,/Library/Fonts,/System/Library/Fonts,${ADDFONTS}
 CONFIGURE_ARGS+=       --with-arch=${MACHINE_ARCH}
 .endif
 CONFIGURE_ARGS+=       --with-add-fonts=${ADDFONTS}
 
-SUBST_CLASSES+= prefix
+SUBST_CLASSES+=                prefix
 SUBST_STAGE.prefix=    post-build
 SUBST_FILES.prefix=    conf.d/README
 SUBST_VARS.prefix=     PREFIX

Index: pkgsrc/fonts/fontconfig/builtin.mk
diff -u pkgsrc/fonts/fontconfig/builtin.mk:1.12 pkgsrc/fonts/fontconfig/builtin.mk:1.13
--- pkgsrc/fonts/fontconfig/builtin.mk:1.12     Fri Apr 26 15:05:14 2019
+++ pkgsrc/fonts/fontconfig/builtin.mk  Sat Nov  2 22:24:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2019/04/26 15:05:14 gavan Exp $
+# $NetBSD: builtin.mk,v 1.13 2019/11/02 22:24:40 rillig Exp $
 
 BUILTIN_PKG:=  fontconfig
 
@@ -19,7 +19,7 @@ IS_BUILTIN.fontconfig=        yes
 IS_BUILTIN.fontconfig= no
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.fontconfig
+MAKEVARS+=             IS_BUILTIN.fontconfig
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -36,7 +36,7 @@ BUILTIN_VERSION.fontconfig!=                                          \
                ${H_FONTCONFIG}
 BUILTIN_PKG.fontconfig=        fontconfig-${BUILTIN_VERSION.fontconfig}
 .endif
-MAKEVARS+=     BUILTIN_PKG.fontconfig
+MAKEVARS+=             BUILTIN_PKG.fontconfig
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -64,7 +64,7 @@ USE_BUILTIN.fontconfig!=                                              \
 .    endif
 .  endif  # PREFER.fontconfig
 .endif
-MAKEVARS+=     USE_BUILTIN.fontconfig
+MAKEVARS+=             USE_BUILTIN.fontconfig
 
 ###
 ### The section below only applies if we are not including this file

Index: pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile
diff -u pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile:1.26 pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile:1.27
--- pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile:1.26      Sun Jul 21 22:24:48 2019
+++ pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile   Sat Nov  2 22:24:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/07/21 22:24:48 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/02 22:24:40 rillig Exp $
 
 DISTNAME=      ghostscript-cidfonts-ryumin-${GS_VERSION}
 DISTFILES=     # empty
@@ -29,7 +29,7 @@ SUBST_VARS=   GCR_INSTALL_TYPE
 .if !empty(GS_CIDFMAP)
 SUBST_CLASSES+=                ttf_path
 SUBST_STAGE.ttf_path=  post-build
-SUBST_MESSAGE.ttf_path=Fixing ttf install directory in cidfmap
+SUBST_MESSAGE.ttf_path=        Fixing ttf install directory in cidfmap
 SUBST_FILES.ttf_path=  ${GS_CIDFMAP}
 SUBST_SED.ttf_path=    -e 's|%%PREFIX%%|${PREFIX}|'
 .endif
@@ -69,15 +69,15 @@ NO_CONFIGURE=       yes
 
 # Following logic is flaky, for looking at PKG_OPTIONS.gs_type now NOT at build time
 .if   !empty(PKG_BUILD_OPTIONS.ghostscript:Mghostscript-agpl)
-. include      "../../print/ghostscript-agpl/Makefile.common"
-. if empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mdisable-compile-inits)
+.  include     "../../print/ghostscript-agpl/Makefile.common"
+.  if empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mdisable-compile-inits)
 PKG_FAIL_REASON+=      '(agpl) You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.'
-. endif
+.  endif
 .else
-. include      "../../print/ghostscript-gpl/Makefile.common"
-. if empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mdisable-compile-inits)
+.  include     "../../print/ghostscript-gpl/Makefile.common"
+.  if empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mdisable-compile-inits)
 PKG_FAIL_REASON+=      '(gpl) You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.'
-. endif
+.  endif
 .endif
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/ghostscript-cidfonts-ryumin/options.mk
diff -u pkgsrc/fonts/ghostscript-cidfonts-ryumin/options.mk:1.2 pkgsrc/fonts/ghostscript-cidfonts-ryumin/options.mk:1.3
--- pkgsrc/fonts/ghostscript-cidfonts-ryumin/options.mk:1.2     Sat Jan 13 01:09:16 2018
+++ pkgsrc/fonts/ghostscript-cidfonts-ryumin/options.mk Sat Nov  2 22:24:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2018/01/13 01:09:16 ryoon Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/02 22:24:40 rillig Exp $
 
 # gcr = ghostscript-cidfonts-ryumin
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcr_type
@@ -11,31 +11,31 @@ PKG_SUGGESTED_OPTIONS=      adobe-cidfonts
 
 # -------- Adobe CID font requested -------------
 .if !empty(PKG_OPTIONS:Madobe-cidfonts)
-GS_CIDFMAP=    cidfmap-adobe
-DEPENDS+=      adobe-cidfonts-[0-9]*:../../fonts/adobe-cidfonts
-DEPENDS+=      ghostscript-cidfonts-[0-9]*:../../fonts/ghostscript-cidfonts
-GCR_INSTALL_TYPE= adobe
+GS_CIDFMAP=            cidfmap-adobe
+DEPENDS+=              adobe-cidfonts-[0-9]*:../../fonts/adobe-cidfonts
+DEPENDS+=              ghostscript-cidfonts-[0-9]*:../../fonts/ghostscript-cidfonts
+GCR_INSTALL_TYPE=      adobe
 .endif
 
 # -------- motoya-fonts (TTF) requested -------------
 .if !empty(PKG_OPTIONS:Mmotoya)
-GS_CIDFMAP=    cidfmap-motoya
-DEPENDS+=      motoya-fonts-[0-9]*:../../fonts/motoya-fonts
-GCR_INSTALL_TYPE= ttf
+GS_CIDFMAP=            cidfmap-motoya
+DEPENDS+=              motoya-fonts-[0-9]*:../../fonts/motoya-fonts
+GCR_INSTALL_TYPE=      ttf
 .endif
 
 # -------- umefont (TTF) requested -------------
 .if !empty(PKG_OPTIONS:Mumefont)
-GS_CIDFMAP=    cidfmap-umefont
-DEPENDS+=      umefont-ttf-[0-9]*:../../fonts/umefont-ttf
-GCR_INSTALL_TYPE= ttf
+GS_CIDFMAP=            cidfmap-umefont
+DEPENDS+=              umefont-ttf-[0-9]*:../../fonts/umefont-ttf
+GCR_INSTALL_TYPE=      ttf
 .endif
 
 # -------- IPA (TTF) font requested -------------
 .if !empty(PKG_OPTIONS:Mipa)
-GS_CIDFMAP=    cidfmap-ipa
-DEPENDS+=      ipafont-[0-9]*:../../fonts/ipafont
-GCR_INSTALL_TYPE= ttf
+GS_CIDFMAP=            cidfmap-ipa
+DEPENDS+=              ipafont-[0-9]*:../../fonts/ipafont
+GCR_INSTALL_TYPE=      ttf
 .endif
 
 # fonts/ja-sazanami-ttf/DESCR:Free Japanese TrueType font based on Wada lab. font (CLWFK) and

Index: pkgsrc/fonts/intlfonts/Makefile
diff -u pkgsrc/fonts/intlfonts/Makefile:1.34 pkgsrc/fonts/intlfonts/Makefile:1.35
--- pkgsrc/fonts/intlfonts/Makefile:1.34        Sun Jun  1 16:35:34 2014
+++ pkgsrc/fonts/intlfonts/Makefile     Sat Nov  2 22:24:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2014/06/01 16:35:34 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/02 22:24:41 rillig Exp $
 
 DISTNAME=      intlfonts-1.2.1
 PKGREVISION=   6
@@ -34,8 +34,8 @@ EXTRA_FONTS=  Chinese.BIG     \
 # Type1/TrueType fonts for Latin1, Thai and Vietnamese
 # XXX need "fonts.scale" for them
 #
-EXTRA_FONTS+=  Type1           \
-               TrueType
+EXTRA_FONTS+=          Type1           \
+                       TrueType
 CONFIGURE_ARGS+=       --with-type1 --with-truetype
 
 MISC_FILES=    README.split
@@ -43,9 +43,9 @@ MISC_FILES=   README.split
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 EXTRACT_ONLY=  ${FONT_SETS:=${EXTRACT_SUFX}}
 
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-fontdir=${FONTS_DIR} \
-               --enable-compress=gzip
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-fontdir=${FONTS_DIR} \
+                       --enable-compress=gzip
 INSTALL_MAKE_FLAGS+=   fontdir=${DESTDIR}${FONTS_DIR}
 
 FONTS_DIR=     ${PREFIX}/share/fonts/X11/intlfonts

Index: pkgsrc/fonts/ja-elisat/Makefile
diff -u pkgsrc/fonts/ja-elisat/Makefile:1.20 pkgsrc/fonts/ja-elisat/Makefile:1.21
--- pkgsrc/fonts/ja-elisat/Makefile:1.20        Wed Aug 16 20:45:36 2017
+++ pkgsrc/fonts/ja-elisat/Makefile     Sat Nov  2 22:24:41 2019
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2017/08/16 20:45:36 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/02 22:24:41 rillig Exp $
 
-DISTNAME=              elisat10
-PKGNAME=               ja-elisat-1.0
-PKGREVISION=           2
-CATEGORIES=            fonts x11 japanese
+DISTNAME=      elisat10
+PKGNAME=       ja-elisat-1.0
+PKGREVISION=   2
+CATEGORIES=    fonts x11 japanese
 MASTER_SITES=  ${MASTER_SITE_FREEBSD}
-MAINTAINER=            tech-pkg-ja%jp.NetBSD.org@localhost
-#HOMEPAGE=             http://www.tea.forus.or.jp/toshi/exhibition/elisat10.html
-COMMENT=               8x8 dots X11 bitmap font for JIS X 0208
-LICENSE=               no-commercial-use
+MAINTAINER=    tech-pkg-ja%jp.NetBSD.org@localhost
+#HOMEPAGE=     http://www.tea.forus.or.jp/toshi/exhibition/elisat10.html
+COMMENT=       8x8 dots X11 bitmap font for JIS X 0208
+LICENSE=       no-commercial-use
 
 WRKSRC=                        ${WRKDIR}
 DOCDIR=                        ${PREFIX}/share/doc/elisat

Index: pkgsrc/fonts/jisx0208fonts/Makefile
diff -u pkgsrc/fonts/jisx0208fonts/Makefile:1.33 pkgsrc/fonts/jisx0208fonts/Makefile:1.34
--- pkgsrc/fonts/jisx0208fonts/Makefile:1.33    Sat Apr 12 14:44:05 2008
+++ pkgsrc/fonts/jisx0208fonts/Makefile Sat Nov  2 22:24:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2008/04/12 14:44:05 taca Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/02 22:24:41 rillig Exp $
 #
 
 DISTNAME=      jisx0208fonts-200301316
@@ -14,8 +14,8 @@ META_PACKAGE= yes
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_NON_SQUARE?= NO
-USE_KANAME?= NO
+USE_NON_SQUARE?=       NO
+USE_KANAME?=           NO
 
 DEPENDS+=      ja-elisat>=1.0:../../fonts/ja-elisat
 DEPENDS+=      ja-kappa20>=0.394:../../fonts/ja-kappa20

Index: pkgsrc/fonts/ko-mizi/Makefile
diff -u pkgsrc/fonts/ko-mizi/Makefile:1.19 pkgsrc/fonts/ko-mizi/Makefile:1.20
--- pkgsrc/fonts/ko-mizi/Makefile:1.19  Sat Jul  4 16:18:32 2015
+++ pkgsrc/fonts/ko-mizi/Makefile       Sat Nov  2 22:24:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:32 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/02 22:24:41 rillig Exp $
 #
 
 DISTNAME=      xfntmizi-1.1-2.noarch
@@ -23,9 +23,9 @@ MAKE_ENV+=    FONTDIR=${FONTDIR:Q} GZIP_CMD
 MIZI_PCF=      mzgt16e.pcf mzgt16h1.pcf mzmj16h.pcf mzpg16h.pcf mzsm16h.pcf \
                mzgt16h.pcf mzmj16e.pcf mzpg16e.pcf mzsm16e.pcf
 
-FONTDIR=       ${PREFIX}/share/fonts/X11/local
-FONTS_DIRS.x11=        ${FONTDIR}
-INSTALLATION_DIRS+= ${FONTDIR}
+FONTDIR=               ${PREFIX}/share/fonts/X11/local
+FONTS_DIRS.x11=                ${FONTDIR}
+INSTALLATION_DIRS+=    ${FONTDIR}
 
 do-extract:
        ${MKDIR} ${WRKSRC}

Index: pkgsrc/fonts/libfontenc/builtin.mk
diff -u pkgsrc/fonts/libfontenc/builtin.mk:1.3 pkgsrc/fonts/libfontenc/builtin.mk:1.4
--- pkgsrc/fonts/libfontenc/builtin.mk:1.3      Mon Mar 10 11:05:51 2014
+++ pkgsrc/fonts/libfontenc/builtin.mk  Sat Nov  2 22:24:41 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:51 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/02 22:24:41 rillig Exp $
 
-BUILTIN_PKG:=  libfontenc
+BUILTIN_PKG:=                  libfontenc
 PKGCONFIG_FILE.libfontenc=     ${X11BASE}/lib/pkgconfig/fontenc.pc
 PKGCONFIG_FILE.libfontenc+=    ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/fontenc.pc
 

Index: pkgsrc/fonts/migu-ttf/Makefile
diff -u pkgsrc/fonts/migu-ttf/Makefile:1.9 pkgsrc/fonts/migu-ttf/Makefile:1.10
--- pkgsrc/fonts/migu-ttf/Makefile:1.9  Sat Jul  4 16:18:32 2015
+++ pkgsrc/fonts/migu-ttf/Makefile      Sat Nov  2 22:24:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/07/04 16:18:32 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/02 22:24:41 rillig Exp $
 #
 
 DISTNAME=      # empty
@@ -20,9 +20,9 @@ NO_BUILD=     yes
 
 VERSION=       20130617
 
-FONTDIR=       ${PREFIX}/share/fonts/X11/TTF
-FONTS_DIRS.ttf=        ${FONTDIR}
-DOCDIR=                ${PREFIX}/share/doc/${PKGBASE}
+FONTDIR=               ${PREFIX}/share/fonts/X11/TTF
+FONTS_DIRS.ttf=                ${FONTDIR}
+DOCDIR=                        ${PREFIX}/share/doc/${PKGBASE}
 INSTALLATION_DIRS=     ${FONTDIR} ${DOCDIR}
 
 INSTALL_FONTS= migu-1c-${VERSION}/migu-1c-bold.ttf \

Index: pkgsrc/fonts/mkfontalias/Makefile
diff -u pkgsrc/fonts/mkfontalias/Makefile:1.17 pkgsrc/fonts/mkfontalias/Makefile:1.18
--- pkgsrc/fonts/mkfontalias/Makefile:1.17      Thu Apr 25 07:32:54 2019
+++ pkgsrc/fonts/mkfontalias/Makefile   Sat Nov  2 22:24:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/04/25 07:32:54 maya Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/02 22:24:42 rillig Exp $
 #
 
 DISTNAME=      mkfontalias.py
@@ -16,7 +16,7 @@ WRKSRC=               ${WRKDIR}
 EXTRACT_ONLY=  # empty
 NO_BUILD=      yes
 
-REPLACE_PYTHON=        ${DISTNAME}
+REPLACE_PYTHON=                ${DISTNAME}
 INSTALLATION_DIRS=     bin
 
 do-extract:

Index: pkgsrc/fonts/monoid/Makefile
diff -u pkgsrc/fonts/monoid/Makefile:1.2 pkgsrc/fonts/monoid/Makefile:1.3
--- pkgsrc/fonts/monoid/Makefile:1.2    Sun Feb 11 15:48:05 2018
+++ pkgsrc/fonts/monoid/Makefile        Sat Nov  2 22:24:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/02/11 15:48:05 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/02 22:24:42 rillig Exp $
 
 PKGNAME=       monoid-0.61
 DISTNAME=      Monoid
@@ -13,10 +13,10 @@ LICENSE=    ofl-v1.1 OR mit
 
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 
-USE_LANGUAGES= # none
-WRKSRC=                ${WRKDIR}
-NO_BUILD=      yes
-FONTS_DIRS.ttf=        ${PREFIX}/share/fonts/X11/TTF
+USE_LANGUAGES=         # none
+WRKSRC=                        ${WRKDIR}
+NO_BUILD=              yes
+FONTS_DIRS.ttf=                ${PREFIX}/share/fonts/X11/TTF
 INSTALLATION_DIRS=     share/fonts/X11/TTF
 
 do-install:

Index: pkgsrc/fonts/mothanna-ttf/Makefile
diff -u pkgsrc/fonts/mothanna-ttf/Makefile:1.5 pkgsrc/fonts/mothanna-ttf/Makefile:1.6
--- pkgsrc/fonts/mothanna-ttf/Makefile:1.5      Mon Sep  4 05:47:37 2017
+++ pkgsrc/fonts/mothanna-ttf/Makefile  Sat Nov  2 22:24:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/09/04 05:47:37 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 22:24:42 rillig Exp $
 
 DISTNAME=      Mothanna-0.02
 PKGNAME=       ${DISTNAME:S/M/m/:S/-0.02//}-ttf-0.02
@@ -12,8 +12,8 @@ COMMENT=      Mothanna is a sans-serif like A
 
 USE_LANGUAGES= # none
 
-NO_CONFIGURE=          yes
-NO_BUILD=              yes
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
 USE_LANGUAGES= # none
 
 FONTS_DIRS.ttf=                share/fonts/X11/TTF

Index: pkgsrc/fonts/mozilla-fonts/Makefile
diff -u pkgsrc/fonts/mozilla-fonts/Makefile:1.11 pkgsrc/fonts/mozilla-fonts/Makefile:1.12
--- pkgsrc/fonts/mozilla-fonts/Makefile:1.11    Sun Jun  1 16:35:36 2014
+++ pkgsrc/fonts/mozilla-fonts/Makefile Sat Nov  2 22:24:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/06/01 16:35:36 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/02 22:24:42 rillig Exp $
 
 DISTNAME=      mozilla-fonts-1.0
 PKGREVISION=   4
@@ -9,7 +9,7 @@ MAINTAINER=     rxg%NetBSD.org@localhost
 #HOMEPAGE=     http://www.myrddin.demon.co.uk/dist/
 COMMENT=       Optimized fonts for Netscape/Mozilla
 
-USE_TOOLS+=    bdftopcf gzip
+USE_TOOLS+=            bdftopcf gzip
 FONTS_DIRS.x11+=       ${PREFIX}/share/fonts/X11/Mozilla
 REQD_DIRS+=            ${PREFIX}/share/fonts/X11/Mozilla
 

Index: pkgsrc/fonts/mplayer-fonts/Makefile
diff -u pkgsrc/fonts/mplayer-fonts/Makefile:1.10 pkgsrc/fonts/mplayer-fonts/Makefile:1.11
--- pkgsrc/fonts/mplayer-fonts/Makefile:1.10    Thu Jan 19 18:52:09 2017
+++ pkgsrc/fonts/mplayer-fonts/Makefile Sat Nov  2 22:24:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/01/19 18:52:09 agc Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/02 22:24:42 rillig Exp $
 
 DISTNAME=      mplayer-fonts-20030714
 PKGREVISION=   1
@@ -24,7 +24,7 @@ NO_CONFIGURE= YES
 
 USE_TOOLS+=    pax
 
-INSTALLATION_DIRS= share/mplayer/fonts
+INSTALLATION_DIRS=     share/mplayer/fonts
 
 do-install:
        for D in font-arial-cp1250 font-arial-iso-8859-1 \

Index: pkgsrc/fonts/oxygen-fonts/Makefile
diff -u pkgsrc/fonts/oxygen-fonts/Makefile:1.2 pkgsrc/fonts/oxygen-fonts/Makefile:1.3
--- pkgsrc/fonts/oxygen-fonts/Makefile:1.2      Mon May  9 10:36:55 2016
+++ pkgsrc/fonts/oxygen-fonts/Makefile  Sat Nov  2 22:24:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/05/09 10:36:55 markd Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/02 22:24:42 rillig Exp $
 
 DISTNAME=      oxygen-fonts-${PLASMAVER}
 CATEGORIES=    fonts kde
@@ -11,8 +11,8 @@ COMMENT=      The Oxygen font family
 LICENSE=       gnu-gpl-v3 AND ofl-v1.1
 
 PLASMAVER=     5.4.3
-BUILD_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
-BUILD_DEPENDS+= fontforge-[0-9]*:../../fonts/fontforge
+BUILD_DEPENDS+=        extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
+BUILD_DEPENDS+=        fontforge-[0-9]*:../../fonts/fontforge
 
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++

Index: pkgsrc/fonts/pixel-sagas-startrek/Makefile
diff -u pkgsrc/fonts/pixel-sagas-startrek/Makefile:1.5 pkgsrc/fonts/pixel-sagas-startrek/Makefile:1.6
--- pkgsrc/fonts/pixel-sagas-startrek/Makefile:1.5      Sun Sep  3 08:36:54 2017
+++ pkgsrc/fonts/pixel-sagas-startrek/Makefile  Sat Nov  2 22:24:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/09/03 08:36:54 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 22:24:42 rillig Exp $
 
 DISTNAME=      pixels-sagas-startrek-201404
 PKGREVISION=   1
@@ -24,14 +24,14 @@ RESTRICTED= License prohibits 3rd partie
 NO_BIN_ON_FTP= ${RESTRICTED}
 NO_SRC_ON_FTP= ${RESTRICTED}
 
-WRKSRC=                ${WRKDIR}
-OTFPATH=       share/fonts/X11/OTF
-TTFPATH=       share/fonts/X11/TTF
+WRKSRC=                        ${WRKDIR}
+OTFPATH=               share/fonts/X11/OTF
+TTFPATH=               share/fonts/X11/TTF
 FONTS_DIRS.otf+=       ${PREFIX}/${OTFPATH:Q}
 FONTS_DIRS.ttf+=       ${PREFIX}/${TTFPATH:Q}
 INSTALLATION_DIRS=     ${OTFPATH:Q} ${TTFPATH:Q}
-NO_CONFIGURE=  yes
-NO_BUILD=      yes
+NO_CONFIGURE=          yes
+NO_BUILD=              yes
 
 do-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.otf:Q}

Index: pkgsrc/fonts/py-TTFQuery/Makefile
diff -u pkgsrc/fonts/py-TTFQuery/Makefile:1.23 pkgsrc/fonts/py-TTFQuery/Makefile:1.24
--- pkgsrc/fonts/py-TTFQuery/Makefile:1.23      Mon Sep  2 13:20:19 2019
+++ pkgsrc/fonts/py-TTFQuery/Makefile   Sat Nov  2 22:24:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/09/02 13:20:19 adam Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/02 22:24:42 rillig Exp $
 
 DISTNAME=              TTFQuery-1.0.5
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=              modified-bsd
 
 DEPENDS+=              ${PYPKGPREFIX}-fonttools>=2.0b1:../../fonts/py-fonttools
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-fonttools
+PYTHON_VERSIONS_ACCEPTED=      27 # py-fonttools
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && for f in ttffamily ttffiles ttfgroups ttfmetadata; do \

Index: pkgsrc/fonts/ricty-ttf/Makefile
diff -u pkgsrc/fonts/ricty-ttf/Makefile:1.25 pkgsrc/fonts/ricty-ttf/Makefile:1.26
--- pkgsrc/fonts/ricty-ttf/Makefile:1.25        Tue Jul 30 05:46:40 2019
+++ pkgsrc/fonts/ricty-ttf/Makefile     Sat Nov  2 22:24:42 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2019/07/30 05:46:40 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/02 22:24:42 rillig Exp $
 
 DISTNAME=      Ricty-3.2.4
 PKGNAME=       ${DISTNAME:S/Ricty/ricty-ttf/}
-GITHUB_PROJECT=                Ricty
-GITHUB_TAG=             ${PKGVERSION_NOREV}
+GITHUB_PROJECT=        Ricty
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 CATEGORIES=    fonts japanese
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=yascentur/}
 

Index: pkgsrc/fonts/sourcecodepro-fonts/Makefile
diff -u pkgsrc/fonts/sourcecodepro-fonts/Makefile:1.8 pkgsrc/fonts/sourcecodepro-fonts/Makefile:1.9
--- pkgsrc/fonts/sourcecodepro-fonts/Makefile:1.8       Sun Apr 29 21:07:38 2018
+++ pkgsrc/fonts/sourcecodepro-fonts/Makefile   Sat Nov  2 22:24:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/04/29 21:07:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/02 22:24:43 rillig Exp $
 
 DISTNAME=      sourcecodepro-fonts-1.050
 PKGREVISION=   1
@@ -14,10 +14,10 @@ LICENSE=    ofl-v1.1
 
 WRKSRC=                ${WRKDIR}/source-code-pro-2.030R-ro-1.050R-it
 
-USE_LANGUAGES= # none
-NO_BUILD=      yes
-FONTSDIR=      ${PREFIX}/share/fonts/X11/TTF
-FONTS_DIRS.ttf=        ${FONTSDIR}
+USE_LANGUAGES=         # none
+NO_BUILD=              yes
+FONTSDIR=              ${PREFIX}/share/fonts/X11/TTF
+FONTS_DIRS.ttf=                ${FONTSDIR}
 INSTALLATION_DIRS=     share/fonts/X11/TTF
 
 do-install:

Index: pkgsrc/fonts/sourcesans-fonts/Makefile
diff -u pkgsrc/fonts/sourcesans-fonts/Makefile:1.8 pkgsrc/fonts/sourcesans-fonts/Makefile:1.9
--- pkgsrc/fonts/sourcesans-fonts/Makefile:1.8  Sun Apr 29 21:09:08 2018
+++ pkgsrc/fonts/sourcesans-fonts/Makefile      Sat Nov  2 22:24:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/04/29 21:09:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/02 22:24:43 rillig Exp $
 
 DISTNAME=      source-sans-pro-2.020R-ro-1.075R-it
 PKGNAME=       sourcesans-fonts-2.020
@@ -16,10 +16,10 @@ LICENSE=    ofl-v1.1
 
 WRKSRC=                ${WRKDIR}/${DISTNAME:S|/|-|}
 
-USE_LANGUAGES= # none
-NO_BUILD=      yes
-FONTSDIR=      ${PREFIX}/share/fonts/X11/TTF
-FONTS_DIRS.ttf=        ${FONTSDIR}
+USE_LANGUAGES=         # none
+NO_BUILD=              yes
+FONTSDIR=              ${PREFIX}/share/fonts/X11/TTF
+FONTS_DIRS.ttf=                ${FONTSDIR}
 INSTALLATION_DIRS=     share/fonts/X11/TTF
 
 do-install:

Index: pkgsrc/fonts/t1lib/Makefile
diff -u pkgsrc/fonts/t1lib/Makefile:1.53 pkgsrc/fonts/t1lib/Makefile:1.54
--- pkgsrc/fonts/t1lib/Makefile:1.53    Thu May 23 19:23:01 2019
+++ pkgsrc/fonts/t1lib/Makefile Sat Nov  2 22:24:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2019/05/23 19:23:01 rillig Exp $
+# $NetBSD: Makefile,v 1.54 2019/11/02 22:24:43 rillig Exp $
 
 DISTNAME=      t1lib-5.1.2
 PKGREVISION=   6
@@ -29,7 +29,7 @@ INSTALLATION_DIRS=    ${EGDIR} ${DATADIR} s
 PLIST_VARS+=   x11
 
 .if !empty(PKG_OPTIONS:Mx11)
-PLIST.x11=     yes
+PLIST.x11=             yes
 .else
 CONFIGURE_ARGS+=       --without-x
 .endif

Index: pkgsrc/fonts/t1lib/options.mk
diff -u pkgsrc/fonts/t1lib/options.mk:1.2 pkgsrc/fonts/t1lib/options.mk:1.3
--- pkgsrc/fonts/t1lib/options.mk:1.2   Tue Nov 29 17:55:07 2011
+++ pkgsrc/fonts/t1lib/options.mk       Sat Nov  2 22:24:43 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2011/11/29 17:55:07 drochner Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/02 22:24:43 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.t1lib
-PKG_SUPPORTED_OPTIONS+= x11
-PKG_SUGGESTED_OPTIONS+= x11
+PKG_SUPPORTED_OPTIONS+=        x11
+PKG_SUGGESTED_OPTIONS+=        x11
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/fonts/tex-concrete-doc/Makefile
diff -u pkgsrc/fonts/tex-concrete-doc/Makefile:1.1 pkgsrc/fonts/tex-concrete-doc/Makefile:1.2
--- pkgsrc/fonts/tex-concrete-doc/Makefile:1.1  Tue May  5 14:52:05 2015
+++ pkgsrc/fonts/tex-concrete-doc/Makefile      Sat Nov  2 22:24:43 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/05/05 14:52:05 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 22:24:43 rillig Exp $
 
 DISTNAME=      concrete.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2014
 TEXLIVE_REV=   15878
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=       http://ctan.org/pkg/concrete
+HOMEPAGE=      http://ctan.org/pkg/concrete
 COMMENT=       Documentation for tex-concrete
 # LICENSE=     knuth
 

Index: pkgsrc/fonts/tex-gnu-freefont-doc/Makefile
diff -u pkgsrc/fonts/tex-gnu-freefont-doc/Makefile:1.1 pkgsrc/fonts/tex-gnu-freefont-doc/Makefile:1.2
--- pkgsrc/fonts/tex-gnu-freefont-doc/Makefile:1.1      Fri May  8 11:27:44 2015
+++ pkgsrc/fonts/tex-gnu-freefont-doc/Makefile  Sat Nov  2 22:24:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/05/08 11:27:44 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 22:24:43 rillig Exp $
 
 DISTNAME=      gnu-freefont.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2014
@@ -34,7 +34,7 @@ REPLACE_PERL+=                doc/fonts/gnu-freefont/t
 #REPLACE_PYTHON+=      doc/fonts/gnu-freefont/tools/utility/metafont/bulk_eps_import.py
 #REPLACE_PYTHON+=      doc/fonts/gnu-freefont/tools/utility/special-purpose/makeBraille.py
 
-CHECK_INTERPRETER_SKIP+=       share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/CheckConformance.pl
+CHECK_INTERPRETER_SKIP+=       share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/CheckConformance.pl
 CHECK_INTERPRETER_SKIP+=       share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/mes-list-expand.pl
 CHECK_INTERPRETER_SKIP+=       share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/KerningNumerals.pl
 CHECK_INTERPRETER_SKIP+=       share/texmf-dist/doc/fonts/gnu-freefont/tools/generate/buildutils.py

Index: pkgsrc/fonts/tex-gothic-doc/Makefile
diff -u pkgsrc/fonts/tex-gothic-doc/Makefile:1.3 pkgsrc/fonts/tex-gothic-doc/Makefile:1.4
--- pkgsrc/fonts/tex-gothic-doc/Makefile:1.3    Fri Feb  1 22:16:43 2019
+++ pkgsrc/fonts/tex-gothic-doc/Makefile        Sat Nov  2 22:24:43 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2019/02/01 22:16:43 markd Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/02 22:24:43 rillig Exp $
 
 DISTNAME=      gothic.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2018
 TEXLIVE_REV=   49869
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=       http://ctan.org/pkg/gothic
+HOMEPAGE=      http://ctan.org/pkg/gothic
 COMMENT=       Documentation for tex-gothic
 # LICENSE=     collection
 

Index: pkgsrc/fonts/tex-luaotfload/Makefile
diff -u pkgsrc/fonts/tex-luaotfload/Makefile:1.8 pkgsrc/fonts/tex-luaotfload/Makefile:1.9
--- pkgsrc/fonts/tex-luaotfload/Makefile:1.8    Sun Aug 11 05:40:19 2019
+++ pkgsrc/fonts/tex-luaotfload/Makefile        Sat Nov  2 22:24:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/08/11 05:40:19 markd Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/02 22:24:43 rillig Exp $
 
 DISTNAME=      luaotfload
 PKGNAME=       tex-${DISTNAME}-2.98
@@ -13,7 +13,7 @@ DEPENDS+=     tex-lualibs-[0-9]*:../../devel
 DEPENDS+=      tex-luatexbase-[0-9]*:../../devel/tex-luatexbase
 
 CHECK_INTERPRETER_SKIP=        share/texmf-dist/scripts/luaotfload/*
-TEX_TEXMF_DIRS=        ${PREFIX}/share/texmf-dist
+TEX_TEXMF_DIRS=                ${PREFIX}/share/texmf-dist
 
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-mathdesign/Makefile
diff -u pkgsrc/fonts/tex-mathdesign/Makefile:1.1 pkgsrc/fonts/tex-mathdesign/Makefile:1.2
--- pkgsrc/fonts/tex-mathdesign/Makefile:1.1    Wed Dec  4 17:53:35 2013
+++ pkgsrc/fonts/tex-mathdesign/Makefile        Sat Nov  2 22:24:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/12/04 17:53:35 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 22:24:43 rillig Exp $
 
 DISTNAME=      mathdesign
 PKGNAME=       tex-${DISTNAME}-2.31
@@ -13,10 +13,10 @@ DEPENDS+=   tex-latex-[0-9]*:../../print/t
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=      tex-xkeyval-[0-9]*:../../print/tex-xkeyval
 
-TEX_MAP_FILES+= mdbch.map
-TEX_MAP_FILES+= mdgreek.map
-TEX_MAP_FILES+= mdici.map
-TEX_MAP_FILES+= mdpgd.map
+TEX_MAP_FILES+=        mdbch.map
+TEX_MAP_FILES+=        mdgreek.map
+TEX_MAP_FILES+=        mdici.map
+TEX_MAP_FILES+=        mdpgd.map
 TEX_MAP_FILES+=        mdpus.map
 TEX_MAP_FILES+=        mdput.map
 TEX_MAP_FILES+=        mdugm.map

Index: pkgsrc/fonts/thaixfonts/Makefile
diff -u pkgsrc/fonts/thaixfonts/Makefile:1.12 pkgsrc/fonts/thaixfonts/Makefile:1.13
--- pkgsrc/fonts/thaixfonts/Makefile:1.12       Wed Sep  6 09:03:01 2017
+++ pkgsrc/fonts/thaixfonts/Makefile    Sat Nov  2 22:24:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/09/06 09:03:01 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 22:24:43 rillig Exp $
 #
 
 DISTNAME=      thaixfonts-1.2.7
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=      --with-fontdir=${FONTDI
 
 FONTDIR=               ${PREFIX}/share/fonts/X11/thaixfonts
 FONTS_DIRS.x11+=       ${FONTDIR}
-INSTALLATION_DIRS=             ${FONTDIR}
+INSTALLATION_DIRS=     ${FONTDIR}
 
 post-install:
        cp -p ${DESTDIR}${FONTDIR}/thai.alias ${DESTDIR}${FONTDIR}/fonts.alias

Index: pkgsrc/fonts/urw-fonts/Makefile
diff -u pkgsrc/fonts/urw-fonts/Makefile:1.6 pkgsrc/fonts/urw-fonts/Makefile:1.7
--- pkgsrc/fonts/urw-fonts/Makefile:1.6 Wed Jul 19 04:01:58 2017
+++ pkgsrc/fonts/urw-fonts/Makefile     Sat Nov  2 22:24:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/07/19 04:01:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/02 22:24:44 rillig Exp $
 
 DISTNAME=      urw-fonts-2.0
 PKGREVISION=   1
@@ -13,22 +13,22 @@ LICENSE=    gnu-gpl-v2
 
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 
-URW_DINGBATS=  urw-dingbats.tar.bz2
+URW_DINGBATS=          urw-dingbats.tar.bz2
 SITES.${URW_DINGBATS}= http://pkgs.fedoraproject.org/repo/pkgs/urw-fonts/urw-dingbats.tar.bz2/5115d797f66c7414a08b5300aae64273/
 
-URW_SYMBOL=    urw-symbol.tar.bz2
+URW_SYMBOL=            urw-symbol.tar.bz2
 SITES.${URW_SYMBOL}=   http://pkgs.fedoraproject.org/repo/pkgs/urw-fonts/urw-symbol.tar.bz2/efb9216f950612419874f37b63d80ae3/
 
-#URW_TWEAKS=   urw-tweaks.tar.bz2
+#URW_TWEAKS=           urw-tweaks.tar.bz2
 #SITES.${URW_TWEAKS}=  http://pkgs.fedoraproject.org/repo/pkgs/urw-fonts/urw-tweaks.tar.bz2/bf5a7e18737c3a8152f4f0c3aa6fa8fa/
 
 DISTFILES=     ${DEFAULT_DISTFILES} ${URW_DINGBATS} ${URW_SYMBOL} #${URW_TWEAKS}
 
-WRKSRC=                ${WRKDIR}/fonts
-USE_LANGUAGES= # none
-NO_BUILD=      yes
-FONTS_DIR=     ${PREFIX}/share/fonts/urw
-INSTALLATION_DIRS= share/fonts/urw
+WRKSRC=                        ${WRKDIR}/fonts
+USE_LANGUAGES=         # none
+NO_BUILD=              yes
+FONTS_DIR=             ${PREFIX}/share/fonts/urw
+INSTALLATION_DIRS=     share/fonts/urw
 
 do-install:
        for dir in ${WRKSRC} ${WRKDIR}; \



Home | Main Index | Thread Index | Old Index