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.

36 files changed, 140 insertions, 101 deletions

diff --git a/devel/ExmanIDE/Makefile b/devel/ExmanIDE/Makefile
index 7bf8690ccb6..de693f790be 100644
--- a/devel/ExmanIDE/Makefile
+++ b/devel/ExmanIDE/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:08 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:16 joerg Exp $
 
 DISTNAME=	ExmanIDE-0.9.4
 PKGREVISION=	4
@@ -11,6 +11,8 @@ COMMENT=	Integrated development environment for Python
 
 DEPENDS+=	${PYPKGPREFIX}-wxWidgets>=2.6:../../x11/py-wxWidgets
 
+USE_TOOLS+=	pax
+
 WRKSRC=		${WRKDIR}/${PKGBASE}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
@@ -35,7 +37,7 @@ INSTALLATION_DIRS=	 bin
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ExmanIDE ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/${PKGBASE}
-	cd ${WRKSRC} && ${PAX} -rwppm '-s|.*/CVS.*$$||'	\
+	cd ${WRKSRC} && pax -rwppm '-s|.*/CVS.*$$||'	\
 		'-s|.*/ExmanIDE$$||' '-s|.*/.xvpics.*$$||' \
 		. ${PREFIX}/share/${PKGBASE}
 	${PYTHONBIN} ${PYCOMPILEALL} ${PREFIX}/share/${PKGBASE}
diff --git a/devel/RTFM/Makefile b/devel/RTFM/Makefile
index 1df79ec65b8..354af9dd14b 100644
--- a/devel/RTFM/Makefile
+++ b/devel/RTFM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/04/30 10:20:20 cube Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/26 02:13:17 joerg Exp $
 #
 
 DISTNAME=	RTFM-2.0.4
@@ -12,6 +12,8 @@ COMMENT=	Enterprise-grade knowledge management tool
 
 DEPENDS+=	rt>=3.4.5:../../devel/rt3
 
+USE_TOOLS+=	pax
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../devel/rt3/dirs.mk"
@@ -28,15 +30,15 @@ do-install:
 	@${ECHO} "=> Libraries"
 	${INSTALL_DATA_DIR} ${DESTDIR}${RT_LIB_DIR}
 	cd ${WRKSRC}/lib/RT && ${FIND} . -type f ! -name '*.orig' 2>/dev/null |		\
-		${PAX} -rw ${DESTDIR}${RT_LIB_DIR}/RT
+		pax -rw ${DESTDIR}${RT_LIB_DIR}/RT
 	@${ECHO} "=> HTML Documents"
 	${INSTALL_DATA_DIR} ${DESTDIR}${RT_HTML_DIR}
 	cd ${WRKSRC}/html && ${FIND} . -type f ! -name '*.orig' 2>/dev/null |		\
-		${PAX} -rw ${DESTDIR}${RT_HTML_DIR}
+		pax -rw ${DESTDIR}${RT_HTML_DIR}
 	@${ECHO} "=> Locales"
 	${INSTALL_DATA_DIR} ${DESTDIR}${RT_I18N_DIR}
 	cd ${WRKSRC}/po && ${FIND} . -type f ! -name '*.orig' 2>/dev/null |		\
-		${PAX} -rw ${DESTDIR}${RT_I18N_DIR}
+		pax -rw ${DESTDIR}${RT_I18N_DIR}
 	@${ECHO} "=> Database Schemas"
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/RTFM
 	for file in acl.Oracle acl.Pg acl.mysql schema.Oracle schema.Pg schema.mysql;	\
diff --git a/devel/acme/Makefile b/devel/acme/Makefile
index 805c67a76c5..e2e6dc13503 100644
--- a/devel/acme/Makefile
+++ b/devel/acme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/03/03 17:45:33 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/05/26 02:13:17 joerg Exp $
 #
 
 DISTNAME=	acme085_linux
@@ -14,7 +14,7 @@ COMMENT=	Cross assembler for 6502, 65c02, and 65816
 
 PKG_DESTDIR_SUPPORT=	destdir
 
-USE_TOOLS+=	unzip
+USE_TOOLS+=	pax unzip
 
 WRKSRC=		${WRKTOP}/sources
 LIBDIST=	lib002.zip
@@ -34,7 +34,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/acme
 	${INSTALL_DATA} ${WRKTOP}/docs/* ${DESTDIR}${PREFIX}/share/doc/acme
 	${INSTALL_DATA_DIR} ${DESTDIR}${ACME_LIB}
-	cd ${WRKDIR}/ACME_Lib && ${PAX} -rw . ${DESTDIR}${ACME_LIB}
+	cd ${WRKDIR}/ACME_Lib && pax -rw . ${DESTDIR}${ACME_LIB}
 	${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${DESTDIR}${ACME_LIB}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/apache-ant15/Makefile b/devel/apache-ant15/Makefile
index cb9996860b1..70b382addf1 100644
--- a/devel/apache-ant15/Makefile
+++ b/devel/apache-ant15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2008/05/26 02:13:17 joerg Exp $
 #
 # NOTE: if you are depending on ant from another package, please be aware that
 # the ant team has CHANGED the version numbering scheme.  A previous version
@@ -25,6 +25,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_JAVA=	run
+USE_TOOLS+=	pax
 
 EXTRACT_OPTS_ZIP=	-Caq
 INSTALLATION_DIRS=	bin
@@ -42,7 +43,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/ant.jar ${DESTDIR}${PREFIX}/lib/java/ant
 	${INSTALL_DATA} ${WRKSRC}/lib/optional.jar ${DESTDIR}${PREFIX}/lib/java/ant
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/java/ant
-	cd ${WRKSRC}/docs && ${PAX} -rw -pmp * ${DESTDIR}${PREFIX}/share/doc/java/ant
+	cd ${WRKSRC}/docs && pax -rw -pmp * ${DESTDIR}${PREFIX}/share/doc/java/ant
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/java/ant
 	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${DESTDIR}${PREFIX}/share/doc/java/ant
 
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index f1220665cda..56a7aba695d 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/04/25 20:39:08 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/26 02:13:17 joerg Exp $
 #
 
 VERSION=		0.4.4
@@ -26,12 +26,14 @@ INSTALLATION_DIRS=	bin
 
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
+USE_TOOLS+=	pax
+
 do-build:
 	${SED} ${SEDSUBST} <${FILESDIR}/Boa.sh >${WRKDIR}/Boa
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${BOADIR}
-	cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${BOADIR}
+	cd ${WRKSRC} && pax -rw . ${DESTDIR}${BOADIR}
 	${CHMOD} -R go-w ${DESTDIR}${BOADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/Boa ${DESTDIR}${PREFIX}/bin
 
diff --git a/devel/boost-build/Makefile b/devel/boost-build/Makefile
index 63c44ffb1c7..aa23e8c72b6 100644
--- a/devel/boost-build/Makefile
+++ b/devel/boost-build/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/02/05 22:52:01 heinz Exp $
+# $NetBSD: Makefile,v 1.10 2008/05/26 02:13:17 joerg Exp $
 #
 
 BOOST_PACKAGE=		build
@@ -7,6 +7,8 @@ BOOST_CONFIG=		no
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 .include "../../meta-pkgs/boost/Makefile.common"
 
 SUBST_CLASSES+=		confdir
@@ -40,7 +42,7 @@ do-build:
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/boost-build
-	cd ${WRKSRC}/tools/build/v2 && ${PAX} -rw -pp -pm		\
+	cd ${WRKSRC}/tools/build/v2 && pax -rw -pp -pm		\
 		-s ':^.*\.orig$$::' . ${DESTDIR}${PREFIX}/share/boost-build
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKDIR}/site-config.jam ${DESTDIR}${EGDIR}
diff --git a/devel/boost-docs/Makefile b/devel/boost-docs/Makefile
index 7db1a0aeaa6..b9e556483ea 100644
--- a/devel/boost-docs/Makefile
+++ b/devel/boost-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/02/05 22:59:05 heinz Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/26 02:13:17 joerg Exp $
 #
 
 BOOST_PACKAGE=		docs
@@ -7,6 +7,8 @@ BOOST_CONFIG=		no
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 .include "../../meta-pkgs/boost/Makefile.common"
 
 DOCDIR=			${PREFIX}/share/doc/boost
@@ -15,7 +17,7 @@ NO_BUILD=		yes
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-	cd ${WRKSRC} && ${PAX} -rw -pm \
+	cd ${WRKSRC} && pax -rw -pm \
 		-s':^.*/build$$::' \
 		-s':^.*/build/.*$$::' \
 		-s':^libs/.*/test$$::' \
diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 807e69d5f39..ea051f0e478 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/05/24 13:19:51 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2008/05/26 02:13:17 joerg Exp $
 #
 
 DISTNAME=	bugzilla-2.22.4
@@ -26,7 +26,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	pax perl:run
 NO_BUILD=	YES
 
 BZ_WEB_GROUP?=	${APACHE_GROUP}
@@ -103,7 +103,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/html/*.html ${DESTDIR}${BZDIR}/docs/html
 
 .for i in ${PAX_DIRS}
-	cd ${WRKSRC}/${i} && ${PAX} -rw . ${DESTDIR}${BZDIR}/${i}
+	cd ${WRKSRC}/${i} && pax -rw . ${DESTDIR}${BZDIR}/${i}
 	${FIND} ${DESTDIR}${BZDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 	${FIND} ${DESTDIR}${BZDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${BZDIR}/${i}
diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index 4ca769642eb..95426f733dd 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/05/24 13:19:51 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:17 joerg Exp $
 #
 
 DISTNAME=	bugzilla-3.0.4
@@ -21,7 +21,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	pax perl:run
 NO_BUILD=	YES
 
 BZ_WEB_GROUP?=	${APACHE_GROUP}
@@ -99,7 +99,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/html/*.html ${DESTDIR}${BZDIR}/docs/html
 
 .for i in ${PAX_DIRS}
-	cd ${WRKSRC}/${i} && ${PAX} -rw . ${DESTDIR}${BZDIR}/${i}
+	cd ${WRKSRC}/${i} && pax -rw . ${DESTDIR}${BZDIR}/${i}
 	${FIND} ${DESTDIR}${BZDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 	${FIND} ${DESTDIR}${BZDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${BZDIR}/${i}
diff --git a/devel/epydoc/Makefile b/devel/epydoc/Makefile
index 24e6d5f0fc2..4ca0d658f59 100644
--- a/devel/epydoc/Makefile
+++ b/devel/epydoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/11/15 01:16:39 wulf Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/26 02:13:17 joerg Exp $
 
 DISTNAME=	epydoc-2.1
 PKGREVISION=	3
@@ -9,13 +9,15 @@ MAINTAINER=	darcy@NetBSD.org
 HOMEPAGE=	http://epydoc.sourceforge.net/
 COMMENT=	Python documentation framework
 
+USE_TOOLS+=	pax
+
 PYDISTUTILSPKG=     yes
 
 EPYDOCDIR=	${PREFIX}/share/doc/epydoc
 
 post-install:
 	${INSTALL_DATA_DIR} ${EPYDOCDIR}
-	cd ${WRKSRC}/doc && ${PAX} -rw -pp -pm . ${EPYDOCDIR}
+	cd ${WRKSRC}/doc && pax -rw -pp -pm . ${EPYDOCDIR}
 
 .include "../../lang/python/extension.mk"
 .include "../../x11/py-Tk/buildlink3.mk"
diff --git a/devel/gobo-eiffel/Makefile b/devel/gobo-eiffel/Makefile
index 266f160ab5b..d7dca843114 100644
--- a/devel/gobo-eiffel/Makefile
+++ b/devel/gobo-eiffel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/03/11 20:10:19 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2008/05/26 02:13:17 joerg Exp $
 #
 
 DISTNAME=	gobo15
@@ -15,6 +15,7 @@ COMMENT=	Portable Eiffel structure libraries and tools
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_DEPENDS+=	SmartEiffel-[0-9]*:../../lang/SmartEiffel
+USE_TOOLS+=	pax
 
 EXTRACT_OPTS_ZIP=	-uLa
 
@@ -55,11 +56,11 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gelex/a.out ${DESTDIR}${PREFIX}/bin/gelex
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gepp/a.out ${DESTDIR}${PREFIX}/bin/gepp
 	${INSTALL_PROGRAM} ${WRKSRC}/src/geyacc/a.out ${DESTDIR}${PREFIX}/bin/geyacc
-	cd ${WRKSRC}; ${PAX} -rw library ${DESTDIR}${GOBO}
+	cd ${WRKSRC}; pax -rw library ${DESTDIR}${GOBO}
 	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${GOBO}
-	cd ${WRKSRC}/doc; ${PAX} -rw * ${DESTDIR}${PREFIX}/share/doc/gobo-eiffel
+	cd ${WRKSRC}/doc; pax -rw * ${DESTDIR}${PREFIX}/share/doc/gobo-eiffel
 	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/doc/gobo-eiffel
-	cd ${WRKSRC}/example; ${PAX} -rw * ${DESTDIR}${PREFIX}/share/examples/gobo-eiffel
+	cd ${WRKSRC}/example; pax -rw * ${DESTDIR}${PREFIX}/share/examples/gobo-eiffel
 	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/examples/gobo-eiffel
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile
index 41e9aab639d..4634fb675b4 100644
--- a/devel/hdf5/Makefile
+++ b/devel/hdf5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2007/09/18 18:58:08 drochner Exp $
+# $NetBSD: Makefile,v 1.40 2008/05/26 02:13:17 joerg Exp $
 
 DISTNAME=	hdf5-1.6.6
 CATEGORIES=	devel
@@ -10,7 +10,7 @@ COMMENT=	Hierarchical Data Format (new generation)
 
 DIST_SUBDIR=		${PKGNAME_NOREV}
 USE_LIBTOOL=		yes
-USE_TOOLS+=		tr
+USE_TOOLS+=		pax tr
 GNU_CONFIGURE=		yes
 TEST_TARGET=		check
 #CONFIGURE_ARGS+= --disable-production --enable-debug
@@ -35,7 +35,7 @@ post-install:
 		release_docs/RELEASE.txt ${PREFIX}/share/doc/hdf5
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hdf5/html
 	# avoid installing the Makefile and Makefile.in's  They are not needed
-	cd ${WRKSRC}/doc/html && ${PAX} -s '/.*Makefile.*//' -rwpm . ${PREFIX}/share/doc/hdf5/html
+	cd ${WRKSRC}/doc/html && pax -s '/.*Makefile.*//' -rwpm . ${PREFIX}/share/doc/hdf5/html
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/hdf5/html
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/hptools/Makefile b/devel/hptools/Makefile
index 694d9e6fdd7..6cce7ba69b7 100644
--- a/devel/hptools/Makefile
+++ b/devel/hptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/11/18 10:39:57 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:17 joerg Exp $
 #
 
 DISTNAME=	hptools-src-3.0.8
@@ -20,12 +20,13 @@ WRKSRC=		${WRKDIR}/Hptools
 GNU_CONFIGURE=	YES
 CONFIGURE_DIRS=	support
 BUILD_DIRS=	support
+USE_TOOLS+=	pax
 
 post-build:
 	${CHMOD} ${SHAREMODE} ${WRKSRC}/doc/*
 
 post-install:
 	cd ${WRKSRC} \
-	&& ${PAX} -rw -pam -s ',^doc,hptools,g' doc ${PREFIX}/share/doc
+	&& pax -rw -pam -s ',^doc,hptools,g' doc ${PREFIX}/share/doc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/javadeps/Makefile b/devel/javadeps/Makefile
index 73a30e156fe..4537dd02d6c 100644
--- a/devel/javadeps/Makefile
+++ b/devel/javadeps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/04/07 17:26:42 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/05/26 02:13:17 joerg Exp $
 #
 
 DISTNAME=	javadeps-1.1
@@ -15,6 +15,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 
 WRKSRC=		${WRKDIR}/JavaDeps-1.1
 USE_JAVA=	run
+USE_TOOLS+=	pax
 
 INSTALLATION_DIRS=	bin share/doc/jdeps share/jdeps
 
@@ -29,7 +30,7 @@ do-build:
 do-install:
 	${CP} ${WRKSRC}/jdeps ${DESTDIR}${PREFIX}/bin
 	${CP} ${WRKSRC}/jdeps.jar ${DESTDIR}${PREFIX}/share/jdeps/jdeps.jar
-	cd ${WRKSRC}/doc && ${PAX} -rw -pe . ${DESTDIR}${PREFIX}/share/doc/jdeps
+	cd ${WRKSRC}/doc && pax -rw -pe . ${DESTDIR}${PREFIX}/share/doc/jdeps
 	${CHOWN} -R ${BINOWN}:${BINGRP} \
 		${DESTDIR}${PREFIX}/share/jdeps ${DESTDIR}${PREFIX}/share/doc/jdeps
 
diff --git a/devel/jgrasp/Makefile b/devel/jgrasp/Makefile
index c9d360ea0aa..2e2dc4b2ba4 100644
--- a/devel/jgrasp/Makefile
+++ b/devel/jgrasp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/03/03 17:45:35 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2008/05/26 02:13:17 joerg Exp $
 #
 
 DISTNAME=		jgrasp170
@@ -17,6 +17,8 @@ USE_JAVA=		run
 PKG_JVMS_ACCEPTED=	sun-jdk13 sun-jdk14 jdk14
 INSTALLATION_DIRS=	bin
 
+USE_TOOLS+=		pax
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
@@ -44,7 +46,7 @@ do-install:
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/${PKGNAME_NOREV}/bin
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/${PKGNAME_NOREV}/bin/${LOWER_OPSYS}
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/${PKGNAME_NOREV}/jbin
-	cd ${WRKSRC} && ${PAX} -s ,^./.*bin/.*,, 			\
+	cd ${WRKSRC} && pax -s ,^./.*bin/.*,, 			\
 		-rw . ${DESTDIR}${PREFIX}/${PKGNAME_NOREV}/
 	${INSTALL_DATA} ${WRKSRC}/jbin/JGRASP__829J_6h.class		\
 		${DESTDIR}${PREFIX}/${PKGNAME_NOREV}/jbin/
diff --git a/devel/ltsa/Makefile b/devel/ltsa/Makefile
index f9d67c0e138..019aa1e4852 100644
--- a/devel/ltsa/Makefile
+++ b/devel/ltsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/03/03 17:45:36 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/26 02:13:17 joerg Exp $
 #
 
 DISTNAME=	ltsa2.2
@@ -17,6 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_CONFIGURE=		YES
 USE_JAVA2=		YES
+USE_TOOLS+=		pax
 
 INSTALLATION_DIRS=	bin
 
@@ -30,12 +31,12 @@ do-build:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ltsa.sh ${DESTDIR}${PREFIX}/bin/ltsa
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/ltsa
-	cd ${WRKSRC}/lib && ${PAX} -rwpppm . ${DESTDIR}${PREFIX}/lib/ltsa
+	cd ${WRKSRC}/lib && pax -rwpppm . ${DESTDIR}${PREFIX}/lib/ltsa
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/ltsa
 	${INSTALL_DATA} ${WRKSRC}/fspv2.pdf ${DESTDIR}${PREFIX}/share/doc/ltsa
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DESTDIR}${PREFIX}/share/doc/ltsa
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/ltsa
-	cd ${WRKSRC}/examples && ${PAX} -rwpppm . ${DESTDIR}${PREFIX}/share/examples/ltsa
+	cd ${WRKSRC}/examples && pax -rwpppm . ${DESTDIR}${PREFIX}/share/examples/ltsa
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/mantis/Makefile b/devel/mantis/Makefile
index b0591912e0e..2a41e9ed4aa 100644
--- a/devel/mantis/Makefile
+++ b/devel/mantis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/05/14 21:43:06 adrianp Exp $
+# $NetBSD: Makefile,v 1.31 2008/05/26 02:13:17 joerg Exp $
 
 DISTNAME=	mantis-1.1.1
 CATEGORIES=	devel www
@@ -15,6 +15,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_BUILD=	YES
 
+USE_TOOLS+=	pax
+
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mantis
@@ -63,7 +65,7 @@ do-install:
 .	endfor
 
 	cd ${WRKSRC} && ${FIND} . -name .cvsignore -print | ${XARGS} ${RM}
-	cd ${WRKSRC} && ${PAX} -rwpppm . ${DESTDIR}${MANTIS_HOME}
+	cd ${WRKSRC} && pax -rwpppm . ${DESTDIR}${MANTIS_HOME}
 
 	cd ${DESTDIR}${MANTIS_HOME} && \
 		${FIND} . -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
diff --git a/devel/netbeans-ide/Makefile b/devel/netbeans-ide/Makefile
index 329760e306f..ec334a1ff18 100644
--- a/devel/netbeans-ide/Makefile
+++ b/devel/netbeans-ide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/03/03 17:45:36 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/05/26 02:13:17 joerg Exp $
 #
 
 DISTNAME=	NetBeansIDE-release351
@@ -14,6 +14,7 @@ COMMENT=	NetBeans Java IDE
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
 USE_JAVA=	run
 PKG_JVMS_ACCEPTED=  sun-jdk13 sun-jdk14 jdk14 sun-jdk15 jdk15 sun-jdk6 jdk6
 NO_CONFIGURE=	yes
@@ -32,12 +33,12 @@ pre-install:
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
-	cd ${WRKSRC}/docs && ${PAX} -rwpm . ${DESTDIR}${DOCDIR}
+	cd ${WRKSRC}/docs && pax -rwpm . ${DESTDIR}${DOCDIR}
 	for f in CHANGES.html CREDITS.html README.html netbeans.css; \
 	do \
 		${INSTALL_DATA} ${WRKSRC}/$${f} ${DESTDIR}${DOCDIR}; \
 	done
-	cd ${WRKSRC} && ${PAX} -rwpm beans bin lib modules system \
+	cd ${WRKSRC} && pax -rwpm beans bin lib modules system \
 	    tomcat406 update_tracking ${DESTDIR}${SHAREDIR}
 	${LN} -sf ${SHAREDIR}/bin/runide.sh ${DESTDIR}${PREFIX}/bin/netbeans
 
diff --git a/devel/nsis/Makefile b/devel/nsis/Makefile
index f962fd857ca..e9d3ef7694a 100644
--- a/devel/nsis/Makefile
+++ b/devel/nsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/03/03 17:45:36 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:17 joerg Exp $
 #
 
 DISTNAME=	nsis-${NSIS_VER}
@@ -15,6 +15,8 @@ COMMENT=	Scriptable system to build Windows installers
 
 DEPENDS+=	scons>=0.96.91:../../devel/scons-devel
 
+USE_TOOLS+=	pax
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 NSIS_SRC=	${DISTNAME:=-src}
@@ -49,7 +51,7 @@ do-install:
 		${DESTDIR}${MAKENSIS_BIN:Q}
 	${INSTALL_SCRIPT} ${WRKSRC:Q}/makensis.sh			\
 		${DESTDIR}${PREFIX:Q}/bin/makensis
-	cd ${WRKDIR:Q}/${DISTNAME:Q} && ${PAX} -rw .			\
+	cd ${WRKDIR:Q}/${DISTNAME:Q} && pax -rw .			\
 		${DESTDIR}${PREFIX:Q}/share/nsis
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/nspr-reference/Makefile b/devel/nspr-reference/Makefile
index c6c3d5851bf..63fccb47f59 100644
--- a/devel/nspr-reference/Makefile
+++ b/devel/nspr-reference/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/03/03 17:45:36 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/26 02:13:17 joerg Exp $
 #
 
 DISTNAME=		nspr-reference
@@ -15,12 +15,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
+USE_TOOLS+=	pax
 
 WRKSRC=			${WRKDIR}/nspr/reference/html
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/nspr/html
-	cd ${WRKSRC} && ${PAX}  -s,.*/CVS.*,, -rwvpe . \
+	cd ${WRKSRC} && pax  -s,.*/CVS.*,, -rwvpe . \
 		${DESTDIR}${PREFIX}/share/doc/nspr/html
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 14a8b755360..28eb36896fa 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/04/12 22:43:00 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2008/05/26 02:13:17 joerg Exp $
 
 DISTNAME=		nspr-4.6.7
 PKGREVISION=		1
@@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=			${WRKDIR}/${DISTNAME}/mozilla/nsprpub
 CONFIGURE_DIRS=		build
 
-USE_TOOLS+=		autoconf213 gmake
+USE_TOOLS+=		autoconf213 gmake pax
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 
@@ -73,8 +73,8 @@ pre-configure:
 	cd ${WRKSRC} && autoconf
 
 do-install:
-	(cd ${WRKSRC}/build/dist/include && ${PAX} -Lrwpe . ${DESTDIR}${PREFIX}/include/ )
-	(cd ${WRKSRC}/build/dist/lib && ${PAX} -Lrwpe . ${DESTDIR}${PREFIX}/lib/nspr/ )
+	(cd ${WRKSRC}/build/dist/include && pax -Lrwpe . ${DESTDIR}${PREFIX}/include/ )
+	(cd ${WRKSRC}/build/dist/lib && pax -Lrwpe . ${DESTDIR}${PREFIX}/lib/nspr/ )
 	${INSTALL_SCRIPT} ${WRKSRC}/build/config/nspr-config ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
 	set -e; \
diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 65dce99e572..25f18517c9f 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/03/21 01:12:15 obache Exp $
+# $NetBSD: Makefile,v 1.31 2008/05/26 02:13:17 joerg Exp $
 
 DISTNAME=		nss-3.11.5
 CATEGORIES=		security
@@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_DIRS=		mozilla/security/nss
 
-USE_TOOLS+=		awk gmake perl
+USE_TOOLS+=		awk gmake pax perl
 DIST=			${WRKSRC}/mozilla/dist
 BUILD_TARGET=		nss_build_all
 MAKE_ENV+=		LD_LIBS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss"
@@ -44,9 +44,9 @@ pre-configure:
 		${WRKSRC}/mozilla/security/coreconf/
 
 do-install:
-	(cd ${DIST}/public && ${PAX} -Lrwpe . ${DESTDIR}${PREFIX}/include/nss/ )
+	(cd ${DIST}/public && pax -Lrwpe . ${DESTDIR}${PREFIX}/include/nss/ )
 	(cd ${DIST}/*_OPT.OBJ/lib && \
-		${PAX} -Lrwpe *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ )
+		pax -Lrwpe *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ )
 	set -e; \
 	{ ${ECHO} "Name: NSS"; \
 	  ${ECHO} "Description: Mozilla Network Security Services"; \
diff --git a/devel/p5-perl-headers/Makefile b/devel/p5-perl-headers/Makefile
index cac646f7433..229857b809d 100644
--- a/devel/p5-perl-headers/Makefile
+++ b/devel/p5-perl-headers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/02/19 19:44:42 bouyer Exp $
+# $NetBSD: Makefile,v 1.32 2008/05/26 02:13:17 joerg Exp $
 
 DISTNAME=		p5-perl-headers
 PKGNAME=		${DISTNAME}-${OS_VERSION}
@@ -15,6 +15,8 @@ COMMENT=		Perl header files
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 WRKSRC=			${WRKDIR}
 PERL5_PACKLIST=		.packlist.h2ph
 
@@ -38,7 +40,7 @@ do-build:
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PERL5_INSTALLVENDORARCH}
-	cd ${WRKSRC}/h2ph/ && ${PAX} -rw . ${DESTDIR}${PERL5_INSTALLVENDORARCH}
+	cd ${WRKSRC}/h2ph/ && pax -rw . ${DESTDIR}${PERL5_INSTALLVENDORARCH}
 	${INSTALL_DATA} ${WRKSRC}/packlist ${DESTDIR}${PERL5_INSTALLVENDORARCH}/${PERL5_PACKLIST}
 	${SED} 's,^,${DESTDIR},' < ${DESTDIR}${PERL5_INSTALLVENDORARCH}/${PERL5_PACKLIST} | ${XARGS} ${CHMOD} a-w
 	${SED} 's,^,${DESTDIR},' < ${DESTDIR}${PERL5_INSTALLVENDORARCH}/${PERL5_PACKLIST} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
diff --git a/devel/pcre-ocaml/Makefile b/devel/pcre-ocaml/Makefile
index 455ecd9df80..0cb1d3879b3 100644
--- a/devel/pcre-ocaml/Makefile
+++ b/devel/pcre-ocaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/03/04 11:02:24 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/26 02:13:17 joerg Exp $
 #
 
 DISTNAME=		pcre-ocaml-5.11.2
@@ -14,7 +14,7 @@ DEPENDS+=		ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pax
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
     (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
 PLIST_SRC=		PLIST PLIST.opt
@@ -26,7 +26,7 @@ EGDIR=			${PREFIX}/share/examples/pcre-ocaml
 INSTALLATION_DIRS=	${EGDIR}
 
 post-install:
-	cd ${WRKSRC}/examples && ${PAX} -rw -pm . ${EGDIR}
+	cd ${WRKSRC}/examples && pax -rw -pm . ${EGDIR}
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/devel/ply/Makefile b/devel/ply/Makefile
index 082ecd7e810..ee724622857 100644
--- a/devel/ply/Makefile
+++ b/devel/ply/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/03 00:13:07 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/26 02:13:17 joerg Exp $
 
 DISTNAME=	ply-1.5
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	aw9k-nnk@asahi-net.or.jp
 HOMEPAGE=	http://systems.cs.uchicago.edu/ply/
 COMMENT=	Python Lex-Yacc
 
+USE_TOOLS+=	pax
+
 PYDISTUTILSPKG=	yes
 
 DOCDIR=	${PREFIX}/share/doc/ply
@@ -19,7 +21,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/ply.html ${DOCDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC}/example && ${PAX} -rwppm * ${EGDIR}
+	cd ${WRKSRC}/example && pax -rwppm * ${EGDIR}
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile
index 20494ad933f..aebc778136f 100644
--- a/devel/pvs/Makefile
+++ b/devel/pvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2008/03/03 17:45:36 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2008/05/26 02:13:18 joerg Exp $
 #
 
 DISTNAME=		pvs-${VERSION}
@@ -27,6 +27,8 @@ COMMENT=		The PVS Specification and Verification System
 
 DEPENDS+=		tk>=8.0:../../x11/tk
 
+USE_TOOLS+=	pax
+
 EMUL_PLATFORMS+=	linux-i386 solaris-sparc
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -50,7 +52,7 @@ do-build:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pvs ${DESTDIR}${PREFIX}/bin/pvs
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/pvs
-	cd ${WRKSRC} && ${PAX} -s ,^./[.].*,, -rw . ${DESTDIR}${PREFIX}/pvs
+	cd ${WRKSRC} && pax -s ,^./[.].*,, -rw . ${DESTDIR}${PREFIX}/pvs
 	${CHMOD} 755 ${DESTDIR}${PREFIX}/pvs/pvs
 
 .include "../../mk/tex.buildlink3.mk"
diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile
index 1eae94b8f97..7a1ba05206f 100644
--- a/devel/roundup/Makefile
+++ b/devel/roundup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/04/25 20:39:09 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2008/05/26 02:13:18 joerg Exp $
 
 DISTNAME=	roundup-1.1.2
 CATEGORIES=	devel
@@ -11,6 +11,7 @@ COMMENT=	Issue tracking system with command-line, web and email clients
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
 USE_LANGUAGES=
+USE_TOOLS+=	pax
 
 PYTHON_PATCH_SCRIPTS+=	cgi-bin/roundup.cgi demo.py roundup/admin.py
 PYTHON_PATCH_SCRIPTS+=	roundup/backends/locking.py
@@ -35,7 +36,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${ROUNDUPDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING.txt ${ROUNDUPDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${ROUNDUPDOCDIR}
-	cd ${WRKSRC}/doc && ${PAX} -s '/.*\.1//g' -rw -pp -pm . ${ROUNDUPDOCDIR}
+	cd ${WRKSRC}/doc && pax -s '/.*\.1//g' -rw -pp -pm . ${ROUNDUPDOCDIR}
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
diff --git a/devel/rox-lib/Makefile b/devel/rox-lib/Makefile
index 9b002e304f5..8ce4d4a1218 100644
--- a/devel/rox-lib/Makefile
+++ b/devel/rox-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/03 17:45:37 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:18 joerg Exp $
 #
 
 DISTNAME=	rox-lib-2.0.2
@@ -21,6 +21,8 @@ DIST_SUBDIR=	rox
 
 NO_BUILD=	yes
 
+USE_TOOLS+=	pax
+
 PYTHON_PATCH_SCRIPTS=	AppRun MakeDist
 PYTHON_PATCH_SCRIPTS+=	python/make_docs.py
 PYTHON_PATCH_SCRIPTS+=	tests/python/*.py
@@ -43,7 +45,7 @@ SUBST_FILES.lib=	Help/findrox.py
 SUBST_SED.lib=		-e 's,/usr/local/lib,${PREFIX}/share/rox,g'
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/share/rox/ROX-Lib2
+	cd ${WRKSRC} && pax -rw . ${DESTDIR}${PREFIX}/share/rox/ROX-Lib2
 
 .include "../../lang/python/application.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/devel/rt3/Makefile.install b/devel/rt3/Makefile.install
index 7b086173646..0c6c93a2d2b 100644
--- a/devel/rt3/Makefile.install
+++ b/devel/rt3/Makefile.install
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.install,v 1.8 2008/03/22 18:44:44 tonnerre Exp $
+# $NetBSD: Makefile.install,v 1.9 2008/05/26 02:13:18 joerg Exp $
 
 .include "dirs.mk"
 
@@ -45,6 +45,8 @@ RT_UPGRADE_DIRS=	3.3.0 3.3.11 3.5.1
 
 MESSAGE_SUBST+=		RTVARDIR=${RT_VAR_DIR:Q} RTSHAREDIR=${RT_SHARE_DIR:Q}
 
+USE_TOOLS+=	pax
+
 do-install:
 	@${ECHO} "=> Configuration files"
 	${INSTALL_DATA_DIR} ${RT_EXAMPLE_DIR}
@@ -60,11 +62,11 @@ do-install:
 	${INSTALL_DATA_DIR} ${RT_SHARE_DIR}/etc/upgrade/${_dir_}
 	cd ${WRKSRC}/etc/upgrade/${_dir_} &&						\
 		${FIND} . -type f ! -name '*.orig' 2>/dev/null | 			\
-		${PAX} -rw ${RT_SHARE_DIR}/etc/upgrade/${_dir_}
+		pax -rw ${RT_SHARE_DIR}/etc/upgrade/${_dir_}
 .endfor
 	@${ECHO} "=> Libraries"
 	${INSTALL_DATA_DIR} ${RT_LIB_DIR}
-	cd ${WRKSRC}/lib && ${FIND} . -type f ! -name '*.orig' 2>/dev/null | ${PAX} -rw ${RT_LIB_DIR}
+	cd ${WRKSRC}/lib && ${FIND} . -type f ! -name '*.orig' 2>/dev/null | pax -rw ${RT_LIB_DIR}
 	@${ECHO} "=> Binaries"
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/rt-mailgate ${WRKSRC}/bin/rt-crontool		\
 		${WRKSRC}/bin/mason_handler.fcgi ${WRKSRC}/bin/mason_handler.scgi	\
@@ -76,7 +78,7 @@ do-install:
 		${WRKSRC}/sbin/rt-test-dependencies ${PREFIX}/sbin
 	@${ECHO} "=> HTML documents"
 	${INSTALL_DATA_DIR} ${RT_HTML_DIR}
-	cd ${WRKSRC}/html && ${FIND} . -type f ! -name '*.orig' 2>/dev/null | ${PAX} -rw ${RT_HTML_DIR}
+	cd ${WRKSRC}/html && ${FIND} . -type f ! -name '*.orig' 2>/dev/null | pax -rw ${RT_HTML_DIR}
 	@${ECHO} "=> Documentation"
 	${INSTALL_DATA_DIR} ${RT_DOC_DIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${RT_DOC_DIR}
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index 266ce8f8f6c..d7dd6b0903a 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/02/28 11:58:48 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2008/05/26 02:13:18 joerg Exp $
 #
 
 # pkgsrc/mail/sendmail (as of 8.11.0) specifically wants 1999, not 2000.
@@ -20,11 +20,13 @@ COMMENT=	Safe and Fast IO library
 
 WRKSRC=		${WRKDIR}
 
+USE_TOOLS+=	pax
+
 AUTO_MKDIRS=			yes
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
-	cd ${WRKDIR} && ${PAX} -O -rf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
+	cd ${WRKDIR} && pax -O -rf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 
 post-patch:
 	${MV} ${WRKSRC}/man/man3/sfio.3 ${WRKSRC}/man/man3/sfio.3.in
diff --git a/devel/swig/Makefile b/devel/swig/Makefile
index fd94222cbb9..0c8e6c352a4 100644
--- a/devel/swig/Makefile
+++ b/devel/swig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/07/10 19:51:22 heinz Exp $
+# $NetBSD: Makefile,v 1.24 2008/05/26 02:13:18 joerg Exp $
 
 DISTNAME=	swig-1.3.31
 PKGREVISION=	1
@@ -16,7 +16,7 @@ CONFLICTS=		swig-build-[0-9]*
 CONFIGURE_ARGS+=	--with-swiglibdir=${PREFIX}/share/swig/1.3
 BUILD_TARGET=		swig
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pax
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
@@ -30,7 +30,7 @@ post-install:
 	${INSTALL_DATA} SWIGDocumentation.html SWIGDocumentation.pdf	\
 		*.png ${DESTDIR:Q}${PREFIX:Q}/share/doc/swig
 	cd ${WRKSRC:Q}/Examples &&					\
-	${PAX} -wr							\
+	pax -wr								\
 		-s ',.*CVS.*,,'						\
 		-s ',.*Makefile\.in$$,,'				\
 		-s ',^test-suite.*,,'					\
diff --git a/devel/teem/Makefile b/devel/teem/Makefile
index dd05b5ad79c..01337e79049 100644
--- a/devel/teem/Makefile
+++ b/devel/teem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/03/03 17:45:37 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/05/26 02:13:18 joerg Exp $
 #
 
 DISTNAME=		teem-1.8.0-src
@@ -13,7 +13,7 @@ COMMENT=		Libraries for manipulation of Structured Scientific Data
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pax
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -58,9 +58,9 @@ pre-install:
 		${WRKSRC}/${TEEM_ARCH}/lib/.empty
 
 do-install:
-	cd ${WRKSRC}/include && ${PAX} -rw . ${DESTDIR}${PREFIX}/include/
-	cd ${WRKSRC}/${TEEM_ARCH}/bin && ${PAX} -rw . ${DESTDIR}${PREFIX}/bin/
-	cd ${WRKSRC}/${TEEM_ARCH}/lib && ${PAX} -rw . ${DESTDIR}${PREFIX}/lib/
+	cd ${WRKSRC}/include && pax -rw . ${DESTDIR}${PREFIX}/include/
+	cd ${WRKSRC}/${TEEM_ARCH}/bin && pax -rw . ${DESTDIR}${PREFIX}/bin/
+	cd ${WRKSRC}/${TEEM_ARCH}/lib && pax -rw . ${DESTDIR}${PREFIX}/lib/
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/tet3/Makefile b/devel/tet3/Makefile
index 27e4e2f20b7..52595283ba1 100644
--- a/devel/tet3/Makefile
+++ b/devel/tet3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/09/09 02:41:58 obache Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/26 02:13:18 joerg Exp $
 
 DISTNAME=	tet3.7-unsup.src
 PKGNAME=	tet3-3.7
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=	-t inet
 BUILD_DIRS=		src
 
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	pax perl:run
 REPLACE_PERL=	contrib/suite/src/common.pl contrib/NTperldemo/ts/tc1.pl
 REPLACE_PERL+=	contrib/NTperldemo/ts/tc2.pl contrib/NTperldemo/ts/tc3.pl
 REPLACE_PERL+=	contrib/tetreport/TetJournal.pl contrib/tetreport/TetReports.pl
@@ -28,9 +28,9 @@ MAKE_FILE=	makefile
 post-install:
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/tet3
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/tet3/bin
-	cd ${WRKSRC}/bin && ${PAX} -rwpe . ${PREFIX}/tet3/bin
+	cd ${WRKSRC}/bin && pax -rwpe . ${PREFIX}/tet3/bin
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/tet3/lib
-	cd ${WRKSRC}/lib && ${PAX} -rwpe . ${PREFIX}/tet3/lib
+	cd ${WRKSRC}/lib && pax -rwpe . ${PREFIX}/tet3/lib
 
 PTHREAD_OPTS+=	native	# only native threads make sense
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index 7cf4d753c1f..7008be47e0f 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/10/09 19:19:09 martti Exp $
+# $NetBSD: Makefile,v 1.34 2008/05/26 02:13:18 joerg Exp $
 #
 
 DISTNAME=	tla-1.3.5
@@ -24,7 +24,7 @@ CHECK_PORTABILITY_SKIP+=	\
 REPLACE_BASH+=	src/tla/tests/changeset-tests/chmod_random
 USE_TOOLS+=	bash
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pax
 
 HAS_CONFIGURE=		yes
 OVERRIDE_GNU_CONFIG_SCRIPTS=	yes
@@ -48,7 +48,7 @@ post-install:
 	cd ${WRKDIR}/${DISTNAME}/src/docs-tla &&		\
 		${FIND} . \( -name \*.css -or -name \*.html	\
 			-or -name \*.txt \) -print		\
-		| ${PAX} -rwppm ${DOCDIR}
+		| pax -rwppm ${DOCDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR}
 	${FIND} ${DOCDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${FIND} ${DOCDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index c2ebf50a6e6..a61bf5bd07e 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/03 17:45:38 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/26 02:13:18 joerg Exp $
 
 DISTNAME=		vtcl-1.6.0
 PKGREVISION=		1
@@ -11,6 +11,7 @@ COMMENT=		Visual Tcl/Tk application development environment
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
 HAS_CONFIGURE=		yes
 NO_BUILD=		yes
 
@@ -27,11 +28,11 @@ do-install:
 	${INSTALL_SCRIPT_DIR} ${DESTDIR}${VTCLEGDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/vtcl ${DESTDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/vtcl.tcl ${DESTDIR}${VTCLDIR}
-	cd ${WRKSRC} && ${PAX} -rwpam lib ${DESTDIR}${VTCLDIR}
-	cd ${WRKSRC} && ${PAX} -rwpam images ${DESTDIR}${VTCLDIR}
-	cd ${WRKSRC} && ${PAX} -rwpam doc ${DESTDIR}${VTCLDOCDIR}
-	cd ${WRKSRC} && ${PAX} -rwpam demo ${DESTDIR}${VTCLEGDIR}
-	cd ${WRKSRC} && ${PAX} -rwpam sample ${DESTDIR}${VTCLEGDIR}
+	cd ${WRKSRC} && pax -rwpam lib ${DESTDIR}${VTCLDIR}
+	cd ${WRKSRC} && pax -rwpam images ${DESTDIR}${VTCLDIR}
+	cd ${WRKSRC} && pax -rwpam doc ${DESTDIR}${VTCLDOCDIR}
+	cd ${WRKSRC} && pax -rwpam demo ${DESTDIR}${VTCLEGDIR}
+	cd ${WRKSRC} && pax -rwpam sample ${DESTDIR}${VTCLEGDIR}
 
 .include "options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/wide/Makefile b/devel/wide/Makefile
index 09441bfc803..08c95d3e372 100644
--- a/devel/wide/Makefile
+++ b/devel/wide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/05/25 20:57:27 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/05/26 02:13:18 joerg Exp $
 #
 
 DISTNAME=		wide
@@ -35,9 +35,9 @@ do-configure:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/wide ${DESTDIR}${PREFIX}/bin/wide
-	cd ${WRKSRC} && ${PAX} -rw Study etc help images *.ini *.xml version.txt \
+	cd ${WRKSRC} && pax -rw Study etc help images *.ini *.xml version.txt \
 				${DESTDIR}${PREFIX}/share/wide/
-	cd ${WRKSRC} && ${PAX} -rw lib ${DESTDIR}${PREFIX}/libexec/wide/
+	cd ${WRKSRC} && pax -rw lib ${DESTDIR}${PREFIX}/libexec/wide/
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"