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

CONFIGURE_ARGS.

15 files changed, 39 insertions, 39 deletions

diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index 801d4a1a88a..8e24354ba36 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:24 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/05 23:55:09 rillig Exp $
 #
 
 DISTNAME=		plt-${DRSCHEME_VERSION}-src-unix
@@ -72,7 +72,7 @@ post-install:
 .include "../../mk/bsd.pkg.mk"
 
 # See comment above.
-CONFIGURE_ARGS+=	--prefix=${PLT_HOME}
+CONFIGURE_ARGS+=	--prefix=${PLT_HOME:Q}
 
 # XXX: Gack.  Ugly hackery to have the install process run with the regular
 #      PATH.
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 9e02d90fb99..5efd191d545 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 23:55:09 rillig Exp $
 #
 
 DISTNAME=	Gauche-0.8.3
@@ -40,7 +40,7 @@ INFO_FILES=		gauche-refe.info gauche-refj.info
 .include "../../mk/bsd.pkg.mk"
 
 .if !empty(_WITH_ICONV_LIB)
-CONFIGURE_ARGS+=	--with-iconv-lib=${_WITH_ICONV_LIB}
+CONFIGURE_ARGS+=	--with-iconv-lib=${_WITH_ICONV_LIB:Q}
 .else
 BUILDLINK_TRANSFORM+=	rm:-liconv
 .endif
diff --git a/lang/gauche/options.mk b/lang/gauche/options.mk
index a9e185c40d8..89841cce70c 100644
--- a/lang/gauche/options.mk
+++ b/lang/gauche/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:37 dillo Exp $
+# $NetBSD: options.mk,v 1.3 2005/12/05 23:55:09 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gauche
 PKG_SUPPORTED_OPTIONS=	gdbm multibyte
@@ -23,7 +23,7 @@ PLIST_SUBST+=	USE_GDBM='@comment '
 ### Multibyte extension.
 ###
 .if !empty(PKG_OPTIONS:Mmultibyte) && defined(GAUCHE_MULTIBYTE)
-CONFIGURE_ARGS+=	--enable-multibyte=${GAUCHE_MULTIBYTE}
+CONFIGURE_ARGS+=	--enable-multibyte=${GAUCHE_MULTIBYTE:Q}
 .endif
 
 .if defined(PKG_DEVELOPER)
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 71d9e562b23..13321b2ded2 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:25 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2005/12/05 23:55:09 rillig Exp $
 
 DISTNAME=		gcc-2.95.3
 PKGNAME=		gcc-ssp-2.95.3.13
@@ -34,8 +34,8 @@ USE_TOOLS+=		gmake
 
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	${WRKSRC}/configure
-CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM}
-CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX}
+CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM:Q}
+CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX:Q}
 CONFIGURE_ARGS+=	--enable-shared
 
 USE_TOOLS+=		chmod
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 16580743bd5..0537090b2a3 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2005/12/05 20:50:25 rillig Exp $
+# $NetBSD: Makefile,v 1.84 2005/12/05 23:55:09 rillig Exp $
 
 DISTNAME=		gcc-2.95.3
 PKGREVISION=		6
@@ -23,8 +23,8 @@ MAKEFLAGS+=		GMAKE_LOCALE=no
 
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	${WRKSRC}/configure
-CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM}
-CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX}
+CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM:Q}
+CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX:Q}
 CONFIGURE_ARGS+=	--enable-shared
 
 USE_TOOLS+=		chmod
diff --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common
index 3fea3b23d81..d12fdace65a 100644
--- a/lang/gcc3/Makefile.common
+++ b/lang/gcc3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2005/12/05 20:50:25 rillig Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/12/05 23:55:09 rillig Exp $
 
 GCC_VERSION=	3.3.5
 DISTNAME=	gcc-${GCC_VERSION}
@@ -30,7 +30,7 @@ GCC3_PKGMODIF=		_${GCC3_INSTALLTO_SUBPREFIX}
 
 GCC_SUBPREFIX=		${GCC3_INSTALLTO_SUBPREFIX}
 GCC_PREFIX=		${PREFIX}/${GCC_SUBPREFIX}
-CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX}
+CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX:Q}
 PLIST_SUBST+=		GCC_SUBPREFIX=${GCC_SUBPREFIX:Q}
 FILES_SUBST+=		GCC_PREFIX=${GCC_PREFIX:Q}
 FILES_SUBST+=		PKGNAME=${PKGNAME:Q}
@@ -56,7 +56,7 @@ PTHREAD_OPTS+=		require native
 .else
 GCC_PLATFORM=		${MACHINE_GNU_PLATFORM}
 .endif
-CONFIGURE_ARGS+=	--host=${GCC_PLATFORM}
+CONFIGURE_ARGS+=	--host=${GCC_PLATFORM:Q}
 PLIST_SUBST+=		GCC_PLATFORM=${GCC_PLATFORM:Q}
 
 .if ${OPSYS} == "AIX"
diff --git a/lang/gcc34-ada/Makefile b/lang/gcc34-ada/Makefile
index b2e5415c5ad..03b4a35ca70 100644
--- a/lang/gcc34-ada/Makefile
+++ b/lang/gcc34-ada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:25 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:09 rillig Exp $
 #
 
 DISTNAME=	gcc-${GCC_VERSION}
@@ -91,14 +91,14 @@ GCC34_PKGMODIF=		${GCC34_INSTALLTO_SUBPREFIX}
 GCC_SUBPREFIX=		${GCC34_INSTALLTO_SUBPREFIX}
 GCC_PREFIX=		${PREFIX}/${GCC_SUBPREFIX}
 GCC_PLATFORM=		${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_a-z].*//}
-CONFIGURE_ARGS+=	--host=${GCC_PLATFORM}
+CONFIGURE_ARGS+=	--host=${GCC_PLATFORM:Q}
 GCC_ARCHSUBDIR=		${GCC_SUBPREFIX}/lib/gcc/${GCC_PLATFORM}/${GCC_VERSION}
 GCC_ARCHDIR=		${PREFIX}/${GCC_ARCHSUBDIR}
 PLIST_SUBST+=		GCC_SUBPREFIX=${GCC_SUBPREFIX:Q}
 FILES_SUBST+=		GCC_PREFIX=${GCC_PREFIX:Q}
 FILES_SUBST+=		PKGNAME=${PKGNAME:Q}
 MESSAGE_SUBST+=		GCC_PREFIX=${GCC_PREFIX}
-CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX}
+CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX:Q}
 PTHREAD_OPTS+=		require native
 CPPFLAGS+=	-I${BUILDLINK_DIR}/include
 CFLAGS+=	-I${BUILDLINK_DIR}/include
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 7e4b7f1a6ad..b34fa106215 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:25 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:09 rillig Exp $
 #
 
 DISTNAME=	gcc-${GCC_VERSION}
@@ -78,12 +78,12 @@ LANGS+='java'
 .if !empty(BUILD_OBJC:M[Yy][Ee][Ss])
 LANGS+='objc'
 .endif
-CONFIGURE_ARGS+=	--enable-languages="${LANGS}"
+CONFIGURE_ARGS+=	--enable-languages=${LANGS:Q}
 CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-__cxa_atexit
 CONFIGURE_ARGS+=	--enable-long-long
-CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX}
+CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 MAKE_ENV+=		ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
 
@@ -144,13 +144,13 @@ GCC_SUBPREFIX=		gcc34
 GCC_PREFIX=		${PREFIX}/${GCC_SUBPREFIX}
 FILES_SUBST+=		PKGNAME=${PKGNAME:Q}
 MESSAGE_SUBST+=		GCC_PREFIX=${GCC_PREFIX}
-CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX}
+CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX:Q}
 CPPFLAGS+=	-I${BUILDLINK_DIR}/include
 CFLAGS+=	-I${BUILDLINK_DIR}/include
 .if ${OPSYS} == "NetBSD"
 # thread / crtbegin / __cxa_atexit support depend on a "netbsd2" OS name
 GCC_PLATFORM=	${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_a-z].*//}
-CONFIGURE_ARGS+=	--host=${GCC_PLATFORM}
+CONFIGURE_ARGS+=	--host=${GCC_PLATFORM:Q}
 ABI_BASELINE_PAIR=	${GCC_PLATFORM:C/--/-/}
 MAKE_ENV+=	ABI_BASELINE_PAIR=${ABI_BASELINE_PAIR:Q}
 .endif # NetBSD
diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile
index d01b9e9c1a6..2b34b946872 100644
--- a/lang/gpc/Makefile
+++ b/lang/gpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:25 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 23:55:09 rillig Exp $
 
 DISTNAME=		gpc-2.1
 PKGREVISION=		3
@@ -41,8 +41,8 @@ GPC_SUBPREFIX=		${_GCC_SUBPREFIX}/
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	${WRKSRC}/configure
-CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM}
-CONFIGURE_ARGS+=	--prefix=${GPC_PREFIX}
+CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM:Q}
+CONFIGURE_ARGS+=	--prefix=${GPC_PREFIX:Q}
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/info
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-languages=pascal
diff --git a/lang/jdk-openjit/Makefile.common b/lang/jdk-openjit/Makefile.common
index e4ebbf662e7..b00837fbf5a 100644
--- a/lang/jdk-openjit/Makefile.common
+++ b/lang/jdk-openjit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2005/12/05 20:50:25 rillig Exp $
+# $NetBSD: Makefile.common,v 1.10 2005/12/05 23:55:10 rillig Exp $
 
 OPENJIT_VERSION=1.1.16
 
@@ -16,7 +16,7 @@ USE_TOOLS+=	gmake
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/java-vm.mk"
 
-CONFIGURE_ARGS+=--with-jdk=${PKG_JAVA_HOME}
+CONFIGURE_ARGS+=--with-jdk=${PKG_JAVA_HOME:Q}
 
 PLIST_SUBST+=	CLASSDIR=${CLASSDIR:Q} JRELIB=${JRELIB:Q} JAVADIR=${PKG_JAVA_HOME:C|^${PREFIX}/||}
 
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 86a7400d853..18d625b68ed 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:26 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 23:55:10 rillig Exp $
 
 DISTNAME=		nhc98src-1.18.tar.gz
 PKGNAME=		nhc98-1.18
@@ -21,7 +21,7 @@ INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
 INCOMPAT_CURSES+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*-*
 
 HAS_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--buildwith=gcc --installdir=${PREFIX} \
+CONFIGURE_ARGS+=	--buildwith=gcc --installdir=${PREFIX:Q} \
 			+docs --docdir=${PREFIX}/share/doc/nhc98
 
 USE_TOOLS+=		gmake
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index cd65d16d33b..a88d22d723f 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2005/10/19 04:40:23 jlam Exp $
+# $NetBSD: Makefile,v 1.106 2005/12/05 23:55:10 rillig Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -91,7 +91,7 @@ CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-sde
 CONFIGURE_ARGS+=	-Darchname="${MACHINE_ARCH}-${LOWER_OPSYS}"
 CONFIGURE_ARGS+=	-Dcc=${CC:Q}
-CONFIGURE_ARGS+=	-Doptimize=${CFLAGS:Q}
+CONFIGURE_ARGS+=	-Doptimize=${CFLAGS:M*:Q}
 CONFIGURE_ARGS+=	-Duseshrplib
 CONFIGURE_ARGS+=	-Ui_malloc
 CONFIGURE_ARGS+=	-Uusemymalloc
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php
index 3dfc50fd3be..4a9323ac1e3 100644
--- a/lang/php5/Makefile.php
+++ b/lang/php5/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.16 2005/12/05 20:50:26 rillig Exp $
+# $NetBSD: Makefile.php,v 1.17 2005/12/05 23:55:10 rillig Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -17,7 +17,7 @@ PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	--with-config-file-path=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-config-file-path=${PKG_SYSCONFDIR:Q}
 
 CONFIGURE_ARGS+=	--with-regex=system
 
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--disable-dom
 CONFIGURE_ARGS+=	--disable-pdo
 
 CONFIGURE_ARGS+=	--enable-xml
-CONFIGURE_ARGS+=	--with-libxml-dir=${PREFIX}
+CONFIGURE_ARGS+=	--with-libxml-dir=${PREFIX:Q}
 .include "../../textproc/libxml2/buildlink3.mk"
 
 # Note: This expression is the same as ${PKGBASE}, but the latter is
diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk
index 8d62c1d4107..e6320ec7033 100644
--- a/lang/ruby/modules.mk
+++ b/lang/ruby/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.13 2005/12/05 20:50:27 rillig Exp $
+# $NetBSD: modules.mk,v 1.14 2005/12/05 23:55:10 rillig Exp $
 
 .if !defined(_RUBY_MODULE_MK)
 _RUBY_MODULE_MK=	# defined
@@ -31,7 +31,7 @@ CONFIGURE_ENV+=		RUBY=${RUBY:Q} RDOC=${RDOC:Q}
 
 RUBY_EXTCONF?=		extconf.rb
 INSTALL_TARGET?=	site-install
-CONFIGURE_ARGS+=	--with-opt-dir="${PREFIX}"
+CONFIGURE_ARGS+=	--with-opt-dir=${PREFIX:Q}
 RUBY_EXTCONF_CHECK?=	yes
 RUBY_EXTCONF_MAKEFILE?=	Makefile
 
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 4fe874c1475..6996959adc6 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:27 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 23:55:10 rillig Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -39,7 +39,7 @@ MAKE_DIRS+=	${RUBY_SITERIDIR}
 .include "../../lang/ruby/rubyversion.mk"
 
 .if !empty(RUBY_SUFFIX)
-CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}"
+CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX:Q}
 .endif
 
 FILES_SUBST+=	DATE=${DATE:Q}