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/ja-ptex-share/Makefile | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'print/ja-ptex-share')

diff --git a/print/ja-ptex-share/Makefile b/print/ja-ptex-share/Makefile
index 066bd159617..4f6f4444c45 100644
--- a/print/ja-ptex-share/Makefile
+++ b/print/ja-ptex-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/16 01:15:32 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/16 03:04:45 jlam Exp $
 
 DISTNAME=	ptex-texmf-2.1
 PKGNAME=	ja-ptex-share-2.1
@@ -25,27 +25,24 @@ DIST_SUBDIR=		teTeX
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
 TEXMFLOCAL=		${PREFIX}/share/texmf.local
-.if !defined(EXTRACT_USING_PAX)
-PKGSRC_USE_TOOLS+=	gtar
-.endif
 
 do-install:
 	${INSTALL_DATA_DIR} ${TEXMFLOCAL}
-.if defined(EXTRACT_USING_PAX)
+.if !empty(EXTRACT_USING:Mgtar)
 	cd ${TEXMFLOCAL} && \
-		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
 	cd ${TEXMFLOCAL}/fonts && \
 	for f in jis nmin-ngoth standard morisawa; do \
-		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/$$f${EXTRACT_SUFX}; \
+		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/$$f${EXTRACT_SUFX}; \
 		${MV} ${TEXMFLOCAL}/fonts/$$f/tfm ${TEXMFLOCAL}/fonts/tfm/$$f;\
 		${MV} ${TEXMFLOCAL}/fonts/$$f/vf ${TEXMFLOCAL}/fonts/vf/$$f;\
 	done
 .else
 	cd ${TEXMFLOCAL} && \
-		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
 	cd ${TEXMFLOCAL}/fonts && \
 	for f in jis nmin-ngoth standard morisawa; do \
-		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/$$f${EXTRACT_SUFX}; \
+		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/$$f${EXTRACT_SUFX}; \
 		${MV} ${TEXMFLOCAL}/fonts/$$f/tfm ${TEXMFLOCAL}/fonts/tfm/$$f;\
 		${MV} ${TEXMFLOCAL}/fonts/$$f/vf ${TEXMFLOCAL}/fonts/vf/$$f;\
 	done
-- 
cgit v1.2.3