Explicitly add pax dependency in those Makefiles that use it (or have

patches to add it). Drop pax from the default USE_TOOLS list.
Make bsdtar the default for those places that wanted gtar to extract
long links etc, as bsdtar can be built of the tree.

6 files changed, 16 insertions, 8 deletions

diff --git a/mail/anomy-sanitizer/Makefile b/mail/anomy-sanitizer/Makefile
index 68a8fdd739b..3e67a8471bd 100644
--- a/mail/anomy-sanitizer/Makefile
+++ b/mail/anomy-sanitizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/03/04 17:57:17 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2008/05/25 21:42:21 joerg Exp $
 #
 
 DISTNAME=	anomy-sanitizer-1.76
@@ -19,7 +19,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../mk/bsd.prefs.mk"
 
 WRKSRC=		${WRKDIR}/anomy
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	perl:run pax
 
 REPLACE_PERL+=			bin/*.pl
 CHECK_INTERPRETER_SKIP+=	*.pm
diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index 14f44febe66..4b2c4b1e362 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/05/25 21:42:21 joerg Exp $
 
 DISTNAME=	exim-html-4.69
 CATEGORIES=	mail net
@@ -16,6 +16,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 NO_BUILD=		yes
 INSTALLATION_DIRS=	share/doc/exim/html
 
+USE_TOOLS+=	pax
+
 do-install:
 	cd ${WRKSRC}/doc/html && pax -wr * \
 		${DESTDIR}${PREFIX}/share/doc/exim/html
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 24ff9d1abf9..3de09ecb563 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2007/10/19 09:11:45 jnemeth Exp $
+# $NetBSD: Makefile,v 1.103 2008/05/25 21:42:21 joerg Exp $
 
 PKGNAME=	sendmail-${DIST_VERS}
 COMMENT=	The well known Mail Transport Agent
@@ -10,6 +10,8 @@ PKG_DESTDIR_SUPPORT=	destdir
 .include "options.mk"
 .include "../../mail/sendmail/Makefile.common"
 
+USE_TOOLS+=	pax
+
 MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
diff --git a/mail/sendmail813/Makefile b/mail/sendmail813/Makefile
index 7cc7d8ed79f..3763fd55fc4 100644
--- a/mail/sendmail813/Makefile
+++ b/mail/sendmail813/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/10/19 09:20:03 jnemeth Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/25 21:42:21 joerg Exp $
 
 PKG_DESTDIR_SUPPORT=	destdir
 
@@ -8,6 +8,8 @@ PKGNAME=	sendmail-${DIST_VERS}
 PKGREVISION=	4
 COMMENT=	The well known Mail Transport Agent
 
+USE_TOOLS+=	pax
+
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
 
 MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
diff --git a/mail/squirrelmail-locales/Makefile b/mail/squirrelmail-locales/Makefile
index 3b8622b8d1f..d4b4999a6d2 100644
--- a/mail/squirrelmail-locales/Makefile
+++ b/mail/squirrelmail-locales/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/03/04 17:57:20 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2008/05/25 21:42:22 joerg Exp $
 
 DISTNAME=	all_locales-${VER}-20071220
 PKGNAME=	squirrelmail-locales-${VER}
@@ -16,7 +16,7 @@ VER=		1.4.13
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_CONFIGURE=		yes
-USE_TOOLS+=		tar
+USE_TOOLS+=		pax
 INSTALLATION_DIRS=	share/squirrelmail
 
 WRKSRC=		${WRKDIR}
diff --git a/mail/squirrelmail/plugin.mk b/mail/squirrelmail/plugin.mk
index a0b7cdabf7b..79e6466429d 100644
--- a/mail/squirrelmail/plugin.mk
+++ b/mail/squirrelmail/plugin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugin.mk,v 1.5 2008/03/04 17:57:20 jlam Exp $
+# $NetBSD: plugin.mk,v 1.6 2008/05/25 21:42:21 joerg Exp $
 
 DISTNAME?=		${PLUGIN_NAME}-${PLUGIN_VERSION}
 PKGNAME=		sm-${PLUGIN_NAME}-${PLUGIN_VERSION}
@@ -17,6 +17,8 @@ INSTALLATION_DIRS+=	${PLUGIN_DIR}
 
 PLIST_SUBST+=		PLUGIN_DIR=${PLUGIN_DIR:Q}
 
+USE_TOOLS+=		pax
+
 do-install:
 	cd ${WRKSRC:Q} && \
 		find . -type f ! -name '*.orig' 2>/dev/null | \