diff options
| author | agc <agc> | 1998-02-27 13:22:59 +0000 |
|---|---|---|
| committer | agc <agc> | 1998-02-27 13:22:59 +0000 |
| commit | a793398e6240628a05f3603fbe9c61490a4075b6 (patch) | |
| tree | 670159f17128a052de924aef63130df24b46b941 /mk | |
| parent | b15b5e97ee18b0ce7041ec6afff7bdf936466612 (diff) | |
| download | pkgsrc-a793398e6240628a05f3603fbe9c61490a4075b6.tar.gz | |
Patches from Matthew Green to use pax if it's present, in preference
to tar.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 13 | ||||
| -rw-r--r-- | mk/bsd.port.mk | 13 |
2 files changed, 18 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 36845c2c217..47fe0727e77 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.pkg.mk,v 1.49 1998/02/20 22:06:18 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.50 1998/02/27 13:22:59 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -510,18 +510,23 @@ PATCH_ARGS+= -C PATCH_DIST_ARGS+= -C .endif +.if exists(/bin/pax) +EXTRACT_CMD?= /bin/pax +EXTRACT_BEFORE_ARGS?= -zrf +.else .if exists(/bin/tar) -EXTRACT_CMD?= /bin/tar +EXTRACT_CMD?= /bin/tar .else -EXTRACT_CMD?= /usr/bin/tar +EXTRACT_CMD?= /usr/bin/tar .endif -EXTRACT_SUFX?= .tar.gz # Backwards compatability. .if defined(EXTRACT_ARGS) EXTRACT_BEFORE_ARGS?= ${EXTRACT_ARGS} .else EXTRACT_BEFORE_ARGS?= -xzf .endif +.endif +EXTRACT_SUFX?= .tar.gz # Figure out where the local mtree file is .if !defined(MTREE_FILE) diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index e248023d98e..6f84f918fbb 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.port.mk,v 1.49 1998/02/20 22:06:18 hubertf Exp $ +# $NetBSD: bsd.port.mk,v 1.50 1998/02/27 13:22:59 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -510,18 +510,23 @@ PATCH_ARGS+= -C PATCH_DIST_ARGS+= -C .endif +.if exists(/bin/pax) +EXTRACT_CMD?= /bin/pax +EXTRACT_BEFORE_ARGS?= -zrf +.else .if exists(/bin/tar) -EXTRACT_CMD?= /bin/tar +EXTRACT_CMD?= /bin/tar .else -EXTRACT_CMD?= /usr/bin/tar +EXTRACT_CMD?= /usr/bin/tar .endif -EXTRACT_SUFX?= .tar.gz # Backwards compatability. .if defined(EXTRACT_ARGS) EXTRACT_BEFORE_ARGS?= ${EXTRACT_ARGS} .else EXTRACT_BEFORE_ARGS?= -xzf .endif +.endif +EXTRACT_SUFX?= .tar.gz # Figure out where the local mtree file is .if !defined(MTREE_FILE) |