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.

12 files changed, 49 insertions, 33 deletions

diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile
index 49a460ed726..1549f627d5b 100644
--- a/graphics/GMT/Makefile
+++ b/graphics/GMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/12/02 12:02:47 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2008/05/26 02:13:20 joerg Exp $
 
 DISTNAME=	GMT4.1.4
 PKGNAME=	GMT-4.1.4
@@ -22,6 +22,7 @@ DIST_SUBDIR=	${DISTNAME}
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
+USE_TOOLS+=	pax
 
 CONFIGURE_ARGS+=--includedir=${PREFIX}/include/gmt
 CONFIGURE_ARGS+=--datadir=${PREFIX}/share/gmt
@@ -51,14 +52,14 @@ post-install:
 		${PREFIX}/share/examples/gmt/tutorial;
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gmt
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/share
-	cd ${WRKSRC}/share && ${PAX} -rw . ${PREFIX}/share/gmt
+	cd ${WRKSRC}/share && pax -rw . ${PREFIX}/share/gmt
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gmt
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/examples/
-	cd ${WRKSRC}/examples && ${PAX} -rw . ${PREFIX}/share/examples/gmt
+	cd ${WRKSRC}/examples && pax -rw . ${PREFIX}/share/examples/gmt
 	${RM} ${PREFIX}/share/gmt/.gmtdefaults_SI.orig
 	${RM} ${PREFIX}/share/gmt/.gmtdefaults_US.orig
 	${RM} ${PREFIX}/share/gmt/gmt.conf.orig
-	cd ${WRKDIR}/share && ${PAX} -rw . ${PREFIX}/share/gmt
+	cd ${WRKDIR}/share && pax -rw . ${PREFIX}/share/gmt
 
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index 274978a5624..e5ac3529e83 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/08/13 11:18:32 seb Exp $
+# $NetBSD: Makefile,v 1.32 2008/05/26 02:13:20 joerg Exp $
 
 PKGNAME=	MesaDemos-${MESA_VERSION}
 COMMENT=	OpenGL examples and Demos
@@ -12,7 +12,7 @@ COMMENT=	OpenGL examples and Demos
 PATCHDIR=	${.CURDIR}/patches
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pax
 MAKE_FLAGS+=	LIB_DEP=""
 
 .include "../../graphics/Mesa/buildlink3.mk"
@@ -22,7 +22,7 @@ pre-build:
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
-	cd ${WRKSRC}/progs && ${PAX}		\
+	cd ${WRKSRC}/progs && pax		\
 		-s ',^./.*Makefile.*,,'	\
 		-s ',^./CVS.*,,'		\
 		-s ',^./.*\.o$$,,'		\
diff --git a/graphics/blender-doc/Makefile b/graphics/blender-doc/Makefile
index 4ec4c84fbb4..dfb8eb2bcf6 100644
--- a/graphics/blender-doc/Makefile
+++ b/graphics/blender-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/03/04 15:39:09 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/26 02:13:20 joerg Exp $
 
 DISTNAME=	BlenderManual.html
 PKGNAME=	blender-doc-20030922
@@ -17,10 +17,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=		${WRKDIR}/doc
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
+USE_TOOLS+=	pax
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/blender
-	cd ${WRKDIR}/html && ${PAX} -s,.*/CVS.*,, -s,.*/.xvpics.*,, \
+	cd ${WRKDIR}/html && pax -s,.*/CVS.*,, -s,.*/.xvpics.*,, \
 		-rw . ${DESTDIR}${PREFIX}/share/doc/blender
 	cd ${DESTDIR}${PREFIX}/share/doc/blender && \
 		${LN} -s book1.html index.html
diff --git a/graphics/cal3d-examples/Makefile b/graphics/cal3d-examples/Makefile
index 74ef8358c3f..eece886c023 100644
--- a/graphics/cal3d-examples/Makefile
+++ b/graphics/cal3d-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:33 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/26 02:13:20 joerg Exp $
 #
 
 PKGNAME=		cal3d-examples-${CAL3D_VERSION}
@@ -11,7 +11,7 @@ DISTFILES=		TheCallyDemo-0.9.1b.zip \
 
 COMMENT=	Tools and demos for cal3d library
 
-USE_TOOLS+=		automake
+USE_TOOLS+=		automake pax
 
 CONFIGURE_ARGS+=	--with-cal3d=${PREFIX:Q}
 CONFIGURE_ARGS+=	--with-glut=${PREFIX:Q}
@@ -43,7 +43,7 @@ SUBST_SED.c3=		-e 's|@@DATADIR@@|${DATADIR}|g'
 
 post-install:
 	${INSTALL_DATA_DIR} ${DATADIR}
-	cd ${WRKDATADIR} && ${PAX} -rw -pp -s ',.*\.orig$$,,' [a-z]* ${DATADIR}
+	cd ${WRKDATADIR} && pax -rw -pp -s ',.*\.orig$$,,' [a-z]* ${DATADIR}
 
 .include "../../graphics/cal3d/buildlink3.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 85e92ad58d0..ca68f2a12ae 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2008/02/08 10:34:19 tnn Exp $
+# $NetBSD: Makefile,v 1.157 2008/05/26 02:13:20 joerg Exp $
 
 DISTNAME=	netpbm-10.34
 PKGREVISION=	1
@@ -14,7 +14,7 @@ MAKE_JOBS_SAFE=	no
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_TOOLS+=	bash:run gmake lex perl
+USE_TOOLS+=	bash:run gmake lex pax perl
 USE_FEATURES=	snprintf
 
 INSTALL_TARGET=	install-dev install-run
@@ -95,7 +95,7 @@ post-install:
 		${TEST} -d "${PREFIX}/$${DIR}" ||		\
 			${ECHO} "@dirrm $${DIR}";		\
 	done >>${PLIST_SRC} &&					\
-	${PAX} -rwpppm . ${PREFIX}
+	pax -rwpppm . ${PREFIX}
 	${RM} -fr ${STAGEDIR}
 	${FIND} ${PREFIX}/share/doc/netpbm -type f -print |	\
 		${XARGS} ${CHMOD} ${NONBINMODE}
diff --git a/graphics/p5-GraphViz/Makefile b/graphics/p5-GraphViz/Makefile
index 9e689e4ec1d..4176cc5c2ac 100644
--- a/graphics/p5-GraphViz/Makefile
+++ b/graphics/p5-GraphViz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/10 21:03:18 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2008/05/26 02:13:20 joerg Exp $
 #
 
 DISTNAME=	GraphViz-2.02
@@ -14,6 +14,8 @@ COMMENT=	Perl interface to the Graphviz tools set
 # This is for the 'test' target
 BUILD_DEPENDS+=	p5-Test-Pod-[0-9]*:../../devel/p5-Test-Pod
 
+USE_TOOLS+=	pax
+
 DEPENDS+=	p5-IPC-Run>=0.74:../../devel/p5-IPC-Run
 DEPENDS+=	graphviz-[0-9]*:../../graphics/graphviz
 
@@ -24,7 +26,7 @@ REPLACE_PERL+=	examples/*
 
 post-install:
 	cd ${WRKSRC}/examples &&	\
-	  ${PAX} -pm -rw . ${PREFIX}/share/examples/p5-GraphViz
+	  pax -pm -rw . ${PREFIX}/share/examples/p5-GraphViz
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/php-jpgraph/Makefile b/graphics/php-jpgraph/Makefile
index 5d31a491e72..e8540fe9128 100644
--- a/graphics/php-jpgraph/Makefile
+++ b/graphics/php-jpgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/04/07 17:49:55 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2008/05/26 02:13:20 joerg Exp $
 
 DISTNAME=	jpgraph-1.18
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
@@ -13,6 +13,8 @@ CONFLICTS=	php-jgraph-[0-9]*
 
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=4.3.1:../../graphics/php-gd
 
+USE_TOOLS+=	pax
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_CONFIGURE=	YES
@@ -51,7 +53,7 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/$$f \
 			${DESTDIR}${PREFIX}/share/doc/php-jpgraph; \
 	done
-	cd ${WRKSRC}/docs && ${PAX} -rw . \
+	cd ${WRKSRC}/docs && pax -rw . \
 		${DESTDIR}${PREFIX}/share/doc/php-jpgraph/html
 	${FIND} ${DESTDIR}${PREFIX}/share/doc/php-jpgraph/html -type d |
 	${XARGS} ${CHMOD} ${PKGDIRMODE}
diff --git a/graphics/ploticus-examples/Makefile b/graphics/ploticus-examples/Makefile
index 19e03866799..7e5d83bda9a 100644
--- a/graphics/ploticus-examples/Makefile
+++ b/graphics/ploticus-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/03/04 15:39:10 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:20 joerg Exp $
 #
 
 DISTNAME=	plnode141
@@ -14,6 +14,8 @@ COMMENT=	Examples for the ploticus data plotting suite
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
@@ -22,7 +24,7 @@ EXDIR=		${PREFIX}/share/examples/ploticus
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${EXDIR}
-	cd ${WRKSRC} && ${PAX} -rw -pp doc gallery tabgallery thumbnails thumbpng ${DESTDIR}${EXDIR}
+	cd ${WRKSRC} && pax -rw -pp doc gallery tabgallery thumbnails thumbpng ${DESTDIR}${EXDIR}
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile
index b96c90f8623..531ae95c441 100644
--- a/graphics/radiance/Makefile
+++ b/graphics/radiance/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/04/12 22:43:01 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/05/26 02:13:20 joerg Exp $
 #
 
 DISTNAME=	rad3R6P1
@@ -15,6 +15,8 @@ COMMENT=	Physically-based, image-generating, backward raytracer
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 WRKSRC=		${WRKDIR}/ray
 
 LICENSE=	radiance-license
@@ -72,13 +74,13 @@ do-build:
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIRPREFIX:Q}/radiance
-	cd ${WRKSRC}/radiance && ${PAX} -rw -s '|.*/\.DS_Store||' . ${DESTDIRPREFIX:Q}/radiance/
+	cd ${WRKSRC}/radiance && pax -rw -s '|.*/\.DS_Store||' . ${DESTDIRPREFIX:Q}/radiance/
 	${INSTALL_DATA_DIR} ${DESTDIRPREFIX:Q}/radiance/obj
-	cd ${WRKSRC}/obj && ${PAX} -rw -s '|.*/\.DS_Store||' . ${DESTDIRPREFIX:Q}/radiance/obj/
+	cd ${WRKSRC}/obj && pax -rw -s '|.*/\.DS_Store||' . ${DESTDIRPREFIX:Q}/radiance/obj/
 	${INSTALL_DATA_DIR} ${DESTDIRPREFIX:Q}/radiance/lib
-	cd ${WRKSRC}/lib && ${PAX} -rw -s '|.*/\.DS_Store||' . ${DESTDIRPREFIX:Q}/radiance/lib/
+	cd ${WRKSRC}/lib && pax -rw -s '|.*/\.DS_Store||' . ${DESTDIRPREFIX:Q}/radiance/lib/
 	${INSTALL_DATA_DIR} ${DESTDIRPREFIX:Q}/radiance/man
-	cd ${WRKSRC}/doc/man && ${PAX} -rw -s '|.*/\.DS_Store||' . ${DESTDIRPREFIX:Q}/radiance/man/
+	cd ${WRKSRC}/doc/man && pax -rw -s '|.*/\.DS_Store||' . ${DESTDIRPREFIX:Q}/radiance/man/
 	${INSTALL_DATA_DIR} ${DESTDIRPREFIX:Q}/share/doc/radiance
 	${INSTALL_DATA} ${WRKSRC}/doc/pdf/*.pdf \
 		${DESTDIRPREFIX:Q}/share/doc/radiance/
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 96ba4b9e0e3..210e2711014 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:36 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/05/26 02:13:20 joerg Exp $
 #
 
 DISTNAME=	skencil-0.6.17
@@ -10,6 +10,8 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://sketch.sourceforge.net/
 COMMENT=	Interactive drawing program
 
+USE_TOOLS+=	pax
+
 PYTHON_PATCH_SCRIPTS= sk2ppm.py sk2ps.py skconvert.py skencil.py skshow.py
 SK_CONF_ARGS=	--imaging-include=${BUILDLINK_PREFIX.pyimaging}/${PYINC}/PIL
 SK_TKFLAGS=	-L${BUILDLINK_PREFIX.tk}/lib -R${BUILDLINK_PREFIX.tk}/lib -ltk -ltcl
@@ -33,11 +35,11 @@ SKETCHEXDIR=	${PREFIX}/share/examples/skencil
 
 post-install:
 	${INSTALL_DATA_DIR} ${SKETCHDOCDIR}
-	cd ${WRKSRC} && ${PAX} -rwpm -v ${SKETCHDOCS} ${SKETCHDOCDIR}
+	cd ${WRKSRC} && pax -rwpm -v ${SKETCHDOCS} ${SKETCHDOCDIR}
 	${RM} ${SKETCHDOCDIR}/Doc/fonts.alias
 	${RM} ${SKETCHDOCDIR}/Doc/fonts.scale
 	${INSTALL_DATA_DIR} ${SKETCHEXDIR}
-	cd ${WRKSRC}/Examples && ${PAX} -rwpm -v . ${SKETCHEXDIR}
+	cd ${WRKSRC}/Examples && pax -rwpm -v . ${SKETCHEXDIR}
 
 .include "../../lang/python/application.mk"
 .include "../../graphics/py-imaging/buildlink3.mk"
diff --git a/graphics/vnc2swf/Makefile b/graphics/vnc2swf/Makefile
index 62d432e709c..7b92bde1904 100644
--- a/graphics/vnc2swf/Makefile
+++ b/graphics/vnc2swf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/02/15 13:33:20 obache Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:20 joerg Exp $
 #
 
 DISTNAME=		vnc2swf-0.5.0
@@ -22,6 +22,8 @@ DEPENDS+=		xwininfo-[0-9]*:../../x11/xwininfo
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 
+USE_TOOLS+=	pax
+
 INSTALLATION_DIRS=	bin lib/X11/app-defaults share/doc/html/vnc2swf
 
 SUBST_CLASSES+=		x11base
@@ -41,7 +43,7 @@ SUBST_SED.toolpath=	-e "s|VNC2SWF=vnc2swf|VNC2SWF=${PREFIX}/bin/vnc2swf|" \
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Vnc2Swf.ad ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Vnc2Swf
 	cd ${WRKSRC}/docs && \
-	${PAX} -rw -pp -pm . ${DESTDIR}${PREFIX}/share/doc/html/vnc2swf
+	pax -rw -pp -pm . ${DESTDIR}${PREFIX}/share/doc/html/vnc2swf
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
diff --git a/graphics/vtk-data/Makefile b/graphics/vtk-data/Makefile
index 02d23559678..0d604326c4d 100644
--- a/graphics/vtk-data/Makefile
+++ b/graphics/vtk-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/04 15:39:11 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/26 02:13:20 joerg Exp $
 #
 
 DISTNAME=	VTKData-4.2
@@ -11,11 +11,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=		${WRKDIR}/VTKData-release-4-2
 NO_BUILD=	yes
 
+USE_TOOLS+=	pax
+
 EXAMPLES_DIR=	share/vtk
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${EXAMPLES_DIR}
-	cd ${WRKSRC} && ${PAX} -rw -pe -s '|.*/CVS/.*||' . \
+	cd ${WRKSRC} && pax -rw -pe -s '|.*/CVS/.*||' . \
 		${DESTDIR}${PREFIX}/${EXAMPLES_DIR}
 
 .include "../../graphics/vtk/Makefile.common"