summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk9
-rw-r--r--mk/bsd.port.mk9
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