Ran "pkglint --autofix", which corrected some of the quoting issues in

CONFIGURE_ARGS.

20 files changed, 48 insertions, 48 deletions

diff --git a/textproc/chasen/Makefile.common b/textproc/chasen/Makefile.common
index a72f2e6314d..52355716f28 100644
--- a/textproc/chasen/Makefile.common
+++ b/textproc/chasen/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/02/13 09:54:38 taca Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/12/05 23:55:20 rillig Exp $
 #
 
 CHASEN_VERSION=		2.3.3
@@ -7,5 +7,5 @@ CHASEN_VERSION=		2.3.3
 
 PKG_SYSCONFSUBDIR?=     chasen
 CHASEN_DICDIR?=		${PREFIX}/share/chasen/dic
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
-			--with-dicdir=${CHASEN_DICDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q} \
+			--with-dicdir=${CHASEN_DICDIR:Q}
diff --git a/textproc/dict-client/Makefile b/textproc/dict-client/Makefile
index a58cff6842b..d1a28ca0ef4 100644
--- a/textproc/dict-client/Makefile
+++ b/textproc/dict-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/10/10 17:02:12 hira Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:20 rillig Exp $
 
 DISTNAME=       dictd-1.9.15
 PKGNAME=        dict-client-1.9.15
@@ -12,8 +12,8 @@ COMMENT=	Dictionary Service Protocol client
 
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-cflags="${CFLAGS}"
-CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-cflags=${CFLAGS:M*:Q}
+CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-dictorg
 
 BUILD_TARGET=	dict
diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile
index 723b6049c1e..85b474e7130 100644
--- a/textproc/dict-server/Makefile
+++ b/textproc/dict-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:34 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:20 rillig Exp $
 
 DISTNAME=	dictd-1.9.15
 PKGNAME=	dict-server-1.9.15
@@ -13,8 +13,8 @@ COMMENT=	Dictionary Service Protocol server
 USE_TOOLS+=		gmake
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-cflags="${CFLAGS}"
-CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-cflags=${CFLAGS:M*:Q}
+CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR:Q}
 
 BUILD_TARGET=	dictd dictzip
 INSTALL_TARGET=	install.dictd install.dictzip install.dictfmt
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index 2ffd0f0b64d..9dc8578fc45 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/12/05 20:51:02 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2005/12/05 23:55:20 rillig Exp $
 
 DISTNAME=	eb-4.1.3
 CATEGORIES=	textproc japanese
@@ -57,7 +57,7 @@ USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--with-zlib
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 CONF_FILES=		${EGDIR}/eb.conf.default ${PKG_SYSCONFDIR}/eb.conf
 
diff --git a/textproc/eperl/Makefile b/textproc/eperl/Makefile
index 76e79f13bd9..0454e990e46 100644
--- a/textproc/eperl/Makefile
+++ b/textproc/eperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/08/06 06:19:31 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:20 rillig Exp $
 
 DISTNAME=	eperl-2.2.14
 PKGREVISION=	3
@@ -12,7 +12,7 @@ COMMENT=	Interpreter/preprocessor for Perl embedded in text documents
 PERL5_PACKLIST=	auto/Parse/ePerl/.packlist
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-perl=${PERL5}
+CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
 PERL5_CONFIGURE=	NO
 PERL5_CONFIGURE_DIRS=	${WRKSRC}/mod/Parse
 BUILD_DIRS=		${WRKSRC} ${WRKSRC}/mod/Parse
diff --git a/textproc/freepwing/Makefile b/textproc/freepwing/Makefile
index 18af8c5eb97..96e1fe68ec5 100644
--- a/textproc/freepwing/Makefile
+++ b/textproc/freepwing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:03 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:20 rillig Exp $
 
 DISTNAME=	freepwing-1.4.4
 PKGREVISION=	3
@@ -13,7 +13,7 @@ DEPENDS+=	p5-Jcode-[0-9]*:../../converters/p5-Jcode
 
 USE_TOOLS+=		gmake perl:run
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-perllibdir=${PERL5_INSTALLVENDORLIB}
+CONFIGURE_ARGS+=	--with-perllibdir=${PERL5_INSTALLVENDORLIB:Q}
 CONFIGURE_ARGS+=	--with-pkgdocdir=${PREFIX}/share/doc/freepwing
 CONFIGURE_ENV+=		GNUMAKE=${GMAKE:Q}
 
diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile
index ce801c06c35..60f2e07af73 100644
--- a/textproc/grep/Makefile
+++ b/textproc/grep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:03 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:20 rillig Exp $
 #
 
 DISTNAME=	grep-2.5.1
@@ -24,7 +24,7 @@ INFO_FILES=		grep.info
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GNU_PROGRAM_PREFIX)
-CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX}
+CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX:Q}
 .endif
 PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
 BUILD_DEFS+=		GNU_PROGRAM_PREFIX
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 0050ad3ea47..296ca86a952 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:03 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:20 rillig Exp $
 #
 
 DISTNAME=	sed-4.1.1
@@ -26,7 +26,7 @@ TEST_TARGET=		check
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GNU_PROGRAM_PREFIX)
-CONFIGURE_ARGS+=        --program-prefix=${GNU_PROGRAM_PREFIX}
+CONFIGURE_ARGS+=        --program-prefix=${GNU_PROGRAM_PREFIX:Q}
 .endif
 PLIST_SUBST+=           GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
 BUILD_DEFS+=            GNU_PROGRAM_PREFIX
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index ce3ac43745f..2df02eb2367 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/10/08 17:18:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:20 rillig Exp $
 #
 
 DISTNAME=	gtk-doc-1.4
@@ -16,7 +16,7 @@ DEPENDS+=	dsssl-docbook-modular-[0-9]*:../../textproc/dsssl-docbook-modular
 
 GNU_CONFIGURE=		YES
 PKGCONFIG_OVERRIDE=	gtk-doc.pc.in
-CONFIGURE_ARGS+=	--with-xml-catalog=${XML_DEFAULT_CATALOG}
+CONFIGURE_ARGS+=	--with-xml-catalog=${XML_DEFAULT_CATALOG:Q}
 USE_TOOLS+=		perl:run
 
 SGML_CATALOGS=		${PREFIX}/share/sgml/gtk-doc/gtk-doc.cat
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 56fe6384c02..4e54a164ccd 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/12/05 20:51:03 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2005/12/05 23:55:20 rillig Exp $
 #
 
 DISTNAME=	icu-3.2
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ENV+=		U_MAKE=${TOOLS_GMAKE:Q}
 
 # ICU's configure script will automatically append "/icu" to the sysconfdir.
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 PKG_SYSCONFSUBDIR=	icu
 
 CONVRTRS_EG=		${CONVRTRS_EG_DIR}/convrtrs.txt
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 5677485b276..ce021e2538c 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/11/28 06:41:22 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:20 rillig Exp $
 
 DISTNAME=	latex2html-2002-2-1
 PKGNAME=	latex2html-2002.2.1
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--enable-png	# add support of PNG images
 CONFIGURE_ARGS+=	--with-texpath=${PKG_LOCALTEXMFPREFIX}/tex/latex/html
 CONFIGURE_ARGS+=	--shlibdir=${PREFIX}/share/latex2html
 .if defined(LATEX2HTML_ICONPATH)
-CONFIGURE_ARGS+=	--with-iconpath=${LATEX2HTML_ICONPATH}
+CONFIGURE_ARGS+=	--with-iconpath=${LATEX2HTML_ICONPATH:Q}
 .endif
 
 .include "../../mk/tex.buildlink3.mk"
diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile
index 7e253922e7d..202e99b6b90 100644
--- a/textproc/namazu2/Makefile
+++ b/textproc/namazu2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:07 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:20 rillig Exp $
 
 DISTNAME=	namazu-2.0.14
 PKGREVISION=	3
@@ -25,9 +25,9 @@ USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=     libtool
 TEST_TARGET=		check
 
-CONFIGURE_ARGS+= 	--localstatedir=${DATADIR} \
+CONFIGURE_ARGS+= 	--localstatedir=${DATADIR:Q} \
 			--libexecdir=${PREFIX}/libexec/cgi-bin \
-			--sysconfdir=${PKG_SYSCONFBASE} \
+			--sysconfdir=${PKG_SYSCONFBASE:Q} \
 			--with-chasen
 
 DATADIR=		${PREFIX}/libdata
diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile
index e41ba40c5d7..820ab220dad 100644
--- a/textproc/ndtpd/Makefile
+++ b/textproc/ndtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:07 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 23:55:20 rillig Exp $
 #
 
 DISTNAME=	ndtpd-3.1.5
@@ -18,9 +18,9 @@ GNU_CONFIGURE=	YES
 
 INFO_FILES=	ndtpd-ja.info ndtpd.info
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--localstatedir=${NDTPD_RUNDIR}
-CONFIGURE_ARGS+=	--with-logdir=${NDTPD_LOGDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--localstatedir=${NDTPD_RUNDIR:Q}
+CONFIGURE_ARGS+=	--with-logdir=${NDTPD_LOGDIR:Q}
 CONFIGURE_ARGS+=	--with-eb
 CONFIGURE_ARGS+=	--with-zlib
 CONFIGURE_ARGS+=	--with-eb-conf=${PKG_SYSCONFDIR.eb}/eb.conf
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 73a8701efda..716cea18912 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:07 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 23:55:20 rillig Exp $
 #
 
 DISTNAME=	openjade-1.3.2
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	YES
 
 CONFIGURE_ENV+=	CXXFLAGS=${CFLAGS:M*:Q}
 CONFIGURE_ARGS+=	--enable-default-catalog=${OPENJADE_DATA_DIR}/catalog \
-		--datadir=${OPENJADE_DATA_DIR}
+		--datadir=${OPENJADE_DATA_DIR:Q}
 
 SGML_CATALOGS=		${PREFIX}/share/sgml/openjade/catalog
 
diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile
index f1afc1c5519..b813234702c 100644
--- a/textproc/rubber/Makefile
+++ b/textproc/rubber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/11 18:50:25 tonio Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 23:55:20 rillig Exp $
 #
 
 DISTNAME=		rubber-1.0
@@ -18,7 +18,7 @@ TEXINFO_REQD=		4.6
 PYTHON_VERSIONS_ACCEPTED=	24 23
 TEX_ACCEPTED=		teTeX1 teTeX2 teTeX3
 
-CONFIGURE_ARGS+=	--python=${PYTHONBIN} --prefix=${PREFIX} \
+CONFIGURE_ARGS+=	--python=${PYTHONBIN:Q} --prefix=${PREFIX:Q} \
 			--datadir=${PREFIX}/share
 
 .include "../../lang/python/application.mk"
diff --git a/textproc/ruby-eruby/Makefile b/textproc/ruby-eruby/Makefile
index 80172e256ea..8fcbeca7666 100644
--- a/textproc/ruby-eruby/Makefile
+++ b/textproc/ruby-eruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 20:51:08 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 23:55:21 rillig Exp $
 
 DISTNAME=	eruby-${ERUBY_VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -18,7 +18,7 @@ ERUBY_VERSION=		1.0.5
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	${RUBY} configure.rb
 CONFIGURE_ARGS+=	--enable-shared \
-			--with-charset="${ERUBY_DEFAULT_CHARSET}"
+			--with-charset=${ERUBY_DEFAULT_CHARSET:Q}
 INSTALL_TARGET=		site-install
 PLIST_SUBST+=		ERUBY_MAJOR=${ERUBY_MAJOR:Q} \
 			ERUBY_MINOR=${ERUBY_MINOR:Q} \
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 7297f5a12d4..e25fb36e6fa 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/12/05 20:51:08 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 23:55:21 rillig Exp $
 #
 
 DISTNAME=		scrollkeeper-0.3.14
@@ -22,9 +22,9 @@ USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 
-CONFIGURE_ARGS+= 	--localstatedir=${SCROLLKEEPER_DATADIR}
-CONFIGURE_ARGS+=	--sharedstatedir=${SCROLLKEEPER_DATADIR}
-CONFIGURE_ARGS+= 	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= 	--localstatedir=${SCROLLKEEPER_DATADIR:Q}
+CONFIGURE_ARGS+=	--sharedstatedir=${SCROLLKEEPER_DATADIR:Q}
+CONFIGURE_ARGS+= 	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+= 	--with-partial-db-dir=db
 CONFIGURE_ARGS+= 	--with-xml-catalog=${BUILDLINK_PREFIX.xmlcatmgr}/share/xml/catalog
 
diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile
index 69596044e6e..b9d8bc953da 100644
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/08/16 11:37:34 adam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:21 rillig Exp $
 
 DISTNAME=	texi2html-1.76
 CATEGORIES=	textproc
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=		perl:run
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 INFO_FILES=		texi2html.info
 
diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile
index 5a427dfaa28..ab2b28ba584 100644
--- a/textproc/xalan-c/Makefile
+++ b/textproc/xalan-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:36 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:21 rillig Exp $
 #
 
 DISTNAME=	Xalan-C_1_6-src
@@ -27,7 +27,7 @@ XALAN_ENV=	XALANCROOT="${WRKDIR}/xml-xalan/c" ICUROOT="${LOCALBASE}"
 
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	./runConfigure
-CONFIGURE_ARGS+=	-C --prefix=${PREFIX}
+CONFIGURE_ARGS+=	-C --prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	-p ${XALAN_PLATFORM}
 CONFIGURE_ARGS+=	-t icu
 CONFIGURE_ARGS+=	-r pthread
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index 30975c9a470..50b8ec508c0 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/12/05 20:51:08 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:21 rillig Exp $
 #
 
 DISTNAME=	xmlcatmgr-2.2
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=	YES
 USE_PKGINSTALL=	YES
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 OWN_DIRS=	${PKG_SYSCONFDIR}/sgml ${PKG_SYSCONFDIR}/xml
 EGDIR=		${PREFIX}/share/examples/xmlcatmgr