diff options
| author | agc <agc@pkgsrc.org> | 1998-03-09 18:36:51 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1998-03-09 18:36:51 +0000 |
| commit | 5f515a6d974e1be0a5b1ed625c8c129e3bcd41b4 (patch) | |
| tree | 68eb09a58943f10e9a70ca53e17967f8991b1338 /mk | |
| parent | ae45c9a50683fc159de1e7b1959fd9c03a8991a1 (diff) | |
| download | pkgsrc-5f515a6d974e1be0a5b1ed625c8c129e3bcd41b4.tar.gz | |
Temporarily revert to using GNU tar, until pax is bug-compatible with
gtar. pax has problems extracting certain archives which were made by
gtar and contain trailing trash at the end - gtar ignores this dross,
pax thinks it's valid, and prompts for the second volume.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 9 | ||||
| -rw-r--r-- | mk/bsd.port.mk | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 41888f31060..bbdb290bfb5 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.57 1998/03/08 14:55:04 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.58 1998/03/09 18:36:51 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -494,7 +494,12 @@ PATCH_ARGS+= -C PATCH_DIST_ARGS+= -C .endif -.if exists(/bin/pax) +# Turn off pax on NetBSD for just now. pax is not bug-compatible with +# GNU tar yet, and some of the archives contain dross after the end of +# archive. tar ignores this, pax thinks it's valid, and asks for the +# second volume of the archive. + +.if exists(/bin/pax) && (${OPSYS} != "NetBSD") EXTRACT_CMD?= /bin/pax EXTRACT_BEFORE_ARGS?= -zrf .else diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index 1f53dd02c76..a340384486d 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.57 1998/03/08 14:55:04 hubertf Exp $ +# $NetBSD: bsd.port.mk,v 1.58 1998/03/09 18:36:51 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -494,7 +494,12 @@ PATCH_ARGS+= -C PATCH_DIST_ARGS+= -C .endif -.if exists(/bin/pax) +# Turn off pax on NetBSD for just now. pax is not bug-compatible with +# GNU tar yet, and some of the archives contain dross after the end of +# archive. tar ignores this, pax thinks it's valid, and asks for the +# second volume of the archive. + +.if exists(/bin/pax) && (${OPSYS} != "NetBSD") EXTRACT_CMD?= /bin/pax EXTRACT_BEFORE_ARGS?= -zrf .else |