From 2338cbae2709fa31f2b29fa5a4636469fbc53d70 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
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-bin/Makefile | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

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

diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile
index be9675f6dd5..f82b0e8711c 100644
--- a/print/ja-ptex-bin/Makefile
+++ b/print/ja-ptex-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/16 01:15:32 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/16 03:04:45 jlam Exp $
 
 DISTNAME=	ptex-src-${PTEX_VERS}
 PKGNAME=	ja-ptex-bin-${PTEX_VERS}
@@ -32,9 +32,6 @@ DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 PTEX_VERS=		3.1.2
 DVIPSK_PATCH_VERS=	p1.6
 MENDEXK_VERS=		2.5
-.if !defined(EXTRACT_USING_PAX)
-PKGSRC_USE_TOOLS+=	gtar
-.endif
 
 DF_TETEX_BIN= tetex-src-${TETEX_BIN_VERS}${EXTRACT_SUFX}
 DF_DVIPSK_PATCH= dvipsk-jpatch-${DVIPSK_PATCH_VERS}${EXTRACT_SUFX}
@@ -62,15 +59,7 @@ pre-extract:
 	fi;
 
 post-extract:
-.if defined(EXTRACT_USING_PAX)
-	cd ${WRKDIR_} && \
-		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_TETEX_BIN}
-	cd ${WRKSRC}/texk/web2c && \
-		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
-	cd ${WRKSRC}/texk && \
-		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_DVIPSK_PATCH}; \
-		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_MENDEXK}
-.else
+.if !empty(EXTRACT_USING:Mgtar)
 	cd ${WRKDIR_} && \
 		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DF_TETEX_BIN}
 	cd ${WRKSRC}/texk/web2c && \
@@ -78,6 +67,14 @@ post-extract:
 	cd ${WRKSRC}/texk && \
 		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DF_DVIPSK_PATCH}; \
 		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DF_MENDEXK}
+.else
+	cd ${WRKDIR_} && \
+		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_TETEX_BIN}
+	cd ${WRKSRC}/texk/web2c && \
+		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+	cd ${WRKSRC}/texk && \
+		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_DVIPSK_PATCH}; \
+		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_MENDEXK}
 .endif
 	${SED} -e "s|\$$TEXMF/ptex/plain/||" \
 	${LOCALBASE}/share/texmf.local/ptex/plain/base/ptex.tex > \
-- 
cgit v1.2.3