Update package Makefile now that bsd.pkg.extract.mk is using the

"extract" script for extraction.  Many cases where a custom EXTRACT_CMD
simply copied the distfile into the work directory are no longer
needed.  The extract script also hides differences between pax and
tar behind a common command-line interface, so we no longer need code
that's conditional on whether EXTRACT_USING is tar or pax.

4 files changed, 11 insertions, 23 deletions

diff --git a/print/ja-a2ps/Makefile b/print/ja-a2ps/Makefile
index 4cd7399325f..0dd8310a74e 100644
--- a/print/ja-a2ps/Makefile
+++ b/print/ja-a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:18 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/21 18:57:42 jlam Exp $
 
 DISTNAME=	a2ps.pl-1.45
 PKGNAME=	ja-a2ps-1.45
@@ -13,7 +13,6 @@ COMMENT=	Text file to postscript converter (with Japanese support)
 WRKSRC=		${WRKDIR}
 USE_TOOLS+=	perl:run
 
-EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} .
 NO_BUILD=	yes
 REPLACE_PERL=	a2ps.pl-1.45
 
diff --git a/print/psjoin/Makefile b/print/psjoin/Makefile
index 121846ba612..52333705274 100644
--- a/print/psjoin/Makefile
+++ b/print/psjoin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/08/10 05:19:39 reed Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/21 18:57:42 jlam Exp $
 #
 
 DISTNAME=		psjoin
@@ -12,7 +12,6 @@ HOMEPAGE=		http://homepage3.nifty.com/tsato/tools/psjoin.html
 COMMENT=		Concatenate PostScript files
 
 DIST_SUBDIR=		${PKGNAME_NOREV}
-EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} .
 NO_BUILD=		yes
 REPLACE_PERL=		psjoin
 USE_TOOLS+=		perl:run
diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile
index b353f133092..d73bb01f00e 100644
--- a/print/teTeX-share/Makefile
+++ b/print/teTeX-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/01/20 23:41:30 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2006/01/21 18:57:42 jlam Exp $
 #
 
 DISTNAME=	tetex-texmf-2.0.2
@@ -24,25 +24,20 @@ EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-USE_TOOLS+=		patch
-
-.include "../../mk/bsd.prefs.mk"
+USE_TOOLS+=	patch
 
 # Don't extract the files listed in ${FILESDIR}/exclude, and preserve
 # permissions.
 #
-.if !empty(EXTRACT_USING:M*tar)
-EXTRACT_OPTS_TAR=	-X ${FILESDIR}/exclude -p
-.elif !empty(EXTRACT_USING:Mpax)
-EXTRACT_OPTS_PAX=	-c `${CAT} ${FILESDIR}/exclude`
-.endif
+EXTRACT_OPTS=		-X ${FILESDIR}/exclude
+EXTRACT_OPTS_TAR=	-p
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
 	distfiles=${DISTFILES:Q};					\
 	for i in $$distfiles; do					\
 		extract_file=${_DISTDIR:Q}"/$$i";			\
-		cd ${PREFIX}/share/texmf; ${EXTRACT_CMD${EXTRACT_SUFX}}; \
+		cd ${PREFIX}/share/texmf; ${EXTRACT_CMD};		\
 	done
 	cd ${PREFIX}/share/texmf/dvipdfm/config && \
 	${PATCH} ${_PATCH_BACKUP_ARG} .orig < ${FILESDIR}/dvipdfm-config.diff && \
diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index f72dc90c28f..ed5ca8222d2 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/01/20 23:41:30 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:42 jlam Exp $
 #
 
 DISTNAME=	tetex-texmf-3.0
@@ -21,18 +21,13 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 USE_TOOLS+=	patch
 
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(EXTRACT_USING:M*tar)
-EXTRACT_OPTS_TAR=	-X ${FILESDIR}/exclude -p
-.elif !empty(EXTRACT_USING:Mpax)
-EXTRACT_OPTS_PAX=	-c `${CAT} ${FILESDIR}/exclude`
-.endif
+EXTRACT_OPTS=		-X ${FILESDIR}/exclude
+EXTRACT_OPTS_TAR=	-p
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
 	extract_file=${_DISTDIR:Q}/${DISTFILES:Q};			\
-	cd ${PREFIX}/share/texmf; ${EXTRACT_CMD${EXTRACT_SUFX}}
+	cd ${PREFIX}/share/texmf; ${EXTRACT_CMD}
 	cd ${PREFIX}/share/texmf/dvipdfm/config && \
 	${PATCH} ${_PATCH_BACKUP_ARG} .orig < ${FILESDIR}/dvipdfm-config.diff && \
 	${RM} config.orig