summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2008-05-25 21:42:20 +0000
committerjoerg <joerg>2008-05-25 21:42:20 +0000
commit7622068693aac7291caeacb4e6c439b5b70d4984 (patch)
tree19c914d506013e6c6d97e10862fb0eb8aa929390
parent134f7a8bab9057fc9e1e7893b2a26d1ceb4571bd (diff)
downloadpkgsrc-7622068693aac7291caeacb4e6c439b5b70d4984.tar.gz
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.
-rw-r--r--audio/eawpatches/Makefile3
-rw-r--r--audio/freepats/Makefile3
-rw-r--r--audio/wavesurfer/Makefile4
-rw-r--r--audio/xmms-funtimedancer/Makefile4
-rw-r--r--biology/mummer/Makefile4
-rw-r--r--cad/fastcap/Makefile4
-rw-r--r--cad/qcad-partlibrary/Makefile3
-rw-r--r--cad/qcad/Makefile4
-rw-r--r--databases/cstore/Makefile4
-rw-r--r--databases/mysql4-client/Makefile.common4
-rw-r--r--databases/mysql5-client/Makefile.common4
-rw-r--r--databases/py-ldap/Makefile4
-rw-r--r--devel/apache-ant/Makefile3
-rw-r--r--devel/bouml/Makefile4
-rw-r--r--devel/jflex/Makefile3
-rw-r--r--devel/libsigc++/Makefile4
-rw-r--r--devel/monotone/Makefile4
-rw-r--r--devel/py-setuptools/Makefile4
-rw-r--r--emulators/arnold/Makefile4
-rw-r--r--games/fortunes-de/Makefile4
-rw-r--r--geography/xrmap-anthems/Makefile3
-rw-r--r--graphics/ns-cult3d/Makefile3
-rw-r--r--graphics/urt/Makefile3
-rw-r--r--lang/caml-light/Makefile4
-rw-r--r--lang/erlang-doc/Makefile4
-rw-r--r--lang/erlang-man/Makefile4
-rw-r--r--mail/anomy-sanitizer/Makefile4
-rw-r--r--mail/exim-html/Makefile4
-rw-r--r--mail/sendmail/Makefile4
-rw-r--r--mail/sendmail813/Makefile4
-rw-r--r--mail/squirrelmail-locales/Makefile4
-rw-r--r--mail/squirrelmail/plugin.mk4
-rw-r--r--misc/ja-man/Makefile4
-rw-r--r--misc/rubygems/rubygem.mk4
-rw-r--r--misc/softmaker-office-demo/Makefile3
-rw-r--r--mk/bsd.pkg.mk4
-rw-r--r--print/teTeX3-texmf/Makefile4
-rw-r--r--print/tex-pgf/Makefile3
-rw-r--r--security/ssh-ip-tunnel/Makefile4
-rw-r--r--textproc/fop/Makefile3
-rw-r--r--textproc/jdom/Makefile3
-rw-r--r--www/apache-tomcat55/Makefile4
-rw-r--r--www/awstats/Makefile4
-rw-r--r--www/jakarta-tomcat5/Makefile4
-rw-r--r--www/jalbum/Makefile4
-rw-r--r--www/ruby-tag/Makefile7
-rw-r--r--www/screws/Makefile4
-rw-r--r--x11/gnome-themes-extras/Makefile10
-rw-r--r--x11/qt2-examples/Makefile4
49 files changed, 115 insertions, 78 deletions
diff --git a/audio/eawpatches/Makefile b/audio/eawpatches/Makefile
index 5674a07cc8d..31a3b55650f 100644
--- a/audio/eawpatches/Makefile
+++ b/audio/eawpatches/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/01/21 21:19:41 heinz Exp $
+# $NetBSD: Makefile,v 1.22 2008/05/25 21:42:20 joerg Exp $
#
DISTNAME= eawpats12_full
@@ -20,6 +20,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
NO_BUILD= yes
USE_LANGUAGES= # empty
+USE_TOOLS+= pax
MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
post-extract:
diff --git a/audio/freepats/Makefile b/audio/freepats/Makefile
index b680eb46935..ee4e8cced65 100644
--- a/audio/freepats/Makefile
+++ b/audio/freepats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/01/21 21:07:29 heinz Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/25 21:42:20 joerg Exp $
#
DISTNAME= freepats-20060219
@@ -16,6 +16,7 @@ WRKSRC= ${WRKDIR}/freepats
NO_CONFIGURE= yes
NO_BUILD= yes
USE_LANGUAGES= # empty
+USE_TOOLS+= pax
MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
diff --git a/audio/wavesurfer/Makefile b/audio/wavesurfer/Makefile
index be452a3b393..2a13ea7db3b 100644
--- a/audio/wavesurfer/Makefile
+++ b/audio/wavesurfer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/02 06:10:34 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/05/25 21:42:20 joerg Exp $
DISTNAME= wavesurfer-1.8.5
CATEGORIES= audio
@@ -13,6 +13,8 @@ DEPENDS+= tk-[0-9]*:../../x11/tk
PKG_DESTDIR_SUPPORT= user-destdir
+USE_TOOLS+= pax
+
NO_CONFIGURE= yes
NO_BUILD= yes
USE_LANGUAGES= # empty
diff --git a/audio/xmms-funtimedancer/Makefile b/audio/xmms-funtimedancer/Makefile
index 7add466f8a6..71ee622dca0 100644
--- a/audio/xmms-funtimedancer/Makefile
+++ b/audio/xmms-funtimedancer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/02/22 19:01:15 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2008/05/25 21:42:20 joerg Exp $
#
DISTNAME= FunTimeDancer-0.1
@@ -12,6 +12,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/ftd/
COMMENT= XMMS plugin displaying an animation
+USE_TOOLS+= pax
+
post-install:
cd ${WRKDIR} && \
pax -rw -pp FunTimeDancer ${PREFIX}/lib/xmms/Visualization
diff --git a/biology/mummer/Makefile b/biology/mummer/Makefile
index cd54bbe48dd..e8ee176200e 100644
--- a/biology/mummer/Makefile
+++ b/biology/mummer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/03 01:10:06 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/05/25 21:42:20 joerg Exp $
#
DISTNAME= MUMmer3.19
@@ -13,7 +13,7 @@ COMMENT= System for aligning whole genome sequences
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_TOOLS+= csh:run gmake perl:run
+USE_TOOLS+= csh:run gmake perl:run pax
USE_LANGUAGES= c c++
MAKE_ENV+= SH=${SH:Q}
diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile
index 583e7db3dd7..d3ef66cf4ad 100644
--- a/cad/fastcap/Makefile
+++ b/cad/fastcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/03/03 01:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2008/05/25 21:42:20 joerg Exp $
#
DISTNAME= fastcap-2.0-18Sep92
@@ -14,7 +14,7 @@ COMMENT= Fast 3-D capacitance solver
PKG_DESTDIR_SUPPORT= user-destdir
-EXTRACT_USING= gtar # cannot be extracted with pax as tar
+EXTRACT_USING= bsdtar
WRKSRC= ${WRKDIR}
HAS_CONFIGURE= yes
diff --git a/cad/qcad-partlibrary/Makefile b/cad/qcad-partlibrary/Makefile
index b84a5bbf742..b0909d6e927 100644
--- a/cad/qcad-partlibrary/Makefile
+++ b/cad/qcad-partlibrary/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/03/03 01:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/25 21:42:20 joerg Exp $
#
DISTNAME= partlibrary-2.0.1.2-1
@@ -16,6 +16,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
NO_CONFIGURE= yes
NO_BUILD= yes
+USE_TOOLS+= pax
DEPENDS+= qcad>=2.0.0.0:../../cad/qcad
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 02b5fa8c0f7..f156e15e04c 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2008/04/03 10:53:46 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2008/05/25 21:42:20 joerg Exp $
#
DISTNAME= qcad-2.0.5.0-1-community.src
@@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
COMMENT= 2D CAD system
GNU_CONFIGURE= yes
-USE_TOOLS+= autoconf gmake
+USE_TOOLS+= autoconf gmake pax
USE_LANGUAGES= c c++
CONFIGURE_DIRS= fparser dxflib
diff --git a/databases/cstore/Makefile b/databases/cstore/Makefile
index 9e0eec4db03..f4c43a9cbfe 100644
--- a/databases/cstore/Makefile
+++ b/databases/cstore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/03 15:21:07 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/25 21:42:20 joerg Exp $
DISTNAME= cstore0.2
PKGNAME= cstore-0.2
@@ -14,7 +14,7 @@ COMMENT= Read-optimised column store relational DBMS
PKG_DESTDIR_SUPPORT= user-destdir
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pax
USE_LANGUAGES+= c c++
WRKSRC= ${WRKDIR}/cstore
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index c972e5fb2cc..ef2182503bc 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.65 2008/03/26 13:29:58 wiz Exp $
+# $NetBSD: Makefile.common,v 1.66 2008/05/25 21:42:20 joerg Exp $
#
# used by databases/mysql4-server/Makefile
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
-EXTRACT_USING= pax
+EXTRACT_USING= bsdtar
# MYSQL_USER username of the database administrator
# MYSQL_GROUP group of the database administrator
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index ea55fc79935..0e5e1cf107d 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2008/03/06 16:50:38 jlam Exp $
+# $NetBSD: Makefile.common,v 1.31 2008/05/25 21:42:21 joerg Exp $
DISTNAME= mysql-5.0.51
CATEGORIES= databases
@@ -13,7 +13,7 @@ GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
-EXTRACT_USING= pax
+EXTRACT_USING= bsdtar
# MYSQL_USER username of the database administrator
# MYSQL_GROUP group of the database administrator
diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index 877d11a9a25..765a077cce1 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/04/25 20:39:07 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2008/05/25 21:42:21 joerg Exp $
DISTNAME= python-ldap-2.3.1
PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -27,6 +27,8 @@ SUBST_SED.setup+= -e "s|@PY_LDAP_LIBS@|${PY_LDAP_LIBS}|"
PY_LDAP_DOCDIR= ${PREFIX}/share/doc/py-ldap
+USE_TOOLS+= pax
+
post-install:
${INSTALL_DATA_DIR} ${PY_LDAP_DOCDIR}
cd ${WRKSRC} && pax -rw CHANGES README INSTALL TODO Demo \
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}
diff --git a/emulators/arnold/Makefile b/emulators/arnold/Makefile
index 60adf474510..20db5fa3c9a 100644
--- a/emulators/arnold/Makefile
+++ b/emulators/arnold/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/05/25 13:16:11 dillo Exp $
+# $NetBSD: Makefile,v 1.20 2008/05/25 21:42:21 joerg Exp $
#
DISTNAME= arnsrc27012002
@@ -28,6 +28,8 @@ SHAREDIR= ${PREFIX}/share/arnold
MAKE_ENV+= SHAREDIR=${SHAREDIR}
AUTO_MKDIRS= yes
+USE_TOOLS+= pax
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/arnold ${DESTDIR}${PREFIX}/bin
cd ${WRKSRC}/roms && pax -wr * ${DESTDIR}${SHAREDIR}/roms/
diff --git a/games/fortunes-de/Makefile b/games/fortunes-de/Makefile
index 45334686fc5..a3221d3ca0a 100644
--- a/games/fortunes-de/Makefile
+++ b/games/fortunes-de/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/04 06:59:04 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/25 21:42:21 joerg Exp $
#
DISTNAME= fortunes-de-0.20
@@ -18,6 +18,8 @@ STRFILE= ${LOCALBASE}/bin/strfile
INSTALLATION_DIRS= share/games/fortune/de
CHECK_PORTABILITY_SKIP= install.sh
+USE_TOOLS+= pax
+
do-build:
find ${WRKSRC}/data -type f ! -name "*.dat" -exec ${STRFILE} {} \;
diff --git a/geography/xrmap-anthems/Makefile b/geography/xrmap-anthems/Makefile
index 63889eda1e4..cf8979deae6 100644
--- a/geography/xrmap-anthems/Makefile
+++ b/geography/xrmap-anthems/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/03/04 14:44:05 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/25 21:42:21 joerg Exp $
#
DISTNAME= anthems-1.1
@@ -19,6 +19,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
NO_BUILD= yes
INSTALLATION_DIRS= share/rmap
+USE_TOOLS+= pax
do-install:
cd ${WRKSRC} && pax -rw -pp anthems ${DESTDIR}${PREFIX}/share/rmap
diff --git a/graphics/ns-cult3d/Makefile b/graphics/ns-cult3d/Makefile
index b92692b170b..dd9c8079095 100644
--- a/graphics/ns-cult3d/Makefile
+++ b/graphics/ns-cult3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/03/04 15:39:10 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/05/25 21:42:21 joerg Exp $
#
DISTNAME= Cult3D_NS4_5.2b1
@@ -18,6 +18,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/cult3d-5.2-b1-linux-x86
NO_CONFIGURE= yes
NO_BUILD= yes
+USE_TOOLS+= pax
CHECK_SHLIBS_SUPPORTED= no
CRYPTO= yes
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index 9dcc07e4e53..6ee75b32a23 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2008/02/28 11:58:48 rillig Exp $
+# $NetBSD: Makefile,v 1.51 2008/05/25 21:42:21 joerg Exp $
DISTNAME= urt
PKGNAME= urt-3.1b1
@@ -21,6 +21,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
USE_LIBTOOL= yes
+USE_TOOLS+= pax
CONFIGURE_SCRIPT=./Configure
CONFIGURE_ARGS+= config/urt
HAS_CONFIGURE= yes
diff --git a/lang/caml-light/Makefile b/lang/caml-light/Makefile
index b90c4c611c7..b7fad411f1f 100644
--- a/lang/caml-light/Makefile
+++ b/lang/caml-light/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/01/18 20:44:25 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/25 21:42:21 joerg Exp $
#
DISTNAME= cl74unix
@@ -14,6 +14,8 @@ WRKSRC= ${WRKDIR}/cl74/src
BUILD_TARGET= world
MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man1
+USE_TOOLS+= pax
+
do-configure:
cd ${WRKSRC} && make configure
diff --git a/lang/erlang-doc/Makefile b/lang/erlang-doc/Makefile
index c99f6dfc978..88ce84c3bc6 100644
--- a/lang/erlang-doc/Makefile
+++ b/lang/erlang-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/01/04 14:10:06 ghen Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/25 21:42:21 joerg Exp $
DISTNAME= otp_doc_html_${DIST_VERSION_MAJOR}-${DIST_VERSION_MINOR}
PKGNAME= erlang-doc-${ERLANG_VERSION}
@@ -19,6 +19,8 @@ PKG_DESTDIR_SUPPORT= user-destdir
NO_CONFIGURE= yes
NO_BUILD= yes
+USE_TOOLS+= pax
+
# these files are already installed by ../../lang/erlang:
DUPLICATE_FILES= lib/cosEvent-${VERSION.cosEvent}/info
DUPLICATE_FILES+= lib/cosEventDomain-${VERSION.cosEventDomain}/info
diff --git a/lang/erlang-man/Makefile b/lang/erlang-man/Makefile
index c458a53bd7b..22d7287072f 100644
--- a/lang/erlang-man/Makefile
+++ b/lang/erlang-man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/01/04 14:10:06 ghen Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/25 21:42:21 joerg Exp $
DISTNAME= otp_doc_man_${DIST_VERSION_MAJOR}-${DIST_VERSION_MINOR}
PKGNAME= erlang-man-${ERLANG_VERSION}
@@ -14,6 +14,8 @@ DIST_SUBDIR= erlang
# needs erlang installed for its directory structure
DEPENDS+= erlang-${ERLANG_VERSION}{,nb*}:../../lang/erlang
+USE_TOOLS+= pax
+
PKG_DESTDIR_SUPPORT= user-destdir
NO_CONFIGURE= yes
diff --git a/mail/anomy-sanitizer/Makefile b/mail/anomy-sanitizer/Makefile
index 68a8fdd739b..3e67a8471bd 100644
--- a/mail/anomy-sanitizer/Makefile
+++ b/mail/anomy-sanitizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/03/04 17:57:17 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2008/05/25 21:42:21 joerg Exp $
#
DISTNAME= anomy-sanitizer-1.76
@@ -19,7 +19,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
WRKSRC= ${WRKDIR}/anomy
-USE_TOOLS+= perl:run
+USE_TOOLS+= perl:run pax
REPLACE_PERL+= bin/*.pl
CHECK_INTERPRETER_SKIP+= *.pm
diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index 14f44febe66..4b2c4b1e362 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/05/25 21:42:21 joerg Exp $
DISTNAME= exim-html-4.69
CATEGORIES= mail net
@@ -16,6 +16,8 @@ PKG_DESTDIR_SUPPORT= user-destdir
NO_BUILD= yes
INSTALLATION_DIRS= share/doc/exim/html
+USE_TOOLS+= pax
+
do-install:
cd ${WRKSRC}/doc/html && pax -wr * \
${DESTDIR}${PREFIX}/share/doc/exim/html
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 24ff9d1abf9..3de09ecb563 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2007/10/19 09:11:45 jnemeth Exp $
+# $NetBSD: Makefile,v 1.103 2008/05/25 21:42:21 joerg Exp $
PKGNAME= sendmail-${DIST_VERS}
COMMENT= The well known Mail Transport Agent
@@ -10,6 +10,8 @@ PKG_DESTDIR_SUPPORT= destdir
.include "options.mk"
.include "../../mail/sendmail/Makefile.common"
+USE_TOOLS+= pax
+
MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
diff --git a/mail/sendmail813/Makefile b/mail/sendmail813/Makefile
index 7cc7d8ed79f..3763fd55fc4 100644
--- a/mail/sendmail813/Makefile
+++ b/mail/sendmail813/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/10/19 09:20:03 jnemeth Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/25 21:42:21 joerg Exp $
PKG_DESTDIR_SUPPORT= destdir
@@ -8,6 +8,8 @@ PKGNAME= sendmail-${DIST_VERS}
PKGREVISION= 4
COMMENT= The well known Mail Transport Agent
+USE_TOOLS+= pax
+
CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC
diff --git a/mail/squirrelmail-locales/Makefile b/mail/squirrelmail-locales/Makefile
index 3b8622b8d1f..d4b4999a6d2 100644
--- a/mail/squirrelmail-locales/Makefile
+++ b/mail/squirrelmail-locales/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/03/04 17:57:20 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2008/05/25 21:42:22 joerg Exp $
DISTNAME= all_locales-${VER}-20071220
PKGNAME= squirrelmail-locales-${VER}
@@ -16,7 +16,7 @@ VER= 1.4.13
PKG_DESTDIR_SUPPORT= user-destdir
NO_CONFIGURE= yes
-USE_TOOLS+= tar
+USE_TOOLS+= pax
INSTALLATION_DIRS= share/squirrelmail
WRKSRC= ${WRKDIR}
diff --git a/mail/squirrelmail/plugin.mk b/mail/squirrelmail/plugin.mk
index a0b7cdabf7b..79e6466429d 100644
--- a/mail/squirrelmail/plugin.mk
+++ b/mail/squirrelmail/plugin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugin.mk,v 1.5 2008/03/04 17:57:20 jlam Exp $
+# $NetBSD: plugin.mk,v 1.6 2008/05/25 21:42:21 joerg Exp $
DISTNAME?= ${PLUGIN_NAME}-${PLUGIN_VERSION}
PKGNAME= sm-${PLUGIN_NAME}-${PLUGIN_VERSION}
@@ -17,6 +17,8 @@ INSTALLATION_DIRS+= ${PLUGIN_DIR}
PLIST_SUBST+= PLUGIN_DIR=${PLUGIN_DIR:Q}
+USE_TOOLS+= pax
+
do-install:
cd ${WRKSRC:Q} && \
find . -type f ! -name '*.orig' 2>/dev/null | \
diff --git a/misc/ja-man/Makefile b/misc/ja-man/Makefile
index f047c8c841e..8e0b43667e0 100644
--- a/misc/ja-man/Makefile
+++ b/misc/ja-man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/02/17 02:23:52 obache Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/25 21:42:22 joerg Exp $
DISTNAME= NetBSD1.3I-jman-19990531
PKGNAME= ja-man-19990531
@@ -23,7 +23,7 @@ MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}/${JAMANDIR}
PLIST_SRC= ${WRKDIR}/PLIST
-USE_TOOLS+= patch
+USE_TOOLS+= patch pax
USE_BSD_MAKE= yes
MANCOMPRESSED_IF_MANZ= yes
INSTALLATION_DIRS= bin share/groff/tmac/mdoc share/examples
diff --git a/misc/rubygems/rubygem.mk b/misc/rubygems/rubygem.mk
index 3534038d2f8..68ba2d1d10d 100644
--- a/misc/rubygems/rubygem.mk
+++ b/misc/rubygems/rubygem.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubygem.mk,v 1.36 2008/03/31 15:47:44 jlam Exp $
+# $NetBSD: rubygem.mk,v 1.37 2008/05/25 21:42:22 joerg Exp $
#
# This Makefile fragment is intended to be included by packages that build
# and install Ruby gems.
@@ -262,6 +262,8 @@ RUBYGEM_GENERATE_PLIST= \
${FIND} ${GEM_DOCDIR:S|${PREFIX}/||} -type d -print | \
${SORT} -r | ${SED} -e "s,^,@dirrm ," );
+USE_TOOLS+= pax
+
.PHONY: gem-install
do-install: gem-install
gem-install:
diff --git a/misc/softmaker-office-demo/Makefile b/misc/softmaker-office-demo/Makefile
index 5db7ba90852..96c3884e56b 100644
--- a/misc/softmaker-office-demo/Makefile
+++ b/misc/softmaker-office-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/04 19:21:12 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/25 21:42:22 joerg Exp $
#
DISTNAME= ofl06trial
@@ -22,6 +22,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/officetrial
USE_LANGUAGES= # none
+USE_TOOLS+= pax
EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= base x11
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 24c934b1cdf..ce7a3222bc8 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1944 2008/05/23 12:31:24 joerg Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1945 2008/05/25 21:42:22 joerg Exp $
#
# This file is in the public domain.
#
@@ -412,7 +412,7 @@ _BUILD_DEFS+= PKG_SYSCONFBASEDIR PKG_SYSCONFDIR
USE_TOOLS+= \
[ awk basename cat chgrp chmod chown cmp cp cut dirname echo \
egrep env false file find grep head hostname id install ln ls \
- mkdir mv pax printf pwd rm rmdir sed sh sort \
+ mkdir mv printf pwd rm rmdir sed sh sort \
tail test touch tr true wc xargs
# bsd.wrapper.mk
diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index a945480391a..03764f99997 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/05/30 00:26:22 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2008/05/25 21:42:22 joerg Exp $
#
DISTNAME= tetex-texmf-3.0
@@ -24,7 +24,7 @@ REPLACE_PERL+= doc/generic/ruhyphen/reduce-patt doc/generic/ruhyphen/sorthyph
CHECK_INTERPRETER_SKIP+=share/texmf-dist/doc/generic/ruhyphen/reduce-patt \
share/texmf-dist/doc/generic/ruhyphen/sorthyph
REPLACE_SH+= doc/latex/bibunits/bibtexall doc/latex/multibib/bibtexall
-USE_TOOLS+= sh:run
+USE_TOOLS+= sh:run pax
INSTALLATION_DIRS= share/texmf-dist
diff --git a/print/tex-pgf/Makefile b/print/tex-pgf/Makefile
index 01ec80a5564..548c0df5e18 100644
--- a/print/tex-pgf/Makefile
+++ b/print/tex-pgf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/04/09 19:34:41 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/25 21:42:22 joerg Exp $
#
DISTNAME= pgf-1.10
@@ -15,6 +15,7 @@ DEPENDS= tex-xkeyval-[0-9]*:../../print/tex-xkeyval
USE_LANGUAGES= # none
+USE_TOOLS+= pax
USE_DIRS+= texmf-1.4
.include "../../print/teTeX/module.mk"
diff --git a/security/ssh-ip-tunnel/Makefile b/security/ssh-ip-tunnel/Makefile
index 0729e13003f..6a7c4f6c96f 100644
--- a/security/ssh-ip-tunnel/Makefile
+++ b/security/ssh-ip-tunnel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/12/30 09:15:36 obache Exp $
+# $NetBSD: Makefile,v 1.16 2008/05/25 21:42:22 joerg Exp $
DISTNAME= vpn-1.0
PKGNAME= ssh-ip-tunnel-1.0
@@ -17,6 +17,8 @@ SSH= ${PREFIX}/bin/ssh
SSH= /usr/bin/ssh
.endif
+USE_TOOLS+= pax
+
CONFLICTS= vpn-1.0
GNU_CONFIGURE= YES
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 8d3a44c9b09..b3e4371a615 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/10/04 22:00:59 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2008/05/25 21:42:22 joerg Exp $
#
# Note: we currently use the pre-built (-bin) distribution of FOP,
# because although FOP runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -23,6 +23,7 @@ COMMENT= The Apache Project's XSL Formatting Objects implementation
WRKSRC= ${WRKDIR}
USE_JAVA= run
+USE_TOOLS+= pax
NO_CONFIGURE= yes
NO_BUILD= yes
INSTALLATION_DIRS= lib/java share/doc/java/fop
diff --git a/textproc/jdom/Makefile b/textproc/jdom/Makefile
index 036da870421..a39aaa74720 100644
--- a/textproc/jdom/Makefile
+++ b/textproc/jdom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/03/04 11:02:25 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/25 21:42:22 joerg Exp $
#
DISTNAME= jdom-1.0
@@ -13,6 +13,7 @@ COMMENT= Simple API for processing XML documents in Java
BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
USE_LANGUAGES= # only Java
+USE_TOOLS+= pax
AUTO_MKDIRS= yes
do-build:
diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile
index bac4bcc0fe9..7844d91a56c 100644
--- a/www/apache-tomcat55/Makefile
+++ b/www/apache-tomcat55/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/03/12 20:41:48 adrianp Exp $
+# $NetBSD: Makefile,v 1.14 2008/05/25 21:42:22 joerg Exp $
DISTNAME= apache-tomcat-${TOMCAT_VERSION}
CATEGORIES= www java
@@ -25,7 +25,7 @@ EGDIR2= ${EGDIR}/${CATALINA_DIR}
# Work around a bug in NetBSD 2.0's pax-as-tar (bin/27228)
.if !empty(MACHINE_PLATFORM:MNetBSD-2.0*)
-EXTRACT_USING= gtar
+EXTRACT_USING= bsdtar
.endif
PKG_SYSCONFDIR.apache-tomcat= ${TOMCAT_LIB}/conf
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 1884c233765..e03a78c7a10 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/04/07 07:21:00 adam Exp $
+# $NetBSD: Makefile,v 1.36 2008/05/25 21:42:22 joerg Exp $
DISTNAME= awstats-6.7
CATEGORIES= www
@@ -10,7 +10,7 @@ COMMENT= Free real-time logfile analyzer to get advanced web statistics
NO_BUILD= yes
-USE_TOOLS+= perl:run
+USE_TOOLS+= perl:run pax
REPLACE_PERL+= tools/*.pl
REPLACE_PERL+= wwwroot/cgi-bin/*.pl
REPLACE_PERL+= wwwroot/cgi-bin/plugins/*.pm
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index 4d317c2ecb7..3af12e97123 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/10/04 22:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/25 21:42:22 joerg Exp $
PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION}
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
@@ -27,7 +27,7 @@ EGDIR2= ${EGDIR}/${CATALINA_DIR}
# Work around a bug in NetBSD 2.0's pax-as-tar (bin/27228)
.if !empty(MACHINE_PLATFORM:MNetBSD-2.0*)
-EXTRACT_USING= gtar
+EXTRACT_USING= bsdtar
.endif
PKG_SYSCONFDIR.jakarta-tomcat5= ${TOMCAT_LIB}/conf
diff --git a/www/jalbum/Makefile b/www/jalbum/Makefile
index af0ecf1141b..400167b1ed6 100644
--- a/www/jalbum/Makefile
+++ b/www/jalbum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/10/30 19:31:43 martti Exp $
+# $NetBSD: Makefile,v 1.20 2008/05/25 21:42:22 joerg Exp $
DISTNAME= JAlbum${VERSION}
PKGNAME= jalbum-${VERSION}
@@ -22,6 +22,8 @@ WRKSRC= ${WRKDIR}/JAlbum
INSTALLATION_DIRS+= ${PREFIX:Q}/share/jalbum
+USE_TOOLS+= pax
+
do-build:
sed -e s#@PKG_JAVA_HOME@#${PKG_JAVA_HOME:Q}#g \
-e s#@PREFIX@#${PREFIX:Q}#g \
diff --git a/www/ruby-tag/Makefile b/www/ruby-tag/Makefile
index 1eeb7650d0f..a3e28a42429 100644
--- a/www/ruby-tag/Makefile
+++ b/www/ruby-tag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:11:28 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/25 21:42:22 joerg Exp $
DISTNAME= tag104
PKGNAME= ${RUBY_PKGPREFIX}-tag-1.0.4
@@ -11,10 +11,7 @@ MAINTAINER= taca@NetBSD.org
HOMEPAGE= http://www.moonwolf.com/ruby/tag.html
COMMENT= Ruby Simple HTML Tag library for CGI
-# The distfile cannot be extracted with some tar (e.g. NetBSD 2.0)
-# or some pax (e.g. NetBSD 1.6). Force use of gtar instead.
-#
-EXTRACT_USING= gtar
+EXTRACT_USING= bsdtar
WRKSRC= ${WRKDIR}
NO_CONFIGURE= yes
diff --git a/www/screws/Makefile b/www/screws/Makefile
index f4fd6915903..0d198f4425d 100644
--- a/www/screws/Makefile
+++ b/www/screws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/01/18 05:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2008/05/25 21:42:22 joerg Exp $
#
DISTNAME= screws-0.56
@@ -10,7 +10,7 @@ MAINTAINER= pancake@phreaker.net
HOMEPAGE= http://www.nopcode.org/?t=screws
COMMENT= SCRipt Enhanced Web Server
-USE_TOOLS+= perl:run
+USE_TOOLS+= perl:run pax
PKG_GROUPS_VARS+= SCREWS_GROUP
PKG_USERS_VARS+= SCREWS_USER
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}