diff options
| author | agc <agc@pkgsrc.org> | 1999-04-01 14:07:52 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1999-04-01 14:07:52 +0000 |
| commit | 171e025b4a914da362b163a5c1b35de5704d732e (patch) | |
| tree | 912abdad11a5164aee0a40a8b94b48bf6cea9e79 /sysutils | |
| parent | cedce5937a71dab5e09821f072c8b4714d70b6d2 (diff) | |
| download | pkgsrc-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 'sysutils')
| -rw-r--r-- | sysutils/crashme/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/lsof/Makefile | 8 |
2 files changed, 8 insertions, 6 deletions
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 ) |