summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archivers/macutil/Makefile6
-rw-r--r--archivers/rar/Makefile5
-rw-r--r--archivers/zip1/Makefile5
-rw-r--r--benchmarks/hint/Makefile4
-rw-r--r--benchmarks/paranoia/Makefile6
-rw-r--r--benchmarks/whetstone/Makefile6
-rw-r--r--comms/binkd/Makefile5
-rw-r--r--cross/binutils/Makefile9
-rw-r--r--databases/p5-gdbm/Makefile4
-rw-r--r--databases/py-gdbm/Makefile4
-rw-r--r--devel/rdp/Makefile5
-rw-r--r--editors/sam/Makefile6
-rw-r--r--games/svb/Makefile6
-rw-r--r--games/xdoom/Makefile5
-rw-r--r--lang/py-html-docs/Makefile8
-rw-r--r--misc/py-readline/Makefile4
-rw-r--r--mk/bsd.pkg.mk32
-rw-r--r--plan9/9menu/Makefile6
-rw-r--r--plan9/9wm/Makefile6
-rw-r--r--plan9/sam/Makefile6
-rw-r--r--sysutils/crashme/Makefile6
-rw-r--r--sysutils/lsof/Makefile8
-rw-r--r--textproc/texi2html/Makefile6
-rw-r--r--www/p5-CGI_Lite/Makefile6
-rw-r--r--x11/xview-clients/Makefile4
-rw-r--r--x11/xview-config/Makefile6
26 files changed, 79 insertions, 95 deletions
diff --git a/archivers/macutil/Makefile b/archivers/macutil/Makefile
index 77374f3c947..6374135c8a2 100644
--- a/archivers/macutil/Makefile
+++ b/archivers/macutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/11/12 15:19:59 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/01 14:07:52 agc Exp $
DISTNAME= macutil2.0b3
PKGNAME= macutil-2.0b3
@@ -9,9 +9,7 @@ EXTRACT_SUFX= .shar.Z
MAINTAINER= mycroft@NetBSD.ORG
MAKEFILE= makefile
-EXTRACT_CMD= zcat
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS= |sh
+EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
WRKSRC= ${WRKDIR}/macutil
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index fa19cfde0d6..4aa38cb40dc 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1999/03/28 15:34:24 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 1999/04/01 14:07:52 agc Exp $
# FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:27 fenner Exp
#
@@ -15,8 +15,7 @@ MAINTAINER= packages@netbsd.org
NO_PACKAGE= Only unmodified original package can be distributed
NO_WRKSUBDIR= yes
-EXTRACT_CMD=
-EXTRACT_BEFORE_ARGS=
+EXTRACT_CMD= ${DOWNLOADED_DISTFILE}
pre-extract:
chmod a+x ${DISTDIR}/${DISTFILES}
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index b20e52a2cd1..1ba6e74d8c0 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/08/20 15:16:38 tsarna Exp $
+# $NetBSD: Makefile,v 1.5 1999/04/01 14:07:52 agc Exp $
#
DISTNAME= zip1-1.1
@@ -12,8 +12,7 @@ HOMEPAGE= http://www.cdrom.com/pub/infozip/
BUILD_DEPENDS= unzip:../../archivers/unzip
-EXTRACT_CMD= unzip
-EXTRACT_BEFORE_ARGS= -qo
+EXTRACT_CMD= unzip -qo ${DOWNLOADED_DISTFILE}
MAKEFILE= makefile
MAKE_FLAGS= CFLAGS="${CFLAGS} -DDIRENT" LFLAGS2="-lcompat"
diff --git a/benchmarks/hint/Makefile b/benchmarks/hint/Makefile
index 1d8edb7bcbb..e41b0594e69 100644
--- a/benchmarks/hint/Makefile
+++ b/benchmarks/hint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/02/10 18:49:17 explorer Exp $
+# $NetBSD: Makefile,v 1.7 1999/04/01 14:07:52 agc Exp $
# FreeBSD: Makefile,v 1.1.1.1 1998/06/15 18:09:43 ghelmer Exp
#
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tar
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.scl.ameslab.gov/Projects/HINT/
-EXTRACT_BEFORE_ARGS=-xf
+EXTRACT_CMD= ${GTAR} -xf ${DOWNLOADED_DISTFILE}
WRKSRC= ${WRKDIR}/unix
ALL_TARGET= DOUBLE INT
diff --git a/benchmarks/paranoia/Makefile b/benchmarks/paranoia/Makefile
index efa859406dd..8e19cb3ac64 100644
--- a/benchmarks/paranoia/Makefile
+++ b/benchmarks/paranoia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/03/16 08:53:43 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/01 14:07:53 agc Exp $
DISTNAME= paranoia
PKGNAME= paranoia-960101
@@ -9,9 +9,7 @@ EXTRACT_SUFX= .c
MAINTAINER= root@garbled.net
NO_WRKSUBDIR= yes
-EXTRACT_CMD= ${CP}
-EXTRACT_BEFORE_ARGS= #empty
-EXTRACT_AFTER_ARGS= ${WRKSRC}
+EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
do-build:
(cd ${WRKSRC} ; ${CC} -ffloat-store -o paranoia paranoia.c -lm)
diff --git a/benchmarks/whetstone/Makefile b/benchmarks/whetstone/Makefile
index b0a72c34133..57a69fdf28a 100644
--- a/benchmarks/whetstone/Makefile
+++ b/benchmarks/whetstone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/03/16 09:02:27 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/01 14:07:53 agc Exp $
DISTNAME= whetstone
PKGNAME= whetstone-1.2
@@ -9,9 +9,7 @@ EXTRACT_SUFX= .c
MAINTAINER= root@garbled.net
NO_WRKSUBDIR= yes
-EXTRACT_CMD= ${CP}
-EXTRACT_BEFORE_ARGS= #empty
-EXTRACT_AFTER_ARGS= ${WRKSRC}
+EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
do-build:
(cd ${WRKSRC} ; ${CC} -O2 -o whetstone whetstone.c -lm)
diff --git a/comms/binkd/Makefile b/comms/binkd/Makefile
index cec3957d036..23a65fc956e 100644
--- a/comms/binkd/Makefile
+++ b/comms/binkd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/22 20:47:13 tv Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/01 14:07:53 agc Exp $
#
DISTNAME= binkd-0.9.2
@@ -12,8 +12,7 @@ HOMEPAGE= http://www.corbina.net/~maloff/binkd/
BUILD_DEPENDS= unzip:../../archivers/unzip
GNU_CONFIGURE= yes
-EXTRACT_CMD= unzip
-EXTRACT_BEFORE_ARGS= -qo
+EXTRACT_CMD= unzip -qo ${DOWNLOADED_DISTFILE}
NO_CDROM= "extremely limited usefulness to the general public"
diff --git a/cross/binutils/Makefile b/cross/binutils/Makefile
index fc9c9a9739f..ebfb4958835 100644
--- a/cross/binutils/Makefile
+++ b/cross/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/02/18 13:46:33 tv Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/01 14:07:53 agc Exp $
#
# GNU binutils configured to hold `as many targets as the cross system is
# capable of using'. Configures and builds everything except gas, which
@@ -60,4 +60,9 @@ do-install:
.include "../../mk/bsd.pkg.mk"
ENABLE_TARGETS_LIST!= ${ECHO} "${ENABLE_TARGETS}" | ${SED} "s/[ ][ ]*/,/g;s/^,*//"
-EXTRACT_BEFORE_ARGS:= -X ${FILESDIR}/exclude ${EXTRACT_BEFORE_ARGS}
+
+.if defined(EXTRACT_USING_PAX)
+EXTRACT_ELEMENTS= '-s|${FILESDIR}/exclude||'
+.else
+EXTRACT_ELEMENTS= -X ${FILESDIR}/exclude
+.endif
diff --git a/databases/p5-gdbm/Makefile b/databases/p5-gdbm/Makefile
index 56763b0d1c8..d30883deb6c 100644
--- a/databases/p5-gdbm/Makefile
+++ b/databases/p5-gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/03/03 00:06:53 kim Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/01 14:07:53 agc Exp $
DISTNAME= perl5.004_04
PKGNAME= p5-gdbm-5.4.4
@@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org
USE_PERL5= YES
DEPENDS+= gdbm-1.7.3:../../databases/gdbm
-EXTRACT_AFTER_ARGS= perl5.004_04/ext/GDBM_File
+EXTRACT_ELEMENTS= perl5.004_04/ext/GDBM_File
WRKSRC= ${WRKDIR}/${EXTRACT_AFTER_ARGS}
do-configure:
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index d1c06126678..0cf03bf3066 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/12/18 00:42:39 tsarna Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/01 14:07:53 agc Exp $
#
DISTNAME= pyth151
@@ -18,7 +18,7 @@ DIST_SUBDIR= python
ALL_TARGET= default
-EXTRACT_AFTER_ARGS= Python-1.5.1/Modules/gdbmmodule.c
+EXTRACT_ELEMENTS= Python-1.5.1/Modules/gdbmmodule.c
PYTHON_CONFIGDIR= ${LOCALBASE}/lib/python1.5/config/
diff --git a/devel/rdp/Makefile b/devel/rdp/Makefile
index 9c45c26ee79..1728c03f491 100644
--- a/devel/rdp/Makefile
+++ b/devel/rdp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/08/20 15:16:50 tsarna Exp $
+# $NetBSD: Makefile,v 1.4 1999/04/01 14:07:53 agc Exp $
DISTNAME= rdp1_5
PKGNAME= rdp-1.5
@@ -11,8 +11,7 @@ HOMEPAGE= http://www.dcs.rhbnc.ac.uk/research/languages/rdp.shtml
BUILD_DEPENDS= unzip:../../archivers/unzip
-EXTRACT_CMD= unzip
-EXTRACT_BEFORE_ARGS= -Laqo
+EXTRACT_CMD= unzip -Laqo ${DOWNLOADED_DISTFILE}
WRKSRC= ${WRKDIR}/rdp
MAKEFILE= makefile
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 00708d24ace..4119d5809d7 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/02/04 18:54:35 agc Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/01 14:07:56 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
#
@@ -11,9 +11,7 @@ EXTRACT_SUFX= .msg.gz
MAINTAINER= packages@netbsd.org
NO_WRKSUBDIR= yes
-EXTRACT_CMD= zcat
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS= |sh
+EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
OPSYS!= uname -s
.if (${OPSYS} == "NetBSD")
diff --git a/games/svb/Makefile b/games/svb/Makefile
index 27347d6e200..0835268725d 100644
--- a/games/svb/Makefile
+++ b/games/svb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/09/07 03:23:09 garbled Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/01 14:07:53 agc Exp $
DISTNAME= svb
PKGNAME= svb-1.0
@@ -10,9 +10,7 @@ MAINTAINER= root@garbled.net
USE_IMAKE= yes
NO_WRKSUBDIR= yes
-EXTRACT_CMD= zcat
-EXTRACT_BEFORE_ARGS= #empty
-EXTRACT_AFTER_ARGS= |sh
+EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
NO_INSTALL_MANPAGES= yes
post-install:
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 242b5ed74f5..d61270deeac 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:49 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/01 14:07:54 agc Exp $
DISTNAME= linuxdoom-1.10
PKGNAME= xdoom-1.10
@@ -15,9 +15,8 @@ BUILD_DEPENDS= unzip:../../archivers/unzip
LICENSE= shareware
-EXTRACT_CMD= unzip
-EXTRACT_BEFORE_ARGS= -qo
EXTRACT_ONLY= doomsrc.zip
+EXTRACT_CMD= unzip -qo ${EXTRACT_ONLY}
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/lang/py-html-docs/Makefile b/lang/py-html-docs/Makefile
index 6a618fd16a6..ffe6f6f0f56 100644
--- a/lang/py-html-docs/Makefile
+++ b/lang/py-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:17:08 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/01 14:07:54 agc Exp $
#
DISTNAME= html-1.5.1
@@ -10,7 +10,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= tsarna@netbsd.org
HOMEPAGE= http://www.python.org/doc/
-EXTRACT_ONLY=
NO_CONFIGURE= yes
NO_BUILD= yes
@@ -20,10 +19,7 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}
${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
- (cd ${PREFIX}/${HTMLDIR}; \
- ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
- ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
- ${EXTRACT_AFTER_ARGS})
+ (cd ${WRKSRC}; pax -r -w -v -p -e . ${PREFIX}/${HTMLDIR})
(cd ${PREFIX}; find ${HTMLDIR} -type f -print >>${PLIST_SRC})
(cd ${PREFIX}; find -d ${HTMLDIR} -type d -print | \
${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
diff --git a/misc/py-readline/Makefile b/misc/py-readline/Makefile
index f27b6368df9..44d940791b4 100644
--- a/misc/py-readline/Makefile
+++ b/misc/py-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/12/18 00:42:40 tsarna Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/01 14:07:54 agc Exp $
#
DISTNAME= pyth151
@@ -16,7 +16,7 @@ DEPENDS+= readline-2.2:../../devel/readline
DIST_SUBDIR= python
ALL_TARGET= default
-EXTRACT_AFTER_ARGS= Python-1.5.1/Modules/readline.c
+EXTRACT_ELEMENTS= Python-1.5.1/Modules/readline.c
PYTHON_CONFIGDIR= ${LOCALBASE}/lib/python1.5/config
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 127344237ef..978f4dcf419 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.239 1999/04/01 07:29:14 agc Exp $
+# $NetBSD: bsd.pkg.mk,v 1.240 1999/04/01 14:07:55 agc Exp $
#
# This file is in the public domain.
#
@@ -266,31 +266,35 @@ PATCH_ARGS+= -C
PATCH_DIST_ARGS+= -C
.endif
+# New decompress and extract definitions
+
# If the archive has a .bz2 suffix, use bzip2 to extract information
# If EXTRACT_USING_PAX is defined, use pax in preference to (GNU) tar,
# and append 2 tar blocks of zero bytes on the end, in case the archive
# was written with a buggy version of GNU tar.
EXTRACT_SUFX?= .tar.gz
-.if (${EXTRACT_SUFX} == ".tar.bz2")
+
+.if ${EXTRACT_SUFX} == ".tar.bz2"
.if exists(/usr/bin/bzcat)
BZCAT= /usr/bin/bzcat
.else
BZCAT= ${LOCALBASE}/bin/bzcat
BUILD_DEPENDS+= ${BZCAT}:${PKGSRCDIR}/archivers/bzip2
.endif # !exists bzcat
-EXTRACT_CMD?= ${EXTRACT_SUBSHELL_OPEN} ${BZCAT}
-EXTRACT_BEFORE_ARGS?= <
-.else # suffix != .tar.bz2
-EXTRACT_CMD?= ${EXTRACT_SUBSHELL_OPEN} ${GZCAT}
-EXTRACT_BEFORE_ARGS?= <
+DECOMPRESS_CMD?= ${BZCAT}
+.else
+DECOMPRESS_CMD?= ${GZCAT}
+.endif
+
+# If this is empty, then everything gets extracted.
+EXTRACT_ELEMENTS?=
+
.if defined(EXTRACT_USING_PAX)
-EXTRACT_SUBSHELL_OPEN= (
-EXTRACT_AFTER_ARGS?= ; dd if=/dev/zero bs=10k count=2 ) | ${PAX} -r
+EXTRACT_CMD?= (${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} ; dd if=/dev/zero bs=10k count=2) | ${PAX} -r ${EXTRACT_ELEMENTS}
.else
-EXTRACT_AFTER_ARGS?= | /usr/bin/tar -xf -
-.endif # !pax
-.endif # suffix != .tar.bz2
+EXTRACT_CMD?= ${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | /usr/bin/tar xf - ${EXTRACT_ELEMENTS}
+.endif
# Figure out where the local mtree file is
.if !defined(MTREE_FILE)
@@ -1020,6 +1024,8 @@ mirror-distfiles:
# Extract
+DOWNLOADED_DISTFILE= ${_DISTDIR}/$$file
+
.if !target(do-extract)
do-extract:
.ifndef NO_WRKDIR
@@ -1036,7 +1042,7 @@ do-extract:
${_PKG_SILENT}${_PKG_DEBUG} \
for file in "" ${EXTRACT_ONLY}; do \
if [ "X$$file" = X"" ]; then continue; fi; \
- (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS}); \
+ (cd ${WRKDIR} && ${EXTRACT_CMD}); \
done
.endif
diff --git a/plan9/9menu/Makefile b/plan9/9menu/Makefile
index 7b75479cf8d..cbb0d110e11 100644
--- a/plan9/9menu/Makefile
+++ b/plan9/9menu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/02/04 18:54:35 agc Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/01 14:07:55 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/09/08 12:23:55 tg Exp
#
@@ -16,9 +16,7 @@ MANCOMPRESSED= yes
.endif
NO_WRKSUBDIR= yes
-EXTRACT_CMD= zcat
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS= |sh
+EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
USE_X11= yes
diff --git a/plan9/9wm/Makefile b/plan9/9wm/Makefile
index eb8cd5a881f..bd6943a68c3 100644
--- a/plan9/9wm/Makefile
+++ b/plan9/9wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/08/20 15:17:23 tsarna Exp $
+# $NetBSD: Makefile,v 1.10 1999/04/01 14:07:55 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/05/28 06:18:20 fenner Exp
#
@@ -11,9 +11,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://dhog.g7.org/dhog/9wm.html
NO_WRKSUBDIR= yes
-EXTRACT_CMD= zcat
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS= |sh
+EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
USE_IMAKE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/sam/Makefile b/plan9/sam/Makefile
index 00708d24ace..4119d5809d7 100644
--- a/plan9/sam/Makefile
+++ b/plan9/sam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/02/04 18:54:35 agc Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/01 14:07:56 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
#
@@ -11,9 +11,7 @@ EXTRACT_SUFX= .msg.gz
MAINTAINER= packages@netbsd.org
NO_WRKSUBDIR= yes
-EXTRACT_CMD= zcat
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS= |sh
+EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
OPSYS!= uname -s
.if (${OPSYS} == "NetBSD")
diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile
index 5f6766fafc8..591664545c8 100644
--- a/sysutils/crashme/Makefile
+++ b/sysutils/crashme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/10/15 19:51:08 agc Exp $
+# $NetBSD: Makefile,v 1.7 1999/04/01 14:07:56 agc Exp $
#
DISTNAME= crashme-2.4
@@ -10,9 +10,7 @@ MAINTAINER= agc@netbsd.org
HOMEPAGE= http://people.delphi.com/gjc/crashme.html
NO_WRKSUBDIR= yes
-EXTRACT_CMD= ${CAT}
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS= |sh
+EXTRACT_CMD= ${SH} ${DOWNLOADED_DISTFILE}
MAKEFILE= makefile
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index ac554c104b6..efd3e6b1f54 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/03/28 17:29:53 christos Exp $
+# $NetBSD: Makefile,v 1.15 1999/04/01 14:07:56 agc Exp $
# FreeBSD Id: Makefile,v 1.19 1998/03/08 06:44:48 obrien Exp
#
@@ -31,7 +31,11 @@ post-extract:
${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \
${FALSE} ; \
fi ; \
- ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS:S/z//} ${SRCBALL_NAME}.tar \
+ if [ "X${EXTRACT_USING_PAX}" = "X" ]; then \
+ ${GTAR} -xf ${SRCBALL_NAME}.tar; \
+ else \
+ ${PAX} -r < ${SRCBALL_NAME}.tar}; \
+ fi
)
@( cd ${WRKSRC} ; ${ECHO} "y" | ./Inventory || exit 1 )
diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile
index a370686ceee..852a27aa1bc 100644
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/08/20 15:17:29 tsarna Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/01 14:07:56 agc Exp $
#
DISTNAME= texi2html
@@ -12,9 +12,7 @@ HOMEPAGE= http://wwwcn1.cern.ch/dci/texi2html/
USE_PERL5= YES
-EXTRACT_CMD= ${GZCAT}
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS= |sh
+EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
NO_WRKSUBDIR= yes
NO_CONFIGURE= yes
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 072fa327cb2..19b8aeb9245 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/26 17:57:03 bad Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/01 14:07:56 agc Exp $
#
DISTNAME= CGI_Lite-1.62.pm
@@ -13,9 +13,7 @@ MAINTAINER= bad@netbsd.org
USE_PERL5= YES
-EXTRACT_CMD= ${GZIP_CMD}
-EXTRACT_BEFORE_ARGS= -dc
-EXTRACT_AFTER_ARGS= >CGI_Lite.pm
+EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} > CGI_Lite.pm
pre-configure:
${CP} ${FILESDIR}/Makefile.PL ${WRKDIR}/Makefile.PL
diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile
index b34745c670a..dfefcd1397e 100644
--- a/x11/xview-clients/Makefile
+++ b/x11/xview-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/07/06 22:19:58 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/04/01 14:07:56 agc Exp $
# $FreeBSD Id: Makefile,v 1.11 1996/11/16 10:49:52 asami Exp
#
@@ -12,7 +12,7 @@ MAINTAINER= packages@netbsd.org
DEPENDS= xview-lib-3.2.1:../../x11/xview-lib
MIRROR_DISTFILE= no
-EXTRACT_AFTER_ARGS= xview3.2p1-X11R6/clients xview3.2p1-X11R6/images
+EXTRACT_ELEMENTS= xview3.2p1-X11R6/clients xview3.2p1-X11R6/images
WRKSRC= ${WRKDIR}/xview3.2p1-X11R6/clients
USE_IMAKE= yes
diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile
index 48267065c5d..5f48ef9b7c6 100644
--- a/x11/xview-config/Makefile
+++ b/x11/xview-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/07/03 23:30:10 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/04/01 14:07:56 agc Exp $
# $FreeBSD Id: Makefile,v 1.9 1998/05/04 03:34:50 steve Exp
#
@@ -10,8 +10,8 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= packages@netbsd.org
MIRROR_DISTFILE= no
-EXTRACT_AFTER_ARGS= xview3.2p1-X11R6/config
-WRKSRC= ${WRKDIR}/${EXTRACT_AFTER_ARGS}
+EXTRACT_ELEMENTS= xview3.2p1-X11R6/config
+WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS}
USE_IMAKE= yes
NO_BUILD= yes
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 09:17:03 +0000