summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorrillig <rillig>2005-12-05 20:49:47 +0000
committerrillig <rillig>2005-12-05 20:49:47 +0000
commitb4f920543059af038598712771c3211999ef42a6 (patch)
treedac5b1dd14794d86b061d26b9503adb2552ed3f8 /print
parent5bf026ec112f405b514a2d69a72e10fa92c4c524 (diff)
downloadpkgsrc-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 'print')
-rw-r--r--print/LPRng-core/Makefile8
-rw-r--r--print/acroread/Makefile14
-rw-r--r--print/acroread3/Makefile12
-rw-r--r--print/acroread5/Makefile10
-rw-r--r--print/acroread7/Makefile6
-rw-r--r--print/apsfilter/Makefile4
-rw-r--r--print/auctex/Makefile6
-rw-r--r--print/bg5pdf/Makefile4
-rw-r--r--print/chktex/Makefile6
-rw-r--r--print/cnprint/Makefile4
-rw-r--r--print/cups/Makefile8
-rw-r--r--print/dvipdfm/Makefile4
-rw-r--r--print/dvipdfmx/Makefile4
-rw-r--r--print/dvipdfmx/map.mk4
-rw-r--r--print/ghostscript-esp/Makefile.common4
-rw-r--r--print/ghostscript-gnu-nox11/Makefile4
-rw-r--r--print/ghostscript-gnu-x11/Makefile4
-rw-r--r--print/ghostscript-gnu/Makefile.common8
-rw-r--r--print/ghostscript-nox11/Makefile.common12
-rw-r--r--print/gnome-print/Makefile4
-rw-r--r--print/hpijs/Makefile3
-rw-r--r--print/ijs/Makefile4
-rw-r--r--print/ja-ptex-bin/Makefile10
-rw-r--r--print/ja-vflib-lib/Makefile.common16
-rw-r--r--print/ja-vflib-utils/Makefile4
-rw-r--r--print/ja-vfxdvik/Makefile8
-rw-r--r--print/lgrind/Makefile4
-rw-r--r--print/libgnomeprintui/Makefile4
-rw-r--r--print/lilypond/Makefile6
-rw-r--r--print/poppler/Makefile4
-rw-r--r--print/psutils/Makefile4
-rw-r--r--print/rtf2latex/Makefile4
-rw-r--r--print/tcl-pdflib/Makefile8
-rw-r--r--print/teTeX-bin/Makefile.common8
-rw-r--r--print/teTeX/module.mk6
-rw-r--r--print/teTeX1-bin/Makefile8
-rw-r--r--print/teTeX3-bin/Makefile.common8
-rw-r--r--print/texfamily/Makefile10
-rw-r--r--print/xpdf/Makefile6
39 files changed, 127 insertions, 128 deletions
diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile
index ab465dcc529..7f1b573ce45 100644
--- a/print/LPRng-core/Makefile
+++ b/print/LPRng-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/24 19:05:48 kristerw Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:52 rillig Exp $
DISTNAME= LPRng-3.8.28
PKGNAME= LPRng-core-3.8.28
@@ -26,8 +26,8 @@ CONFIGURE_ARGS+= --with-printcap_path="${PRINTCAP_PATH}"
CONFIGURE_ARGS+= --with-filterdir="${FILTER_DIR}"
CONFIGURE_ARGS+= --with-filter_path="${FILTER_PATH}"
CONFIGURE_ARGS+= --with-ld_library_path="${FILTER_LD_PATH}"
-CONFIGURE_ENV+= CHGRP="${TOOLS_CHGRP}"
-CONFIGURE_ENV+= CHOWN="${TOOLS_CHOWN}"
+CONFIGURE_ENV+= CHGRP=${TOOLS_CHGRP:Q}
+CONFIGURE_ENV+= CHOWN=${TOOLS_CHOWN:Q}
.include "options.mk"
@@ -48,7 +48,7 @@ INSTALL_FILE= ${WRKDIR}/INSTALL
USE_PKGINSTALL= YES
RCD_SCRIPTS= LPRng
-FILES_SUBST= CAT=${CAT:Q}
+FILES_SUBST+= CAT=${CAT:Q}
FILES_SUBST+= CHMOD=${CHMOD:Q}
FILES_SUBST+= CMP=${CMP:Q}
FILES_SUBST+= CP=${CP:Q}
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index 2518d7ce904..e77b4bda736 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/07/09 17:34:42 kristerw Exp $
+# $NetBSD: Makefile,v 1.44 2005/12/05 20:50:52 rillig Exp $
DISTNAME= acroread # Overridden below
PKGNAME= acroread-4.05
@@ -33,20 +33,20 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-1.4[L-Z]-sparc \
.if ${OPSYS} == "NetBSD"
. if (${MACHINE_ARCH} == "i386")
-DEPENDS= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
DISTNAME= linux-ar-405
PLATFORM= intellinux
WRKSRC= ${WRKDIR}/ILINXR.install
. elif (${MACHINE_ARCH} == "alpha")
. if !exists(/emul/osf1/sbin/loader)
-PKG_FAIL_REASON= '${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)'
+PKG_FAIL_REASON+= '${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)'
. endif
DISTNAME= fdec-rs-405
PLATFORM= alphaosf
WRKSRC= ${WRKDIR}/AOSFRS.install
. elif (${MACHINE_ARCH} == "sparc")
. if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
+PKG_FAIL_REASON+= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
. endif
DISTNAME= sunsparc-rs-405
WRKSRC= ${WRKDIR}/SSOLRS.install
@@ -64,13 +64,13 @@ WRKSRC= ${WRKDIR}/SSOLRS.install
PLATFORM= sparcsolaris
. endif # i86pc
- # Solaris sparc + x86:
-PREPEND_PATH= /bin # for "ed"
+# Solaris sparc + x86:
+PREPEND_PATH+= /bin # for "ed"
post-patch:
${CHMOD} -R o+rwx ${WRKSRC}
.endif # SunOS
-PLIST_SUBST+= PLATFORM=${PLATFORM}
+PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins
diff --git a/print/acroread3/Makefile b/print/acroread3/Makefile
index 6aae628e454..47881881fd5 100644
--- a/print/acroread3/Makefile
+++ b/print/acroread3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:52 rillig Exp $
PKGNAME= acroread3-3.01
CATEGORIES= print
@@ -22,21 +22,21 @@ NO_BUILD= YES
.if ${OPSYS} == "NetBSD"
.if (${MACHINE_ARCH} == "i386")
-DEPENDS= suse_libc5>=6.3:../../emulators/${SUSE_DIR_PREFIX}_libc5
-DEPENDS= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+= suse_libc5>=6.3:../../emulators/${SUSE_DIR_PREFIX}_libc5
+DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
DISTNAME= acroread_linux_301
PLATFORM= intellinux
CHECK_SHLIBS= no
.elif (${MACHINE_ARCH} == "alpha")
.if !exists(/emul/osf1/sbin/loader)
-PKG_FAIL_REASON= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)"
+PKG_FAIL_REASON+= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)"
.endif
DISTNAME= acroread_osf_301
PLATFORM= alphaosf
LDD?= ${TRUE}
.elif (${MACHINE_ARCH} == "sparc")
.if !exists(/emul/sunos/usr/lib/ld.so)
-PKG_FAIL_REASON= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)"
+PKG_FAIL_REASON+= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)"
.endif
DISTNAME= acroread_sunos_301
PLATFORM= sparcsun
@@ -57,7 +57,7 @@ DISTNAME= ${PKGNAME}
LDD?= ${TRUE}
.endif
-PLIST_SUBST+= PLATFORM=${PLATFORM}
+PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
INSTALLATION_DIRS= bin
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index ed898a4634b..eab726730ab 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/10 16:46:37 recht Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:52 rillig Exp $
DISTNAME= acroread5 # Overridden below
PKGNAME= acroread5-5.10
@@ -36,18 +36,18 @@ PLATFORM= unknown
.if ${OPSYS} == "NetBSD"
. if (${MACHINE_ARCH} == "i386")
-DEPENDS= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
DISTNAME= linux-5010
PLATFORM= intellinux
. elif (${MACHINE_ARCH} == "sparc")
. if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
+PKG_FAIL_REASON+= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
. endif
DISTNAME= solaris-5010
PLATFORM= sparcsolaris
. elif (${MACHINE_ARCH} == "sparc64")
. if !exists(/emul/svr4_32/usr/lib/ld.so)
-PKG_FAIL_REASON= '${PKGNAME} requires Solaris libraries - see compat_svr4_32(8)'
+PKG_FAIL_REASON+= '${PKGNAME} requires Solaris libraries - see compat_svr4_32(8)'
. endif
DISTNAME= solaris-5010
PLATFORM= sparcsolaris
@@ -60,7 +60,7 @@ DISTNAME= solaris-5010
PLATFORM= sparcsolaris
.endif
-PLIST_SUBST+= PLATFORM=${PLATFORM}
+PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
BIN_PATCH= ${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index 3651cd1c6dd..2bf7a6602ad 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/08/19 14:35:28 salo Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:52 rillig Exp $
DISTNAME= acroread7 # Overridden below
PKGNAME= acroread7-7.0.1
@@ -35,7 +35,7 @@ PLATFORM= unknown
.if ${OPSYS} == "NetBSD"
. if (${MACHINE_ARCH} == "i386")
-DEPENDS= suse_gtk2>=9.1:../../emulators/suse91_gtk2
+DEPENDS+= suse_gtk2>=9.1:../../emulators/suse91_gtk2
DEPENDS+= suse_locale>=9.1:../../emulators/suse91_locale
DISTNAME= AdbeRdr701_linux_enu
PLATFORM= intellinux
@@ -45,7 +45,7 @@ DISTNAME= AdbeRdr701_linux_enu
PLATFORM= intellinux
.endif
-PLIST_SUBST+= PLATFORM=${PLATFORM}
+PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
BIN_PATCH= ${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 59bb42d3644..464518448b1 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/11/28 06:41:21 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:52 rillig Exp $
#
DISTNAME= apsfilter-7.2.5
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.apsfilter.org/
COMMENT= Flexible magic filter for printing under Unix environment
-DEPENDS= recode-[0-9]*:../../converters/recode
+DEPENDS+= recode-[0-9]*:../../converters/recode
#DEPENDS+= html2ps-[0-9]*:../../print/html2ps
DEPENDS+= transfig-[0-9]*:../../print/transfig
DEPENDS+= jpeg>=6b:../../graphics/jpeg
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 9cfcb7ac59f..4e487e45a92 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/10/17 16:17:22 tonio Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:52 rillig Exp $
DISTNAME= auctex-11.81
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -24,12 +24,12 @@ CONFIGURE_ARGS+= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp||}
.endif
CONFIGURE_ARGS+= --disable-preview
-MAKEFLAGS+= EMACS=${EMACS_BIN}
+MAKEFLAGS+= EMACS=${EMACS_BIN:Q}
LISPDIR= ${EMACS_LISPPREFIX}
INFO_FILES= auctex.info
-PLIST_SUBST+= INFODIR=${INFODIR}
+PLIST_SUBST+= INFODIR=${INFODIR:Q}
MESSAGE_SUBST+= LISPDIR=${LISPDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/print/bg5pdf/Makefile b/print/bg5pdf/Makefile
index cf88c9d6464..89e66220112 100644
--- a/print/bg5pdf/Makefile
+++ b/print/bg5pdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:52 rillig Exp $
#
DISTNAME= bg5pdf-1.0.0
@@ -16,7 +16,7 @@ PYBINMODULE= # defined
PY_PATCHPLIST= yes
PYTHON_PATCH_SCRIPTS= bg5pdf
-MAKE_ENV+= PYINC=${PYINC} PYSITELIB=${PYSITELIB}
+MAKE_ENV+= PYINC=${PYINC:Q} PYSITELIB=${PYSITELIB:Q}
post-extract:
${RM} -f ${WRKSRC}/bg5pdflib.so
diff --git a/print/chktex/Makefile b/print/chktex/Makefile
index f67fae4db6d..91bb28d28cc 100644
--- a/print/chktex/Makefile
+++ b/print/chktex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/11/08 20:30:29 tonio Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:52 rillig Exp $
#
DISTNAME= chktex-1.6.3
@@ -18,8 +18,8 @@ CONF_FILES= ${EGDIR}/chktexrc ${PKG_SYSCONFDIR}/chktexrc
USE_TOOLS+= gmake perl:run
GNU_CONFIGURE= YES
CFLAGS+= -D__unix__
-CONFIGURE_ENV+= PERL5="${PERL5}"
-MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" EGDIR="${EGDIR}"
+CONFIGURE_ENV+= PERL5=${PERL5:Q}
+MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} EGDIR=${EGDIR:Q}
pre-install:
${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/print/cnprint/Makefile b/print/cnprint/Makefile
index f6cfebeda9b..52300e3334e 100644
--- a/print/cnprint/Makefile
+++ b/print/cnprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:53 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:52 rillig Exp $
DISTNAME= #
PKGNAME= cnprint-3.30b
@@ -25,7 +25,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.neurophys.wisc.edu/~cai/software/index.html
COMMENT= Print & convert CJK style text to PostScript
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
USE_TOOLS+= gtar gunzip
INSTALLATION_DIRS= bin
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 64b0fc31ea6..610843731ec 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2005/08/24 08:20:46 rillig Exp $
+# $NetBSD: Makefile,v 1.99 2005/12/05 20:50:52 rillig Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --with-manext=bsd
CONFIGURE_ARGS+= --enable-libtool
CONFIGURE_ARGS+= --enable-slp
CONFIGURE_ARGS+= --enable-ssl
-CONFIGURE_ENV+= DSOFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
.include "../../mk/bsd.prefs.mk"
@@ -74,8 +74,8 @@ PLIST_SUBST+= PAM="@comment "
#
CUPS_USER?= lp
CUPS_GROUP?= sys
-FILES_SUBST+= CUPS_USER=${CUPS_USER}
-FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP}
+FILES_SUBST+= CUPS_USER=${CUPS_USER:Q}
+FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP:Q}
BUILD_DEFS+= CUPS_USER CUPS_GROUP
diff --git a/print/dvipdfm/Makefile b/print/dvipdfm/Makefile
index 1f3287ae65b..aab4462ca77 100644
--- a/print/dvipdfm/Makefile
+++ b/print/dvipdfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/11/28 06:41:21 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:52 rillig Exp $
DISTNAME= dvipdfm-0.13.2c
PKGREVISION= 5
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --datadir=${PREFIX}/share
# needed to get the stdarg.h version of kpathsea/c-varargs.h instead of the
# varargs.h version which gcc3 does not like
CPPFLAGS+= -DHAVE_PROTOTYPES
-CONFIGURE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX}
+CONFIGURE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index eecfbbbdbbf..cdd8e0ffb5f 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/11/28 06:41:21 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:52 rillig Exp $
DISTNAME= dvipdfmx-20050627
PKGNAME= ${DISTNAME:S/-/-0.0.0./}
@@ -16,7 +16,7 @@ CONFLICTS+= ja-dvipdfm-[0-9]*
USE_TOOLS+= gs:run
GNU_CONFIGURE= YES
-MAKE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX}
+MAKE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:Q}
.include "../../graphics/png/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/print/dvipdfmx/map.mk b/print/dvipdfmx/map.mk
index 6e81f0ad8ad..356cd8d35fe 100644
--- a/print/dvipdfmx/map.mk
+++ b/print/dvipdfmx/map.mk
@@ -1,4 +1,4 @@
-# $NetBSD: map.mk,v 1.2 2005/11/20 19:14:50 minskim Exp $
+# $NetBSD: map.mk,v 1.3 2005/12/05 20:50:52 rillig Exp $
# This Makefile fragment is intended to be included by packages that
# install font maps used by dvipdfmx. It takes care of adding and
# removing font map entires in dvipdfmx.cfg.
@@ -19,7 +19,7 @@ DEPENDS+= dvipdfmx>=0.0.0.20050627:../../print/dvipdfmx
.endif
USE_PKGINSTALL= yes
-FILES_SUBST+= DVIPDFMX_FONTMAPS="${DVIPDFMX_FONTMAPS}"
+FILES_SUBST+= DVIPDFMX_FONTMAPS=${DVIPDFMX_FONTMAPS:Q}
FILES_SUBST+= DVIPDFMX_CONFIG_DIR="${PKG_LOCALTEXMFPREFIX}/dvipdfm/config"
INSTALL_EXTRA_TMPL+= ../../print/dvipdfmx/files/map.tmpl
DEINSTALL_EXTRA_TMPL+= ../../print/dvipdfmx/files/map.tmpl
diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common
index 13380f59c7b..a42c1fb1e50 100644
--- a/print/ghostscript-esp/Makefile.common
+++ b/print/ghostscript-esp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2005/11/21 06:17:58 jlam Exp $
+# $NetBSD: Makefile.common,v 1.27 2005/12/05 20:50:52 rillig Exp $
DISTNAME= espgs-${GS_VERS}-source
BASEGS_VERS= 8.15
@@ -71,7 +71,7 @@ CUPS_EGDIR= ${PREFIX}/share/examples/cups
CUPS_MODEL_DIR= ${PREFIX}/share/cups/model
DOCDIR= ${PREFIX}/share/doc/ghostscript
-PLIST_SUBST+= GS_VERS=${BASEGS_VERS}
+PLIST_SUBST+= GS_VERS=${BASEGS_VERS:Q}
CONF_FILES= ${CUPS_EGDIR}/pstoraster.convs ${CUPS_CONFDIR}/pstoraster.convs
diff --git a/print/ghostscript-gnu-nox11/Makefile b/print/ghostscript-gnu-nox11/Makefile
index 3949a68209c..e6a10315ed7 100644
--- a/print/ghostscript-gnu-nox11/Makefile
+++ b/print/ghostscript-gnu-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/11/27 17:06:59 adrianp Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:52 rillig Exp $
PKGNAME= ghostscript-gnu-nox11-${GS_VERS}
PKGREVISION= 1
@@ -6,4 +6,4 @@ COMMENT= GNU Postscript interpreter without X11 drivers
CONFIGURE_ARGS+= --without-x
-.include "../ghostscript-gnu/Makefile.common"
+.include "../../print/ghostscript-gnu/Makefile.common"
diff --git a/print/ghostscript-gnu-x11/Makefile b/print/ghostscript-gnu-x11/Makefile
index 691e0f435e2..5bf768e914a 100644
--- a/print/ghostscript-gnu-x11/Makefile
+++ b/print/ghostscript-gnu-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:09 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:53 rillig Exp $
PKGNAME= ghostscript-gnu-x11-${GS_VERS}
COMMENT= GNU Postscript interpreter with X11 and image drivers only
@@ -19,4 +19,4 @@ MAKE_FLAGS+= DEVICE_DEVS${N}=
MAKE_FLAGS+= DEVICE_DEVS5="\$$(DD)ijs.dev"
.include "../../mk/x11.buildlink3.mk"
-.include "../ghostscript-gnu/Makefile.common"
+.include "../../print/ghostscript-gnu/Makefile.common"
diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common
index 2b0840bab96..a2d2d7c7593 100644
--- a/print/ghostscript-gnu/Makefile.common
+++ b/print/ghostscript-gnu/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2005/10/11 07:23:52 abs Exp $
+# $NetBSD: Makefile.common,v 1.26 2005/12/05 20:50:52 rillig Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 8.15
@@ -55,8 +55,8 @@ CFLAGS+= -DA4
.endif
CFLAGS+= -DHAVE_MKSTEMP=1
-MAKE_FLAGS+= XCFLAGS="${CFLAGS}"
-MAKE_FLAGS+= XLDFLAGS="${LDFLAGS}"
+MAKE_FLAGS+= XCFLAGS=${CFLAGS:M*:Q}
+MAKE_FLAGS+= XLDFLAGS=${LDFLAGS:M*:Q}
REPLACE_PERL= lib/fixmswrd.pl
@@ -66,7 +66,7 @@ DOCDIR= ${PREFIX}/share/doc/ghostscript
HTMLDIR= ${PREFIX}/share/doc/html/ghostscript
LIBDIR= ${GSDATADIR}/lib
-PLIST_SUBST+= GS_VERS=${GS_VERS}
+PLIST_SUBST+= GS_VERS=${GS_VERS:Q}
.include "../../mk/compiler.mk"
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 40ce4a83994..bcb170b4c3d 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.60 2005/10/11 07:23:53 abs Exp $
+# $NetBSD: Makefile.common,v 1.61 2005/12/05 20:50:53 rillig Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 6.01
@@ -153,10 +153,10 @@ CFLAGS+= -DHAVE_MKSTEMP=1
XLIBS?= # empty
GS_DISPLAY_DEVICE?= # empty
-MAKE_FLAGS+= CFLAGS="${CFLAGS}"
-MAKE_FLAGS+= LDFLAGS="${LDFLAGS}"
-MAKE_FLAGS+= GS_DISPLAY_DEVICE="${GS_DISPLAY_DEVICE}"
-MAKE_FLAGS+= XINCLUDE= XLIBDIRS= XLIBS="${XLIBS}"
+MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q}
+MAKE_FLAGS+= LDFLAGS=${LDFLAGS:M*:Q}
+MAKE_FLAGS+= GS_DISPLAY_DEVICE=${GS_DISPLAY_DEVICE:Q}
+MAKE_FLAGS+= XINCLUDE= XLIBDIRS= XLIBS=${XLIBS:Q}
.if ${OPSYS} == "SunOS"
LDFLAGS+= -L${LOCALBASE}/bsd/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/bsd/lib
@@ -172,7 +172,7 @@ LDFLAGS+= -L${LOCALBASE}/bsd/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/bsd/lib
# fixed point.
#
FPU_TYPE?= 1
-MAKE_FLAGS+= FPU_TYPE=${FPU_TYPE}
+MAKE_FLAGS+= FPU_TYPE=${FPU_TYPE:Q}
PLIST_SUBST+= GS_VERS=${GS_VERS}vflib
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 31d3ac07e9f..6678957d179 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2005/11/28 06:41:21 jlam Exp $
+# $NetBSD: Makefile,v 1.70 2005/12/05 20:50:53 rillig Exp $
DISTNAME= gnome-print-0.37
CATEGORIES= print gnome
@@ -17,7 +17,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --without-admin # currently unstable
# override HOME to avoid trying to install ${HOME}/.gnome
-MAKE_ENV+= HOME=${WRKSRC}
+MAKE_ENV+= HOME=${WRKSRC:Q}
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk"
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index 69bb51d791b..55cf9e18e03 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2005/09/28 20:52:25 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:53 rillig Exp $
DISTNAME= hpijs-1.7.1
-PKGREVISION= # empty
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hpinkjet/}
diff --git a/print/ijs/Makefile b/print/ijs/Makefile
index 78816669c1a..13a9ada1d4b 100644
--- a/print/ijs/Makefile
+++ b/print/ijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:26 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:53 rillig Exp $
DISTNAME= ijs-0.34
PKGREVISION= 1
@@ -14,7 +14,7 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
BUILD_TARGET= libijs.la
-MAKE_ENV+= XCFLAGS="${CFLAGS}"
+MAKE_ENV+= XCFLAGS=${CFLAGS:M*:Q}
MAKE_ENV+= IJS_VERSION_INFO="0:0"
post-install:
diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile
index ac51314b81a..bf2bc2d2d6c 100644
--- a/print/ja-ptex-bin/Makefile
+++ b/print/ja-ptex-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:53 rillig Exp $
DISTNAME= ptex-src-${PTEX_VERS}
PKGNAME= ja-ptex-bin-${PTEX_VERS}
@@ -46,11 +46,11 @@ EXTRACT_ONLY= # none
TEXMF= ${PKG_TEXMFPREFIX}
TEXMFLOCAL= ${PREFIX}/share/texmf.local
-FILES_SUBST+= TEXMFLOCAL=${TEXMFLOCAL}
-FILES_SUBST+= TEXMFSITE=${TEXMFSITE}
-FILES_SUBST+= WRKDIR_=${WRKDIR_}
+FILES_SUBST+= TEXMFLOCAL=${TEXMFLOCAL:Q}
+FILES_SUBST+= TEXMFSITE=${TEXMFSITE:Q}
+FILES_SUBST+= WRKDIR_=${WRKDIR_:Q}
#FILES_SUBST+= FILESDIR=${FILESDIR}
-FILES_SUBST+= PATCH=${PATCH}
+FILES_SUBST+= PATCH=${PATCH:Q}
pre-extract:
if [ ! -r ${WRKSRC} ]; then \
diff --git a/print/ja-vflib-lib/Makefile.common b/print/ja-vflib-lib/Makefile.common
index 6b805cf5fb6..95f1a7ebc50 100644
--- a/print/ja-vflib-lib/Makefile.common
+++ b/print/ja-vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/04/11 21:47:08 tv Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/12/05 20:50:53 rillig Exp $
DISTNAME= VFlib2-${VFLIB_VERSION}
CATEGORIES+= japanese print
@@ -11,21 +11,21 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org
HOMEPAGE= http://TypeHack.aial.hiroshima-u.ac.jp/VFlib/
VFLIB_VERSION= 2.24.2
-PLIST_SUBST+= VFLIB_VERSION=${VFLIB_VERSION}
+PLIST_SUBST+= VFLIB_VERSION=${VFLIB_VERSION:Q}
PLIST_SUBST+= VFLIB_SO_VERSION=${VFLIB_VERSION:C/^2.//}
-USE_LIBTOOL= # defined
+USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
FT_LIB= ttf -lintl
FT_INCLUDEDIR= ${BUILDLINK_PREFIX.freetype}/include/freetype
FT_LIBDIR= ${BUILDLINK_PREFIX.freetype}/lib
-GNU_CONFIGURE= # defined
-CONFIGURE_ARGS+= --with-freetype="${FT_LIB}"
-CONFIGURE_ARGS+= --with-freetype-includedir=${FT_INCLUDEDIR}
-CONFIGURE_ARGS+= --with-freetype-libdir=${FT_LIBDIR}
-MAKE_ENV+= LOCAL_LDFLAGS="${LDFLAGS}"
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-freetype=${FT_LIB:Q}
+CONFIGURE_ARGS+= --with-freetype-includedir=${FT_INCLUDEDIR:Q}
+CONFIGURE_ARGS+= --with-freetype-libdir=${FT_LIBDIR:Q}
+MAKE_ENV+= LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
DISTINFO_FILE= ${.CURDIR}/../../print/ja-vflib-lib/distinfo
PATCHDIR= ${.CURDIR}/../../print/ja-vflib-lib/patches
diff --git a/print/ja-vflib-utils/Makefile b/print/ja-vflib-utils/Makefile
index 484b53a8baf..cc3d3953457 100644
--- a/print/ja-vflib-utils/Makefile
+++ b/print/ja-vflib-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:20 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:53 rillig Exp $
.include "../../print/ja-vflib-lib/Makefile.common"
@@ -6,7 +6,7 @@ PKGNAME= ja-vflib-utils-${VFLIB_VERSION}
PKGREVISION= 1
COMMENT= Utilities for manipulating VFlib vector font files
-BUILDLINK_DEPENDS.vflib=ja-vflib-lib>=${VFLIB_VERSION}
+BUILDLINK_DEPENDS.vflib+= ja-vflib-lib>=${VFLIB_VERSION}
CONFIGURE_ARGS+= --enable-tools --with-x
diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index d7584080cde..102557f9049 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:53 rillig Exp $
DISTNAME= xdvik-${XDVIK_ORIGINAL_VERS}
PKGNAME= ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
@@ -62,9 +62,9 @@ CONFIGURE_ARGS+= --with-zlib-libdir=${PREFIX}/lib \
--with-zlib-include=${PREFIX}/include
.endif
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
+CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
+ INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \
+ INSTALL_DATA=${INSTALL_DATA:Q}
do-build:
cd ${XDVI_DIR} && ${MAKE_PROGRAM}
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index b74904ed18f..7e9ff20a799 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:53 rillig Exp $
DISTNAME= lgrind
PKGNAME= lgrind-3.5
@@ -17,7 +17,7 @@ TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
.include "../../mk/x11.buildlink3.mk"
-MAKE_ENV+= PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX}
+MAKE_ENV+= PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:Q}
pre-patch:
${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile-prepatch
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 7424ea07518..56f8b90195b 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/10/10 13:57:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:53 rillig Exp $
#
DISTNAME= libgnomeprintui-2.12.1
@@ -19,7 +19,7 @@ USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libgnomeprintui/libgnomeprintui-2.2.pc.in
-CONFIGURE_ARGS= --enable-gtk-doc=no
+CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.12.1
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index a439f47fc4c..5de2597a835 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/11/28 06:41:22 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:53 rillig Exp $
#
DISTNAME= lilypond-2.4.3
@@ -30,12 +30,12 @@ CONFIGURE_HAS_INFODIR= NO
CONFIGURE_ARGS+= --infodir=${PREFIX}/info
CONFIGURE_ARGS+=--disable-optimising
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
PYTHON_VERSIONS_ACCEPTED= 21 23
# 22 has some regular expression problem
SCRIPTS_DIR= share/lilypond/${PKGVERSION:S/nb${PKGREVISION}//}/scripts
-PLIST_SUBST+= SCRIPTS_DIR=${SCRIPTS_DIR}
+PLIST_SUBST+= SCRIPTS_DIR=${SCRIPTS_DIR:Q}
MESSAGE_SUBST+= SCRIPTS_DIR=${SCRIPTS_DIR}
post-install:
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 20491f717be..c239a00f3aa 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/10/16 12:24:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:53 rillig Exp $
#
DISTNAME= poppler-0.4.2
@@ -9,7 +9,7 @@ MAINTAINER= reed@reedmedia.net
HOMEPAGE= http://poppler.freedesktop.org/
COMMENT= PDF rendering library
-USE_TOOLS= gmake pkg-config
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
#PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.in
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index 25113555ef8..6a43984d789 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/07/16 01:19:18 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:53 rillig Exp $
DISTNAME= psutils-p17
PKGNAME= psutils-1.17
@@ -20,7 +20,7 @@ USE_PKGINSTALL= yes
PAPERSIZE?= A4
-MAKE_ENV+= PERL5="${PERL5}"
+MAKE_ENV+= PERL5=${PERL5:Q}
MAKE_FLAGS+= PAPER=`${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'`
MAKEFILE= Makefile.unix
diff --git a/print/rtf2latex/Makefile b/print/rtf2latex/Makefile
index 454f5e46d03..4133a78945f 100644
--- a/print/rtf2latex/Makefile
+++ b/print/rtf2latex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/24 21:13:00 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:54 rillig Exp $
DISTNAME= rtf2LaTeX.1.5
PKGNAME= rtf2latex-1.5
@@ -17,7 +17,7 @@ post-extract:
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
-MAKE_ENV+= XCFLAGS="${CPPFLAGS} -DSYSV" CC="${CC}"
+MAKE_ENV+= XCFLAGS="${CPPFLAGS} -DSYSV" CC=${CC:Q}
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/print/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile
index b6be56490e6..d259fefb9d9 100644
--- a/print/tcl-pdflib/Makefile
+++ b/print/tcl-pdflib/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2004/12/03 15:15:07 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:54 rillig Exp $
-.include "../pdflib/Makefile.common"
+.include "../../print/pdflib/Makefile.common"
PKGNAME= tcl-pdflib-${PDFLIB_BASE_VERS}
PKGREVISION= 3
COMMENT= Tcl interface to PDFlib for generating PDF files
-BUILDLINK_DEPENDS.pdflib= pdflib>=${PDFLIB_BASE_VERS}
+BUILDLINK_DEPENDS.pdflib+= pdflib>=${PDFLIB_BASE_VERS}
CONFIGURE_ARGS+= --with-tcl=${TCLSH}
CONFIGURE_ARGS+= --with-tclincl="${BUILDLINK_PREFIX.tcl}/include"
@@ -30,7 +30,7 @@ do-install:
${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
.endfor
-.include "../pdflib/buildlink3.mk"
+.include "../../print/pdflib/buildlink3.mk"
.include "../../lang/tcl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX-bin/Makefile.common b/print/teTeX-bin/Makefile.common
index bcbede64090..2f34f73eb1b 100644
--- a/print/teTeX-bin/Makefile.common
+++ b/print/teTeX-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2005/06/01 18:03:20 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2005/12/05 20:50:54 rillig Exp $
TETEX_BIN_VERS= 2.0.2
DIST_SUBDIR= teTeX
@@ -44,9 +44,9 @@ CONFIGURE_ARGS+= --disable-a4
CONFIGURE_ARGS+= --enable-auto-core
.endif
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
+CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
+ INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \
+ INSTALL_DATA=${INSTALL_DATA:Q}
TEXFONTSDIR= ${VARBASE}/spool/texfonts
OWN_DIRS= ${TEXFONTSDIR}
diff --git a/print/teTeX/module.mk b/print/teTeX/module.mk
index b34ab348bd3..20633c5f935 100644
--- a/print/teTeX/module.mk
+++ b/print/teTeX/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.5 2005/11/20 18:22:50 minskim Exp $
+# $NetBSD: module.mk,v 1.6 2005/12/05 20:50:54 rillig Exp $
#
# This Makefile fragment is intended to be included by packages that
# install TeX packages. It takes care of rebuilding the ls-R database
@@ -24,9 +24,9 @@ BUILDLINK_DEPENDS.teTeX-bin+= teTeX-bin>=3.0nb4
USE_PKGINSTALL= yes
FILES_SUBST+= MKTEXLSR="${LOCALBASE}/bin/mktexlsr"
-FILES_SUBST+= TEXMFDIRS="${TEXMFDIRS}"
+FILES_SUBST+= TEXMFDIRS=${TEXMFDIRS:Q}
FILES_SUBST+= UPDMAP_SYS="${LOCALBASE}/bin/updmap-sys"
-FILES_SUBST+= TEX_FONTMAPS="${TEX_FONTMAPS}"
+FILES_SUBST+= TEX_FONTMAPS=${TEX_FONTMAPS:Q}
INSTALL_EXTRA_TMPL+= ../../print/teTeX/files/texmf.tmpl
DEINSTALL_EXTRA_TMPL+= ../../print/teTeX/files/texmf.tmpl
diff --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile
index dbbd976c989..966f1d4fe5a 100644
--- a/print/teTeX1-bin/Makefile
+++ b/print/teTeX1-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/10/10 14:51:02 tonio Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:54 rillig Exp $
DISTNAME= teTeX-src-1.0.7
PKGNAME= teTeX-bin-1.0.7
@@ -70,9 +70,9 @@ CONFIGURE_ARGS+= --enable-auto-core
CXX= g++2
.endif
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
+CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
+ INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \
+ INSTALL_DATA=${INSTALL_DATA:Q}
TEXFONTSDIR= /var/spool/texfonts
OWN_DIRS= ${TEXFONTSDIR}
diff --git a/print/teTeX3-bin/Makefile.common b/print/teTeX3-bin/Makefile.common
index b9b5b6ddf30..400bf8a7a40 100644
--- a/print/teTeX3-bin/Makefile.common
+++ b/print/teTeX3-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/06/01 18:03:20 jlam Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:50:54 rillig Exp $
TETEX_BIN_VERS= 3.0
DIST_SUBDIR= teTeX
@@ -44,9 +44,9 @@ CONFIGURE_ARGS+= --disable-a4
CONFIGURE_ARGS+= --enable-auto-core
.endif
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
+CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
+ INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \
+ INSTALL_DATA=${INSTALL_DATA:Q}
TEXFONTSDIR= ${VARBASE}/spool/texfonts
OWN_DIRS= ${TEXFONTSDIR}
diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile
index a9749eb58e2..edeac6997ca 100644
--- a/print/texfamily/Makefile
+++ b/print/texfamily/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/12/03 20:11:40 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:54 rillig Exp $
DISTNAME= TeXfamily-1.2.1
PKGREVISION= 5
@@ -39,7 +39,7 @@ EXTRACT_ONLY= # none
BUILD_TARGET= all
INSTALL_TARGET= install strip
USE_TOOLS+= gmake gtar
-PLIST_SUBST+= MV="${MV}"
+PLIST_SUBST+= MV=${MV:Q}
CFLAGS+= -Dunix
MAKEFLAGS+= PREFIX=${PREFIX:Q}
GNU_CONFIGURE= yes
@@ -72,9 +72,9 @@ CONFIGURE_ARGS+= --with-zlib-libdir=${LOCALBASE}/lib \
--with-zlib-include=${LOCALBASE}/include
.endif
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
+CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
+ INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \
+ INSTALL_DATA=${INSTALL_DATA:Q}
# Local versions
TEXFAMILY_PTEXVERSION= 3.0.1
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 31857f3be21..c4389873f27 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/09/07 15:19:08 adam Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:54 rillig Exp $
DISTNAME= xpdf-3.01
CATEGORIES= print
@@ -20,8 +20,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-freetype2-includes=${BUILDLINK_PREFIX.freetype2}/include/freetype2
CONFIGURE_ARGS+= --with-t1-includes=${BUILDLINK_PREFIX.t1lib}/include
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
-MAKE_ENV+= SED="${SED}" ECHO="${ECHO}"
+CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
+MAKE_ENV+= SED=${SED:Q} ECHO=${ECHO:Q}
.include "../../mk/bsd.prefs.mk"