pkgsrc doesn't support PREFIX with spaces or other special characters.

Therefore it is not necessary to add the :Q modifier to this variable
and several others.

pkglint -r -Wall --autofix --only :Q

37 files changed, 101 insertions, 101 deletions

diff --git a/games/colchess-book-colchess/Makefile b/games/colchess-book-colchess/Makefile
index b0d37fdef23..614203856a7 100644
--- a/games/colchess-book-colchess/Makefile
+++ b/games/colchess-book-colchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/08/01 17:40:11 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/01/14 15:26:46 rillig Exp $
 
 DISTNAME=		colchess
 PKGNAME=		${CHESS_ENGINE}-book-${DIST_SUBDIR}
@@ -21,7 +21,7 @@ NO_CONFIGURE=		yes
 NO_BUILD=		yes
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE:Q}
-PLIST_SUBST+=		BOOK_FILE=${BOOK_FILE:Q}
+PLIST_SUBST+=		BOOK_FILE=${BOOK_FILE}
 
 BOOKDIR=		${PREFIX}/share/${CHESS_ENGINE}
 BOOK_FILE=		book.dat
diff --git a/games/colchess-book-large/Makefile b/games/colchess-book-large/Makefile
index c1c56eaff84..26c56af1982 100644
--- a/games/colchess-book-large/Makefile
+++ b/games/colchess-book-large/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/06 11:54:33 asau Exp $
+# $NetBSD: Makefile,v 1.15 2018/01/14 15:26:46 rillig Exp $
 
 DISTNAME=		book_large
 PKGNAME=		${CHESS_ENGINE}-book-large-20000512
@@ -19,7 +19,7 @@ DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		yes
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE:Q}
-PLIST_SUBST+=		BOOK_FILE=${BOOK_FILE:Q}
+PLIST_SUBST+=		BOOK_FILE=${BOOK_FILE}
 
 BOOKDIR=		${PREFIX}/share/${CHESS_ENGINE}
 BOOK_FILE=		book.dat
diff --git a/games/colchess/Makefile b/games/colchess/Makefile
index af366b5e0c9..ad6ed6ea9a0 100644
--- a/games/colchess/Makefile
+++ b/games/colchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/08/01 17:40:11 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2018/01/14 15:26:46 rillig Exp $
 
 DISTNAME=		colchess
 PKGNAME=		${DISTNAME}-7.0
@@ -11,7 +11,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Chess analysis engine
 
 DIST_SUBDIR=		${PKGNAME_NOREV}
-MAKE_ENV+=		PREFIX=${PREFIX:Q}
+MAKE_ENV+=		PREFIX=${PREFIX}
 NO_CONFIGURE=		yes
 WRKSRC=			${WRKDIR}/ColChess
 
diff --git a/games/crafty-book-medium/Makefile b/games/crafty-book-medium/Makefile
index 0dd867f7bf5..3285e467583 100644
--- a/games/crafty-book-medium/Makefile
+++ b/games/crafty-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/06 11:54:34 asau Exp $
+# $NetBSD: Makefile,v 1.17 2018/01/14 15:26:46 rillig Exp $
 
 DISTNAME=		medium
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -20,7 +20,7 @@ DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		yes
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE:Q}
-PLIST_SUBST+=		BOOK_FILE=${BOOK_FILE:Q}
+PLIST_SUBST+=		BOOK_FILE=${BOOK_FILE}
 
 BOOKDIR=		${PREFIX}/lib/${CHESS_ENGINE}
 PGN_FILE=		book.txt
diff --git a/games/crafty-book-small/Makefile b/games/crafty-book-small/Makefile
index 448df031ae7..d33c1187cb6 100644
--- a/games/crafty-book-small/Makefile
+++ b/games/crafty-book-small/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/06 11:54:34 asau Exp $
+# $NetBSD: Makefile,v 1.17 2018/01/14 15:26:46 rillig Exp $
 
 DISTNAME=		small
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -20,7 +20,7 @@ DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		yes
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE:Q}
-PLIST_SUBST+=		BOOK_FILE=${BOOK_FILE:Q}
+PLIST_SUBST+=		BOOK_FILE=${BOOK_FILE}
 
 BOOKDIR=		${PREFIX}/lib/${CHESS_ENGINE}
 PGN_FILE=		${DISTNAME}.txt
diff --git a/games/d2x/Makefile b/games/d2x/Makefile
index 110bce299fb..1cb7655b0d4 100644
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2015/04/25 14:22:53 tnn Exp $
+# $NetBSD: Makefile,v 1.23 2018/01/14 15:26:46 rillig Exp $
 #
 
 DISTNAME=	d2x-0.2.5
@@ -22,7 +22,7 @@ MESSAGE_SUBST+=		D2X_DATA=${D2X_DATA}
 # support
 #
 CONFIGURE_ARGS+=	--disable-network
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--with-sharepath=${D2X_DATA:Q}
 
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/games/exchess-book-medium/Makefile b/games/exchess-book-medium/Makefile
index 63ebc38fcad..33feb9a15d9 100644
--- a/games/exchess-book-medium/Makefile
+++ b/games/exchess-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/09/11 17:08:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2018/01/14 15:26:46 rillig Exp $
 
 DISTNAME=		medium
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20140911
@@ -20,7 +20,7 @@ DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		yes
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE:Q}
-PLIST_SUBST+=		BOOK_FILE=${BOOK_FILE:Q}
+PLIST_SUBST+=		BOOK_FILE=${BOOK_FILE}
 
 BOOKDIR=		${PREFIX}/lib/${CHESS_ENGINE}
 PGN_FILE=		book.txt
diff --git a/games/exchess-book-small/Makefile b/games/exchess-book-small/Makefile
index 480ad4d4818..087c38bd46f 100644
--- a/games/exchess-book-small/Makefile
+++ b/games/exchess-book-small/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/09/11 17:08:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2018/01/14 15:26:47 rillig Exp $
 
 DISTNAME=		small
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20140911
@@ -20,7 +20,7 @@ DIST_SUBDIR=		chessbooks
 NO_CONFIGURE=		yes
 
 PLIST_SUBST+=		CHESS_ENGINE=${CHESS_ENGINE:Q}
-PLIST_SUBST+=		BOOK_FILE=${BOOK_FILE:Q}
+PLIST_SUBST+=		BOOK_FILE=${BOOK_FILE}
 
 BOOKDIR=		${PREFIX}/lib/${CHESS_ENGINE}
 PGN_FILE=		${DISTNAME}.txt
diff --git a/games/exchess/Makefile b/games/exchess/Makefile
index 7617e75fce0..3e6082f734e 100644
--- a/games/exchess/Makefile
+++ b/games/exchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/09/11 16:59:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2018/01/14 15:26:46 rillig Exp $
 
 DISTNAME=		EXchess_v7.31beta
 PKGNAME=		exchess-7.31beta
@@ -18,7 +18,7 @@ WRKSRC=			${WRKDIR}/${DISTNAME:C/beta//}
 LIBDIR=			${PREFIX}/lib/exchess
 DOCDIR=			${PREFIX}/share/doc/exchess
 
-CFLAGS+=		-DEXCHESS_DIR=${LIBDIR:Q}
+CFLAGS+=		-DEXCHESS_DIR=${LIBDIR}
 LDFLAGS+=		${PTHREAD_LDFLAGS}
 LIBS+=			${PTHREAD_LIBS}
 
diff --git a/games/ggz-client-libs/Makefile b/games/ggz-client-libs/Makefile
index b37820ea1cd..3b54aeca797 100644
--- a/games/ggz-client-libs/Makefile
+++ b/games/ggz-client-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/09/19 13:04:18 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/01/14 15:26:47 rillig Exp $
 #
 
 DISTNAME=	ggz-client-libs-0.0.14.1
@@ -15,7 +15,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	msgfmt
 
 CONFIGURE_ARGS+=	--enable-debug-gdb
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg/menus ${PKG_SYSCONFDIR}/xdg/menus/applications-merged
 CONF_FILES+=	${PREFIX}/share/examples/ggz-client-libs/ggz.menu \
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index d1de8d71f6b..ba2cfd1fed4 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.157 2017/11/23 17:19:54 wiz Exp $
+# $NetBSD: Makefile,v 1.158 2018/01/14 15:26:47 rillig Exp $
 
 DISTNAME=		gnome-games-2.32.1
 PKGREVISION=		34
@@ -23,9 +23,9 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 CONFIGURE_ENV+=		ac_cv_path_MSGFMT=msgfmt
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--enable-omitgames=lightsoff
 
 FILES_SUBST+=		INSTALL=${INSTALL:Q}
diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index ee7ed1301a3..29de0d540e0 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2017/08/16 20:21:09 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2018/01/14 15:26:47 rillig Exp $
 #
 
 DISTNAME=	icebreaker-1.9.7
@@ -13,7 +13,7 @@ COMMENT=	Penguin capturing simulation
 
 USE_TOOLS+=	gmake
 MAKE_ENV+=	mandir="${PREFIX}/man" highscoredir="/var/games"
-MAKE_ENV+=	prefix=${PREFIX:Q}
+MAKE_ENV+=	prefix=${PREFIX}
 
 SETGIDGAME=	yes
 SPECIAL_PERMS=	bin/icebreaker ${SETGID_GAMES_PERMS}
diff --git a/games/knightcap-brain/Makefile b/games/knightcap-brain/Makefile
index c4f914812b9..95b704b76a9 100644
--- a/games/knightcap-brain/Makefile
+++ b/games/knightcap-brain/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/01/04 06:11:03 dholland Exp $
+# $NetBSD: Makefile,v 1.19 2018/01/14 15:26:47 rillig Exp $
 
 DISTNAME=		new_brain
 PKGNAME=		knightcap-brain-19980616
@@ -42,14 +42,14 @@ EGDIR=			${PREFIX}/share/examples/knightcap
 INSTALLATION_DIRS=	bin
 
 do-build:
-	${SED} -e "s,@PREFIX@,${PREFIX},g" < ${FILESDIR:Q}/newbrain.sh \
-		> ${WRKSRC:Q}/newbrain.sh
+	${SED} -e "s,@PREFIX@,${PREFIX},g" < ${FILESDIR}/newbrain.sh \
+		> ${WRKSRC}/newbrain.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC:Q}/newbrain.sh \
-		${DESTDIR}${PREFIX:Q}/bin/newbrain
-	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR:Q}
-	${INSTALL_DATA} ${DISTDIR:Q}/${DIST_SUBDIR:Q}/new_brain.dat \
-		${DESTDIR}${EGDIR:Q}/brain.dat
+	${INSTALL_SCRIPT} ${WRKSRC}/newbrain.sh \
+		${DESTDIR}${PREFIX}/bin/newbrain
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/new_brain.dat \
+		${DESTDIR}${EGDIR}/brain.dat
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/koth/Makefile b/games/koth/Makefile
index 7763420af44..1f3bf72dbbc 100644
--- a/games/koth/Makefile
+++ b/games/koth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2015/08/17 17:11:23 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2018/01/14 15:26:47 rillig Exp $
 #
 
 DISTNAME=	koth-0.8.0
@@ -13,7 +13,7 @@ COMMENT=	The classic "shoot the other tank" artillery game, networked
 
 PTHREAD_AUTO_VARS=	yes
 GNU_CONFIGURE=	YES
-CPPFLAGS+=	-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR:Q}\""
+CPPFLAGS+=	-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 
 EGDIR=		${PREFIX}/share/examples/koth
 CONF_FILES=	${EGDIR}/koth.cfg ${PKG_SYSCONFDIR}/koth.cfg
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index 5e879ac01ac..6d56f243889 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2015/04/25 14:23:00 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2018/01/14 15:26:47 rillig Exp $
 
 DISTNAME=	lbreakout-010315
 PKGREVISION=	12
@@ -10,7 +10,7 @@ HOMEPAGE=	http://lgames.sourceforge.net/
 COMMENT=	Breakout-style arcade game
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ENV+=		VARBASE=${VARBASE:Q}
+CONFIGURE_ENV+=		VARBASE=${VARBASE}
 CONFIGURE_ARGS+=	--disable-sound
 
 USE_LANGUAGES=	c c++
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index 1edc9d4be6f..86838e8ff67 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2015/04/25 14:23:00 tnn Exp $
+# $NetBSD: Makefile,v 1.41 2018/01/14 15:26:47 rillig Exp $
 
 DISTNAME=	lbreakout2-2.6.4
 PKGREVISION=	2
@@ -11,7 +11,7 @@ COMMENT=	Breakout-style arcade game
 LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}/games
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/games
 CONFIGURE_ARGS+=	--with-highscore-path=${PREFIX}/share/games/
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/html
 
diff --git a/games/maelstrom-sdl/Makefile b/games/maelstrom-sdl/Makefile
index e697babfb31..a5db5ac8d99 100644
--- a/games/maelstrom-sdl/Makefile
+++ b/games/maelstrom-sdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/04/25 14:23:01 tnn Exp $
+# $NetBSD: Makefile,v 1.26 2018/01/14 15:26:47 rillig Exp $
 
 DISTNAME=	Maelstrom-3.0.6
 PKGNAME=	maelstrom-sdl-3.0.6
@@ -37,7 +37,7 @@ SCOREDIR=		${VARBASE}/games
 SCOREFILE=		${SCOREDIR}/Maelstrom-Scores
 ORIGSCOREFILE=		${PREFIX}/share/Maelstrom/Maelstrom-Scores
 REQD_FILES_PERMS+=	${ORIGSCOREFILE} ${SCOREFILE} ${SCOREFILE_PERMS}
-CFLAGS+=		-DMAELSTROM_SCOREDIR=\"${SCOREDIR:Q}\"
+CFLAGS+=		-DMAELSTROM_SCOREDIR=\"${SCOREDIR}\"
 BUILD_DEFS+=		VARBASE SCOREFILE
 
 post-install:
diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile
index c46216f43f2..7761d9cd293 100644
--- a/games/maelstrom-x11/Makefile
+++ b/games/maelstrom-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2017/09/03 08:36:54 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2018/01/14 15:26:47 rillig Exp $
 
 DISTNAME=		Maelstrom-1.4.3-L2.0.6-src.tar.gz
 PKGNAME=		maelstrom-x11-2.0.6
@@ -27,7 +27,7 @@ USE_TOOLS+=		pax
 LDFLAGS.SunOS+=		-lsocket -lnsl
 LIBS.SunOS+=		-lsocket -lnsl
 MAKE_FLAGS+=		EXTRALIBS=${LIBS:Q}
-MAKE_ENV+=		BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} XPMDIR=${BUILDLINK_PREFIX.libXpm}
+MAKE_ENV+=		BINOWN=${BINOWN} BINGRP=${BINGRP} XPMDIR=${BUILDLINK_PREFIX.libXpm}
 MAKE_ENV+=		GAMEOWN=${GAMEOWN} GAMEGRP=${GAMEGRP}
 MAKE_ENV+=		GAMEMODE=${GAMEMODE} GAMEDATAMODE=${GAMEDATAMODE}
 MAKE_ENV+=		VARBASE=${VARBASE}
diff --git a/games/monsterz/Makefile b/games/monsterz/Makefile
index 2c4afd0190e..896750885c8 100644
--- a/games/monsterz/Makefile
+++ b/games/monsterz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2017/01/01 14:43:40 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2018/01/14 15:26:47 rillig Exp $
 
 DISTNAME=		monsterz-0.7.1
 PKGREVISION=		4
@@ -17,7 +17,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-Numeric
 
 MAKE_ENV+=		GAMEOWN=${GAMEOWN:Q}
 MAKE_ENV+=		GAMEGRP=${GAMEGRP:Q}
-MAKE_ENV+=		VARBASE=${VARBASE:Q}
+MAKE_ENV+=		VARBASE=${VARBASE}
 
 SETGIDGAME=		yes
 CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/monsterz \
diff --git a/games/nethack-lib/Makefile.common b/games/nethack-lib/Makefile.common
index 4082d77a8af..b5c818fafaa 100644
--- a/games/nethack-lib/Makefile.common
+++ b/games/nethack-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2017/12/14 16:13:31 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.34 2018/01/14 15:26:48 rillig Exp $
 #
 # used by games/nethack/Makefile
 # used by games/nethack-lib/Makefile
@@ -61,8 +61,8 @@ GAMEPERM=		${NETHACK_USER} ${NETHACK_GROUP} 2555
 
 GAMEDIR=		${PREFIX}/share/${NETHACK_DIR}
 VARDIR=			/var/games/nethack340
-MAKE_ENV+=		GAMEDIR=${GAMEDIR:Q}
-MAKE_ENV+=		VARDIR=${VARDIR:Q}
+MAKE_ENV+=		GAMEDIR=${GAMEDIR}
+MAKE_ENV+=		VARDIR=${VARDIR}
 
 pre-configure:
 	@${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh
diff --git a/games/netmaj/Makefile b/games/netmaj/Makefile
index ef9d775fbb4..831177e4194 100644
--- a/games/netmaj/Makefile
+++ b/games/netmaj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/07/09 06:38:18 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2018/01/14 15:26:48 rillig Exp $
 #
 
 DISTNAME=		netmaj-2.0.7
@@ -13,7 +13,7 @@ COMMENT=		Mahjongg game with network and 1-4 player(s) support
 WRKSRC=			${WRKDIR}/netmaj
 USE_TOOLS+=		perl:run
 HAS_CONFIGURE=		yes
-CONFIGURE_ENV+=		OPSYS=${OPSYS:Q}
+CONFIGURE_ENV+=		OPSYS=${OPSYS}
 CONFIGURE_ENV+=		CURSES_LIBS=${BUILDLINK_LDADD.ncursesw:Q}
 
 INSTALL_MAKE_FLAGS+=	PERL=${PERL5:Q}
diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile
index 05ab59a8056..e19d95fdcd5 100644
--- a/games/powermanga/Makefile
+++ b/games/powermanga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/04/25 14:23:02 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2018/01/14 15:26:48 rillig Exp $
 #
 
 DISTNAME=	powermanga-0.90
@@ -14,8 +14,8 @@ LICENSE=	gnu-gpl-v3
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-MAKE_ENV+=		TOUCH=${TOUCH:Q} WRKSRC=${WRKSRC:Q}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+MAKE_ENV+=		TOUCH=${TOUCH:Q} WRKSRC=${WRKSRC}
 LDFLAGS.DragonFly=	-lm
 LDFLAGS.SunOS+=		-lm
 
diff --git a/games/qstat/Makefile b/games/qstat/Makefile
index c2bdb65bece..9634626aff1 100644
--- a/games/qstat/Makefile
+++ b/games/qstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/09/04 18:00:55 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/01/14 15:26:48 rillig Exp $
 
 DISTNAME=	qstat-2.10
 CATEGORIES=	games
@@ -9,7 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Program that gathers real-time statistics from game servers
 
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR:Q}\""
+CPPFLAGS+=	-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES=	${EGDIR}/qstat.cfg ${PKG_SYSCONFDIR}/qstat.cfg
diff --git a/games/quake/Makefile b/games/quake/Makefile
index 18bcae524b4..6ee850a1f88 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2017/09/04 18:08:24 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2018/01/14 15:26:48 rillig Exp $
 
 DISTNAME=	q1source
 PKGNAME=	quake-2.30
@@ -18,11 +18,11 @@ ONLY_FOR_PLATFORM=	*-*-i386
 
 WRKSRC=		${WRKDIR}
 USE_TOOLS+=	gmake
-MAKE_ENV+=	MAINDIR=${WRKSRC:Q}
+MAKE_ENV+=	MAINDIR=${WRKSRC}
 
 
 MAKE_ENV+=	MESA_DIR=${BUILDLINK_PREFIX.Mesa}
-MAKE_ENV+=	X11BASE=${X11BASE:Q}
+MAKE_ENV+=	X11BASE=${X11BASE}
 
 LDFLAGS+=	${LIBOSSAUDIO}
 
diff --git a/games/quake6/Makefile b/games/quake6/Makefile
index fe508b953bc..3ab3a57e073 100644
--- a/games/quake6/Makefile
+++ b/games/quake6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2017/09/04 18:00:55 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2018/01/14 15:26:48 rillig Exp $
 
 DISTNAME=	quake-v6-bsd-kame
 PKGNAME=	quake6-0.0
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--disable-asmopt --bindir=/bin
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 .if ${X11_TYPE} == "modular"
-CONFIGURE_ARGS+=	--x-includes=${X11BASE:Q}/include
+CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include
 .endif
 
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/games/spaceracer/Makefile b/games/spaceracer/Makefile
index 6ef017a2f2b..3520e394f2a 100644
--- a/games/spaceracer/Makefile
+++ b/games/spaceracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/04/25 14:23:04 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2018/01/14 15:26:48 rillig Exp $
 #
 
 DISTNAME=		spaceracer-0.2.4
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		automake autoconf
 
 pre-configure:
-	cd ${WRKSRC:Q} && autoreconf -i
+	cd ${WRKSRC} && autoreconf -i
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/games/sudoku-cli/Makefile b/games/sudoku-cli/Makefile
index 5e258416e6d..43855d2f2b6 100644
--- a/games/sudoku-cli/Makefile
+++ b/games/sudoku-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/09/04 18:00:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2018/01/14 15:26:48 rillig Exp $
 #
 
 DISTNAME=		sudoku-1.0.1
@@ -24,20 +24,20 @@ MAKE_FLAGS+=		INSTALL_BIN=${INSTALL_PROGRAM:Q}
 MAKE_FLAGS+=		INSTALL_DATADIR=${INSTALL_DATA_DIR:Q}
 MAKE_FLAGS+=		INSTALL_DATA=${INSTALL_DATA:Q}
 MAKE_FLAGS+=		INSTALL_MAN=${INSTALL_MAN:Q}
-MAKE_FLAGS+=		BINDIR=${PREFIX:Q}/bin
-MAKE_FLAGS+=		LIBDIR=${SHARE_DIR:Q}
-MAKE_FLAGS+=		MAN6DIR=${PREFIX:Q}/${PKGMANDIR:Q}/man6
+MAKE_FLAGS+=		BINDIR=${PREFIX}/bin
+MAKE_FLAGS+=		LIBDIR=${SHARE_DIR}
+MAKE_FLAGS+=		MAN6DIR=${PREFIX}/${PKGMANDIR}/man6
 MAKE_FLAGS+=		DEFS=${CFLAGS:Q}
 MAKE_FLAGS+=		SUDOKUNAME=sudoku-cli
 
-CFLAGS+=		-DTEMPLATE="${SHARE_DIR:Q}/template"
-CFLAGS+=		-DPRECANNED="${SHARE_DIR:Q}/precanned"
+CFLAGS+=		-DTEMPLATE="${SHARE_DIR}/template"
+CFLAGS+=		-DPRECANNED="${SHARE_DIR}/precanned"
 
 SUBST_CLASSES+=		sudoku-cli
 SUBST_STAGE.sudoku-cli=	pre-build
 SUBST_MESSAGE.sudoku-cli=Correcting path names in man page
 SUBST_FILES.sudoku-cli+=sudoku.6
-SUBST_SED.sudoku-cli+=	-e s,/usr/lib/sudoku,${SHARE_DIR:Q},
+SUBST_SED.sudoku-cli+=	-e s,/usr/lib/sudoku,${SHARE_DIR},
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/svb/Makefile b/games/svb/Makefile
index 0d073f4210a..08af2ce9169 100644
--- a/games/svb/Makefile
+++ b/games/svb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/06 11:54:56 asau Exp $
+# $NetBSD: Makefile,v 1.18 2018/01/14 15:26:48 rillig Exp $
 
 DISTNAME=		svb
 PKGNAME=		svb-1.0
@@ -15,7 +15,7 @@ USE_IMAKE=		yes
 NO_INSTALL_MANPAGES=	yes
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
-MAKE_ENV+=	VARBASE=${VARBASE:Q}
+MAKE_ENV+=	VARBASE=${VARBASE}
 
 SETGIDGAME=	yes
 
diff --git a/games/tetrinetx/Makefile b/games/tetrinetx/Makefile
index abef612b74d..a6e70bf552a 100644
--- a/games/tetrinetx/Makefile
+++ b/games/tetrinetx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/01/29 09:53:29 mef Exp $
+# $NetBSD: Makefile,v 1.9 2018/01/14 15:26:48 rillig Exp $
 
 DISTNAME=	tetrinetx-1.13.16+qirc-1.40c
 PKGNAME=	tetrinetx-1.13.16
@@ -20,22 +20,22 @@ LIBS.SunOS+=	-lsocket -lnsl -lresolv
 INSTALLATION_DIRS=	bin ${SHAREDIR}
 
 do-build:
-	cd ${WRKSRC:Q}/src && \
+	cd ${WRKSRC}/src && \
 	${CC} \
-		${CPPFLAGS} -I${PREFIX:Q}/include			\
-		-DSHAREDIR=\"${SHAREDIR:Q}\" -DPREFIX=\"${PREFIX:Q}\"	\
+		${CPPFLAGS} -I${PREFIX}/include			\
+		-DSHAREDIR=\"${SHAREDIR}\" -DPREFIX=\"${PREFIX}\"	\
 		${CFLAGS} -fno-strength-reduce -Wall			\
-		${LDFLAGS} -L${PREFIX:Q}/lib -ladns ${LIBS}		\
-		-o ../bin/${BINARY:Q} -Wl,-R${PREFIX:Q}/lib		\
+		${LDFLAGS} -L${PREFIX}/lib -ladns ${LIBS}		\
+		-o ../bin/${BINARY:Q} -Wl,-R${PREFIX}/lib		\
 		main.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/bin/${BINARY:Q} \
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINARY:Q} \
 		${DESTDIR}${PREFIX}/bin/tetrix
-	${INSTALL_DATA} ${WRKSRC:Q}/bin/game.conf ${DESTDIR}${SHAREDIR:Q}
-	${INSTALL_DATA} ${WRKSRC:Q}/bin/game.secure ${DESTDIR}${SHAREDIR:Q}
-	${INSTALL_DATA} ${WRKSRC:Q}/bin/game.motd ${DESTDIR}${SHAREDIR:Q}
-	${INSTALL_DATA} ${WRKSRC:Q}/bin/game.pmotd ${DESTDIR}${SHAREDIR:Q}
+	${INSTALL_DATA} ${WRKSRC}/bin/game.conf ${DESTDIR}${SHAREDIR}
+	${INSTALL_DATA} ${WRKSRC}/bin/game.secure ${DESTDIR}${SHAREDIR}
+	${INSTALL_DATA} ${WRKSRC}/bin/game.motd ${DESTDIR}${SHAREDIR}
+	${INSTALL_DATA} ${WRKSRC}/bin/game.pmotd ${DESTDIR}${SHAREDIR}
 
 .include "../../net/adns/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index a47718a6158..cf514539bf3 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2012/10/06 11:54:59 asau Exp $
+# $NetBSD: Makefile,v 1.35 2018/01/14 15:26:48 rillig Exp $
 #
 
 DISTNAME=		xbill-2.0
@@ -25,7 +25,7 @@ PKG_GROUPS=		${GAMEGRP}
 MAKE_DIRS_PERMS+=	${VARBASE}/games ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 MAKE_ENV+=		GAMEOWN=${GAMEOWN:Q}
 MAKE_ENV+=		GAMEGRP=${GAMEGRP:Q}
-MAKE_ENV+=		GAMEMODE=${GAMEMODE:Q}
+MAKE_ENV+=		GAMEMODE=${GAMEMODE}
 CONF_FILES_PERMS+=	${PREFIX}/share/examples/xbill.scores \
 			${VARBASE}/games/xbill.scores \
 			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 2d4f5984f7d..89d28c67732 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2015/07/04 16:18:35 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2018/01/14 15:26:48 rillig Exp $
 
 DISTNAME=		xconq-7.4.1
 PKGREVISION=		13
@@ -15,9 +15,9 @@ CONFIGURE_ARGS+=	--enable-alternate-scoresdir=${SCOREDIR}
 CONFIGURE_ARGS+=	--with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
 CONFIGURE_ARGS+=	--with-tkconfig="${BUILDLINK_PREFIX.tk}/lib"
 
-MAKE_ENV+=		LOCALBASE=${LOCALBASE:Q}
-MAKE_FLAGS+=		mandir=${PREFIX:Q}/${PKGMANDIR:Q}		\
-			infodir=${PREFIX:Q}/${PKGINFODIR:Q}
+MAKE_ENV+=		LOCALBASE=${LOCALBASE}
+MAKE_FLAGS+=		mandir=${PREFIX}/${PKGMANDIR}		\
+			infodir=${PREFIX}/${PKGINFODIR}
 INFO_FILES=	yes
 
 # XXX SETGIDGAME should go away and the rest of these should come from
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 8e74df24b0a..813c0627558 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2017/09/04 18:08:24 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2018/01/14 15:26:49 rillig Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10
@@ -18,7 +18,7 @@ DEPENDS+=	doom1-[0-9]*:../../games/doom1
 
 WRKSRC=		${WRKDIR}
 USE_TOOLS+=	gmake gunzip tar unzip
-MAKE_ENV+=	X11BASE=${X11BASE:Q} INSTALL_PREFIX=${PREFIX:Q}
+MAKE_ENV+=	X11BASE=${X11BASE} INSTALL_PREFIX=${PREFIX}
 
 BROKEN_ON_PLATFORM=	${LP64PLATFORMS}
 
diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile
index 88f6f332538..7d28bc3013d 100644
--- a/games/xemeraldia/Makefile
+++ b/games/xemeraldia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/06 11:55:00 asau Exp $
+# $NetBSD: Makefile,v 1.19 2018/01/14 15:26:49 rillig Exp $
 
 DISTNAME=	xemeraldia-0.3
 PKGNAME=	xemeraldia-0.31
@@ -17,8 +17,8 @@ USE_IMAKE=	yes
 BUILD_TARGET=	xemeraldia
 
 GAMES_DIR=	share/games
-MAKE_ENV+=	GAMES_DIR=${GAMES_DIR:Q}
-PLIST_SUBST=	GAMES_DIR=${GAMES_DIR:Q}
+MAKE_ENV+=	GAMES_DIR=${GAMES_DIR}
+PLIST_SUBST=	GAMES_DIR=${GAMES_DIR}
 
 SETGIDGAME=	yes
 
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index 7d2975b4f18..d0b782c1db5 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2012/10/06 11:55:01 asau Exp $
+# $NetBSD: Makefile,v 1.36 2018/01/14 15:26:49 rillig Exp $
 
 DISTNAME=		xgalaga-2.0.34
 PKGREVISION=		4
@@ -15,7 +15,7 @@ GNU_CONFIGURE_PREFIX=	${PREFIX}/share/xgalaga
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}/bin
 SETGIDGAME=		yes
 MAKE_ENV+=		GAMEOWN=${GAMEOWN:Q} GAMEGRP=${GAMEGRP:Q} \
-			GAMEMODE=${GAMEMODE:Q} GAMEDATAMODE=${GAMEDATAMODE:Q}
+			GAMEMODE=${GAMEMODE} GAMEDATAMODE=${GAMEDATAMODE}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index 8ae3ce7cf62..d546916b453 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2017/09/06 10:40:28 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/01/14 15:26:49 rillig Exp $
 
 DISTNAME=		xjump_2.7.5.orig
 PKGNAME=		xjump-2.7.5
@@ -14,7 +14,7 @@ COMMENT=		Jumping game for X
 WRKSRC=			${WRKDIR}/xjump-2.7.5.orig
 BUILD_TARGET=		xjump
 INSTALLATION_DIRS=	bin
-MAKE_ENV+=		VARBASE=${VARBASE:Q}
+MAKE_ENV+=		VARBASE=${VARBASE}
 
 SETGIDGAME=		yes
 SPECIAL_PERMS=		bin/xjump ${SETGID_GAMES_PERMS}
diff --git a/games/xkobo/Makefile b/games/xkobo/Makefile
index 23684a2fe50..abe0922232b 100644
--- a/games/xkobo/Makefile
+++ b/games/xkobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2017/09/06 10:40:28 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2018/01/14 15:26:49 rillig Exp $
 
 DISTNAME=	xkobo-1.11
 PKGREVISION=	5
@@ -16,7 +16,7 @@ SPECIAL_PERMS+=	bin/xoko ${SETGID_GAMES_PERMS}
 OWN_DIRS_PERMS+=	${VARBASE}/games/xkobo ${GAMES_USER} ${GAMES_GROUP} \
 			${GAMEDIRMODE}
 
-MAKE_ENV+=	VARBASE=${VARBASE:Q}
+MAKE_ENV+=	VARBASE=${VARBASE}
 
 USE_IMAKE=	yes
 USE_LANGUAGES=	c c++
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index eab2e5260dc..f0ce4789658 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2016/02/20 16:58:56 dholland Exp $
+# $NetBSD: Makefile,v 1.30 2018/01/14 15:26:49 rillig Exp $
 
 DISTNAME=	xpat2-1.07
 PKGREVISION=	4
@@ -13,7 +13,7 @@ MAKE_JOBS_SAFE=		no
 
 USE_TOOLS+=	imake pax
 
-MAKE_ENV+=	XPMDIR=${BUILDLINK_PREFIX.libXpm:Q} XMKMF=${XMKMF_CMD:Q}
+MAKE_ENV+=	XPMDIR=${BUILDLINK_PREFIX.libXpm} XMKMF=${XMKMF_CMD:Q}
 
 USE_GAMESGROUP=		yes
 SPECIAL_PERMS+=		bin/xpat2 ${SETGID_GAMES_PERMS}