Use EXTRACT_CMD_OPTS.tar.gz and EXTRACT_CMD.tar.gz instead of figuring

out the whole command line necessary to extract a .tar.gz file.

7 files changed, 61 insertions, 70 deletions

diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile
index f82b0e8711c..0d706361606 100644
--- a/print/ja-ptex-bin/Makefile
+++ b/print/ja-ptex-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/16 03:04:45 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/17 22:00:13 jlam Exp $
 
 DISTNAME=	ptex-src-${PTEX_VERS}
 PKGNAME=	ja-ptex-bin-${PTEX_VERS}
@@ -59,23 +59,18 @@ pre-extract:
 	fi;
 
 post-extract:
-.if !empty(EXTRACT_USING:Mgtar)
-	cd ${WRKDIR_} && \
-		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DF_TETEX_BIN}
-	cd ${WRKSRC}/texk/web2c && \
-		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
-	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
+	cd ${WRKDIR_};							\
+		extract_file=${_DISTDIR:Q}/${DF_TETEX_BIN:Q};		\
+		${EXTRACT_CMD${EXTRACT_SUFX}}
+	cd ${WRKSRC}/texk/web2c;					\
+		extract_file=${_DISTDIR:Q}/${DISTNAME:Q}${EXTRACT_SUFX}; \
+		${EXTRACT_CMD${EXTRACT_SUFX}}
+	cd ${WRKSRC}/texk;						\
+		extract_file=${_DISTDIR:Q}/${DF_DVIPSK_PATCH:Q};	\
+		${EXTRACT_CMD${EXTRACT_SUFX}}
+	cd ${WRKSRC}/texk;						\
+		extract_file=${_DISTDIR:Q}/${DF_MENDEXK:Q};		\
+		${EXTRACT_CMD${EXTRACT_SUFX}}
 	${SED} -e "s|\$$TEXMF/ptex/plain/||" \
 	${LOCALBASE}/share/texmf.local/ptex/plain/base/ptex.tex > \
 		${WRKSRC_PTEX}/ptex.tex
diff --git a/print/ja-ptex-share/Makefile b/print/ja-ptex-share/Makefile
index ded734350c8..e7e60ee87dc 100644
--- a/print/ja-ptex-share/Makefile
+++ b/print/ja-ptex-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/16 16:33:24 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/17 22:00:13 jlam Exp $
 
 DISTNAME=	ptex-texmf-2.1
 PKGNAME=	ja-ptex-share-2.1
@@ -30,24 +30,15 @@ TEXMFLOCAL=		${PREFIX}/share/texmf.local
 
 do-install:
 	${INSTALL_DATA_DIR} ${TEXMFLOCAL}
-.if !empty(EXTRACT_USING:Mgtar)
-	cd ${TEXMFLOCAL} && \
-		${GTAR} -zxpf ${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}; \
-		${MV} ${TEXMFLOCAL}/fonts/$$f/tfm ${TEXMFLOCAL}/fonts/tfm/$$f;\
-		${MV} ${TEXMFLOCAL}/fonts/$$f/vf ${TEXMFLOCAL}/fonts/vf/$$f;\
+	cd ${TEXMFLOCAL};						\
+		extract_file=${_DISTDIR:Q}/${DISTNAME:Q}${EXTRACT_SUFX}; \
+		${EXTRACT_CMD${EXTRACT_SUFX}}
+	cd ${TEXMFLOCAL}/fonts;						\
+	for f in jis nmin-ngoth standard morisawa; do			\
+		extract_file=${_DISTDIR:Q}/$$f${EXTRACT_SUFX};		\
+		${EXTRACT_CMD${EXTRACT_SUFX}};				\
+		${MV} ${TEXMFLOCAL}/fonts/$$f/tfm ${TEXMFLOCAL}/fonts/tfm/$$f; \
+		${MV} ${TEXMFLOCAL}/fonts/$$f/vf ${TEXMFLOCAL}/fonts/vf/$$f; \
 	done
-.else
-	cd ${TEXMFLOCAL} && \
-		${PAX} -O -zrf ${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}; \
-		${MV} ${TEXMFLOCAL}/fonts/$$f/tfm ${TEXMFLOCAL}/fonts/tfm/$$f;\
-		${MV} ${TEXMFLOCAL}/fonts/$$f/vf ${TEXMFLOCAL}/fonts/vf/$$f;\
-	done
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile
index a26ebdd742c..764d99370d9 100644
--- a/print/teTeX-share/Makefile
+++ b/print/teTeX-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/16 10:38:53 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/17 22:00:13 jlam Exp $
 #
 
 DISTNAME=	tetex-texmf-2.0.2
@@ -8,12 +8,13 @@ CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/2.0/distrib/}
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=	listings${EXTRACT_SUFX}
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	Machine-independent part of teTeX, version 2
 
-SITES_listings.tar.gz= ${LOCAL_PORTS}
+SITES_listings${EXTRACT_SUFX}= ${LOCAL_PORTS}
 
 CONFLICTS+=	teTeX2-share-[0-9]*
 
@@ -27,17 +28,22 @@ USE_GNU_TOOLS+=		patch
 
 .include "../../mk/bsd.prefs.mk"
 
+# Don't extract the files listed in ${FILESDIR}/exclude, and preserve
+# permissions.
+#
+.if !empty(EXTRACT_USING:M*tar)
+EXTRACT_CMD_OPTS${EXTRACT_SUFX}=	-X ${FILESDIR}/exclude -p
+.elif !empty(EXTRACT_USING:Mpax)
+EXTRACT_CMD_OPTS${EXTRACT_SUFX}=	-c `${CAT} ${FILESDIR}/exclude`
+.endif
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
-.if !empty(EXTRACT_USING:Mgtar)
-	for i in ${DISTFILES}; do \
-		cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/$$i | ${GTAR} -X ${FILESDIR}/exclude -xpf -; \
+	distfiles=${DISTFILES:Q};					\
+	for i in $$distfiles; do					\
+		extract_file=${_DISTDIR:Q}"/$$i";			\
+		cd ${PREFIX}/share/texmf; ${EXTRACT_CMD${EXTRACT_SUFX}}; \
 	done
-.else
-	for i in ${DISTFILES}; do \
-		cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/$$i | ${PAX} -O -cr `${CAT} ${FILESDIR}/exclude`; \
-	done
-.endif
 	cd ${PREFIX}/share/texmf/dvipdfm/config && \
 	${PATCH} ${_PATCH_BACKUP_ARG} .orig < ${FILESDIR}/dvipdfm-config.diff && \
 	${RM} config.orig
diff --git a/print/teTeX-sharesrc/Makefile b/print/teTeX-sharesrc/Makefile
index 8ecf57dd872..91acc50d0c2 100644
--- a/print/teTeX-sharesrc/Makefile
+++ b/print/teTeX-sharesrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/05/16 12:35:06 tron Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/17 22:00:13 jlam Exp $
 
 DISTNAME=	tetex-texmfsrc-2.0.2
 PKGNAME=	teTeX-sharesrc-2.0.2
@@ -24,10 +24,7 @@ NO_MTREE=	yes
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
-.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
+	extract_file=${_DISTDIR:Q}/${DISTFILES:Q};			\
+	cd ${PREFIX}/share/texmf; ${EXTRACT_CMD${EXTRACT_SUFX}}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index bed8b506a35..2b37581ee5a 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/16 16:33:24 kristerw Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/17 22:00:13 jlam Exp $
 #
 
 DISTNAME=	tetex-texmf-3.0
@@ -6,6 +6,7 @@ PKGREVISION=	1
 PKGNAME=	${DISTNAME:C/tetex/teTeX/}
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	kei@NetBSD.org,hubertf@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
@@ -22,13 +23,16 @@ USE_GNU_TOOLS+=	patch
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !empty(EXTRACT_USING:M*tar)
+EXTRACT_CMD_OPTS${EXTRACT_SUFX}=	-X ${FILEDIR}/exclude -p
+.elif !empty(EXTRACT_USING:Mpax)
+EXTRACT_CMD_OPTS${EXTRACT_SUFX}=	-c `${CAT} ${FILESDIR}/exclude`
+.endif
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
-.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
+	extract_file=${_DISTDIR:Q}/${DISTFILES:Q};			\
+	cd ${PREFIX}/share/texmf; ${EXTRACT_CMD${EXTRACT_SUFX}}
 	cd ${PREFIX}/share/texmf/dvipdfm/config && \
 	${PATCH} ${_PATCH_BACKUP_ARG} .orig < ${FILESDIR}/dvipdfm-config.diff && \
 	${RM} config.orig
diff --git a/print/teTeX3-texmfsrc/Makefile b/print/teTeX3-texmfsrc/Makefile
index 73e0a40f153..59f44f00bb4 100644
--- a/print/teTeX3-texmfsrc/Makefile
+++ b/print/teTeX3-texmfsrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/16 16:33:24 kristerw Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/17 22:00:13 jlam Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
 #
 
@@ -26,10 +26,7 @@ NO_MTREE=	yes
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
-.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
+	extract_file=${_DISTDIR:Q}/${DISTFILES:Q};			\
+	cd ${PREFIX}/share/texmf; ${EXTRACT_CMD${EXTRACT_SUFX}}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/htdig/Makefile b/www/htdig/Makefile
index d311b53c077..446bfc98de6 100644
--- a/www/htdig/Makefile
+++ b/www/htdig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/16 03:04:45 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/17 22:00:13 jlam Exp $
 
 DISTNAME=	htdig-3.1.6
 PKGREVISION=	3
@@ -11,6 +11,7 @@ MASTER_SITES=	http://www.htdig.org/files/ \
 		http://www.it.htdig.org/files/ \
 		ftp://www.it.htdig.org/pub/htdig/ \
 		http://www.opdenbrouw.nl/htdig/maindocs/files/
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://htdig.sourceforge.net/
@@ -42,10 +43,10 @@ CONF_FILES+=	${PREFIX}/share/examples/htdig/htdig.conf \
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(EXTRACT_USING:Mgtar)
-EXTRACT_ELEMENTS= --exclude ${DISTNAME}/db*
-.else
-EXTRACT_ELEMENTS= -c ${DISTNAME}/db*
+.if !empty(EXTRACT_USING:M*tar)
+EXTRACT_CMD_OPTS${EXTRACT_SUFX}=	--exclude ${DISTNAME}/db*
+.elif !empty(EXTRACT_USING:Mpax)
+EXTRACT_CMD_OPTS${EXTRACT_SUFX}=	-c ${DISTNAME}/db*
 .endif
 
 .include "../../databases/db/buildlink3.mk"