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, 13 insertions, 14 deletions

diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile
index bac4bcc0fe9..7844d91a56c 100644
--- a/www/apache-tomcat55/Makefile
+++ b/www/apache-tomcat55/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/03/12 20:41:48 adrianp Exp $
+# $NetBSD: Makefile,v 1.14 2008/05/25 21:42:22 joerg Exp $
 
 DISTNAME=	apache-tomcat-${TOMCAT_VERSION}
 CATEGORIES=	www java
@@ -25,7 +25,7 @@ EGDIR2=		${EGDIR}/${CATALINA_DIR}
 
 # Work around a bug in NetBSD 2.0's pax-as-tar (bin/27228)
 .if !empty(MACHINE_PLATFORM:MNetBSD-2.0*)
-EXTRACT_USING=	gtar
+EXTRACT_USING=	bsdtar
 .endif
 
 PKG_SYSCONFDIR.apache-tomcat=	${TOMCAT_LIB}/conf
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 1884c233765..e03a78c7a10 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/04/07 07:21:00 adam Exp $
+# $NetBSD: Makefile,v 1.36 2008/05/25 21:42:22 joerg Exp $
 
 DISTNAME=	awstats-6.7
 CATEGORIES=	www
@@ -10,7 +10,7 @@ COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 
 NO_BUILD=		yes
 
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		perl:run pax
 REPLACE_PERL+=		tools/*.pl
 REPLACE_PERL+=		wwwroot/cgi-bin/*.pl
 REPLACE_PERL+=		wwwroot/cgi-bin/plugins/*.pm
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index 4d317c2ecb7..3af12e97123 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/10/04 22:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/25 21:42:22 joerg Exp $
 
 PKGNAME=	jakarta-tomcat5-${TOMCAT_VERSION}
 DISTNAME=	jakarta-tomcat-${TOMCAT_VERSION}
@@ -27,7 +27,7 @@ EGDIR2=		${EGDIR}/${CATALINA_DIR}
 
 # Work around a bug in NetBSD 2.0's pax-as-tar (bin/27228)
 .if !empty(MACHINE_PLATFORM:MNetBSD-2.0*)
-EXTRACT_USING=	gtar
+EXTRACT_USING=	bsdtar
 .endif
 
 PKG_SYSCONFDIR.jakarta-tomcat5= ${TOMCAT_LIB}/conf
diff --git a/www/jalbum/Makefile b/www/jalbum/Makefile
index af0ecf1141b..400167b1ed6 100644
--- a/www/jalbum/Makefile
+++ b/www/jalbum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/10/30 19:31:43 martti Exp $
+# $NetBSD: Makefile,v 1.20 2008/05/25 21:42:22 joerg Exp $
 
 DISTNAME=		JAlbum${VERSION}
 PKGNAME=		jalbum-${VERSION}
@@ -22,6 +22,8 @@ WRKSRC=			${WRKDIR}/JAlbum
 
 INSTALLATION_DIRS+=	${PREFIX:Q}/share/jalbum
 
+USE_TOOLS+=		pax
+
 do-build:
 	sed	-e s#@PKG_JAVA_HOME@#${PKG_JAVA_HOME:Q}#g	\
 		-e s#@PREFIX@#${PREFIX:Q}#g			\
diff --git a/www/ruby-tag/Makefile b/www/ruby-tag/Makefile
index 1eeb7650d0f..a3e28a42429 100644
--- a/www/ruby-tag/Makefile
+++ b/www/ruby-tag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:11:28 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/25 21:42:22 joerg Exp $
 
 DISTNAME=	tag104
 PKGNAME=	${RUBY_PKGPREFIX}-tag-1.0.4
@@ -11,10 +11,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.moonwolf.com/ruby/tag.html
 COMMENT=	Ruby Simple HTML Tag library for CGI
 
-# The distfile cannot be extracted with some tar (e.g. NetBSD 2.0)
-# or some pax (e.g. NetBSD 1.6).  Force use of gtar instead.
-#
-EXTRACT_USING=	gtar
+EXTRACT_USING=	bsdtar
 
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
diff --git a/www/screws/Makefile b/www/screws/Makefile
index f4fd6915903..0d198f4425d 100644
--- a/www/screws/Makefile
+++ b/www/screws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/01/18 05:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2008/05/25 21:42:22 joerg Exp $
 #
 
 DISTNAME=	screws-0.56
@@ -10,7 +10,7 @@ MAINTAINER=	pancake@phreaker.net
 HOMEPAGE=	http://www.nopcode.org/?t=screws
 COMMENT=	SCRipt Enhanced Web Server
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	perl:run pax
 
 PKG_GROUPS_VARS+=	SCREWS_GROUP
 PKG_USERS_VARS+=	SCREWS_USER