Second round of explicit pax dependencies. As reminded by tnn@,

many packages used to use ${PAX}. Use the common way of directly calling
pax, it is created as tool after all.

27 files changed, 100 insertions, 75 deletions

diff --git a/games/4stAttack/Makefile b/games/4stAttack/Makefile
index 88df640ba0c..9fb05696d68 100644
--- a/games/4stAttack/Makefile
+++ b/games/4stAttack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/04/07 16:21:03 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=		4stAttack-2.1.4
@@ -14,6 +14,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 INSTALLATION_DIRS=	bin share/${PKGBASE}
 
+USE_TOOLS+=	pax
+
 PYTHON_PATCH_SCRIPTS=	4stattack.py
 
 FIND_EXCLUDE=	\( -name \*.orig -or -name \*.txt -or -name \*.pre -or -name GPL -or -name \*~ -or -name 4stattack \)
@@ -29,7 +31,7 @@ do-build:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/4stattack ${DESTDIR}${PREFIX}/bin
 	cd ${WRKSRC} && ${FIND} . -type f -and \! ${FIND_EXCLUDE} \
-		-print | ${PAX} -rw -pp -pm ${DESTDIR}${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/angband-tty/Makefile b/games/angband-tty/Makefile
index b1e0dc4c4f6..131f1a2e27c 100644
--- a/games/angband-tty/Makefile
+++ b/games/angband-tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/03/04 06:59:03 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=		angband-283
@@ -17,6 +17,8 @@ CONFLICTS=		angband-x11-[0-9]*
 
 PKG_DESTDIR_SUPPORT=	destdir
 
+USE_TOOLS+=	pax
+
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 MAKE_FILE=		Makefile.std
@@ -35,10 +37,10 @@ INSTALLATION_DIRS=	bin
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/angband
-	cd ${WRKDIR}/${DISTNAME}/lib && ${PAX} -wr * \
+	cd ${WRKDIR}/${DISTNAME}/lib && pax -wr * \
 		${DESTDIR}${PREFIX}/share/angband
 	cd ${DESTDIR}${PREFIX}/share/angband/help && \
-		${PAX} -O -zrf ${DISTDIR}/${SPOILERFILE}
+		pax -O -zrf ${DISTDIR}/${SPOILERFILE}
 	${CHOWN} -R ${GAMEOWN}:${GAMEGRP} ${DESTDIR}${PREFIX}/share/angband
 	cd ${DESTDIR}${PREFIX}/share/angband && \
 		${CHMOD} ${GAMEDATAMODE} */*
diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index 38c2a9b72f4..3b5bc0d417d 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2008/01/19 09:16:20 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=	angband-3.0.3
@@ -16,6 +16,8 @@ CONFLICTS=	angband-tty-[0-9]*
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+USE_TOOLS+=	pax
+
 INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
 INCOMPAT_CURSES+=	NetBSD-1.6[A-M]-*
 
@@ -38,7 +40,7 @@ SUBST_SED.070=		-e 's,070,770,g'
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/games/angband/lib/info
 	cd ${PREFIX}/share/games/angband/lib/info/ && \
-		 ${PAX} -O -zrf ${DISTDIR}/${SPOILERFILE}
+		 pax -O -zrf ${DISTDIR}/${SPOILERFILE}
 	${CHOWN} -R bin:games ${PREFIX}/share/games/angband
 	${FIND} ${PREFIX}/share/games/angband -name delete.me -exec ${RM} {} \;
 
diff --git a/games/billardgl/Makefile b/games/billardgl/Makefile
index ea620f8758a..68da38a9e1e 100644
--- a/games/billardgl/Makefile
+++ b/games/billardgl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/02/02 17:44:20 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=	BillardGL-1.75
@@ -13,7 +13,7 @@ COMMENT=	3D Billard using OpenGL hardware acceleration
 
 BUILD_DIRS=	src
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake imake
+USE_TOOLS+=	gmake imake pax
 MAKE_ENV+=	PAX=${PAX:Q}
 LDFLAGS+=	${X11_LDFLAGS}
 
diff --git a/games/bos/Makefile b/games/bos/Makefile
index 84fca90b429..befdc7fc661 100644
--- a/games/bos/Makefile
+++ b/games/bos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/03/04 06:59:03 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=		bos_1_1
@@ -16,6 +16,8 @@ DEPENDS+=		stratagus>=2.1:../../games/stratagus
 PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	bin
 
+USE_TOOLS+=	pax
+
 do-build:
 	${SED} -e "s|@LOCALBASE@|${LOCALBASE}|" \
 		-e "s|@PREFIX@|${PREFIX}|" ${FILESDIR}/bos > \
@@ -24,7 +26,7 @@ do-build:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bos ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/bos
-	cd ${WRKSRC} && ${PAX} -pe -rw data ${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
 
diff --git a/games/civctp-demo/Makefile b/games/civctp-demo/Makefile
index 5ee699ed56e..8be217edca3 100644
--- a/games/civctp-demo/Makefile
+++ b/games/civctp-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/04 06:59:03 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/05/26 02:13:19 joerg Exp $
 
 DISTNAME=	civctp-demo-10251999
 PKGNAME=	civctp-demo-19991025
@@ -18,6 +18,8 @@ EMUL_MODULES.linux=	x11
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 WRKSRC=		${WRKDIR}/${WRKNAME}
 BUILD_DIRS=	# empty
 
@@ -53,7 +55,7 @@ do-install:
 		${DESTDIR}${LIBDIR}/${BINNAME}
 	${INSTALL_DATA} ${WRKSRC}/README \
 		${DESTDIR}${SHAREDIR}/${BINNAME}-README
-	cd ${WRKSRC} && ${PAX} -rw appstr.txt civpaths.txt ctp_data \
+	cd ${WRKSRC} && pax -rw appstr.txt civpaths.txt ctp_data \
 		${DESTDIR}${LIBDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/et/Makefile b/games/et/Makefile
index 63ef7e8ecac..f622f978f72 100644
--- a/games/et/Makefile
+++ b/games/et/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/29 13:55:34 obache Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=	et-linux-2.56-2.x86
@@ -17,7 +17,7 @@ EMUL_MODULES.linux=	base glx
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar pax
 EXTRACT_CMD=	${TAIL} +356 ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - \
 		-C ${WRKSRC}
 
@@ -47,11 +47,11 @@ do-install:
 	${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
+	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
+	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
+	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
diff --git a/games/eus-demo/Makefile b/games/eus-demo/Makefile
index 8d07014fb10..68c2bc18de6 100644
--- a/games/eus-demo/Makefile
+++ b/games/eus-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/04 06:59:04 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/05/26 02:13:19 joerg Exp $
 
 DISTNAME=	eus-demo
 PKGNAME=	eus-demo-1.0
@@ -18,6 +18,8 @@ EMUL_MODULES.linux=	x11
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 WRKSRC=		${WRKDIR}/${WRKNAME}
 BUILD_DIRS=	# empty
 
@@ -52,6 +54,6 @@ do-install:
 	${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}
+	cd ${WRKSRC} && pax -rw [Eai-p]* sounds ${DESTDIR}${LIBDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/fillets-ng-data/Makefile b/games/fillets-ng-data/Makefile
index ebf4ac27ba8..2d73c887929 100644
--- a/games/fillets-ng-data/Makefile
+++ b/games/fillets-ng-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/03/04 06:59:04 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=	fillets-ng-data-0.7.1
@@ -13,14 +13,15 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
+USE_TOOLS+=	pax
 
 do-install:
 	${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 \
+		pax -rw -pm font images music script sound \
 			${DESTDIR}${PREFIX}/share/games/fillets-ng/
 	cd ${WRKSRC}/doc/html && \
-		${PAX} -rw -pm . ${DESTDIR}${PREFIX}/share/doc/fillets-ng/
+		pax -rw -pm . ${DESTDIR}${PREFIX}/share/doc/fillets-ng/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/flightgear-base/Makefile b/games/flightgear-base/Makefile
index 92e3d5d30f5..e0d7f76c4cb 100644
--- a/games/flightgear-base/Makefile
+++ b/games/flightgear-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/03/14 14:49:53 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=	fgfs-base-1.0.0
@@ -21,6 +21,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=		${WRKDIR}/data
 NO_BUILD=	yes
 USE_LANGUAGES=	# empty
+USE_TOOLS+=	pax
 
 FG_SHAREDIR=	${PREFIX}/share/FlightGear
 
@@ -29,7 +30,7 @@ do-install:
 	(							\
 	cd ${WRKSRC};						\
 	${FIND} . -type f -name .\* -print|${XARGS} rm -f;	\
-	${PAX} -rwppm . ${DESTDIR}${FG_SHAREDIR};		\
+	pax -rwppm . ${DESTDIR}${FG_SHAREDIR};		\
 	)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/heretic2-demo/Makefile b/games/heretic2-demo/Makefile
index 8c35cabdb00..353a79ede71 100644
--- a/games/heretic2-demo/Makefile
+++ b/games/heretic2-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/03/04 06:59:04 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=	heretic2-demo-x86
@@ -19,7 +19,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 NO_CONFIGURE=	yes
 EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
 								${GTAR} xzf -
-USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar pax
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -58,7 +58,7 @@ do-install:
 		${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 \
+	cd ${WRKSRC} && pax -rw base gl_drivers icon.xpm ref_glx.so \
 		${DESTDIR}${LIBDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index c3b25c060cf..69e16380ea2 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/01/19 09:16:21 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2008/05/26 02:13:19 joerg Exp $
 
 DISTNAME=		imaze1.3
 PKGNAME=		imaze-1.3
@@ -15,11 +15,12 @@ EXTRACT_ONLY=		imaze1.3.tar.Z
 
 WRKSRC=			${WRKDIR}/imaze
 USE_X11BASE=		yes
+USE_TOOLS+=		pax
 
 INSTALLATION_DIRS=	bin lib/X11/app-defaults ${PKGMANDIR}/man6
 
 post-build:
-	cd ${WRKSRC} && ${PAX} -O -rf ${DISTDIR}/imaze-sounds.tar
+	cd ${WRKSRC} && pax -O -rf ${DISTDIR}/imaze-sounds.tar
 
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile
index fe161c76cf3..f2cb22c78e3 100644
--- a/games/maelstrom-x11/Makefile
+++ b/games/maelstrom-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/01/19 09:16:21 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2008/05/26 02:13:19 joerg Exp $
 
 DISTNAME=		Maelstrom-1.4.3-L2.0.6-src.tar.gz
 PKGNAME=		maelstrom-x11-2.0.6
@@ -23,6 +23,7 @@ EXTRACT_ONLY=		${DISTNAME}
 
 WRKSRC=			${WRKDIR}/Maelstrom
 USE_LANGUAGES=		c c++
+USE_TOOLS+=		pax
 USE_X11BASE=		YES
 MAKE_ENV+=		BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} XPMDIR=${BUILDLINK_PREFIX.libXpm}
 MAKE_ENV+=		GAMEOWN=${GAMEOWN} GAMEGRP=${GAMEGRP}
@@ -35,9 +36,9 @@ CONF_FILES_PERMS+=	${PREFIX}/share/maelstrom/Maelstrom-Scores \
 
 post-install:
 	cd ${PREFIX}/share/maelstrom && \
-		${PAX} -O -pm -zrf ${DISTDIR}/${ESOUND} && \
-		${PAX} -O -pm -zrf ${DISTDIR}/${STREK} && \
-		${PAX} -O -pm -zrf ${DISTDIR}/${SWARS}
+		pax -O -pm -zrf ${DISTDIR}/${ESOUND} && \
+		pax -O -pm -zrf ${DISTDIR}/${STREK} && \
+		pax -O -pm -zrf ${DISTDIR}/${SWARS}
 	${CHOWN} ${GAMEOWN}:${GAMEGRP} ${PREFIX}/bin/Maelstrom
 	${CHMOD} ${GAMEMODE} ${PREFIX}/bin/Maelstrom
 	${INSTALL_DATA} ${WRKSRC}/README.* ${PREFIX}/share/maelstrom
diff --git a/games/majesty-demo/Makefile b/games/majesty-demo/Makefile
index 43f6e26dd63..b57dd0313f9 100644
--- a/games/majesty-demo/Makefile
+++ b/games/majesty-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=	majesty_demo
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.linuxgamepublishing.com/info.php?id=majesty
 COMMENT=	Fantasy kingdom simulation (demo)
 
 EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
-			${GZCAT} | ${PAX} -O -r
+			${GZCAT} | pax -O -r
 USE_TOOLS+=	gzcat pax
 
 EMUL_PLATFORMS=		linux-i386
@@ -41,7 +41,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${MAJ_PATH}
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/Linux/x86/glibc-2.1/maj_demo \
 		${DESTDIR}${MAJ_PATH}
-	cd ${WRKDIR} && ${PAX} -rw README README.licenses data majesty* \
+	cd ${WRKDIR} && pax -rw README README.licenses data majesty* \
 		quests ${DESTDIR}${MAJ_PATH}
 	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh \
 		${DESTDIR}${PREFIX}/bin/${BINNAME}
diff --git a/games/mirrormagic-sdl/Makefile b/games/mirrormagic-sdl/Makefile
index 19284afd67f..d439969c8e0 100644
--- a/games/mirrormagic-sdl/Makefile
+++ b/games/mirrormagic-sdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=		mirrormagic-2.0.2
@@ -15,7 +15,7 @@ CONFLICTS=		mirrormagic-[1-9]*
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pax
 PLIST_SRC=		${WRKDIR}/PLIST PLIST
 
 # if you change SCORE_PATH, don't forget to change patch-aa, too
@@ -37,7 +37,7 @@ INSTALLATION_DIRS=	bin
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/mirrormagic
-	cd ${WRKSRC} && ${PAX} -rw graphics levels music sounds \
+	cd ${WRKSRC} && pax -rw graphics levels music sounds \
 		${DESTDIR}${PREFIX}/share/mirrormagic/
 
 	${RM} -f ${WRKDIR}/PLIST
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index 56773193304..5e281dfa631 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/04/07 17:40:51 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=		mirrormagic-2.0.2
@@ -14,7 +14,7 @@ CONFLICTS=		mirrormagic-sdl-[1-9]*
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pax
 PLIST_SRC=		${WRKDIR}/PLIST PLIST
 
 # if you change SCORE_PATH, don't forget to change patch-aa, too
@@ -35,7 +35,7 @@ INSTALLATION_DIRS=	bin share/mirrormagic
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${DESTDIR}${PREFIX}/bin
-	cd ${WRKSRC} && ${PAX} -rw graphics levels music sounds \
+	cd ${WRKSRC} && pax -rw graphics levels music sounds \
 		${DESTDIR}${PREFIX}/share/mirrormagic/
 
 	${RM} -f ${WRKDIR}/PLIST
diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index 72b0a23c859..e82fae09ce9 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=	neverball-1.4.0
@@ -12,7 +12,7 @@ COMMENT=	Part puzzle game, part action game and with SDL graphics
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pax
 
 # Avoiding multiples patches...
 BUILDLINK_FNAME_TRANSFORM.SDL+=	-e "s|/SDL/|/|g"
@@ -29,7 +29,7 @@ do-install:
 	    ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_PROGRAM} ${WRKSRC}/neverball ${WRKSRC}/neverputt \
 	    ${DESTDIR}${SHAREDIR}
-	cd ${WRKSRC} && ${PAX} -rwppm data ${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 \
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index 9f3fb68e428..4559e529a93 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=		nighthawk-2.1
@@ -18,7 +18,7 @@ COMMENT=		C64 Paradroid clone
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/nighthawk
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pax
 USE_LANGUAGES=		c c++
 
 MAKE_ENV+=		OSTYPE=${OPSYS:Q}
@@ -45,7 +45,7 @@ do-install:
 	${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
+	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
diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile
index beb49613980..53394633f45 100644
--- a/games/quake3arena-demo/Makefile
+++ b/games/quake3arena-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2008/04/07 17:54:03 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2008/05/26 02:13:19 joerg Exp $
 
 DISTNAME=	linuxq3ademo-1_11-6_x86_gz
 PKGREVISION=	3
@@ -19,7 +19,7 @@ EMUL_MODULES.linux=	base x11 glx
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar pax
 EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} |	\
 		${GTAR} xzf -
 
@@ -51,8 +51,8 @@ do-install:
 	${LN} -s ${LIBDIR}/libMesaVoodooGL.so.3.2 \
 		${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}
+	cd ${WRKSRC} && pax -rw demoq3 icon.bmp icon.xpm ${DESTDIR}${LIBDIR}
+	cd ${WRKSRC} && pax -rw Help ${DESTDIR}${SHAREDIR}
 	${MV} ${DESTDIR}${SHAREDIR}/Help ${DESTDIR}${SHAREDIR}/quake3arena-Help
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile
index efebf6188ae..5bb0f9ae45e 100644
--- a/games/quake3arena/Makefile
+++ b/games/quake3arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2008/05/26 02:13:19 joerg Exp $
 
 DISTNAME=	linuxq3apoint-1.32b.x86
 PKGREVISION=	3
@@ -22,7 +22,7 @@ NO_BIN_ON_FTP=	no
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=	gtar gunzip tail
+USE_TOOLS+=	gtar gunzip pax tail
 
 # The distfile is a self-extracting shell script.  "266" is a magic
 # number that's taken from the distfile itself.
@@ -53,7 +53,7 @@ do-install:
 		${DESTDIR}${LIBDIR}/${BINNAME}
 	${INSTALL_DATA} ${WRKSRC}/README-linux.txt ${DESTDIR}${SHAREDIR}/${BINNAME}-README
 
-	cd ${WRKSRC} && ${PAX} -rw baseq3 ${DESTDIR}${LIBDIR}
+	cd ${WRKSRC} && pax -rw baseq3 ${DESTDIR}${LIBDIR}
 
 # Some platforms, e.g. FreeBSD, need to "brand" the ELF binaries to
 # the correct type.
diff --git a/games/quake3server-excessive/Makefile b/games/quake3server-excessive/Makefile
index 1ceb0c88556..d80e8af9ec9 100644
--- a/games/quake3server-excessive/Makefile
+++ b/games/quake3server-excessive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/26 02:13:19 joerg Exp $
 
 DISTNAME=	excessive_q3_server_003
 PKGNAME=	quake3server-excessive-003
@@ -17,12 +17,14 @@ WRKSRC=		${WRKDIR}
 .include "../../games/quake3server/Makefile.common"
 
 DEPENDS+=	quake3server>=1.32:../../games/quake3server
+USE_TOOLS+=	pax
+
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 NO_BUILD=	yes
 Q3MODDIR=	${Q3ROOTDIR}/excessive
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${Q3MODDIR}
-	cd ${WRKSRC}/excessive && ${PAX} -rwppm . ${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 dd29b269d84..5f0a31c70cb 100644
--- a/games/quake3server-osp/Makefile
+++ b/games/quake3server-osp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/26 02:13:19 joerg Exp $
 
 DISTNAME=	osp-Quake3-1.03a_full
 PKGNAME=	quake3server-osp-1.03a
@@ -16,12 +16,14 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../games/quake3server/Makefile.common"
 
 DEPENDS+=	quake3server>=1.32:../../games/quake3server
+USE_TOOLS+=	pax
+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/osp
 Q3MODDIR=	${Q3ROOTDIR}/osp
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${Q3MODDIR}
-	cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${Q3MODDIR}
+	cd ${WRKSRC} && pax -rw . ${DESTDIR}${Q3MODDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index 106359fadd7..87bd0e37675 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2008/05/26 02:13:19 joerg Exp $
 
 DISTNAME=	wolf-linux-1.33.x86
 PKGNAME=	rtcw-1.33
@@ -27,7 +27,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_DIRS=	# empty
 RTCWDIR=	${PREFIX}/lib/lokigames/rtcw
-USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar pax
 EXTRACT_CMD=	${SED} '1,178d' ${DOWNLOADED_DISTFILE} |		\
 		${GTAR} xzf - -C ${WRKSRC}
 
@@ -36,6 +36,6 @@ pre-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${RTCWDIR}
-	cd ${WRKSRC} && ${PAX} -rw -p am . ${DESTDIR}${RTCWDIR}
+	cd ${WRKSRC} && pax -rw -p am . ${DESTDIR}${RTCWDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile
index 3b5093d8327..d11403679d7 100644
--- a/games/starfighter/Makefile
+++ b/games/starfighter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/03/10 10:33:38 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2008/05/26 02:13:19 joerg Exp $
 #
 
 DISTNAME=	starfighter-1.1-1
@@ -12,7 +12,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.parallelrealities.co.uk/starfighter.php
 COMMENT=	Old school 2D shoot them up
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pax
 USE_LANGUAGES=	c++
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-1$//}
 
@@ -23,7 +23,7 @@ MAKE_FILE=	makefile
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/starfighter/music
 	${CHMOD} 644 ${WRKDIR}/music/*
-	cd ${WRKDIR}/music && ${PAX} -rw . \
+	cd ${WRKDIR}/music && pax -rw . \
 		${PREFIX}/share/starfighter/music
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 439dcec66f3..dbfafb5d8ba 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/08/08 17:21:15 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2008/05/26 02:13:20 joerg Exp $
 #
 
 DISTNAME=	tuxracer-0.61
@@ -23,16 +23,18 @@ CONFIGURE_ARGS+=	--with-tcl-libs=${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ENV+=		CFLAGS=${CFLAGS:M*:Q}
 USE_LANGUAGES=	c c++
 
+USE_TOOLS+=	pax
+
 INSTALLATION_DIRS=	share/doc/html/tuxracer share/examples/tuxracer \
 			share/tuxracer
 
 post-install:
 	cd ${WRKSRC}/html && \
-		${PAX} -rw .  ${DESTDIR}${PREFIX}/share/doc/html/tuxracer/
+		pax -rw .  ${DESTDIR}${PREFIX}/share/doc/html/tuxracer/
 	cd ${WRKSRC}/contrib && \
-		${PAX} -rw .  ${DESTDIR}${PREFIX}/share/examples/tuxracer/
+		pax -rw .  ${DESTDIR}${PREFIX}/share/examples/tuxracer/
 	cd ${WRKDIR}/${PKGBASE}-data-${PKGVERSION:C/nb[0-9]*$//} && \
-		${PAX} -rw .  ${DESTDIR}${PREFIX}/share/tuxracer/
+		pax -rw .  ${DESTDIR}${PREFIX}/share/tuxracer/
 	cd ${DESTDIR}${PREFIX}/share/tuxracer && \
 		${FIND} . -type f -exec ${CHMOD} 444 {} \;
 
diff --git a/games/urban/Makefile b/games/urban/Makefile
index 60625e2e85e..8f8a88def62 100644
--- a/games/urban/Makefile
+++ b/games/urban/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/05/15 21:07:59 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/26 02:13:20 joerg Exp $
 #
 
 DISTNAME=	urban-1.5.3
@@ -14,10 +14,11 @@ COMMENT=	U.R.B.A.N The Cyborg Project
 PTHREAD_AUTO_VARS=	yes
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
+USE_TOOLS+=	pax
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
 post-install:
-	cd ${WRKDIR} && ${PAX} -rwppm snd ${PREFIX}/share/urban
+	cd ${WRKDIR} && pax -rwppm snd ${PREFIX}/share/urban
 
 .include "../../audio/libmikmod/buildlink3.mk"
 .include "../../graphics/libggi/buildlink3.mk"
diff --git a/games/xtux/Makefile b/games/xtux/Makefile
index 663eaee193c..38dd07569c1 100644
--- a/games/xtux/Makefile
+++ b/games/xtux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/03/04 06:59:06 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2008/05/26 02:13:20 joerg Exp $
 
 DISTNAME=	xtux-arena-src-nov-15
 PKGNAME=	xtux-0.2000.11.15
@@ -12,14 +12,16 @@ COMMENT=	2D multi-player shootout using images from the Open Software scene
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 WRKSRC=		${WRKDIR}/xtux
 
 INSTALLATION_DIRS=	bin
 
 do-install:
 	${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
+	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