From 4d2fb797dba9c9dd13af2cd19bccb1f3e76935f5 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Tue, 17 May 2005 22:00:13 +0000
Subject: 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.

---
 print/teTeX-share/Makefile | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'print/teTeX-share')

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
-- 
cgit v1.2.3