From 25269a4603e9a9f29a28946b67439e5d43316dee Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Fri, 27 Feb 1998 13:22:59 +0000
Subject: Patches from Matthew Green to use pax if it's present, in preference
 to tar.

---
 mk/bsd.pkg.mk  | 13 +++++++++----
 mk/bsd.port.mk | 13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'mk')

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)
-- 
cgit v1.2.3