Use the default EXTRACT_CMD instead of a hand-crafted one, as the default

is sufficient.

11 files changed, 15 insertions, 28 deletions

diff --git a/archivers/bunzip/Makefile b/archivers/bunzip/Makefile
index 1bb80b88b01..043e2984de5 100644
--- a/archivers/bunzip/Makefile
+++ b/archivers/bunzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:10 agc Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/25 04:47:21 jlam Exp $
 
 DISTNAME=	bunzip021.c
 PKGNAME=	bunzip-0.21
@@ -12,7 +12,6 @@ COMMENT=	Decompressor for bzip .bz files
 
 USE_BUILDLINK_ONLY=	# defined
 WRKSRC=			${WRKDIR}
-EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} >${DISTNAME}
 
 do-build:
 	cd ${WRKSRC} && ${LINK.c} -o bunzip ${DISTNAME}
diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile
index c556f10386f..deac4b19e6f 100644
--- a/archivers/undms/Makefile
+++ b/archivers/undms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:11 agc Exp $
+# $NetBSD: Makefile,v 1.6 2002/02/25 04:47:21 jlam Exp $
 
 DISTNAME=	undms-1.3.c
 PKGNAME=	undms-1.3
@@ -12,7 +12,6 @@ COMMENT=	Converts .dms Amiga disk images to uncompressed .adf images
 
 USE_BUILDLINK_ONLY=	# defined
 WRKSRC=			${WRKDIR}
-EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} >${DISTNAME}
 
 do-build:
 	cd ${WRKSRC} && ${LINK.c} -o undms undms-1.3.c
diff --git a/archivers/unlzx/Makefile b/archivers/unlzx/Makefile
index ce088610610..ac33bae7586 100644
--- a/archivers/unlzx/Makefile
+++ b/archivers/unlzx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/12/13 17:57:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/02/25 04:47:21 jlam Exp $
 
 DISTNAME=	unlzx.c
 PKGNAME=	unlzx-1.1
@@ -11,8 +11,7 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	Extracts .lzx archives from Amiga systems
 
 USE_BUILDLINK_ONLY=	# defined
-EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} >${DISTNAME}
-WRKSRC=		${WRKDIR}
+WRKSRC=			${WRKDIR}
 
 do-build:
 	cd ${WRKSRC} && ${LINK.c} -o unlzx unlzx.c
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index f30d39ded26..8ac3bde79dc 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/09/27 23:17:42 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2002/02/25 04:47:21 jlam Exp $
 #
 
 DISTNAME=	zip1-1.1
@@ -11,14 +11,10 @@ MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://www.info-zip.org/pub/infozip/
 COMMENT=	Create/update ZIP files compatible with pkzip version 1
 
-BUILD_DEPENDS=	unzip-[0-9]*:../../archivers/unzip
-
 RESTRICTED=	"Do not modify.  Do not sell for profit."
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
-EXTRACT_CMD=	unzip -qo ${DOWNLOADED_DISTFILE}
-
 MAKEFILE=	makefile
 MAKE_FLAGS=	CFLAGS="${CFLAGS} -DDIRENT" LFLAGS2="-lcompat"
 ALL_TARGET=	zip
diff --git a/benchmarks/hint/Makefile b/benchmarks/hint/Makefile
index 4a1d80ce3f1..07f14552c61 100644
--- a/benchmarks/hint/Makefile
+++ b/benchmarks/hint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/04/09 11:45:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/02/25 04:47:21 jlam Exp $
 # FreeBSD: Makefile,v 1.1.1.1 1998/06/15 18:09:43 ghelmer Exp
 #
 
@@ -12,7 +12,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.scl.ameslab.gov/Projects/HINT/
 COMMENT=	Scalable benchmark for testing CPU and memory performance
 
-EXTRACT_CMD=	${GTAR} -xf ${DOWNLOADED_DISTFILE}
 WRKSRC=		${WRKDIR}/unix
 ALL_TARGET=	DOUBLE INT
 
diff --git a/devel/pccts/Makefile b/devel/pccts/Makefile
index 7f16cde2b75..bbf372668b6 100644
--- a/devel/pccts/Makefile
+++ b/devel/pccts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/20 11:40:09 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/02/25 04:47:22 jlam Exp $
 #
 
 DISTNAME=	pccts133mr22
@@ -13,7 +13,6 @@ COMMENT=	Purdue Compiler Construction Tool Set
 
 DIST_SUBDIR=	${PKGNAME}
 
-EXTRACT_CMD=    unzip -qo ${DOWNLOADED_DISTFILE}
 WRKSRC=		${WRKDIR}/pccts
 MAKEFILE=	makefile
 ALL_TARGET=
diff --git a/devel/rdp/Makefile b/devel/rdp/Makefile
index a51642b7ff3..b98ed8a0981 100644
--- a/devel/rdp/Makefile
+++ b/devel/rdp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/04/09 11:45:40 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/02/25 04:47:22 jlam Exp $
 
 DISTNAME=		rdp1_5
 PKGNAME=		rdp-1.5
@@ -10,8 +10,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.dcs.rhbnc.ac.uk/research/languages/rdp.shtml
 COMMENT=		compiles attributed LL(1) grammars into recursive descent compilers
 
-EXTRACT_CMD=		unzip -Laqo ${DOWNLOADED_DISTFILE}
-
 WRKSRC=			${WRKDIR}/rdp
 MAKEFILE=		makefile
 
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index f5db0f160ae..f7b6a275084 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/09/09 20:36:36 agc Exp $
+# $NetBSD: Makefile,v 1.17 2002/02/25 04:47:22 jlam Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/08/10 22:31:15 fenner Exp
 #
 
@@ -20,10 +20,11 @@ NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
 EPHEM=          LRZ5_24 CHI_24 CPJV_24
+EXTRACT_ONLY=	${DISTNAME}.shr
+EXTRACT_CMD=	${EXTRACT_CMD.shar}
 
 USE_X11BASE=	yes
 
-EXTRACT_CMD=    ${SH} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.shr
 DIST_SUBDIR=    astrolog
 ALL_TARGET=     astrolog
 WRKSRC=		${WRKDIR}
diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile
index 0bd6a59933c..3a2fb1be353 100644
--- a/sysutils/crashme/Makefile
+++ b/sysutils/crashme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:47 agc Exp $
+# $NetBSD: Makefile,v 1.10 2002/02/25 04:47:22 jlam Exp $
 #
 
 DISTNAME=       	crashme-2.4
@@ -11,7 +11,7 @@ HOMEPAGE=		http://people.delphi.com/gjc/crashme.html
 COMMENT=		Try to crash machine with random arguments to random system calls
 
 WRKSRC=			${WRKDIR}
-EXTRACT_CMD=		${SH} ${DOWNLOADED_DISTFILE}
+EXTRACT_CMD=		${EXTRACT_CMD.shar}
 MAKEFILE=		makefile
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/memconf/Makefile b/sysutils/memconf/Makefile
index 26e024525a9..6504423fa3f 100644
--- a/sysutils/memconf/Makefile
+++ b/sysutils/memconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/05/08 16:15:56 agc Exp $
+# $NetBSD: Makefile,v 1.4 2002/02/25 04:47:22 jlam Exp $
 #
 
 DISTNAME=		memconf
@@ -15,7 +15,6 @@ ONLY_FOR_PLATFORM=	SunOS-*-* 	# only for Solaris
 
 WRKSRC=			${WRKDIR}
 
-EXTRACT_CMD=		${GZCAT} ${DOWNLOADED_DISTFILE} > ${WRKSRC}/memconf
 NO_BUILD=		yes
 
 do-install:
diff --git a/time/py-mxDateTime/Makefile b/time/py-mxDateTime/Makefile
index 1b78fd2125d..afc9e9325b3 100644
--- a/time/py-mxDateTime/Makefile
+++ b/time/py-mxDateTime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/01/16 20:40:12 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2002/02/25 04:47:23 jlam Exp $
 #
 
 DISTNAME=	mxDateTime-1.3.0
@@ -12,8 +12,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://starship.python.net/~lemburg/mxDateTime.html
 COMMENT=	Python extension that provides new types and conversions for dates
 
-EXTRACT_CMD=	unzip -Laqo ${DOWNLOADED_DISTFILE}
-
 RESTRICTED=	No commercial distribution
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}