summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-05-16 03:04:44 +0000
committerjlam <jlam@pkgsrc.org>2005-05-16 03:04:44 +0000
commit2338cbae2709fa31f2b29fa5a4636469fbc53d70 (patch)
treeb4a01b61c27a7220ff7f5134cb7652ae5ab80571 /print
parente70b376fa428d35e2ee7ec89f1f025ea77c1a2e5 (diff)
downloadpkgsrc-2338cbae2709fa31f2b29fa5a4636469fbc53d70.tar.gz
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.
Diffstat (limited to 'print')
-rw-r--r--print/ja-ptex-bin/Makefile23
-rw-r--r--print/ja-ptex-share/Makefile15
-rw-r--r--print/teTeX-share/Makefile11
-rw-r--r--print/teTeX-sharesrc/Makefile12
-rw-r--r--print/teTeX3-texmf/Makefile12
-rw-r--r--print/teTeX3-texmfsrc/Makefile12
6 files changed, 32 insertions, 53 deletions
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 > \
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
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 && \
diff --git a/print/teTeX-sharesrc/Makefile b/print/teTeX-sharesrc/Makefile
index 92666b8cf24..81679f2460d 100644
--- a/print/teTeX-sharesrc/Makefile
+++ b/print/teTeX-sharesrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/16 01:15:33 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/16 03:04:45 jlam Exp $
DISTNAME= tetex-texmfsrc-2.0.2
PKGNAME= teTeX-sharesrc-2.0.2
@@ -20,16 +20,12 @@ NO_CONFIGURE= yes
NO_BUILD= yes
NO_MTREE= yes
-.if !defined(EXTRACT_USING_PAX)
-PKGSRC_USE_TOOLS+= gtar
-.endif
-
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
-.if defined(EXTRACT_USING_PAX)
- cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -r
-.else
+.if !empty(EXTRACT_USING:Mgtar)
cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${GTAR} -xpf -
+.else
+ cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -r
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index 1af7e7861e2..43f053e3a25 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/16 01:15:33 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/16 03:04:45 jlam Exp $
#
DISTNAME= tetex-texmf-3.0
@@ -20,16 +20,12 @@ 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)
- cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -cr `${CAT} ${FILESDIR}/exclude`
-.else
+.if !empty(EXTRACT_USING:Mgtar)
cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${GTAR} -X ${FILESDIR}/exclude -xpf -
+.else
+ cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -cr `${CAT} ${FILESDIR}/exclude`
.endif
cd ${PREFIX}/share/texmf/dvipdfm/config && \
${PATCH} ${_PATCH_BACKUP_ARG} .orig < ${FILESDIR}/dvipdfm-config.diff && \
diff --git a/print/teTeX3-texmfsrc/Makefile b/print/teTeX3-texmfsrc/Makefile
index ef804b68314..3210599a036 100644
--- a/print/teTeX3-texmfsrc/Makefile
+++ b/print/teTeX3-texmfsrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/16 01:15:33 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/16 03:04:45 jlam Exp $
# FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
#
@@ -22,16 +22,12 @@ NO_CONFIGURE= yes
NO_BUILD= yes
NO_MTREE= yes
-.if !defined(EXTRACT_USING_PAX)
-PKGSRC_USE_TOOLS+= gtar
-.endif
-
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
-.if defined(EXTRACT_USING_PAX)
- cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -r
-.else
+.if !empty(EXTRACT_USING:Mgtar)
cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${GTAR} -xpf -
+.else
+ cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -r
.endif
.include "../../mk/bsd.pkg.mk"