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.

5 files changed, 19 insertions, 14 deletions

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 63a544d2a9a..6d25f98f781 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2007/07/04 20:54:42 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2008/05/26 02:13:21 joerg Exp $
 
 DISTNAME=	dspam-3.8.0
 CATEGORIES=	mail
@@ -11,7 +11,7 @@ COMMENT=	Extremely scalable, statistical-hybrid anti-spam filter
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
-USE_TOOLS+=		perl:run pkg-config
+USE_TOOLS+=		pax perl:run pkg-config
 REPLACE_PERL=		src/tools/dspam_train.in
 REPLACE_PERL+=		src/tools/dspam_logrotate
 REPLACE_PERL+=		webui/cgi-bin/*.cgi webui/cgi-bin/configure.pl.in
@@ -130,7 +130,7 @@ post-install:
 
 .for d in txt webui/cgi-bin webui/htdocs
 	${INSTALL_DATA_DIR} ${DATADIR}/${d}
-	cd ${WRKSRC}/${d} && ${PAX} -rwppm '-s|.*/Makefile.*$$||'	\
+	cd ${WRKSRC}/${d} && pax -rwppm '-s|.*/Makefile.*$$||'	\
 		'-s|./admins.*$$||' '-s|./default.prefs.*$$||'		\
 		'-s|./configure.pl.*$$||' . ${DATADIR}/${d}
 .endfor
@@ -139,14 +139,14 @@ post-install:
 .  if !empty(DSPAM_STORAGE_DRIVER:M${drv})
 	${INSTALL_DATA_DIR} ${DATADIR}/${drv}
 	cd ${WRKSRC}/src/tools.${drv}_drv && \
-		${PAX} -rwppm ./*.sql ${DATADIR}/${drv}
+		pax -rwppm ./*.sql ${DATADIR}/${drv}
 .  endif
 .endfor
 
 .if !empty(DSPAM_STORAGE_DRIVER:Msqlite*)
 	${INSTALL_DATA_DIR} ${DATADIR}/sqlite
 	 cd ${WRKSRC}/src/tools.sqlite_drv && \
-	 	${PAX} -rwppm '-s|.*/Makefile.*$$||' . ${DATADIR}/sqlite
+	 	pax -rwppm '-s|.*/Makefile.*$$||' . ${DATADIR}/sqlite
 .endif
 
 	${CHMOD} ${SHAREMODE} ${DATADIR}/webui/cgi-bin/*.txt
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 6eb55df5620..63b4786fbaf 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2008/05/26 02:13:22 joerg Exp $
 
 DISTNAME=	imp-h3-${IMPVER}
 PKGNAME=	imp-${IMPVER}
@@ -16,6 +16,8 @@ DEPENDS+=	horde>=3.0.2:../../www/horde
 DEPENDS+=	${PHP_PKG_PREFIX}-imap>4.3.3:../../mail/php-imap
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail-[0-9]*:../../mail/pear-Mail
 
+USE_TOOLS+=	pax
+
 PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.prefs.mk"
@@ -91,7 +93,7 @@ do-install:
 .	endfor
 
 .	for d in ${PAXDIRS}
-		cd ${WRKSRC}/${d} && ${PAX} -rwpam . ${DESTDIR}${IMPDIR}/${d}
+		cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${IMPDIR}/${d}
 .	endfor
 
 	${INSTALL_DATA} ${WRKSRC}/config/*.dist ${DESTDIR}${IMPDIR}/config
diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile
index 2a144703bdc..91a70a0142a 100644
--- a/mail/ingo/Makefile
+++ b/mail/ingo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/05/26 02:13:22 joerg Exp $
 
 DISTNAME=	ingo-h3-${INGOVER}
 PKGNAME=	ingo-${INGOVER}
@@ -16,6 +16,8 @@ PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.prefs.mk"
 
+USE_TOOLS+=	pax
+
 DOCDIR=		${PREFIX}/share/doc/ingo
 EGDIR=		${PREFIX}/share/examples/ingo
 HORDEDIR=	${PREFIX}/share/horde
@@ -75,7 +77,7 @@ do-install:
 .	endfor
 
 .	for d in ${PAXDIRS}
-		cd ${WRKSRC}/${d:Q} && ${PAX} -rwpma . ${DESTDIR}${INGODIR}/${d:Q}
+		cd ${WRKSRC}/${d:Q} && pax -rwpma . ${DESTDIR}${INGODIR}/${d:Q}
 .	endfor
 
 	${INSTALL_DATA} ${WRKSRC}/config/*.dist ${DESTDIR}${INGODIR}/config
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 389b5ab7d03..41268324952 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/05/04 16:34:03 adrianp Exp $
+# $NetBSD: Makefile,v 1.10 2008/05/26 02:13:22 joerg Exp $
 #
 
 DISTNAME=	roundcubemail-${VERSION}-dep
@@ -10,6 +10,7 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://roundcube.net/
 COMMENT=	Browser-based multilingual IMAP client
 
+USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 NO_BUILD=	yes
 VERSION=	0.1.1
@@ -95,7 +96,7 @@ do-install:
 	${CHOWN} ${WWW_USER}:${WWW_GROUP} ${RCDIR}/config/*.dist
 
 .	for i in ${PAX_DIRS}
-		cd ${WRKSRC}/${i} && ${PAX} -rw . ${RCDIR}/${i}
+		cd ${WRKSRC}/${i} && pax -rw . ${RCDIR}/${i}
 		${FIND} ${RCDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 		${FIND} ${RCDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${RCDIR}/${i}
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index aea1ee59fb1..c47fd31f7fb 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/04/07 18:17:34 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2008/05/26 02:13:22 joerg Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
@@ -22,7 +22,7 @@ HORDEDIR=	${PREFIX}/share/horde
 TURBADIR=	${HORDEDIR}/turba
 TURBAVER=	2.1.7
 PAXDIRS=	lib locale po scripts templates themes
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	pax perl:run
 
 MESSAGE_SUBST+=	TURBADIR=${TURBADIR:Q}
 MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
@@ -87,7 +87,7 @@ do-install:
 .	endfor
 
 .	for d in ${PAXDIRS}
-		cd ${WRKSRC}/${d:Q} && ${PAX} -rwpma . \
+		cd ${WRKSRC}/${d:Q} && pax -rwpma . \
 			${DESTDIR}${TURBADIR}/${d:Q}
 .	endfor