Mechanical changes to add DESTDIR support to packages that install

their files via a custom do-install target.

101 files changed, 935 insertions, 627 deletions

diff --git a/games/0verkill/Makefile b/games/0verkill/Makefile
index 5413391f911..905b6e80758 100644
--- a/games/0verkill/Makefile
+++ b/games/0verkill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/09/07 05:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=	0verkill-0.16
 CATEGORIES=	games
@@ -9,6 +9,8 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://artax.karlin.mff.cuni.cz/~brain/0verkill/
 COMMENT=	0verkill is bloody 2D action deathmatch-like game in ASCII-ART
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 HAS_CONFIGURE=		yes
 
 INSTALLATION_DIRS=	bin share/0verkill share/doc/0verkill
@@ -27,13 +29,13 @@ SUBST_FILES.prefix=	cfg.h
 SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} 0verkill ${PREFIX}/bin
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} 0verkill ${DESTDIR}${PREFIX}/bin
 	cd ${WRKSRC} && for f in avi bot editor server test_server; do \
-		${INSTALL_PROGRAM} $$f ${PREFIX}/bin/0verkill-$$f; \
+		${INSTALL_PROGRAM} $$f ${DESTDIR}${PREFIX}/bin/0verkill-$$f; \
 	done
-	${INSTALL_DATA} ${WRKSRC}/data/* ${PREFIX}/share/0verkill/data
-	${INSTALL_DATA} ${WRKSRC}/grx/* ${PREFIX}/share/0verkill/grx
+	${INSTALL_DATA} ${WRKSRC}/data/* ${DESTDIR}${PREFIX}/share/0verkill/data
+	${INSTALL_DATA} ${WRKSRC}/grx/* ${DESTDIR}${PREFIX}/share/0verkill/grx
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} AUTHORS README.html avi.txt \
-		bot.txt doc.html ${PREFIX}/share/doc/0verkill
+		bot.txt doc.html ${DESTDIR}${PREFIX}/share/doc/0verkill
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/4stAttack/Makefile b/games/4stAttack/Makefile
index 3c038235b6e..51209d67e84 100644
--- a/games/4stAttack/Makefile
+++ b/games/4stAttack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/06/12 16:28:07 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 06:59:03 jlam Exp $
 #
 
 DISTNAME=		4stAttack-2.1.4
@@ -10,6 +10,8 @@ MAINTAINER=		recht@NetBSD.org
 HOMEPAGE=		http://forcedattack.sourceforge.net/
 COMMENT=		Game in which you have to try to out-smart your opponent
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PYTHON_PATCH_SCRIPTS=	4stattack.py
 
 FIND_EXCLUDE=	\( -name \*.orig -or -name \*.txt -or -name \*.pre -or -name GPL -or -name \*~ -or -name 4stattack \)
@@ -23,10 +25,10 @@ do-build:
 	${PYTHONBIN} -O ${PREFIX}/${PYLIB}/compileall.py ${WRKSRC}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/${PKGBASE}
-	${INSTALL_SCRIPT} ${WRKSRC}/4stattack ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/${PKGBASE}
+	${INSTALL_SCRIPT} ${WRKSRC}/4stattack ${DESTDIR}${PREFIX}/bin
 	cd ${WRKSRC} && ${FIND} . -type f -and \! ${FIND_EXCLUDE} \
-		-print | ${PAX} -rw -pp -pm ${PREFIX}/share/${PKGBASE}
+		-print | ${PAX} -rw -pp -pm ${DESTDIR}${PREFIX}/share/${PKGBASE}
 
 .include "../../devel/py-game/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/games/REminiscence/Makefile b/games/REminiscence/Makefile
index 97446ca1003..3758a4dc79b 100644
--- a/games/REminiscence/Makefile
+++ b/games/REminiscence/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/10/04 21:43:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/04 06:59:03 jlam Exp $
 #
 
 DISTNAME=		REminiscence-0.1.6
@@ -11,6 +11,8 @@ MAINTAINER=		dillo@NetBSD.org
 HOMEPAGE=		http://cyxdown.free.fr/reminiscence/
 COMMENT=		Engine to play Flashback by Delphine Software
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c++
 
 BUILD_TARGET=		rs
@@ -28,8 +30,9 @@ PKG_FAIL_REASON+=	"Unknown endianness."
 .include "../../devel/SDL/buildlink3.mk"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rs ${LOCALBASE}/bin
-	${INSTALL_DATA_DIR} ${LOCALBASE}/share/doc/REminiscence
-	${INSTALL_DATA} ${WRKSRC}/README ${LOCALBASE}/share/doc/REminiscence
+	${INSTALL_PROGRAM} ${WRKSRC}/rs ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/REminiscence
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/share/doc/REminiscence
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/adom/Makefile b/games/adom/Makefile
index c86abc31cae..7d63d169007 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/07/29 05:19:25 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=	adom-111-elf
 PKGNAME=	adom-1.1.1
@@ -13,13 +13,15 @@ COMMENT=	Ancient Domains of Mystery - yet another roguelike game
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	base
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/adom
 BUILD_DIRS=		# empty
 
 INSTALLATION_DIRS=	bin share/doc/adom
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/adom ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/*.* ${PREFIX}/share/doc/adom
+	${INSTALL_PROGRAM} ${WRKSRC}/adom ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/*.* ${DESTDIR}${PREFIX}/share/doc/adom
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/angband-tty/Makefile b/games/angband-tty/Makefile
index a2bb822c71e..b1e0dc4c4f6 100644
--- a/games/angband-tty/Makefile
+++ b/games/angband-tty/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2008/01/19 09:16:20 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2008/03/04 06:59:03 jlam Exp $
 #
 
 DISTNAME=		angband-283
 PKGNAME=		angband-tty-2.8.3
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		games
 MASTER_SITES=		ftp://export.andrew.cmu.edu/angband/Source/ \
 			ftp://ftp.greyhelm.com/pub/Games/Angband/Angband-2.7.x/Source/
@@ -15,6 +15,8 @@ COMMENT=		Tolkien based variant of Moria for tty/console displays
 
 CONFLICTS=		angband-x11-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	destdir
+
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 MAKE_FILE=		Makefile.std
@@ -26,16 +28,22 @@ SPOILERFILE=		angband-spoilers.tar.gz
 GCC_REQD+=		2.95.3
 .endif
 
+SETGIDGAME=		yes
+SPECIAL_PERMS=		bin/angband ${SETGID_GAMES_PERMS}
+
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL} -d -o bin -g games -m 0775 ${PREFIX}/share/angband
-	cd ${WRKDIR}/${DISTNAME}/lib && ${PAX} -wr * ${PREFIX}/share/angband
-	cd ${PREFIX}/share/angband/help && \
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/angband
+	cd ${WRKDIR}/${DISTNAME}/lib && ${PAX} -wr * \
+		${DESTDIR}${PREFIX}/share/angband
+	cd ${DESTDIR}${PREFIX}/share/angband/help && \
 		${PAX} -O -zrf ${DISTDIR}/${SPOILERFILE}
-	${CHOWN} -R ${GAMEOWN}:${GAMEGRP} ${PREFIX}/share/angband
-	cd ${PREFIX}/share/angband && ${CHMOD} ${GAMEDATAMODE} */*
-	cd ${PREFIX}/share/angband && ${CHMOD} ${GAMEDIRMODE} apex bone data edit file help info save user xtra
-	${INSTALL_GAME} ${WRKSRC}/angband ${PREFIX}/bin
+	${CHOWN} -R ${GAMEOWN}:${GAMEGRP} ${DESTDIR}${PREFIX}/share/angband
+	cd ${DESTDIR}${PREFIX}/share/angband && \
+		${CHMOD} ${GAMEDATAMODE} */*
+	cd ${DESTDIR}${PREFIX}/share/angband && \
+		${CHMOD} ${GAMEDIRMODE} apex bone data edit file help info save user xtra
+	${INSTALL_PROGRAM} ${WRKSRC}/angband ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/bastet/Makefile b/games/bastet/Makefile
index b13e70a014f..3dbce3e2908 100644
--- a/games/bastet/Makefile
+++ b/games/bastet/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/09/14 20:53:24 dogcow Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/04 06:59:03 jlam Exp $
 #
 
 DISTNAME=		bastet-0.41
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		http://fph.altervista.org/prog/
 EXTRACT_SUFX=		.tgz
@@ -10,16 +11,20 @@ MAINTAINER=		rillig@NetBSD.org
 HOMEPAGE=		http://fph.altervista.org/prog/bastet.shtml
 COMMENT=		Bastard Tetris
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake
 MAKE_FLAGS+=		BIN_PREFIX=${PREFIX}/bin/
 MAKE_FLAGS+=		DATA_PREFIX=${VARBASE}/games/
 BUILD_DEFS+=		VARBASE
 
+SETGIDGAME=		yes
+SPECIAL_PERMS=		bin/bastet ${SETGID_GAMES_PERMS}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
-	${INSTALL_GAME} ${WRKSRC}/bastet ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/bastet.6 ${PREFIX}/${PKGMANDIR}/man6/
+	${INSTALL_PROGRAM} ${WRKSRC}/bastet ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/bastet.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index a3ae4d71162..5faa98a12c9 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2008/01/19 09:16:20 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=		battalion
 PKGNAME=		battalion-1.4
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.evl.uic.edu/aej/BATTALION/
 DISTFILES=		battalionSource1.4.tar.Z battalionSUN4.tar.gz
@@ -13,6 +13,8 @@ COMMENT=		Virtual reality 3D GL game for X11
 
 NOT_FOR_PLATFORM=	*-*-alpha	# relies on Mesa (gcc)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/battalionSource
 EXTRACT_ONLY=		battalionSource1.4.tar.Z
 USE_TOOLS+=		gtar
@@ -23,25 +25,29 @@ USE_TOOLS+=		gtar
 MAKE_ENV+=	LIBFLAGS=-lcompat
 .endif
 
+SETGIDGAME=		yes
+SPECIAL_PERMS+=		bin/battalion ${SETGID_GAMES_PERMS}
+CONF_FILES_PERMS=	/dev/null /var/games/battalion_hiscore		\
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
-	${INSTALL} -c -s -o ${ROOT_USER} -g games -m 2755 ${WRKSRC}/battalion ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/battalion $${DESTDIR}{PREFIX}/bin
 	cd ${WRKDIR} && \
 	    ${GZCAT} ${DISTDIR}/battalionSUN4.tar.gz | ${GTAR} xmf -
-	${INSTALL_DATA_DIR} ${PREFIX}/share/battalion/HELP
-	${INSTALL_DATA_DIR} ${PREFIX}/share/battalion/battalion.data/DATA
-	${INSTALL_DATA_DIR} ${PREFIX}/share/battalion/battalion.data/MUSIC
-	${INSTALL_DATA_DIR} ${PREFIX}/share/battalion/battalion.data/SOUNDS
-	${INSTALL_DATA_DIR} ${PREFIX}/share/battalion/battalion.data/TEXTURES
-	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/DATA/* ${PREFIX}/share/battalion/battalion.data/DATA
-	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/MUSIC/* ${PREFIX}/share/battalion/battalion.data/MUSIC
-	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/SOUNDS/* ${PREFIX}/share/battalion/battalion.data/SOUNDS
-	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/TEXTURES/* ${PREFIX}/share/battalion/battalion.data/TEXTURES
-	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/battalion.sho ${PREFIX}/share/battalion/battalion.data
-	${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man ${PREFIX}/${PKGMANDIR}/man6/battalion.6
-	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/HELP/* ${PREFIX}/share/battalion/HELP
-	${INSTALL} -o bin -g games -m 664 /dev/null /var/games/battalion_hiscore
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/battalion/HELP
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/battalion/battalion.data/DATA
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/battalion/battalion.data/MUSIC
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/battalion/battalion.data/SOUNDS
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/battalion/battalion.data/TEXTURES
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/DATA/* ${DESTDIR}${PREFIX}/share/battalion/battalion.data/DATA
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/MUSIC/* ${DESTDIR}${PREFIX}/share/battalion/battalion.data/MUSIC
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/SOUNDS/* ${DESTDIR}${PREFIX}/share/battalion/battalion.data/SOUNDS
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/TEXTURES/* ${DESTDIR}${PREFIX}/share/battalion/battalion.data/TEXTURES
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/battalion.sho ${DESTDIR}${PREFIX}/share/battalion/battalion.data
+	${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/battalion.6
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/HELP/* ${DESTDIR}${PREFIX}/share/battalion/HELP
 
 pre-clean:
 	@${RM} -rf ${WRKDIR}/battalionSUN4
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index 48b0058f696..95d5878dda8 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/01/19 09:16:20 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=	battleball.21.src
 PKGNAME=	battleball-2.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://web.archive.org/web/*/http://www.cs.utexas.edu/users/pahardin/bb.html
 COMMENT=	3d game of soccer, with tanks
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/battleball-2.1-src
 USE_LANGUAGES=	c c++
 
@@ -24,7 +26,7 @@ do-configure:
 	${SED} ${SED_CMDS} < ${WRKSRC}/Makefile.orig > ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/battleball ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/battleball ${DESTDIR}${PREFIX}/bin/
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/bos/Makefile b/games/bos/Makefile
index ba6a3a0b31a..84fca90b429 100644
--- a/games/bos/Makefile
+++ b/games/bos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/03 12:47:06 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/04 06:59:03 jlam Exp $
 #
 
 DISTNAME=		bos_1_1
@@ -13,6 +13,7 @@ COMMENT=		Invasion - Battle of Survival (real-time strategy game)
 
 DEPENDS+=		stratagus>=2.1:../../games/stratagus
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	bin
 
 do-build:
@@ -21,10 +22,10 @@ do-build:
 		${WRKSRC}/bos
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bos ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/bos
-	cd ${WRKSRC} && ${PAX} -pe -rw data ${PREFIX}/share/bos
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bos
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/bos
+	${INSTALL_SCRIPT} ${WRKSRC}/bos ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/bos
+	cd ${WRKSRC} && ${PAX} -pe -rw data ${DESTDIR}${PREFIX}/share/bos
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/bos
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/share/doc/bos
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/bridge-hands/Makefile b/games/bridge-hands/Makefile
index 7de7fb30d83..76174f8ec3f 100644
--- a/games/bridge-hands/Makefile
+++ b/games/bridge-hands/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:40 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=	hands-2.0.bsd386
 PKGNAME=	bridge-hands-2.0
@@ -11,6 +11,8 @@ COMMENT=	Generate hands for duplicate bridge
 
 EXTRACT_ELEMENTS=	hands/source
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/hands/source
 INSTALLATION_DIRS=	bin
 
@@ -19,6 +21,6 @@ do-build:
 		-o hands hands.c ${LIBS}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hands ${PREFIX}/bin/bridge-hands
+	${INSTALL_PROGRAM} ${WRKSRC}/hands ${DESTDIR}${PREFIX}/bin/bridge-hands
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/cgoban-java/Makefile b/games/cgoban-java/Makefile
index ba853e92f54..757703dca01 100644
--- a/games/cgoban-java/Makefile
+++ b/games/cgoban-java/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2008/02/19 02:53:50 rh Exp $
+# $NetBSD: Makefile,v 1.47 2008/03/04 06:59:03 jlam Exp $
 #
 
 DISTNAME=	cgoban-java-3.3.22
@@ -11,6 +11,8 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gokgs.com/
 COMMENT=	Client for the KGS Go Server and SGF viewer/editor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_JAVA=	run
 USE_JAVA2=	yes
@@ -22,8 +24,10 @@ do-build:
 	printf "#! ${SH}\\nexec ${JAVA_BINPREFIX}-java -jar ${PREFIX}/lib/java/${DISTNAME}.jar \"\$$@\"\\n" > ${WRKSRC}/cgoban-java.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/cgoban-java.sh ${PREFIX}/bin/cgoban-java
-	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${PREFIX}/lib/java/${DISTNAME}.jar
+	${INSTALL_SCRIPT} ${WRKSRC}/cgoban-java.sh \
+		${DESTDIR}${PREFIX}/bin/cgoban-java
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar \
+		${DESTDIR}${PREFIX}/lib/java/${DISTNAME}.jar
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/civctp-demo/Makefile b/games/civctp-demo/Makefile
index 6f811f5b6d9..5ee699ed56e 100644
--- a/games/civctp-demo/Makefile
+++ b/games/civctp-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/07/29 05:19:25 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=	civctp-demo-10251999
 PKGNAME=	civctp-demo-19991025
@@ -16,6 +16,8 @@ COMMENT=	Civilization: Call to Power - graphical strategy (linux demo)
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	x11
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${WRKNAME}
 BUILD_DIRS=	# empty
 
@@ -43,11 +45,15 @@ do-build:
 
 # The executable must be in the same directory as the data.
 do-install:
-	${INSTALL_DATA_DIR} ${LIBDIR}
-	${INSTALL_DATA_DIR} ${SHAREDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINTYPE}/${DISTBINNAME} ${LIBDIR}/${BINNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README
-	cd ${WRKSRC} && ${PAX} -rw appstr.txt civpaths.txt ctp_data ${LIBDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh \
+		${DESTDIR}${PREFIX}/bin/${BINNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINTYPE}/${DISTBINNAME} \
+		${DESTDIR}${LIBDIR}/${BINNAME}
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${SHAREDIR}/${BINNAME}-README
+	cd ${WRKSRC} && ${PAX} -rw appstr.txt civpaths.txt ctp_data \
+		${DESTDIR}${LIBDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/cmatrix/Makefile b/games/cmatrix/Makefile
index 341d1c87f00..7bc13d7f384 100644
--- a/games/cmatrix/Makefile
+++ b/games/cmatrix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:54 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/04 06:59:03 jlam Exp $
 #
 
 DISTNAME=		cmatrix-1.2a
@@ -9,14 +9,18 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.asty.org/cmatrix/
 COMMENT=		Make your console feel like Nadbuchonazor's bridge
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cmatrix ${PREFIX}/bin/cmatrix
-	${INSTALL_MAN} ${WRKSRC}/cmatrix.1 ${PREFIX}/${PKGMANDIR}/man1/cmatrix.1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/cmatrix
-	${INSTALL_DATA} ${WRKSRC}/mtx.pcf ${PREFIX}/share/cmatrix/mtx.pcf
+	${INSTALL_PROGRAM} ${WRKSRC}/cmatrix ${DESTDIR}${PREFIX}/bin/cmatrix
+	${INSTALL_MAN} ${WRKSRC}/cmatrix.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/cmatrix.1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/cmatrix
+	${INSTALL_DATA} ${WRKSRC}/mtx.pcf \
+		${DESTDIR}${PREFIX}/share/cmatrix/mtx.pcf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/colchess-book-colchess/Makefile b/games/colchess-book-colchess/Makefile
index 5fa6821b05d..b99254ef213 100644
--- a/games/colchess-book-colchess/Makefile
+++ b/games/colchess-book-colchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:40 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=		colchess
 PKGNAME=		${CHESS_ENGINE}-book-${DIST_SUBDIR}
@@ -14,6 +14,8 @@ DEPENDS+=		colchess>=7.0:../../games/colchess
 
 CONFLICTS+=		colchess-book-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/ColChess
 CHESS_ENGINE=		colchess
 DIST_SUBDIR=		colchess-7.0
@@ -27,7 +29,7 @@ BOOKDIR=		${PREFIX}/share/${CHESS_ENGINE}
 BOOK_FILE=		book.dat
 
 do-install:
-	${INSTALL_DATA_DIR} ${BOOKDIR}
-	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${BOOKDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${BOOKDIR}
+	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${DESTDIR}${BOOKDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/colchess-book-large/Makefile b/games/colchess-book-large/Makefile
index 3378d170cd6..356abf6b296 100644
--- a/games/colchess-book-large/Makefile
+++ b/games/colchess-book-large/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:40 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=		book_large
 PKGNAME=		${CHESS_ENGINE}-book-large-20000512
@@ -13,6 +13,8 @@ DEPENDS+=		colchess>=7.0:../../games/colchess
 
 CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		colchess
 DIST_SUBDIR=		chessbooks
@@ -28,7 +30,7 @@ do-build:
 	cd ${WRKSRC}; ${LN} ${DISTNAME}.dat ${BOOK_FILE}
 
 do-install:
-	${INSTALL_DATA_DIR} ${BOOKDIR}
-	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${BOOKDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${BOOKDIR}
+	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${DESTDIR}${BOOKDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/colchess/Makefile b/games/colchess/Makefile
index 758c6017898..3f3852b009e 100644
--- a/games/colchess/Makefile
+++ b/games/colchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:40 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=		colchess
 PKGNAME=		${DISTNAME}-7.0
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.ast.cam.ac.uk/~cmf/chess/colchess/
 COMMENT=		Chess analysis engine
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=		${PKGNAME_NOREV}
 MAKE_ENV+=		PREFIX=${PREFIX:Q}
 NO_CONFIGURE=		yes
@@ -20,12 +22,12 @@ DOCDIR=			${PREFIX}/share/doc/colchess
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/colchess ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/chessdat.dat ${DATADIR}
-	${INSTALL_DATA_DIR} ${DATADIR}/tests
-	${INSTALL_DATA} ${WRKSRC}/tests/*.epd ${DATADIR}/tests
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/colchess ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/chessdat.dat ${DESTDIR}${DATADIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DATADIR}/tests
+	${INSTALL_DATA} ${WRKSRC}/tests/*.epd ${DESTDIR}${DATADIR}/tests
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/crafty-book-medium/Makefile b/games/crafty-book-medium/Makefile
index 0b322518cda..9a5fde71de4 100644
--- a/games/crafty-book-medium/Makefile
+++ b/games/crafty-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:40 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=		medium
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -14,6 +14,8 @@ DEPENDS+=		crafty>=17.0:../../games/crafty
 
 CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		crafty
 DIST_SUBDIR=		chessbooks
@@ -35,7 +37,7 @@ do-build:
 	cd ${WRKSRC} && crafty bookpath=.
 
 do-install:
-	${INSTALL_DATA_DIR} ${BOOKDIR}
-	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${BOOKDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${BOOKDIR}
+	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${DESTDIR}${BOOKDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/crafty-book-small/Makefile b/games/crafty-book-small/Makefile
index c4e1b11bcef..9038d658678 100644
--- a/games/crafty-book-small/Makefile
+++ b/games/crafty-book-small/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:40 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=		small
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -14,6 +14,8 @@ DEPENDS+=		crafty>=17.0:../../games/crafty
 
 CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		crafty
 DIST_SUBDIR=		chessbooks
@@ -35,7 +37,7 @@ do-build:
 	cd ${WRKSRC} && crafty bookpath=.
 
 do-install:
-	${INSTALL_DATA_DIR} ${BOOKDIR}
-	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${BOOKDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${BOOKDIR}
+	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${DESTDIR}${BOOKDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/crafty-doc/Makefile b/games/crafty-doc/Makefile
index 4ca6db21032..41ccb8db969 100644
--- a/games/crafty-doc/Makefile
+++ b/games/crafty-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:40 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=		crafty-doc-18.0
 CATEGORIES=		games
@@ -8,6 +8,8 @@ DISTFILES=		crafty.doc.ps
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Documentation for Crafty chess engine
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=		${PKGNAME_NOREV}
 EXTRACT_ONLY=		# empty
 NO_CONFIGURE=		yes
@@ -16,9 +18,10 @@ NO_BUILD=		yes
 DOCDIR=			${PREFIX}/share/doc/crafty
 
 do-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 	for file in ${DISTFILES}; do \
-		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$${file} ${DOCDIR}; \
+		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$${file} \
+			${DESTDIR}${DOCDIR}; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/crafty/Makefile b/games/crafty/Makefile
index aa04dc39a8d..5f647326cc0 100644
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/05/19 09:18:29 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=		crafty-18.15
 CATEGORIES=		games
@@ -11,6 +11,7 @@ DISTFILES+=		${CRAFTY_STARTPGN} ${CRAFTY_DOCFILES}
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Chess engine
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 DIST_SUBDIR=		${DISTNAME}-1
 CRAFTY_DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -77,12 +78,13 @@ post-build:
 	cd ${WRKSRC} && ${WRKSRC}/crafty bookpath=.
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/crafty ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${BOOKDIR}
-	${INSTALL_DATA} ${WRKSRC}/books.bin ${BOOKDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/crafty ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${BOOKDIR}
+	${INSTALL_DATA} ${WRKSRC}/books.bin ${DESTDIR}${BOOKDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 	for file in ${CRAFTY_DOCFILES}; do \
-		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$${file} ${DOCDIR}; \
+		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$${file} \
+			${DESTDIR}${DOCDIR}; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/digger/Makefile b/games/digger/Makefile
index 566dc3f538a..0ecad15628f 100644
--- a/games/digger/Makefile
+++ b/games/digger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/09/09 02:42:00 obache Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/04 06:59:03 jlam Exp $
 #
 
 DISTNAME=		digger-20020314
@@ -10,6 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.digger.org/
 COMMENT=		Digger Remastered
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,7 +25,7 @@ MAKE_FLAGS+=		-DSDL
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/digger ${PREFIX}/bin/digger
+	${INSTALL_PROGRAM} ${WRKSRC}/digger ${DESTDIR}${PREFIX}/bin/digger
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/dipmap/Makefile b/games/dipmap/Makefile
index 5b2c47d3baf..ef1e1c7924a 100644
--- a/games/dipmap/Makefile
+++ b/games/dipmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/09/09 02:42:00 obache Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/04 06:59:03 jlam Exp $
 
 DISTNAME=		mapit.v1-16
 PKGNAME=		dipmap-1.16
@@ -11,6 +11,8 @@ MAINTAINER=		njohnston@globaltetrahedron.com
 HOMEPAGE=		http://www.diplom.org/Online/mapsoftware.html
 COMMENT=		Generate postscript maps from results of play-by-email Diplomacy games
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_FILE=		makefile
 USE_TOOLS+=		csh:run
 WRKSRC=			${WRKDIR}/mapit
@@ -26,13 +28,13 @@ post-patch:
 	${MV} ${WRKSRC}/dipmap.new ${WRKSRC}/dipmap
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/dipmap ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mapit
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mapit
-	${INSTALL_PROGRAM} ${WRKSRC}/mapit ${PREFIX}/libexec
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mapit
-	${INSTALL_DATA} ${WRKSRC}/README.maps ${PREFIX}/share/doc/mapit
-	${INSTALL_DATA} ${WRKSRC}/*.ps ${PREFIX}/share/mapit
-	${INSTALL_DATA} ${WRKSRC}/*.info ${PREFIX}/share/mapit
+	${INSTALL_SCRIPT} ${WRKSRC}/dipmap ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/mapit
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/mapit
+	${INSTALL_PROGRAM} ${WRKSRC}/mapit ${DESTDIR}${PREFIX}/libexec
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mapit
+	${INSTALL_DATA} ${WRKSRC}/README.maps ${DESTDIR}${PREFIX}/share/doc/mapit
+	${INSTALL_DATA} ${WRKSRC}/*.ps ${DESTDIR}${PREFIX}/share/mapit
+	${INSTALL_DATA} ${WRKSRC}/*.info ${DESTDIR}${PREFIX}/share/mapit
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/et/Makefile b/games/et/Makefile
index 8c4b3bc6963..3aa9f4f7bcb 100644
--- a/games/et/Makefile
+++ b/games/et/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/07/29 05:19:25 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 06:59:03 jlam Exp $
 #
 
 DISTNAME=	et-linux-2.56-2.x86
@@ -15,6 +15,8 @@ COMMENT=	Wolfenstein: Enemy Territory for Linux
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	base
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gtar
 EXTRACT_CMD=	${TAIL} +356 ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - \
 		-C ${WRKSRC}
@@ -38,21 +40,21 @@ post-extract:
 	${CP} ${FILESDIR}/etded.sh ${WRKDIR}/etded
 
 do-install:
-	${INSTALL_DATA_DIR} ${ETDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${ETDIR}/
-	${INSTALL_DATA} ${WRKSRC}/README ${ETDIR}/
-	${INSTALL_DATA} ${WRKSRC}/ET.xpm ${ETDIR}/
-	${INSTALL_DATA} ${WRKSRC}/openurl.sh ${ETDIR}/
-	${INSTALL_DATA} ${WRKSRC}/v1.02_Readme.htm ${ETDIR}/
-	${INSTALL_DATA_DIR} ${ETDIR}/Docs
-	cd ${WRKSRC}/Docs && ${PAX} -rw -p am . ${ETDIR}/Docs
-	${INSTALL_DATA_DIR} ${ETDIR}/etmain
-	cd ${WRKSRC}/etmain && ${PAX} -rw -p am . ${ETDIR}/etmain
-	${INSTALL_DATA_DIR} ${ETDIR}/pb
-	cd ${WRKSRC}/pb && ${PAX} -rw -p am . ${ETDIR}/pb
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/Linux/x86/et.x86 ${ETDIR}/
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/Linux/x86/etded.x86 ${ETDIR}/
-	${INSTALL_SCRIPT} ${WRKDIR}/et ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/etded ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${ETDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${ETDIR}/
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${ETDIR}/
+	${INSTALL_DATA} ${WRKSRC}/ET.xpm ${DESTDIR}${ETDIR}/
+	${INSTALL_DATA} ${WRKSRC}/openurl.sh ${DESTDIR}${ETDIR}/
+	${INSTALL_DATA} ${WRKSRC}/v1.02_Readme.htm ${DESTDIR}${ETDIR}/
+	${INSTALL_DATA_DIR} ${DESTDIR}${ETDIR}/Docs
+	cd ${WRKSRC}/Docs && ${PAX} -rw -p am . ${DESTDIR}${ETDIR}/Docs
+	${INSTALL_DATA_DIR} ${DESTDIR}${ETDIR}/etmain
+	cd ${WRKSRC}/etmain && ${PAX} -rw -p am . ${DESTDIR}${ETDIR}/etmain
+	${INSTALL_DATA_DIR} ${DESTDIR}${ETDIR}/pb
+	cd ${WRKSRC}/pb && ${PAX} -rw -p am . ${DESTDIR}${ETDIR}/pb
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/Linux/x86/et.x86 ${DESTDIR}${ETDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/Linux/x86/etded.x86 ${DESTDIR}${ETDIR}/
+	${INSTALL_SCRIPT} ${WRKDIR}/et ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/etded ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/eus-demo/Makefile b/games/eus-demo/Makefile
index 70f21445cd0..8d07014fb10 100644
--- a/games/eus-demo/Makefile
+++ b/games/eus-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/07/29 05:19:25 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/04 06:59:04 jlam Exp $
 
 DISTNAME=	eus-demo
 PKGNAME=	eus-demo-1.0
@@ -16,6 +16,8 @@ COMMENT=	Eric's Ultimate Solitaire (linux demo)
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	x11
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${WRKNAME}
 BUILD_DIRS=	# empty
 
@@ -43,11 +45,13 @@ do-build:
 
 # The executable must be in the same directory as the data.
 do-install:
-	${INSTALL_DATA_DIR} ${LIBDIR}
-	${INSTALL_DATA_DIR} ${SHAREDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINTYPE}/${DISTBINNAME} ${LIBDIR}/${BINNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README
-	cd ${WRKSRC} && ${PAX} -rw [Eai-p]* sounds ${LIBDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh \
+		${DESTDIR}${PREFIX}/bin/${BINNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINTYPE}/${DISTBINNAME} \
+		${DESTDIR}${LIBDIR}/${BINNAME}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${SHAREDIR}/${BINNAME}-README
+	cd ${WRKSRC} && ${PAX} -rw [Eai-p]* sounds ${DESTDIR}${LIBDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/exchess-book-medium/Makefile b/games/exchess-book-medium/Makefile
index f465ad61908..ab967be3bac 100644
--- a/games/exchess-book-medium/Makefile
+++ b/games/exchess-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:41 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/04 06:59:04 jlam Exp $
 
 DISTNAME=		medium
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -14,6 +14,8 @@ DEPENDS+=		exchess-[0-9]*:../../games/exchess
 
 CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		exchess
 DIST_SUBDIR=		chessbooks
@@ -43,7 +45,7 @@ do-build:
 	cd ${WRKSRC} && exchess < ${CMDFILE}
 
 do-install:
-	${INSTALL_DATA_DIR} ${BOOKDIR}
-	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${BOOKDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${BOOKDIR}
+	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${DESTDIR}${BOOKDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/exchess-book-small/Makefile b/games/exchess-book-small/Makefile
index d50fe3e0e73..aa76bb698a2 100644
--- a/games/exchess-book-small/Makefile
+++ b/games/exchess-book-small/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:41 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/04 06:59:04 jlam Exp $
 
 DISTNAME=		small
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -14,6 +14,8 @@ DEPENDS+=		exchess-[0-9]*:../../games/exchess
 
 CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		exchess
 DIST_SUBDIR=		chessbooks
@@ -39,7 +41,7 @@ do-build:
 	cd ${WRKSRC} && exchess < ${CMDFILE}
 
 do-install:
-	${INSTALL_DATA_DIR} ${BOOKDIR}
-	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${BOOKDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${BOOKDIR}
+	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${DESTDIR}${BOOKDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/fillets-ng-data/Makefile b/games/fillets-ng-data/Makefile
index 8110c6c15c2..ebf4ac27ba8 100644
--- a/games/fillets-ng-data/Makefile
+++ b/games/fillets-ng-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/04 21:43:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=	fillets-ng-data-0.7.1
@@ -9,16 +9,18 @@ MAINTAINER=	salo@NetBSD.org
 HOMEPAGE=	http://fillets.sourceforge.net/
 COMMENT=	Fish Fillets NG data files
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/games/fillets-ng
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fillets-ng
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/games/fillets-ng
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/fillets-ng
 	cd ${WRKSRC} && \
 		${PAX} -rw -pm font images music script sound \
-			${PREFIX}/share/games/fillets-ng/
+			${DESTDIR}${PREFIX}/share/games/fillets-ng/
 	cd ${WRKSRC}/doc/html && \
-		${PAX} -rw -pm . ${PREFIX}/share/doc/fillets-ng/
+		${PAX} -rw -pm . ${DESTDIR}${PREFIX}/share/doc/fillets-ng/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index 24a7265dd1c..abc55c69aae 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:30 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=		fkiss-0.33
@@ -17,6 +17,8 @@ PATCH_DIST_STRIP=	-p1
 
 DEPENDS+=		lha-[0-9]*:../../archivers/lha
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CFLAGS+=		-DUSE_STDARG -DHAVE_STDARG_H
@@ -33,16 +35,18 @@ post-patch:
 		<${WRKSRC}/fkiss.man.bak >${WRKSRC}/fkiss.man
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fkiss ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/fkiss.man ${PREFIX}/${PKGMANDIR}/man6/fkiss.6
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/fkiss
+	${INSTALL_PROGRAM} ${WRKSRC}/fkiss ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/fkiss.man \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/fkiss.6
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/fkiss
 	${INSTALL_DATA} ${WRKSRC}/fkissrc.smp \
-		${PREFIX}/share/examples/fkiss/fkissrc
-	${INSTALL_DATA} ${WRKSRC}/frkismi4.lzh ${PREFIX}/share/examples/fkiss
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fkiss
+		${DESTDIR}${PREFIX}/share/examples/fkiss/fkissrc
+	${INSTALL_DATA} ${WRKSRC}/frkismi4.lzh \
+		${DESTDIR}${PREFIX}/share/examples/fkiss
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/fkiss
 	for i in ${WRKSRC}/*.doc; do \
 		${SED} -f ${WRKSRC}/english.sed <$$i \
-			>${PREFIX}/share/doc/fkiss/`${BASENAME} $$i`; \
+		    >${DESTDIR}${PREFIX}/share/doc/fkiss/`${BASENAME} $$i`; \
 	done
 
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/games/flightgear-base/Makefile b/games/flightgear-base/Makefile
index 2aae7679d52..51b383ae6b9 100644
--- a/games/flightgear-base/Makefile
+++ b/games/flightgear-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/07/12 20:05:28 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=	fgfs-base-0.9.10
@@ -16,6 +16,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	ftp://ftp.flightgear.org/pub/fgfs/Shared/
 COMMENT=	FlightGear Simulator (data files)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/data
 NO_BUILD=	yes
 USE_LANGUAGES=	# empty
@@ -23,13 +25,11 @@ USE_LANGUAGES=	# empty
 FG_SHAREDIR=	${PREFIX}/share/FlightGear
 
 do-install:
-.if !exists(${FG_SHAREDIR})
-	${INSTALL_DATA_DIR} ${FG_SHAREDIR}
-.endif
-	(						    \
-	cd ${WRKSRC};					    \
-	${FIND} . -type f -name .\* -print|${XARGS} rm -f;  \
-	${PAX} -rwppm . ${FG_SHAREDIR};			    \
+	${INSTALL_DATA_DIR} ${DESTDIR}${FG_SHAREDIR}
+	(							\
+	cd ${WRKSRC};						\
+	${FIND} . -type f -name .\* -print|${XARGS} rm -f;	\
+	${PAX} -rwppm . ${DESTDIR}${FG_SHAREDIR};		\
 	)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/fltk-sudoku/Makefile b/games/fltk-sudoku/Makefile
index cec5111f5b4..406dbf9016a 100644
--- a/games/fltk-sudoku/Makefile
+++ b/games/fltk-sudoku/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/03/23 22:10:50 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/04 06:59:04 jlam Exp $
 
 DISTNAME=	fltk-1.1.7-source
 PKGNAME=	fltk-sudoku-1.1.7
+PKGREVISION=	1
 VERS=		${DISTNAME:S/fltk-//:S/-source//}
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fltk/} \
@@ -17,6 +18,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.easysw.com/~mike/sudoku/index.html
 COMMENT=	FLTK example Sudoku game creator and solver
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
@@ -42,8 +45,11 @@ SUBST_SED.config2=	-e "s|../lib/||g"
 BUILD_DIRS=		test
 BUILD_TARGET=		sudoku
 
+SETGIDGAME=		yes
+SPECIAL_PERMS=		bin/fltk-sudoku ${SETGID_GAMES_PERMS}
+
 do-install:
-	${INSTALL_GAME} ${WRKSRC}/test/sudoku ${PREFIX}/bin/fltk-sudoku
+	${INSTALL_PROGRAM} ${WRKSRC}/test/sudoku ${DESTDIR}${PREFIX}/bin/fltk-sudoku
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/games/fortunes-calvin/Makefile b/games/fortunes-calvin/Makefile
index 0d79b349db8..e185d4cb49a 100644
--- a/games/fortunes-calvin/Makefile
+++ b/games/fortunes-calvin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/11/09 08:36:46 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=	fortunes-calvin-0.2
@@ -12,6 +12,8 @@ COMMENT=	Fortunes from the famous Calvin & Hobbes comic strips
 
 BUILD_DEPENDS+=	fortune-strfile-[0-9]*:../../games/fortune-strfile
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 STRFILE=	${LOCALBASE}/bin/strfile
 WRKSRC=		${WRKDIR}
 
@@ -19,8 +21,10 @@ do-build:
 	${STRFILE} ${WRKDIR}/${DISTNAME}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/games/fortune/
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME} ${PREFIX}/share/games/fortune/calvin
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}.dat ${PREFIX}/share/games/fortune/calvin.dat
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/games/fortune/
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME} \
+		${DESTDIR}${PREFIX}/share/games/fortune/calvin
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}.dat \
+		${DESTDIR}${PREFIX}/share/games/fortune/calvin.dat
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/fortunes-de/Makefile b/games/fortunes-de/Makefile
index 573eddc5b80..45334686fc5 100644
--- a/games/fortunes-de/Makefile
+++ b/games/fortunes-de/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/01/07 13:24:33 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=	fortunes-de-0.20
@@ -12,7 +12,9 @@ COMMENT=	German data files for fortune
 
 BUILD_DEPENDS+=	fortune-strfile-[0-9]*:../../games/fortune-strfile
 
-STRFILE=	${LOCALBASE}/bin/strfile
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+STRFILE=		${LOCALBASE}/bin/strfile
 INSTALLATION_DIRS=	share/games/fortune/de
 CHECK_PORTABILITY_SKIP=	install.sh
 
@@ -20,6 +22,7 @@ do-build:
 	find ${WRKSRC}/data -type f ! -name "*.dat" -exec ${STRFILE} {} \;
 
 do-install:
-	cd ${WRKSRC}/data && pax -rw . ${PREFIX}/share/games/fortune/de
+	cd ${WRKSRC}/data && pax -rw . \
+		${DESTDIR}${PREFIX}/share/games/fortune/de
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/fortunes-futurama/Makefile b/games/fortunes-futurama/Makefile
index 28401064a4d..1b5e57af618 100644
--- a/games/fortunes-futurama/Makefile
+++ b/games/fortunes-futurama/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/11/09 08:44:04 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=	fortunes-futurama-0.2
@@ -12,6 +12,8 @@ COMMENT=	Fortunes from the Futurama animated TV series
 
 BUILD_DEPENDS+=	fortune-strfile-[0-9]*:../../games/fortune-strfile
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 STRFILE=	${LOCALBASE}/bin/strfile
 WRKSRC=		${WRKDIR}
 
@@ -19,8 +21,10 @@ do-build:
 	${STRFILE} ${WRKDIR}/${DISTNAME}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/games/fortune/
-	${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${PREFIX}/share/games/fortune/futurama
-	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.dat ${PREFIX}/share/games/fortune/futurama.dat
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/games/fortune/
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME} \
+		${DESTDIR}${PREFIX}/share/games/fortune/futurama
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.dat \
+		${DESTDIR}${PREFIX}/share/games/fortune/futurama.dat
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/fortunes-h2g2/Makefile b/games/fortunes-h2g2/Makefile
index adcb2cd7aed..72a82e0ba82 100644
--- a/games/fortunes-h2g2/Makefile
+++ b/games/fortunes-h2g2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/11/11 20:25:39 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=	fortunes-h2g2-0.1
@@ -12,6 +12,8 @@ COMMENT=	Fortunes from Douglas Adams' "Hitchhiker's Guide to the Galaxy"
 
 BUILD_DEPENDS+=	fortune-strfile-[0-9]*:../../games/fortune-strfile
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 STRFILE=	${LOCALBASE}/bin/strfile
 WRKSRC=		${WRKDIR}
 
@@ -19,8 +21,10 @@ do-build:
 	${STRFILE} ${WRKDIR}/${PKGNAME}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/games/fortune/
-	${INSTALL_DATA} ${WRKDIR}/${PKGNAME} ${PREFIX}/share/games/fortune/h2g2
-	${INSTALL_DATA} ${WRKDIR}/${PKGNAME}.dat ${PREFIX}/share/games/fortune/h2g2.dat
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/games/fortune/
+	${INSTALL_DATA} ${WRKDIR}/${PKGNAME} \
+		${DESTDIR}${PREFIX}/share/games/fortune/h2g2
+	${INSTALL_DATA} ${WRKDIR}/${PKGNAME}.dat \
+		${DESTDIR}${PREFIX}/share/games/fortune/h2g2.dat
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-manual/Makefile b/games/freeciv-manual/Makefile
index 664d3a4652d..01a9b857eeb 100644
--- a/games/freeciv-manual/Makefile
+++ b/games/freeciv-manual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:41 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=	manual-1.8.1-2
@@ -10,14 +10,16 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.freeciv.org/
 COMMENT=	Manuals for freeciv (game, client, and server)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/manual
 NO_BUILD=	YES
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/freeciv/img
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/html/freeciv/img
 	cd ${WRKSRC} && \
-	${INSTALL_DATA} *.html ${PREFIX}/share/doc/html/freeciv
+	${INSTALL_DATA} *.html ${DESTDIR}${PREFIX}/share/doc/html/freeciv
 	cd ${WRKSRC}/img && \
-	${INSTALL_DATA} *.jpg ${PREFIX}/share/doc/html/freeciv/img
+	${INSTALL_DATA} *.jpg ${DESTDIR}${PREFIX}/share/doc/html/freeciv/img
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index e7f9a9e6a63..b59b6c49276 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/12/02 00:00:20 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2008/03/04 06:59:04 jlam Exp $
 
 DISTNAME=	frotz-2.43
 PKGREVISION=	2
@@ -11,6 +11,7 @@ MAINTAINER=	seebs@plethora.net
 HOMEPAGE=	http://www.cs.csubak.edu/~dgriffi/proj/frotz/
 COMMENT=	Curses-based interpreter for Infocom-compatible games
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 # setscrreg()
 INCOMPAT_CURSES=	NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-V]-*
@@ -21,12 +22,15 @@ DOCDIR=		${PREFIX}/share/doc/frotz
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/frotz ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/frotz.6 ${PREFIX}/${PKGMANDIR}/man6
-	${INSTALL_DATA_DIR} ${SAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/frotz.conf-big ${SAMPLEDIR}/frotz.conf
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL HOW_TO_PLAY ${DOCDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/frotz ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/frotz.6 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
+	${INSTALL_DATA_DIR} ${DESTDIR}${SAMPLEDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/frotz.conf-big \
+		${DESTDIR}${SAMPLEDIR}/frotz.conf
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL HOW_TO_PLAY \
+		${DESTDIR}${DOCDIR}
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/games/fruit/Makefile b/games/fruit/Makefile
index 288edab14e4..7a2ac1fd732 100644
--- a/games/fruit/Makefile
+++ b/games/fruit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/10/02 20:05:20 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=		fruit_21_linux
@@ -11,10 +11,12 @@ MAINTAINER=		rillig@NetBSD.org
 HOMEPAGE=		http://arctrix.com/nas/fruit/
 COMMENT=		Chess playing engine
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DIRS=		src
 USE_LANGUAGES=		c++
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/fruit ${PREFIX}/bin/fruit
+	${INSTALL_PROGRAM} ${WRKSRC}/src/fruit ${DESTDIR}${PREFIX}/bin/fruit
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/genecys-data/Makefile b/games/genecys-data/Makefile
index 443f95d211d..1d0a177511d 100644
--- a/games/genecys-data/Makefile
+++ b/games/genecys-data/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:15 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=		genecys-data-0.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=genecys/}
 
@@ -10,16 +10,18 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.genecys.org/
 COMMENT=		Game datafiles for Genecys
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 NO_BUILD=		YES
 NO_CONFIGURE=		YES
 USE_TOOLS+=		gtar
 
 do-extract:
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/genecys
-	cd ${PREFIX}/share/genecys && \
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/genecys
+	cd ${DESTDIR}${PREFIX}/share/genecys && \
 		${GZCAT} ${DISTDIR}/${DISTFILES} | ${GTAR} xmf -
-	${CHOWN} -R ${ROOT_USER}:games ${PREFIX}/share/genecys
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gnuchess-book-medium/Makefile b/games/gnuchess-book-medium/Makefile
index 01b0120e19c..a301e609738 100644
--- a/games/gnuchess-book-medium/Makefile
+++ b/games/gnuchess-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:29:41 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/03/04 06:59:04 jlam Exp $
 
 DISTNAME=		medium
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -14,6 +14,8 @@ DEPENDS+=		gnuchess>=5.07:../../games/gnuchess
 
 CONFLICTS=		${CHESS_ENGINE}-book-*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		gnuchess
 DIST_SUBDIR=		chessbooks
@@ -32,7 +34,7 @@ do-build:
 	@cd ${WRKSRC} && ${CAT} makebook.gnuchess | ${PREFIX}/bin/gnuchess
 
 do-install:
-	${INSTALL_DATA_DIR} ${BOOKDIR}
-	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${BOOKDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${BOOKDIR}
+	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${DESTDIR}${BOOKDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gnuchess-book/Makefile b/games/gnuchess-book/Makefile
index f21d5051c74..37065e2f166 100644
--- a/games/gnuchess-book/Makefile
+++ b/games/gnuchess-book/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:41 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=		book_1.01.pgn
@@ -16,6 +16,8 @@ DEPENDS+=		gnuchess>=5.07:../../games/gnuchess
 
 CONFLICTS+=		gnuchess-book-*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 CHESS_ENGINE=		gnuchess
 NO_CONFIGURE=		yes
@@ -33,7 +35,7 @@ do-build:
 	@cd ${WRKSRC} && ${CAT} makebook.gnuchess | ${LOCALBASE}/bin/gnuchess
 
 do-install:
-	${INSTALL_DATA_DIR} ${BOOKDIR}
-	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${BOOKDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${BOOKDIR}
+	${INSTALL_DATA} ${WRKSRC}/${BOOK_FILE} ${DESTDIR}${BOOKDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gogui/Makefile b/games/gogui/Makefile
index bbb1f70960e..730cbd2741d 100644
--- a/games/gogui/Makefile
+++ b/games/gogui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/01/06 17:44:52 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=		gogui-0.9.3
@@ -10,6 +10,8 @@ MAINTAINER=		rillig@NetBSD.org
 HOMEPAGE=		http://gogui.sourceforge.net/
 COMMENT=		GUI for Go-playing programs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 REPLACE_BASH+=		bin/*
 USE_TOOLS+=		bash:run
 
@@ -35,10 +37,12 @@ do-build:
 .endfor
 
 do-install:
-	cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} * ${PREFIX}/bin/.
-	cd ${WRKSRC}/lib && ${INSTALL_DATA} *.jar ${LIBDIR}/.
-	cd ${WRKSRC}/doc/manual/html && ${INSTALL_DATA} *.html *.png ${DOCDIR}/.
-	cd ${WRKSRC}/doc/manual/man && ${INSTALL_MAN} *.1 ${MY_MANDIR}/man1/.
+	cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} * ${DESTDIR}${PREFIX}/bin/.
+	cd ${WRKSRC}/lib && ${INSTALL_DATA} *.jar ${DESTDIR}${LIBDIR}/.
+	cd ${WRKSRC}/doc/manual/html && ${INSTALL_DATA} *.html *.png \
+		${DESTDIR}${DOCDIR}/.
+	cd ${WRKSRC}/doc/manual/man && ${INSTALL_MAN} *.1 \
+		${DESTDIR}${MY_MANDIR}/man1/.
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gtklevel9/Makefile b/games/gtklevel9/Makefile
index 599872eedf0..0de8fd104ca 100644
--- a/games/gtklevel9/Makefile
+++ b/games/gtklevel9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/11 14:23:23 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/04 06:59:04 jlam Exp $
 
 DISTNAME=		Level9_4.0_Source
 PKGNAME=		gtklevel9-4.0
@@ -12,6 +12,8 @@ MAINTAINER=		dillo@NetBSD.org
 HOMEPAGE=		http://www.ifarchive.org/if-archive/level9/interpreters/level9/
 COMMENT=		GTK+ port of the Level 9 text adventure interpreter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/Gtk
 
 INSTALLATION_DIRS=	bin
@@ -19,9 +21,10 @@ BUILD_TARGET=		gtklevel9
 USE_TOOLS+=		pkg-config
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gtklevel9
-	${INSTALL_DATA} ${WRKDIR}/level9.txt ${PREFIX}/share/doc/gtklevel9
-	${INSTALL_PROGRAM} ${WRKSRC}/gtklevel9 ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/gtklevel9
+	${INSTALL_DATA} ${WRKDIR}/level9.txt \
+		${DESTDIR}${PREFIX}/share/doc/gtklevel9
+	${INSTALL_PROGRAM} ${WRKSRC}/gtklevel9 ${DESTDIR}${PREFIX}/bin
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gtkmagnetic/Makefile b/games/gtkmagnetic/Makefile
index 44e261abadb..fe064639ccd 100644
--- a/games/gtkmagnetic/Makefile
+++ b/games/gtkmagnetic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/12 16:28:09 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=		Magnetic22Src
@@ -14,6 +14,8 @@ MAINTAINER=		dillo@NetBSD.org
 HOMEPAGE=		http://www.if-legends.org/~msmemorial/magnetic.htm
 COMMENT=		Interpreter for text adventures from Magnetic Scrolls
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake pkg-config
 BUILD_TARGET=		gtkmagnetic
 WRKSRC=			${WRKDIR}/Gtk
@@ -30,8 +32,9 @@ INSTALLATION_DIRS=	bin
 .include "../../x11/gtk2/buildlink3.mk"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gtkmagnetic ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gtkmagnetic
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gtkmagnetic
+	${INSTALL_PROGRAM} ${WRKSRC}/gtkmagnetic ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/gtkmagnetic
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/share/doc/gtkmagnetic
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/heretic2-demo/Makefile b/games/heretic2-demo/Makefile
index 36339b15a51..8c35cabdb00 100644
--- a/games/heretic2-demo/Makefile
+++ b/games/heretic2-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/06/02 13:32:35 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=	heretic2-demo-x86
@@ -14,6 +14,8 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.lokigames.com/products/heretic2/
 COMMENT=	Heretic2 - first person Quake 3D engine based (linux demo)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	yes
 EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
 								${GTAR} xzf -
@@ -46,12 +48,17 @@ do-build:
 
 # The executable must be in the same directory as the data.
 do-install:
-	${INSTALL_PROGRAM_DIR} ${LIBDIR}
-	${INSTALL_DATA_DIR} ${SHAREDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/${DISTBINNAME} ${LIBDIR}/${BINNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-QuickStart.txt
-	${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README
-	cd ${WRKSRC} && ${PAX} -rw base gl_drivers icon.xpm ref_glx.so ${LIBDIR}
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${LIBDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh \
+		${DESTDIR}${PREFIX}/bin/${BINNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/${DISTBINNAME} \
+		${DESTDIR}${LIBDIR}/${BINNAME}
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${SHAREDIR}/${BINNAME}-QuickStart.txt
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${SHAREDIR}/${BINNAME}-README
+	cd ${WRKSRC} && ${PAX} -rw base gl_drivers icon.xpm ref_glx.so \
+		${DESTDIR}${LIBDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/hugo/Makefile b/games/hugo/Makefile
index d0bd1290dbd..1f1f880f8e7 100644
--- a/games/hugo/Makefile
+++ b/games/hugo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/07/27 18:48:02 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=	hugov31_unix_source
@@ -14,11 +14,13 @@ COMMENT=	Interactive fiction design system and interpreter
 
 SITES.hugolib.zip=${MASTER_SITE_IFARCHIVE:=programming/hugo/library/}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=	${PKGNAME_NOREV}
 USE_TOOLS+=	gmake
 # uses halfkey (present since 1.6M)
-INCOMPAT_CURSES+=	NetBSD-1.4[Y-Z]*-* NetBSD-1.5*-* NetBSD-1.6-* NetBSD-1.6.*-*
-INCOMPAT_CURSES+=	NetBSD-1.6[A-L]*-*
+INCOMPAT_CURSES+=	NetBSD-1.4[Y-Z]*-* NetBSD-1.5*-* NetBSD-1.6-*
+INCOMPAT_CURSES+=	NetBSD-1.6.*-* NetBSD-1.6[A-L]*-*
 WRKSRC=		${WRKDIR}/hugov3.1.02
 
 LIBDIR=		${PREFIX}/share/hugo
@@ -26,14 +28,14 @@ LIBDIR=		${PREFIX}/share/hugo
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hc ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/hd ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/he ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${LIBDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/hc ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/hd ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/he ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}
 	for f in hugofix.g hugofix.h hugolib.h objlib.h resource.h \
 		system.h verblib.g verblib.h verbstub.g verbstub.h window.h; \
 	do \
-		${INSTALL_DATA} ${WRKDIR}/$$f ${LIBDIR}; \
+		${INSTALL_DATA} ${WRKDIR}/$$f ${DESTDIR}${LIBDIR}; \
 	done
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index 0755814b5cb..3a01fe539e2 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2007/09/09 16:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=	icebreaker-1.9.7
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	http://mattdm.org/icebreaker/1.9.x/
 EXTRACT_SUFX=	.tgz
@@ -11,20 +11,27 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mattdm.org/icebreaker/
 COMMENT=	Penguin capturing simulation
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 MAKE_ENV+=	mandir="${PREFIX}/man" highscoredir="/var/games"
 MAKE_ENV+=	prefix=${PREFIX:Q}
 
+SETGIDGAME=	yes
+SPECIAL_PERMS=	bin/icebreaker ${SETGID_GAMES_PERMS}
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/icebreaker
-	${INSTALL_DATA_DIR} ${PREFIX}/share/icebreaker
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/icebreaker
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icebreaker
 	cd ${WRKSRC} && ${INSTALL_DATA} *.ibt *.wav *.bmp \
-		${PREFIX}/share/icebreaker
-	${INSTALL_PROGRAM} -g games -m 2755 ${WRKSRC}/icebreaker ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/icebreaker.6 ${PREFIX}/${PKGMANDIR}/man6
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/icebreaker
+		${DESTDIR}${PREFIX}/share/icebreaker
+	${INSTALL_PROGRAM} ${WRKSRC}/icebreaker ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/icebreaker.6 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/share/doc/icebreaker
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../multimedia/smpeg/buildlink3.mk"
diff --git a/games/kajaani-kombat/Makefile b/games/kajaani-kombat/Makefile
index f3400675d19..e9755ab4ed7 100644
--- a/games/kajaani-kombat/Makefile
+++ b/games/kajaani-kombat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:54 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=		kajaani-kombat-0.7
@@ -9,17 +9,19 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://kombat.kajaani.net/
 COMMENT=		Rampart-like multiplayer game set in space
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c++
 USE_TOOLS+=		gmake
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/kajaani-kombat.6 ${PREFIX}/${PKGMANDIR}/man6
-	${INSTALL_DATA_DIR} ${PREFIX}/share/kajaani-kombat
-	${INSTALL_DATA} ${WRKSRC}/*.ogg ${PREFIX}/share/kajaani-kombat
-	${INSTALL_DATA} ${WRKSRC}/*.png ${PREFIX}/share/kajaani-kombat
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${PREFIX}/share/kajaani-kombat
+	${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/kajaani-kombat.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/kajaani-kombat
+	${INSTALL_DATA} ${WRKSRC}/*.ogg ${DESTDIR}${PREFIX}/share/kajaani-kombat
+	${INSTALL_DATA} ${WRKSRC}/*.png ${DESTDIR}${PREFIX}/share/kajaani-kombat
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${DESTDIR}${PREFIX}/share/kajaani-kombat
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/games/kapooka/Makefile b/games/kapooka/Makefile
index 9f8ebd4049a..799da232793 100644
--- a/games/kapooka/Makefile
+++ b/games/kapooka/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/12 16:28:09 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=		kapooka_0.2
@@ -12,6 +12,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://kapooka.sourceforge.net/
 COMMENT=		Puzzle game
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/kapooka
 USE_TOOLS+=		gmake
 
@@ -24,19 +26,25 @@ SUBST_SED.kapooka=	"s!data/!${PREFIX}/share/kapooka/!"
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/kapooka ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/kapooka
-	${INSTALL_DATA_DIR} ${PREFIX}/share/kapooka/interface
-	${INSTALL_DATA_DIR} ${PREFIX}/share/kapooka/levelDummy
-	${INSTALL_DATA_DIR} ${PREFIX}/share/kapooka/music
-	${INSTALL_DATA_DIR} ${PREFIX}/share/kapooka/sound
-	${INSTALL_DATA_DIR} ${PREFIX}/share/kapooka/sprites
-	${INSTALL_DATA} ${WRKSRC}/data/level.dat ${PREFIX}/share/kapooka
-	${INSTALL_DATA} ${WRKSRC}/data/interface/* ${PREFIX}/share/kapooka/interface
-	${INSTALL_DATA} ${WRKSRC}/data/levelDummy/* ${PREFIX}/share/kapooka/levelDummy
-	${INSTALL_DATA} ${WRKSRC}/data/music/* ${PREFIX}/share/kapooka/music
-	${INSTALL_DATA} ${WRKSRC}/data/sound/* ${PREFIX}/share/kapooka/sound
-	${INSTALL_DATA} ${WRKSRC}/data/sprites/*.png ${PREFIX}/share/kapooka/sprites
+	${INSTALL_PROGRAM} ${WRKSRC}/kapooka ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/kapooka
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/kapooka/interface
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/kapooka/levelDummy
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/kapooka/music
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/kapooka/sound
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/kapooka/sprites
+	${INSTALL_DATA} ${WRKSRC}/data/level.dat \
+		${DESTDIR}${PREFIX}/share/kapooka
+	${INSTALL_DATA} ${WRKSRC}/data/interface/* \
+		${DESTDIR}${PREFIX}/share/kapooka/interface
+	${INSTALL_DATA} ${WRKSRC}/data/levelDummy/* \
+		${DESTDIR}${PREFIX}/share/kapooka/levelDummy
+	${INSTALL_DATA} ${WRKSRC}/data/music/* \
+		${DESTDIR}${PREFIX}/share/kapooka/music
+	${INSTALL_DATA} ${WRKSRC}/data/sound/* \
+		${DESTDIR}${PREFIX}/share/kapooka/sound
+	${INSTALL_DATA} ${WRKSRC}/data/sprites/*.png \
+		${DESTDIR}${PREFIX}/share/kapooka/sprites
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../audio/libmikmod/buildlink3.mk"
diff --git a/games/ketm/Makefile b/games/ketm/Makefile
index 6158a4e8774..749c5b26474 100644
--- a/games/ketm/Makefile
+++ b/games/ketm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/10/25 21:06:14 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2008/03/04 06:59:04 jlam Exp $
 #
 
 DISTNAME=	ketm-0.0.6
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://home.t-online.de/home/haslbeck/ketm/
 COMMENT=	Old-school 2d-scrolling shooter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_TARGET=	ketm
 
 USE_TOOLS+=	gmake
@@ -20,13 +22,13 @@ INSTALLATION_DIRS=	bin share/ketm/data
 SUBST_CLASSES+=		ketm
 SUBST_STAGE.ketm=	pre-configure
 SUBST_FILES.ketm=	*.c font.h
-SUBST_SED.ketm=		-e "s,data/,${LOCALBASE}/share/ketm/data/,g"
+SUBST_SED.ketm=		-e "s,data/,${PREFIX}/share/ketm/data/,g"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ketm ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/ketm
+	${INSTALL_PROGRAM} ${WRKSRC}/ketm ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/ketm
 	cd ${WRKSRC}/data && 						\
-		${INSTALL_DATA} *.bmp *.dat ${PREFIX}/share/ketm/data
+		${INSTALL_DATA} *.bmp *.dat ${DESTDIR}${PREFIX}/share/ketm/data
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/games/knightcap-brain/Makefile b/games/knightcap-brain/Makefile
index 6c33072ca1a..d459cae01da 100644
--- a/games/knightcap-brain/Makefile
+++ b/games/knightcap-brain/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/10 23:58:15 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/04 06:59:04 jlam Exp $
 
 DISTNAME=		new_brain
 PKGNAME=		knightcap-brain-19980616
@@ -12,6 +12,8 @@ COMMENT=		Book of losing moves for KnightCap
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
@@ -26,9 +28,10 @@ do-build:
 		> ${WRKSRC:Q}/newbrain.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC:Q}/newbrain.sh ${PREFIX:Q}/bin/newbrain
-	${INSTALL_DATA_DIR} ${EGDIR:Q}
+	${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 \
-		${EGDIR:Q}/brain.dat
+		${DESTDIR}${EGDIR:Q}/brain.dat
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/level9/Makefile b/games/level9/Makefile
index 4eb58718c06..0866875a323 100644
--- a/games/level9/Makefile
+++ b/games/level9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:19 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/04 06:59:04 jlam Exp $
 
 DISTNAME=		Level9_4.0_Source
 PKGNAME=		level9-4.0
@@ -11,10 +11,12 @@ MAINTAINER=		dillo@NetBSD.org
 HOMEPAGE=		http://www.ifarchive.org/if-archive/level9/interpreters/level9/
 COMMENT=		Curses port of the Level 9 text adventure interpreter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/Unix
 # uses halfkey (present since 1.6M)
-INCOMPAT_CURSES+=	NetBSD-1.4[Y-Z]*-* NetBSD-1.5*-* NetBSD-1.6-* NetBSD-1.6.*-*
-INCOMPAT_CURSES+=	NetBSD-1.6[A-L]*-*
+INCOMPAT_CURSES+=	NetBSD-1.4[Y-Z]*-* NetBSD-1.5*-* NetBSD-1.6-*
+INCOMPAT_CURSES+=	NetBSD-1.6.*-* NetBSD-1.6[A-L]*-*
 
 INSTALLATION_DIRS=	bin
 
@@ -22,9 +24,10 @@ post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/level9
-	${INSTALL_DATA} ${WRKDIR}/level9.txt ${PREFIX}/share/doc/level9
-	${INSTALL_PROGRAM} ${WRKSRC}/level9 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/level9 ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/level9
+	${INSTALL_DATA} ${WRKDIR}/level9.txt \
+		${DESTDIR}${PREFIX}/share/doc/level9
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/majesty-demo/Makefile b/games/majesty-demo/Makefile
index d0e3a292608..43f6e26dd63 100644
--- a/games/majesty-demo/Makefile
+++ b/games/majesty-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/07/29 05:19:25 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/04 06:59:05 jlam Exp $
 #
 
 DISTNAME=	majesty_demo
@@ -19,6 +19,8 @@ USE_TOOLS+=	gzcat pax
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	x11
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 BUILD_DIRS=	# empty
 
@@ -35,12 +37,13 @@ do-build:
 	    <${FILESDIR}/wrapper.sh >${WRKDIR}/${BINNAME}.sh
 
 do-install:
-	${INSTALL_DATA_DIR} ${LGP_PATH}
-	${INSTALL_DATA_DIR} ${MAJ_PATH}
+	${INSTALL_DATA_DIR} ${DESTDIR}${LGP_PATH}
+	${INSTALL_DATA_DIR} ${DESTDIR}${MAJ_PATH}
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/Linux/x86/glibc-2.1/maj_demo \
-		${MAJ_PATH}
+		${DESTDIR}${MAJ_PATH}
 	cd ${WRKDIR} && ${PAX} -rw README README.licenses data majesty* \
-		quests ${MAJ_PATH}
-	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME}
+		quests ${DESTDIR}${MAJ_PATH}
+	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh \
+		${DESTDIR}${PREFIX}/bin/${BINNAME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/minami/Makefile b/games/minami/Makefile
index e30ff60ace4..78dd9bf45ab 100644
--- a/games/minami/Makefile
+++ b/games/minami/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/16 19:10:39 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/04 06:59:05 jlam Exp $
 #
 
 DISTNAME=	minami-1.0.2
@@ -10,13 +10,15 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://www.guru.gr.jp/~issei/minami/
 COMMENT=	Text adventure
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	gen_act gen_dun gen_itm gen_scn minflag
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/minami ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/minami ${DESTDIR}${PREFIX}/bin
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/mirrormagic-sdl/Makefile b/games/mirrormagic-sdl/Makefile
index c679e31a3a1..19284afd67f 100644
--- a/games/mirrormagic-sdl/Makefile
+++ b/games/mirrormagic-sdl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2008/01/19 09:16:22 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2008/03/04 06:59:05 jlam Exp $
 #
 
 DISTNAME=		mirrormagic-2.0.2
 PKGNAME=		${DISTNAME:S/-/-sdl-/}
-PKGREVISION=		12
+PKGREVISION=		13
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.artsoft.org/RELEASES/unix/mirrormagic/
 
@@ -13,38 +13,44 @@ COMMENT=		Nice little puzzle game with color graphics and sound
 
 CONFLICTS=		mirrormagic-[1-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake
 PLIST_SRC=		${WRKDIR}/PLIST PLIST
 
 # if you change SCORE_PATH, don't forget to change patch-aa, too
 SCORE_PATH=		/var/games/mirrormagic
 
+SETGIDGAME=		yes
+OWN_DIRS_PERMS=		${SCORE_PATH} ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${SCORE_PATH}/scores				\
+				${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${SCORE_PATH}/scores/classic_deflektor		\
+				${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${SCORE_PATH}/scores/classic_mindbender		\
+				${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+
+SPECIAL_PERMS=		bin/mirrormagic ${SETGID_GAMES_PERMS}
+
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} -o bin -g games -m 2755 \
-		${WRKSRC}/mirrormagic ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mirrormagic
+	${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/mirrormagic
 	cd ${WRKSRC} && ${PAX} -rw graphics levels music sounds \
-		${PREFIX}/share/mirrormagic/
-	${CHOWN} -R games:games ${PREFIX}/share/mirrormagic
-	${INSTALL_DATA_DIR} ${SCORE_PATH}/scores
-	${CHMOD} 755 ${SCORE_PATH}
-	${CHMOD} 775 ${SCORE_PATH}/scores
-.for directory in classic_deflektor classic_mindbender
-		${INSTALL_DATA_DIR} ${SCORE_PATH}/scores/${directory} \
-		&& ${CHMOD} 775 ${SCORE_PATH}/scores/${directory}
-.endfor
+		${DESTDIR}${PREFIX}/share/mirrormagic/
+
 	${RM} -f ${WRKDIR}/PLIST
 .for levdir in Classic_Games
-	cd ${PREFIX} && \
-	${FIND} share/mirrormagic/levels/${levdir} -type f -print >>${WRKDIR}/PLIST
+	cd ${DESTDIR}${PREFIX} && \
+	${FIND} share/mirrormagic/levels/${levdir} -type f -print \
+		>>${WRKDIR}/PLIST
 .endfor
 .for directory in graphics music sounds
-	cd ${PREFIX} && \
-	${FIND} share/mirrormagic/${directory} -type f -print >>${WRKDIR}/PLIST
+	cd ${DESTDIR}${PREFIX} && \
+	${FIND} share/mirrormagic/${directory} -type f -print \
+		>>${WRKDIR}/PLIST
 .endfor
-	${CHOWN} -R games:games ${SCORE_PATH}
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index 6672d6218fa..71a8ebe9509 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2008/01/19 09:16:22 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2008/03/04 06:59:05 jlam Exp $
 #
 
 DISTNAME=		mirrormagic-2.0.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.artsoft.org/RELEASES/unix/mirrormagic/
 
@@ -12,38 +12,44 @@ COMMENT=		Nice little puzzle game with color graphics and sound
 
 CONFLICTS=		mirrormagic-sdl-[1-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake
 PLIST_SRC=		${WRKDIR}/PLIST PLIST
 
 # if you change SCORE_PATH, don't forget to change patch-aa, too
 SCORE_PATH=		/var/games/mirrormagic
 
+SETGIDGAME=		yes
+OWN_DIRS_PERMS=		${SCORE_PATH} ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE} 
+OWN_DIRS_PERMS+=	${SCORE_PATH}/scores				\
+				${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${SCORE_PATH}/scores/classic_deflektor		\
+				${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${SCORE_PATH}/scores/classic_mindbender		\
+				${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+
+SPECIAL_PERMS=		bin/mirrormagic ${SETGID_GAMES_PERMS}
+
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} -o bin -g games -m 2755 \
-		${WRKSRC}/mirrormagic ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/mirrormagic
 	cd ${WRKSRC} && ${PAX} -rw graphics levels music sounds \
 		${PREFIX}/share/mirrormagic/
-	${CHOWN} -R games:games ${PREFIX}/share/mirrormagic
-	${INSTALL_DATA_DIR} ${SCORE_PATH}/scores
-	${CHMOD} 755 ${SCORE_PATH}
-	${CHMOD} 775 ${SCORE_PATH}/scores
-.for directory in classic_deflektor classic_mindbender
-		${INSTALL_DATA_DIR} ${SCORE_PATH}/scores/${directory} \
-		&& ${CHMOD} 775 ${SCORE_PATH}/scores/${directory}
-.endfor
+
 	${RM} -f ${WRKDIR}/PLIST
 .for levdir in Classic_Games
 	cd ${PREFIX} && \
-	${FIND} share/mirrormagic/levels/${levdir} -type f -print >>${WRKDIR}/PLIST
+	${FIND} share/mirrormagic/levels/${levdir} -type f -print \
+		>>${WRKDIR}/PLIST
 .endfor
 .for directory in graphics music sounds
 	cd ${PREFIX} && \
-	${FIND} share/mirrormagic/${directory} -type f -print >>${WRKDIR}/PLIST
+	${FIND} share/mirrormagic/${directory} -type f -print \
+		>>${WRKDIR}/PLIST
 .endfor
-	${CHOWN} -R games:games ${SCORE_PATH}
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/games/nagi/Makefile b/games/nagi/Makefile
index 5fe8de5afec..4dafe178ad5 100644
--- a/games/nagi/Makefile
+++ b/games/nagi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/09/09 02:42:00 obache Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/04 06:59:05 jlam Exp $
 #
 
 DISTNAME=		nagi_src_-_2002-11-14
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.agidev.com/projects/nagi/
 COMMENT=		Clone of Sierra's AGI
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/src
 USE_TOOLS+=	gmake
 MAKE_FILE=	Makefile.linux
@@ -23,10 +25,10 @@ post-build:
 	${SED} "s|@PREFIX@|${PREFIX}|" <${FILESDIR}/nagi.sh >${WRKDIR}/nagi.sh
 
 do-install:
-	${INSTALL_DATA_DIR} ${NAGILIB}
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/nagi ${NAGILIB}
-	${INSTALL_DATA} ${WRKDIR}/bin/*.nbf ${WRKDIR}/bin/*.ini ${NAGILIB}
-	${INSTALL_SCRIPT} ${WRKDIR}/nagi.sh ${PREFIX}/bin/nagi
+	${INSTALL_DATA_DIR} ${DESTDIR}${NAGILIB}
+	${INSTALL_PROGRAM} ${WRKDIR}/bin/nagi ${DESTDIR}${NAGILIB}
+	${INSTALL_DATA} ${WRKDIR}/bin/*.nbf ${WRKDIR}/bin/*.ini ${DESTDIR}${NAGILIB}
+	${INSTALL_SCRIPT} ${WRKDIR}/nagi.sh ${DESTDIR}${PREFIX}/bin/nagi
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/games/netris/Makefile b/games/netris/Makefile
index 9f55ff097d6..c8320037822 100644
--- a/games/netris/Makefile
+++ b/games/netris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:09:21 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 06:59:05 jlam Exp $
 #
 
 DISTNAME=		netris-0.52
@@ -15,6 +15,8 @@ MAINTAINER=		uebs@gmx.at
 HOMEPAGE=		http://www.netris.org/
 COMMENT=		Everybody's darling T*tris in a networked version
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	./Configure
@@ -24,10 +26,10 @@ CONFIGURE_SCRIPT=	./Configure
 INSTALLATION_DIRS=	bin
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/netris ${PREFIX}/bin
-	@ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/netris
-	@ ${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/netris
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/netris
-	@ ${INSTALL_DATA} ${WRKSRC}/robot_desc ${PREFIX}/share/doc/netris
+	${INSTALL_PROGRAM} ${WRKSRC}/netris ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/netris
+	${INSTALL_DATA} ${WRKSRC}/FAQ ${DESTDIR}${PREFIX}/share/doc/netris
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/netris
+	${INSTALL_DATA} ${WRKSRC}/robot_desc ${DESTDIR}${PREFIX}/share/doc/netris
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index 047d1eb2ab7..72b0a23c859 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/01/17 03:11:19 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/04 06:59:05 jlam Exp $
 #
 
 DISTNAME=	neverball-1.4.0
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.icculus.org/neverball/
 COMMENT=	Part puzzle game, part action game and with SDL graphics
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 
 # Avoiding multiples patches...
@@ -21,15 +23,17 @@ SHAREDIR=	${PREFIX}/share/${PKGBASE}
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_DATA_DIR} ${SHAREDIR}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/README \
-	    ${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_PROGRAM} ${WRKSRC}/neverball ${WRKSRC}/neverputt ${SHAREDIR}
-	cd ${WRKSRC} && ${PAX} -rwppm data ${SHAREDIR}
+	    ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_PROGRAM} ${WRKSRC}/neverball ${WRKSRC}/neverputt \
+	    ${DESTDIR}${SHAREDIR}
+	cd ${WRKSRC} && ${PAX} -rwppm data ${DESTDIR}${SHAREDIR}
 	${SED} -e "s,@SHAREDIR@,${SHAREDIR},g" ${FILESDIR}/neverball.sh \
 	    > ${WRKSRC}/neverball.sh
-	${INSTALL_SCRIPT} ${WRKSRC}/neverball.sh ${PREFIX}/bin/neverball
+	${INSTALL_SCRIPT} ${WRKSRC}/neverball.sh \
+	    ${DESTDIR}${PREFIX}/bin/neverball
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index d175fed5acf..9f3fb68e428 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2008/02/12 07:59:04 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2008/03/04 06:59:05 jlam Exp $
 #
 
 DISTNAME=		nighthawk-2.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 games
 MASTER_SITES=		${MASTER_SITE_BACKUP}
 EXTRACT_SUFX=		.tgz
@@ -15,6 +15,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://jsno.arafuraconnect.com.au/proj_linux/nighthawk.html
 COMMENT=		C64 Paradroid clone
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/nighthawk
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
@@ -24,6 +26,11 @@ CPPFLAGS+=		-DPREFIX="\"${PREFIX}\"" \
 			-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" \
 			-DVARBASE="\"${VARBASE}\""
 
+SETGIDGAME=		yes
+CONF_FILES_PERMS=	/dev/null ${VARBASE}/games/nighthawk.scores	\
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+SPECIAL_PERMS=		bin/nighthawk ${SETGID_GAMES_PERMS}
+
 INSTALLATION_DIRS=	bin
 MAKE_DIRS=		${VARBASE}/games
 
@@ -35,18 +42,14 @@ post-build:
 		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} nighthawk_sound
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nighthawk
-	${INSTALL_DATA_DIR} ${PREFIX}/share/nighthawk
-	${INSTALL_DATA_DIR} ${PREFIX}/share/nighthawk/data
-	cd ${WRKSRC}/data && ${PAX} -rw . ${PREFIX}/share/nighthawk/data
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/nighthawk
-	${FIND} ${PREFIX}/share/nighthawk -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
-	${FIND} ${PREFIX}/share/nighthawk -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-	${INSTALL_PROGRAM} ${WRKSRC}/src/nighthawk ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/src_sound/nighthawk_sound ${PREFIX}/bin
-	${CHGRP} ${GAMEGRP} ${PREFIX}/bin/nighthawk
-	${CHMOD} g+s ${PREFIX}/bin/nighthawk
-	${INSTALL_MAN} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/nighthawk/README
-	${INSTALL} -o ${ROOT_USER} -g ${GAMEGRP} -m 664 /dev/null ${VARBASE}/games/nighthawk.scores
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/nighthawk
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/nighthawk
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/nighthawk/data
+	cd ${WRKSRC}/data && ${PAX} -rw . ${DESTDIR}${PREFIX}/share/nighthawk/data
+	${FIND} ${DESTDIR}${PREFIX}/share/nighthawk -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
+	${FIND} ${DESTDIR}${PREFIX}/share/nighthawk -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/nighthawk ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src_sound/nighthawk_sound ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/share/doc/nighthawk/README
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/omega/Makefile b/games/omega/Makefile
index 594a5968253..9aa85ca80bf 100644
--- a/games/omega/Makefile
+++ b/games/omega/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2007/01/07 09:13:54 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	omega-0.90.4-src
 PKGNAME=	omega-0.90.4
-PKGREVISION=			2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.alcyone.com/binaries/omega/
 
@@ -10,37 +10,37 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.alcyone.com/max/projects/omega/
 COMMENT=	Complex rogue-like game of exploration with a sense of humor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/omega
 BUILD_TARGET=		# empty
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(SETGIDGAME:M[yY][eE][sS])
-FILEMODE=	0660
-.else
-FILEMODE=	0600
-.endif
+SETGIDGAME=		yes
+SPECIAL_PERMS=		bin/Omega ${SETGID_GAMES_PERMS}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
-	${INSTALL_GAME} ${WRKSRC}/omega ${PREFIX}/bin/Omega
-	${INSTALL_MAN} ${WRKSRC}/docs/omega.6 ${PREFIX}/${PKGMANDIR}/man6
-	${INSTALL_DATA_DIR} ${PREFIX}/share/omega
-	${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/share/omega
-	${RM} ${PREFIX}/share/omega/license.old
-	${CHMOD} ${FILEMODE} ${PREFIX}/share/omega/omega.hi
-	${CHMOD} ${FILEMODE} ${PREFIX}/share/omega/omega.log
-	${CP} ${PREFIX}/share/omega/omega.hi ${PREFIX}/share/omega/omegahi.bak
-	${CHOWN} -R ${GAMEOWN}:${GAMEGRP} ${PREFIX}/share/omega
+	${INSTALL_PROGRAM} ${WRKSRC}/omega ${DESTDIR}${PREFIX}/bin/Omega
+	${INSTALL_MAN} ${WRKSRC}/docs/omega.6 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/omega
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${DESTDIR}${PREFIX}/share/omega
+	${RM} ${DESTDIR}${PREFIX}/share/omega/license.old
+	${CHMOD} 0660 ${DESTDIR}${PREFIX}/share/omega/omega.hi
+	${CHMOD} 0660 ${DESTDIR}${PREFIX}/share/omega/omega.log
+	${CP} ${PREFIX}/share/omega/omega.hi \
+		${DESTDIR}${PREFIX}/share/omega/omegahi.bak
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/omega
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/omega
 	cd ${WRKSRC}; for f in						\
 		buglist.txt docs/compile.all docs/readme.1st		\
 		docs/omega.txt docs/readme3 docs/readme4;		\
 	do								\
-		${INSTALL_DATA} $${f} ${PREFIX}/share/doc/omega;	\
+		${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/share/doc/omega; \
 	done
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/games/polyglot/Makefile b/games/polyglot/Makefile
index 241ba6ec8ac..ee4c00eb168 100644
--- a/games/polyglot/Makefile
+++ b/games/polyglot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/06/17 15:24:32 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/04 06:59:05 jlam Exp $
 #
 
 DISTNAME=		polyglot_14
@@ -11,6 +11,8 @@ MAINTAINER=		rillig@NetBSD.org
 HOMEPAGE=		http://wbec-ridderkerk.nl/html/details/PolyGlot.html
 COMMENT=		UCI to WB adapter (for chess engines)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/polyglot_14
 BUILD_DIRS=		src
 MAKE_FILE=		${FILESDIR}/Makefile
@@ -39,8 +41,10 @@ do-build:
 		${CXX} ${CXXFLAGS} ${LDFLAGS} -lm -o polyglot ${SRCS}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/polyglot ${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/polyglot/
-	${INSTALL_DATA} ${WRKSRC}/fruit.ini ${PREFIX}/share/examples/polyglot/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/polyglot ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/readme.txt \
+		${DESTDIR}${PREFIX}/share/doc/polyglot/
+	${INSTALL_DATA} ${WRKSRC}/fruit.ini \
+		${DESTDIR}${PREFIX}/share/examples/polyglot/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/powwow/Makefile b/games/powwow/Makefile
index f8c510e274f..45026d69740 100644
--- a/games/powwow/Makefile
+++ b/games/powwow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:54 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	powwow-1.2.5
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://linuz.sns.it/~max/powwow.html
 COMMENT=	Client to play MUDs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 POWWOW_DIR=	${PREFIX}/share/powwow
 
@@ -18,10 +20,10 @@ do-build:
 	cd ${WRKSRC} && POWWOW_DIR="${POWWOW_DIR}" CFLAGS="${CFLAGS}" ./make_it
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/powwow ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/powwow.6 ${PREFIX}/${PKGMANDIR}/man6
-	${INSTALL_DATA_DIR} ${POWWOW_DIR}
-	${INSTALL_DATA} ${WRKSRC}/powwow.doc ${POWWOW_DIR}
-	${INSTALL_DATA} ${WRKSRC}/powwow.help ${POWWOW_DIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/powwow ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/powwow.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
+	${INSTALL_DATA_DIR} ${DESTDIR}${POWWOW_DIR}
+	${INSTALL_DATA} ${WRKSRC}/powwow.doc ${DESTDIR}${POWWOW_DIR}
+	${INSTALL_DATA} ${WRKSRC}/powwow.help ${DESTDIR}${POWWOW_DIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index 9b570ea0bb6..21fd7ad65a3 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/01/07 09:13:54 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2008/03/04 06:59:05 jlam Exp $
 #
 
 DISTNAME=	pysol-4.81
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pysol.org/
 COMMENT=	Solitaire game, written in Python
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 PLIST_SRC=	${WRKDIR}/PLIST.src
 
@@ -24,18 +26,18 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 do-install:
 	${SED} -e "s|@pkgdatadir@|${PREFIX}/share/pysol|" \
 		-e "s|python|${PYTHONBIN}|" \
-		< ${WRKSRC}/pysol > ${PREFIX}/bin/pysol
-	${CHMOD} +x ${PREFIX}/bin/pysol
-	${INSTALL_DATA} ${WRKSRC}/pysol.6 ${PREFIX}/${PKGMANDIR}/man6
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/pysol
+		< ${WRKSRC}/pysol > ${DESTDIR}${PREFIX}/bin/pysol
+	${CHMOD} +x ${DESTDIR}${PREFIX}/bin/pysol
+	${INSTALL_DATA} ${WRKSRC}/pysol.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
+	@${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/pysol
 	(cd ${WRKSRC}/data; tar cf - *) | \
-		(cd ${PREFIX}/share/pysol; tar xf -)
+		(cd ${DESTDIR}${PREFIX}/share/pysol; tar xf -)
 	(cd ${WRKDIR}/${CARDSETS}/data; tar cf - *) | \
-		(cd ${PREFIX}/share/pysol; tar xf -)
+		(cd ${DESTDIR}${PREFIX}/share/pysol; tar xf -)
 
 post-install:
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	@(cd ${PREFIX}; \
+	@(cd ${DESTDIR}${PREFIX}; \
 	  ${FIND} share/pysol \( -type f -or -type l \) -print | \
 	    ${SORT} >> ${PLIST_SRC}; \
 	  for DIR in `${FIND} share/pysol -type d -print | ${SORT} -r`; do \
diff --git a/games/qstat/Makefile b/games/qstat/Makefile
index b9556bb3244..6693f11933c 100644
--- a/games/qstat/Makefile
+++ b/games/qstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/05/18 10:03:31 peter Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	qstat-2.10
 CATEGORIES=	games
@@ -8,7 +8,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.qstat.org/
 COMMENT=	Program that gathers real-time statistics from game servers
 
-INSTALLATION_DIRS=	bin
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR:Q}\""
@@ -16,14 +16,18 @@ CPPFLAGS+=	-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR:Q}\""
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES=	${EGDIR}/qstat.cfg ${PKG_SYSCONFDIR}/qstat.cfg
 
+INSTALLATION_DIRS=	bin
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGBASE}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}/template
-	${INSTALL_PROGRAM} ${WRKSRC}/qstat ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/qstatdoc.html ${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/template/*.html ${PREFIX}/share/doc/${PKGBASE}/template
-	${INSTALL_DATA} ${WRKSRC}/contrib.cfg ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/qstat.cfg ${EGDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/template
+	${INSTALL_PROGRAM} ${WRKSRC}/qstat ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/qstatdoc.html \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/template/*.html \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/template
+	${INSTALL_DATA} ${WRKSRC}/contrib.cfg ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/qstat.cfg ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quake/Makefile b/games/quake/Makefile
index acfe6d36597..6d0bb9a21b6 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2007/02/02 18:59:15 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	q1source
 PKGNAME=	quake-2.30
@@ -16,6 +16,8 @@ DEPENDS+=	quakedata-[0-9]*:../../games/quakedata
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_TOOLS+=	gmake
 MAKE_ENV+=	MAINDIR=${WRKSRC:Q}
@@ -41,15 +43,15 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qw/release_version/qwsv \
-	    ${PREFIX}/bin
+	    ${DESTDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/qw/release_version/qwcl.x11 \
-	    ${PREFIX}/bin
+	    ${DESTDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/qw/release_version/glqwcl.glx \
-	    ${PREFIX}/bin
+	    ${DESTDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/winquake/release_version/bin/glquake.glx \
-	    ${PREFIX}/bin
+	    ${DESTDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/winquake/release_version/bin/quake.x11 \
-	    ${PREFIX}/bin
+	    ${DESTDIR}${PREFIX}/bin
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile
index 5c979a62da1..4d5bb8add84 100644
--- a/games/quake3arena-demo/Makefile
+++ b/games/quake3arena-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/07/29 05:19:25 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	linuxq3ademo-1_11-6_x86_gz
 PKGREVISION=	3
@@ -17,6 +17,8 @@ CONFLICTS=	quake3arena-[0-9]*
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	base x11 glx
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gtar
 EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} |	\
 		${GTAR} xzf -
@@ -39,20 +41,20 @@ do-build:
 
 # The executable must be in the same directory as the data.
 do-install:
-	${INSTALL_PROGRAM_DIR} ${LIBDIR}
-	${INSTALL_DATA_DIR} ${SHAREDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME}
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${LIBDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${DESTDIR}${PREFIX}/bin/${BINNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/x86/glibc-2.1/${DISTBINNAME} \
-		${LIBDIR}/${BINNAME}
+		${DESTDIR}${LIBDIR}/${BINNAME}
 	${INSTALL_DATA} ${WRKSRC}/bin/x86/glibc-2.1/libMesaVoodooGL.so.3.2 \
-		${LIBDIR}
+		${DESTDIR}${LIBDIR}
 	${LN} -s ${LIBDIR}/libMesaVoodooGL.so.3.2 \
-		${LIBDIR}/libMesaVoodooGL.so.3
+		${DESTDIR}${LIBDIR}/libMesaVoodooGL.so.3
 	${LN} -s ${LIBDIR}/libMesaVoodooGL.so.3.2 \
-		${LIBDIR}/libMesaVoodooGL.so
-	${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README
-	cd ${WRKSRC} && ${PAX} -rw demoq3 icon.bmp icon.xpm ${LIBDIR}
-	cd ${WRKSRC} && ${PAX} -rw Help ${SHAREDIR}
-	${MV} ${SHAREDIR}/Help ${SHAREDIR}/quake3arena-Help
+		${DESTDIR}${LIBDIR}/libMesaVoodooGL.so
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${SHAREDIR}/${BINNAME}-README
+	cd ${WRKSRC} && ${PAX} -rw demoq3 icon.bmp icon.xpm ${DESTDIR}${LIBDIR}
+	cd ${WRKSRC} && ${PAX} -rw Help ${DESTDIR}${SHAREDIR}
+	${MV} ${SHAREDIR}/Help ${DESTDIR}${SHAREDIR}/quake3arena-Help
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile
index b0817283d71..efebf6188ae 100644
--- a/games/quake3arena/Makefile
+++ b/games/quake3arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2007/07/29 05:19:26 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	linuxq3apoint-1.32b.x86
 PKGREVISION=	3
@@ -20,6 +20,8 @@ EMUL_MODULES.linux=	base x11 glx
 NO_SRC_ON_FTP=	no
 NO_BIN_ON_FTP=	no
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gtar gunzip tail
 
 # The distfile is a self-extracting shell script.  "266" is a magic
@@ -44,19 +46,19 @@ do-build:
 
 # The executable must be in the same directory as the data.
 do-install:
-	${INSTALL_PROGRAM_DIR} ${LIBDIR}
-	${INSTALL_DATA_DIR} ${SHAREDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME}
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${LIBDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${DESTDIR}${PREFIX}/bin/${BINNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/x86/${DISTBINNAME} \
-		${LIBDIR}/${BINNAME}
-	${INSTALL_DATA} ${WRKSRC}/README-linux.txt ${SHAREDIR}/${BINNAME}-README
+		${DESTDIR}${LIBDIR}/${BINNAME}
+	${INSTALL_DATA} ${WRKSRC}/README-linux.txt ${DESTDIR}${SHAREDIR}/${BINNAME}-README
 
-	cd ${WRKSRC} && ${PAX} -rw baseq3 ${LIBDIR}
+	cd ${WRKSRC} && ${PAX} -rw baseq3 ${DESTDIR}${LIBDIR}
 
 # Some platforms, e.g. FreeBSD, need to "brand" the ELF binaries to
 # the correct type.
 #
 post-install:
-	${BRANDELF:D${BRANDELF} -t Linux ${PREFIX}/bin/${BINNAME}:U${TRUE}}
+	${BRANDELF:D${BRANDELF} -t Linux ${DESTDIR}${PREFIX}/bin/${BINNAME}:U${TRUE}}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quake3server-excessive/Makefile b/games/quake3server-excessive/Makefile
index 02ea78a8b05..1ceb0c88556 100644
--- a/games/quake3server-excessive/Makefile
+++ b/games/quake3server-excessive/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	excessive_q3_server_003
 PKGNAME=	quake3server-excessive-003
 PKGREVISION=	1
 CATEGORIES=	games net
 MASTER_SITES=	ftp://ftp.fr.FreeBSD.org/pub/FreeBSD/distfiles/
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	david@silicium.ath.cx
 COMMENT=	Quake III Arena Mod: Excessive for Linux
 
-EXTRACT_SUFX=	.zip
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 
 .include "../../games/quake3server/Makefile.common"
@@ -20,7 +22,7 @@ NO_BUILD=	yes
 Q3MODDIR=	${Q3ROOTDIR}/excessive
 
 do-install:
-	${INSTALL_DATA_DIR} ${Q3MODDIR}
-	cd ${WRKSRC}/excessive && ${PAX} -rwppm . ${Q3MODDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${Q3MODDIR}
+	cd ${WRKSRC}/excessive && ${PAX} -rwppm . ${DESTDIR}${Q3MODDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quake3server-osp/Makefile b/games/quake3server-osp/Makefile
index fada299cc45..dd29b269d84 100644
--- a/games/quake3server-osp/Makefile
+++ b/games/quake3server-osp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	osp-Quake3-1.03a_full
 PKGNAME=	quake3server-osp-1.03a
@@ -11,6 +11,8 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	david@silicium.ath.cx
 COMMENT=	Quake III Arena Mod: OSP Tourney DM/CA/CTF for Linux
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../games/quake3server/Makefile.common"
 
 DEPENDS+=	quake3server>=1.32:../../games/quake3server
@@ -19,7 +21,7 @@ WRKSRC=		${WRKDIR}/osp
 Q3MODDIR=	${Q3ROOTDIR}/osp
 
 do-install:
-	${INSTALL_DATA_DIR} ${Q3MODDIR}
-	cd ${WRKSRC} && ${PAX} -rw . ${Q3MODDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${Q3MODDIR}
+	cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${Q3MODDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quake3server-ra3/Makefile b/games/quake3server-ra3/Makefile
index a9974d8508d..6333bc9fb91 100644
--- a/games/quake3server-ra3/Makefile
+++ b/games/quake3server-ra3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	ra3-1.65
 PKGNAME=	quake3server-ra3-1.65
@@ -12,6 +12,8 @@ DISTFILES=	ra3165cl.zip \
 MAINTAINER=	david@silicium.ath.cx
 COMMENT=	Quake III Arena Mod: Rocket Arena 3 for Linux
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../games/quake3server/Makefile.common"
 
 DEPENDS+=	quake3server>=1.32:../../games/quake3server
@@ -22,14 +24,14 @@ Q3MODDIR=	${Q3ROOTDIR}/arena
 DOCDIR=		${PREFIX}/share/doc/lokigames/quake3server/arena
 
 do-install:
-	${INSTALL_DATA_DIR} ${Q3MODDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR]${Q3MODDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR]${DOCDIR}
 .for datafile in *.pk3 qagame* *.cfg
-	${INSTALL_DATA} ${WRKSRC}/${datafile} ${Q3MODDIR}
+	${INSTALL_DATA} ${WRKSRC}/${datafile} ${DESTDIR]${Q3MODDIR}
 .endfor
 
 .for docfile in readme.txt readsrv.txt
-	${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/${docfile} ${DESTDIR]${DOCDIR}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quake3server-ut/Makefile b/games/quake3server-ut/Makefile
index e1f4b931a61..cb1fefc46e8 100644
--- a/games/quake3server-ut/Makefile
+++ b/games/quake3server-ut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	urbanterror3
 PKGNAME=	quake3server-ut-3.0
@@ -17,6 +17,8 @@ MASTER_SITES=	http://64.159.80.11/ \
 MAINTAINER=	david@silicium.ath.cx
 COMMENT=	Quake III Arena Mod: Urban Terror 3 for Linux
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../games/quake3server/Makefile.common"
 
 DEPENDS+=	quake3server>=1.32:../../games/quake3server
@@ -28,13 +30,13 @@ DOCDIR=		${PREFIX}/share/doc/lokigames/quake3server/ut
 MESSAGE_SUBST+=	Q3MODDIR=${Q3MODDIR}
 
 do-install:
-	${INSTALL_DATA_DIR} ${Q3MODDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${Q3MODDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 
-	${INSTALL_DATA} ${WRKSRC}/zq3ut3.pk3 ${Q3MODDIR}
+	${INSTALL_DATA} ${WRKSRC}/zq3ut3.pk3 ${DESTDIR}${Q3MODDIR}
 
 	for docfile in readme.txt overview.txt radio\ commands.txt; do \
-		${INSTALL_DATA} "${WRKSRC}/$${docfile}" ${DOCDIR}; \
+		${INSTALL_DATA} "${WRKSRC}/$${docfile}" ${DESTDIR}${DOCDIR}; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quake3server/Makefile b/games/quake3server/Makefile
index f97aff360f2..c2d879e08af 100644
--- a/games/quake3server/Makefile
+++ b/games/quake3server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/07/29 05:19:26 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	linuxq3apoint-1.32b.x86
 PKGNAME=	quake3server-1.32b
@@ -11,6 +11,8 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	david@silicium.ath.cx
 COMMENT=	Quake III Arena Dedicated Server for Linux
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../games/quake3server/Makefile.common"
 
 USE_TOOLS+=	gtar
@@ -20,36 +22,38 @@ WRKSRC=		${WRKDIR}
 BASEDOCDIR=	${PREFIX}/share/doc/lokigames/quake3server
 RCD_SCRIPTS=	quake3server
 
+SPECIAL_PERMS+=	${Q3ROOTDIR}/q3ded nobody nogroup 0500
+
 do-install:
-	${INSTALL_DATA_DIR} ${Q3ROOTDIR}/pb ${Q3ROOTDIR}/baseq3 \
-		${Q3ROOTDIR}/missionpack
+	${INSTALL_DATA_DIR} ${DESTDIR}${Q3ROOTDIR}/pb \
+		${DESTDIR}${Q3ROOTDIR}/baseq3 \
+		${DESTDIR}${Q3ROOTDIR}/missionpack
 .for bpak in 1 2 3 4 5 6 7 8
 	${INSTALL_DATA} ${WRKSRC}/baseq3/pak${bpak}.pk3 \
-		${Q3ROOTDIR}/baseq3
+		${DESTDIR}${Q3ROOTDIR}/baseq3
 .endfor
 .for mpak in 1 2 3
 	${INSTALL_DATA} ${WRKSRC}/missionpack/pak${mpak}.pk3 \
-		${Q3ROOTDIR}/missionpack
+		${DESTDIR}${Q3ROOTDIR}/missionpack
 .endfor
-	${INSTALL} -c -o nobody -g nogroup -m 500 ${WRKSRC}/bin/x86/q3ded \
-		${Q3ROOTDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/x86/q3ded ${DESTDIR}${Q3ROOTDIR}
 
 .for pb in pbag.so pbcl.so pbsv.so
-	${INSTALL_DATA} ${WRKSRC}/pb/${pb} ${Q3ROOTDIR}/pb
+	${INSTALL_DATA} ${WRKSRC}/pb/${pb} ${DESTDIR}${Q3ROOTDIR}/pb
 .endfor
 
 post-install:
-	${INSTALL_DATA_DIR} ${BASEDOCDIR}/Docs/LinuxFAQ \
-		${BASEDOCDIR}/Docs/PunkBuster/admins \
-		${BASEDOCDIR}/Docs/PunkBuster/players \
-		${BASEDOCDIR}/pb/htm
+	${INSTALL_DATA_DIR} ${DESTDIR}${BASEDOCDIR}/Docs/LinuxFAQ \
+		${DESTDIR}${BASEDOCDIR}/Docs/PunkBuster/admins \
+		${DESTDIR}${BASEDOCDIR}/Docs/PunkBuster/players \
+		${DESTDIR}${BASEDOCDIR}/pb/htm
 .for docs in CHANGES-1.32.txt INSTALL Q3A_EULA.txt README-Id-7-26-01.html \
 	README-linux.txt quake3.xpm
-	${INSTALL_DATA} ${WRKSRC}/${docs} ${BASEDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/${docs} ${DESTDIR}${BASEDOCDIR}
 .endfor
 .for faq in INSTALL index.html udp_wide_README.txt udp_wide_broadcast.patch
 	${INSTALL_DATA} ${WRKSRC}/Docs/LinuxFAQ/${faq} \
-		${BASEDOCDIR}/Docs/LinuxFAQ
+		${DESTDIR}${BASEDOCDIR}/Docs/LinuxFAQ
 .endfor
 .for admins in index.htm tabout1.gif tadvanced1.gif tbasics1.gif \
 	tcommands1.gif tcommands2.gif tenabling1.gif tfaq1.gif tgame1.gif \
@@ -57,7 +61,7 @@ post-install:
 	tplayer1.gif tquick1.gif tremote1.gif tscreen1.gif tsettings1.gif \
 	ttitle1.gif ttoc1.gif tupdating1.gif
 	${INSTALL_DATA} ${WRKSRC}/Docs/PunkBuster/admins/${admins} \
-		${BASEDOCDIR}/Docs/PunkBuster/admins
+		${DESTDIR}${BASEDOCDIR}/Docs/PunkBuster/admins
 .endfor
 .for players in index.htm sbrowser1.jpg skeyboard1.gif stilde1.gif tabout1.gif \
 	tbasics1.gif tbutton1.gif tbutton2.gif tcommands1.gif tcommands2.gif \
@@ -66,12 +70,12 @@ post-install:
 	tquick1.gif tremote1.gif tscreen1.gif tsettings1.gif ttaking1.gif \
 	ttitle1.gif ttoc1.gif tupdating1.gif tusing1.gif
 	${INSTALL_DATA} ${WRKSRC}/Docs/PunkBuster/players/${players} \
-		${BASEDOCDIR}/Docs/PunkBuster/players
+		${DESTDIR}${BASEDOCDIR}/Docs/PunkBuster/players
 .endfor
 .for pbhtm in la001293.htm lc000993.htm ls000993.htm ma001293.htm mc000993.htm \
 	ms000993.htm wa001293.htm wc000993.htm ws000993.htm
-	${INSTALL_DATA} ${WRKSRC}/pb/htm/${pbhtm} ${BASEDOCDIR}/pb/htm
+	${INSTALL_DATA} ${WRKSRC}/pb/htm/${pbhtm} ${DESTDIR}${BASEDOCDIR}/pb/htm
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/pb/PB_EULA.txt ${BASEDOCDIR}/pb
+	${INSTALL_DATA} ${WRKSRC}/pb/PB_EULA.txt ${DESTDIR}${BASEDOCDIR}/pb
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quakedata/Makefile b/games/quakedata/Makefile
index 97eb7c294c4..2bc620375d9 100644
--- a/games/quakedata/Makefile
+++ b/games/quakedata/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/11/17 13:40:16 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	quake106
 PKGNAME=	quakedata-1.0
@@ -20,6 +20,8 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_ELEMENTS=	resource.*
 EXTRACT_OPTS_ZIP=	-qo
 
@@ -32,7 +34,8 @@ post-extract:
 	cd ${WRKDIR} && ${LHA} xfq resource.exe id1/pak0.pak
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/quake/id1
-	${INSTALL_DATA} ${WRKSRC}/id1/pak0.pak ${PREFIX}/share/quake/id1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/quake/id1
+	${INSTALL_DATA} ${WRKSRC}/id1/pak0.pak \
+		${DESTDIR}${PREFIX}/share/quake/id1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/rocksndiamonds-levels/Makefile b/games/rocksndiamonds-levels/Makefile
index 886859bcf55..78691ec3330 100644
--- a/games/rocksndiamonds-levels/Makefile
+++ b/games/rocksndiamonds-levels/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/05/22 06:47:44 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	rocksndiamonds-levels-1.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/
 DISTFILES=	rockslevels-dx-1.0.tar.gz \
@@ -14,12 +14,14 @@ COMMENT=	DX, Emerald Mine, and Sokoban levels for Rocks'N'Diamonds
 
 DEPENDS+=	rocksndiamonds{,-sdl}>=1.4.0:../../games/rocksndiamonds
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 USE_LANGUAGES=	# none
 WRKSRC=		${WRKDIR}/levels
 
-PLIST_SRC=	${WRKDIR}/PLIST PLIST
+PLIST_SRC=	${WRKDIR}/PLIST ${PKGDIR}/PLIST
 
 # if you change SCORE_PATH, don't forget to change patch-aa, too
 SCORE_PATH=	${VARBASE}/games/rocksndiamonds
@@ -29,8 +31,10 @@ CPIO?=		cpio
 post-extract:
 	${CHMOD} -R o-w ${WRKSRC}
 
-# XXX: how are these directories cleaned up?
-do-install:
+SETGIDGAME=		yes
+MAKE_DIRS_PERMS=	${SCORE_PATH} ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+MAKE_DIRS_PERMS+=	${SCORE_PATH}/scores ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+
 .for directory in dx_abd dx_achim_haertel \
 	dx_bd4 dx_blunderdash dx_boulderdash5 dx_dc2classic dx_firefox1 \
 	dx_forgottenmine1 dx_manfred_tausch dx_martin_brentnall \
@@ -71,16 +75,18 @@ do-install:
 	supaplex_01 supaplex_02 supaplex_03 supaplex_04 supaplex_05 \
 	supaplex_06 supaplex_07 supaplex_08 supaplex_95 supaplex_96 \
 	supaplex_97 supaplex_98 supaplex_99
-		${INSTALL_DATA_DIR} ${SCORE_PATH}/scores/${directory} \
-		&& ${CHMOD} 775 ${SCORE_PATH}/scores/${directory}
+OWN_DIRS_PERMS+=	${SCORE_PATH}/scores/${directory} \
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 .endfor
+
+do-install:
 	cd ${WRKSRC} && ${FIND} DX_Boulderdash Emerald_Mine_Club Supaplex | \
-		${CPIO} -p ${PREFIX}/share/rocksndiamonds/levels
+		${CPIO} -p ${DESTDIR}${PREFIX}/share/rocksndiamonds/levels
 	${RM} -f ${WRKDIR}/PLIST
 .for levdir in DX_Boulderdash Emerald_Mine_Club Supaplex
-	cd ${PREFIX} && \
-	${FIND} share/rocksndiamonds/levels/${levdir} -type f -print >>${WRKDIR}/PLIST
+	cd ${DESTDIR}${PREFIX} && \
+	${FIND} share/rocksndiamonds/levels/${levdir} -type f -print \
+		>>${WRKDIR}/PLIST
 .endfor
-	${CHOWN} -R games:games ${SCORE_PATH}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index f0a2592828d..614a836cfc8 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2007/10/13 12:58:47 adam Exp $
+# $NetBSD: Makefile,v 1.37 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	rocksndiamonds-3.2.4
+PKGREVISION=	1
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
 
@@ -8,14 +9,12 @@ MAINTAINER=	heinz@NetBSD.org
 HOMEPAGE=	http://www.artsoft.org/rocksndiamonds/
 COMMENT=	Game like Boulder Dash, Emerald Mine, or Sokoban
 
-PKG_DESTDIR_SUPPORT=	# wrong permissions in +INSTALL script
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man6
 
-PKG_GROUPS+=	${GAMEGRP}
-PKG_USERS+=	${GAMEOWN}:${GAMEGRP}
 BUILD_DEFS+=	VARBASE SCORE_PATH
 
 SHARESUBDIR=		share/rocksndiamonds
@@ -25,22 +24,26 @@ SCORE_PATH=	${VARBASE}/games/rocksndiamonds
 
 REQD_DIRS+=		${SHARESUBDIR}
 
+SETGIDGAME=		yes
+
 OWN_DIRS_PERMS+=	${SCORE_PATH:Q}
-OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores
-OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} 750
+OWN_DIRS_PERMS+=	${GAMES_USER} ${GAMES_GROUP} 750
 OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores/classic_boulderdash
-OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores/classic_emerald_mine
-OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores/classic_sokoban
-OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores/classic_supaplex
-OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores/rnd_tutorial_aaron_davidson
-OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores/rnd_tutorial_niko_boehm
-OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+
+SPECIAL_PERMS=		bin/rocksndiamonds ${SETGID_GAMES_PERMS}
 
 PLIST_SRC=	PLIST ${WRKDIR}/PLIST.F ${WRKDIR}/PLIST.D
 
@@ -60,7 +63,7 @@ MAKE_FLAGS+=	X11_LIBS=-lX11
 .include "options.mk"
 
 do-install:
-	${INSTALL_GAME} ${WRKSRC}/rocksndiamonds ${DESTDIR:Q}${PREFIX:Q}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${DESTDIR:Q}${PREFIX:Q}/bin/
 	${INSTALL_MAN} ${WRKSRC}/rocksndiamonds.1 \
 		${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man6/rocksndiamonds.6
 	${INSTALL_DATA_DIR} ${DESTDIR:Q}${SHAREDIR:Q}
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index d6fb7b42df9..e1350c49378 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2008/02/12 08:01:26 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	Rollemup
 PKGNAME=	rollemup-1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://savor.gulic.org/demos/
 # was http://usa.lostboys.nl/medialab/rollemup/Linux/
@@ -20,6 +20,8 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	destdir
+
 USE_TOOLS+=		gtar
 
 EMUL_PLATFORMS=		linux-i386
@@ -29,6 +31,11 @@ PLIST_SRC=		${WRKDIR}/PLIST.src
 GAMES_DIR=		share/games
 MESSAGE_SUBST+=		GAMES_DIR=${GAMES_DIR}
 
+SETGIDGAME=		yes
+CONF_FILES_PERMS+=	/dev/null ${GAMES_DIR}/Rollemup/Rollemup.ini	\
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+SPECIAL_PERMS=		bin/Rollemup ${SETGID_GAMES_PERMS}
+
 INSTALLATION_DIRS=	bin
 
 do-build:
@@ -39,24 +46,22 @@ do-build:
 		> ${WRKDIR}/README.Rollemup
 
 do-install:
-	${MKDIR} ${PREFIX}/${GAMES_DIR}
-	${GTAR} xCzf ${PREFIX}/${GAMES_DIR} ${_DISTDIR}/${DISTFILES}
-	${TOUCH} ${PREFIX}/${GAMES_DIR}/Rollemup/Rollemup.ini
-	${MV} ${PREFIX}/${GAMES_DIR}/Rollemup/Rollemup ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/rollemup ${PREFIX}/bin
+	${MKDIR} ${DESTDIR}${PREFIX}/${GAMES_DIR}
+	${GTAR} xCzf ${DESTDIR}${PREFIX}/${GAMES_DIR} ${_DISTDIR}/${DISTFILES}
+	${TOUCH} ${DESTDIR}${PREFIX}/${GAMES_DIR}/Rollemup/Rollemup.ini
+	${MV} ${PREFIX}/${GAMES_DIR}/Rollemup/Rollemup ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/rollemup ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/README.Rollemup \
-		${PREFIX}/${GAMES_DIR}/Rollemup
+		${DESTDIR}${PREFIX}/${GAMES_DIR}/Rollemup
 	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	(cd ${PREFIX}; \
+	(cd ${DESTDIR}${PREFIX}; \
 	  ${FIND} ${GAMES_DIR}/Rollemup -type f -print >> ${PLIST_SRC}; \
 	  for DIR in `${FIND} ${GAMES_DIR}/Rollemup -type d -print | ${SORT} -r`; do \
 	    ${ECHO} "@dirrm $$DIR" >> ${PLIST_SRC}; \
 	  done)
-	${CHOWN} ${ROOT_USER}:games ${PREFIX}/bin/Rollemup
-	${CHMOD} 2755 ${PREFIX}/bin/Rollemup
-	${CHOWN} -R ${ROOT_USER}:games ${PREFIX}/${GAMES_DIR}/Rollemup
-	${CHMOD} 775 ${PREFIX}/${GAMES_DIR}/Rollemup/Games
-	${CHMOD} 775 ${PREFIX}/${GAMES_DIR}/Rollemup/Upload
-	${CHMOD} 664 ${PREFIX}/${GAMES_DIR}/Rollemup/Rollemup.ini
+	${CHOWN} -R ${ROOT_USER}:${GAMEGRP} \
+		${DESTDIR}${PREFIX}/${GAMES_DIR}/Rollemup
+	${CHMOD} ${GAMEDIRMODE} ${DESTDIR}${PREFIX}/${GAMES_DIR}/Rollemup/Games
+	${CHMOD} ${GAMEDIRMODE} ${DESTDIR}${PREFIX}/${GAMES_DIR}/Rollemup/Upload
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index 5c9c7492e1a..106359fadd7 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/07/29 05:19:26 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/04 06:59:05 jlam Exp $
 
 DISTNAME=	wolf-linux-1.33.x86
 PKGNAME=	rtcw-1.33
@@ -23,6 +23,8 @@ EMUL_MODULES.linux=	base
 # This package needs DRI support.
 NOT_FOR_PLATFORM=	NetBSD-*-*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DIRS=	# empty
 RTCWDIR=	${PREFIX}/lib/lokigames/rtcw
 USE_TOOLS+=	gtar
@@ -33,7 +35,7 @@ pre-extract:
 	${MKDIR} ${WRKSRC}
 
 do-install:
-	${INSTALL_DATA_DIR} ${RTCWDIR}
-	cd ${WRKSRC} && ${PAX} -rw -p am . ${RTCWDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${RTCWDIR}
+	cd ${WRKSRC} && ${PAX} -rw -p am . ${DESTDIR}${RTCWDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/sarien/Makefile b/games/sarien/Makefile
index 8d693deaa2d..fad1c600a7d 100644
--- a/games/sarien/Makefile
+++ b/games/sarien/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/06/12 16:28:10 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/04 06:59:05 jlam Exp $
 #
 
 DISTNAME=	sarien-0.7.0
@@ -10,6 +10,8 @@ MAINTAINER=	mor@linex.com
 HOMEPAGE=	http://sarien.sourceforge.net/
 COMMENT=	Adventure Game Interpreter (AGI) for Sierra On-Line Titles
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake
 
@@ -22,11 +24,11 @@ CONF_FILES=		${EGDIR}/sarien.conf ${PKG_SYSCONFDIR}/sarien.conf
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/sarien ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sarien
-	${INSTALL_DATA} ${WRKSRC}/doc/README* ${PREFIX}/share/doc/sarien
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/etc/sarien.cfg ${EGDIR}/sarien.conf
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/sarien ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/sarien
+	${INSTALL_DATA} ${WRKSRC}/doc/README* ${DESTDIR}${PREFIX}/share/doc/sarien
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/sarien.cfg ${DESTDIR}${EGDIR}/sarien.conf
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/scummvm-bass/Makefile b/games/scummvm-bass/Makefile
index d4349d21d84..9a7c8c5f578 100644
--- a/games/scummvm-bass/Makefile
+++ b/games/scummvm-bass/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:43 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=		BASS-Floppy
@@ -12,6 +12,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://scummvm.sourceforge.net/
 COMMENT=		Beneath a Steel Sky
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/sky-floppy
 
 BASSDIR=	${PREFIX}/share/games/bass
@@ -23,8 +25,8 @@ do-build:
 		>${WRKDIR}/bass.sh
 
 do-install:
-	${INSTALL_DATA_DIR} ${BASSDIR}
-	${INSTALL_DATA} ${WRKSRC}/sky.dnr ${WRKSRC}/sky.dsk ${BASSDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/bass.sh ${PREFIX}/bin/bass
+	${INSTALL_DATA_DIR} ${DESTDIR}${BASSDIR}
+	${INSTALL_DATA} ${WRKSRC}/sky.dnr ${WRKSRC}/sky.dsk ${DESTDIR}${BASSDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/bass.sh ${DESTDIR}${PREFIX}/bin/bass
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/scummvm-fotaq/Makefile b/games/scummvm-fotaq/Makefile
index 10f90fe1a9b..1b4afe0bbd7 100644
--- a/games/scummvm-fotaq/Makefile
+++ b/games/scummvm-fotaq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:43 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=		FOTAQ_Floppy
@@ -12,6 +12,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.scummvm.org/
 COMMENT=		Flight Of The Amazon Queen
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/FOTAQ_Floppy
 
 FOTAQDIR=	${PREFIX}/share/games/fotaq
@@ -23,8 +25,8 @@ do-build:
 		>${WRKDIR}/fotaq.sh
 
 do-install:
-	${INSTALL_DATA_DIR} ${FOTAQDIR}
-	${INSTALL_DATA} ${WRKSRC}/queen.1 ${FOTAQDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/fotaq.sh ${PREFIX}/bin/fotaq
+	${INSTALL_DATA_DIR} ${DESTDIR}${FOTAQDIR}
+	${INSTALL_DATA} ${WRKSRC}/queen.1 ${DESTDIR}${FOTAQDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/fotaq.sh ${DESTDIR}${PREFIX}/bin/fotaq
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index a44a3a122a8..f892ac458ca 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/02/22 19:30:03 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=		scummvm-tools-0.9.0
@@ -10,6 +10,8 @@ MAINTAINER=		dillo@NetBSD.org
 HOMEPAGE=		http://scummvm.sourceforge.net/
 COMMENT=		Conversion and compression tools for ScummVM
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/tools-0.9.0
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
@@ -26,10 +28,10 @@ do-install:
         	extract_mm_c64 extract_mm_nes extract_scumm_mac \
         	extract_simon1_amiga extract_zak_c64; \
 	do \
-		${INSTALL_PROGRAM} ${WRKSRC}/$$f ${LOCALBASE}/bin; \
+		${INSTALL_PROGRAM} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/bin; \
 	done
-	${INSTALL_DATA_DIR} ${LOCALBASE}/share/doc/scummvm-tools
-	${INSTALL_DATA} ${WRKSRC}/README ${LOCALBASE}/share/doc/scummvm-tools
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/scummvm-tools
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/scummvm-tools
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/games/singularity/Makefile b/games/singularity/Makefile
index ac168b4d7fd..217f02e5018 100644
--- a/games/singularity/Makefile
+++ b/games/singularity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/09/09 17:04:32 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=		singularity_0.26a
@@ -10,6 +10,8 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.emhsoft.com/singularity/
 COMMENT=		Endgame: Singularity game
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
 INSTALLATION_DIRS=	bin share/doc/singularity \
@@ -23,12 +25,15 @@ do-build:
 	${ECHO} "${PYTHONBIN} singularity.py" >> ${WRKSRC}/singularity
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/singularity ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/code/*.py ${PREFIX}/share/singularity/code
-	${INSTALL_DATA} ${WRKSRC}/data/*.* ${PREFIX}/share/singularity/data
+	${INSTALL_SCRIPT} ${WRKSRC}/singularity ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/code/*.py \
+		${DESTDIR}${PREFIX}/share/singularity/code
+	${INSTALL_DATA} ${WRKSRC}/data/*.* \
+		${DESTDIR}${PREFIX}/share/singularity/data
 	${INSTALL_DATA} ${WRKSRC}/data/music-src/* \
-		${PREFIX}/share/singularity/data/music-src
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/singularity
+		${DESTDIR}${PREFIX}/share/singularity/data/music-src
+	${INSTALL_DATA} ${WRKSRC}/README.txt \
+		${DESTDIR}${PREFIX}/share/doc/singularity
 
 .include "../../devel/py-game/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
diff --git a/games/sl/Makefile b/games/sl/Makefile
index 250f9d6c782..aad0f4f593d 100644
--- a/games/sl/Makefile
+++ b/games/sl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:54 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=	sl
@@ -19,13 +19,15 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 
 BUILD_DEPENDS+=	nkf-[0-9]*:../../converters/nkf
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/ja_JP.EUC/man1
 
 post-build:
 	nkf -e ${WRKSRC}/sl.1 > ${WRKSRC}/sl.1.euc
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sl ${PREFIX}/bin/sl
-	${INSTALL_DATA} ${WRKSRC}/sl.1.euc ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/sl.1
+	${INSTALL_PROGRAM} ${WRKSRC}/sl ${DESTDIR}${PREFIX}/bin/sl
+	${INSTALL_DATA} ${WRKSRC}/sl.1.euc \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/sl.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index 271fcc2ef57..62608642229 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/01/12 20:33:03 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=		stratagus-2.1-src
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://stratagus.sourceforge.net/
 COMMENT=		Real-time strategy engine
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/stratagus-040702
 USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
@@ -22,12 +24,12 @@ CONFIGURE_ARGS+=	--with-flac --with-mad
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/stratagus ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/stratagus
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/stratagus/graphics
-	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/stratagus
+	${INSTALL_PROGRAM} ${WRKSRC}/stratagus ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/stratagus
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/stratagus/graphics
+	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${DESTDIR}${PREFIX}/share/doc/stratagus
 	${INSTALL_DATA} ${WRKSRC}/doc/graphics/* \
-		${PREFIX}/share/doc/stratagus/graphics
+		${DESTDIR}${PREFIX}/share/doc/stratagus/graphics
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
diff --git a/games/tetrinetx/Makefile b/games/tetrinetx/Makefile
index 187183fc097..e36d75a7dcf 100644
--- a/games/tetrinetx/Makefile
+++ b/games/tetrinetx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/09/02 12:33:13 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/04 06:59:06 jlam Exp $
 
 DISTNAME=	tetrinetx-1.13.16+qirc-1.40c
 PKGNAME=	tetrinetx-1.13.16
@@ -10,6 +10,8 @@ MAINTAINER=	david@netbsd-fr.org
 HOMEPAGE=	${MASTER_SITES}
 COMMENT=	Server for an addictive 6 player tetris game
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${DISTNAME}
 SHAREDIR=	${PREFIX}/share/tetrinetx
 BINARY=		tetrix.netbsd
@@ -20,20 +22,21 @@ LIBS.SunOS+=	-lsocket -lnsl -lresolv
 do-build:
 	cd ${WRKSRC:Q}/src && \
 	${CC} \
-		${CPPFLAGS} -I${LOCALBASE:Q}/include			\
+		${CPPFLAGS} -I${PREFIX:Q}/include			\
 		-DSHAREDIR=\"${SHAREDIR:Q}\" -DPREFIX=\"${PREFIX:Q}\"	\
 		${CFLAGS} -fno-strength-reduce -Wall			\
-		${LDFLAGS} -L${LOCALBASE:Q}/lib -ladns ${LIBS}		\
-		-o ../bin/${BINARY:Q} -Wl,-R${LOCALBASE:Q}/lib		\
+		${LDFLAGS} -L${PREFIX:Q}/lib -ladns ${LIBS}		\
+		-o ../bin/${BINARY:Q} -Wl,-R${PREFIX:Q}/lib		\
 		main.c
 
 do-install:
-	${INSTALL_DATA_DIR} ${SHAREDIR}
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/bin/${BINARY:Q} ${PREFIX:Q}/bin/tetrix
-	${INSTALL_DATA} ${WRKSRC:Q}/bin/game.conf ${SHAREDIR:Q}
-	${INSTALL_DATA} ${WRKSRC:Q}/bin/game.secure ${SHAREDIR:Q}
-	${INSTALL_DATA} ${WRKSRC:Q}/bin/game.motd ${SHAREDIR:Q}
-	${INSTALL_DATA} ${WRKSRC:Q}/bin/game.pmotd ${SHAREDIR:Q}
+	${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
+	${INSTALL_PROGRAM} ${WRKSRC:Q}/bin/${BINARY:Q} \
+		${DESTDIR}${PREFIX:Q}/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}
 
 .include "../../net/adns/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/thew/Makefile b/games/thew/Makefile
index 3a73201e826..a3366adade5 100644
--- a/games/thew/Makefile
+++ b/games/thew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/12/07 05:28:30 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/04 06:59:06 jlam Exp $
 
 DISTNAME=		thew-1.1.1
 PKGREVISION=		2
@@ -11,11 +11,12 @@ MAINTAINER=		ilfoglionascosto@netcat.it
 HOMEPAGE=		http://thew.sourceforce.net/
 COMMENT=		The hermit worm
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 AUTO_MKDIRS=		yes
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/thew ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/thew.6 ${PREFIX}/${PKGMANDIR}/man6
+	${INSTALL_PROGRAM} ${WRKSRC}/thew ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/thew.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/tscp/Makefile b/games/tscp/Makefile
index 49f066d8a96..b2d0ce35ea8 100644
--- a/games/tscp/Makefile
+++ b/games/tscp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/03/26 06:15:27 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=	tscp181
@@ -12,21 +12,21 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://home.comcast.net/~tckerrigan/
 COMMENT=	Tom Kerrigan's Simple Chess Program
 
-
-RESTRICTED= No distribution without authorisation from Tom Kerrigan
+RESTRICTED=	No distribution without authorisation from Tom Kerrigan
 
 NO_BIN_ON_CDROM= ${RESTRICTED}
 NO_SRC_ON_CDROM= ${RESTRICTED}
 NO_BIN_ON_FTP= ${RESTRICTED}
 NO_SRC_ON_FTP= ${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	bin
 
 do-build:
 	cd ${WRKSRC} ; ${CC} ${CFLAGS} ${LDFLAGS} -o tscp *.c -lcompat
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tscp ${PREFIX}/bin/tscp
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/tscp.txt
+	${INSTALL_PROGRAM} ${WRKSRC}/tscp ${DESTDIR}${PREFIX}/bin/tscp
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DESTDIR}${PREFIX}/share/doc/tscp.txt
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/velena/Makefile b/games/velena/Makefile
index 0a3d2a6d01f..cfeb5009cef 100644
--- a/games/velena/Makefile
+++ b/games/velena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/02/28 11:58:48 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=	veleng10
@@ -17,10 +17,12 @@ RESTRICTED=		You must not charge a fee for this software nor for any derived wor
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_OPTS_ZIP=	-LLaqo
 WRKSRC=			${WRKDIR}
 MAKE_FILE=		makefile
-AUTO_MKDIRS=			yes
+AUTO_MKDIRS=		yes
 
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	pre-configure
diff --git a/games/wxhugo/Makefile b/games/wxhugo/Makefile
index e02ce57ae2a..b42bd81f741 100644
--- a/games/wxhugo/Makefile
+++ b/games/wxhugo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/05/15 21:05:49 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=	hugov31_unix_source
@@ -15,6 +15,8 @@ COMMENT=	Interactive fiction interpreter with sound and graphics support
 DISTFILE_WX=	hugov31_wxwin_source${EXTRACT_SUFX}
 #EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=	hugo-3.1.02
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
@@ -33,6 +35,6 @@ INSTALLATION_DIRS=	bin
 .include "../../x11/wxGTK24/buildlink3.mk"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hewx ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/hewx ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 05ffd9f3a0b..3ee7002f6f9 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2008/01/19 09:16:23 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2008/03/04 06:59:06 jlam Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10
@@ -15,6 +15,8 @@ COMMENT=	3D shoot-em-up for 8-bit X11 displays
 
 LICENSE=	xdoom-license
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_ONLY=		doomsrc.zip
 EXTRACT_OPTX_ZIP=	-qo
 
@@ -46,10 +48,13 @@ do-build:
 	cd ${WRKSRC}/sndserv && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME}/linux/linuxxdoom ${PREFIX}/bin/xdoom
-	${INSTALL_PROGRAM} ${WRKSRC}/sndserv/linux/sndserver ${PREFIX}/bin/sndserver
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doom
-	${GUNZIP_CMD} -c ${DISTDIR}/doom-1.8.wad.gz > ${PREFIX}/share/doom/doom1.wad
+	${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME}/linux/linuxxdoom \
+		${DESTDIR}${PREFIX}/bin/xdoom
+	${INSTALL_PROGRAM} ${WRKSRC}/sndserv/linux/sndserver \
+		${DESTDIR}${PREFIX}/bin/sndserver
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doom
+	${GUNZIP_CMD} -c ${DISTDIR}/doom-1.8.wad.gz \
+		> ${DESTDIR}${PREFIX}/share/doom/doom1.wad
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 775ac520b72..8722a90ea45 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/12/15 20:32:56 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2008/03/04 06:59:06 jlam Exp $
 
 DISTNAME=	xevilsrc2.02r2
 PKGNAME=	xevil-2.02
@@ -11,6 +11,8 @@ MAINTAINER=	snj@pobox.com
 HOMEPAGE=	http://www.xevil.com/
 COMMENT=	Side scrolling, bloody action game
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_FILE=	makefile
 
 BUILD_TARGET=	pkgsrc
@@ -23,9 +25,9 @@ USE_LANGUAGES=	c++
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/x11/PKGSRC/xevil ${PREFIX}/bin/xevil
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xevil
-	${INSTALL_DATA} ${WRKSRC}/instructions/* ${PREFIX}/share/doc/xevil
+	${INSTALL_PROGRAM} ${WRKSRC}/x11/PKGSRC/xevil ${DESTDIR}${PREFIX}/bin/xevil
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xevil
+	${INSTALL_DATA} ${WRKSRC}/instructions/* ${DESTDIR}${PREFIX}/share/doc/xevil
 
 SUBST_CLASSES+=		uname
 SUBST_STAGE.uname=	pre-configure
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index b97cd61633d..3a95c1ab219 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:37 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 06:59:06 jlam Exp $
 
 DISTNAME=		xjump_2.7.5.orig
 PKGNAME=		xjump-2.7.5
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/\
 			http://www.gtlib.cc.gatech.edu/pub/debian/pool/main/x/xjump/
@@ -11,13 +11,18 @@ MAINTAINER=		pancake@phreaker.net
 HOMEPAGE=		http://www.gtlib.cc.gatech.edu/pub/debian/pool/main/x/xjump/
 COMMENT=		Jumping game for X
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/xjump-2.7.5.orig
 BUILD_TARGET=		xjump
 INSTALLATION_DIRS=	bin
 MAKE_ENV+=		VARBASE=${VARBASE:Q}
 
+SETGIDGAME=		yes
+SPECIAL_PERMS=		bin/xjump ${SETGID_GAMES_PERMS}
+
 do-install:
-	${INSTALL_GAME} ${WRKSRC}/xjump ${PREFIX}/bin/xjump
+	${INSTALL_PROGRAM} ${WRKSRC}/xjump ${DESTDIR}${PREFIX}/bin/xjump
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index 2be821ae94a..fab2b06bed9 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2008/01/19 09:16:23 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=	xpipeman-1.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=games/strategy/}
 
@@ -11,19 +11,25 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 # domain squatted, page last updated 1999
 COMMENT=	Connect the pipes to contain the water flow game for X11
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/xpipeman
 USE_IMAKE=	yes
 
+SETGIDGAME=		yes
+CONF_FILES_PERMS=	share/xpipeman/xpipescores /var/games/xpipescores \
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+SPECIAL_PERMS=		bin/xpipeman ${SETGID_GAMES_PERMS}
+REQD_DIRS_PERMS=	share/xpipeman ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
-	${INSTALL} -o bin -g games -m 2755 ${WRKSRC}/xpipeman \
-		${PREFIX}/bin/xpipeman
-	${INSTALL_MAN} ${WRKSRC}/xpipeman.man ${PREFIX}/${PKGMANDIR}/man6/xpipeman.6
-	${INSTALL} -d -o bin -g games -m 0775 ${PREFIX}/share/xpipeman
-	if [ ! -r /var/games/xpipescores ]; then \
-		${INSTALL} -o bin -g games -m 0664 ${WRKSRC}/xpipescores /var/games ; \
-	fi
+	${INSTALL_PROGRAM} ${WRKSRC}/xpipeman ${DESTDIR}${PREFIX}/bin/xpipeman
+	${INSTALL_MAN} ${WRKSRC}/xpipeman.man \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/xpipeman.6
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/xpipeman
+	${INSTALL_DATA} ${WRKSRC}/xpipescores ${DESTDIR}${PREFIX}/share/xpipeman
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/games/xpipeman/PLIST b/games/xpipeman/PLIST
index 99328877568..b7f0cf67e1b 100644
--- a/games/xpipeman/PLIST
+++ b/games/xpipeman/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:57:28 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/03/04 07:01:16 jlam Exp $
 bin/xpipeman
 man/man6/xpipeman.6
-@dirrm share/xpipeman
+share/examples/xpipeman/xpipescores
+@dirrm share/examples/xpipeman
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index 5ddf89f36dd..704840d0610 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:31 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=	xrick-021212
@@ -17,6 +17,8 @@ NO_SRC_ON_CDROM=    ${RESTRICTED}
 NO_BIN_ON_FTP=	    ${RESTRICTED}
 NO_SRC_ON_FTP=	    ${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake gunzip
 
 SUBST_CLASSES+=		data
@@ -31,10 +33,10 @@ post-extract:
 	cd ${WRKSRC} && ${GUNZIP_CMD} xrick.6.gz
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xrick ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xrick.6 ${PREFIX}/${PKGMANDIR}/man6
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xrick
-	${INSTALL_DATA} ${WRKSRC}/data.zip ${PREFIX}/share/xrick
+	${INSTALL_PROGRAM} ${WRKSRC}/xrick ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xrick.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/xrick
+	${INSTALL_DATA} ${WRKSRC}/data.zip ${DESTDIR}${PREFIX}/share/xrick
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xsc/Makefile b/games/xsc/Makefile
index a0969db65dd..c97ca72ee57 100644
--- a/games/xsc/Makefile
+++ b/games/xsc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/02 01:13:57 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=		xsc-1.5
@@ -10,14 +10,16 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.panix.com/~mbh/xsc/
 COMMENT=		Star Castle clone
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xsc ${PREFIX}/bin/xsc
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xsc
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xsc
+	${INSTALL_PROGRAM} ${WRKSRC}/xsc ${DESTDIR}${PREFIX}/bin/xsc
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xsc
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xsc
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 41c4fbf101b..fb9509d70c9 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:37 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=	xscrabble-1.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	X version of the popular board game, for 1 to 4 players
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/xscrabble
 USE_IMAKE=	YES
 
@@ -22,18 +24,24 @@ SUBST_SED.xscrabble+=	-e 's,/usr/local/lib,${PREFIX}/share/games/xscrabble,g'
 
 MAKE_DIRS=		${VARBASE}/games
 EGDIR=			${PREFIX}/share/games/xscrabble
-CONF_FILES_PERMS=	${EGDIR}/xscrabble.scores.dist ${VARBASE}/games/xscrabble.scores ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
+
 SETGIDGAME=		yes
+CONF_FILES_PERMS=	${EGDIR}/xscrabble.scores.dist \
+			${VARBASE}/games/xscrabble.scores \
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+SPECIAL_PERMS=		bin/xscrab ${SETGID_GAMES_PERMS}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/xscrabble ${PREFIX}/bin
-	${INSTALL_GAME} ${WRKSRC}/src/xscrab ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/games
-	${INSTALL_DATA_DIR} ${PREFIX}/share/games/xscrabble
-	${INSTALL_DATA} ${WRKSRC}/OSPD3.gz ${EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/scrabble_permutations ${EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/xscrabble.scores ${EGDIR}/xscrabble.scores.dist
-	${INSTALL_DATA} ${WRKSRC}/XScrabble.ad ${PREFIX}/lib/X11/app-defaults/XScrabble
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xscrabble ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xscrab ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/games
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/games/xscrabble
+	${INSTALL_DATA} ${WRKSRC}/OSPD3.gz ${DESTDIR}${EGDIR}/
+	${INSTALL_DATA} ${WRKSRC}/scrabble_permutations ${DESTDIR}${EGDIR}/
+	${INSTALL_DATA} ${WRKSRC}/xscrabble.scores \
+		${DESTDIR}${EGDIR}/xscrabble.scores.dist
+	${INSTALL_DATA} ${WRKSRC}/XScrabble.ad \
+		${DESTDIR}${PREFIX}/lib/X11/app-defaults/XScrabble
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/games/xtris/Makefile b/games/xtris/Makefile
index 02aa59eee0a..884c0d12998 100644
--- a/games/xtris/Makefile
+++ b/games/xtris/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/02/02 01:06:57 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/04 06:59:06 jlam Exp $
 #
 
 DISTNAME=	xtris-1.15
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.iagora.com/~espel/xtris/
 
@@ -10,6 +10,8 @@ MAINTAINER=	opp@MuFFiN.Org
 HOMEPAGE=	http://www.iagora.com/~espel/xtris/xtris.html
 COMMENT=	Multi-player version of a popular game for the X Window system
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/xtris
 USE_X11BASE=	yes
 LIBS.SunOS+=	-lsocket -lnsl
@@ -17,15 +19,20 @@ MAKE_ENV+=	LIBS=${LIBS:Q}
 
 .include "options.mk"
 
+SETGIDGAME=	yes
+SPECIAL_PERMS+=	bin/xtris ${SETGID_GAMES_PERMS}
+SPECIAL_PERMS+=	bin/xtbot ${SETGID_GAMES_PERMS}
+SPECIAL_PERMS+=	bin/xtserv ${SETGID_GAMES_PERMS}
+
 INSTALLATION_DIRS=	bin ${PREFIX}/${PKGMANDIR}/man6
 
 do-install:
-	${INSTALL_GAME} ${WRKSRC}/xtris ${PREFIX}/bin/xtris
-	${INSTALL_GAME} ${WRKSRC}/xtbot ${PREFIX}/bin/xtbot
-	${INSTALL_GAME} ${WRKSRC}/xtserv ${PREFIX}/bin/xtserv
-	${INSTALL_MAN} ${WRKSRC}/xtris.6 ${PREFIX}/${PKGMANDIR}/man6/xtris.6
-	${INSTALL_MAN} ${WRKSRC}/xtbot.6 ${PREFIX}/${PKGMANDIR}/man6/xtbot.6
-	${INSTALL_MAN} ${WRKSRC}/xtserv.6 ${PREFIX}/${PKGMANDIR}/man6/xtserv.6
+	${INSTALL_PROGRAM} ${WRKSRC}/xtris ${DESTDIR}${PREFIX}/bin/xtris
+	${INSTALL_PROGRAM} ${WRKSRC}/xtbot ${DESTDIR}${PREFIX}/bin/xtbot
+	${INSTALL_PROGRAM} ${WRKSRC}/xtserv ${DESTDIR}${PREFIX}/bin/xtserv
+	${INSTALL_MAN} ${WRKSRC}/xtris.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/xtris.6
+	${INSTALL_MAN} ${WRKSRC}/xtbot.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/xtbot.6
+	${INSTALL_MAN} ${WRKSRC}/xtserv.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/xtserv.6
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xtux/Makefile b/games/xtux/Makefile
index 65843dce15f..663eaee193c 100644
--- a/games/xtux/Makefile
+++ b/games/xtux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/12/02 00:03:37 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/04 06:59:06 jlam Exp $
 
 DISTNAME=	xtux-arena-src-nov-15
 PKGNAME=	xtux-0.2000.11.15
@@ -10,21 +10,23 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://xtux.sourceforge.net/
 COMMENT=	2D multi-player shootout using images from the Open Software scene
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/xtux
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xtux
-	cd ${WRKSRC} && ${PAX} -rw data ${PREFIX}/share/xtux
-	cd ${WRKSRC} && ${PAX} -rw doc ${PREFIX}/share/xtux
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/xtux
-	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${PREFIX}/share/xtux
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/xtux
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/xtux
-	${INSTALL_DATA} ${WRKSRC}/example-config ${PREFIX}/share/xtux
-	${INSTALL_PROGRAM} ${WRKSRC}/tux_serv ${PREFIX}/bin/tux_serv
-	${INSTALL_PROGRAM} ${WRKSRC}/xtux ${PREFIX}/bin/xtux
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/xtux
+	cd ${WRKSRC} && ${PAX} -rw data ${DESTDIR}${PREFIX}/share/xtux
+	cd ${WRKSRC} && ${PAX} -rw doc ${DESTDIR}${PREFIX}/share/xtux
+	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DESTDIR}${PREFIX}/share/xtux
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DESTDIR}${PREFIX}/share/xtux
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/xtux
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/xtux
+	${INSTALL_DATA} ${WRKSRC}/example-config ${DESTDIR}${PREFIX}/share/xtux
+	${INSTALL_PROGRAM} ${WRKSRC}/tux_serv ${DESTDIR}${PREFIX}/bin/tux_serv
+	${INSTALL_PROGRAM} ${WRKSRC}/xtux ${DESTDIR}${PREFIX}/bin/xtux
 
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xvier/Makefile b/games/xvier/Makefile
index 4b6b44d40cf..d6e4e58c1dc 100644
--- a/games/xvier/Makefile
+++ b/games/xvier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:37 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/04 06:59:06 jlam Exp $
 
 DISTNAME=	xvier
 PKGNAME=	xvier-1.0
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 #HOMEPAGE=
 COMMENT=	Four-in-a-row game
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_IMAKE=	YES
 CPPFLAGS.SunOS+=	-D__EXTENSIONS__
@@ -18,9 +20,11 @@ CPPFLAGS.SunOS+=	-D__EXTENSIONS__
 INSTALLATION_DIRS+=	bin libexec ${PKGMANDIR}/man6
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xvier ${PREFIX}/bin/xvier
-	${INSTALL_PROGRAM} ${WRKSRC}/xvier_prog ${PREFIX}/libexec/xvier_prog
-	${INSTALL_MAN} ${WRKSRC}/xvier.man ${PREFIX}/${PKGMANDIR}/man6/xvier.6
+	${INSTALL_PROGRAM} ${WRKSRC}/xvier ${DESTDIR}${PREFIX}/bin/xvier
+	${INSTALL_PROGRAM} ${WRKSRC}/xvier_prog \
+		${DESTDIR}${PREFIX}/libexec/xvier_prog
+	${INSTALL_MAN} ${WRKSRC}/xvier.man \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/xvier.6
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/games/xworm/Makefile b/games/xworm/Makefile
index f6672ce4c4b..3a33fdb5b09 100644
--- a/games/xworm/Makefile
+++ b/games/xworm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/01/19 09:16:24 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/04 06:59:06 jlam Exp $
 
 DISTNAME=	xworm102
 PKGNAME=	xworm-1.02
@@ -9,16 +9,18 @@ MASTER_SITES=	http://www.ekran.no/archive/x/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Classic game with apples and hungry worm
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/XWorm
 BUILD_TARGET=	bsd
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xworm ${PREFIX}/bin
-	@ ${INSTALL_DATA_DIR} ${PREFIX}/share/xworm
+	${INSTALL_PROGRAM} ${WRKSRC}/xworm ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/xworm
 .for file in font grid raw
-	${INSTALL_DATA} ${WRKSRC}/xworm.${file} ${PREFIX}/share/xworm
+	${INSTALL_DATA} ${WRKSRC}/xworm.${file} ${DESTDIR}${PREFIX}/share/xworm
 .endfor
 
 .include "../../x11/libXt/buildlink3.mk"