summaryrefslogtreecommitdiff
path: root/plan9
diff options
context:
space:
mode:
authoragc <agc>1999-04-01 14:07:52 +0000
committeragc <agc>1999-04-01 14:07:52 +0000
commit9a7c454ba681cc22753b8d4c26f74b2e0fed2ae3 (patch)
tree912abdad11a5164aee0a40a8b94b48bf6cea9e79 /plan9
parent60da1ece312a07574750a2c97a062f550fa84256 (diff)
downloadpkgsrc-9a7c454ba681cc22753b8d4c26f74b2e0fed2ae3.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 'plan9')
-rw-r--r--plan9/9menu/Makefile6
-rw-r--r--plan9/9wm/Makefile6
-rw-r--r--plan9/sam/Makefile6
3 files changed, 6 insertions, 12 deletions
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")