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

CONFIGURE_ARGS.

20 files changed, 45 insertions, 45 deletions

diff --git a/x11/blt/Makefile b/x11/blt/Makefile
index 3a7775436e7..fcb77165399 100644
--- a/x11/blt/Makefile
+++ b/x11/blt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:15 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:23 rillig Exp $
 #
 
 DISTNAME=	BLT2.4z
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/blt2.4z
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}
+CONFIGURE_ARGS+=	--exec-prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}/lib
 CONFIGURE_ENV+=		X11BASE=${X11BASE:Q}
diff --git a/x11/control-center/Makefile b/x11/control-center/Makefile
index 4df7777ebe1..5955bdd6062 100644
--- a/x11/control-center/Makefile
+++ b/x11/control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/24 21:26:24 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:23 rillig Exp $
 
 DISTNAME=		control-center-1.4.0.5
 CATEGORIES=		x11 gnome
@@ -20,7 +20,7 @@ USE_LIBTOOL=		YES
 LOCALSTATEDIR=		${PREFIX}/var
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
+CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 515934b94f2..f846df89b9b 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/06/01 19:44:07 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/05 23:55:23 rillig Exp $
 
 DISTNAME=	Eterm-0.9.3
 PKGNAME=	${DISTNAME:S/^E/e/}
@@ -23,7 +23,7 @@ PIXMAP_FILES=		Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 PKG_SYSCONFSUBDIR=	Eterm
 OWN_DIRS=		${PKG_SYSCONFDIR}/themes
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index d4ba0bfc3a4..1d6a72c8f38 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/08/24 19:48:18 kristerw Exp $
+# $NetBSD: Makefile,v 1.52 2005/12/05 23:55:24 rillig Exp $
 
 DISTNAME=	fltk-1.1.6-source
 PKGNAME=	${DISTNAME:S/-source//}
@@ -25,7 +25,7 @@ TEST_TARGET=		test
 
 PTHREAD_OPTS+=		require
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-libtool=${LIBTOOL}
+CONFIGURE_ARGS+=	--enable-libtool=${LIBTOOL:Q}
 CONFIGURE_ARGS+=	--with-links
 
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 89c8f1b9464..55886d712dd 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2005/12/05 20:51:15 rillig Exp $
+# $NetBSD: Makefile,v 1.94 2005/12/05 23:55:24 rillig Exp $
 #
 
 DISTNAME=	gdm-2.8.0.5
@@ -32,8 +32,8 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.gdm
 PKG_SUPPORTED_OPTIONS=	inet6 pam
 .include "../../mk/bsd.options.mk"
 
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}
 CONFIGURE_ENV+=		X11BASE=${X11BASE:Q}
 MAKE_ENV+=		CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 1b7aee48384..13f254b61e6 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2005/12/05 20:51:16 rillig Exp $
+# $NetBSD: Makefile,v 1.112 2005/12/05 23:55:24 rillig Exp $
 
 DISTNAME=		gnome-libs-1.4.2
 PKGREVISION=		4
@@ -18,7 +18,7 @@ USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
+CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR:Q} \
 			--enable-gtk-doc=no \
 			--with-html-dir=${PREFIX}/share/doc/html \
 			--with-kde-datadir=${X11PREFIX}/share/kde
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index f8eb0bc5926..0c0c89d28a3 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2005/10/23 17:26:14 minskim Exp $
+# $NetBSD: Makefile,v 1.49 2005/12/05 23:55:24 rillig Exp $
 #
 
 DISTNAME=		gnome-applets-2.12.0
@@ -25,7 +25,7 @@ PKG_SUPPORTED_OPTIONS=	inet6
 .include "../../mk/bsd.options.mk"
 
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 PKGCONFIG_OVERRIDE+=	libgswitchit/gswitchit.pc.in
 
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 26b180b8765..8a84570fa5c 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/11/25 21:23:15 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2005/12/05 23:55:24 rillig Exp $
 #
 
 DISTNAME=	control-center-2.12.1
@@ -23,7 +23,7 @@ USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 
 CONFIGURE_ARGS+=	--disable-alsa
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 INSTALL_MAKE_FLAGS+=	vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE}
 
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index fc61851535f..17238e9c368 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/10/16 12:12:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/05 23:55:24 rillig Exp $
 #
 
 DISTNAME=		gnopernicus-0.11.7
@@ -17,7 +17,7 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 PKG_SYSCONFSUBDIR=	gnopernicus
 OWN_DIRS+=		${PKG_SYSCONFDIR}/translation_tables
 EGDIR=			${PREFIX}/share/examples/gnopernicus
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index ce7a466f94b..fb9a608424c 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/08/10 20:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 23:55:24 rillig Exp $
 
 DISTNAME=	mlterm-2.9.2
 PKGREVISION=	1
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+=	--with-imagelib=gdk-pixbuf
 CONFIGURE_ARGS+=	--with-type-engines=xft
 CONFIGURE_ARGS+=	--without-libiconv-prefix
 CONFIGURE_ARGS+=	--without-libintl-prefix
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
 
 SUBST_CLASSES+=		link
 SUBST_MESSAGE.link=	"Fixing hardcoded paths and link options."
diff --git a/x11/py-qt2-sip/Makefile b/x11/py-qt2-sip/Makefile
index 8a82af34e1a..f391f3f0086 100644
--- a/x11/py-qt2-sip/Makefile
+++ b/x11/py-qt2-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:18 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:24 rillig Exp $
 #
 
 DISTNAME=	sip-3.1
@@ -14,8 +14,8 @@ COMMENT=	Tool to create Python bindings for C++ libraries
 USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-python=${PYTHONBIN} \
-			--with-qt-dir=${QTDIR}
+CONFIGURE_ARGS+=	--with-python=${PYTHONBIN:Q} \
+			--with-qt-dir=${QTDIR:Q}
 
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile
index 04677b05163..027528a464d 100644
--- a/x11/py-qt2/Makefile
+++ b/x11/py-qt2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:18 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:24 rillig Exp $
 #
 
 DISTNAME=	PyQt-3.1-Qt-2.3.1
@@ -15,8 +15,8 @@ WRKSRC=			${WRKDIR}/PyQt-3.1
 USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-python=${PYTHONBIN} \
-			--with-qt-dir=${QTDIR}
+CONFIGURE_ARGS+=	--with-python=${PYTHONBIN:Q} \
+			--with-qt-dir=${QTDIR:Q}
 
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
diff --git a/x11/ruby-tcltklib/Makefile b/x11/ruby-tcltklib/Makefile
index dd1805a1d98..69cbbf8b527 100644
--- a/x11/ruby-tcltklib/Makefile
+++ b/x11/ruby-tcltklib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/11/03 07:22:46 taca Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:24 rillig Exp $
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-tcltklib-${RUBY_VERSION}
@@ -14,12 +14,12 @@ USE_RUBY_EXTCONF=	yes
 EXTRACT_ELEMENTS=	${RUBY_DISTNAME}/ext/tcltklib
 WRKSRC=			${RUBY_WRKSRC}/ext/tcltklib
 
-CONFIGURE_ARGS+= --with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \
+CONFIGURE_ARGS+= --with-tcllib=${TCL_LIB:Q} --with-tklib=${TK_LIB:Q} \
 		--with-tcl-lib="${BUILDLINK_PREFIX.tcl}/lib/${TCL_DIR}" \
 		--with-tk-lib="${BUILDLINK_PREFIX.tk}/lib/${TK_DIR}" \
 		--with-tcl-include="${BUILDLINK_PREFIX.tcl}/include/${TCL_DIR}" \
 		--with-tk-include="${BUILDLINK_PREFIX.tk}/include/${TK_DIR}" \
-		--with-X11-dir="${X11BASE}"
+		--with-X11-dir=${X11BASE:Q}
 REPLACE_RUBY=	demo/lines1.rb demo/lines2.rb demo/safeTk.rb
 
 post-install:
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 9190fe161d3..c20f3ee6c43 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:19 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:24 rillig Exp $
 
 DISTNAME=		wdm-1.25
 PKGREVISION=		6
@@ -17,7 +17,7 @@ USE_X11BASE=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
-CONFIGURE_ARGS+=	--with-wdmdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-wdmdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
 CONFIGURE_ARGS+=	--with-gfx-incs=${BUILDLINK_DIR}/include/WINGs
 CONFIGURE_ARGS+=	--with-gfx-libs=${BUILDLINK_DIR}/lib
@@ -50,7 +50,7 @@ CONF_FILES+=	${PREFIX}/share/examples/wdm/${f} ${PKG_SYSCONFDIR}/${f}
 # different from WindowMaker. WDM_MANAGERS is a space-separated
 # list of window managers to support.
 .for WMANAGER in ${WDM_MANAGERS}
-CONFIGURE_ARGS+=	--with-winmgr=${WMANAGER}
+CONFIGURE_ARGS+=	--with-winmgr=${WMANAGER:Q}
 .endfor
 
 pre-install:
diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index 58b4c6576d3..e60c5be795f 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/12/03 21:04:32 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:24 rillig Exp $
 #
 
 DISTNAME=	wmweather-2.4.2
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake xmessage:run
 
 USE_PKGINSTALL=		yes
-CONFIGURE_ARGS+=	--with-sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-xmessage=${TOOLS_PATH.xmessage}
 
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index aa700e7fc9e..2662191c99a 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/11/09 07:09:05 martti Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:24 rillig Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -24,7 +24,7 @@ CONF_FILES+=		${EGDIR}/xfce-registered-categories.xml.${_l} \
 			${PKG_SYSCONFDIR}/xfce-registered-categories.xml.${_l}
 .endfor
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
 
 REQD_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
 
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index d0f1cca1086..3391a38985c 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/11/09 07:09:05 martti Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:24 rillig Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -21,7 +21,7 @@ CONF_FILES+=		${EGDIR}/contents.xml.${_l} \
 			${PKG_SYSCONFDIR}/contents.xml.${_l}
 .endfor
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
 
 REQD_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
 
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index fb2be89ea68..1f9e779a4d2 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/02 14:49:24 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:24 rillig Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -14,7 +14,7 @@ EGDIR=			${XFCE4_EGBASE}/session
 CONF_FILES=		${EGDIR}/xfce4-session.rc \
 			${PKG_SYSCONFDIR}/xfce4-session.rc
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE} ICEAUTH=${TOOLS_PATH.iceauth}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q} ICEAUTH=${TOOLS_PATH.iceauth}
 
 REQD_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
 
diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile
index 2c6cedad9c3..f747e775a32 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/11/09 07:09:05 martti Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 23:55:24 rillig Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -16,7 +16,7 @@ CONF_FILES=		${EGDIR}/xinitrc ${PKG_SYSCONFDIR}/xinitrc
 
 REQD_DIRS+=		${EGDIR}
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
 
 .include "options.mk"
 
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index 5c4eb581cc0..be9fb66faee 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2005/12/01 19:17:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.38 2005/12/05 23:55:24 rillig Exp $
 #
 # This Makefile.common is included by:
 #
@@ -66,7 +66,7 @@ XLOCK_AUDIOPLAY?=	${BUILDLINK_PREFIX.oss}/bin/ossplay
 .  else
 XLOCK_AUDIOPLAY?=	/usr/bin/audioplay
 .  endif
-CONFIGURE_ARGS+=	--enable-def-play="${XLOCK_AUDIOPLAY}"
+CONFIGURE_ARGS+=	--enable-def-play=${XLOCK_AUDIOPLAY:Q}
 .endif
 
 .if empty(PKG_OPTIONS:Mxlockmore-dpms)