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.

---
 print/teTeX-share/Makefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'print/teTeX-share')

diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile
index c0f30aec004..d0980979fd7 100644
--- a/print/teTeX-share/Makefile
+++ b/print/teTeX-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/16 01:15:33 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/16 03:04:45 jlam Exp $
 #
 
 DISTNAME=	tetex-texmf-2.0.2
@@ -24,19 +24,16 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
 USE_GNU_TOOLS+=		patch
-.if !defined(EXTRACT_USING_PAX)
-PKGSRC_USE_TOOLS+=	gtar
-.endif
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
-.if defined(EXTRACT_USING_PAX)
+.if !empty(EXTRACT_USING:Mgtar)
 	for i in ${DISTFILES}; do \
-		cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/$$i | ${PAX} -O -cr `${CAT} ${FILESDIR}/exclude`; \
+		cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/$$i | ${GTAR} -X ${FILESDIR}/exclude -xpf -; \
 	done
 .else
 	for i in ${DISTFILES}; do \
-		cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/$$i | ${GTAR} -X ${FILESDIR}/exclude -xpf -; \
+		cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/$$i | ${PAX} -O -cr `${CAT} ${FILESDIR}/exclude`; \
 	done
 .endif
 	cd ${PREFIX}/share/texmf/dvipdfm/config && \
-- 
cgit v1.2.3