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.

7 files changed, 26 insertions, 16 deletions

diff --git a/security/CSP/Makefile b/security/CSP/Makefile
index 1578175723c..a6f2599fbfc 100644
--- a/security/CSP/Makefile
+++ b/security/CSP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/01/18 05:09:36 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/26 02:13:23 joerg Exp $
 #
 
 DISTNAME=	CSP-0.32
@@ -15,6 +15,8 @@ DEPENDS+=	p5-Date-Calc>=5.4:../../devel/p5-Date-Calc
 DEPENDS+=	p5-IPC-Run>=0.79:../../devel/p5-IPC-Run
 DEPENDS+=	p5-Term-Prompt>=1.03:../../devel/p5-Term-Prompt
 
+USE_TOOLS+=	pax
+
 CSPGUIDE=	cspguide.pdf
 SITES.${CSPGUIDE}=	http://devel.it.su.se/content/1/c4/32/90/
 EXTRACT_ONLY=	${DISTFILES:N*.pdf}
@@ -35,7 +37,7 @@ SUBST_SED.csp=		-e s,@@CSPHOME@@,${CSPHOME},	\
 SUBST_STAGE.csp=	post-patch
 
 post-install:
-	cd ${WRKSRC}/ca && ${FIND} . -type f | ${PAX} -rw ${CSPHOME}
+	cd ${WRKSRC}/ca && ${FIND} . -type f | pax -rw ${CSPHOME}
 	${INSTALL_DATA} ${DISTDIR}/${CSPGUIDE} ${PREFIX}/share/doc/csp
 
 .include "../../lang/perl5/module.mk"
diff --git a/security/ap-modsecurity/Makefile b/security/ap-modsecurity/Makefile
index da7d390beaf..2b01caac7ca 100644
--- a/security/ap-modsecurity/Makefile
+++ b/security/ap-modsecurity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/05/18 10:23:16 adrianp Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/26 02:13:23 joerg Exp $
 #
 
 DISTNAME=	modsecurity-apache_1.9.4
@@ -10,6 +10,8 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://www.modsecurity.org/
 COMMENT=	Intrusion detection and prevention engine for web applications
 
+USE_TOOLS+=	pax
+
 .include "../../mk/apache.mk"
 
 PKG_APACHE_ACCEPTED=	apache13 apache2
@@ -44,6 +46,6 @@ post-install:
 
 	${INSTALL_DATA} ${WRKSRC}/httpd.conf.example-minimal \
 		${PREFIX}/share/examples/ap-security
-	cd ${WRKSRC}/doc && ${PAX} -rw . ${PREFIX}/share/doc/ap-security
+	cd ${WRKSRC}/doc && pax -rw . ${PREFIX}/share/doc/ap-security
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ap-modsecurity2/Makefile b/security/ap-modsecurity2/Makefile
index 7ac7cc5e787..c5ecad65163 100644
--- a/security/ap-modsecurity2/Makefile
+++ b/security/ap-modsecurity2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/01/04 10:05:51 adrianp Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/26 02:13:23 joerg Exp $
 
 DISTNAME=	modsecurity-apache_2.1.4
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/apache_//}
@@ -12,6 +12,8 @@ COMMENT=	Intrusion detection and prevention engine for web applications
 .include "../../mk/apache.mk"
 .include "options.mk"
 
+USE_TOOLS+=	pax
+
 PKG_APACHE_ACCEPTED=	apache2
 BUILD_DIRS=		apache2
 EGDIR=			${PREFIX}/share/examples/ap-security
@@ -46,7 +48,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ap-security
 
 	${INSTALL_DATA} ${WRKSRC}/modsecurity.conf-minimal ${EGDIR}
-	cd ${WRKSRC}/doc && ${PAX} -rw . ${PREFIX}/share/doc/ap-security
+	cd ${WRKSRC}/doc && pax -rw . ${PREFIX}/share/doc/ap-security
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/base/Makefile b/security/base/Makefile
index 2e5a8543498..62984a9d0be 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/11/25 18:09:53 adrianp Exp $
+# $NetBSD: Makefile,v 1.18 2008/05/26 02:13:23 joerg Exp $
 #
 
 DISTNAME=	base-1.3.9
@@ -34,7 +34,7 @@ MESSAGE_SUBST+= EGDIR=${EGDIR:Q} BASE_DIR=${BASE_DIR:Q}
 PAX_DIRS=	admin help images includes languages scripts setup sql styles
 WWW_USER?=	${APACHE_USER}
 WWW_GROUP?=	${APACHE_GROUP}
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	pax perl:run
 REPLACE_PERL+=	scripts/base_maintenance.pl
 
 # SKIP_PORTABILITY_CHECK=	YES
@@ -77,7 +77,7 @@ do-install:
 .	endfor
 
 .	for i in ${PAX_DIRS}
-		cd ${WRKSRC}/${i:Q} && ${PAX} -rw . ${BASE_DIR}/${i:Q}
+		cd ${WRKSRC}/${i:Q} && pax -rw . ${BASE_DIR}/${i:Q}
 .	endfor
 
 	${CHOWN} ${WWW_USER} ${BASE_DIR}
diff --git a/security/rc5des/Makefile b/security/rc5des/Makefile
index f2b93ef0948..d6d56387df8 100644
--- a/security/rc5des/Makefile
+++ b/security/rc5des/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/08/23 19:36:00 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/05/26 02:13:23 joerg Exp $
 #
 
 DISTNAME=		rc5-mlg-004
@@ -14,6 +14,8 @@ COMMENT=		Binaries for taking part in the rc5des challenge
 EMUL_PLATFORMS=		netbsd-alpha netbsd-arm netbsd-i386
 EMUL_MODULES.netbsd=	base
 
+USE_TOOLS+=	pax
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${EMUL_PLATFORM} == "netbsd-i386"
@@ -42,6 +44,6 @@ do-build:
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/RC5
-	cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}/RC5
+	cd ${WRKSRC} && pax -rw . ${PREFIX}/RC5
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index eec3f0533ae..1c38de65926 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/04/22 09:22:14 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/26 02:13:23 joerg Exp $
 #
 
 DISTNAME=	SnortSnarf-050314.1
@@ -14,7 +14,7 @@ DEPENDS+=	p5-Time>=101.062101:../../time/p5-Time
 
 NO_BUILD=	YES
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	pax perl:run
 REPLACE_PERL=	snortsnarf.pl include/ann_xml.pl include/web_utils.pl	\
 		include/xml_help.pl
 
@@ -29,7 +29,7 @@ INSTALLATION_DIRS=	bin
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/snortsnarf.pl ${PREFIX}/bin/snortsnarf.pl
 	${INSTALL_DATA_DIR} ${PREFIX}/share/snortsnarf
-	cd ${WRKSRC}/include && ${PAX} -rw -pm * ${PREFIX}/share/snortsnarf
+	cd ${WRKSRC}/include && pax -rw -pm * ${PREFIX}/share/snortsnarf
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snortsnarf
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/snortsnarf
 	${INSTALL_DATA} ${WRKSRC}/Usage ${PREFIX}/share/doc/snortsnarf
diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index 17baefb38f1..aa7cf7b6a56 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/02/28 11:58:49 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2008/05/26 02:13:23 joerg Exp $
 #
 
 DISTNAME=	tripwire-1.2
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cerias.purdue.edu/about/history/coast/coast-library.html
 COMMENT=	File and directory integrity checker
 
+USE_TOOLS+=	pax
+
 ONLY_FOR_PLATFORM=	NetBSD-*-* FreeBSD-*-* SunOS-*-*
 
 PKG_SYSCONFSUBDIR=	tripwire
@@ -20,7 +22,7 @@ CONF_FILES=		${EGDIR}/tripwire.conf ${PKG_SYSCONFDIR}/tripwire.conf
 AUTO_MKDIRS=			yes
 
 post-extract:
-	cd ${WRKDIR} && ${PAX} -O -rf T1.2.tar
+	cd ${WRKDIR} && pax -O -rf T1.2.tar
 	${CP} ${FILESDIR}/conf-${LOWER_OPSYS}.h ${WRKSRC}/configs
 
 pre-configure: