summaryrefslogtreecommitdiff
path: root/benchmarks
diff options
context:
space:
mode:
authoragc <agc>1999-04-01 14:07:52 +0000
committeragc <agc>1999-04-01 14:07:52 +0000
commit0e80196c5fa544a8f2ac9cb799fbe25948361831 (patch)
tree912abdad11a5164aee0a40a8b94b48bf6cea9e79 /benchmarks
parent131321b966a315123f6c845f7317d4277e5363a2 (diff)
downloadpkgsrc-0e80196c5fa544a8f2ac9cb799fbe25948361831.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 'benchmarks')
-rw-r--r--benchmarks/hint/Makefile4
-rw-r--r--benchmarks/paranoia/Makefile6
-rw-r--r--benchmarks/whetstone/Makefile6
3 files changed, 6 insertions, 10 deletions
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)