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.

13 files changed, 52 insertions, 39 deletions

diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 249d77a7af4..46ec911d15a 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:12 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:24 joerg Exp $
 #
 
 DISTNAME=		asciidoc-8.2.5
@@ -15,7 +15,7 @@ DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 DEPENDS+=		getopt-[0-9]*:../../misc/getopt
 
 REPLACE_BASH+=		a2x
-USE_TOOLS+=		bash:run
+USE_TOOLS+=		bash:run pax
 PYTHON_PATCH_SCRIPTS=	asciidoc.py filters/code-filter.py filters/music2png.py
 
 NO_BUILD=		yes
@@ -43,7 +43,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/asciidoc.txt ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/asciidoc.html ${DOCDIR}
 
-	cd ${WRKSRC} && ${PAX} -wr -pma *.conf filters/*.py \
+	cd ${WRKSRC} && pax -wr -pma *.conf filters/*.py \
 		filters/*.conf docbook-xsl/*.xsl stylesheets/*.css	\
 		javascripts/*.js images/icons/callouts/* images/icons/*.png \
 		images/icons/README \
diff --git a/textproc/crimson/Makefile b/textproc/crimson/Makefile
index 4a0921d548a..0de8782bde7 100644
--- a/textproc/crimson/Makefile
+++ b/textproc/crimson/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/06 14:09:22 tonio Exp $
+# $NetBSD: Makefile,v 1.22 2008/05/26 02:13:24 joerg Exp $
 #
 # We use the binary distribution of crimson because otherwise we
 # have a bootstrap-loop between apache-ant and crimson, each of which
@@ -17,6 +17,7 @@ COMMENT=	Apache.org implementation of JAXP, SAX, and DOM
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_JAVA=	run
 USE_JAVA2=	yes
+USE_TOOLS+=	pax
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKSRC}/crimson.jar ${PREFIX}/lib/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/crimson
-	cd ${WRKSRC}/docs && ${PAX} -rw -pp * ${PREFIX}/share/doc/java/crimson
+	cd ${WRKSRC}/docs && pax -rw -pp * ${PREFIX}/share/doc/java/crimson
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/crimson
-	cd ${WRKSRC}/examples && ${PAX} -rw -pp * ${PREFIX}/share/examples/java/crimson
+	cd ${WRKSRC}/examples && pax -rw -pp * ${PREFIX}/share/examples/java/crimson
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/db2latex/Makefile b/textproc/db2latex/Makefile
index 66dc4df5de6..c7f054d2763 100644
--- a/textproc/db2latex/Makefile
+++ b/textproc/db2latex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/06/12 19:13:38 minskim Exp $
+# $NetBSD: Makefile,v 1.14 2008/05/26 02:13:24 joerg Exp $
 
 DISTNAME=	db2latex-xsl-0.8pre1
 PKGNAME=	${DISTNAME:S/xsl-//}
@@ -15,6 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 USE_LANGUAGES=	# none
+USE_TOOLS+=	pax
 
 DOCDIR=		${PREFIX}/share/doc/db2latex
 XSLDIR=		${PREFIX}/share/xsl/db2latex
@@ -33,9 +34,9 @@ pre-install:
 do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA_DIR} ${XSLDIR}
-	cd ${WRKSRC}/doc && ${PAX} -rwpm . ${DOCDIR}
-	cd ${WRKSRC} && ${PAX} -rwpm AUTHOR COPYING COPYRIGHT README \
+	cd ${WRKSRC}/doc && pax -rwpm . ${DOCDIR}
+	cd ${WRKSRC} && pax -rwpm AUTHOR COPYING COPYRIGHT README \
 		TODO VERSION ${DOCDIR}
-	cd ${WRKSRC}/xsl && ${PAX} -rwpm . ${XSLDIR}
+	cd ${WRKSRC}/xsl && pax -rwpm . ${XSLDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook-website/Makefile b/textproc/docbook-website/Makefile
index a9fd7f3a8a3..f4c0933dc6c 100644
--- a/textproc/docbook-website/Makefile
+++ b/textproc/docbook-website/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/21 06:00:49 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2008/05/26 02:13:24 joerg Exp $
 #
 
 DISTNAME=	docbook-website-2.6.0
@@ -14,6 +14,7 @@ DEPENDS+=	docbook-simple-[0-9]*:../../textproc/docbook-simple
 DEPENDS+=	docbook-xsl>=1.58:../../textproc/docbook-xsl
 
 USE_LANGUAGES=	# empty
+USE_TOOLS+=	pax
 NO_BUILD=	YES
 NO_CONFIGURE=	YES
 
@@ -29,11 +30,11 @@ do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA_DIR} ${DTDDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC} && ${PAX} -rwpm ChangeLog README VERSION \
+	cd ${WRKSRC} && pax -rwpm ChangeLog README VERSION \
 		RELEASE-NOTES.html RELEASE-NOTES.txt RELEASE-NOTES.xml \
 		TODO ${DOCDIR}
-	cd ${WRKSRC}/example && ${PAX} -rwpm . ${EGDIR}
-	cd ${WRKSRC} && ${PAX} -rwpm VERSION extensions schema xsl \
+	cd ${WRKSRC}/example && pax -rwpm . ${EGDIR}
+	cd ${WRKSRC} && pax -rwpm VERSION extensions schema xsl \
 		${DTDDIR}
 	${INSTALL_DATA} ${WRKSRC}/catalog.xml ${WRKSRC}/catalog ${DTDDIR}
 
diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index b75f0b5bc9f..1760ad02b87 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2007/10/01 23:39:20 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.49 2008/05/26 02:13:24 joerg Exp $
 #
 
 DISTNAME=	docbook-xsl-1.73.2
@@ -18,7 +18,7 @@ DEPENDS+=	docbook-xml>=4.2:../../textproc/docbook-xml
 USE_LANGUAGES=	# empty
 NO_BUILD=	YES
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	pax perl:run
 REPLACE_PERL+=	fo/pdf2index
 
 EGDIR=		${PREFIX}/share/examples/docbook-xsl
@@ -32,13 +32,13 @@ XML_CATALOGS=	${XSLDIR}/catalog.xml
 INSTALLATION_DIRS=	${EGDIR} ${XSLDIR}
 
 do-install:
-	cd ${WRKSRC}/template && ${PAX} -rw -pp -pm . ${DESTDIR}${EGDIR}
+	cd ${WRKSRC}/template && pax -rw -pp -pm . ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/VERSION ${DESTDIR}${XSLDIR}
 	${INSTALL_DATA} ${WRKSRC}/catalog.xml ${DESTDIR}${XSLDIR}/catalog.xml
 	for d in ${XSLMODS}; do \
 	    ${ECHO} "${INSTALL_DATA_DIR} ${DESTDIR}${XSLDIR}/$$d"; \
-	    ${ECHO} "cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/"; \
-	    cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/; \
+	    ${ECHO} "cd ${WRKSRC} && pax -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/"; \
+	    cd ${WRKSRC} && pax -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/; \
 	done
 	for f in `${FIND} ${DESTDIR}${XSLDIR} -name \*.orig -print` ; do \
 		${ECHO} "Remove .orig file $$f" ; \
diff --git a/textproc/jing/Makefile b/textproc/jing/Makefile
index 45a5a13a47f..5069d7915e8 100644
--- a/textproc/jing/Makefile
+++ b/textproc/jing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/06 17:37:21 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/26 02:13:24 joerg Exp $
 #
 
 DISTNAME=		jing-20030619
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.thaiopensource.com/relaxng/trang.html
 COMMENT=		RELAX NG validator in Java
 
+USE_TOOLS+=	pax
+
 USE_JAVA=		run
 USE_JAVA2=		1.4
 
@@ -26,7 +28,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jing
 	${INSTALL_DATA} ${WRKSRC}/readme.html ${PREFIX}/share/doc/jing
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jing/doc
-	cd ${WRKSRC}/doc && ${PAX} -pp -rw * ${PREFIX}/share/doc/jing/doc
+	cd ${WRKSRC}/doc && pax -pp -rw * ${PREFIX}/share/doc/jing/doc
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-xmlscan/Makefile b/textproc/ruby-xmlscan/Makefile
index 1c5c52c260b..b30bc393482 100644
--- a/textproc/ruby-xmlscan/Makefile
+++ b/textproc/ruby-xmlscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/04/01 01:58:38 obache Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/26 02:13:24 joerg Exp $
 #
 
 DISTNAME=	xmlscan-${VER}
@@ -14,6 +14,7 @@ VER=		0.2.3
 
 NO_BUILD=		yes
 USE_RUBY_INSTALL=	yes
+USE_TOOLS+=	pax
 
 REPLACE_RUBY=	samples/getxmlchar.rb samples/xmlbench.rb \
 		samples/xmlconftest.rb
@@ -38,7 +39,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/ja/manual.ja.html ${RUBY_DOCDIR}/xmlscan/ja
 	${INSTALL_DATA} ${WRKSRC}/doc/ja/manual.ja.rd ${RUBY_DOCDIR}/xmlscan/ja
 	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/xmlscan
-	cd ${WRKSRC}/samples && ${PAX} -rw -pp * ${RUBY_EXAMPLESDIR}/xmlscan
+	cd ${WRKSRC}/samples && pax -rw -pp * ${RUBY_EXAMPLESDIR}/xmlscan
 
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index 8daf004dafa..f2dbeb41519 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/10/04 22:01:00 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2008/05/26 02:13:24 joerg Exp $
 #
 
 DISTNAME=	saxon
@@ -18,6 +18,8 @@ USE_JAVA=	run
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+USE_TOOLS+=	pax
+
 post-extract:
 	chmod -R u+w,go-w ${WRKSRC}
 
@@ -25,9 +27,9 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKSRC}/saxon.jar ${PREFIX}/lib/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java
-	cd ${WRKSRC} && ${PAX} -rw -s '/^doc/saxon/' doc ${PREFIX}/share/doc/java
+	cd ${WRKSRC} && pax -rw -s '/^doc/saxon/' doc ${PREFIX}/share/doc/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/saxon
-	cd ${WRKSRC} && ${PAX} -rw -s '/^samples/saxon/' samples ${PREFIX}/share/examples/java
+	cd ${WRKSRC} && pax -rw -s '/^samples/saxon/' samples ${PREFIX}/share/examples/java
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/unroff/Makefile b/textproc/unroff/Makefile
index 44dd99e3309..85c75195a5f 100644
--- a/textproc/unroff/Makefile
+++ b/textproc/unroff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2007/12/02 11:44:26 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2008/05/26 02:13:24 joerg Exp $
 
 DISTNAME=		unroff-1.0
 PKGNAME=		unroff-1.0.2
@@ -15,6 +15,8 @@ COMMENT=		Programmable troff translator with backend for HTML
 
 DIST_SUBDIR=		unroff
 
+USE_TOOLS+=	pax
+
 CFLAGS+=		-DBSD
 BUILD_DIRS=		src
 
@@ -29,7 +31,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${LIBDIR}
 	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} src/unroff ${PREFIX}/bin/unroff
-	cd ${WRKSRC} && ${PAX} -wr scm ${LIBDIR}
+	cd ${WRKSRC} && pax -wr scm ${LIBDIR}
 	${INSTALL_DATA_DIR} ${LIBDIR}/doc
 	cd ${WRKSRC} && ${INSTALL_DATA} doc/manual.ms ${LIBDIR}/doc
 	${INSTALL_DATA_DIR} ${LIBDIR}/misc
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index e25ba3996bd..7cf46f87cb4 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:08 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2008/05/26 02:13:24 joerg Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of Xalan-J,
 # because although Xalan runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -17,6 +17,7 @@ DEPENDS+=	xerces-j>=1.2.0:../../textproc/xerces-j
 
 WRKSRC=		${WRKDIR}
 USE_JAVA=	run
+USE_TOOLS+=	pax
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/xalan.jar ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKSRC}/bsf.jar ${PREFIX}/lib/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xalan
-	cd ${WRKSRC}/docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/xalan
+	cd ${WRKSRC}/docs && pax -rw -pp . ${PREFIX}/share/doc/java/xalan
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xalan
-	cd ${WRKSRC}/samples && ${PAX} -rw -pp . ${PREFIX}/share/examples/java/xalan
+	cd ${WRKSRC}/samples && pax -rw -pp . ${PREFIX}/share/examples/java/xalan
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index 538c07dd907..6dbaf96b030 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/10/04 22:01:00 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2008/05/26 02:13:24 joerg Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of Xerces-J,
 # because although Xerces runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -16,6 +16,7 @@ COMMENT=	The Apache Project's validating XML parser with DOM and SAX support
 
 WRKSRC=		${WRKDIR}/xerces-1_2_0
 USE_JAVA=	run
+USE_TOOLS+=	pax
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
@@ -26,10 +27,10 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKSRC}/xerces.jar ${PREFIX}/lib/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xerces
-	cd ${WRKSRC}/docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/xerces
+	cd ${WRKSRC}/docs && pax -rw -pp . ${PREFIX}/share/doc/java/xerces
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xerces
 	${INSTALL_DATA} ${WRKSRC}/xercesSamples.jar ${PREFIX}/share/examples/java/xerces
-	cd ${WRKSRC}/data && ${PAX} -rw -pp . ${PREFIX}/share/examples/java/xerces
+	cd ${WRKSRC}/data && pax -rw -pp . ${PREFIX}/share/examples/java/xerces
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xhtml/Makefile b/textproc/xhtml/Makefile
index 6c57f0d916f..b5cc4966bcf 100644
--- a/textproc/xhtml/Makefile
+++ b/textproc/xhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/21 06:00:50 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:24 joerg Exp $
 #
 
 DISTNAME=	xhtml1
@@ -15,6 +15,7 @@ COMMENT=	DTDs for the Extensible Hypertext Markup Language
 NO_BUILD=	yes
 NO_MTREE=	yes
 USE_LANGUAGES=	# empty
+USE_TOOLS+=	pax
 WRKSRC=		${WRKDIR}/xhtml1-20020801
 
 SGML_CATALOGS=	${PREFIX}/share/xml/xhtml/1.0/xhtml.soc
@@ -22,7 +23,7 @@ XML_CATALOGS=	${PREFIX}/share/xml/xhtml/1.0/catalog
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xml/xhtml/1.0
-	cd ${WRKSRC}/DTD && ${PAX} -rwpppm . ${PREFIX}/share/xml/xhtml/1.0
+	cd ${WRKSRC}/DTD && pax -rwpppm . ${PREFIX}/share/xml/xhtml/1.0
 	${INSTALL_DATA} ${FILESDIR}/catalog10 \
 	    ${PREFIX}/share/xml/xhtml/1.0/catalog
 
diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile
index 570679c6ae7..45a95cd8db7 100644
--- a/textproc/xp/Makefile
+++ b/textproc/xp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/09/18 12:14:53 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2008/05/26 02:13:24 joerg Exp $
 #
 
 DISTNAME=	xp
@@ -12,7 +12,7 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://www.jclark.com/xml/
 COMMENT=	James Clark's non-validating XML Parser for Java
 
-USE_TOOLS+=	unzip
+USE_TOOLS+=	pax unzip
 EXTRACT_ONLY=	# empty
 USE_JAVA=	run
 NO_CONFIGURE=	yes
@@ -26,7 +26,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKDIR}/xp.jar ${PREFIX}/lib/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xp
-	cd ${WRKDIR}/docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/xp
+	cd ${WRKDIR}/docs && pax -rw -pp . ${PREFIX}/share/doc/java/xp
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"