chat/*: remove unnecessary :Q modifiers

18 files changed, 57 insertions, 57 deletions

diff --git a/chat/anope/Makefile b/chat/anope/Makefile
index f137e6599fd..5e5448bc972 100644
--- a/chat/anope/Makefile
+++ b/chat/anope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/07/09 06:37:52 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/01/13 23:18:25 rillig Exp $
 
 DISTNAME=	anope-1.7.21
 PKGREVISION=	8
@@ -17,8 +17,8 @@ USE_TOOLS+=	gmake perl:run
 ANOPE_USER=	anope
 ANOPE_GROUP=	anope
 RCD_SCRIPTS=	anope
-FILES_SUBST+=	ANOPE_USER=${ANOPE_USER:Q}
-FILES_SUBST+=	ANOPE_GROUP=${ANOPE_GROUP:Q}
+FILES_SUBST+=	ANOPE_USER=${ANOPE_USER}
+FILES_SUBST+=	ANOPE_GROUP=${ANOPE_GROUP}
 
 USERGROUP_PHASE=	pre-install
 PKG_USERS_VARS+=	ANOPE_USER
@@ -29,11 +29,11 @@ PKG_GROUPS_VARS+=	ANOPE_GROUP
 PKG_USERS=	${ANOPE_USER}:${ANOPE_GROUP}
 PKG_HOME.${ANOPE_USER}=		${PREFIX}/lib/anope
 PKG_GROUPS=	${ANOPE_GROUP}
-MAKE_ENV+=	RUNGROUP=${ANOPE_GROUP:Q}
+MAKE_ENV+=	RUNGROUP=${ANOPE_GROUP}
 OWN_DIRS_PERMS+=	${PREFIX}/lib/anope/logs \
-			${ANOPE_USER:Q} ${ANOPE_GROUP:Q} 2755
+			${ANOPE_USER} ${ANOPE_GROUP} 2755
 OWN_DIRS_PERMS+=	${PREFIX}/lib/anope/modules/runtime \
-			${ANOPE_USER:Q} ${ANOPE_GROUP:Q} 2755
+			${ANOPE_USER} ${ANOPE_GROUP} 2755
 
 CONF_FILES_PERMS+=	${PREFIX}/share/examples/anope/example.conf \
 			${PREFIX}/lib/anope/services.conf \
@@ -42,7 +42,7 @@ CONF_FILES_PERMS+=	${PREFIX}/share/examples/anope/example.conf \
 CONFIGURE_ARGS+=	--with-permissions=077
 CONFIGURE_ARGS+=	--with-bindir=${PREFIX}/lib/anope
 CONFIGURE_ARGS+=	--with-datadir=${PREFIX}/lib/anope
-CONFIGURE_ARGS+=	--with-rungroup=${ANOPE_GROUP:Q}
+CONFIGURE_ARGS+=	--with-rungroup=${ANOPE_GROUP}
 
 .include "options.mk"
 
diff --git a/chat/ctrlproxy/Makefile b/chat/ctrlproxy/Makefile
index 8f71344f3c1..18673910c28 100644
--- a/chat/ctrlproxy/Makefile
+++ b/chat/ctrlproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/09/19 13:04:19 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/01/13 23:18:25 rillig Exp $
 #
 
 DISTNAME=		ctrlproxy-3.0.8
@@ -26,7 +26,7 @@ INSTALLATION_DIRS+=	share/examples/ctrlproxy
 .include "options.mk"
 
 post-install:
-	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR:Q} ${MAKE} install
+	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR} ${MAKE} install
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/ctrlproxy/README
 	${INSTALL_DATA} ${WRKSRC}/motd \
 		${DESTDIR}${PREFIX}/share/examples/ctrlproxy/motd
diff --git a/chat/dircproxy/Makefile b/chat/dircproxy/Makefile
index d3b5e1514c7..a7dc9c46492 100644
--- a/chat/dircproxy/Makefile
+++ b/chat/dircproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2017/08/01 16:58:17 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2018/01/13 23:18:25 rillig Exp $
 
 DISTNAME=	dircproxy-1.2.0-beta2
 PKGNAME=	${DISTNAME:S/-beta/beta/}
@@ -20,11 +20,11 @@ CONFLICTS=		dircproxy<=1.1.0
 
 REPLACE_PERL+=		contrib/log.pl contrib/privmsg-log.pl
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 EGDIR=			${PREFIX}/share/examples/dircproxy
-CONF_FILES=		${EGDIR:Q}/dircproxyrc.sample \
-			${PKG_SYSCONFDIR:Q}/dircproxyrc
+CONF_FILES=		${EGDIR}/dircproxyrc.sample \
+			${PKG_SYSCONFDIR}/dircproxyrc
 RCD_SCRIPTS=		dircproxy
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile
index 41ad5b037d6..ea77740e64c 100644
--- a/chat/eggdrop/Makefile
+++ b/chat/eggdrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2014/01/11 14:42:01 adam Exp $
+# $NetBSD: Makefile,v 1.37 2018/01/13 23:18:25 rillig Exp $
 
 DISTNAME=	eggdrop1.6.21
 PKGNAME=	eggdrop-1.6.21
@@ -16,7 +16,7 @@ MAKE_JOBS_SAFE=	no
 
 PLIST_VARS=		dynamic
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=		TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include"
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index d96b588a648..9a31d9c1597 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2017/08/07 07:56:58 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2018/01/13 23:18:25 rillig Exp $
 
 DISTNAME=	gale-0.99fruit
 PKGNAME=	gale-0.99f
@@ -15,7 +15,7 @@ MAKE_JOBS_SAFE=	no
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=		PROG_GLIB_CONFIG=${GLIB_CONFIG:Q}
 
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.boehm-gc}/include/gc
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index a2045b9390c..c416176664a 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2017/11/30 16:45:15 adam Exp $
+# $NetBSD: Makefile,v 1.118 2018/01/13 23:18:26 rillig Exp $
 
 DISTNAME=	gnomeicu-0.99.12
 PKGREVISION=	62
@@ -18,7 +18,7 @@ BROKEN_GETTEXT_DETECTION=	YES
 
 LIBS.SunOS+=		-lsocket
 
-CONFIGURE_ARGS+=	--sysconfdir=${EGDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${EGDIR}
 
 EGDIR=			${PREFIX}/share/examples/gnomeicu
 CONF_FILES=		${EGDIR}/sound/events/GnomeICU.soundlist \
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index a0a0975f7e6..3985545d7ec 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2017/11/23 17:19:49 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2018/01/13 23:18:26 rillig Exp $
 #
 
 DISTNAME=	gossip-0.10.2
@@ -18,7 +18,7 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 GCONF_SCHEMAS=		gossip.schemas
 
diff --git a/chat/inspircd12/Makefile b/chat/inspircd12/Makefile
index 70fee294ca5..b35ee3096f7 100644
--- a/chat/inspircd12/Makefile
+++ b/chat/inspircd12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2017/11/30 16:45:16 adam Exp $
+# $NetBSD: Makefile,v 1.39 2018/01/13 23:18:26 rillig Exp $
 #
 
 DISTNAME=	InspIRCd-1.2.0
@@ -26,8 +26,8 @@ RCD_SCRIPTS+=		inspircd
 PKG_SYSCONFSUBDIR=	inspircd
 MAKE_FILE=		GNUmakefile
 
-FILES_SUBST+=		INSPIRCD_USER=${INSPIRCD_USER:Q}
-FILES_SUBST+=		INSPIRCD_GROUP=${INSPIRCD_GROUP:Q}
+FILES_SUBST+=		INSPIRCD_USER=${INSPIRCD_USER}
+FILES_SUBST+=		INSPIRCD_GROUP=${INSPIRCD_GROUP}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -37,16 +37,16 @@ MODULES?=		# undef
 HEADERS?=		# undef
 CONF_FILES_PERMS=	${EGDIR}/inspircd.conf.example \
 			${PKG_SYSCONFDIR}/inspircd.conf \
-			${INSPIRCD_USER:Q} ${INSPIRCD_GROUP:Q} 0400
+			${INSPIRCD_USER} ${INSPIRCD_GROUP} 0400
 CONF_FILES_PERMS+=	${EGDIR}/modules.conf.example \
 			${PKG_SYSCONFDIR}/modules.conf \
-			${INSPIRCD_USER:Q} ${INSPIRCD_GROUP:Q} 0400
+			${INSPIRCD_USER} ${INSPIRCD_GROUP} 0400
 
 PKG_USERS_VARS=		INSPIRCD_USER
 PKG_GROUPS_VARS=	INSPIRCD_GROUP
 
-PKG_GROUPS=		${INSPIRCD_GROUP:Q}
-PKG_USERS=		${INSPIRCD_USER:Q}:${INSPIRCD_GROUP:Q}
+PKG_GROUPS=		${INSPIRCD_GROUP}
+PKG_USERS=		${INSPIRCD_USER}:${INSPIRCD_GROUP}
 
 PKG_GECOS.${INSPIRCD_USER}=	InspIRCd user
 
@@ -75,7 +75,7 @@ BUILD_DEFS+=		INSPIRCD_USER INSPIRCD_GROUP VARBASE
 
 MAKE_DIRS+=		${VARBASE}/log
 OWN_DIRS_PERMS+=	${VARBASE}/run/inspircd \
-			${INSPIRCD_USER:Q} ${INSPIRCD_GROUP:Q} 750
+			${INSPIRCD_USER} ${INSPIRCD_GROUP} 750
 
 INSPIRCD_USER?=		inspircd
 INSPIRCD_GROUP?=	inspircd
diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile
index db23e795081..a98e7249b4f 100644
--- a/chat/ircd-hybrid/Makefile
+++ b/chat/ircd-hybrid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2016/07/09 06:37:53 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2018/01/13 23:18:26 rillig Exp $
 
 DISTNAME=	ircd-hybrid-7.2.3
 PKGREVISION=	11
@@ -42,9 +42,9 @@ OWN_DIRS_PERMS+=	${VARBASE}/log/ircd-hybrid/logs \
 OWN_DIRS_PERMS+=	${VARBASE}/run/ircd-hybrid \
 			${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 0770
 
-FILES_SUBST+=		IRCD_HYBRID_IRC_USER=${IRCD_HYBRID_IRC_USER:Q}
-FILES_SUBST+=		IRCD_HYBRID_IRC_GROUP=${IRCD_HYBRID_IRC_GROUP:Q}
-FILES_SUBST+=		VARBASE=${VARBASE:Q}
+FILES_SUBST+=		IRCD_HYBRID_IRC_USER=${IRCD_HYBRID_IRC_USER}
+FILES_SUBST+=		IRCD_HYBRID_IRC_GROUP=${IRCD_HYBRID_IRC_GROUP}
+FILES_SUBST+=		VARBASE=${VARBASE}
 
 PKG_GROUPS=		${IRCD_HYBRID_IRC_GROUP}
 PKG_USERS=		${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}
@@ -76,7 +76,7 @@ SUBST_SED.bpaths+=	-e "s|messages|share/ircd-hybrid/messages|g"
 CONFIGURE_ARGS+=	--with-nicklen=${IRCD_HYBRID_NICLEN:Q}
 CONFIGURE_ARGS+=	--with-topiclen=${IRCD_HYBRID_TOPICLEN:Q}
 CONFIGURE_ARGS+=	--enable-syslog=${IRCD_HYBRID_SYSLOG_EVENTS:Q}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/log/ircd-hybrid
 CONFIGURE_ARGS+=	--enable-clobber
 
diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile
index 249efd3bbf2..4303a50484b 100644
--- a/chat/ircservices/Makefile
+++ b/chat/ircservices/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2018/01/07 19:57:48 rillig Exp $
+# $NetBSD: Makefile,v 1.51 2018/01/13 23:18:26 rillig Exp $
 #
 
 DISTNAME=	ircservices-5.0.64
@@ -25,7 +25,7 @@ RCD_SCRIPTS=	ircservices
 PKG_GROUPS=	services
 BUILD_DEFS=	VARBASE
 
-CONFIGURE_ARGS+=	-prefix ${PREFIX:Q}
+CONFIGURE_ARGS+=	-prefix ${PREFIX}
 CONFIGURE_ARGS+=	-cc ${CC:Q}
 CONFIGURE_ARGS+=	${empty(CFLAGS):?:-cflags ${CFLAGS:Q}}
 CONFIGURE_ARGS+=	${empty(LDFLAGS):?:-lflags ${LDFLAGS:Q}}
diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile
index 695fc0b30fe..69388bd1c60 100644
--- a/chat/ircu/Makefile
+++ b/chat/ircu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2013/07/12 10:44:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2018/01/13 23:18:26 rillig Exp $
 #
 
 DISTNAME=	ircu2.10.12.12
@@ -47,7 +47,7 @@ PKG_SYSCONFDIR_PERMS=	${IRCD_USER} ${IRCD_GROUP} 0700
 
 RCD_SCRIPTS=		ircd
 
-FILES_SUBST+=		IRCD_USER=${IRCD_USER:Q}
+FILES_SUBST+=		IRCD_USER=${IRCD_USER}
 MESSAGE_SUBST+=		IRCD_USER=${IRCD_USER}
 MESSAGE_SUBST+=		IRCD_GROUP=${IRCD_GROUP}
 
diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile
index b8d5b57c1df..1e194a0c14f 100644
--- a/chat/jabberd/Makefile
+++ b/chat/jabberd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2017/08/16 20:45:32 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2018/01/13 23:18:26 rillig Exp $
 #
 
 DISTNAME=		jabber-1.4.2
@@ -43,10 +43,10 @@ PKG_USERS=		${JABBERD_USER}:${JABBERD_GROUP}
 PKG_USERS_VARS+=	JABBERD_USER
 PKG_GROUPS_VARS+=	JABBERD_GROUP
 
-FILES_SUBST+=		JABBERD_USER=${JABBERD_USER:Q}
-FILES_SUBST+=		JABBERD_GROUP=${JABBERD_GROUP:Q}
-FILES_SUBST+=		JABBERD_SPOOLDIR=${JABBERD_SPOOLDIR:Q}
-FILES_SUBST+=		JABBERD_PIDDIR=${JABBERD_PIDDIR:Q}
+FILES_SUBST+=		JABBERD_USER=${JABBERD_USER}
+FILES_SUBST+=		JABBERD_GROUP=${JABBERD_GROUP}
+FILES_SUBST+=		JABBERD_SPOOLDIR=${JABBERD_SPOOLDIR}
+FILES_SUBST+=		JABBERD_PIDDIR=${JABBERD_PIDDIR}
 
 .for f in ${JABBERD_LOGDIR} ${JABBERD_SPOOLDIR} ${JABBERD_PIDDIR}
 OWN_DIRS_PERMS+=	${f} ${JABBERD_USER} ${JABBERD_GROUP} 750
diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index 71082b28654..d98a248c5f7 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2016/03/05 11:28:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.84 2018/01/13 23:18:26 rillig Exp $
 
 DISTNAME=	psi-0.15
 PKGREVISION=	9
@@ -23,8 +23,8 @@ HAS_CONFIGURE=	yes
 
 CONFIG_SHELL=	${SH}
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=	--qtdir=${QTDIR:Q}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--qtdir=${QTDIR}
 CONFIGURE_ARGS+=	--with-zlib-inc=${BUILDLINK_PREFIX.zlib}/include
 CONFIGURE_ARGS+=	--with-zlib-lib=${BUILDLINK_PREFIX.zlib}/lib
 CONFIGURE_ARGS+=	--with-qca-lib=${BUILDLINK_PREFIX.qca2}/lib
diff --git a/chat/riece/Makefile b/chat/riece/Makefile
index 8ed54694353..308f42a042d 100644
--- a/chat/riece/Makefile
+++ b/chat/riece/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2018/01/04 16:36:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2018/01/13 23:18:26 rillig Exp $
 #
 
 DISTNAME=	riece-9.0.0
@@ -24,11 +24,11 @@ GNU_CONFIGURE=	YES
 INFO_FILES=	yes
 
 # --with-emacs=... or --with-xemacs=...
-CONFIGURE_ARGS+=	--with-${EMACS_FLAVOR}=${EMACS_BIN:Q}
+CONFIGURE_ARGS+=	--with-${EMACS_FLAVOR}=${EMACS_BIN}
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${EMACS_FLAVOR}}
 
 # Riece digs sub directory.
-CONFIGURE_ARGS.emacs=	--with-lispdir=${EMACS_LISPPREFIX:Q}
+CONFIGURE_ARGS.emacs=	--with-lispdir=${EMACS_LISPPREFIX}
 CONFIGURE_ARGS.xemacs=	--with-packagedir=${EMACS_LISPPREFIX:C|/lisp\$||}
 
 do-install: plist
diff --git a/chat/silc-client-icb/Makefile b/chat/silc-client-icb/Makefile
index df8ecf5bf20..3b86198bf78 100644
--- a/chat/silc-client-icb/Makefile
+++ b/chat/silc-client-icb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/04/06 03:45:07 rodent Exp $
+# $NetBSD: Makefile,v 1.23 2018/01/13 23:18:26 rillig Exp $
 #
 
 DISTNAME=	irssi-icb-0.14
@@ -21,7 +21,7 @@ USE_LIBTOOL=	yes
 
 IRSSI_DIR=	${WRKDIR}/${SILC_CLIENT_DISTNAME}/apps/irssi
 
-CONFIGURE_ARGS+=	--with-irssi=${IRSSI_DIR:Q}
+CONFIGURE_ARGS+=	--with-irssi=${IRSSI_DIR}
 
 INSTALLATION_DIRS+=	share/doc/silc-client
 
diff --git a/chat/xchat-systray-integration/Makefile b/chat/xchat-systray-integration/Makefile
index e0d10ce76a9..8ba84763d2f 100644
--- a/chat/xchat-systray-integration/Makefile
+++ b/chat/xchat-systray-integration/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2017/02/12 06:25:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.44 2018/01/13 23:18:26 rillig Exp $
 
 DISTNAME=	xchat-systray-integration-2.4.5-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
 
-MAKE_ENV+=	prefix=${PREFIX:Q} SHLIBTOOL=${SHLIBTOOL:Q}
+MAKE_ENV+=	prefix=${PREFIX} SHLIBTOOL=${SHLIBTOOL:Q}
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/zenirc/Makefile b/chat/zenirc/Makefile
index e15dee046a5..a484e9cc75e 100644
--- a/chat/zenirc/Makefile
+++ b/chat/zenirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/02/17 19:17:57 dholland Exp $
+# $NetBSD: Makefile,v 1.16 2018/01/13 23:18:27 rillig Exp $
 #
 
 DISTNAME=	zenirc-2.112
@@ -19,6 +19,6 @@ CONFIGURE_HAS_MANDIR=	NO
 .if ${EMACS_FLAVOR} == "xemacs"
 MAKE_FLAGS+=	EMACS=xemacs
 .endif
-MAKE_FLAGS+=	elispdir=${DESTDIR:Q}${EMACS_LISPPREFIX:Q}/zenirc
+MAKE_FLAGS+=	elispdir=${DESTDIR}${EMACS_LISPPREFIX}/zenirc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/zircon/Makefile b/chat/zircon/Makefile
index 2e8141a1c70..6ae5f4c3b45 100644
--- a/chat/zircon/Makefile
+++ b/chat/zircon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/05/30 11:32:22 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2018/01/13 23:18:27 rillig Exp $
 #
 
 DISTNAME=	zircon-1.18.256
@@ -23,7 +23,7 @@ post-extract:
 		>> ${WRKSRC}/installer/pkgIndex.tcl
 
 do-install:
-	@( cd ${WRKSRC} && ${TCLSH} installer/install.tcl -b ${PREFIX}/bin -l ${PREFIX}/share/zircon -p ${DESTDIR:Q} -w ${WISH} -g)
+	@( cd ${WRKSRC} && ${TCLSH} installer/install.tcl -b ${PREFIX}/bin -l ${PREFIX}/share/zircon -p ${DESTDIR} -w ${WISH} -g)
 	@${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/zircon
 .for file in BUGS COPYRIGHT FAQ MANUAL MIRRORS README.ONS README.load README.look README.prefs TODO
 	@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DESTDIR}${PREFIX}/share/doc/zircon