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.

25 files changed, 96 insertions, 60 deletions

diff --git a/lang/Cg-compiler/Makefile b/lang/Cg-compiler/Makefile
index 1379c6e430e..06641c63922 100644
--- a/lang/Cg-compiler/Makefile
+++ b/lang/Cg-compiler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/04/07 16:23:01 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=	CgLinux-1.3.0408-0400
@@ -17,6 +17,8 @@ EMUL_REQD=		suse>=7.3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 WRKSRC=			${WRKDIR}
 BUILD_DIRS=		# empty
 RUN_LDCONFIG=		yes
@@ -34,7 +36,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/usr/lib/* ${DESTDIR}${EMULDIR}/lib
 	${INSTALL_MAN} ${WRKSRC}/usr/share/man/man3/* \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
-	cd ${WRKSRC}/usr/local && ${PAX} -rwppm . \
+	cd ${WRKSRC}/usr/local && pax -rwppm . \
 		${DESTDIR}${PREFIX}/share/NVIDIA-Cg-linux
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 67bf154837c..38df5d1307f 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2007/06/12 22:00:39 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2008/05/26 02:13:21 joerg Exp $
 
 DISTNAME=		gcc-2.95.3
 PKGNAME=		gcc-ssp-2.95.3.13
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM:Q}
 CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX:Q}
 CONFIGURE_ARGS+=	--enable-shared
 
-USE_TOOLS+=		chmod
+USE_TOOLS+=		chmod pax
 MAKE_ENV+=		ac_cv_prog_chmod=${TOOLS_CHMOD:Q}
 MAKE_ENV+=		SHELL=${CONFIG_SHELL}
 
@@ -91,7 +91,7 @@ post-extract:
 	${RM} ${WRKSRC}/libf2c/libF77/etime_.c
 
 post-patch:
-	cd ${WRKDIR} && ${PAX} -O -zrf ${_DISTDIR}/${SSP_PATCH}
+	cd ${WRKDIR} && pax -O -zrf ${_DISTDIR}/${SSP_PATCH}
 	${CP} ${WRKDIR}/protector.c ${WRKDIR}/protector.h ${WRKSRC}/gcc/
 	${PATCH} -p0 -d ${WRKSRC} --forward --quiet -E < ${WRKDIR}/protector.dif
 	${PATCH} -p0 -d ${WRKSRC} --forward --quiet -E < ${WRKDIR}/protectonly.dif
diff --git a/lang/jasmin/Makefile b/lang/jasmin/Makefile
index c8a13cdff08..119af763dc9 100644
--- a/lang/jasmin/Makefile
+++ b/lang/jasmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/03/04 16:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=	jasmin-1.06
@@ -13,6 +13,7 @@ COMMENT=	Java "assembler" interface
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_JAVA=	run
+USE_TOOLS+=	pax
 
 WRKSRC=		${WRKDIR}/jasmin
 NO_BUILD=	yes
@@ -29,7 +30,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/jasmin
-	cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/jasmin
+	cd ${WRKSRC} && pax -rw . ${DESTDIR}${PREFIX}/jasmin
 	${LN} -s ../jasmin/bin/jasmin ${DESTDIR}${PREFIX}/bin/jasmin
 
 .include "../../mk/java-vm.mk"
diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index 2eea0c84116..498d51df967 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2008/03/04 16:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2008/05/26 02:13:21 joerg Exp $
 #
 
 VERSION=	1.1.8
@@ -18,6 +18,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
+USE_TOOLS+=	pax
+
 JAVA_HOME=	${PREFIX}/java/jdk-${VERSION}
 JAVA_NAME=	jdk11
 JAVA_WRAPPERS=	appletviewer jar java javac javadoc javah javakey \
@@ -91,7 +93,7 @@ do-build: # empty, but cannot use NO_BUILD with java-env.mk
 do-install:
 	${RM} -f ${WRKSRC}/*.orig
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${JAVA_HOME}
-	cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${JAVA_HOME}
+	cd ${WRKSRC} && pax -rw . ${DESTDIR}${JAVA_HOME}
 	${RM} -f ${JAVA_HOME}/bin/i386/green_threads/javac.orig
 
 .include "../../mk/java-env.mk"
diff --git a/lang/jini/Makefile b/lang/jini/Makefile
index 7aa4f7aba42..62b2d5c3119 100644
--- a/lang/jini/Makefile
+++ b/lang/jini/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/03/04 16:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=		jini-${SUN_VERSION}-src
@@ -25,6 +25,8 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+USE_TOOLS+=	pax
+
 PKG_DESTDIR_SUPPORT=	destdir
 
 WRKSRC=			${WRKDIR}/jini${SUN_VERSION}
@@ -51,7 +53,7 @@ FETCH_MESSAGE+=	${DOWNLOAD:Q}
 do-install:
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/jini
 	${CHOWN} -hR ${BINOWN}:${BINGRP} ${WRKSRC}
-	cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/jini
+	cd ${WRKSRC} && pax -rw . ${DESTDIR}${PREFIX}/jini
 
 cleandir: clean
 	${RM} -fr ${JINI_HOME}
diff --git a/lang/joos/Makefile b/lang/joos/Makefile
index e8384e6afe2..b294329f163 100644
--- a/lang/joos/Makefile
+++ b/lang/joos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/03/04 16:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=	joos-0.2
@@ -13,10 +13,11 @@ COMMENT=	Java Object Oriented Subset
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_JAVA=	run
+USE_TOOLS+=	pax
 
 do-install:
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/joos
-	cd ${WRKSRC} && ${PAX} -s ,^./.*orig,, -rw . ${DESTDIR}${PREFIX}/joos
+	cd ${WRKSRC} && pax -s ,^./.*orig,, -rw . ${DESTDIR}${PREFIX}/joos
 	cd ${DESTDIR}${PREFIX}/joos/Bin && ${LN} -s joos.a- joos
 
 .include "../../mk/java-vm.mk"
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index b836dca32fa..c6a1528b638 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2008/03/04 16:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2008/05/26 02:13:21 joerg Exp $
 
 DISTNAME=		mercury-compiler-0.11.0
 PKGNAME=		mercury-0.11.0
@@ -14,7 +14,7 @@ COMMENT=		Modern logic/functional programming language
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pax
 USE_GNU_READLINE=	yes	# rl_prep_term_function
 INFO_FILES=		# PLIST
 
@@ -48,11 +48,11 @@ do-build:
 	cd ${WRKSRC} && ${BUILD_MAKE_CMD} install
 
 do-install:
-	cd ${WRKSRC}/tmp && ${PAX} -rw . ${DESTDIR}${PREFIX}
+	cd ${WRKSRC}/tmp && pax -rw . ${DESTDIR}${PREFIX}
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/mercury
 	${FIND} ${WRKSRC} -type d -name "CVS" -print | ${XARGS} ${RM} -fr
 	${FIND} ${WRKSRC} -type f -name ".cvsignore" -print | ${XARGS} ${RM} -f
 	cd ${WRKSRC}/samples && \
-	${PAX} -rw . ${DESTDIR}${PREFIX}/share/examples/mercury
+	pax -rw . ${DESTDIR}${PREFIX}/share/examples/mercury
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/mit-scheme-bin/Makefile b/lang/mit-scheme-bin/Makefile
index 9fa260069c5..c8a36c8b739 100644
--- a/lang/mit-scheme-bin/Makefile
+++ b/lang/mit-scheme-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/03/04 16:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=		mit-scheme-7.7.1-ix86-gnu-linux
@@ -18,6 +18,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=			${WRKDIR}
 INSTALLATION_DIRS=	bin libexec
 
+USE_TOOLS+=	pax
+
 do-build:
 	${SED} "s!@PREFIX@!${PREFIX}!g" ${FILESDIR}/scheme > ${WRKSRC}/scheme
 	${SED} "s!@PREFIX@!${PREFIX}!g" ${FILESDIR}/bchscheme \
@@ -29,7 +31,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/bchscheme ${DESTDIR}${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/scheme ${DESTDIR}${PREFIX}/libexec
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/mit-scheme
-	cd ${WRKSRC}/lib && ${PAX} -rw mit-scheme ${DESTDIR}${PREFIX}/lib
+	cd ${WRKSRC}/lib && pax -rw mit-scheme ${DESTDIR}${PREFIX}/lib
 	${RMDIR} ${DESTDIR}${PREFIX}/lib/mit-scheme/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/py-funge/Makefile b/lang/py-funge/Makefile
index 32d1b9047fa..423e08d6ea0 100644
--- a/lang/py-funge/Makefile
+++ b/lang/py-funge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:39 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:21 joerg Exp $
 
 DISTNAME=	pyfunge-0.2-beta1
 PKGNAME=	${PYPKGPREFIX}-funge-0.2beta1
@@ -10,6 +10,8 @@ MAINTAINER=	fox9@netb.co.kr
 HOMEPAGE=	http://pyfunge.kldp.net/
 COMMENT=	Extensible Funge-98 interpreter written in Python
 
+USE_TOOLS+=	pax
+
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
 
@@ -24,7 +26,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/README.ko ${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA_DIR} ${PREFIX}/${PYSITELIB}/PyFunge
-	cd ${WRKSRC} && ${PAX} -rwppm '-s|.*/README.ko||' \
+	cd ${WRKSRC} && pax -rwppm '-s|.*/README.ko||' \
 		. ${PREFIX}/${PYSITELIB}/PyFunge
 	${PYTHONBIN} ${PYCOMPILEALL} ${PREFIX}/${PYSITELIB}/PyFunge
 	${PYTHONBIN} -O ${PYCOMPILEALL} ${PREFIX}/${PYSITELIB}/PyFunge
diff --git a/lang/py-html-docs/Makefile b/lang/py-html-docs/Makefile
index 93a34016270..d0e33ec4d73 100644
--- a/lang/py-html-docs/Makefile
+++ b/lang/py-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/03/04 16:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=	html-2.0
@@ -13,6 +13,8 @@ COMMENT=	HTML Documentation for Python
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	python
 
@@ -25,7 +27,7 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${HTMLDIR}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
+	cd ${WRKSRC} && pax -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
 	cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
 	cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
 	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
diff --git a/lang/py21-html-docs/Makefile b/lang/py21-html-docs/Makefile
index be33b0faf50..9bbbf7f8b0c 100644
--- a/lang/py21-html-docs/Makefile
+++ b/lang/py21-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/03/04 16:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=	html-2.1.3
@@ -13,6 +13,8 @@ COMMENT=	HTML Documentation for Python
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	python
 
@@ -25,7 +27,7 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${HTMLDIR}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
+	cd ${WRKSRC} && pax -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
 	cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
 	cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
 	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
diff --git a/lang/py22-html-docs/Makefile b/lang/py22-html-docs/Makefile
index 5538ae912d7..c9b6005fa11 100644
--- a/lang/py22-html-docs/Makefile
+++ b/lang/py22-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/04 16:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=	html-2.2.2
@@ -13,6 +13,8 @@ COMMENT=	HTML Documentation for Python
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	python
 
@@ -25,7 +27,7 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${HTMLDIR}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
+	cd ${WRKSRC} && pax -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
 	cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
 	cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
 	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
diff --git a/lang/py23-html-docs/Makefile b/lang/py23-html-docs/Makefile
index f158af24098..81a43645980 100644
--- a/lang/py23-html-docs/Makefile
+++ b/lang/py23-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/04 16:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=	html-2.3.3
@@ -13,6 +13,8 @@ COMMENT=	HTML Documentation for Python
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 WRKSRC=		${WRKDIR}/Python-Docs-2.3.3/
 DIST_SUBDIR=	python
 
@@ -25,7 +27,7 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${HTMLDIR}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
+	cd ${WRKSRC} && pax -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
 	cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
 	cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
 	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
diff --git a/lang/py24-html-docs/Makefile b/lang/py24-html-docs/Makefile
index 06bbd6165c4..eb79afcc631 100644
--- a/lang/py24-html-docs/Makefile
+++ b/lang/py24-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/11/14 21:58:46 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=	html-2.4.3
@@ -16,6 +16,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=		${WRKDIR}/Python-Docs-2.4.3/
 DIST_SUBDIR=	python
 
+USE_TOOLS+=	pax
+
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
@@ -26,7 +28,7 @@ INSTALLATION_DIRS=	${HTMLDIR}
 
 do-install:
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
+	cd ${WRKSRC} && pax -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
 	cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
 	cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
 	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index 9642e3a9770..150c394338f 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2008/04/07 17:58:55 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2008/05/26 02:13:21 joerg Exp $
 
 DISTNAME=		sather-1.2.1
 PKGREVISION=		7
@@ -11,7 +11,7 @@ COMMENT=		Compiler for the Sather object oriented programming language
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		gmake makeinfo
+USE_TOOLS+=		gmake makeinfo pax
 
 BUILD_TARGET=		full optional
 INFO_FILES=		# PLIST
@@ -71,7 +71,7 @@ do-install:
 		${DESTDIR}${PREFIX}/lib/sather/Bin
 	 ${LN} -sf ../lib/sather/Bin/bin-wrapper ${DESTDIR}${PREFIX}/bin/sacomp
 	 ${LN} -sf ../lib/sather/Bin/bin-wrapper ${DESTDIR}${PREFIX}/bin/sabrowse
-	cd ${WRKSRC} && ${PAX} -s ',.*\.sav,,' -rw Library		\
+	cd ${WRKSRC} && pax -s ',.*\.sav,,' -rw Library		\
 		System/FORBID						\
 		System/Debug						\
 		System/Common/*.c System/Common/*.h			\
@@ -87,7 +87,7 @@ do-install:
 		${TEST} ! -f "$$f" ||					\
 		${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\
 	done
-	cd ${WRKSRC}/Doc && ${PAX} -rw -s ',.*/man.*,,' .		\
+	cd ${WRKSRC}/Doc && pax -rw -s ',.*/man.*,,' .		\
 		${DESTDIR}${PREFIX}/share/doc/sather
 	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sacomp.1			\
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index cb60b60d8f0..7698d04fff5 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/03/04 16:38:13 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=	boot.${BOX}-unix
@@ -40,7 +40,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	smlnj-${SML_VERSION}
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pax
 
 # previous versions of the package had an additional '-'
 CONFLICTS=	sml-nj-[0-9]*
@@ -103,7 +103,7 @@ post-build:
 # 3. install links to executables in $PREFIX/bin
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${SML_BASE}
-	cd ${WRKDIR} && ${PAX} -rw -pam bin lib ${DESTDIR}${SML_BASE}
+	cd ${WRKDIR} && pax -rw -pam bin lib ${DESTDIR}${SML_BASE}
 	cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf ../lib/smlnj/bin/* .
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/spl/Makefile b/lang/spl/Makefile
index 11dcccf3cab..5e0065ba03b 100644
--- a/lang/spl/Makefile
+++ b/lang/spl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/03/17 08:45:03 obache Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=	spl-1.0pre3
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.clifford.at/spl/
 COMMENT=	The SPL Programming Language
 
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	bash gmake gawk
+USE_TOOLS+=	bash gmake gawk pax
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-patch
@@ -34,7 +34,7 @@ post-install:
 	${CHMOD} a+rwx ${PREFIX}/libexec/cgi-bin/webspl_cache
 	${LN} -s ${PREFIX}/lib/spl_modules ${PREFIX}/libexec/cgi-bin/spl_modules
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	cd ${WRKSRC} && ${PAX} -rw -p am README* manual.tex spldoc webspl_demo webspltut qtdemo ${DOCDIR}
+	cd ${WRKSRC} && pax -rw -p am README* manual.tex spldoc webspl_demo webspltut qtdemo ${DOCDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}/examples && ${INSTALL_DATA} example* ${EGDIR}
 
diff --git a/lang/sr-examples/Makefile b/lang/sr-examples/Makefile
index 1c34b919abb..c9b757bb9f5 100644
--- a/lang/sr-examples/Makefile
+++ b/lang/sr-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/04 16:38:13 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=		vs233
@@ -14,6 +14,8 @@ COMMENT=		The SR language compiler and run time system
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 WRKSRC=			${WRKDIR}
 NO_EXTRACT=		yes
 NO_CONFIGURE=		yes
@@ -26,7 +28,7 @@ DOMOD=
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/examples/sr
 	cd ${DESTDIR}${PREFIX:Q}/share/examples/sr &&			\
-	${PAX} -zr ${DOMOD} -f ${DISTDIR:Q}/${DISTFILES:Q}		\
+	pax -zr ${DOMOD} -f ${DISTDIR:Q}/${DISTFILES:Q}		\
 		-s ,vsuite/examples,.,					\
 		vsuite/examples
 
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index 8574f928f86..6ad4ab23213 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2008/04/12 22:43:03 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2008/05/26 02:13:21 joerg Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -10,6 +10,8 @@ COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.4.2
 
 SHORT=		JRE
 
+USE_TOOLS+=	pax
+
 WRKSRC=		${WRKDIR}/j2re1.4.2_17
 JAVA_WRAPPERS=	java keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
@@ -95,7 +97,7 @@ do-configure:
 
 pre-install:
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
-	cd ${WRKDIR}/jce ; ${PAX} -rw -pe -v . ${WRKSRC}/lib/security
+	cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common
index fff2b1438fc..92e78327e5a 100644
--- a/lang/sun-jre14/Makefile.common
+++ b/lang/sun-jre14/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2008/01/21 01:39:02 tnn Exp $
+# $NetBSD: Makefile.common,v 1.40 2008/05/26 02:13:21 joerg Exp $
 
 CATEGORIES=	lang java
 EXTRACT_SUFX=	.bin
@@ -60,6 +60,6 @@ post-fetch:
 
 do-install:
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${JAVA_HOME}
-	cd ${WRKSRC} && ${PAX} -rwp ma . ${DESTDIR}${JAVA_HOME}
+	cd ${WRKSRC} && pax -rwp ma . ${DESTDIR}${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index 6ac63037699..dd9e6fb738b 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2008/04/12 22:43:03 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2008/05/26 02:13:21 joerg Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -8,6 +8,8 @@ MASTER_SITES=	# empty
 
 SHORT_NAME=	JRE
 
+USE_TOOLS+=	pax
+
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:C/-linux-.*//}
 JAVA_WRAPPERS=	java javaws keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
@@ -86,7 +88,7 @@ do-configure:
 
 pre-install:
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
-	cd ${WRKDIR}/jce ; ${PAX} -rw -pe -v . ${WRKSRC}/lib/security
+	cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security
 .endif
 
 #
diff --git a/lang/sun-jre15/Makefile.common b/lang/sun-jre15/Makefile.common
index 57b0d54579e..32189cb0b68 100644
--- a/lang/sun-jre15/Makefile.common
+++ b/lang/sun-jre15/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2008/01/21 01:50:22 tnn Exp $
+# $NetBSD: Makefile.common,v 1.24 2008/05/26 02:13:21 joerg Exp $
 
 CATEGORIES=	lang java
 COMMENT=	Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -59,6 +59,8 @@ FETCH_MESSAGE+=	""
 FETCH_MESSAGE+=	" Click 'Download ${DOWNLOAD_NAME}', read and accept the"
 FETCH_MESSAGE+=	" license, then choose 'Linux self-extracting file'."
 
+USE_TOOLS+=	pax
+
 post-fetch:
 	@if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then	\
 		${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};	\
@@ -66,6 +68,6 @@ post-fetch:
 
 do-install:
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${JAVA_HOME}
-	cd ${WRKSRC} && ${PAX} -rwp ma . ${DESTDIR}${JAVA_HOME}
+	cd ${WRKSRC} && pax -rwp ma . ${DESTDIR}${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index da886590a06..f1e6a5f84b0 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/04/12 22:43:03 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/05/26 02:13:21 joerg Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
@@ -10,6 +10,8 @@ MASTER_SITES=	# empty
 DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u5
 SHORT_NAME=	JRE
 
+USE_TOOLS+=	pax
+
 WRKSRC=		${WRKDIR}/jre1.6.0_05
 JAVA_WRAPPERS=	java javaws keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
@@ -85,7 +87,7 @@ do-configure:
 
 pre-install:
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
-	cd ${WRKDIR}/jce ; ${PAX} -rw -pe -v . ${WRKSRC}/lib/security
+	cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security
 .endif
 
 #
diff --git a/lang/sun-jre6/Makefile.common b/lang/sun-jre6/Makefile.common
index 735e8f0c232..47fad949263 100644
--- a/lang/sun-jre6/Makefile.common
+++ b/lang/sun-jre6/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2008/03/04 16:38:13 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2008/05/26 02:13:21 joerg Exp $
 
 CATEGORIES=	lang java
 COMMENT=	Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -19,6 +19,8 @@ EMUL_PLATFORMS=		linux-i386
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 .include "../../mk/bsd.prefs.mk"
 
 EMUL_MODULES.linux=	compat locale x11
@@ -70,6 +72,6 @@ post-fetch:
 
 do-install:
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${JAVA_HOME}
-	cd ${WRKSRC} && ${PAX} -rwp ma . ${DESTDIR}${JAVA_HOME}
+	cd ${WRKSRC} && pax -rwp ma . ${DESTDIR}${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
diff --git a/lang/twelf/Makefile b/lang/twelf/Makefile
index 56d838633b2..fb005da1f2b 100644
--- a/lang/twelf/Makefile
+++ b/lang/twelf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/09/05 01:06:07 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/05/26 02:13:21 joerg Exp $
 #
 
 DISTNAME=	twelf-1-4
@@ -19,6 +19,8 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+USE_TOOLS+=	pax
+
 WRKSRC=		${WRKDIR}/twelf
 MAKE_FILE=	smlnj/Makefile
 MAKEFLAGS+=	sml=${PREFIX:Q}/bin/sml
@@ -53,10 +55,10 @@ post-build:
 	find ${WRKSRC} -name "*.orig" | xargs rm
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -rw -pam bin ${TWELF_LIBDIR}
+	cd ${WRKSRC} && pax -rw -pam bin ${TWELF_LIBDIR}
 	${LN} -sf ${TWELF_LIBDIR}/bin/* ${PREFIX}/bin
 
-	cd ${WRKSRC}/emacs && ${PAX} -rw -pam * ${TWELF_EMACSDIR}
+	cd ${WRKSRC}/emacs && pax -rw -pam * ${TWELF_EMACSDIR}
 	${LN} -sf ${TWELF_EMACSDIR} ${TWELF_LIBDIR}/emacs
 
 	cd ${WRKSRC}/doc; for t in dvi pdf ps; do			\
@@ -69,9 +71,9 @@ do-install:
 		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
 	done
 
-	cd ${WRKSRC}/doc/html && ${PAX} -rw -pam * ${TWELF_HTMLDOCDIR}
+	cd ${WRKSRC}/doc/html && pax -rw -pam * ${TWELF_HTMLDOCDIR}
 
-	cd ${WRKSRC}/examples && ${PAX} -rw -pam * ${TWELF_EXAMPLEDIR}
+	cd ${WRKSRC}/examples && pax -rw -pam * ${TWELF_EXAMPLEDIR}
 	${LN} -sf ${TWELF_EXAMPLEDIR} ${TWELF_LIBDIR}/examples
 
 .include "../../mk/emacs.mk"