Explicitly add pax dependency in those Makefiles that use it (or have

patches to add it). Drop pax from the default USE_TOOLS list.
Make bsdtar the default for those places that wanted gtar to extract
long links etc, as bsdtar can be built of the tree.

6 files changed, 12 insertions, 10 deletions

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 414128236c8..388c1420607 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2008/05/25 21:42:21 joerg Exp $
 #
 
 DISTNAME=	apache-ant-1.7.0
@@ -18,6 +18,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_JAVA=	run
 USE_JAVA2=	yes
+USE_TOOLS+=	pax
 NO_BUILD=	yes
 
 SUBST_CLASSES+=		ant
diff --git a/devel/bouml/Makefile b/devel/bouml/Makefile
index c8437b81b4d..16038fb97c5 100644
--- a/devel/bouml/Makefile
+++ b/devel/bouml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/06/05 05:56:42 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/25 21:42:21 joerg Exp $
 #
 
 DISTNAME=		bouml_${BOUMLVERSION}
@@ -13,7 +13,7 @@ COMMENT=		UML modeling tool, generates C++, JAVA, and IDL
 BOUMLVERSION=		2.27
 
 USE_LIBTOOL=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pax
 USE_LANGUAGES=		c++
 BUILD_TARGET=		compile
 USE_DIRS+=		xdg-1.3
diff --git a/devel/jflex/Makefile b/devel/jflex/Makefile
index eaa38990b3b..5292344fa73 100644
--- a/devel/jflex/Makefile
+++ b/devel/jflex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/03/04 11:02:24 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/25 21:42:21 joerg Exp $
 #
 
 DISTNAME=	jflex-1.4.1
@@ -13,6 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# none
 USE_JAVA=	run
+USE_TOOLS+=	pax
 
 INSTALLATION_DIRS=	bin lib/java share/doc/jflex share/examples/jflex
 
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 97c1e15b6f9..59237ed49b5 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/04/24 20:47:05 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2008/05/25 21:42:21 joerg Exp $
 
 DISTNAME=	libsigc++-2.2.2
 CATEGORIES=	devel
@@ -21,7 +21,7 @@ CONFLICTS+=		libsigc++2-[0-9]*
 # supported according to the file README
 GCC_REQD+=		3.2
 # use something that can extract long filenames in GNU format on NetBSD 1.6.x
-EXTRACT_USING=		pax
+EXTRACT_USING=		bsdtar
 
 PKGCONFIG_OVERRIDE=	sigc++-2.0.pc.in
 
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 4a8225aae02..909d23f6e98 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2008/04/29 20:26:47 dan Exp $
+# $NetBSD: Makefile,v 1.54 2008/05/25 21:42:21 joerg Exp $
 #
 
 DISTNAME=	monotone-0.40
@@ -16,7 +16,7 @@ GCC_REQD+=		3.0
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
 UNLIMIT_RESOURCES+=	datasize
-USE_TOOLS+=		gmake makeinfo
+USE_TOOLS+=		gmake makeinfo pax
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 
diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 3091bacd35b..ca492378fc7 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:09 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/25 21:42:21 joerg Exp $
 #
 
 EGG_VERSION=		0.6c6
@@ -15,7 +15,7 @@ COMMENT=		New Python packaging system
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYTHON_VERSIONS_ACCEPTED= 25 24
-USE_TOOLS+=		unzip
+USE_TOOLS+=		unzip pax
 
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	EGG_NAME=${EGG_NAME}