Update package Makefile now that bsd.pkg.extract.mk is using the

"extract" script for extraction.  Many cases where a custom EXTRACT_CMD
simply copied the distfile into the work directory are no longer
needed.  The extract script also hides differences between pax and
tar behind a common command-line interface, so we no longer need code
that's conditional on whether EXTRACT_USING is tar or pax.

4 files changed, 17 insertions, 20 deletions

diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile
index 7365a35b56c..0e5d75a7e03 100644
--- a/www/apache-tomcat55/Makefile
+++ b/www/apache-tomcat55/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/01/03 18:12:37 abs Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/21 18:57:42 jlam Exp $
 
 DISTNAME=       apache-tomcat-${TOMCAT_VERSION}
 CATEGORIES=	www java
@@ -21,11 +21,12 @@ CATALINA_DIR=	Catalina/localhost
 EGDIR=		${TOMCAT_LIB}/share/examples/apache-tomcat
 EGDIR2=		${EGDIR}/${CATALINA_DIR}
 
-USE_TOOLS+=	gunzip tar
+.include "../../mk/bsd.prefs.mk"
 
-# Work around a horrible interaction with the gzip in NetBSD 2.0 (at least RC4)
-# If gzip is used in a pipeline the tarfile fails to extract. PR bin/27228
-EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}/tar.gz && ${GUNZIP_CMD} ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar
+# Work around a bug in NetBSD 2.0's pax-as-tar (bin/27228)
+.if !empty(MACHINE_PLATFORM:MNetBSD-2.0*)
+EXTRACT_USING=	gtar
+.endif
 
 PKG_SYSCONFDIR.apache-tomcat=	${TOMCAT_LIB}/conf
 MAKE_DIRS=	${PKG_SYSCONFDIR.apache-tomcat}/${CATALINA_DIR}
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 2626d273a8f..027f4826589 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/12/29 06:22:23 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/21 18:57:42 jlam Exp $
 #
 
 DISTNAME=	hiawatha
@@ -24,7 +24,7 @@ USE_JAVA=	run
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_CMD=	unzip -aq ${DOWNLOADED_DISTFILE}
+EXTRACT_OPTS_ZIP=	-aq
 
 RCD_SCRIPTS=	hiawatha
 
diff --git a/www/htdig/Makefile b/www/htdig/Makefile
index 246c36eee2c..b1bab5e81d7 100644
--- a/www/htdig/Makefile
+++ b/www/htdig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/01/20 23:41:30 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/01/21 18:57:42 jlam Exp $
 
 DISTNAME=	htdig-3.1.6
 PKGREVISION=	3
@@ -40,13 +40,8 @@ OWN_DIRS+=	${DBDIR}
 CONF_FILES+=	${PREFIX}/share/examples/htdig/htdig.conf \
 		${PKG_SYSCONFDIR}/htdig.conf
 
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(EXTRACT_USING:M*tar)
-EXTRACT_OPTS_TAR=	--exclude ${DISTNAME}/db*
-.elif !empty(EXTRACT_USING:Mpax)
-EXTRACT_OPTS_PAX=	-c ${DISTNAME}/db*
-.endif
+EXTRACT_OPTS+=		-x
+EXTRACT_ELEMENTS=	${DISTNAME}/db*
 
 .include "../../databases/db/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index f9d5e730b12..dc5cf040e55 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/29 06:22:23 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/21 18:57:42 jlam Exp $
 
 PKGNAME=	jakarta-tomcat5-${TOMCAT_VERSION}
 DISTNAME=	jakarta-tomcat-${TOMCAT_VERSION}
@@ -23,11 +23,12 @@ CATALINA_DIR=	Catalina/localhost
 EGDIR=		${TOMCAT_LIB}/share/examples/jakarta-tomcat
 EGDIR2=		${EGDIR}/${CATALINA_DIR}
 
-USE_TOOLS+=	gunzip tar
+.include "../../mk/bsd.prefs.mk"
 
-# Work around a horrible interaction with the gzip in NetBSD 2.0 (at least RC4)
-# If gzip is used in a pipeline the tarfile fails to extract. PR bin/27228
-EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}/tar.gz && ${GUNZIP_CMD} ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar
+# Work around a bug in NetBSD 2.0's pax-as-tar (bin/27228)
+.if !empty(MACHINE_PLATFORM:MNetBSD-2.0*)
+EXTRACT_USING=	gtar
+.endif
 
 PKG_SYSCONFDIR.jakarta-tomcat5= ${TOMCAT_LIB}/conf
 MAKE_DIRS=	${PKG_SYSCONFDIR.jakarta-tomcat5}/${CATALINA_DIR}