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.

10 files changed, 35 insertions, 27 deletions

diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index def3e6d3ec9..059e5bb5009 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2008/05/11 00:00:57 tonnerre Exp $
+# $NetBSD: Makefile,v 1.41 2008/05/26 02:13:22 joerg Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME}pl1
@@ -11,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.isc.org/sw/bind/
 COMMENT=	The Berkeley Internet Name Daemon, an implementation of DNS
 
-USE_TOOLS+=	lex yacc
+USE_TOOLS+=	lex pax yacc
 
 WRKSRC=		${WRKDIR}
 BIND_VERSION=	8.4.7
@@ -44,7 +44,7 @@ post-extract:
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/bind8
-	cd ${WRKSRC}/doc/html && ${PAX} -rw * ${PREFIX}/share/doc/html/bind8
+	cd ${WRKSRC}/doc/html && pax -rw * ${PREFIX}/share/doc/html/bind8
 	${CHMOD} ${DOCMODE} ${PREFIX}/share/doc/html/bind8/*.html
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 78c574572c3..ad4b1aef7da 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2008/05/11 00:00:59 tonnerre Exp $
+# $NetBSD: Makefile,v 1.98 2008/05/26 02:13:22 joerg Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P1/pl1/}
@@ -18,6 +18,7 @@ BUILD_DEFS+=	IPV6_READY
 
 BUILD_DEFS+=	BIND_DIR VARBASE
 
+USE_TOOLS+=	pax
 USE_LIBTOOL=	yes
 
 GNU_CONFIGURE=	yes
@@ -60,7 +61,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/misc
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/rfc
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bind9
-	set -e; cd ${WRKSRC}/doc && ${PAX} -rwppm			\
+	set -e; cd ${WRKSRC}/doc && pax -rwppm			\
 	  -s ',.*xsl.*,,' -s ',Makefile.*,,' -s ',.*\.pl,,'		\
 	  . ${PREFIX}/share/doc/bind9
 	${CHMOD} -R g-w ${PREFIX}/share/doc/bind9
diff --git a/net/gated/Makefile b/net/gated/Makefile
index 0ddceaedefa..6775210270a 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/11/11 23:57:39 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2008/05/26 02:13:22 joerg Exp $
 
 DISTNAME=	gated-3-5-11
 PKGNAME=	gated-3.5.11
@@ -13,6 +13,8 @@ COMMENT=	Routing protocol daemon
 
 NOT_FOR_PLATFORM=	Interix-*-* # no userland routing table support
 
+USE_TOOLS+=	pax
+
 LICENSE=		gated-license
 RESTRICTED=		Required license from Merit
 NO_SRC_ON_FTP=		${RESTRICTED}
@@ -42,7 +44,7 @@ do-configure:
 
 post-install:
 	${CHMOD} -w ${PREFIX}/bin/gdc ${PREFIX}/bin/ospf_monitor
-	cd ${WRKSRC}/doc && ${PAX} -rw . ${PREFIX}/share/doc/gated
+	cd ${WRKSRC}/doc && pax -rw . ${PREFIX}/share/doc/gated
 	${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/doc/gated
 	${CHGRP} -R ${SHAREGRP} ${PREFIX}/share/doc/gated
 	${FIND} ${PREFIX}/share/doc/gated -type f -print | \
diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index 5010ba01d4c..a8d0427774c 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/11/12 23:10:08 seb Exp $
+# $NetBSD: Makefile,v 1.21 2008/05/26 02:13:22 joerg Exp $
 #
 
 DISTNAME=		netdisco-0.95_with_mibs
@@ -28,7 +28,7 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
 EGDIR=			${PREFIX}/share/examples/${PKGNAME_NOREV}
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	pax perl:run
 REPLACE_PERL+=	bin/doc_munge
 REPLACE_PERL+=	bin/pod_arg_link_fix
 REPLACE_PERL+=	bin/test_cdp.pl
@@ -133,7 +133,7 @@ do-build:
 
 do-install:
 	${RM} -f ${WRKSRC:Q}/bin/netdisco_daemon
-	cd ${WRKSRC:Q} && ${PAX} -rw -pp . ${PREFIX:Q}/netdisco
+	cd ${WRKSRC:Q} && pax -rw -pp . ${PREFIX:Q}/netdisco
 	${CHOWN} -R ${NETDISCOUSER}:${NETDISCOGROUP} ${PREFIX:Q}/netdisco
 	${CHMOD} 775 ${PREFIX:Q}/netdisco/html
 	set -e; \
diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index c52c084bb22..6ab40272684 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2008/04/12 22:43:08 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2008/05/26 02:13:22 joerg Exp $
 #
 
 DISTNAME=	ntp-4.2.0
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 CONFLICTS+=	openntpd-[0-9]*
 
 GNU_CONFIGURE=	YES
-USE_TOOLS+=	perl
+USE_TOOLS+=	pax perl
 
 CONFIGURE_ENV+=	PATH_PERL=${PERL5:Q} ac_cv_header_sys_soundcard_h=no
 
@@ -29,8 +29,8 @@ ALL_NTP_DOCS=	${DOCDIR} ${EXAMPLESDIR}
 RCD_SCRIPTS=	ntpd ntpdate
 
 post-install:
-	cd ${WRKSRC}/html && ${PAX} -rw . ${DOCDIR}
-	cd ${WRKSRC}/conf && ${PAX} -rw . ${EXAMPLESDIR}
+	cd ${WRKSRC}/html && pax -rw . ${DOCDIR}
+	cd ${WRKSRC}/conf && pax -rw . ${EXAMPLESDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${ALL_NTP_DOCS}
 	${FIND} ${ALL_NTP_DOCS} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${FIND} ${ALL_NTP_DOCS} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 3ad4934f60b..9ac6b44242e 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2008/01/18 05:08:47 tnn Exp $
+# $NetBSD: Makefile,v 1.34 2008/05/26 02:13:22 joerg Exp $
 
 DISTNAME=	openslp-1.2.1
 PKGREVISION=	2
@@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 # Needs pkgviews-enabled automake
 # PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_TOOLS+=		automake bison lex
+USE_TOOLS+=		automake bison lex pax
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -45,7 +45,7 @@ pre-configure:
 		${LOCALBASE}/bin/libtoolize && automake --add-missing
 
 post-install:
-	@cd ${WRKSRC}/doc && ${PAX} -rw . ${DESTDIR}${PREFIX}/share/doc/openslp
+	@cd ${WRKSRC}/doc && pax -rw . ${DESTDIR}${PREFIX}/share/doc/openslp
 	@${FIND} ${DESTDIR}${PREFIX}/share/doc/openslp | ${XARGS} ${CHOWN} \
 		${SHAREOWN}:${SHAREGRP}
 	@${FIND} ${DESTDIR}${PREFIX}/share/doc/openslp -type f | ${XARGS} ${CHMOD} \
diff --git a/net/py-twisted-docs/Makefile b/net/py-twisted-docs/Makefile
index f5346923205..6ae65e83ad4 100644
--- a/net/py-twisted-docs/Makefile
+++ b/net/py-twisted-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:30:23 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:23 joerg Exp $
 #
 
 DISTNAME=		${TWISTED_DISTNAME}
@@ -12,7 +12,8 @@ COMMENT=		Framework for writing networked applications
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-USE_LANGUAGES=
+USE_LANGUAGES=	# empty
+USE_TOOLS+=	pax
 
 HTMLDIR=	share/doc/py-twisted-docs-${TWISTED_VERSION}
 DOC_SRCDIR=	${WRKSRC}/doc
@@ -21,7 +22,7 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	cd ${DOC_SRCDIR} && ${PAX} -rw -pe * ${PREFIX}/${HTMLDIR}
+	cd ${DOC_SRCDIR} && pax -rw -pe * ${PREFIX}/${HTMLDIR}
 	cd ${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
 	cd ${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
 	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
diff --git a/net/skype/Makefile b/net/skype/Makefile
index 840e2051448..6a2b40ccf81 100644
--- a/net/skype/Makefile
+++ b/net/skype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/09/07 23:06:13 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2008/05/26 02:13:23 joerg Exp $
 #
 
 DISTNAME=		skype_static-1.4.0.99
@@ -27,6 +27,8 @@ EMUL_MODULES.linux=	alsa base compat fontconfig freetype2 glx \
 USE_DIRS+=		xdg-1.1
 WRKSRC=			${WRKDIR}/${DISTNAME}
 
+USE_TOOLS+=	pax
+
 DATADIR=		${PREFIX}/share/skype
 DOCDIR=			${PREFIX}/share/doc/skype
 
@@ -41,7 +43,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA_DIR} ${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/skype ${DATADIR}
-	cd ${WRKSRC} && ${PAX} -rwppm icons sounds ${DATADIR}
+	cd ${WRKSRC} && pax -rwppm icons sounds ${DATADIR}
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index df2c25914f9..17f4a1367cd 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/04/06 21:47:00 adrianp Exp $
+# $NetBSD: Makefile,v 1.25 2008/05/26 02:13:23 joerg Exp $
 
 DISTNAME=	smokeping-2.3.5
 CATEGORIES=	net
@@ -13,7 +13,7 @@ DEPENDS+=	fping>=2.4b2:../../net/fping
 DEPENDS+=	p5-Digest-MD5>=2.20:../../security/p5-Digest-MD5
 DEPENDS+=	p5-libwww>=5.64:../../www/p5-libwww
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	pax perl:run
 NO_BUILD=	YES
 
 PKG_SYSCONFSUBDIR?=	smokeping
@@ -123,7 +123,7 @@ do-install:
 			$$FILE ${PREFIX}/lib/smokeping/Smokeping/sorters; \
 	done
 
-	cd ${WRKSRC}/htdocs/cropper && ${PAX} -rw -pm . ${SPDIR}/cropper
+	cd ${WRKSRC}/htdocs/cropper && pax -rw -pm . ${SPDIR}/cropper
 
 	for FILE in ${WRKSRC}/etc/config.dist \
 		${WRKSRC}/etc/basepage.html.dist \
diff --git a/net/teamspeak-server/Makefile b/net/teamspeak-server/Makefile
index 0dad2e7042c..0c473e033dc 100644
--- a/net/teamspeak-server/Makefile
+++ b/net/teamspeak-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/08/03 16:51:10 abs Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:23 joerg Exp $
 
 ftp://ftp.freenet.de/pub/4players/teamspeak.org/developer/server/202319/ts2_server_rc2_202319.tar.bz2
 
@@ -57,6 +57,8 @@ INSTALLATION_DIRS=	${LIB_DIR} share/examples/rc.d ${SHARE_DIR}/httpdocs \
 			${SHARE_DIR}/tcpquerydocs ${SHARE_DIR}/mysql_sql \
 			${SHARE_DIR}/sqlite_sql ${DOC_DIR}/Manual
 
+USE_TOOLS+=	pax
+
 do-build:
 	${MV} ${WRKSRC}/Manual/_TeamSpeak\ RC2\ Server\ manual-1.png \
 	      ${WRKSRC}/Manual/_TeamSpeak_RC2_Server_manual-1.png
@@ -66,7 +68,7 @@ do-install:
 	${INSTALL_LIB} ${WRKSRC}/*.so* ${LIB_DIR}
 	${INSTALL_SCRIPT} -m 644 ${FILESDIR}/teamspeak.sh ${PREFIX}/share/examples/rc.d/teamspeak
 	for d in httpdocs tcpquerydocs mysql_sql sqlite_sql ; do \
-	cd ${WRKSRC}/$$d && ${PAX} -rw . ${SHARE_DIR}/$$d;\
+	cd ${WRKSRC}/$$d && pax -rw . ${SHARE_DIR}/$$d;\
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SHARE_DIR}/$$d;\
 	${FIND} ${SHARE_DIR}/$$d -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE};\
 	done