Received: by mail.netbsd.org (Postfix, from userid 605)
	id A5AED84E57; Sun, 14 Jan 2018 15:26:52 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 2FDBA84D3D
	for <pkgsrc-changes@NetBSD.org>; Sun, 14 Jan 2018 15:26:52 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([127.0.0.1])
	by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
	with ESMTP id xZVD8xQASIbS for <pkgsrc-changes@netbsd.org>;
	Sun, 14 Jan 2018 15:26:50 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id 105C884D2F
	for <pkgsrc-changes@NetBSD.org>; Sun, 14 Jan 2018 15:26:50 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 0ABFCFBDE; Sun, 14 Jan 2018 15:26:50 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1515943610295170"
MIME-Version: 1.0
Date: Sun, 14 Jan 2018 15:26:50 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: pkgsrc/games
To: pkgsrc-changes@NetBSD.org
Reply-To: rillig@netbsd.org
X-Mailer: log_accum
Message-Id: <20180114152650.0ABFCFBDE@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_1515943610295170
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rillig
Date:		Sun Jan 14 15:26:49 UTC 2018

Modified Files:
	pkgsrc/games/colchess: Makefile
	pkgsrc/games/colchess-book-colchess: Makefile
	pkgsrc/games/colchess-book-large: Makefile
	pkgsrc/games/crafty-book-medium: Makefile
	pkgsrc/games/crafty-book-small: Makefile
	pkgsrc/games/d2x: Makefile
	pkgsrc/games/exchess: Makefile
	pkgsrc/games/exchess-book-medium: Makefile
	pkgsrc/games/exchess-book-small: Makefile
	pkgsrc/games/ggz-client-libs: Makefile
	pkgsrc/games/gnome-games: Makefile
	pkgsrc/games/icebreaker: Makefile
	pkgsrc/games/knightcap-brain: Makefile
	pkgsrc/games/koth: Makefile
	pkgsrc/games/lbreakout: Makefile
	pkgsrc/games/lbreakout2: Makefile
	pkgsrc/games/maelstrom-sdl: Makefile
	pkgsrc/games/maelstrom-x11: Makefile
	pkgsrc/games/monsterz: Makefile
	pkgsrc/games/nethack-lib: Makefile.common
	pkgsrc/games/netmaj: Makefile
	pkgsrc/games/powermanga: Makefile
	pkgsrc/games/qstat: Makefile
	pkgsrc/games/quake: Makefile
	pkgsrc/games/quake6: Makefile
	pkgsrc/games/spaceracer: Makefile
	pkgsrc/games/sudoku-cli: Makefile
	pkgsrc/games/svb: Makefile
	pkgsrc/games/tetrinetx: Makefile
	pkgsrc/games/xbill: Makefile
	pkgsrc/games/xconq: Makefile
	pkgsrc/games/xdoom: Makefile
	pkgsrc/games/xemeraldia: Makefile
	pkgsrc/games/xgalaga: Makefile
	pkgsrc/games/xjump: Makefile
	pkgsrc/games/xkobo: Makefile
	pkgsrc/games/xpat2: Makefile

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/games/colchess/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/games/colchess-book-colchess/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/games/colchess-book-large/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/games/crafty-book-medium/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/games/crafty-book-small/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/games/d2x/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/games/exchess/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/games/exchess-book-medium/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/games/exchess-book-small/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/ggz-client-libs/Makefile
cvs rdiff -u -r1.157 -r1.158 pkgsrc/games/gnome-games/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/games/icebreaker/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/games/knightcap-brain/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/games/koth/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/games/lbreakout/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/games/lbreakout2/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/games/maelstrom-sdl/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/games/maelstrom-x11/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/games/monsterz/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/games/nethack-lib/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/games/netmaj/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/games/powermanga/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/qstat/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/games/quake/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/games/quake6/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/spaceracer/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/sudoku-cli/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/games/svb/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/tetrinetx/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/games/xbill/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/games/xconq/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/games/xdoom/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/games/xemeraldia/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/games/xgalaga/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/games/xjump/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/games/xkobo/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/games/xpat2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1515943610295170
Content-Disposition: inline
Content-Length: 29748
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/games/colchess/Makefile
diff -u pkgsrc/games/colchess/Makefile:1.17 pkgsrc/games/colchess/Makefile:1.18
--- pkgsrc/games/colchess/Makefile:1.17	Tue Aug  1 17:40:11 2017
+++ pkgsrc/games/colchess/Makefile	Sun Jan 14 15:26:46 2018
@@ -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
 

Index: pkgsrc/games/colchess-book-colchess/Makefile
diff -u pkgsrc/games/colchess-book-colchess/Makefile:1.15 pkgsrc/games/colchess-book-colchess/Makefile:1.16
--- pkgsrc/games/colchess-book-colchess/Makefile:1.15	Tue Aug  1 17:40:11 2017
+++ pkgsrc/games/colchess-book-colchess/Makefile	Sun Jan 14 15:26:46 2018
@@ -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

Index: pkgsrc/games/colchess-book-large/Makefile
diff -u pkgsrc/games/colchess-book-large/Makefile:1.14 pkgsrc/games/colchess-book-large/Makefile:1.15
--- pkgsrc/games/colchess-book-large/Makefile:1.14	Sat Oct  6 11:54:33 2012
+++ pkgsrc/games/colchess-book-large/Makefile	Sun Jan 14 15:26:46 2018
@@ -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

Index: pkgsrc/games/crafty-book-medium/Makefile
diff -u pkgsrc/games/crafty-book-medium/Makefile:1.16 pkgsrc/games/crafty-book-medium/Makefile:1.17
--- pkgsrc/games/crafty-book-medium/Makefile:1.16	Sat Oct  6 11:54:34 2012
+++ pkgsrc/games/crafty-book-medium/Makefile	Sun Jan 14 15:26:46 2018
@@ -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

Index: pkgsrc/games/crafty-book-small/Makefile
diff -u pkgsrc/games/crafty-book-small/Makefile:1.16 pkgsrc/games/crafty-book-small/Makefile:1.17
--- pkgsrc/games/crafty-book-small/Makefile:1.16	Sat Oct  6 11:54:34 2012
+++ pkgsrc/games/crafty-book-small/Makefile	Sun Jan 14 15:26:46 2018
@@ -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

Index: pkgsrc/games/d2x/Makefile
diff -u pkgsrc/games/d2x/Makefile:1.22 pkgsrc/games/d2x/Makefile:1.23
--- pkgsrc/games/d2x/Makefile:1.22	Sat Apr 25 14:22:53 2015
+++ pkgsrc/games/d2x/Makefile	Sun Jan 14 15:26:46 2018
@@ -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"

Index: pkgsrc/games/exchess/Makefile
diff -u pkgsrc/games/exchess/Makefile:1.17 pkgsrc/games/exchess/Makefile:1.18
--- pkgsrc/games/exchess/Makefile:1.17	Thu Sep 11 16:59:16 2014
+++ pkgsrc/games/exchess/Makefile	Sun Jan 14 15:26:46 2018
@@ -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}
 

Index: pkgsrc/games/exchess-book-medium/Makefile
diff -u pkgsrc/games/exchess-book-medium/Makefile:1.18 pkgsrc/games/exchess-book-medium/Makefile:1.19
--- pkgsrc/games/exchess-book-medium/Makefile:1.18	Thu Sep 11 17:08:00 2014
+++ pkgsrc/games/exchess-book-medium/Makefile	Sun Jan 14 15:26:46 2018
@@ -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

Index: pkgsrc/games/exchess-book-small/Makefile
diff -u pkgsrc/games/exchess-book-small/Makefile:1.18 pkgsrc/games/exchess-book-small/Makefile:1.19
--- pkgsrc/games/exchess-book-small/Makefile:1.18	Thu Sep 11 17:08:00 2014
+++ pkgsrc/games/exchess-book-small/Makefile	Sun Jan 14 15:26:47 2018
@@ -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

Index: pkgsrc/games/ggz-client-libs/Makefile
diff -u pkgsrc/games/ggz-client-libs/Makefile:1.13 pkgsrc/games/ggz-client-libs/Makefile:1.14
--- pkgsrc/games/ggz-client-libs/Makefile:1.13	Mon Sep 19 13:04:18 2016
+++ pkgsrc/games/ggz-client-libs/Makefile	Sun Jan 14 15:26:47 2018
@@ -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 \

Index: pkgsrc/games/gnome-games/Makefile
diff -u pkgsrc/games/gnome-games/Makefile:1.157 pkgsrc/games/gnome-games/Makefile:1.158
--- pkgsrc/games/gnome-games/Makefile:1.157	Thu Nov 23 17:19:54 2017
+++ pkgsrc/games/gnome-games/Makefile	Sun Jan 14 15:26:47 2018
@@ -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}

Index: pkgsrc/games/icebreaker/Makefile
diff -u pkgsrc/games/icebreaker/Makefile:1.32 pkgsrc/games/icebreaker/Makefile:1.33
--- pkgsrc/games/icebreaker/Makefile:1.32	Wed Aug 16 20:21:09 2017
+++ pkgsrc/games/icebreaker/Makefile	Sun Jan 14 15:26:47 2018
@@ -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}

Index: pkgsrc/games/knightcap-brain/Makefile
diff -u pkgsrc/games/knightcap-brain/Makefile:1.18 pkgsrc/games/knightcap-brain/Makefile:1.19
--- pkgsrc/games/knightcap-brain/Makefile:1.18	Sun Jan  4 06:11:03 2015
+++ pkgsrc/games/knightcap-brain/Makefile	Sun Jan 14 15:26:47 2018
@@ -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/knight
 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"

Index: pkgsrc/games/koth/Makefile
diff -u pkgsrc/games/koth/Makefile:1.26 pkgsrc/games/koth/Makefile:1.27
--- pkgsrc/games/koth/Makefile:1.26	Mon Aug 17 17:11:23 2015
+++ pkgsrc/games/koth/Makefile	Sun Jan 14 15:26:47 2018
@@ -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 ta
 
 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

Index: pkgsrc/games/lbreakout/Makefile
diff -u pkgsrc/games/lbreakout/Makefile:1.35 pkgsrc/games/lbreakout/Makefile:1.36
--- pkgsrc/games/lbreakout/Makefile:1.35	Sat Apr 25 14:23:00 2015
+++ pkgsrc/games/lbreakout/Makefile	Sun Jan 14 15:26:47 2018
@@ -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++

Index: pkgsrc/games/lbreakout2/Makefile
diff -u pkgsrc/games/lbreakout2/Makefile:1.40 pkgsrc/games/lbreakout2/Makefile:1.41
--- pkgsrc/games/lbreakout2/Makefile:1.40	Sat Apr 25 14:23:00 2015
+++ pkgsrc/games/lbreakout2/Makefile	Sun Jan 14 15:26:47 2018
@@ -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
 

Index: pkgsrc/games/maelstrom-sdl/Makefile
diff -u pkgsrc/games/maelstrom-sdl/Makefile:1.25 pkgsrc/games/maelstrom-sdl/Makefile:1.26
--- pkgsrc/games/maelstrom-sdl/Makefile:1.25	Sat Apr 25 14:23:01 2015
+++ pkgsrc/games/maelstrom-sdl/Makefile	Sun Jan 14 15:26:47 2018
@@ -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:

Index: pkgsrc/games/maelstrom-x11/Makefile
diff -u pkgsrc/games/maelstrom-x11/Makefile:1.29 pkgsrc/games/maelstrom-x11/Makefile:1.30
--- pkgsrc/games/maelstrom-x11/Makefile:1.29	Sun Sep  3 08:36:54 2017
+++ pkgsrc/games/maelstrom-x11/Makefile	Sun Jan 14 15:26:47 2018
@@ -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}

Index: pkgsrc/games/monsterz/Makefile
diff -u pkgsrc/games/monsterz/Makefile:1.16 pkgsrc/games/monsterz/Makefile:1.17
--- pkgsrc/games/monsterz/Makefile:1.16	Sun Jan  1 14:43:40 2017
+++ pkgsrc/games/monsterz/Makefile	Sun Jan 14 15:26:47 2018
@@ -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 #
 
 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 \

Index: pkgsrc/games/nethack-lib/Makefile.common
diff -u pkgsrc/games/nethack-lib/Makefile.common:1.33 pkgsrc/games/nethack-lib/Makefile.common:1.34
--- pkgsrc/games/nethack-lib/Makefile.common:1.33	Thu Dec 14 16:13:31 2017
+++ pkgsrc/games/nethack-lib/Makefile.common	Sun Jan 14 15:26:48 2018
@@ -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_GRO
 
 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

Index: pkgsrc/games/netmaj/Makefile
diff -u pkgsrc/games/netmaj/Makefile:1.24 pkgsrc/games/netmaj/Makefile:1.25
--- pkgsrc/games/netmaj/Makefile:1.24	Sat Jul  9 06:38:18 2016
+++ pkgsrc/games/netmaj/Makefile	Sun Jan 14 15:26:48 2018
@@ -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
 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}

Index: pkgsrc/games/powermanga/Makefile
diff -u pkgsrc/games/powermanga/Makefile:1.27 pkgsrc/games/powermanga/Makefile:1.28
--- pkgsrc/games/powermanga/Makefile:1.27	Sat Apr 25 14:23:02 2015
+++ pkgsrc/games/powermanga/Makefile	Sun Jan 14 15:26:48 2018
@@ -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
 

Index: pkgsrc/games/qstat/Makefile
diff -u pkgsrc/games/qstat/Makefile:1.9 pkgsrc/games/qstat/Makefile:1.10
--- pkgsrc/games/qstat/Makefile:1.9	Mon Sep  4 18:00:55 2017
+++ pkgsrc/games/qstat/Makefile	Sun Jan 14 15:26:48 2018
@@ -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

Index: pkgsrc/games/quake/Makefile
diff -u pkgsrc/games/quake/Makefile:1.51 pkgsrc/games/quake/Makefile:1.52
--- pkgsrc/games/quake/Makefile:1.51	Mon Sep  4 18:08:24 2017
+++ pkgsrc/games/quake/Makefile	Sun Jan 14 15:26:48 2018
@@ -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}
 

Index: pkgsrc/games/quake6/Makefile
diff -u pkgsrc/games/quake6/Makefile:1.41 pkgsrc/games/quake6/Makefile:1.42
--- pkgsrc/games/quake6/Makefile:1.41	Mon Sep  4 18:00:55 2017
+++ pkgsrc/games/quake6/Makefile	Sun Jan 14 15:26:48 2018
@@ -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 --bind
 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"

Index: pkgsrc/games/spaceracer/Makefile
diff -u pkgsrc/games/spaceracer/Makefile:1.13 pkgsrc/games/spaceracer/Makefile:1.14
--- pkgsrc/games/spaceracer/Makefile:1.13	Sat Apr 25 14:23:04 2015
+++ pkgsrc/games/spaceracer/Makefile	Sun Jan 14 15:26:48 2018
@@ -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"

Index: pkgsrc/games/sudoku-cli/Makefile
diff -u pkgsrc/games/sudoku-cli/Makefile:1.7 pkgsrc/games/sudoku-cli/Makefile:1.8
--- pkgsrc/games/sudoku-cli/Makefile:1.7	Mon Sep  4 18:00:55 2017
+++ pkgsrc/games/sudoku-cli/Makefile	Sun Jan 14 15:26:48 2018
@@ -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_PROG
 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"

Index: pkgsrc/games/svb/Makefile
diff -u pkgsrc/games/svb/Makefile:1.17 pkgsrc/games/svb/Makefile:1.18
--- pkgsrc/games/svb/Makefile:1.17	Sat Oct  6 11:54:56 2012
+++ pkgsrc/games/svb/Makefile	Sun Jan 14 15:26:48 2018
@@ -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
 

Index: pkgsrc/games/tetrinetx/Makefile
diff -u pkgsrc/games/tetrinetx/Makefile:1.8 pkgsrc/games/tetrinetx/Makefile:1.9
--- pkgsrc/games/tetrinetx/Makefile:1.8	Thu Jan 29 09:53:29 2015
+++ pkgsrc/games/tetrinetx/Makefile	Sun Jan 14 15:26:48 2018
@@ -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"

Index: pkgsrc/games/xbill/Makefile
diff -u pkgsrc/games/xbill/Makefile:1.34 pkgsrc/games/xbill/Makefile:1.35
--- pkgsrc/games/xbill/Makefile:1.34	Sat Oct  6 11:54:59 2012
+++ pkgsrc/games/xbill/Makefile	Sun Jan 14 15:26:48 2018
@@ -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}

Index: pkgsrc/games/xconq/Makefile
diff -u pkgsrc/games/xconq/Makefile:1.46 pkgsrc/games/xconq/Makefile:1.47
--- pkgsrc/games/xconq/Makefile:1.46	Sat Jul  4 16:18:35 2015
+++ pkgsrc/games/xconq/Makefile	Sun Jan 14 15:26:48 2018
@@ -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-scor
 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

Index: pkgsrc/games/xdoom/Makefile
diff -u pkgsrc/games/xdoom/Makefile:1.54 pkgsrc/games/xdoom/Makefile:1.55
--- pkgsrc/games/xdoom/Makefile:1.54	Mon Sep  4 18:08:24 2017
+++ pkgsrc/games/xdoom/Makefile	Sun Jan 14 15:26:49 2018
@@ -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}
 

Index: pkgsrc/games/xemeraldia/Makefile
diff -u pkgsrc/games/xemeraldia/Makefile:1.18 pkgsrc/games/xemeraldia/Makefile:1.19
--- pkgsrc/games/xemeraldia/Makefile:1.18	Sat Oct  6 11:55:00 2012
+++ pkgsrc/games/xemeraldia/Makefile	Sun Jan 14 15:26:49 2018
@@ -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
 

Index: pkgsrc/games/xgalaga/Makefile
diff -u pkgsrc/games/xgalaga/Makefile:1.35 pkgsrc/games/xgalaga/Makefile:1.36
--- pkgsrc/games/xgalaga/Makefile:1.35	Sat Oct  6 11:55:01 2012
+++ pkgsrc/games/xgalaga/Makefile	Sun Jan 14 15:26:49 2018
@@ -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/xg
 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"
 

Index: pkgsrc/games/xjump/Makefile
diff -u pkgsrc/games/xjump/Makefile:1.18 pkgsrc/games/xjump/Makefile:1.19
--- pkgsrc/games/xjump/Makefile:1.18	Wed Sep  6 10:40:28 2017
+++ pkgsrc/games/xjump/Makefile	Sun Jan 14 15:26:49 2018
@@ -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}

Index: pkgsrc/games/xkobo/Makefile
diff -u pkgsrc/games/xkobo/Makefile:1.24 pkgsrc/games/xkobo/Makefile:1.25
--- pkgsrc/games/xkobo/Makefile:1.24	Wed Sep  6 10:40:28 2017
+++ pkgsrc/games/xkobo/Makefile	Sun Jan 14 15:26:49 2018
@@ -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_
 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++

Index: pkgsrc/games/xpat2/Makefile
diff -u pkgsrc/games/xpat2/Makefile:1.29 pkgsrc/games/xpat2/Makefile:1.30
--- pkgsrc/games/xpat2/Makefile:1.29	Sat Feb 20 16:58:56 2016
+++ pkgsrc/games/xpat2/Makefile	Sun Jan 14 15:26:49 2018
@@ -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}


--_----------=_1515943610295170--