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

CONFIGURE_ARGS.

38 files changed, 139 insertions, 139 deletions

diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index c227ea53007..f30ccc86569 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/11/22 18:15:56 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 23:55:10 rillig Exp $
 
 DISTNAME=	bogofilter-0.96.6
 CATEGORIES=	mail
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=	YES
 USE_PKGINSTALL=	YES
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 EGDIR=			${PREFIX}/share/examples/bogofilter
 CONF_FILES=		${EGDIR}/bogofilter.cf ${PKG_SYSCONFDIR}/bogofilter.cf
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index ecf82ee0d6f..7d9d9da4a6a 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2005/12/05 20:50:28 rillig Exp $
+# $NetBSD: Makefile,v 1.49 2005/12/05 23:55:10 rillig Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -17,10 +17,10 @@ USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-clamav
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-dbdir=${VIRUSDBDIR}
-CONFIGURE_ARGS+=	--with-uid=${CLAMAV_USER}
-CONFIGURE_ARGS+=	--with-group=${CLAMAV_GROUP}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-dbdir=${VIRUSDBDIR:Q}
+CONFIGURE_ARGS+=	--with-uid=${CLAMAV_USER:Q}
+CONFIGURE_ARGS+=	--with-group=${CLAMAV_GROUP:Q}
 CONFIGURE_ARGS+=	--with-tcpwrappers
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index cb85576f192..aad13f2dc72 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/12/05 20:50:29 rillig Exp $
+# $NetBSD: Makefile,v 1.46 2005/12/05 23:55:10 rillig Exp $
 
 DISTNAME=	courier-imap-4.0.6
 CATEGORIES=	mail
@@ -22,7 +22,7 @@ PKGNAME=	${DISTNAME}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/courier
 CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec/courier
 
-CONFIGURE_ARGS+=	--with-mailuser=${ROOT_USER}
+CONFIGURE_ARGS+=	--with-mailuser=${ROOT_USER:Q}
 CONFIGURE_ARGS+=	--with-piddir=${VARBASE}/run
 CONFIGURE_ARGS+=	--program-transform-name='s/\.rc$$//'
 CONFIGURE_ENV+=		OPENSSL=${SSLBASE}/bin/openssl
diff --git a/mail/courier-maildir/Makefile.common b/mail/courier-maildir/Makefile.common
index f3c8a67d4b4..72fe5a4ddc5 100644
--- a/mail/courier-maildir/Makefile.common
+++ b/mail/courier-maildir/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/11/11 07:42:08 rillig Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/12/05 23:55:10 rillig Exp $
 #
 # Package Makefiles should include this file after setting PKGNAME and
 # PKG_SUPPORTED_OPTIONS.
@@ -14,8 +14,8 @@ EGDIR=			${PREFIX}/share/examples/courier
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 CONFIGURE_ARGS+=	--disable-root-check
 CONFIGURE_ARGS+=	--enable-unicode
diff --git a/mail/cue/Makefile b/mail/cue/Makefile
index 4af82d9fdc6..19ce398e731 100644
--- a/mail/cue/Makefile
+++ b/mail/cue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2005/10/05 13:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2005/12/05 23:55:10 rillig Exp $
 
 DISTNAME=	cue-snap-20050131
 PKGNAME=	cue-20050131
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=	--without-canna
 CONFIGURE_ARGS+=	--enable-idea
 .endif
 
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 
 INSTALLATION_DIRS=	bin
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 65641bd6994..cee91ae037e 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2005/12/05 20:50:29 rillig Exp $
+# $NetBSD: Makefile,v 1.58 2005/12/05 23:55:10 rillig Exp $
 
 DISTNAME=	cyrus-imapd-2.2.12
 PKGREVISION=	2
@@ -30,14 +30,14 @@ BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
 FILES_SUBST+=		CYRUS_USER=${CYRUS_USER:Q}
 FILES_SUBST+=		CYRUS_GROUP=${CYRUS_GROUP:Q}
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER}
-CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER:Q}
+CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP:Q}
 CONFIGURE_ARGS+=	--with-cyrus-prefix=${PREFIX}/cyrus
 CONFIGURE_ARGS+=	--with-statedir=${VARBASE}/run
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-CONFIGURE_ARGS+=	--with-perl=${PERL5}
+CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
 CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
 CONFIGURE_ENV+=		ac_cv_lib_wrap_request_init=yes
 
@@ -66,7 +66,7 @@ CONFIGURE_ARGS+=	--with-krb=/usr
 .elif !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-auth=krb5
-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
@@ -99,7 +99,7 @@ BUILD_DEFS+=		CYRUS_IDLE
     (${CYRUS_IDLE} != "no")
 PKG_FAIL_REASON+=	"CYRUS_IDLE must be poll, idled or no"
 .endif
-CONFIGURE_ARGS+=	--with-idle=${CYRUS_IDLE}
+CONFIGURE_ARGS+=	--with-idle=${CYRUS_IDLE:Q}
 .if ${CYRUS_IDLE} == "idled"
 PLIST_SUBST+=		IDLED=
 .else
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 49522ffc666..d93daa7b9b0 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:29 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 23:55:10 rillig Exp $
 
 DISTNAME=		cyrus-imapd-2.1.18
 SVR4_PKGNAME=		cimap
@@ -32,13 +32,13 @@ BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
 FILES_SUBST+=		CYRUS_USER=${CYRUS_USER:Q}
 FILES_SUBST+=		CYRUS_GROUP=${CYRUS_GROUP:Q}
 
-CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER}
-CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP}
+CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER:Q}
+CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP:Q}
 CONFIGURE_ARGS+=	--with-cyrus-prefix=${PREFIX}/cyrus
 CONFIGURE_ARGS+=	--with-statedir=${VARBASE}/run
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-CONFIGURE_ARGS+=	--with-perl=${PERL5}
+CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
 CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
 CONFIGURE_ENV+=		ac_cv_lib_wrap_request_init=yes
 
@@ -95,7 +95,7 @@ CONFIGURE_ARGS+=	--with-krb=/usr
 .elif !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-auth=unix
-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/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 5a80b8c5528..63823394da4 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/08/23 11:48:48 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/05 23:55:10 rillig Exp $
 
 DISTNAME=		dovecot-0.99.14
 PKGREVISION=		1
@@ -16,9 +16,9 @@ USE_LIBTOOL=		yes
 USE_PKGINSTALL= 	yes
 GNU_CONFIGURE=		yes
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ARGS+=	--with-ssldir=${SSLCERTS}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--with-ssldir=${SSLCERTS:Q}
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index b8728b6d92e..0013c2baf9c 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:29 rillig Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/05 23:55:10 rillig Exp $
 
 DISTNAME=	dspam-3.6.2
 CATEGORIES=	mail
@@ -57,15 +57,15 @@ DSPAM_PIDDIR?=		${VARBASE}/run/dspam
 DSPAM_WWWUSER?=		${APACHE_USER}
 DSPAM_WWWGROUP?=	${APACHE_GROUP}
 
-CONFIGURE_ARGS+=	--with-signature-life=${DSPAM_SIGNATURE_LIFE}
-CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME}			\
-			--with-dspam-home-owner=${DSPAM_USER}		\
-			--with-dspam-home-group=${DSPAM_GROUP}		\
-			--with-dspam-owner=${DSPAM_USER}		\
-			--with-dspam-group=${DSPAM_GROUP}		\
-			--with-dspam-mode=${DSPAM_BINMODE}		\
-			--with-logdir=${DSPAM_LOGDIR}			\
-			--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-signature-life=${DSPAM_SIGNATURE_LIFE:Q}
+CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME:Q}			\
+			--with-dspam-home-owner=${DSPAM_USER:Q}		\
+			--with-dspam-home-group=${DSPAM_GROUP:Q}		\
+			--with-dspam-owner=${DSPAM_USER:Q}		\
+			--with-dspam-group=${DSPAM_GROUP:Q}		\
+			--with-dspam-mode=${DSPAM_BINMODE:Q}		\
+			--with-logdir=${DSPAM_LOGDIR:Q}			\
+			--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 .include "options.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
index 80748d14dd7..a10092adc73 100644
--- a/mail/esmtp/Makefile
+++ b/mail/esmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/11/12 17:55:59 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 23:55:10 rillig Exp $
 #
 
 DISTNAME=	esmtp-0.5.1
@@ -16,7 +16,7 @@ USE_PKGINSTALL=		yes
 USE_TOOLS+=		bison flex
 PTHREAD_OPTS+=		require
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	"Fixing hardcoded paths."
diff --git a/mail/fetchmail/options.mk b/mail/fetchmail/options.mk
index 86307d57e40..c304cd60949 100644
--- a/mail/fetchmail/options.mk
+++ b/mail/fetchmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2005/10/25 17:52:38 scottr Exp $
+# $NetBSD: options.mk,v 1.14 2005/12/05 23:55:10 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fetchmail
 PKG_SUPPORTED_OPTIONS=	inet6 kerberos4 kerberos gssapi ssl
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=	--enable-inet6
 ### Authentication via GSSAPI (currently only over Kerberos V) support.
 ###
 .if !empty(PKG_OPTIONS:Mgssapi)
-CONFIGURE_ARGS+=	--with-gssapi=${KRB5BASE}
+CONFIGURE_ARGS+=	--with-gssapi=${KRB5BASE:Q}
 .else
 CONFIGURE_ARGS+=	--with-gssapi=no
 .endif
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=	--with-kerberos=no
 .if !empty(PKG_OPTIONS:Mkerberos) || !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"
 PKG_USE_KERBEROS=	yes
-CONFIGURE_ARGS+=        --with-kerberos5=${KRB5BASE}
+CONFIGURE_ARGS+=        --with-kerberos5=${KRB5BASE:Q}
 .else
 CONFIGURE_ARGS+=        --with-kerberos5=no
 .endif
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+=        --with-kerberos5=no
 ###
 .if !empty(PKG_OPTIONS:Mssl)
 .  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
 .else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
diff --git a/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile
index d936e8fa59d..c2de7692f96 100644
--- a/mail/libspf-alt/Makefile
+++ b/mail/libspf-alt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:11 rillig Exp $
 
 DISTNAME=	libspf_alt-0.4.0
 PKGREVISION=	2
@@ -12,7 +12,7 @@ COMMENT=	Sender Permitted Framework (SPF) library
 BUILDLINK_DEPENDS.bind+=	bind>=9.2.3nb3
 
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--with-bind=${BUILDLINK_PREFIX.bind} --prefix=${PREFIX}
+CONFIGURE_ARGS+=--with-bind=${BUILDLINK_PREFIX.bind} --prefix=${PREFIX:Q}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../net/bind9/buildlink3.mk"
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 62e7c2805d4..b87a98ad587 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/10/05 13:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:11 rillig Exp $
 #
 
 DISTNAME=	mail-notification-1.0
@@ -16,7 +16,7 @@ USE_TOOLS+=		gmake pkg-config
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 GCONF2_SCHEMAS=		mail-notification.schemas
 
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 1290e09bfe5..fed018a270d 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/11/11 07:34:30 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 23:55:11 rillig Exp $
 
 DISTNAME=	maildrop-2.0.1
 CATEGORIES=     security
@@ -29,12 +29,12 @@ PKGNAME=	${DISTNAME}
 #
 MAILDROP_TRUSTED_USERS?=	${ROOT_USER} ${COURIER_USER} qmaild
 
-CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-maildirquota
-CONFIGURE_ARGS+=	--enable-maildrop-uid=${ROOT_USER}
-CONFIGURE_ARGS+=	--enable-maildrop-gid=${COURIER_GROUP}
-CONFIGURE_ARGS+=	--enable-trusted-users='${MAILDROP_TRUSTED_USERS}'
-CONFIGURE_ARGS+=	--enable-trusted-groups='${COURIER_GROUP}'
+CONFIGURE_ARGS+=	--enable-maildrop-uid=${ROOT_USER:Q}
+CONFIGURE_ARGS+=	--enable-maildrop-gid=${COURIER_GROUP:Q}
+CONFIGURE_ARGS+=	--enable-trusted-users=${MAILDROP_TRUSTED_USERS:Q}
+CONFIGURE_ARGS+=	--enable-trusted-groups=${COURIER_GROUP:Q}
 CONFIGURE_ARGS+=	--enable-syslog=1
 
 .if !empty(PKG_OPTIONS:Mauthlib)
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 1bd395f3dfe..d45d84e0769 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:33 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:11 rillig Exp $
 
 DISTNAME=	mailman-2.1.6
 CATEGORIES=	mail www
@@ -72,15 +72,15 @@ PYTHON_PATCH_SCRIPTS+=	admin/bin/faq2ht.py
 PYTHON_PATCH_SCRIPTS+=	admin/bin/mm2do
 PYTHON_PATCH_SCRIPTS+=	bin/msgfmt.py
 
-CONFIGURE_ARGS+=	--with-cgi-gid=${MAILMAN_CGIGROUP}
+CONFIGURE_ARGS+=	--with-cgi-gid=${MAILMAN_CGIGROUP:Q}
 .if ${MAILMAN_CGIEXT} != "none"
-CONFIGURE_ARGS+=	--with-cgi-ext=${MAILMAN_CGIEXT}
+CONFIGURE_ARGS+=	--with-cgi-ext=${MAILMAN_CGIEXT:Q}
 .endif
-CONFIGURE_ARGS+=	--with-groupname=${MAILMAN_GROUP}
-CONFIGURE_ARGS+=	--with-mail-gid=${MAILMAN_MAILGROUP}
-CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
-CONFIGURE_ARGS+=	--with-username=${MAILMAN_USER}
-CONFIGURE_ARGS+=	--with-var-prefix=${MAILMAN_DATADIR}
+CONFIGURE_ARGS+=	--with-groupname=${MAILMAN_GROUP:Q}
+CONFIGURE_ARGS+=	--with-mail-gid=${MAILMAN_MAILGROUP:Q}
+CONFIGURE_ARGS+=	--with-python=${PYTHONBIN:Q}
+CONFIGURE_ARGS+=	--with-username=${MAILMAN_USER:Q}
+CONFIGURE_ARGS+=	--with-var-prefix=${MAILMAN_DATADIR:Q}
 CONFIGURE_ARGS+=	--without-permcheck
 
 # Put in externally invalid defaults (MESSAGE directs how to fix it)
diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index afd148680d6..abe17c23081 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:33 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:11 rillig Exp $
 #
 
 DISTNAME=		mairix-0.16.1
@@ -12,7 +12,7 @@ COMMENT=		Program for indexing and searching email messages
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 
 USE_MAKEINFO=		YES
 INFO_FILES=		mairix.info
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index c2ca9f1cf45..cc02f8f4d20 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/10/21 22:26:59 tron Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 23:55:11 rillig Exp $
 
 DISTNAME=	milter-greylist-2.0.2
 CATEGORIES=	mail
@@ -13,8 +13,8 @@ USE_PKGINSTALL=	YES
 
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-user=smmsp
-CONFIGURE_ARGS+=--with-libspf_alt=${PREFIX}
-CONFIGURE_ARGS+=--prefix=${PREFIX}
+CONFIGURE_ARGS+=--with-libspf_alt=${PREFIX:Q}
+CONFIGURE_ARGS+=--prefix=${PREFIX:Q}
 BUILD_TARGET=	milter-greylist
 
 PKG_GROUPS=	smmsp
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index e153e73d4d6..398a209801f 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:34 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:11 rillig Exp $
 
 DISTNAME=		mimedefang-2.52
 PKGREVISION=		1
@@ -46,12 +46,12 @@ OWN_DIRS_PERMS+=	${DEFANG_SPOOLDIR} ${DEFANG_USER} ${DEFANG_GROUP} 0700
 CONF_FILES+=		${EGDIR}/mimedefang-filter ${PKG_SYSCONFDIR}/mimedefang-filter
 CONF_FILES+=		${EGDIR}/sa-mimedefang.cf ${PKG_SYSCONFDIR}/sa-mimedefang.cf
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-confsubdir=
 CONFIGURE_ARGS+=	--with-milterinc=${BUILDLINK_PREFIX.libmilter}/include
 CONFIGURE_ARGS+=	--with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib
-CONFIGURE_ARGS+=	--with-spooldir=${DEFANG_SPOOLDIR}
-CONFIGURE_ARGS+=	--with-quarantinedir=${DEFANG_SPOOLDIR}
+CONFIGURE_ARGS+=	--with-spooldir=${DEFANG_SPOOLDIR:Q}
+CONFIGURE_ARGS+=	--with-quarantinedir=${DEFANG_SPOOLDIR:Q}
 # CONFIGURE_ARGS+=	--disable-anti-virus
 #	list the paths where they _would_ be installed, so they
 #	can be found at runtime. -- they have to be listed
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 36a97ef3b2b..18597fdf4b3 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:34 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/05 23:55:11 rillig Exp $
 
 DISTNAME=		mutt-1.5.11
 PKGREVISION=	2
@@ -23,7 +23,7 @@ USE_TOOLS+=		perl:run
 REPLACE_PERL=		*.pl */*.pl
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}			\
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}			\
 			--with-docdir=${PREFIX}/share/doc/mutt		\
 			--without-included-gettext			\
 			--enable-pop					\
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index ffd0e8f2c90..1c662836fc1 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2005/10/04 15:37:32 tonio Exp $
+# $NetBSD: options.mk,v 1.11 2005/12/05 23:55:11 rillig Exp $
 
 # Global and legacy options
 
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
 ###
 .if !empty(PKG_OPTIONS:Mssl)
 .  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
 .else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 605a01a16f7..230c4a648fc 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2005/12/05 20:50:34 rillig Exp $
+# $NetBSD: Makefile,v 1.130 2005/12/05 23:55:11 rillig Exp $
 
 DISTNAME=		mutt-1.4.2.1i
 PKGNAME=		${DISTNAME:C/i$//}
@@ -22,7 +22,7 @@ BUILD_USES_MSGFMT=	yes
 USE_PKGLOCALEDIR=	yes
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}			\
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}			\
 			--with-docdir=${PREFIX}/share/doc/mutt		\
 			--without-included-gettext			\
 			--enable-pop					\
diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk
index 9b22cdc1be7..d0390af0eef 100644
--- a/mail/mutt/options.mk
+++ b/mail/mutt/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2005/05/31 10:01:38 dillo Exp $
+# $NetBSD: options.mk,v 1.8 2005/12/05 23:55:11 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
 PKG_SUPPORTED_OPTIONS=	slang ncurses ssl buffy-size
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncurses}
 ###
 .if !empty(PKG_OPTIONS:Mssl)
 .  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
 .else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index cf2236f0854..88ec858eae6 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/12/05 20:50:34 rillig Exp $
+# $NetBSD: Makefile,v 1.60 2005/12/05 23:55:11 rillig Exp $
 
 DISTNAME=		nmh-1.0.4
 PKGREVISION=		6
@@ -29,16 +29,16 @@ GNU_CONFIGURE=		yes
 USE_PKGINSTALL=		yes
 
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/libexec/nmh
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-nmh-pop
-CONFIGURE_ARGS+=	--with-mts=${NMH_MTA}
+CONFIGURE_ARGS+=	--with-mts=${NMH_MTA:Q}
 
 .if defined(NMH_EDITOR)
-CONFIGURE_ARGS+=	--with-editor=${NMH_EDITOR}
+CONFIGURE_ARGS+=	--with-editor=${NMH_EDITOR:Q}
 .endif
 
 .if defined(NMH_PAGER)
-CONFIGURE_ARGS+=	--with-pager=${NMH_PAGER}
+CONFIGURE_ARGS+=	--with-pager=${NMH_PAGER:Q}
 .endif
 
 .if defined(KERBEROS)
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index cfd33e11411..acf0da9f272 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:34 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:11 rillig Exp $
 
 DISTNAME=		nullmailer-1.00
 CATEGORIES=		mail
@@ -11,7 +11,7 @@ COMMENT=		Simple relay-only mail transport agent
 USE_LANGUAGES=		c++
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+= 	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= 	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/spool
 CONFIGURE_ARGS+=	--bindir=${PREFIX}/libexec/nullmailer
 CONFIGURE_ARGS+=	--sbindir=${PREFIX}/libexec/nullmailer
diff --git a/mail/pine-pgp-filters/Makefile b/mail/pine-pgp-filters/Makefile
index beffd21dbd3..5136addd006 100644
--- a/mail/pine-pgp-filters/Makefile
+++ b/mail/pine-pgp-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/02/07 15:54:04 abs Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:11 rillig Exp $
 #
 
 DISTNAME=		pine-pgp-filters-1.1
@@ -11,7 +11,7 @@ HOMEPAGE=		http://dougbarton.net/FreeBSD/Downloads/
 COMMENT=		Filters to integrate Pine with gnupg or pgp
 
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 
 DOCDIR=			 ${PREFIX}/share/doc/pine-pgp-filters
 DOCFILES=		BUGS CHANGES INSTALL LICENSE README
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 46dab7713b5..51a158d4b16 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/12/05 14:13:05 taca Exp $
+# $NetBSD: Makefile,v 1.53 2005/12/05 23:55:11 rillig Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -16,8 +16,8 @@ COMMENT=		Qualcomm's POP server for Eudora
 
 .include "Makefile.common"
 
-CONFIGURE_ARGS+=	--enable-apop=${QPOPPER_APOP_AUTH} \
-			--enable-popuid=${QPOPPER_USER} \
+CONFIGURE_ARGS+=	--enable-apop=${QPOPPER_APOP_AUTH:Q} \
+			--enable-popuid=${QPOPPER_USER:Q} \
 			--disable-update-abort --without-gdbm
 
 .include "options.mk"
@@ -28,7 +28,7 @@ QPOPPER_APOP_AUTH?=	${PKG_SYSCONFDIR}/apop.auth
 DB_SUFFIX?=		db
 
 .if defined(QPOPPER_SPOOL_DIR)
-CONFIGURE_ARGS+=	--enable-spool-dir=${QPOPPER_SPOOL_DIR}
+CONFIGURE_ARGS+=	--enable-spool-dir=${QPOPPER_SPOOL_DIR:Q}
 .endif
 
 USE_PKGINSTALL=		yes
diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common
index db912af49fc..a3a9dfbbeaa 100644
--- a/mail/qpopper/Makefile.common
+++ b/mail/qpopper/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2005/06/13 16:53:47 taca Exp $
+# $NetBSD: Makefile.common,v 1.18 2005/12/05 23:55:11 rillig Exp $
 
 QPOPPER_MASTER_SITES+=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \
 			http://core.ring.gr.jp/archives/net/mail/qpopper/
@@ -10,6 +10,6 @@ VERSION=		4.0.8
 QPOPPER_FAC?=		LOCAL1
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q} \
 			--enable-log-facility=LOG_${QPOPPER_FAC}
 LIBS+=			${LDFLAGS}
diff --git a/mail/qpopper/options.mk b/mail/qpopper/options.mk
index 6adfc1b98d0..2c19ce21476 100644
--- a/mail/qpopper/options.mk
+++ b/mail/qpopper/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2005/12/05 14:13:05 taca Exp $
+# $NetBSD: options.mk,v 1.11 2005/12/05 23:55:11 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qpopper
 PKG_SUPPORTED_OPTIONS=	drac inet6 kerberos pam qpopper-servermode ssl
@@ -10,7 +10,7 @@ PKG_OPTIONS_LEGACY_VARS+=	QPOPPER_USE_DRAC:drac
 
 .if !empty(PKG_OPTIONS:Mssl)
 .  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 .else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 40fc789f50f..9953024b733 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: Makefile,v 1.66 2005/12/05 23:55:11 rillig Exp $
 
 DISTNAME=	Mail-SpamAssassin-3.1.0
 PKGNAME=	spamassassin-3.1.0
@@ -47,7 +47,7 @@ PLIST_SRC=		${PKGDIR}/PLIST ${PLIST_ADD}
 PERL5_PACKLIST=		auto/Mail/SpamAssassin/.packlist
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_DIRS=		${WRKSRC}/spamc
 BUILD_DIRS=		${WRKSRC}
 PERL5_CONFIGURE=	NO # we need the default "do-configure" target
diff --git a/mail/spamprobe/options.mk b/mail/spamprobe/options.mk
index 6073bde1d2a..5d863c13cf9 100644
--- a/mail/spamprobe/options.mk
+++ b/mail/spamprobe/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/06/29 00:06:58 hubertf Exp $
+# $NetBSD: options.mk,v 1.2 2005/12/05 23:55:11 rillig Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.spamprobe
 PKG_SUPPORTED_OPTIONS=		bdb
@@ -9,6 +9,6 @@ PKG_SUGGESTED_OPTIONS=		bdb
 .if !empty(PKG_OPTIONS:Mbdb)
 BDB_ACCEPTED=           db4 # db3 db2 (not tested)
 .include "../../mk/bdb.buildlink3.mk"
-CONFIGURE_ARGS+=        --with-db=${BDBBASE}
+CONFIGURE_ARGS+=        --with-db=${BDBBASE:Q}
 .endif
 
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 8066541a16a..59063e380ec 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/05 23:55:11 rillig Exp $
 
 DISTNAME=	sqwebmail-5.0.6
 CATEGORIES=	mail www
@@ -41,22 +41,22 @@ MIME_TYPES=		${PKG_SYSCONFDIR}/mime.types:${PKG_SYSCONFBASEDIR}/httpd/mime.types
 # This is used by the sqwebmail configure script to set the location of
 # the sqwebmaild socket file and lockfile.
 #
-CONFIGURE_ARGS+=	--localstatedir=${SQWEBMAIL_STATEDIR}
+CONFIGURE_ARGS+=	--localstatedir=${SQWEBMAIL_STATEDIR:Q}
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/courier
 CONFIGURE_ARGS+=	--program-transform-name='s/\.rc$$//'
 
 CONFIGURE_ARGS+=	--enable-cgibindir=${PREFIX}/libexec/cgi-bin
 CONFIGURE_ARGS+=	--enable-https=auto
-CONFIGURE_ARGS+=	--enable-imagedir=${SQWEBMAIL_IMAGEDIR}
-CONFIGURE_ARGS+=	--enable-imageurl=${SQWEBMAIL_IMAGEURL}
-CONFIGURE_ARGS+=	--enable-mimetypes="${MIME_TYPES}"
-CONFIGURE_ARGS+=	--with-cachedir=${SQWEBMAIL_CACHEDIR}
-CONFIGURE_ARGS+=	--with-cacheowner=${ROOT_USER}
-CONFIGURE_ARGS+=	--with-calendardir=${SQWEBMAIL_CALENDARDIR}
+CONFIGURE_ARGS+=	--enable-imagedir=${SQWEBMAIL_IMAGEDIR:Q}
+CONFIGURE_ARGS+=	--enable-imageurl=${SQWEBMAIL_IMAGEURL:Q}
+CONFIGURE_ARGS+=	--enable-mimetypes=${MIME_TYPES:Q}
+CONFIGURE_ARGS+=	--with-cachedir=${SQWEBMAIL_CACHEDIR:Q}
+CONFIGURE_ARGS+=	--with-cacheowner=${ROOT_USER:Q}
+CONFIGURE_ARGS+=	--with-calendardir=${SQWEBMAIL_CALENDARDIR:Q}
 CONFIGURE_ARGS+=	--with-ispell="${LOCALBASE}/bin/ispell"
 CONFIGURE_ARGS+=	--with-mailer="${SENDMAIL} -oi -t"
-CONFIGURE_ARGS+=	--with-mailgroup=${COURIER_GROUP}
+CONFIGURE_ARGS+=	--with-mailgroup=${COURIER_GROUP:Q}
 CONFIGURE_ARGS+=	--with-piddir=${VARBASE}/run
 
 CONFIGURE_ENV+=		GPG="${LOCALBASE}/bin/gpg"
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 64c61ca5085..b2769ed4ae9 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:11 rillig Exp $
 #
 # TLS functionality needs testing. Please let me know the result,
 # and preferably info about your system.
@@ -19,7 +19,7 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:S/.orig$//}
 USE_TOOLS+=		gmake
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
 
 .include "options.mk"
 
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index f87e8006d75..b492ef587d4 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/06/01 20:08:01 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/05 23:55:11 rillig Exp $
 
 .include "Makefile.common"
 
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--disable-spamassassin-plugin
 CONFIGURE_ARGS+=	--disable-mathml-viewer-plugin
 
 PKG_SYSCONFSUBDIR=	sylpheed
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/sylpheed-devel/Makefile b/mail/sylpheed-devel/Makefile
index 44af5aae571..d3916e43eb7 100644
--- a/mail/sylpheed-devel/Makefile
+++ b/mail/sylpheed-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/12/02 07:48:27 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:12 rillig Exp $
 
 DISTNAME=	sylpheed-2.1.8
 CATEGORIES=	mail news x11
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ARGS+=	--enable-compface
 
 PKG_SYSCONFSUBDIR=	sylpheed
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 EGDIR=		${PREFIX}/share/examples/sylpheed
 CONF_FILES=	${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index fd2b83dedb4..cb1cbbff46a 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2005/11/27 19:27:20 salo Exp $
+# $NetBSD: Makefile,v 1.84 2005/12/05 23:55:11 rillig Exp $
 
 DISTNAME=	sylpheed-2.0.4
 CATEGORIES=	mail news x11
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-compface
 
 PKG_SYSCONFSUBDIR=	sylpheed
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 PKG_OPTIONS_VAR=        PKG_OPTIONS.sylpheed
 PKG_SUPPORTED_OPTIONS=  jpilot ldap inet6
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index c8e6ca9fe1e..cc6f334c174 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/10/07 18:42:33 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:12 rillig Exp $
 #
 
 DISTNAME=	sympa-4.1.2
@@ -35,13 +35,13 @@ OPSYSVARS+=	DEPENDS
 
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-confdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-cgidir=${SYMPA_BIN}
+CONFIGURE_ARGS+=	--with-confdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-cgidir=${SYMPA_BIN:Q}
 CONFIGURE_ARGS+=	--with-iconsdir=${SYMPA_PREFIX}/httpd/icons
-CONFIGURE_ARGS+=	--with-bindir=${SYMPA_BIN}
-CONFIGURE_ARGS+=	--with-sbindir=${SYMPA_BIN}
-CONFIGURE_ARGS+=	--with-libexecdir=${SYMPA_BIN}
-CONFIGURE_ARGS+=	--with-libdir=${SYMPA_BIN}
+CONFIGURE_ARGS+=	--with-bindir=${SYMPA_BIN:Q}
+CONFIGURE_ARGS+=	--with-sbindir=${SYMPA_BIN:Q}
+CONFIGURE_ARGS+=	--with-libexecdir=${SYMPA_BIN:Q}
+CONFIGURE_ARGS+=	--with-libdir=${SYMPA_BIN:Q}
 CONFIGURE_ARGS+=	--with-datadir=${SYMPA_BIN}/etc
 CONFIGURE_ARGS+=	--with-expldir=${SYMPA_VARBASE}/expl
 CONFIGURE_ARGS+=	--with-mandir=${PREFIX}/${PKGMANDIR}
@@ -50,14 +50,14 @@ CONFIGURE_ARGS+=	--with-piddir=${SYMPA_VARBASE}/run
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}/sympa
 CONFIGURE_ARGS+=	--with-nlsdir=${SYMPA_PREFIX}/nls
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/html/sympa
-CONFIGURE_ARGS+=	--with-scriptdir=${SYMPA_BIN}
+CONFIGURE_ARGS+=	--with-scriptdir=${SYMPA_BIN:Q}
 CONFIGURE_ARGS+=	--with-sampledir=${PREFIX}/share/examples/sympa
-CONFIGURE_ARGS+=	--with-spooldir=${SYMPA_SPOOL}
-CONFIGURE_ARGS+=	--with-perl=${PERL5}
+CONFIGURE_ARGS+=	--with-spooldir=${SYMPA_SPOOL:Q}
+CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
 CONFIGURE_ARGS+=	--with-mhonarc=${MHONARC_PREFIX}/bin/mhonarc
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}/bin/openssl
-CONFIGURE_ARGS+=	--with-user=${SYMPA_USER}
-CONFIGURE_ARGS+=	--with-group=${SYMPA_GROUP}
+CONFIGURE_ARGS+=	--with-user=${SYMPA_USER:Q}
+CONFIGURE_ARGS+=	--with-group=${SYMPA_GROUP:Q}
 
 MHONARC_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=		MHONARC_PREFIX=mhonarc
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index 294352872d7..b5df6bcd489 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:46:28 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:12 rillig Exp $
 
 DISTNAME=	teapop-0.3.8
 PKGREVISION=	2
@@ -14,7 +14,7 @@ USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--enable-flock
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-piddir=${VARBASE}/run
 
 EGDIR=		${PREFIX}/share/examples/teapop
diff --git a/mail/yatsvrs/Makefile b/mail/yatsvrs/Makefile
index f417a44cdb4..605240fcdf4 100644
--- a/mail/yatsvrs/Makefile
+++ b/mail/yatsvrs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:36 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:12 rillig Exp $
 #
 
 DISTNAME=		yatsvrs-5.00p6
@@ -21,9 +21,9 @@ EXAMPLES=		yatrc2 yatsvrrc
 EXAMPLESDIR=		${PREFIX}/share/examples/yatsvr5
 
 CONFIGURE_ARGS+=	--enable-popper-xmit
-CONFIGURE_ARGS+=	--with-log-facility=${YATSVR_LOGFAC}
-CONFIGURE_ARGS+=	--with-yat-sys-dir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-yat-sys-old-dir-v4=${OLDCONFDIR}
+CONFIGURE_ARGS+=	--with-log-facility=${YATSVR_LOGFAC:Q}
+CONFIGURE_ARGS+=	--with-yat-sys-dir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-yat-sys-old-dir-v4=${OLDCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-shadow-password
 
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL