From 43c47c1b47887ef8bc7dd2962e4fc3732705a948 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 16 May 2005 03:04:44 +0000
Subject: Change the EXTRACT_USING_PAX defined/undefined option into a
 EXTRACT_USING which can take multiple values -- "pax" or "gtar".  The default
 value of EXTRACT_USING is "pax", which more closely matches reality since
 before, we were using bootstrap "tar" for ${GTAR} and it was actually
 pax-as-tar.  Also, stop pretending pax-as-tar from the bootstrap kit or on
 NetBSD is GNU tar.  Lastly, in bsd.pkg.extract.mk, note whether we need "pax"
 or "gtar" depending on what we need to extract the distfiles.

---
 www/htdig/Makefile                 | 9 +++++----
 www/p5-HTML-LinkExtractor/Makefile | 5 ++---
 www/p5-HTML-Scrubber/Makefile      | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'www')

diff --git a/www/htdig/Makefile b/www/htdig/Makefile
index 583946f7bd9..d311b53c077 100644
--- a/www/htdig/Makefile
+++ b/www/htdig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/19 00:28:31 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/16 03:04:45 jlam Exp $
 
 DISTNAME=	htdig-3.1.6
 PKGREVISION=	3
@@ -41,10 +41,11 @@ CONF_FILES+=	${PREFIX}/share/examples/htdig/htdig.conf \
 		${PKG_SYSCONFDIR}/htdig.conf
 
 .include "../../mk/bsd.prefs.mk"
-.if defined(EXTRACT_USING_PAX)
-EXTRACT_ELEMENTS= -c ${DISTNAME}/db*
-.else
+
+.if !empty(EXTRACT_USING:Mgtar)
 EXTRACT_ELEMENTS= --exclude ${DISTNAME}/db*
+.else
+EXTRACT_ELEMENTS= -c ${DISTNAME}/db*
 .endif
 
 .include "../../databases/db/buildlink3.mk"
diff --git a/www/p5-HTML-LinkExtractor/Makefile b/www/p5-HTML-LinkExtractor/Makefile
index 9138d533971..1db92175250 100644
--- a/www/p5-HTML-LinkExtractor/Makefile
+++ b/www/p5-HTML-LinkExtractor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:56 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/16 03:04:45 jlam Exp $
 
 DISTNAME=	HTML-LinkExtractor-0.121
 PKGNAME=	p5-${DISTNAME}
@@ -10,9 +10,8 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/~podmaster/${DISTNAME}/
 COMMENT=	Extract links from an HTML document
 
-EXTRACT_USING_PAX=	# defined
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+EXTRACT_USING=		pax
 
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/HTML/LinkExtractor/.packlist
 
diff --git a/www/p5-HTML-Scrubber/Makefile b/www/p5-HTML-Scrubber/Makefile
index e5db05b4ca5..601111c0f8d 100644
--- a/www/p5-HTML-Scrubber/Makefile
+++ b/www/p5-HTML-Scrubber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:56 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/16 03:04:45 jlam Exp $
 #
 
 DISTNAME=	HTML-Scrubber-0.08
@@ -14,7 +14,7 @@ DEPENDS+=	p5-HTML-Parser>=3:../../www/p5-HTML-Parser
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/Scrubber/.packlist
-EXTRACT_USING_PAX=	YES
+EXTRACT_USING=		pax
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3