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

CONFIGURE_ARGS.

41 files changed, 118 insertions, 118 deletions

diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index 64953b9cfb1..87ab258ec08 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:54 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 23:55:16 rillig Exp $
 #
 
 DISTNAME=	Linux-PAM-0.77
@@ -26,7 +26,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-docdir=${PREFIX}/share/doc/PAM
 CONFIGURE_ARGS+=	--enable-includedir=${PREFIX}/include
 CONFIGURE_ARGS+=	--enable-mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+=	--enable-sconfigdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--enable-sconfigdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-static-libpam
 CONFIGURE_ENV+=		ac_cv_prog_HAVE_SGML2TXT=no
 CONFIGURE_ENV+=		ac_cv_prog_HAVE_SGML2HTML=no
diff --git a/security/amap/Makefile b/security/amap/Makefile
index ddd87a00ad8..5b1efa8a075 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:54 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:16 rillig Exp $
 #
 
 DISTNAME=       amap-5.0
@@ -12,7 +12,7 @@ COMMENT=        Applications and Services scanner
 HAS_CONFIGURE=	YES
 USE_PKGINSTALL=	YES
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 EGDIR=			${PREFIX}/share/examples/amap
 PKG_SYSCONFSUBDIR?=	amap
 
diff --git a/security/amavis-perl/Makefile b/security/amavis-perl/Makefile
index bc07f8ed651..c2903e7628c 100644
--- a/security/amavis-perl/Makefile
+++ b/security/amavis-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:54 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 23:55:16 rillig Exp $
 
 DISTNAME=	amavisd-${VERSION}
 PKGNAME=	amavis-perl-${VERSION}
@@ -53,8 +53,8 @@ CONFIGURE_ENV+=	file=${TOOLS_FILE_CMD:Q}
 CONFIGURE_ENV+=	procmail="/usr/libexec/mail.local"
 
 CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/amavis
-CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR}
-CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO}
+CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR:Q}
+CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO:Q}
 CONFIGURE_ARGS+=--enable-all
 CONFIGURE_ARGS+=--with-amavisuser=amavis
 
diff --git a/security/amavis-perl/options.mk b/security/amavis-perl/options.mk
index 48711fba5d3..decee369870 100644
--- a/security/amavis-perl/options.mk
+++ b/security/amavis-perl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/08/01 12:18:41 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2005/12/05 23:55:16 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.amavis-perl
 PKG_SUPPORTED_OPTIONS=	milter
@@ -17,6 +17,6 @@ CONFIGURE_ARGS+=--enable-milter
 CONFIGURE_ARGS+=--with-milter-libs=${PREFIX}/lib
 CONFIGURE_ARGS+=--with-milter-includes=${PREFIX}/include
 .else
-CONFIGURE_ARGS+=--enable-smtp --with-smtp-port=${SMTPPORT}
+CONFIGURE_ARGS+=--enable-smtp --with-smtp-port=${SMTPPORT:Q}
 PLIST_SRC+=	${PKGDIR}/PLIST.nomilter
 .endif
diff --git a/security/amavis/Makefile b/security/amavis/Makefile
index 4449ae66a64..ce3a582b01f 100644
--- a/security/amavis/Makefile
+++ b/security/amavis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:54 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:16 rillig Exp $
 #
 
 DISTNAME=	amavis-0.2.1
@@ -31,8 +31,8 @@ VIRUSMAILTO?=	security		# whom to notify about viruses
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	procmail="/usr/libexec/mail.local"
 CONFIGURE_ENV+=	BASH=${TOOLS_SH:Q}
-CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR}
-CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO}
+CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR:Q}
+CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO:Q}
 
 INSTALLATION_DIRS=	bin sbin
 
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 86c013da22f..7b68fdf446a 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:54 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:16 rillig Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -68,9 +68,9 @@ PKG_SUPPORTED_OPTIONS=	milter
 
 .if !empty(PKG_OPTIONS:Mmilter)
 GNU_CONFIGURE=  	yes
-CONFIGURE_ARGS+=	--with-runtime-dir=${AMAVIS_DIR}
+CONFIGURE_ARGS+=	--with-runtime-dir=${AMAVIS_DIR:Q}
 CONFIGURE_ARGS+=	--with-sockname=${AMAVIS_DIR}/amavisd.sock
-CONFIGURE_ARGS+=	--with-user=${AMAVIS_USER}
+CONFIGURE_ARGS+=	--with-user=${AMAVIS_USER:Q}
 CONFIGURE_ARGS+=	--with-milterinc=${BUILDLINK_PREFIX.libmilter}/include
 CONFIGURE_ARGS+=	--with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib
 CONFIGURE_DIRS=		${WRKSRC}/helper-progs
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 82d6345e164..e10be4ed577 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:55 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:17 rillig Exp $
 
 .include "Makefile.common"
 
@@ -24,12 +24,12 @@ REPLACE_PERL=		samplepipe.pl sysconftool
 USE_TOOLS+=		cat:run gmake perl:run
 CONFIGURE_ENV+=		CAT=${TOOLS_CAT:Q}		# makedat
 
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ARGS+=	--with-pkgconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--with-pkgconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--without-stdheaderdir
 
 AUTHDAEMONVAR?=		${VARBASE}/authdaemon
-CONFIGURE_ARGS+=	--with-authdaemonvar=${AUTHDAEMONVAR}
+CONFIGURE_ARGS+=	--with-authdaemonvar=${AUTHDAEMONVAR:Q}
 OWN_DIRS_PERMS=		${AUTHDAEMONVAR} ${COURIER_USER} ${COURIER_GROUP} 0750
 FILES_SUBST+=		AUTHDAEMONVAR=${AUTHDAEMONVAR:Q}
 
diff --git a/security/courier-authlib/Makefile.common b/security/courier-authlib/Makefile.common
index 51659d837a6..37e8cf47301 100644
--- a/security/courier-authlib/Makefile.common
+++ b/security/courier-authlib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:50:55 rillig Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/12/05 23:55:17 rillig Exp $
 
 COURIER_USER?=		courier
 COURIER_GROUP?=		mail
@@ -10,5 +10,5 @@ PKG_GROUPS=		${COURIER_GROUP}
 PKG_USERS=		${COURIER_USER}:${COURIER_GROUP}::Courier\ user
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-mailuser=${COURIER_USER}
-CONFIGURE_ARGS+=	--with-mailgroup=${COURIER_GROUP}
+CONFIGURE_ARGS+=	--with-mailuser=${COURIER_USER:Q}
+CONFIGURE_ARGS+=	--with-mailgroup=${COURIER_GROUP:Q}
diff --git a/security/cy2-digestmd5/Makefile b/security/cy2-digestmd5/Makefile
index c03d0f28253..6d238e545b6 100644
--- a/security/cy2-digestmd5/Makefile
+++ b/security/cy2-digestmd5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:55 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:17 rillig Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-digestmd5/}
 COMMENT=	Cyrus SASL DIGEST-MD5 authentication plugin
@@ -10,7 +10,7 @@ CONFLICTS=	cyrus-sasl<=2.1.19nb1
 
 CONFIGURE_ARGS+=	--enable-digest
 CONFIGURE_ARGS+=	--with-rc4
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 
 BUILD_DIRS=	${WRKSRC}/plugins
 BUILD_TARGET=	libdigestmd5.la
diff --git a/security/cy2-gssapi/Makefile b/security/cy2-gssapi/Makefile
index 3f862f41b9a..da92e4ae5c7 100644
--- a/security/cy2-gssapi/Makefile
+++ b/security/cy2-gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:55 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 23:55:17 rillig Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-gssapi/}
 COMMENT=	Cyrus SASL GSSAPI authentication plugin
@@ -8,8 +8,8 @@ CONFLICTS=	cyrus-sasl<=2.1.19nb1
 
 .include "../../security/cyrus-sasl2/Makefile.common"
 
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
-CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
+CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE:Q}
 CONFIGURE_ARGS+=	--with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
 GSSIMPL.heimdal=	heimdal
 GSSIMPL.mit-krb5=	mit
diff --git a/security/cy2-ntlm/Makefile b/security/cy2-ntlm/Makefile
index d67401f0442..76084b89944 100644
--- a/security/cy2-ntlm/Makefile
+++ b/security/cy2-ntlm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:55 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:17 rillig Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-ntlm/}
 COMMENT=	Cyrus SASL NTLM authentication plugin
@@ -7,7 +7,7 @@ SASL_PLUGIN=	yes
 .include "../../security/cyrus-sasl2/Makefile.common"
 
 CONFIGURE_ARGS+=	--enable-ntlm
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 
 BUILD_DIRS=	${WRKSRC}/plugins
 BUILD_TARGET=	libntlm.la
diff --git a/security/cy2-otp/Makefile b/security/cy2-otp/Makefile
index 1b4f87ec17a..2e60dbae620 100644
--- a/security/cy2-otp/Makefile
+++ b/security/cy2-otp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:55 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:17 rillig Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-otp/}
 COMMENT=	Cyrus SASL OTP authentication plugin
@@ -9,7 +9,7 @@ CONFLICTS=	cyrus-sasl<=2.1.19nb1
 .include "../../security/cyrus-sasl2/Makefile.common"
 
 CONFIGURE_ARGS+=	--enable-otp
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 
 BUILD_DIRS=	${WRKSRC}/plugins
 BUILD_TARGET=	libotp.la
diff --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile
index 9d87c817e91..d9f674dea66 100644
--- a/security/cy2-sql/Makefile
+++ b/security/cy2-sql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:55 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:17 rillig Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-sql/}
 COMMENT=	Cyrus SASL SQL authentication plugin
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
 
 .if !empty(PKG_OPTIONS:Mpgsql)
 .  include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pgsql=${PGSQL_PREFIX}
+CONFIGURE_ARGS+=	--with-pgsql=${PGSQL_PREFIX:Q}
 .endif
 
 .if !empty(PKG_OPTIONS:Msqlite)
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index d3660b77df2..fbe4073838f 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/12/05 20:50:55 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2005/12/05 23:55:17 rillig Exp $
 
 .include "Makefile.common"
 
@@ -18,14 +18,14 @@ USE_DB185=		no
 .  include "../../mk/bdb.buildlink3.mk"
 .endif
 
-CONFIGURE_ARGS+=	--with-dblib=${SASL_DBTYPE}
+CONFIGURE_ARGS+=	--with-dblib=${SASL_DBTYPE:Q}
 CONFIGURE_ARGS+=	--with-dbpath=${PKG_SYSCONFDIR}/sasldb
 
 # Support using Cyrus saslauthd (security/cyrus-saslauthd) for plaintext
 # password authentication.
 #
 SASLSOCKETDIR?=		${VARBASE}/run/saslauthd
-CONFIGURE_ARGS+=	--with-saslauthd=${SASLSOCKETDIR}
+CONFIGURE_ARGS+=	--with-saslauthd=${SASLSOCKETDIR:Q}
 BUILD_DEFS+=		SASLSOCKETDIR
 
 # Support using the Courier authdaemond (security/courier-authlib) for
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=	--enable-checkapop
 SASL_ENTROPY_SOURCE?=	/dev/urandom
 .endif
 .if defined(SASL_ENTROPY_SOURCE)
-CONFIGURE_ARGS+=	--with-devrandom=${SASL_ENTROPY_SOURCE}
+CONFIGURE_ARGS+=	--with-devrandom=${SASL_ENTROPY_SOURCE:Q}
 .endif
 BUILD_DEFS+=		SASL_ENTROPY_SOURCE
 
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index 27a91e14fcb..34859deb21e 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2005/11/04 19:36:57 tv Exp $
+# $NetBSD: Makefile.common,v 1.31 2005/12/05 23:55:17 rillig Exp $
 #
 # This file is currently included by:
 #
@@ -52,7 +52,7 @@ DOCDIR=			${PREFIX}/share/doc/cyrus-sasl
 PLUGINDIR=		${PREFIX}/lib/sasl2
 _PLUGINDIR=		${VIEWBASE}/lib/sasl2
 
-CONFIGURE_ARGS+=	--with-plugindir=${_PLUGINDIR}
+CONFIGURE_ARGS+=	--with-plugindir=${_PLUGINDIR:Q}
 
 # Authentication mechanisms
 CONFIGURE_ARGS+=	--disable-anon		# ANONYMOUS
diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index eff31978872..3fa9514cc94 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:55 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:17 rillig Exp $
 
 DISTNAME=	cyrus-sasl-2.1.20
 PKGNAME=	${DISTNAME:S/sasl/saslauthd/}
@@ -21,15 +21,15 @@ HOMEPAGE=		http://asg.web.cmu.edu/sasl/
 COMMENT=		Cyrus SASL plaintext authentication daemon
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 BUILD_TARGET=		all saslcache testsaslauthd
 
 SASLSOCKETDIR?=		${VARBASE}/run/saslauthd
 BUILD_DEFS+=		SASLSOCKETDIR
 FILES_SUBST+=		SASLSOCKETDIR=${SASLSOCKETDIR:Q}
-CONFIGURE_ARGS+=	--with-saslauthd="${SASLSOCKETDIR}"
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-saslauthd=${SASLSOCKETDIR:Q}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 
 .include "options.mk"
 
diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk
index 09802b75bfd..2a301974c5e 100644
--- a/security/cyrus-saslauthd/options.mk
+++ b/security/cyrus-saslauthd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2005/05/31 11:24:33 dillo Exp $
+# $NetBSD: options.mk,v 1.7 2005/12/05 23:55:17 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-saslauthd
 PKG_SUPPORTED_OPTIONS=	pam kerberos ldap gssapi
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS=	pam kerberos ldap gssapi
 ###
 .if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pam=${PAMBASE}
+CONFIGURE_ARGS+=	--with-pam=${PAMBASE:Q}
 .endif
 
 ###
@@ -39,7 +39,7 @@ PKG_OPTIONS+=		gssapi
 ###
 .if !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE}
+CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE:Q}
 CONFIGURE_ARGS+=	--with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
 GSSIMPL.heimdal=	heimdal
 GSSIMPL.mit-krb5=	mit
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index a472dfa4118..29efafebd3a 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/08/23 11:48:51 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 23:55:17 rillig Exp $
 #
 
 DISTNAME=		dirmngr-0.9.1
@@ -25,8 +25,8 @@ USE_PKGLOCALEDIR=	yes
 RCD_SCRIPTS=		dirmngr
 PKG_RCD_SCRIPTS=	yes
 
-CONFIGURE_ARGS+=	--localstatedir="${VARBASE}"
-CONFIGURE_ARGS+=	--sharedstatedir="${VARBASE}"
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE:Q}
 CONFIGURE_ENV+=		BUILDLINK_PREFIX_openldap=${BUILDLINK_PREFIX.openldap}
 CONFIGURE_ARGS+=	--with-pth-prefix=${WRKDIR}/pth
 
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index b86596d6258..b787c22dd71 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/12/05 20:50:56 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2005/12/05 23:55:17 rillig Exp $
 
 DISTNAME=	heimdal-0.7.1
 PKGREVISION=	1
@@ -21,8 +21,8 @@ MAKE_ENV+=		INSTALL_CATPAGES=no
 HEIMDAL_STATEDIR?=	${VARBASE}/heimdal
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--localstatedir=${HEIMDAL_STATEDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--localstatedir=${HEIMDAL_STATEDIR:Q}
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/krb5
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--without-krb4
@@ -45,7 +45,7 @@ CPPFLAGS+=		-I${BUILDLINK_PREFIX.readline}/include/readline
 BROKEN_READLINE_DETECTION=	yes
 .include "../../devel/readline/buildlink3.mk"
 
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 .include "../../security/openssl/buildlink3.mk"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.heimdal
@@ -84,7 +84,7 @@ KRB5_PREFIX=		# empty
 HEIMDAL_TRANSFORM=	s/^ftp/k&/
 .endif
 PLIST_SUBST+=		KRB5_PREFIX=${KRB5_PREFIX:Q}
-CONFIGURE_ARGS+=	--program-transform-name="${HEIMDAL_TRANSFORM}"
+CONFIGURE_ARGS+=	--program-transform-name=${HEIMDAL_TRANSFORM:Q}
 
 USE_PKGINSTALL=		yes
 OWN_DIRS_PERMS=		${HEIMDAL_STATEDIR} ${ROOT_USER} ${ROOT_GROUP} 0700
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index 4cf054c238c..8e88d02224f 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:56 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:17 rillig Exp $
 #
 
 DISTNAME=	${PKGNAME}-src
@@ -31,7 +31,7 @@ SUBST_MESSAGE.build=	"Patching build files."
 
 USE_OLD_DES_API=	YES
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 BUILDLINK_DEPENDS.libssh+=	libssh-0.1
 
 INSTALLATION_DIRS=	bin
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 24c785d5a26..d3369460abb 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:56 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:17 rillig Exp $
 
 DISTNAME=		ipsec-tools-0.6.3
 CATEGORIES=		security
@@ -35,11 +35,11 @@ CONFIGURE_ARGS+=	--enable-frag --enable-hybrid
 CONFIGURE_ARGS+=	--enable-adminport --enable-dpd
 CONFIGURE_ARGS+=	--enable-natt=kernel
 
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 PLIST_SUBST+=		VARBASE=${VARBASE:Q}
 
 PKG_SYSCONFSUBDIR=	racoon
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 SAMPLE_DIR=	${WRKSRC}/src/racoon/samples
 EXAMPLE_DIR=	${PREFIX}/share/examples/ipsec-tools
diff --git a/security/jessie/Makefile b/security/jessie/Makefile
index daf5a7765f0..16a0fd922e1 100644
--- a/security/jessie/Makefile
+++ b/security/jessie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:56 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 23:55:17 rillig Exp $
 #
 
 DISTNAME=		jessie-0.9.7
@@ -16,7 +16,7 @@ USE_JAVA2=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
-CONFIGURE_ARGS+=	--with-java-prefix=${PKG_JAVA_HOME}
+CONFIGURE_ARGS+=	--with-java-prefix=${PKG_JAVA_HOME:Q}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib/java/jessie
 CONFIGURE_ENV+=		JAVA=${PKG_JAVA_HOME}/bin/java
 CONFIGURE_ENV+=		JAVAC=${PKG_JAVA_HOME}/bin/javac
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 982cb010861..c26af8cb349 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/06/01 18:03:21 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/05 23:55:17 rillig Exp $
 #
 
 DISTNAME=		krb4-1.2.1
@@ -36,7 +36,7 @@ PLIST_SUBST+=		KRB4_PREFIX=k4
 KTH_KRB4_TRANSFORM=	s/^ftp$$/k4&/	# always k4ftp
 PLIST_SUBST+=		KRB4_PREFIX=
 .endif
-CONFIGURE_ARGS+=	--program-transform="${KTH_KRB4_TRANSFORM}"
+CONFIGURE_ARGS+=	--program-transform=${KTH_KRB4_TRANSFORM:Q}
 
 INFO_FILES=		kth-krb.info
 
diff --git a/security/libnasl/Makefile b/security/libnasl/Makefile
index fd964ef3e97..34fd610b1ad 100644
--- a/security/libnasl/Makefile
+++ b/security/libnasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:56 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:18 rillig Exp $
 
 .include	"../../security/nessus/Makefile.common"
 
@@ -8,7 +8,7 @@ COMMENT=	Nessus Attack Scripting Language library
 
 WRKSRC=			${WRKDIR}/libnasl
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 
 .include "../../security/nessus-libraries/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index d9b23769950..59be35b9502 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:56 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 23:55:18 rillig Exp $
 
 DISTNAME=	krb5-1.4.2
 PKGNAME=	mit-${DISTNAME:S/-signed$//}
@@ -29,8 +29,8 @@ USE_LIBTOOL=		yes
 MIT_KRB5_STATEDIR?=	${VARBASE}
 FILES_SUBST+=		MIT_KRB5_STATEDIR=${MIT_KRB5_STATEDIR:Q}
 
-CONFIGURE_ARGS+=	--localstatedir=${MIT_KRB5_STATEDIR}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--localstatedir=${MIT_KRB5_STATEDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-pkgsrc-libtool
 CONFIGURE_ARGS+=	--enable-dns
@@ -60,7 +60,7 @@ KRB5_PREFIX=		# empty
 MIT_KRB5_TRANSFORM=	s/^ftp/k&/
 .endif
 PLIST_SUBST+=		KRB5_PREFIX=${KRB5_PREFIX:Q}
-CONFIGURE_ARGS+=	--program-transform-name="${MIT_KRB5_TRANSFORM}"
+CONFIGURE_ARGS+=	--program-transform-name=${MIT_KRB5_TRANSFORM:Q}
 
 # Fix some places in the MIT krb5 sources that don't point to the correct
 # Kerberized binaries when exec'ing programs.
diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index 371f130bb71..a42101d4c70 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:57 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:18 rillig Exp $
 
 .include 	"../../security/nessus/Makefile.common"
 
@@ -9,7 +9,7 @@ COMMENT=	Core module of the Nessus Network Security Scanner
 WRKSRC=		${WRKDIR}/nessus-core
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-gtk --with-x --localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--enable-gtk --with-x --localstatedir=${VARBASE:Q}
 CONFIGURE_ENV+=		ac_cv_path_GTKCONFIG="pkg-config gtk+-2.0" \
 			ac_cv_path_GLIBCONFIG="pkg-config glib-2.0"
 
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index 24b73d2c77f..3c5c81fd805 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:57 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 23:55:18 rillig Exp $
 
 .include 	"../../security/nessus/Makefile.common"
 
@@ -12,7 +12,7 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-zlib=${BUILDLINK_PREFIX.zlib}/lib \
 			--with-ssl=${BUILDLINK_PREFIX.openssl} \
-			--localstatedir=${VARBASE}
+			--localstatedir=${VARBASE:Q}
 CONFIGURE_ENV+=		CPP=${CPP:Q}
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index d757c0c38e4..9f53e15da7d 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:57 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 23:55:18 rillig Exp $
 
 .include	"../../security/nessus/Makefile.common"
 
@@ -14,7 +14,7 @@ WRKSRC=		${WRKDIR}/nessus-plugins
 GNU_CONFIGURE=		yes
 USE_TOOLS+=	cat gzip
 
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ENV+=		CAT=${TOOLS_CAT:Q} GZIP=${TOOLS_GZIP_CMD:Q}
 
 PLIST_SRC=	${WRKDIR}/PLIST PLIST
diff --git a/security/openpam/Makefile b/security/openpam/Makefile
index 528cb09d441..9e5b661d8b9 100644
--- a/security/openpam/Makefile
+++ b/security/openpam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:57 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:18 rillig Exp $
 
 DISTNAME=	openpam-20050201
 CATEGORIES=	security
@@ -12,7 +12,7 @@ CONFLICTS+=	PAM-[0-9]*
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--without-pam-su
 CONFIGURE_ARGS+=	--with-pam-unix
 CONFIGURE_ARGS+=	--with-modules-dir=${PREFIX}/lib/security
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index 398abca3a94..b69863d6e34 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:57 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 23:55:18 rillig Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -54,12 +54,12 @@ PKG_SYSCONFSUBDIR=	ssh
 USE_PKGINSTALL=		yes
 USE_TOOLS+=		autoconf perl
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-pid-dir=${SSH_PID_DIR}
-CONFIGURE_ARGS+=	--with-ssl-dir=${SSLBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-pid-dir=${SSH_PID_DIR:Q}
+CONFIGURE_ARGS+=	--with-ssl-dir=${SSLBASE:Q}
 CONFIGURE_ARGS+=	--with-tcp-wrappers=${BUILDLINK_PREFIX.tcp_wrappers}
-CONFIGURE_ARGS+=	--with-privsep-path=${OPENSSH_CHROOT}
-CONFIGURE_ARGS+=	--with-privsep-user=${OPENSSH_USER}
+CONFIGURE_ARGS+=	--with-privsep-path=${OPENSSH_CHROOT:Q}
+CONFIGURE_ARGS+=	--with-privsep-user=${OPENSSH_USER:Q}
 CONFIGURE_ARGS+=	--with-kerberos5=/usr
 CONFIGURE_ARGS+=	--with-kerberos4=/usr
 
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 80e6274d617..dd683fc19b6 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.161 2005/12/05 20:50:57 rillig Exp $
+# $NetBSD: Makefile,v 1.162 2005/12/05 23:55:18 rillig Exp $
 
 DISTNAME=		openssh-4.2p1
 PKGNAME=		openssh-4.2.1
@@ -60,14 +60,14 @@ PKG_SYSCONFSUBDIR=	ssh
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-mantype=man
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-pid-dir=${SSH_PID_DIR}
-CONFIGURE_ARGS+=	--with-ssl-dir=${SSLBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-pid-dir=${SSH_PID_DIR:Q}
+CONFIGURE_ARGS+=	--with-ssl-dir=${SSLBASE:Q}
 CONFIGURE_ARGS+=	--with-tcp-wrappers=${BUILDLINK_PREFIX.tcp_wrappers}
 
 .if ${OPSYS} != "Interix"
-CONFIGURE_ARGS+=	--with-privsep-path=${OPENSSH_CHROOT}
-CONFIGURE_ARGS+=	--with-privsep-user=${OPENSSH_USER}
+CONFIGURE_ARGS+=	--with-privsep-path=${OPENSSH_CHROOT:Q}
+CONFIGURE_ARGS+=	--with-privsep-user=${OPENSSH_USER:Q}
 .endif
 
 # pkgsrc already enforces a "secure" version of zlib via dependencies,
diff --git a/security/openssh/options.mk b/security/openssh/options.mk
index 5bac94e7942..408105a4aa1 100644
--- a/security/openssh/options.mk
+++ b/security/openssh/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2005/09/21 18:07:09 reed Exp $
+# $NetBSD: options.mk,v 1.7 2005/12/05 23:55:18 rillig Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -13,7 +13,7 @@ PKG_SUPPORTED_OPTIONS+= pam
 
 .if !empty(PKG_OPTIONS:Mkerberos)
 .  include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+=        --with-kerberos5=${KRB5BASE}
+CONFIGURE_ARGS+=        --with-kerberos5=${KRB5BASE:Q}
 .endif
 
 .if !empty(PKG_OPTIONS:Mhpn-patch)
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 93fd55e518f..18ea217f58e 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2005/12/05 20:50:57 rillig Exp $
+# $NetBSD: Makefile,v 1.110 2005/12/05 23:55:18 rillig Exp $
 
 OPENSSL_SNAPSHOT?=	# empty
 OPENSSL_STABLE?=	# empty
@@ -45,8 +45,8 @@ TEST_TARGET=		tests
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./config
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--openssldir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--openssldir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	shared
 
 .if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index 26afab0069f..31ab68ead3a 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/08/29 09:49:07 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:18 rillig Exp $
 #
 
 DISTNAME=	pam_ldap-180
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=	--with-ldap-lib=openldap
 CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap}
 CONFIGURE_ARGS+=	--with-ldap-conf-file=${PKG_SYSCONFDIR}/pam_ldap.conf
 CONFIGURE_ARGS+=	--with-ldap-secret-file=${PKG_SYSCONFDIR}/pam_ldap.secret
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 MAKE_ENV+=		SHLIBTOOL=$(SHLIBTOOL)
 
diff --git a/security/pks/Makefile b/security/pks/Makefile
index e6cf4e7a186..853e675e1c6 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:58 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:18 rillig Exp $
 
 DISTNAME=	pks-0.9.4
 PKGREVISION=	3
@@ -43,13 +43,13 @@ OWN_DIRS_PERMS+=	${PKS_HOME}/db ${PKS_USER} ${PKS_GROUP} 0770
 OWN_DIRS_PERMS+=	${PKS_HOME}/incoming ${PKS_USER} ${PKS_GROUP} 0770
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/pks
-CONFIGURE_ARGS+=	--localstatedir=${PKS_HOME}
+CONFIGURE_ARGS+=	--localstatedir=${PKS_HOME:Q}
 #
 # pksd doesn't actually look for its config file anywhere; it must be
 # specified directly on the command-line.  Setting sysconfdir here just
 # causes the example pksd.conf file to be installed at the named location.
 #
-CONFIGURE_ARGS+=	--sysconfdir=${EGDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${EGDIR:Q}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	"Fixing hardcoded paths."
diff --git a/security/priv/Makefile b/security/priv/Makefile
index 929babf2391..72fc6691d84 100644
--- a/security/priv/Makefile
+++ b/security/priv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:17 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:18 rillig Exp $
 #
 
 DISTNAME=	priv-1.0-beta2
@@ -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}
 SUBST_CLASSES+=		sysconfdir
 SUBST_STAGE.sysconfdir=	post-configure
 SUBST_FILES.sysconfdir=	priv.1
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index caa26b105cb..8039eb71cc4 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/08/23 11:48:51 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:18 rillig Exp $
 #
 
 DISTNAME=		sfs-0.7.2
@@ -14,8 +14,8 @@ GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--with-sfsuser=sfs
 CONFIGURE_ARGS+=	--with-sfsgroup=sfs
-CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-sfsdir=${SFS_ROOT}
+CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-sfsdir=${SFS_ROOT:Q}
 CONFIGURE_ARGS+=	--disable-uvfs
 
 USE_PKGINSTALL=		yes
diff --git a/security/skey/Makefile b/security/skey/Makefile
index bd91aa9a112..3556f9654c6 100644
--- a/security/skey/Makefile
+++ b/security/skey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:19 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:18 rillig Exp $
 #
 
 DISTNAME=		skey-1.1.5
@@ -14,7 +14,7 @@ COMMENT=		Port of OpenBSD s/key implementation
 USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		yes
 USE_PKGINSTALL=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONF_FILES+=		${PREFIX}/share/examples/skey/skeykeys \
 			${PKG_SYSCONFDIR}/skeykeys
 
diff --git a/security/ssh2/Makefile.common b/security/ssh2/Makefile.common
index ce4f4bc6328..78e826d5fba 100644
--- a/security/ssh2/Makefile.common
+++ b/security/ssh2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2005/12/05 20:50:58 rillig Exp $
+# $NetBSD: Makefile.common,v 1.16 2005/12/05 23:55:18 rillig Exp $
 #
 
 DISTNAME=	ssh-3.2.9.1
@@ -55,13 +55,13 @@ CONFIGURE_ARGS+=	--without-daemonpam --without-clientpam
 CONFIGURE_ARGS+=	--without-ssh-agent1-compat
 CONFIGURE_ARGS+=	--without-ssh1-compat
 CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp-wrappers}
-CONFIGURE_ARGS+=	--with-pid-dir=${SSH_PID_DIR}
+CONFIGURE_ARGS+=	--with-pid-dir=${SSH_PID_DIR:Q}
 
 # Setting FOREIGN_ETCDIR to PKG_SYSCONFBASEDIR may seem stupid
 # if PKG_SYSCONFDIR.${PKG_SYSCONFVAR} is set but it does no harm...
 #
-CONFIGURE_ARGS+=	--with-foreign-etcdir=${PKG_SYSCONFBASEDIR}
-CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-foreign-etcdir=${PKG_SYSCONFBASEDIR:Q}
+CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR:Q}
 
 MAKE_ENV+=		PKGBASE=${PKGBASE:Q}
 MAKE_ENV+=		RM=${RM:Q}
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index fba538128bc..b9fe738d79b 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/09/28 20:52:26 rillig Exp $
+# $NetBSD: Makefile,v 1.51 2005/12/05 23:55:18 rillig Exp $
 
 DISTNAME=		stunnel-4.07
 PKGREVISION=		2
@@ -13,12 +13,12 @@ COMMENT=		Universal SSL tunnel
 
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-ssl=${SSLBASE} \
-			--with-cert-dir="${SSLCERTS}" \
-			--with-pem-dir="${SSLCERTS}" \
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q} \
+			--with-cert-dir=${SSLCERTS:Q} \
+			--with-pem-dir=${SSLCERTS:Q} \
 			--with-tcp-wrappers \
-			--sysconfdir="${PKG_SYSCONFDIR}" \
-			--localstatedir=${VARBASE}
+			--sysconfdir=${PKG_SYSCONFDIR:Q} \
+			--localstatedir=${VARBASE:Q}
 
 PKG_SYSCONFSUBDIR=	stunnel
 
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index a6dc0672c1a..03e80af8f63 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2005/11/12 14:17:45 adrianp Exp $
+# $NetBSD: Makefile,v 1.84 2005/12/05 23:55:18 rillig Exp $
 #
 
 DISTNAME=		sudo-1.6.8p9
@@ -25,7 +25,7 @@ GNU_CONFIGURE=		yes
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=	--disable-root-mailer
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 .include "options.mk"