diff options
| author | rillig <rillig> | 2005-12-05 20:49:47 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-12-05 20:49:47 +0000 |
| commit | b4f920543059af038598712771c3211999ef42a6 (patch) | |
| tree | dac5b1dd14794d86b061d26b9503adb2552ed3f8 /fonts | |
| parent | 5bf026ec112f405b514a2d69a72e10fa92c4c524 (diff) | |
| download | pkgsrc-b4f920543059af038598712771c3211999ef42a6.tar.gz | |
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in
http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Diffstat (limited to 'fonts')
31 files changed, 73 insertions, 77 deletions
diff --git a/fonts/XFree86-fontsEncodings/Makefile b/fonts/XFree86-fontsEncodings/Makefile index e6cc29cbae2..1ab59c20aa1 100644 --- a/fonts/XFree86-fontsEncodings/Makefile +++ b/fonts/XFree86-fontsEncodings/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/09/28 20:52:21 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:13 rillig Exp $ DISTNAME= XFree86-${XF_VER}-src-4 PKGNAME= XFree86-fontsEncodings-${XF_VER} @@ -11,7 +11,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.xfree86.org/ COMMENT= XFree86 Encoding fonts -BUILD_DEPENDS= XFree86-clients>=${XF_VER}:../../x11/XFree86-clients +BUILD_DEPENDS+= XFree86-clients>=${XF_VER}:../../x11/XFree86-clients NO_XFREE86_TARGETS= yes WRKSRC= ${WRKDIR}/xc/fonts/encodings diff --git a/fonts/XFree86-fontsScalable/Makefile b/fonts/XFree86-fontsScalable/Makefile index 48622ac6279..dd066242975 100644 --- a/fonts/XFree86-fontsScalable/Makefile +++ b/fonts/XFree86-fontsScalable/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/09/28 20:52:21 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:13 rillig Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-fontsScalable-${XF_VER} @@ -22,7 +22,6 @@ do-install: .for fnt in ${FONT_TYPES} ${INSTALL_DATA_DIR} ${X11ROOT}/lib/X11/fonts/${fnt} .endfor -.undef fnt ${INSTALL_DATA} ${WRKDIR}/xc/fonts/scaled/Speedo/font0*.spd \ ${X11ROOT}/lib/X11/fonts/Speedo ${INSTALL_DATA} ${WRKDIR}/xc/fonts/scaled/Speedo/COPYRIGHT \ @@ -35,13 +34,11 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/xc/fonts/scaled/Type1/*.${f} \ ${X11ROOT}/lib/X11/fonts/Type1 .endfor -.undef f # because fonts.mk does not do this yet .for fnt in ${FONT_TYPES} ${X11ROOT}/bin/mkfontscale ${X11ROOT}/lib/X11/fonts/${fnt} ${X11ROOT}/bin/mkfontdir ${X11ROOT}/lib/X11/fonts/${fnt} .endfor -.undef fnt ${X11ROOT}/bin/mkfontdir -e ${X11ROOT}/lib/X11/fonts/encodings \ -e ${X11ROOT}/lib/X11/fonts/encodings/large \ ${X11ROOT}/lib/X11/fonts/Speedo \ diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile index deddbcfa720..2fcfdc4e965 100644 --- a/fonts/Xft2/Makefile +++ b/fonts/Xft2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/10/15 16:55:32 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:13 rillig Exp $ DISTNAME= libXft-2.1.7 PKGNAME= Xft2-2.1.7 @@ -17,7 +17,7 @@ USE_LIBTOOL= YES USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE= xft.pc.in -MAKE_ENV+= EGREP="${EGREP}" +MAKE_ENV+= EGREP=${EGREP:Q} BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8.2 BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.2 diff --git a/fonts/acroread-chsfont/Makefile b/fonts/acroread-chsfont/Makefile index 456eb9002ab..f45a2f992e5 100644 --- a/fonts/acroread-chsfont/Makefile +++ b/fonts/acroread-chsfont/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:13 rillig Exp $ # DISTNAME= chsfont @@ -12,4 +12,4 @@ DEPENDS+= acroread-font-share-4.0:../../fonts/acroread-font-share WRKSRC= ${WRKDIR}/CHSKIT TAR_FILE= ${WRKSRC}/LANGCHS.TAR -.include "../acroread-font-share/Makefile.common" +.include "../../fonts/acroread-font-share/Makefile.common" diff --git a/fonts/acroread-chtfont/Makefile b/fonts/acroread-chtfont/Makefile index 6cbaec1f3a5..b340f0328b7 100644 --- a/fonts/acroread-chtfont/Makefile +++ b/fonts/acroread-chtfont/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:13 rillig Exp $ # DISTNAME= chtfont @@ -12,4 +12,4 @@ DEPENDS+= acroread-font-share-4.0:../../fonts/acroread-font-share WRKSRC= ${WRKDIR}/CHTKIT TAR_FILE= ${WRKSRC}/LANGCHT.TAR -.include "../acroread-font-share/Makefile.common" +.include "../../fonts/acroread-font-share/Makefile.common" diff --git a/fonts/acroread-font-share/Makefile b/fonts/acroread-font-share/Makefile index 3ebf65c90d4..4709343d7d4 100644 --- a/fonts/acroread-font-share/Makefile +++ b/fonts/acroread-font-share/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:13 rillig Exp $ # DISTNAME= font-share @@ -11,9 +11,9 @@ COMMENT= Asian Font Packs for Acrobat Reader 4.0 (common base) WRKSRC= ${WRKDIR}/KORKIT TAR_FILE= ${WRKSRC}/LANGCOM.TAR -PLIST_SUBST+= MKDIR="${MKDIR}" CHOWN="${CHOWN}" CHMOD="${CHMOD}" \ - SHAREOWN="${SHAREOWN}" SHAREGRP="${SHAREGRP}" \ - SHAREMODE="${SHAREMODE}" +PLIST_SUBST+= MKDIR=${MKDIR:Q} CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} \ + SHAREOWN=${SHAREOWN:Q} SHAREGRP=${SHAREGRP:Q} \ + SHAREMODE=${SHAREMODE:Q} pre-install: @${INSTALL_DATA_DIR} ${PREFIX}/Acrobat4/Resource diff --git a/fonts/acroread-jpnfont/Makefile b/fonts/acroread-jpnfont/Makefile index c6943f7428f..0caf519802d 100644 --- a/fonts/acroread-jpnfont/Makefile +++ b/fonts/acroread-jpnfont/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:16 agc Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:13 rillig Exp $ # DISTNAME= jpnfont @@ -23,4 +23,4 @@ _FETCH_MESSAGE= \ ${ECHO} " http://www.adobe.com/prodindex/acrobat/readstep.html"; \ ${ECHO} "=======================================================" -.include "../acroread-font-share/Makefile.common" +.include "../../fonts/acroread-font-share/Makefile.common" diff --git a/fonts/acroread-korfont/Makefile b/fonts/acroread-korfont/Makefile index f03528c1103..b6ab6da37ec 100644 --- a/fonts/acroread-korfont/Makefile +++ b/fonts/acroread-korfont/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:13 rillig Exp $ # DISTNAME= korfont @@ -12,4 +12,4 @@ DEPENDS+= acroread-font-share-4.0:../../fonts/acroread-font-share WRKSRC= ${WRKDIR}/KORKIT TAR_FILE= ${WRKSRC}/LANGKOR.TAR -.include "../acroread-font-share/Makefile.common" +.include "../../fonts/acroread-font-share/Makefile.common" diff --git a/fonts/acroread5-chsfont/Makefile b/fonts/acroread5-chsfont/Makefile index 9e49c8b6f88..615e966c23d 100644 --- a/fonts/acroread5-chsfont/Makefile +++ b/fonts/acroread5-chsfont/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:13 rillig Exp $ # DISTNAME= chsfont @@ -12,4 +12,4 @@ DEPENDS+= acroread5-font-share-5.0:../../fonts/acroread5-font-share WRKSRC= ${WRKDIR}/CHSKIT TAR_FILE= ${WRKSRC}/LANGCHS.TAR -.include "../acroread5-font-share/Makefile.common" +.include "../../fonts/acroread5-font-share/Makefile.common" diff --git a/fonts/acroread5-chtfont/Makefile b/fonts/acroread5-chtfont/Makefile index 4aaf3aad1b8..9a5c8df8474 100644 --- a/fonts/acroread5-chtfont/Makefile +++ b/fonts/acroread5-chtfont/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/02/21 07:00:57 snj Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:13 rillig Exp $ # DISTNAME= chtfont @@ -12,4 +12,4 @@ DEPENDS+= acroread5-font-share-5.0:../../fonts/acroread5-font-share WRKSRC= ${WRKDIR}/CHTKIT TAR_FILE= ${WRKSRC}/LANGCHT.TAR -.include "../acroread5-font-share/Makefile.common" +.include "../../fonts/acroread5-font-share/Makefile.common" diff --git a/fonts/acroread5-font-share/Makefile b/fonts/acroread5-font-share/Makefile index 5f5429d0822..befb2378559 100644 --- a/fonts/acroread5-font-share/Makefile +++ b/fonts/acroread5-font-share/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:13 rillig Exp $ # DISTNAME= font-share @@ -11,8 +11,8 @@ COMMENT= Asian Font Packs for Acrobat Reader 5 (common base) WRKSRC= ${WRKDIR}/KORKIT TAR_FILE= ${WRKSRC}/LANGCOM.TAR -PLIST_SUBST+= MKDIR="${MKDIR}" CHOWN="${CHOWN}" CHMOD="${CHMOD}" \ - SHAREOWN="${SHAREOWN}" SHAREGRP="${SHAREGRP}" \ - SHAREMODE="${SHAREMODE}" +PLIST_SUBST+= MKDIR=${MKDIR:Q} CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} \ + SHAREOWN=${SHAREOWN:Q} SHAREGRP=${SHAREGRP:Q} \ + SHAREMODE=${SHAREMODE:Q} .include "./Makefile.common" diff --git a/fonts/acroread5-jpnfont/Makefile b/fonts/acroread5-jpnfont/Makefile index d09eee0f78e..c6836e0134f 100644 --- a/fonts/acroread5-jpnfont/Makefile +++ b/fonts/acroread5-jpnfont/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:14 rillig Exp $ # DISTNAME= jpnfont @@ -12,4 +12,4 @@ DEPENDS+= acroread5-font-share-5.0:../../fonts/acroread5-font-share WRKSRC= ${WRKDIR}/JPNKIT TAR_FILE= ${WRKSRC}/LANGJPN.TAR -.include "../acroread5-font-share/Makefile.common" +.include "../../fonts/acroread5-font-share/Makefile.common" diff --git a/fonts/acroread5-korfont/Makefile b/fonts/acroread5-korfont/Makefile index 0c69eed6643..e4b28de6193 100644 --- a/fonts/acroread5-korfont/Makefile +++ b/fonts/acroread5-korfont/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:17 agc Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:14 rillig Exp $ # DISTNAME= korfont @@ -12,4 +12,4 @@ DEPENDS+= acroread5-font-share-5.0:../../fonts/acroread5-font-share WRKSRC= ${WRKDIR}/KORKIT TAR_FILE= ${WRKSRC}/LANGKOR.TAR -.include "../acroread5-font-share/Makefile.common" +.include "../../fonts/acroread5-font-share/Makefile.common" diff --git a/fonts/chkfontpath/Makefile b/fonts/chkfontpath/Makefile index ce2e488ca54..3bef15603d4 100644 --- a/fonts/chkfontpath/Makefile +++ b/fonts/chkfontpath/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:49 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:14 rillig Exp $ # DISTNAME= chkfontpath-1.9.7 @@ -12,7 +12,7 @@ COMMENT= Command line tool to manage X server's font path BUILD_DEPENDS+= rpm2cpio>=1.1:../../converters/rpm2cpio -MAKE_ENV+= VERSION=${PKGVERSION} +MAKE_ENV+= VERSION=${PKGVERSION:Q} USE_TOOLS+= gmake gtar INSTALLATION_DIRS= bin man/man8 diff --git a/fonts/ec-fonts-mftraced/Makefile b/fonts/ec-fonts-mftraced/Makefile index 0d105451c1c..7f6960942d4 100644 --- a/fonts/ec-fonts-mftraced/Makefile +++ b/fonts/ec-fonts-mftraced/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/11/13 05:30:10 minskim Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:14 rillig Exp $ # DISTNAME= ec-fonts-mftraced-1.0.8 @@ -14,8 +14,8 @@ USE_PKGLOCALEDIR= yes HAS_CONFIGURE= yes USE_TOOLS+= gmake MAKEFILE= GNUmakefile -MAKE_ENV+= PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX} -MAKE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX} +MAKE_ENV+= PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:Q} +MAKE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:Q} .include "../../fonts/mftrace/buildlink3.mk" .include "../../print/teTeX/module.mk" diff --git a/fonts/efont-unicode/Makefile b/fonts/efont-unicode/Makefile index 051734f0607..270f1ea9ef8 100644 --- a/fonts/efont-unicode/Makefile +++ b/fonts/efont-unicode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/11/08 18:22:09 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:14 rillig Exp $ DISTNAME= efont-unicode-bdf-0.4.2 PKGNAME= ${DISTNAME:S/-bdf//} @@ -14,7 +14,7 @@ USE_X11BASE= YES USE_TOOLS+= gzip mkfontdir:run MESSAGE_SUBST+= FONTDIR=${FONTDIR} -PLIST_SUBST+= FONTDIR=${FONTDIR} +PLIST_SUBST+= FONTDIR=${FONTDIR:Q} FONTS= b10 b10_b b10_bi b10_i\ b12 b12_b b12_bi b12_i\ diff --git a/fonts/freefont-ttf/Makefile b/fonts/freefont-ttf/Makefile index ebddf459e96..6b468923e3a 100644 --- a/fonts/freefont-ttf/Makefile +++ b/fonts/freefont-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/07/20 00:59:45 reed Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:14 rillig Exp $ # DISTNAME= freefont-ttf @@ -10,7 +10,7 @@ MAINTAINER= reed@reedmedia.net HOMEPAGE= http://www.nongnu.org/freefont/ COMMENT= Free UCS Outline Fonts: FreeMono, FreeSans, and FreeSerif -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} WRKSRC= ${WRKDIR} NO_CONFIGURE= yes diff --git a/fonts/ghostscript-cidfonts/Makefile b/fonts/ghostscript-cidfonts/Makefile index b04b9a7ba32..a9708c711e2 100644 --- a/fonts/ghostscript-cidfonts/Makefile +++ b/fonts/ghostscript-cidfonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/11/28 06:41:20 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:14 rillig Exp $ DISTNAME= ghostscript-cidfonts-20000901 PKGREVISION= 1 @@ -25,9 +25,9 @@ USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR} -FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR} -FILES_SUBST+= PKG_INFO=${PKG_TOOLS_BIN}/pkg_info +FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q} +FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR:Q} +FILES_SUBST+= PKG_INFO=${PKG_INFO:Q} REQD_DIRS= ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CIDFont diff --git a/fonts/ghostscript-cmaps/Makefile b/fonts/ghostscript-cmaps/Makefile index 6828d1d1d9c..93d61651e1e 100644 --- a/fonts/ghostscript-cmaps/Makefile +++ b/fonts/ghostscript-cmaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/11/28 06:41:20 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:14 rillig Exp $ DISTNAME= ghostscript-cmaps-20020913 PKGREVISION= 1 @@ -25,9 +25,9 @@ USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR} -FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR} -FILES_SUBST+= PKG_INFO=${PKG_TOOLS_BIN}/pkg_info +FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q} +FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR:Q} +FILES_SUBST+= PKG_INFO=${PKG_INFO:Q} REQD_DIRS= ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CMap diff --git a/fonts/ja-kappa20/Makefile b/fonts/ja-kappa20/Makefile index d4c976fea54..5b8ec868a8d 100644 --- a/fonts/ja-kappa20/Makefile +++ b/fonts/ja-kappa20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:52 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:14 rillig Exp $ DISTNAME= Kappa20-0.394 PKGNAME= ja-kappa20-0.394 @@ -18,8 +18,8 @@ USE_PKGINSTALL= YES DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -FILES_SUBST+= FONTDIR=${FONTDIR} -FILES_SUBST+= ALIAS_KAPPA=${ALIAS_KAPPA} +FILES_SUBST+= FONTDIR=${FONTDIR:Q} +FILES_SUBST+= ALIAS_KAPPA=${ALIAS_KAPPA:Q} # do not build experimental JIS X 0213 font. BUILD_TARGET= default diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile index 478ae1a677d..656b5189efc 100644 --- a/fonts/ja-shinonome/Makefile +++ b/fonts/ja-shinonome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:10 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:14 rillig Exp $ # DISTNAME= shinonome-0.9.10-src @@ -23,8 +23,8 @@ USE_PKGINSTALL= YES DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -FILES_SUBST+= FONTDIR=${FONTDIR} -FILES_SUBST+= ALIAS_SHINONOME=${ALIAS_SHINONOME} +FILES_SUBST+= FONTDIR=${FONTDIR:Q} +FILES_SUBST+= ALIAS_SHINONOME=${ALIAS_SHINONOME:Q} CONFIGURE_ARGS+= --with-fontdir=${FONTDIR} CONFIGURE_ARGS+= --disable-progressbar diff --git a/fonts/ko-baekmuk/Makefile b/fonts/ko-baekmuk/Makefile index a8c91072776..a2ad4850e4d 100644 --- a/fonts/ko-baekmuk/Makefile +++ b/fonts/ko-baekmuk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/11/08 18:22:09 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:14 rillig Exp $ # DISTNAME= baekmuk-2.0 @@ -16,7 +16,7 @@ CONFLICTS+= ksc5601fonts-[0-9]* USE_X11BASE= yes USE_TOOLS+= gzip mkfontdir:run -MAKE_ENV+= FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}" +MAKE_ENV+= FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q} # fonts BAEKMUK_BDF= batang10.bdf batang10b.bdf batang12.bdf batang12b.bdf \ diff --git a/fonts/ko-hanyang/Makefile b/fonts/ko-hanyang/Makefile index 38de6dd5a6f..c4b775ccc9a 100644 --- a/fonts/ko-hanyang/Makefile +++ b/fonts/ko-hanyang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/11/08 18:22:09 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:14 rillig Exp $ # DISTNAME= hanyang-font-pcf @@ -16,7 +16,7 @@ USE_X11BASE= yes USE_TOOLS+= gzip mkfontdir:run EXTRACT_ONLY= # empty -MAKE_ENV+= FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}" +MAKE_ENV+= FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q} # fonts EXTRACT_ONLY+= hanyang-font-pcf.tar.gz diff --git a/fonts/ko-kaist/Makefile b/fonts/ko-kaist/Makefile index 4b3014a7cb3..bf55a8a032e 100644 --- a/fonts/ko-kaist/Makefile +++ b/fonts/ko-kaist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/11/08 18:22:09 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:14 rillig Exp $ # DISTNAME= ko-kaist-20010718 @@ -16,7 +16,7 @@ USE_X11BASE= yes USE_TOOLS+= gzip gunzip mkfontdir:run EXTRACT_ONLY= # empty -MAKE_ENV+= FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}" +MAKE_ENV+= FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q} FONTDIR=${PREFIX}/lib/X11/fonts/local diff --git a/fonts/ko-mizi/Makefile b/fonts/ko-mizi/Makefile index f28ebd827fc..b8d3234f194 100644 --- a/fonts/ko-mizi/Makefile +++ b/fonts/ko-mizi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/11/08 18:22:09 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:14 rillig Exp $ # DISTNAME= xfntmizi-1.1-2.noarch @@ -17,7 +17,7 @@ CONFLICTS+= ksc5601fonts-[0-9]* USE_X11BASE= yes USE_TOOLS+= gzip gunzip mkfontdir:run -MAKE_ENV+= FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}" +MAKE_ENV+= FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q} # fonts MIZI_PCF= mzgt16e.pcf mzgt16h1.pcf mzmj16h.pcf mzpg16h.pcf mzsm16h.pcf \ diff --git a/fonts/mftrace/Makefile b/fonts/mftrace/Makefile index 5b7bfb00488..ba874d79671 100644 --- a/fonts/mftrace/Makefile +++ b/fonts/mftrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/11/08 19:49:52 tonio Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:14 rillig Exp $ DISTNAME= mftrace-1.1.1 PKGREVISION= 1 @@ -16,10 +16,10 @@ DEPENDS+= t1utils>=1.27:../../fonts/t1utils USE_TOOLS+= gmake GNU_CONFIGURE= yes -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} MAKEFILE= GNUmakefile -PLIST_SUBST+= PYSITELIB=${PYSITELIB} +PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q} PYTHON_VERSIONS_ACCEPTED= 24 23 22 21 INSTALLATION_DIRS= bin man/man1 ${PYSITELIB} diff --git a/fonts/py-fonttools/Makefile b/fonts/py-fonttools/Makefile index ffad3444d00..41ff8e346b5 100644 --- a/fonts/py-fonttools/Makefile +++ b/fonts/py-fonttools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/07/27 16:21:17 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:14 rillig Exp $ # DISTNAME= fonttools-2.0b1 @@ -14,7 +14,7 @@ COMMENT= Library for manipulating fonts WRKSRC= ${WRKDIR}/fonttools PYDISTUTILSPKG= yes -PLIST_SUBST+= FONTTOOLSPTH=${FONTTOOLSPTH} +PLIST_SUBST+= FONTTOOLSPTH=${FONTTOOLSPTH:Q} .include "../../lang/python/extension.mk" .if !empty(PYPKGPREFIX:M*pth) diff --git a/fonts/ttmkfdir2/Makefile b/fonts/ttmkfdir2/Makefile index d1d5402a9a9..9266851b63a 100644 --- a/fonts/ttmkfdir2/Makefile +++ b/fonts/ttmkfdir2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:52 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:14 rillig Exp $ # DISTNAME= ttmkfdir2.20021109 @@ -19,7 +19,7 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake lex USE_LANGUAGES= c c++ -MAKE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG} +MAKE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG:Q} LDFLAGS+= ${BUILDLINK_LDADD.getopt} INSTALLATION_DIRS= bin diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile index ae141e641bb..fa092332497 100644 --- a/fonts/vfontcap-kochi/Makefile +++ b/fonts/vfontcap-kochi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:52 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:14 rillig Exp $ DISTNAME= vfontcap-kochi-0.0 PKGREVISION= 1 @@ -22,7 +22,7 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL VFONTCAPDIR= ${PREFIX}/share/VFlib/2.24.2 -FILES_SUBST+= VFONTCAPDIR=${VFONTCAPDIR} +FILES_SUBST+= VFONTCAPDIR=${VFONTCAPDIR:Q} INSTALLATION_DIRS= share/VFlib/2.24.2 diff --git a/fonts/xmbdfed/Makefile b/fonts/xmbdfed/Makefile index 3c04d042dee..b4cb2c39b4e 100644 --- a/fonts/xmbdfed/Makefile +++ b/fonts/xmbdfed/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:52 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:14 rillig Exp $ DISTNAME= xmbdfed-4.5 -PKGREVISION= # CATEGORIES= fonts graphics x11 MASTER_SITES= ftp://crl.nmsu.edu/CLR/multiling/General/ diff --git a/fonts/xorg-fontsEncodings/Makefile.common b/fonts/xorg-fontsEncodings/Makefile.common index ccdf9fc704a..42b24248fd0 100644 --- a/fonts/xorg-fontsEncodings/Makefile.common +++ b/fonts/xorg-fontsEncodings/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.1 2005/05/23 20:53:28 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.2 2005/12/05 20:50:15 rillig Exp $ -.ifndef XORG_FONTSENCODINGS_COMMON -XORG_FONTSENCODINGS_COMMON= defined +.if !defined(XORG_FONTSENCODINGS_COMMON) +XORG_FONTSENCODINGS_COMMON= # defined BUILD_DEPENDS+= xorg-clients>=${XORG_VER}:../../x11/xorg-clients |