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.

2 files changed, 6 insertions, 8 deletions

diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index 09e2640ef72..311bdc07c36 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/04/26 00:49:51 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2008/05/25 21:42:22 joerg Exp $
 #
 
 DISTNAME=	gnome-themes-extras-2.22.0
@@ -11,12 +11,8 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Collection of metathemes for the GNOME desktop environment
 
 .include "../../mk/bsd.prefs.mk"
-# NetBSD's pax-as-tar truncates filenames
-.if ${OPSYS} == "DragonFly"
-# and so does older GNU tar
-TOOLS_PLATFORM.gtar=	/usr/bin/bsdtar
-.endif
-EXTRACT_USING=		gtar
+
+EXTRACT_USING=		bsdtar
 
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
diff --git a/x11/qt2-examples/Makefile b/x11/qt2-examples/Makefile
index 7070f882882..45ca2a424e5 100644
--- a/x11/qt2-examples/Makefile
+++ b/x11/qt2-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/02/15 15:28:48 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2008/05/25 21:42:22 joerg Exp $
 #
 
 PKGNAME=	qt2-examples-${QTVERSION}
@@ -19,6 +19,8 @@ SUBST_SED.ex+=		-e 's:\$$[({]QTDIR[})]:${QTPREFIX}:g'
 SUBST_SED.ex+=		-e 's:\$$[({]LOCALBASE[})]:${LOCALBASE}:g'
 SUBST_SED.ex+=		-e 's:\$$[({]LIBTOOL[})]:${LIBTOOL}:g'
 
+USE_TOOLS+=	pax
+
 do-install:
 	cd ${WRKSRC} && pax -wr -s ',.*Makefile\.in$$,,' examples tutorial ${QTPREFIX}