pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/fonts fonts: align variable assignments



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f9f1a1b405b
branches:  trunk
changeset: 343351:3f9f1a1b405b
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Nov 02 22:24:37 2019 +0000

description:
fonts: align variable assignments

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

No manual corrections.

diffstat:

 fonts/AnonymousPro/Makefile                  |   4 ++--
 fonts/CamingoCode/Makefile                   |   4 ++--
 fonts/Code-New-Roman/Makefile                |  12 ++++++------
 fonts/CutiveFont/Makefile                    |  12 ++++++------
 fonts/EB-Garamond/Makefile                   |   8 ++++----
 fonts/FiraCode/Makefile                      |  10 +++++-----
 fonts/Hasklig/Makefile                       |  10 +++++-----
 fonts/Merriweather-ttf/Makefile              |  12 ++++++------
 fonts/Office-Code-Pro/Makefile               |   6 +++---
 fonts/Xft2/Makefile                          |   4 ++--
 fonts/Xft2/builtin.mk                        |   8 ++++----
 fonts/adobe-cmaps/Makefile                   |   8 ++++----
 fonts/aegyptus-ttf/Makefile                  |   4 ++--
 fonts/chkfontpath/Makefile                   |   8 ++++----
 fonts/courier-prime/Makefile                 |   4 ++--
 fonts/cyberbit-ttf/Makefile.common           |  14 +++++++-------
 fonts/cyr-rfx-bulgarian-mik/Makefile         |   6 +++---
 fonts/cyr-rfx-ibm-cp866/Makefile             |   6 +++---
 fonts/cyr-rfx-iso10646_0400/Makefile         |   8 ++++----
 fonts/cyr-rfx-iso8859_15/Makefile            |   8 ++++----
 fonts/cyr-rfx-iso8859_5/Makefile             |   8 ++++----
 fonts/cyr-rfx-koi8-o/Makefile                |   6 +++---
 fonts/cyr-rfx-koi8-ru/Makefile               |   6 +++---
 fonts/cyr-rfx-koi8-ub/Makefile               |   6 +++---
 fonts/cyr-rfx-koi8_1/Makefile                |   8 ++++----
 fonts/cyr-rfx-mac-cyrillic/Makefile          |   6 +++---
 fonts/cyr-rfx-windows_1251/Makefile          |   8 ++++----
 fonts/cyr-rfx-winlatin_1/Makefile            |   8 ++++----
 fonts/dbz-ttf/Makefile                       |  10 +++++-----
 fonts/fntsample/Makefile                     |   6 +++---
 fonts/font-bh-ttf/Makefile                   |   4 ++--
 fonts/font-misc-ethiopic/Makefile            |   6 +++---
 fonts/fontconfig/Makefile                    |   6 +++---
 fonts/fontconfig/builtin.mk                  |   8 ++++----
 fonts/ghostscript-cidfonts-ryumin/Makefile   |  16 ++++++++--------
 fonts/ghostscript-cidfonts-ryumin/options.mk |  28 ++++++++++++++--------------
 fonts/intlfonts/Makefile                     |  12 ++++++------
 fonts/ja-elisat/Makefile                     |  18 +++++++++---------
 fonts/jisx0208fonts/Makefile                 |   6 +++---
 fonts/ko-mizi/Makefile                       |   8 ++++----
 fonts/libfontenc/builtin.mk                  |   4 ++--
 fonts/migu-ttf/Makefile                      |   8 ++++----
 fonts/mkfontalias/Makefile                   |   4 ++--
 fonts/monoid/Makefile                        |  10 +++++-----
 fonts/mothanna-ttf/Makefile                  |   6 +++---
 fonts/mozilla-fonts/Makefile                 |   4 ++--
 fonts/mplayer-fonts/Makefile                 |   4 ++--
 fonts/oxygen-fonts/Makefile                  |   6 +++---
 fonts/pixel-sagas-startrek/Makefile          |  12 ++++++------
 fonts/py-TTFQuery/Makefile                   |   4 ++--
 fonts/ricty-ttf/Makefile                     |   6 +++---
 fonts/sourcecodepro-fonts/Makefile           |  10 +++++-----
 fonts/sourcesans-fonts/Makefile              |  10 +++++-----
 fonts/t1lib/Makefile                         |   4 ++--
 fonts/t1lib/options.mk                       |   6 +++---
 fonts/tex-concrete-doc/Makefile              |   4 ++--
 fonts/tex-gnu-freefont-doc/Makefile          |   4 ++--
 fonts/tex-gothic-doc/Makefile                |   4 ++--
 fonts/tex-luaotfload/Makefile                |   4 ++--
 fonts/tex-mathdesign/Makefile                |  10 +++++-----
 fonts/thaixfonts/Makefile                    |   4 ++--
 fonts/urw-fonts/Makefile                     |  18 +++++++++---------
 62 files changed, 243 insertions(+), 243 deletions(-)

diffs (truncated from 1325 to 300 lines):

diff -r 353310c3802d -r 3f9f1a1b405b fonts/AnonymousPro/Makefile
--- a/fonts/AnonymousPro/Makefile       Sat Nov 02 22:18:22 2019 +0000
+++ b/fonts/AnonymousPro/Makefile       Sat Nov 02 22:24:37 2019 +0000
@@ -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 @@
                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 \
diff -r 353310c3802d -r 3f9f1a1b405b fonts/CamingoCode/Makefile
--- a/fonts/CamingoCode/Makefile        Sat Nov 02 22:18:22 2019 +0000
+++ b/fonts/CamingoCode/Makefile        Sat Nov 02 22:24:37 2019 +0000
@@ -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 @@
 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:
diff -r 353310c3802d -r 3f9f1a1b405b fonts/Code-New-Roman/Makefile
--- a/fonts/Code-New-Roman/Makefile     Sat Nov 02 22:18:22 2019 +0000
+++ b/fonts/Code-New-Roman/Makefile     Sat Nov 02 22:24:37 2019 +0000
@@ -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 @@
 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:
diff -r 353310c3802d -r 3f9f1a1b405b fonts/CutiveFont/Makefile
--- a/fonts/CutiveFont/Makefile Sat Nov 02 22:18:22 2019 +0000
+++ b/fonts/CutiveFont/Makefile Sat Nov 02 22:24:37 2019 +0000
@@ -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 @@
 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:
diff -r 353310c3802d -r 3f9f1a1b405b fonts/EB-Garamond/Makefile
--- a/fonts/EB-Garamond/Makefile        Sat Nov 02 22:18:22 2019 +0000
+++ b/fonts/EB-Garamond/Makefile        Sat Nov 02 22:24:37 2019 +0000
@@ -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 @@
 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}
diff -r 353310c3802d -r 3f9f1a1b405b fonts/FiraCode/Makefile
--- a/fonts/FiraCode/Makefile   Sat Nov 02 22:18:22 2019 +0000
+++ b/fonts/FiraCode/Makefile   Sat Nov 02 22:24:37 2019 +0000
@@ -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 @@
 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
diff -r 353310c3802d -r 3f9f1a1b405b fonts/Hasklig/Makefile
--- a/fonts/Hasklig/Makefile    Sat Nov 02 22:18:22 2019 +0000
+++ b/fonts/Hasklig/Makefile    Sat Nov 02 22:24:37 2019 +0000
@@ -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 @@
 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:
diff -r 353310c3802d -r 3f9f1a1b405b fonts/Merriweather-ttf/Makefile
--- a/fonts/Merriweather-ttf/Makefile   Sat Nov 02 22:18:22 2019 +0000
+++ b/fonts/Merriweather-ttf/Makefile   Sat Nov 02 22:24:37 2019 +0000
@@ -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/
diff -r 353310c3802d -r 3f9f1a1b405b fonts/Office-Code-Pro/Makefile
--- a/fonts/Office-Code-Pro/Makefile    Sat Nov 02 22:18:22 2019 +0000
+++ b/fonts/Office-Code-Pro/Makefile    Sat Nov 02 22:24:37 2019 +0000
@@ -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 @@
 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
 
diff -r 353310c3802d -r 3f9f1a1b405b fonts/Xft2/Makefile
--- a/fonts/Xft2/Makefile       Sat Nov 02 22:18:22 2019 +0000
+++ b/fonts/Xft2/Makefile       Sat Nov 02 22:24:37 2019 +0000
@@ -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 @@
 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"
diff -r 353310c3802d -r 3f9f1a1b405b fonts/Xft2/builtin.mk
--- a/fonts/Xft2/builtin.mk     Sat Nov 02 22:18:22 2019 +0000
+++ b/fonts/Xft2/builtin.mk     Sat Nov 02 22:24:37 2019 +0000
@@ -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=       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 @@
                ${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 @@
 .    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
diff -r 353310c3802d -r 3f9f1a1b405b fonts/adobe-cmaps/Makefile
--- a/fonts/adobe-cmaps/Makefile        Sat Nov 02 22:18:22 2019 +0000
+++ b/fonts/adobe-cmaps/Makefile        Sat Nov 02 22:24:37 2019 +0000
@@ -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 @@
 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/
diff -r 353310c3802d -r 3f9f1a1b405b fonts/aegyptus-ttf/Makefile
--- a/fonts/aegyptus-ttf/Makefile       Sat Nov 02 22:18:22 2019 +0000
+++ b/fonts/aegyptus-ttf/Makefile       Sat Nov 02 22:24:37 2019 +0000
@@ -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/



Home | Main Index | Thread Index | Old Index