summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>1999-04-01 14:07:52 +0000
committeragc <agc@pkgsrc.org>1999-04-01 14:07:52 +0000
commit171e025b4a914da362b163a5c1b35de5704d732e (patch)
tree912abdad11a5164aee0a40a8b94b48bf6cea9e79 /archivers
parentcedce5937a71dab5e09821f072c8b4714d70b6d2 (diff)
downloadpkgsrc-171e025b4a914da362b163a5c1b35de5704d732e.tar.gz
Rewrite the extraction commands to be more intuitive.
In the vast majority of cases, nothing has changed (i.e. .tgz, .tar.gz, and .tar.bz2). EXTRACT_USING_PAX can be set as before. For custom extractions, instead of using EXTRACT_BEFORE_ARGS, EXTRACT_AFTER_ARGS and EXTRACT_CMD, simply set EXTRACT_CMD to be the command needed to decompress and extract the lements from the archive. ${DOWNLOADED_DISTFILE} can be used to reference the distfile(s). e.g. for compressed shars, where previously there was: EXTRACT_CMD= ${GZCAT} EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= |sh now use: EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
Diffstat (limited to 'archivers')
-rw-r--r--archivers/macutil/Makefile6
-rw-r--r--archivers/rar/Makefile5
-rw-r--r--archivers/zip1/Makefile5
3 files changed, 6 insertions, 10 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"