diff options
| author | jlam <jlam> | 2005-07-15 18:27:48 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-07-15 18:27:48 +0000 |
| commit | d2eea181f0c5ef51db2ef63ecadc8d3add70bd6b (patch) | |
| tree | 91f275af994eade5936cfd1677c803fdc48b0f89 | |
| parent | 6b7892b7405d77307d3b0c21dd5229fd6fa9d116 (diff) | |
| download | pkgsrc-d2eea181f0c5ef51db2ef63ecadc8d3add70bd6b.tar.gz | |
Drop distinction between PKGSRC_USE_TOOLS and USE_TOOLS by making
PKGSRC_USE_TOOLS go away. There is now only a single USE_TOOLS variable
that specifies all of the tools we need to build/run the package.
127 files changed, 314 insertions, 351 deletions
@@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.73 2005/06/06 22:30:19 kristerw Exp $ +# $NetBSD: Makefile,v 1.74 2005/07/15 18:27:48 jlam Exp $ # # tools used by this Makefile -PKGSRC_USE_TOOLS+= [ awk cat cmp echo env expr false fgrep grep mv \ - rm sed sort wc +USE_TOOLS+= [ awk cat cmp echo env expr false fgrep grep mv rm sed \ + sort wc # additional tools used by bsd.pkg.subdir.mk -PKGSRC_USE_TOOLS+= basename touch +USE_TOOLS+= basename touch # additional tools used by bsd.bulk-pkg.mk -PKGSRC_USE_TOOLS+= egrep find ls sh tee true tsort +USE_TOOLS+= egrep find ls sh tee true tsort .include "mk/bsd.prefs.mk" diff --git a/audio/gqmpeg-skins/Makefile b/audio/gqmpeg-skins/Makefile index 2c1dbd01e91..b4edf2194dd 100644 --- a/audio/gqmpeg-skins/Makefile +++ b/audio/gqmpeg-skins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/17 04:49:45 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/15 18:27:48 jlam Exp $ DISTNAME= gqmpeg-skins-20030712 PKGREVISION= 3 @@ -84,7 +84,7 @@ DIST_SUBDIR= gqmpeg-skins WRKSRC= ${WRKDIR}/Makefile PLIST distinfo NO_BUILD= yes -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar INSTALLATION_DIRS= share/gqmpeg/skins diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile index e55d355b4ed..6f7f3e7d9d4 100644 --- a/benchmarks/bonnie/Makefile +++ b/benchmarks/bonnie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/16 04:38:03 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/07/15 18:27:48 jlam Exp $ DISTNAME= bonnie PKGNAME= bonnie-2.06 @@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews NO_CONFIGURE= yes WRKSRC= ${WRKDIR} -PKGSRC_USE_TOOLS+= expr +USE_TOOLS+= expr MANCOMPRESSED_IF_MANZ= yes INSTALLATION_DIRS= bin man/cat1 man/man1 diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile index 788480e50c7..7c2e70c6589 100644 --- a/benchmarks/xengine/Makefile +++ b/benchmarks/xengine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/12 04:03:30 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/07/15 18:27:48 jlam Exp $ DISTNAME= xengine-1.0.1 PKGREVISION= 1 @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR} DIST_SUBDIR= xengine USE_IMAKE= yes -PKGSRC_USE_TOOLS+= gzcat patch sed +USE_TOOLS+= gzcat patch sed EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SED} "1,/\#!/d" | ${SH} diff --git a/biology/arka/Makefile b/biology/arka/Makefile index 0fb982e4c15..527c13108ad 100644 --- a/biology/arka/Makefile +++ b/biology/arka/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/05/15 22:02:26 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/07/15 18:27:48 jlam Exp $ # DISTNAME= arka-0.11 @@ -20,7 +20,7 @@ CPPFLAGS+= -DARKA_GLOBAL=\"${PKG_SYSCONFDIR}/arkarc\" CPPFLAGS+= -DARKA_PROGRAMS=\"${PKG_SYSCONFDIR}/arkarc\" INSTALLATION_DIRS= bin man/man1 -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gunzip post-build: cd ${WRKSRC} && ${GUNZIP_CMD} arka.1.gz diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile index 4e8c104d6df..01942b523b0 100644 --- a/biology/rasmol/Makefile +++ b/biology/rasmol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/15 22:02:26 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/07/15 18:27:48 jlam Exp $ DISTNAME= RasMol_2.7.1 PKGNAME= rasmol-2.7.1 @@ -12,7 +12,7 @@ COMMENT= Molecular Graphics Visualisation Tool WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_IMAKE= YES -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gunzip MAKE_ENV+= DEPTHDEF="${DEPTHDEF}" diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk index b8ca10d4aeb..8fc3ece3bee 100644 --- a/cross/COMMON/cross.mk +++ b/cross/COMMON/cross.mk @@ -1,4 +1,4 @@ -# $NetBSD: cross.mk,v 1.36 2005/06/27 15:53:36 rillig Exp $ +# $NetBSD: cross.mk,v 1.37 2005/07/15 18:27:48 jlam Exp $ # Shared definitions for building a cross-compile environment. @@ -45,7 +45,7 @@ AR_FOR_TARGET= ${WRKDIR}/ar NM_FOR_TARGET= ${WRKDIR}/nm RANLIB_FOR_TARGET= ${WRKDIR}/ranlib LD_FOR_TARGET= ${WRKDIR}/ld -PKGSRC_USE_TOOLS+= patch +USE_TOOLS+= patch pre-patch: binutils-patch pre-configure: binutils-configure diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile index 52b1243c376..f918d28dc9e 100644 --- a/cross/avr-gcc/Makefile +++ b/cross/avr-gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:44 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/15 18:27:48 jlam Exp $ DISTNAME= gcc-3.3.2003.05.11 PKGNAME= avr-gcc-3.3.2003.05.11 @@ -23,8 +23,7 @@ EXTRACT_ONLY= gcc-core+g++-3.3.2003.05.11${EXTRACT_SUFX} GNU_CONFIGURE= yes USE_PERL5= build USE_BZIP2= yes -USE_TOOLS+= bison gmake lex -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= bison gmake lex tar USE_PKGLOCALEDIR= yes CONFIGURE_ARGS= --target=avr --prefix=${PREFIX} diff --git a/cross/i386-mingw32/Makefile b/cross/i386-mingw32/Makefile index d79dd03b70f..1d6dd54d8c3 100644 --- a/cross/i386-mingw32/Makefile +++ b/cross/i386-mingw32/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:45 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/07/15 18:27:48 jlam Exp $ DISTNAME= cross-${TARGET_ARCH}-3.2 CROSS_DISTFILES= @@ -26,8 +26,7 @@ CROSS_DISTFILES+= mingw-runtime-3.2.tar.gz MINGW_WRKSRC= ${WRKDIR}/mingw-runtime-3.2 CROSS_DISTFILES+= w32api-2.5.tar.gz W32_WRKSRC= ${WRKDIR}/w32api-2.5 -USE_TOOLS+= gmake -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= gmake tar USE_PERL5= build WRKSRC= ${WRKDIR} # for the patch target diff --git a/databases/postgresql73-lib/Makefile b/databases/postgresql73-lib/Makefile index e96061ece82..112cf1154a0 100644 --- a/databases/postgresql73-lib/Makefile +++ b/databases/postgresql73-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/16 01:15:30 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/15 18:27:48 jlam Exp $ PKGNAME= postgresql73-lib-${BASE_VERS} PKGREVISION= 2 @@ -13,7 +13,7 @@ CONFIGURE_ARGS+= --with-openssl=${SSLBASE} BUILD_DIRS= ${WRKSRC}/src/include BUILD_DIRS+= ${WRKSRC}/src/interfaces BUILD_DIRS+= ${WRKSRC}/src/pl -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index 7c8655b988b..66b98d6533c 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/31 11:24:32 dillo Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/15 18:27:48 jlam Exp $ PKGNAME= postgresql73-server-${BASE_VERS} PKGREVISION= # empty @@ -16,7 +16,7 @@ NOT_FOR_PLATFORM= *-*-mips USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar CONFIGURE_ARGS+= --with-openssl=${SSLBASE} BUILD_DIRS= ${WRKSRC}/src/backend BUILD_DIRS+= ${WRKSRC}/src/backend/utils/mb/conversion_procs diff --git a/databases/postgresql74-client/Makefile b/databases/postgresql74-client/Makefile index 4a00ff8d1eb..118b759cc37 100644 --- a/databases/postgresql74-client/Makefile +++ b/databases/postgresql74-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/07/02 10:48:20 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/15 18:27:48 jlam Exp $ PKGNAME= postgresql74-client-${BASE_VERS} PKGREVISION= # empty @@ -10,7 +10,7 @@ COMMENT= PostgreSQL database client programs # XXX work around core dumps with the native libedit USE_GNU_READLINE= yes -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= tar CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-zlib CONFIGURE_ARGS+= --with-readline diff --git a/databases/postgresql74-docs/Makefile b/databases/postgresql74-docs/Makefile index 519d4606357..538d0f68776 100644 --- a/databases/postgresql74-docs/Makefile +++ b/databases/postgresql74-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/16 01:32:22 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:48 jlam Exp $ PKGNAME= postgresql74-docs-${BASE_VERS} SVR4_PKGNAME= pstgd @@ -8,7 +8,7 @@ COMMENT= PostgreSQL database system documentation NO_BUILD= yes NO_CONFIGURE= yes -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= tar #BUILD_DIRS= ${WRKSRC}/doc DOCDIR= ${PREFIX}/share/doc/postgresql diff --git a/databases/postgresql74-lib/Makefile b/databases/postgresql74-lib/Makefile index 024696b345a..11db0e62d35 100644 --- a/databases/postgresql74-lib/Makefile +++ b/databases/postgresql74-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/16 01:32:22 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/15 18:27:48 jlam Exp $ PKGNAME= postgresql74-lib-${BASE_VERS} PKGREVISION= 1 @@ -7,7 +7,7 @@ COMMENT= PostgreSQL database headers and libraries .include "../../databases/postgresql74/Makefile.common" -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= tar CONFIGURE_ARGS+= --with-openssl=${SSLBASE} .include "../../mk/bsd.prefs.mk" diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 5196268ed9a..c5c2f9c69bf 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/31 11:24:32 dillo Exp $ +# $NetBSD: Makefile,v 1.16 2005/07/15 18:27:48 jlam Exp $ PKGNAME= postgresql74-server-${BASE_VERS} PKGREVISION= # empty @@ -15,7 +15,7 @@ NOT_FOR_PLATFORM= *-*-mips USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL MESSAGE_SRC= ${.CURDIR}/MESSAGE -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= tar CONFIGURE_ARGS+= --with-openssl=${SSLBASE} BUILD_DIRS= ${WRKSRC}/src/backend diff --git a/databases/tcl-postgresql73/Makefile b/databases/tcl-postgresql73/Makefile index 8f3c5038fab..f2bd747d770 100644 --- a/databases/tcl-postgresql73/Makefile +++ b/databases/tcl-postgresql73/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/16 01:15:30 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/15 18:27:48 jlam Exp $ PKGNAME= tcl-postgresql73-${BASE_VERS} PKGREVISION= 1 @@ -13,7 +13,7 @@ CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" CONFIGURE_ENV+= TCLSH="${TCLSH}" TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh MAKE_ENV+= INSTALLED_LIBPQ=1 -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar BUILD_DIRS= ${WRKSRC}/src/interfaces/libpgtcl BUILD_DIRS+= ${WRKSRC}/src/bin/pgtclsh diff --git a/databases/tk-postgresql73/Makefile b/databases/tk-postgresql73/Makefile index 467626166c0..7403bc33e22 100644 --- a/databases/tk-postgresql73/Makefile +++ b/databases/tk-postgresql73/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:42 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:48 jlam Exp $ PKGNAME= tk-postgresql73-${BASE_VERS} PKGREVISION= 1 @@ -7,7 +7,7 @@ COMMENT= Tk interface to PostgreSQL .include "../postgresql73/Makefile.common" -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tk diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index 9f251df01bb..b8e59827750 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2005/05/22 20:07:50 jlam Exp $ +# $NetBSD: Makefile,v 1.65 2005/07/15 18:27:48 jlam Exp $ # DISTNAME= ddd-3.3.10 @@ -13,10 +13,9 @@ COMMENT= Data Display Debugger -- graphical front-end for GDB/DBX/XDB GNU_CONFIGURE= YES INFO_FILES= ddd-themes.info ddd.info TEST_TARGET= check -USE_TOOLS+= gmake +USE_TOOLS+= gmake gzip USE_LANGUAGES= c c++ USE_X11BASE= YES -PKGSRC_USE_TOOLS+= gzip GCC_REQD+= 3.0 diff --git a/devel/device-driver-doc-de/Makefile b/devel/device-driver-doc-de/Makefile index 1cd3b978202..a49effe8049 100644 --- a/devel/device-driver-doc-de/Makefile +++ b/devel/device-driver-doc-de/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/05/15 22:02:26 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/07/15 18:27:48 jlam Exp $ DISTNAME= NetBSD-treiber_schreiben PKGNAME= device-driver-doc-de-20030729 @@ -9,8 +9,8 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.unixag-kl.fh-kl.de/~jkunz/ COMMENT= Device driver documentation in German -NO_BUILD= yes -PKGSRC_USE_TOOLS+= gunzip +NO_BUILD= yes +USE_TOOLS+= gunzip do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/device-driver-doc-de diff --git a/devel/newt/Makefile b/devel/newt/Makefile index 84b1484f3e2..57dccced42b 100644 --- a/devel/newt/Makefile +++ b/devel/newt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:47 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:49 jlam Exp $ DISTNAME= ${PKGNAME_NOREV}-5.src.rpm PKGNAME= newt-0.51.6 @@ -13,8 +13,7 @@ COMMENT= Windowing toolkit based on libslang BUILD_DEPENDS+= rpm2pkg>=2.0:../../pkgtools/rpm2pkg -USE_TOOLS+= gmake gzcat -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= gmake gzcat tar USE_LIBTOOL= yes NO_EXPORT_CPP= yes diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index f1a8a2cfa69..0ec2404ba8e 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/05/22 20:07:54 jlam Exp $ +# $NetBSD: Makefile,v 1.44 2005/07/15 18:27:49 jlam Exp $ DISTNAME= pwlib-v1_8_3-src PKGNAME= pwlib-1.8.3 @@ -14,8 +14,7 @@ COMMENT= Portable Windows Libary BUILD_DEPENDS= bison-[0-9]*:../../devel/bison WRKSRC= ${WRKDIR}/pwlib -USE_TOOLS+= gmake -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= gmake tar USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGINSTALL= yes diff --git a/editors/ted-en-us/Makefile b/editors/ted-en-us/Makefile index 3e92ee3715d..2e6a5ff2650 100644 --- a/editors/ted-en-us/Makefile +++ b/editors/ted-en-us/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:49 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:49 jlam Exp $ DISTNAME= ted-2.16.src PKGNAME= ted-en-us-2.16 @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/Ted-2.16 USE_X11BASE= YES NO_BUILD= YES -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar INSTALLATION_DIRS= share/Ted/ind post-extract: diff --git a/editors/ted/Makefile b/editors/ted/Makefile index e405286c90c..08ca182eb95 100644 --- a/editors/ted/Makefile +++ b/editors/ted/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/16 01:15:31 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/15 18:27:49 jlam Exp $ DISTNAME= ted-2.16.src PKGNAME= ted-2.16 @@ -13,7 +13,7 @@ COMMENT= X11 based WordPad-like word processor PKG_INSTALLATION_TYPES= overwrite pkgviews -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar WRKSRC= ${WRKDIR}/Ted-2.16 USE_X11BASE= YES diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile index 22987421f4d..7f8df513e8f 100644 --- a/editors/xemacs-packages/Makefile +++ b/editors/xemacs-packages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/05/16 01:15:31 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2005/07/15 18:27:49 jlam Exp $ DISTNAME= xemacs-packages PKGNAME= xemacs-packages-1.15 @@ -137,7 +137,7 @@ DIST_SUBDIR= ${PKGBASE} EXTRACT_ONLY= # empty NO_BUILD= yes -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar .include "../../editors/xemacs/Makefile.pkg" diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common index 294686039de..6b1df16cfb9 100644 --- a/editors/xemacs/Makefile.common +++ b/editors/xemacs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2005/05/16 01:15:31 jlam Exp $ +# $NetBSD: Makefile.common,v 1.11 2005/07/15 18:27:49 jlam Exp $ DISTNAME= xemacs-21.4.17 CATEGORIES= editors @@ -12,7 +12,7 @@ CONFLICTS+= gnuclient-[0-9]* NOT_FOR_PLATFORM= *-*-mips* # fails purespace dumping -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar DIST_SUBDIR= xemacs EXTRA_FILES= ${DISTNAME}-elc.tar.gz ${DISTNAME}-info.tar.gz diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile index bb29591e9c0..2f94d139d5a 100644 --- a/emulators/linuxppc_lib/Makefile +++ b/emulators/linuxppc_lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/16 01:15:31 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/07/15 18:27:49 jlam Exp $ DISTNAME= linuxppc_lib-2000.4.6 CATEGORIES= emulators @@ -31,7 +31,7 @@ CHECK_SHLIBS= NO DIST_SUBDIR= linuxppc_lib PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar EMUL_LINUX= emul/linux LINUX_LDCONFIG= ${PREFIX}/${EMUL_LINUX}/sbin/ldconfig diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile index de9cc649a27..35ca97ccb69 100644 --- a/emulators/spim/Makefile +++ b/emulators/spim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:58 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/07/15 18:27:49 jlam Exp $ DISTNAME= spim PKGNAME= spim-6.5 @@ -16,9 +16,8 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./Configure USE_IMAKE= yes -USE_TOOLS+= lex +USE_TOOLS+= gzip lex XMKMF= ${X11BASE}/bin/xmkmf # don't specify -a option -PKGSRC_USE_TOOLS+= gzip BUILD_TARGET= y.tab.c depend spim xspim diff --git a/fonts/XFree86-fontsEncodings/Makefile.common b/fonts/XFree86-fontsEncodings/Makefile.common index b2fc9ef7929..6b6abdf9185 100644 --- a/fonts/XFree86-fontsEncodings/Makefile.common +++ b/fonts/XFree86-fontsEncodings/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2005/05/21 04:10:17 jlam Exp $ +# $NetBSD: Makefile.common,v 1.10 2005/07/15 18:27:49 jlam Exp $ # # Makefile fragment used by XFree86-fonts* packages. @@ -11,7 +11,7 @@ FILESDIR= ${.CURDIR}/../../fonts/XFree86-fontsEncodings/files ENCODINGS= encodings encodings/large TOPDIR?= ../../.. -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar post-extract: . if defined(FONTS_MISC) diff --git a/fonts/acroread-font-share/Makefile.common b/fonts/acroread-font-share/Makefile.common index ddae119f3d3..c3fa3422db4 100644 --- a/fonts/acroread-font-share/Makefile.common +++ b/fonts/acroread-font-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2005/06/16 06:57:52 jlam Exp $ +# $NetBSD: Makefile.common,v 1.6 2005/07/15 18:27:49 jlam Exp $ # PKGNAME= acroread-${DISTNAME}-4.0 @@ -18,7 +18,7 @@ NO_PATCH= yes NO_CONFIGURE= yes NO_BUILD= yes -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar INSTALLATION_DIRS= Acrobat4/Resource do-install: diff --git a/fonts/acroread5-font-share/Makefile.common b/fonts/acroread5-font-share/Makefile.common index f4679385e3b..8ba22d17ebd 100644 --- a/fonts/acroread5-font-share/Makefile.common +++ b/fonts/acroread5-font-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2005/06/16 06:57:52 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4 2005/07/15 18:27:49 jlam Exp $ # PKGNAME= acroread5-${DISTNAME}-5.0 @@ -21,7 +21,7 @@ NO_PATCH= yes NO_CONFIGURE= yes NO_BUILD= yes -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar INSTALLATION_DIRS= Acrobat5/Resource/Font do-install: diff --git a/fonts/arphic-ttf/Makefile b/fonts/arphic-ttf/Makefile index 97c59991507..764aad05132 100644 --- a/fonts/arphic-ttf/Makefile +++ b/fonts/arphic-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/15 22:02:26 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:49 jlam Exp $ # DISTNAME= arphic-ttf-2.11 @@ -22,7 +22,7 @@ USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gunzip FONTS_TTF_DIRS= ${PREFIX}/lib/X11/fonts/TTF DOCDIR= ${PREFIX}/share/doc/arphic-ttf diff --git a/fonts/biznet-iso8859_2/Makefile b/fonts/biznet-iso8859_2/Makefile index 9dadb3708fd..4be252fae47 100644 --- a/fonts/biznet-iso8859_2/Makefile +++ b/fonts/biznet-iso8859_2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:26 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:49 jlam Exp $ # DISTNAME= ISO8859-2-pcf @@ -14,7 +14,7 @@ USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES -PKGSRC_USE_TOOLS+= gzip +USE_TOOLS+= gzip FONTDIR= ${PREFIX}/lib/X11/fonts/biznet OWN_DIRS= ${FONTDIR} diff --git a/fonts/chkfontpath/Makefile b/fonts/chkfontpath/Makefile index 12f7c13f45e..ce2e488ca54 100644 --- a/fonts/chkfontpath/Makefile +++ b/fonts/chkfontpath/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:52 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:49 jlam Exp $ # DISTNAME= chkfontpath-1.9.7 @@ -13,9 +13,8 @@ COMMENT= Command line tool to manage X server's font path BUILD_DEPENDS+= rpm2cpio>=1.1:../../converters/rpm2cpio MAKE_ENV+= VERSION=${PKGVERSION} -USE_TOOLS+= gmake +USE_TOOLS+= gmake gtar -PKGSRC_USE_TOOLS+= gtar INSTALLATION_DIRS= bin man/man8 # Might as well make this a general scheme for .src.rpm files... - HF diff --git a/fonts/cyr-rfx-share/Makefile.common b/fonts/cyr-rfx-share/Makefile.common index 903a3a0ae27..8e16a6562d3 100644 --- a/fonts/cyr-rfx-share/Makefile.common +++ b/fonts/cyr-rfx-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2005/05/16 01:15:31 jlam Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/07/15 18:27:50 jlam Exp $ DISTNAME= cyr-rfx-${CYR_RFX_ENCODING}-1.1 CATEGORIES= fonts x11 @@ -18,7 +18,7 @@ NO_PATCH= yes NO_CONFIGURE= yes NO_BUILD= yes -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar do-install: @cd ${PREFIX}/lib/X11/fonts/local && ${GTAR} xzf ${_DISTDIR}/${DISTFILES} ${CYR_RFX_ENCODING}/misc ${CYR_RFX_ENCODING}/75dpi diff --git a/fonts/efont-unicode/Makefile b/fonts/efont-unicode/Makefile index 495faf00308..727930d5f0b 100644 --- a/fonts/efont-unicode/Makefile +++ b/fonts/efont-unicode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:27 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:50 jlam Exp $ DISTNAME= efont-unicode-bdf-0.4.2 PKGNAME= ${DISTNAME:S/-bdf//} @@ -10,8 +10,8 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://openlab.ring.gr.jp/efont/unicode/ COMMENT= Free unicode BDF font -USE_X11BASE= YES -PKGSRC_USE_TOOLS+= gzip +USE_X11BASE= YES +USE_TOOLS+= gzip MESSAGE_SUBST+= FONTDIR=${FONTDIR} PLIST_SUBST+= FONTDIR=${FONTDIR} diff --git a/fonts/freefonts/Makefile b/fonts/freefonts/Makefile index f3645bd28c2..181a2ed1b0e 100644 --- a/fonts/freefonts/Makefile +++ b/fonts/freefonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/06/16 06:57:52 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/15 18:27:50 jlam Exp $ # DISTNAME= freefonts-0.10 @@ -14,7 +14,7 @@ NO_CONFIGURE= yes NO_BUILD= yes USE_X11BASE= yes -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar INSTALLATION_DIRS= lib/X11/fonts do-install: diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile index 89851b6b56a..3f5a0f95004 100644 --- a/fonts/ja-elisat/Makefile +++ b/fonts/ja-elisat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/17 04:49:46 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:50 jlam Exp $ DISTNAME= elisat10 PKGNAME= ja-elisat-1.0 @@ -14,7 +14,7 @@ USE_X11BASE= YES DOCDIR= ${PREFIX}/share/doc/elisat FONTDIR= ${PREFIX}/lib/X11/fonts/local #ALIAS= ${WRKDIR}/fonts.alias -PKGSRC_USE_TOOLS+= gzip +USE_TOOLS+= gzip LICENSE= no-commercial-use diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile index 324c306203d..4ab8ae296e5 100644 --- a/fonts/ja-elisau/Makefile +++ b/fonts/ja-elisau/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/17 04:49:46 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/15 18:27:50 jlam Exp $ DISTNAME= elisau10 PKGNAME= ja-elisau-1.0 @@ -18,8 +18,7 @@ SITES_elisau10${EXTRACT_SUFX}= \ SITES_clR5x8.bdf= ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/ WRKSRC= ${WRKDIR} -USE_TOOLS+= patch -PKGSRC_USE_TOOLS+= gzip +USE_TOOLS+= gzip patch USE_X11BASE= YES DOCDIR= ${PREFIX}/share/doc/elisau FONTDIR= ${PREFIX}/lib/X11/fonts/local diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile index e3b3a762b2e..d4ede31f72f 100644 --- a/fonts/ja-kaname/Makefile +++ b/fonts/ja-kaname/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/17 04:49:46 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:50 jlam Exp $ DISTNAME= kaname_k12_bdf PKGNAME= ja-kaname-0.0.0.20030112 @@ -10,7 +10,7 @@ COMMENT= 12x12 dots X11 bitmap font for JIS X 0208 WRKSRC= ${WRKDIR} USE_X11BASE= YES -PKGSRC_USE_TOOLS+= gzip +USE_TOOLS+= gzip DOCDIR= ${PREFIX}/share/doc/kaname FONTDIR= ${PREFIX}/lib/X11/fonts/local diff --git a/fonts/ja-naga10/Makefile b/fonts/ja-naga10/Makefile index 230a66d5f40..143e1de87c1 100644 --- a/fonts/ja-naga10/Makefile +++ b/fonts/ja-naga10/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/06/17 04:49:46 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/15 18:27:50 jlam Exp $ DISTNAME= knj10-1.1 PKGNAME= ja-naga10-1.1 @@ -12,7 +12,7 @@ HOMEPAGE= http://hp.vector.co.jp/authors/VA013391/fonts/#naga10 COMMENT= 10x10 dots X11 bitmap font for JIS X 0208 USE_X11BASE= YES -PKGSRC_USE_TOOLS+= gzip +USE_TOOLS+= gzip DOCDIR= ${PREFIX}/share/doc FONTDIR= ${PREFIX}/lib/X11/fonts/local diff --git a/fonts/jisx0212fonts/Makefile b/fonts/jisx0212fonts/Makefile index f4db2af8072..b35cf9eea19 100644 --- a/fonts/jisx0212fonts/Makefile +++ b/fonts/jisx0212fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/15 22:02:27 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:50 jlam Exp $ DISTNAME= jisx0212fonts-0.0 PKGREVISION= 1 @@ -21,7 +21,7 @@ FONTS= ${DISTFILES:C/\.bdf.*$//} FONTDIR= ${PREFIX}/lib/X11/fonts/local FONTS_X11_DIRS= ${FONTDIR} -PKGSRC_USE_TOOLS+= gzip gunzip +USE_TOOLS+= gzip gunzip # XXX Can we assume that ${GUNZIP_CMD} can extract .Z files? do-extract: diff --git a/fonts/jisx0213fonts/Makefile b/fonts/jisx0213fonts/Makefile index 9dee2ded4f4..47dca38b3c9 100644 --- a/fonts/jisx0213fonts/Makefile +++ b/fonts/jisx0213fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/15 22:02:27 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/07/15 18:27:50 jlam Exp $ # DISTNAME= jisx0213fonts-0.0 @@ -10,8 +10,8 @@ MAINTAINER= itojun@itojun.org, uebayasi@NetBSD.org HOMEPAGE= ftp://ftp.m17n.org/pub/character/fonts/imamura/jisx0213/ COMMENT= X11 bitmap fonts for JIS X 0213 -USE_X11BASE= yes -PKGSRC_USE_TOOLS+= gzip +USE_X11BASE= yes +USE_TOOLS+= gzip FONTS= K14-1 K14-2 jiskan16-2000-1 jiskan16-2000-2 FONTDIR= ${PREFIX}/lib/X11/fonts/local diff --git a/fonts/ko-kaist/Makefile b/fonts/ko-kaist/Makefile index 83e3fedaa2c..381a353342c 100644 --- a/fonts/ko-kaist/Makefile +++ b/fonts/ko-kaist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/16 18:21:42 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:50 jlam Exp $ # DISTNAME= ko-kaist-20010718 @@ -13,8 +13,7 @@ COMMENT= X11 fonts for Korean KSC 5601 standard (kaist foundry) CONFLICTS+= ksc5601fonts-[0-9]* USE_X11BASE= yes -PKGSRC_USE_TOOLS+= gunzip -USE_TOOLS+= gzip +USE_TOOLS+= gzip gunzip EXTRACT_ONLY= # empty MAKE_ENV+= FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}" diff --git a/fonts/ko-mizi/Makefile b/fonts/ko-mizi/Makefile index 2349a7a43d6..23ad2b14863 100644 --- a/fonts/ko-mizi/Makefile +++ b/fonts/ko-mizi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/20 02:07:30 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:50 jlam Exp $ # DISTNAME= xfntmizi-1.1-2.noarch @@ -15,8 +15,7 @@ BUILD_DEPENDS+= rpm-[0-9]*:../../misc/rpm CONFLICTS+= ksc5601fonts-[0-9]* USE_X11BASE= yes -PKGSRC_USE_TOOLS+= gunzip -USE_TOOLS+= gzip +USE_TOOLS+= gzip gunzip MAKE_ENV+= FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}" diff --git a/fonts/sgi-fonts/Makefile b/fonts/sgi-fonts/Makefile index 1175d644a89..a0bb11a85e1 100644 --- a/fonts/sgi-fonts/Makefile +++ b/fonts/sgi-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/16 01:15:31 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:50 jlam Exp $ # DISTNAME= sgi-fonts-1.0-457.src @@ -19,8 +19,7 @@ BUILD_DEPENDS+= bzip2>=1.0.2:../../archivers/bzip2 WRKSRC= ${WRKDIR}/sgi-fonts USE_IMAKE= YES - -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar RPM2PKG= ${LOCALBASE}/sbin/rpm2pkg diff --git a/games/abuse/Makefile b/games/abuse/Makefile index 4cfdef7ce7e..ec8d144b7ea 100644 --- a/games/abuse/Makefile +++ b/games/abuse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:49 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/07/15 18:27:50 jlam Exp $ DISTNAME= abuse_pd PKGNAME= abuse-2.0 @@ -14,9 +14,8 @@ COMMENT= Full color 320x200 arcade quality platform shooter USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= LDFLAGS="${X11_LDFLAGS}" -USE_TOOLS+= gmake +USE_TOOLS+= gmake gtar USE_LANGUAGES+= c c++ -PKGSRC_USE_TOOLS+= gtar NOT_FOR_PLATFORM= NetBSD-*-arm32 diff --git a/games/battalion/Makefile b/games/battalion/Makefile index 80ab117ef2f..740273c994c 100644 --- a/games/battalion/Makefile +++ b/games/battalion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/06/16 06:57:53 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/07/15 18:27:50 jlam Exp $ DISTNAME= battalion PKGNAME= battalion-1.4 @@ -15,7 +15,7 @@ NOT_FOR_PLATFORM= *-*-alpha # relies on Mesa (gcc) WRKSRC= ${WRKDIR}/battalionSource EXTRACT_ONLY= battalionSource1.4.tar.Z -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar .include "../../mk/bsd.prefs.mk" diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile index 2471f2526f3..e75d8ef296d 100644 --- a/games/crossfire-cli/Makefile +++ b/games/crossfire-cli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/06/17 04:49:46 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/07/15 18:27:50 jlam Exp $ # DISTNAME= crossfire-client-1.0.0 @@ -18,10 +18,9 @@ CF_SND= client-0.95.2-au-sounds.tgz CF_RAW= client-0.95.2-raw-sounds.tgz USE_PERL5= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake gtar GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-sound-dir=${PREFIX}/share/cfclient/sounds -PKGSRC_USE_TOOLS+= gtar REPLACE_PERL= utils/deftoheader.pl items.pl diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile index 55133596e85..a9a3e871aa3 100644 --- a/games/crossfire-srv/Makefile +++ b/games/crossfire-srv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/06/17 04:49:46 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/07/15 18:27:50 jlam Exp $ # DISTNAME= crossfire-1.0.0 @@ -17,11 +17,10 @@ EXTRACT_ONLY= ${CF_SRC} CF_SRC= crossfire-1.0.0.tar.bz2 CF_MAPS= crossfire-1.0.0-maps.tar.bz2 -USE_TOOLS+= gmake +USE_TOOLS+= gmake gtar GNU_CONFIGURE= yes USE_PERL5= yes CONFIGURE_ARGS+= --with-includes=-I${LOCALBASE}/include -PKGSRC_USE_TOOLS+= gtar MAKE_ENV+= EXTRA_INCLUDES=-I${LOCALBASE}/include diff --git a/games/et/Makefile b/games/et/Makefile index 7d0fd76963e..3fa699212af 100644 --- a/games/et/Makefile +++ b/games/et/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:54 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:50 jlam Exp $ # DISTNAME= et-linux-2.56-2.x86 @@ -15,7 +15,7 @@ NO_BUILD= yes USE_PKGINSTALL= yes ONLY_FOR_PLATFORM= FreeBSD-*-i386 Linux-*-i386 -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar ETDIR= ${PREFIX}/lib/lokigames/et EXTRACT_CMD= ${TAIL} +356 ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - \ -C ${WRKSRC} diff --git a/games/genecys-data/Makefile b/games/genecys-data/Makefile index c7a49b91bbd..8de3cfc273b 100644 --- a/games/genecys-data/Makefile +++ b/games/genecys-data/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/16 01:15:31 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/07/15 18:27:50 jlam Exp $ # DISTNAME= genecys-data-0.2 @@ -12,7 +12,7 @@ COMMENT= Game datafiles for Genecys WRKSRC= ${WRKDIR} NO_BUILD= YES NO_CONFIGURE= YES -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar do-extract: do-install: diff --git a/games/heretic2-demo/Makefile b/games/heretic2-demo/Makefile index 1134c2dad21..09c235fd425 100644 --- a/games/heretic2-demo/Makefile +++ b/games/heretic2-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:54 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/07/15 18:27:50 jlam Exp $ # DISTNAME= heretic2-demo-x86 @@ -16,7 +16,7 @@ COMMENT= Heretic2 - first person Quake 3D engine based (linux demo) NO_CONFIGURE= yes EXTRACT_CMD= ${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \ ${GTAR} xzf - -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar ONLY_FOR_PLATFORM=*-*-i386 diff --git a/games/majesty-demo/Makefile b/games/majesty-demo/Makefile index 8129631d814..2006677cb98 100644 --- a/games/majesty-demo/Makefile +++ b/games/majesty-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:55 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:50 jlam Exp $ # DISTNAME= majesty_demo @@ -13,7 +13,7 @@ COMMENT= Fantasy kingdom simulation (demo) EXTRACT_CMD= ${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \ ${GZCAT} | ${PAX} -O -r -PKGSRC_USE_TOOLS+= gzcat pax +USE_TOOLS+= gzcat pax ONLY_FOR_PLATFORM=*-*-i386 diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile index 8087062e3fc..5816e3ef653 100644 --- a/games/quake3arena-demo/Makefile +++ b/games/quake3arena-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/06/16 06:57:55 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/07/15 18:27:51 jlam Exp $ DISTNAME= linuxq3ademo-1_11-6_x86_gz PKGREVISION= 2 @@ -28,7 +28,7 @@ DEPENDS+= suse_glx>=6.4:../../emulators/${SUSE_DIR_PREFIX}_glx NO_CONFIGURE= yes EXTRACT_CMD= ${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \ ${GTAR} xzf - -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar ONLY_FOR_PLATFORM=*-*-i386 diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile index f4d3253e0cb..90f2dc3bc5c 100644 --- a/games/quake3arena/Makefile +++ b/games/quake3arena/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/06/16 06:57:55 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/07/15 18:27:51 jlam Exp $ DISTNAME= linuxq3apoint-1.32b.x86 PKGREVISION= 1 @@ -29,7 +29,7 @@ NO_BIN_ON_FTP= no NO_CONFIGURE= yes CHECK_SHLIBS= NO -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar EXTRACT_CMD= ${SED} '1,265d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - diff --git a/games/quake3server/Makefile b/games/quake3server/Makefile index e2d4bd4775e..7a45f156694 100644 --- a/games/quake3server/Makefile +++ b/games/quake3server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/16 01:15:32 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:51 jlam Exp $ DISTNAME= linuxq3apoint-1.32b.x86 PKGNAME= quake3server-1.32b @@ -14,7 +14,7 @@ COMMENT= Quake III Arena Dedicated Server for Linux .include "../../games/quake3server/Makefile.common" ONLY_FOR_PLATFORM= NetBSD-*-i386 -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar EXTRACT_CMD= ${SED} '1,265d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - WRKSRC= ${WRKDIR} diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile index 39a89f6e3ca..f9c02ff4157 100644 --- a/games/rollemup/Makefile +++ b/games/rollemup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/06/16 06:57:55 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/07/15 18:27:51 jlam Exp $ DISTNAME= Rollemup PKGNAME= rollemup-1.0 @@ -30,7 +30,7 @@ PLIST_SRC= ${WRKDIR}/PLIST.src GAMES_DIR= share/games MESSAGE_SUBST+= GAMES_DIR=${GAMES_DIR} -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar ONLY_FOR_PLATFORM= *-*-i386 diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile index 17afb597260..b1a1087e9a4 100644 --- a/games/rtcw/Makefile +++ b/games/rtcw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:52 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:51 jlam Exp $ DISTNAME= wolf-linux-1.33.x86 PKGNAME= rtcw-1.33 @@ -23,7 +23,7 @@ NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_FTP= ${RESTRICTED} EXTRACT_CMD= ${SED} '1,178d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - \ -C ${WRKSRC} -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar .include "../../mk/bsd.prefs.mk" diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile index 10362aa0cbf..ad9c3a3d2b6 100644 --- a/games/xdoom/Makefile +++ b/games/xdoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/06/17 04:49:46 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/07/15 18:27:51 jlam Exp $ DISTNAME= linuxdoom-1.10 PKGNAME= xdoom-1.10 @@ -20,11 +20,9 @@ WRKSRC= ${WRKDIR} EXTRACT_ONLY= doomsrc.zip EXTRACT_CMD= unzip -qo ${DISTDIR}/${EXTRACT_ONLY} USE_X11BASE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake gtar gunzip MAKE_ENV+= X11BASE=${X11BASE} INSTALL_PREFIX=${PREFIX} -PKGSRC_USE_TOOLS+= gtar gunzip - .include "../../mk/bsd.prefs.mk" .ifdef ${OPSYS} == "Linux" diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile index 2e389899e10..9f911bd4d01 100644 --- a/games/xjewel/Makefile +++ b/games/xjewel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/16 16:33:42 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:51 jlam Exp $ DISTNAME= xjewel-1.6 PKGREVISION= 1 @@ -9,7 +9,7 @@ EXTRACT_SUFX= .tar.z MAINTAINER= jdc@NetBSD.org COMMENT= X windows-based dropping jewels game -USE_IMAKE= yes -PKGSRC_USE_TOOLS+= gzcat +USE_IMAKE= yes +USE_TOOLS+= gzcat .include "../../mk/bsd.pkg.mk" diff --git a/games/xrick/Makefile b/games/xrick/Makefile index c6e4fe6f563..e8cbd2196b1 100644 --- a/games/xrick/Makefile +++ b/games/xrick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/06/16 06:57:56 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/07/15 18:27:51 jlam Exp $ # DISTNAME= xrick-021212 @@ -17,8 +17,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_FTP= ${RESTRICTED} -USE_TOOLS+= gmake -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gmake gunzip SUBST_CLASSES+= data SUBST_STAGE.data= post-patch diff --git a/graphics/Ngraph/Makefile b/graphics/Ngraph/Makefile index c531819bef4..ed14f4ba455 100644 --- a/graphics/Ngraph/Makefile +++ b/graphics/Ngraph/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:54 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/07/15 18:27:51 jlam Exp $ # DISTNAME= Ngraph-6.3.30-src @@ -15,8 +15,7 @@ COMMENT= The 2D graph and data analysis program EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -USE_TOOLS+= gmake -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gmake gtar post-extract: ${GTAR} -C ${WRKSRC}/combo -xzf ${DISTDIR}/ileaf-widgets.tar.Z diff --git a/graphics/jhead/Makefile b/graphics/jhead/Makefile index 4b046355c7c..495fcdc4160 100644 --- a/graphics/jhead/Makefile +++ b/graphics/jhead/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/19 11:35:25 veego Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/15 18:27:51 jlam Exp $ # DISTNAME= jhead-2.4 @@ -10,8 +10,8 @@ HOMEPAGE= http://www.sentex.net/~mwandel/jhead/ COMMENT= Extract EXIF header from JPEG image PKG_INSTALLATION_TYPES= overwrite pkgviews -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gunzip MAKEFILE= makefile INSTALLATION_DIRS= bin man/man1 share/doc/html/jhead diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common index b231defa683..a5d143d8434 100644 --- a/lang/blackdown-jre13/Makefile.common +++ b/lang/blackdown-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2005/05/15 22:02:27 jlam Exp $ +# $NetBSD: Makefile.common,v 1.20 2005/07/15 18:27:51 jlam Exp $ # RELVERSION= 1.3.1 @@ -44,7 +44,7 @@ CHECK_SHLIBS= NO # This would use NetBSD ldd on Linux shlibs. .include "../../mk/bsd.prefs.mk" JVM_HOME= ${PREFIX}/java/blackdown-${RELVERSION} -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gunzip PLIST_SUBST+= BLACKDOWN_ARCH=${BLACKDOWN_ARCH} diff --git a/lang/brandybasic/Makefile b/lang/brandybasic/Makefile index 1d531a90897..5d42585abc5 100644 --- a/lang/brandybasic/Makefile +++ b/lang/brandybasic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:59 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:51 jlam Exp $ # DISTNAME= b116 @@ -16,7 +16,7 @@ DOCDIR= ${PREFIX}/share/doc/brandy EXAMPLEDIR= ${PREFIX}/share/examples/brandy BUILD_TARGET= nodebug -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar INSTALLATION_DIRS= bin do-install: diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile index b3f3a7c127c..947a8ec218c 100644 --- a/lang/f2c/Makefile +++ b/lang/f2c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/05/15 22:02:27 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/07/15 18:27:51 jlam Exp $ DISTNAME= f2c-20001205 PKGREVISION= 8 @@ -33,8 +33,7 @@ MAKE_ENV+= ECHO=${ECHO} WRKSRC= ${WRKDIR}/f2c USE_LIBTOOL= yes - -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gunzip post-extract: @${RM} ${WRKSRC}/index.html diff --git a/lang/jbuilder-jit/Makefile b/lang/jbuilder-jit/Makefile index 5559cf37878..56d3e92b327 100644 --- a/lang/jbuilder-jit/Makefile +++ b/lang/jbuilder-jit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/06/16 06:58:00 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/07/15 18:27:51 jlam Exp $ # DISTNAME= unix_jb35foundation @@ -27,7 +27,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_FTP= ${RESTRICTED} -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar NO_BUILD= yes diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile index 0e109c815b0..a46eb470202 100644 --- a/lang/snobol/Makefile +++ b/lang/snobol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/16 06:58:01 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/15 18:27:51 jlam Exp $ # DISTNAME= snobol-0.99.4 @@ -19,7 +19,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} BUILD_TARGET= it USE_CONFIGURE= NO -PKGSRC_USE_TOOLS+= gzip +USE_TOOLS+= gzip INSTALLATION_DIRS= bin man/man1 do-install: diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk index a8c4967c45d..9d609b2113d 100644 --- a/mail/postfix-current/options.mk +++ b/mail/postfix-current/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2005/05/16 01:32:23 jlam Exp $ +# $NetBSD: options.mk,v 1.10 2005/07/15 18:27:51 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.postfix #PKG_SUPPORTED_OPTIONS= inet6 ldap mysql mysql4 pcre pgsql sasl tls @@ -30,7 +30,7 @@ PKG_SUPPORTED_OPTIONS= ldap mysql mysql4 pcre pgsql sasl # SITES_${TLS_PATCH}= http://mirrors.loonybin.net/postfix_tls/ \ # ftp://mirrors.loonybin.net/pub/postfix_tls/ \ # ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/ -# PKGSRC_USE_TOOLS+= tar +# USE_TOOLS+= tar # PATCH_DIST_CAT.${TLS_PATCH}= ${TAR} -zxOf ${TLS_PATCH} "*/pfixtls.diff" # PATCH_DIST_STRIP.${TLS_PATCH}= -p1 # . endif diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 07b6e65a943..dff346929b0 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/05/16 04:38:03 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/07/15 18:27:51 jlam Exp $ # DISTNAME= netqmail-1.05 @@ -29,7 +29,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} .endif PKG_INSTALLATION_TYPES= overwrite pkgviews -PKGSRC_USE_TOOLS+= expr +USE_TOOLS+= expr DJB_BUILD_TARGETS= man diff --git a/mail/squirrelmail-locales/Makefile b/mail/squirrelmail-locales/Makefile index 064b58ba560..80cf05fc647 100644 --- a/mail/squirrelmail-locales/Makefile +++ b/mail/squirrelmail-locales/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/16 06:58:08 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:51 jlam Exp $ # DISTNAME= all_locales-${VER}-20050122 @@ -14,7 +14,7 @@ COMMENT= Locale package for SquirrelMail VER= 1.4.4 NO_CONFIGURE= # defined -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= tar INSTALLATION_DIRS= share/squirrelmail WRKSRC= ${WRKDIR} diff --git a/math/gap/Makefile b/math/gap/Makefile index bd7c518bc5d..78d5afa1b85 100644 --- a/math/gap/Makefile +++ b/math/gap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/06/17 03:50:20 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/07/15 18:27:52 jlam Exp $ # DISTNAME= gap4r3 @@ -20,7 +20,7 @@ SITES_fix4r3n5.tar.gz= ${MASTER_SITES:=bugfixes/} LICENSE= no-commercial-use -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar GNU_CONFIGURE= yes CONFIGURE_ENV+= PREFIX=${PREFIX} diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 8694860ee50..5977ae7a1f1 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2005/05/16 04:53:07 jlam Exp $ +# $NetBSD: Makefile,v 1.63 2005/07/15 18:27:52 jlam Exp $ # DISTNAME= ${SCIBASE}.src @@ -21,7 +21,7 @@ NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \ USE_LANGUAGES= fortran USE_X11BASE= yes USE_LIBTOOL= yes -PKGSRC_USE_TOOLS+= tee +USE_TOOLS+= tee GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-xaw3d diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common index b29a9cfd8a6..0cb89075a13 100644 --- a/meta-pkgs/xorg/Makefile.common +++ b/meta-pkgs/xorg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.32 2005/05/23 19:17:49 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.33 2005/07/15 18:27:52 jlam Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -305,7 +305,7 @@ do-configure: # # This can use for a single distfile. # -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= tar . if defined(XEXTRACTS) && !empty(XEXTRACTS) _EXTRACTS= xc/config xc/include xc/extras/Mesa/include/GL . for _dir in ${XEXTRACTS} diff --git a/misc/bbweather/Makefile b/misc/bbweather/Makefile index e5e03f63024..8c5ace9428a 100644 --- a/misc/bbweather/Makefile +++ b/misc/bbweather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:04 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/07/15 18:27:52 jlam Exp $ # DISTNAME= bbweather-0.6.2 @@ -15,7 +15,7 @@ DEPENDS+= wget>=1.7:../../net/wget GNU_CONFIGURE= YES REPLACE_PERL= GrabWeather USE_PERL5= run -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gunzip .include "../../mk/x11.buildlink3.mk" diff --git a/misc/colorize/Makefile b/misc/colorize/Makefile index d793028c738..9135aa32c7a 100644 --- a/misc/colorize/Makefile +++ b/misc/colorize/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:21 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:52 jlam Exp $ # DISTNAME= colorize_0.3.0 @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} NO_BUILD= yes USE_PERL5= yes -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gunzip INSTALLATION_DIRS= bin man/man1 post-patch: diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile index 62c21d40574..3df33392c4b 100644 --- a/misc/dnetc/Makefile +++ b/misc/dnetc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:21 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/15 18:27:52 jlam Exp $ DISTNAME= ${DISTNAME_${OPSYS}_${MACHINE_ARCH}} PKGNAME= dnetc-2.${DISTVER_${OPSYS}_${MACHINE_ARCH}} @@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM= Darwin-*-powerpc NetBSD-*-alpha NetBSD-*-arm \ NO_BUILD= YES USE_PKGINSTALL= YES -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar DISTNAME_Darwin_powerpc= dnetc-darwin-ppc DISTNAME_NetBSD_m68k= dnetc-netbsd-68k diff --git a/misc/figlet-fonts/Makefile b/misc/figlet-fonts/Makefile index d305740b4b6..1f0648c5edb 100644 --- a/misc/figlet-fonts/Makefile +++ b/misc/figlet-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:21 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/15 18:27:52 jlam Exp $ # DISTNAME= figlet-fonts-20021023 @@ -16,7 +16,7 @@ DIST_SUBDIR= ${DISTNAME} NO_CONFIGURE= # defined NO_BUILD= # defined -PKGSRC_USE_TOOLS+= gtar gzcat +USE_TOOLS+= gtar gzcat INSTALLATION_DIRS= bin share/figlet post-extract: diff --git a/misc/ja-man/Makefile b/misc/ja-man/Makefile index 986d808431f..131f7fea925 100644 --- a/misc/ja-man/Makefile +++ b/misc/ja-man/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:21 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/15 18:27:52 jlam Exp $ DISTNAME= NetBSD1.3I-jman-19990531 PKGNAME= ja-man-19990531 @@ -18,7 +18,7 @@ MAKE_ENV+= JAMANDIR=${JAMANDIR} PLIST_SRC= ${WRKDIR}/PLIST -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar MANCOMPRESSED_IF_MANZ= yes INSTALLATION_DIRS= bin etc share/groff/tmac diff --git a/misc/kdrill/Makefile b/misc/kdrill/Makefile index 51f07db22b6..272185411f6 100644 --- a/misc/kdrill/Makefile +++ b/misc/kdrill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/15 22:02:27 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/15 18:27:52 jlam Exp $ # DISTNAME= kdrill5.11.6 @@ -14,8 +14,8 @@ COMMENT= Kanji quiz and japanese dictionary DEPENDS+= edict-[0-9]*:../../misc/edict DEPENDS+= kanjidic-[0-9]*:../../misc/kanjidic -USE_IMAKE= yes -PKGSRC_USE_TOOLS+= gzip +USE_IMAKE= yes +USE_TOOLS+= gzip post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/kdrill diff --git a/misc/lile/Makefile b/misc/lile/Makefile index 89f2e3eb397..0a031e4371d 100644 --- a/misc/lile/Makefile +++ b/misc/lile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/15 19:21:46 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:52 jlam Exp $ DISTNAME= lile-2.0 PKGNAME= ile-2.0 @@ -9,7 +9,7 @@ EXTRACT_SUFX= .tar.z MAINTAINER= tech-pkg@NetBSD.org COMMENT= Input Line Editor that wraps itself around programs -PKGSRC_USE_TOOLS+= gzcat +USE_TOOLS+= gzcat post-patch: @(cd ${WRKSRC}; ${SED} "s,/usr/local,${PREFIX}," Makefile \ diff --git a/misc/routeplanner-cli/Makefile b/misc/routeplanner-cli/Makefile index dd938fb345d..a0e1d6d8387 100644 --- a/misc/routeplanner-cli/Makefile +++ b/misc/routeplanner-cli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:22 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:52 jlam Exp $ # DISTNAME= routeplanner_0.11 @@ -12,7 +12,7 @@ COMMENT= Highway trip planner written in Python WRKSRC= ${WRKDIR}/routeplanner-0.11 NO_BUILD= yes -PKGSRC_USE_TOOLS+= gzip +USE_TOOLS+= gzip PYTHON_PATCH_SCRIPTS= rpcli RPLIBDIR= ${PREFIX}/lib/routeplanner diff --git a/mk/bsd.pkg.check.mk b/mk/bsd.pkg.check.mk index e96f2a53ed6..668c8cb68b0 100644 --- a/mk/bsd.pkg.check.mk +++ b/mk/bsd.pkg.check.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.check.mk,v 1.6 2005/06/23 21:34:01 kristerw Exp $ +# $NetBSD: bsd.pkg.check.mk,v 1.7 2005/07/15 18:27:54 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and defines the # relevant variables and targets the for various install-time "check" @@ -41,7 +41,7 @@ CHECK_FILES?= no CHECK_FILES_STRICT?= no CHECK_WRKREF?= no -PKGSRC_USE_TOOLS+= awk cat cmp diff echo find grep rm sed test \ +USE_TOOLS+= awk cat cmp diff echo find grep rm sed test \ touch true ########################################################################### diff --git a/mk/bsd.pkg.extract.mk b/mk/bsd.pkg.extract.mk index d9f82ee4d67..d226d0f318e 100644 --- a/mk/bsd.pkg.extract.mk +++ b/mk/bsd.pkg.extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.extract.mk,v 1.9 2005/05/22 19:11:12 jlam Exp $ +# $NetBSD: bsd.pkg.extract.mk,v 1.10 2005/07/15 18:27:54 jlam Exp $ # # This Makefile fragment is included to bsd.pkg.mk and defines the # relevant variables and targets for the "extract" phase. @@ -55,34 +55,34 @@ _EXTRACT_SUFFIXES+= .rar !empty(EXTRACT_SUFX:M*.tbz) || !empty(EXTRACT_SUFX:M*.tgz) || \ !empty(EXTRACT_ONLY:M*_tar.gz) || !empty(EXTRACT_SUFX:M*_tar.gz) . if !empty(EXTRACT_USING:Mgtar) -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar . elif !empty(EXTRACT_USING:Mnbtar) -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= tar . else -PKGSRC_USE_TOOLS+= pax +USE_TOOLS+= pax . endif .endif .if !empty(EXTRACT_ONLY:M*.bz2) || !empty(EXTRACT_ONLY:M*.tbz) || \ !empty(EXTRACT_SUFX:M*.bz2) || !empty(EXTRACT_SUFX:M*.tbz) -PKGSRC_USE_TOOLS+= bzcat +USE_TOOLS+= bzcat .endif .if !empty(EXTRACT_ONLY:M*.zip) || !empty(EXTRACT_SUFX:M*.zip) -PKGSRC_USE_TOOLS+= unzip +USE_TOOLS+= unzip .endif .if !empty(EXTRACT_ONLY:M*.lzh) || !empty(EXTRACT_ONLY:M*.lha) || \ !empty(EXTRACT_SUFX:M*.lzh) || !empty(EXTRACT_SUFX:M*.lha) -PKGSRC_USE_TOOLS+= lha +USE_TOOLS+= lha .endif .if !empty(EXTRACT_ONLY:M*.gz) || !empty(EXTRACT_ONLY:M*.tgz) || \ !empty(EXTRACT_SUFX:M*.gz) || !empty(EXTRACT_SUFX:M*.tgz) || \ !empty(EXTRACT_ONLY:M*.Z) || !empty(EXTRACT_SUFX:M*.Z) -PKGSRC_USE_TOOLS+= gzcat +USE_TOOLS+= gzcat .endif .if !empty(EXTRACT_ONLY:M*.zoo) || !empty(EXTRACT_SUFX:M*.zoo) -PKGSRC_USE_TOOLS+= unzoo +USE_TOOLS+= unzoo .endif .if !empty(EXTRACT_ONLY:M*.rar) || !empty(EXTRACT_SUFX:M*.rar) -PKGSRC_USE_TOOLS+= unrar +USE_TOOLS+= unrar .endif DECOMPRESS_CMD.tar.gz?= ${GZCAT} diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d6a99286e72..8e49d1d8c17 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1706 2005/07/06 05:52:34 reed Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1707 2005/07/15 18:27:54 jlam Exp $ # # This file is in the public domain. # @@ -779,38 +779,38 @@ BUILD_DEFS+= PKG_SYSCONFBASEDIR PKG_SYSCONFDIR # eventually be split up into lists of tools required by different # phases of a pkgsrc build. # -PKGSRC_USE_TOOLS+= \ +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 pwd rm rmdir sed sh sort tail test touch tr true \ wc xargs # bsd.wrapper.mk -PKGSRC_USE_TOOLS+= expr +USE_TOOLS+= expr # bsd.bulk-pkg.mk uses certain tools .if defined(BATCH) -PKGSRC_USE_TOOLS+= tee tsort +USE_TOOLS+= tee tsort .endif .if !defined(NO_MTREE) -PKGSRC_USE_TOOLS+= mtree +USE_TOOLS+= mtree .endif .if defined(PKG_PRESERVE) -PKGSRC_USE_TOOLS+= date +USE_TOOLS+= date .endif # We need a mail command to send mail to ${PKGSRC_MESSAGE_RECIPIENTS}. .if !empty(PKGSRC_MESSAGE_RECIPIENTS) -PKGSRC_USE_TOOLS+= mail +USE_TOOLS+= mail .endif # We need shlock if we're using locking to synchronize multiple builds # over the same pkgsrc tree. # .if ${PKGSRC_LOCKTYPE} != "none" -PKGSRC_USE_TOOLS+= shlock +USE_TOOLS+= shlock .endif # If MANZ is defined, then we want the final man pages to be compressed. @@ -847,10 +847,10 @@ _MANZ= ${MANZ:Dyes:Uno} MAKEVARS+= _MANCOMPRESSED _MANZ .if !empty(_MANCOMPRESSED:M[yY][eE][sS]) && empty(_MANZ:M[yY][eE][sS]) -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gunzip .endif .if empty(_MANCOMPRESSED:M[yY][eE][sS]) && !empty(_MANZ:M[yY][eE][sS]) -PKGSRC_USE_TOOLS+= gzip +USE_TOOLS+= gzip .endif # Extract diff --git a/mk/bsd.pkg.patch.mk b/mk/bsd.pkg.patch.mk index 752916331ce..0bee3814fac 100644 --- a/mk/bsd.pkg.patch.mk +++ b/mk/bsd.pkg.patch.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.patch.mk,v 1.15 2005/06/12 03:59:42 jlam Exp $ +# $NetBSD: bsd.pkg.patch.mk,v 1.16 2005/07/15 18:27:55 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and defines the # relevant variables and targets for the "patch" phase. @@ -63,19 +63,19 @@ .if (defined(PATCHFILES) && !empty(PATCHFILES)) || \ (defined(PATCHDIR) && exists(${PATCHDIR})) || \ (defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH})) -PKGSRC_USE_TOOLS+= patch +USE_TOOLS+= patch .endif # These tools are used to output the contents of the distribution patches # to stdout. # .if defined(PATCHFILES) -PKGSRC_USE_TOOLS+= cat +USE_TOOLS+= cat . if !empty(PATCHFILES:M*.Z) || !empty(PATCHFILES:M*.gz) -PKGSRC_USE_TOOLS+= gzcat +USE_TOOLS+= gzcat . endif . if !empty(PATCHFILES:M*.bz2) -PKGSRC_USE_TOOLS+= bzcat +USE_TOOLS+= bzcat . endif .endif diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index c5392bee06b..87a392e43bb 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.195 2005/06/14 07:25:24 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.196 2005/07/15 18:27:55 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -267,16 +267,15 @@ _PKGSRC_TOPDIR= ${.CURDIR}/../.. . include "${_PKGSRC_TOPDIR}/mk/defaults/mk.conf" .endif -PKGSRC_USE_TOOLS?= # empty -USE_TOOLS?= # empty +USE_TOOLS?= # empty # Provide default values for TOOLs used by the top-level make. -PKGSRC_USE_TOOLS+= [ awk dirname echo grep pwd sed test true +USE_TOOLS+= [ awk dirname echo grep pwd sed test true # These tools are used by the top-level make only in certain packages and # should eventually be moved into those particular package Makefiles. # -PKGSRC_USE_TOOLS+= date tr +USE_TOOLS+= date tr .include "${_PKGSRC_TOPDIR}/mk/tools/defaults.mk" diff --git a/mk/buildlink3/find-files.mk b/mk/buildlink3/find-files.mk index cd1ff634eca..cdc51e8d25c 100644 --- a/mk/buildlink3/find-files.mk +++ b/mk/buildlink3/find-files.mk @@ -1,4 +1,4 @@ -# $NetBSD: find-files.mk,v 1.1 2005/06/01 18:03:06 jlam Exp $ +# $NetBSD: find-files.mk,v 1.2 2005/07/15 18:27:55 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -72,11 +72,11 @@ # .include "../../mk/buildlink3/builtin-files.mk" # -.if empty(PKGSRC_USE_TOOLS:Mecho) -PKGSRC_USE_TOOLS+= echo +.if empty(USE_TOOLS:Mecho) +USE_TOOLS+= echo .endif -.if empty(PKGSRC_USE_TOOLS:Mgrep) -PKGSRC_USE_TOOLS+= grep +.if empty(USE_TOOLS:Mgrep) +USE_TOOLS+= grep .endif .for _var_ in ${BUILTIN_FIND_FILES_VAR} diff --git a/mk/buildlink3/find-libs.mk b/mk/buildlink3/find-libs.mk index 9cd0ce0475f..b0022893368 100644 --- a/mk/buildlink3/find-libs.mk +++ b/mk/buildlink3/find-libs.mk @@ -1,4 +1,4 @@ -# $NetBSD: find-libs.mk,v 1.2 2005/06/01 18:03:06 jlam Exp $ +# $NetBSD: find-libs.mk,v 1.3 2005/07/15 18:27:55 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -52,11 +52,11 @@ # # either "yes" or "no". # -.if empty(PKGSRC_USE_TOOLS:Mecho) -PKGSRC_USE_TOOLS+= echo +.if empty(USE_TOOLS:Mecho) +USE_TOOLS+= echo .endif -.if empty(PKGSRC_USE_TOOLS:Mtest) -PKGSRC_USE_TOOLS+= test +.if empty(USE_TOOLS:Mtest) +USE_TOOLS+= test .endif .for _lib_ in ${BUILTIN_FIND_LIBS} diff --git a/mk/buildlink3/imake-check.mk b/mk/buildlink3/imake-check.mk index af7d3cafbce..914a02992e1 100644 --- a/mk/buildlink3/imake-check.mk +++ b/mk/buildlink3/imake-check.mk @@ -1,4 +1,4 @@ -# $NetBSD: imake-check.mk,v 1.1 2005/06/03 19:12:49 jlam Exp $ +# $NetBSD: imake-check.mk,v 1.2 2005/07/15 18:27:55 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -58,8 +58,8 @@ # .for _pair_ in ${BUILTIN_IMAKE_CHECK} -PKGSRC_USE_TOOLS+= cat echo grep imake mkdir rm # XXX -IMAKE?= ${X11BASE}/bin/imake # XXX +USE_TOOLS+= cat echo grep imake mkdir rm # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX . if !defined(BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}) BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}!= \ diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk index 550a947e52d..81ea80ef7f4 100644 --- a/mk/tools/defaults.mk +++ b/mk/tools/defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: defaults.mk,v 1.34 2005/06/24 20:59:59 jlam Exp $ +# $NetBSD: defaults.mk,v 1.35 2005/07/15 18:27:55 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -172,13 +172,13 @@ _TOOLS_VARNAME_GNU.yacc= YACC ###################################################################### -# Set a default value for the TOOL names for each of the tools we claim -# we'll use in PKGSRC_USE_TOOLS to point to the platform command, e.g., +# Set a default value for the TOOL names for each of the tools we +# claim we'll use in USE_TOOLS to point to the platform command, e.g., # TBL, YACC, etc. These tools are used in the top-level make(1), not # just in the targets, so these must be defined here, and this file be # included by bsd.prefs.mk. # -.for _t_ in ${PKGSRC_USE_TOOLS:O:u} +.for _t_ in ${USE_TOOLS:O:u} . if defined(_TOOLS_VARNAME.${_t_}) && \ defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_}) . for _v_ in ${_TOOLS_VARNAME.${_t_}} diff --git a/mk/tools/imake.mk b/mk/tools/imake.mk index b673ee6535f..2b126c277f4 100644 --- a/mk/tools/imake.mk +++ b/mk/tools/imake.mk @@ -1,4 +1,4 @@ -# $NetBSD: imake.mk,v 1.15 2005/07/08 13:43:47 jlam Exp $ +# $NetBSD: imake.mk,v 1.16 2005/07/15 18:27:55 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -56,7 +56,7 @@ # that use imake. # # This file needs to be included before replace.mk as it modifies the -# PKGSRC_USE_TOOLS and USE_TOOLS variables that are used by replace.mk. +# USE_TOOLS variables that are used by replace.mk. # .if defined(USE_IMAKE) @@ -64,19 +64,13 @@ USE_TOOLS+= imake xmkmf .endif # imake and xmkmf imply each other -.if !empty(PKGSRC_USE_TOOLS:Mimake) || !empty(PKGSRC_USE_TOOLS:Mxmkmf) -PKGSRC_USE_TOOLS+= imake xmkmf -.endif .if !empty(USE_TOOLS:Mimake) || !empty(USE_TOOLS:Mxmkmf) -USE_TOOLS+= imake xmkmf +USE_TOOLS+= imake xmkmf .endif # Add any extra tools that may be required when using imake, e.g. gmake. -.if !empty(PKGSRC_USE_TOOLS:Mimake) -PKGSRC_USE_TOOLS+= ${IMAKE_TOOLS:Nimake} -.endif .if !empty(USE_TOOLS:Mimake) -USE_TOOLS+= ${IMAKE_TOOLS:Nimake} +USE_TOOLS+= ${IMAKE_TOOLS:Nimake} .endif TOOLS_REAL_ARGS.imake?= ${IMAKEOPTS} diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 39f40a28819..c4b11cf7bd4 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.107 2005/06/24 21:21:31 minskim Exp $ +# $NetBSD: replace.mk,v 1.108 2005/07/15 18:27:55 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -54,14 +54,10 @@ # The tools that could be replaced with pkgsrc counterparts (usually # GNU versions of the tools) that are required by pkgsrc itself, i.e. # in targets that are part of pkgsrc infrastructure or part of the -# package Makefile, should be listed as: -# -# PKGSRC_USE_TOOLS+= awk sed -# -# The tools that are required by the package itself, i.e. within the +# package Makefile, or by the package itself, i.e. within the # software's own build system, should be listed as: # -# USE_TOOLS+= gawk gmake lex +# USE_TOOLS+= awk gmake lex sed # # If a package requires yacc to generate a parser, then the package # Makefile should contain one of the following two lines: @@ -103,13 +99,11 @@ USE_TOOLS+= bison-yacc ###################################################################### -# Create _USE_TOOLS, a sanitized version of PKGSRC_USE_TOOLS and -# USE_TOOLS that removes the ones that are overridden by superseding -# ones. +# Create _USE_TOOLS, a sanitized version of USE_TOOLS that removes the +# ones that are overridden by superseding ones. # .if !defined(_USE_TOOLS) -_USE_TOOLS:= ${PKGSRC_USE_TOOLS} ${USE_TOOLS} -_USE_TOOLS:= ${_USE_TOOLS:O:u} +_USE_TOOLS:= ${USE_TOOLS:O:u} . if !empty(USE_TOOLS:Mbison-yacc) # bison-yacc > yacc _USE_TOOLS:= ${_USE_TOOLS:Nyacc} . endif @@ -1205,11 +1199,11 @@ ${TOOLS_DEPMETHOD.${_t_}}+= ${_dep_} ###################################################################### -# For each tool that pkgsrc requires, make sure that the "TOOL" name -# points to the real command, e.g., AWK, SED, etc., provided that -# "TOOL" has been associated with <tool>. +# For each tool, make sure that the "TOOL" name points to the real +# command, e.g., AWK, SED, etc., provided that "TOOL" has been +# associated with <tool>. # -.for _t_ in ${PKGSRC_USE_TOOLS:O:u} +.for _t_ in ${_USE_TOOLS} _TOOLS_USE_PKGSRC.${_t_}?= no . if defined(_TOOLS_VARNAME.${_t_}) . if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[nN][oO]) diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile index 6f178796a53..5fbcbe64c20 100644 --- a/multimedia/gmplayer/Makefile +++ b/multimedia/gmplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/06/17 03:50:23 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/07/15 18:27:52 jlam Exp $ # # NOTE: if you are updating both mplayer and gmplayer, you must ensure @@ -52,7 +52,7 @@ DISTFILES+= ${SKINS} DISTINFO_FILE= ${.CURDIR}/distinfo DIST_SUBDIR= ${PKGNAME_NOREV}-20050409 -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar CONFIGURE_ARGS+= --enable-gui --disable-mencoder \ --confdir=${PREFIX}/share/mplayer diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile index 29cb2bc7a98..a5506b2f8a3 100644 --- a/multimedia/xanim/Makefile +++ b/multimedia/xanim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/02 18:26:36 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:52 jlam Exp $ DISTNAME= xanim2801 PKGNAME= xanim-2.80.1 @@ -22,8 +22,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} .include "Makefile.codecs" -USE_IMAKE= YES -PKGSRC_USE_TOOLS+= gunzip +USE_IMAKE= YES +USE_TOOLS+= gunzip .include "../../mk/bsd.prefs.mk" diff --git a/net/cisco-mibs/Makefile b/net/cisco-mibs/Makefile index 35cc92c90ff..136ab5ef281 100644 --- a/net/cisco-mibs/Makefile +++ b/net/cisco-mibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/05/16 01:15:32 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/07/15 18:27:52 jlam Exp $ DISTNAME= cisco-mibs-20050210 CATEGORIES= net @@ -20,7 +20,7 @@ DIST_SUBDIR= ${PKGBASE} EXTRACT_ONLY= # empty NO_BUILD= yes -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar MIBDIR= ${PREFIX}/share/cisco-mibs diff --git a/net/dgd/Makefile b/net/dgd/Makefile index 32b9e27c884..b119423ec8a 100644 --- a/net/dgd/Makefile +++ b/net/dgd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/16 01:15:32 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/15 18:27:52 jlam Exp $ DISTNAME= dgd-1.2p4 PKGNAME= dgd-1.2.0.4 @@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/dgd/src -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar SUBST_CLASSES+= paths SUBST_MESSAGE.paths= "Fixing hardcoded paths and command names." diff --git a/net/lambdamoo-core/Makefile b/net/lambdamoo-core/Makefile index 1e63f4ce9ac..c3539c31e2f 100644 --- a/net/lambdamoo-core/Makefile +++ b/net/lambdamoo-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/15 22:02:28 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:52 jlam Exp $ DISTNAME= LambdaCore-12Apr99.db PKGNAME= lambdamoo-core-990412 @@ -11,8 +11,8 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.ccs.neu.edu/home/eostrom/muds/lambdamoo.html COMMENT= Generic core classes for lambdamoo -EXTRACT_CMD= : -PKGSRC_USE_TOOLS+= gunzip +EXTRACT_CMD= : +USE_TOOLS+= gunzip WRKSRC= ${WRKDIR} diff --git a/net/netperf/Makefile b/net/netperf/Makefile index 953d62b2204..229062811a9 100644 --- a/net/netperf/Makefile +++ b/net/netperf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/15 21:52:10 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/07/15 18:27:52 jlam Exp $ # KAME Id: Makefile,v 1.3 2000/01/21 12:34:29 itojun Exp # @@ -11,8 +11,8 @@ MAINTAINER= itojun@kame.net HOMEPAGE= http://www.netperf.org/ COMMENT= Rick Jones' network performance benchmarking package -PKGSRC_USE_TOOLS+= gzip -MAKEFILE= makefile +USE_TOOLS+= gzip +MAKEFILE= makefile CFLAGS.IRIX+= -DIRIX diff --git a/net/openh323/Makefile b/net/openh323/Makefile index e91daffe833..c86a9126bd1 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:25 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/07/15 18:27:53 jlam Exp $ DISTNAME= openh323-v1_15_2-src PKGNAME= openh323-1.15.2 @@ -11,8 +11,7 @@ HOMEPAGE= http://www.openh323.org/ COMMENT= Open H.323 library WRKSRC= ${WRKDIR}/openh323 -USE_TOOLS+= gmake -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= gmake tar USE_LIBTOOL= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes diff --git a/net/ppp-lzs/Makefile b/net/ppp-lzs/Makefile index 3dc025efc89..f30e0674379 100644 --- a/net/ppp-lzs/Makefile +++ b/net/ppp-lzs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:27 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:53 jlam Exp $ DISTNAME= ppp-lzs-1.2 CATEGORIES= net @@ -17,7 +17,7 @@ MAKE_ENV+= NETBSDSRCDIR="${NETBSDSRCDIR}" MAKE_ENV+= S="${NETBSDSRCDIR}/sys" MESSAGE_SUBST+= PREFIX="${PREFIX}" -PKGSRC_USE_TOOLS+= patch +USE_TOOLS+= patch BUILDLINK_PASSTHRU_DIRS= ${NETBSDSRCDIR}/lib/libpcap diff --git a/net/wakeup/Makefile b/net/wakeup/Makefile index b7be8f8373d..861f94f4f64 100644 --- a/net/wakeup/Makefile +++ b/net/wakeup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/15 22:02:28 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/07/15 18:27:53 jlam Exp $ # DISTNAME= hpwake @@ -11,7 +11,7 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.berens-partner.de/wann/computer/wol.html COMMENT= Wakeup On LAN client for remote power-up of machines -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gunzip do-extract: ${MKDIR} ${WRKSRC} diff --git a/pkgtools/prereq-readme/Makefile b/pkgtools/prereq-readme/Makefile index 01f3abc5bde..96aeacf45d2 100644 --- a/pkgtools/prereq-readme/Makefile +++ b/pkgtools/prereq-readme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/05/22 01:33:31 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.3 2005/07/15 18:27:53 jlam Exp $ # DISTNAME= prereq-readme-20050521 @@ -18,15 +18,15 @@ NO_INSTALL= # defined NO_PACKAGE= # defined # list all the tools we use -PKGSRC_USE_TOOLS+= awk -PKGSRC_USE_TOOLS+= cmp -PKGSRC_USE_TOOLS+= echo -PKGSRC_USE_TOOLS+= expr -PKGSRC_USE_TOOLS+= fgrep -PKGSRC_USE_TOOLS+= find -PKGSRC_USE_TOOLS+= grep -PKGSRC_USE_TOOLS+= sed -PKGSRC_USE_TOOLS+= setenv -PKGSRC_USE_TOOLS+= sort +USE_TOOLS+= awk +USE_TOOLS+= cmp +USE_TOOLS+= echo +USE_TOOLS+= expr +USE_TOOLS+= fgrep +USE_TOOLS+= find +USE_TOOLS+= grep +USE_TOOLS+= sed +USE_TOOLS+= setenv +USE_TOOLS+= sort .include "../../mk/bsd.pkg.mk" diff --git a/print/cnprint/Makefile b/print/cnprint/Makefile index 0af1be6736d..f6cfebeda9b 100644 --- a/print/cnprint/Makefile +++ b/print/cnprint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:30 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:53 jlam Exp $ DISTNAME= # PKGNAME= cnprint-3.30b @@ -26,7 +26,7 @@ HOMEPAGE= http://www.neurophys.wisc.edu/~cai/software/index.html COMMENT= Print & convert CJK style text to PostScript DIST_SUBDIR= ${PKGNAME} -PKGSRC_USE_TOOLS+= gtar gunzip +USE_TOOLS+= gtar gunzip INSTALLATION_DIRS= bin do-extract: diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile index f7d4f319abd..96b50275f44 100644 --- a/print/hpijs/Makefile +++ b/print/hpijs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/06/17 04:49:48 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/07/15 18:27:53 jlam Exp $ DISTNAME= hpijs-1.7.1 PKGREVISION= # empty @@ -15,7 +15,7 @@ USE_LANGUAGES= c c++ GNU_CONFIGURE= # defined CPPFLAGS+= -DAPDK_BUFFER_SEND -PKGSRC_USE_TOOLS+= gzip +USE_TOOLS+= gzip ONLY_FOR_COMPILER= gcc INSTALLATION_DIRS= bin diff --git a/print/teTeX1-sharesrc/Makefile b/print/teTeX1-sharesrc/Makefile index 9c16814026c..1b8822e0075 100644 --- a/print/teTeX1-sharesrc/Makefile +++ b/print/teTeX1-sharesrc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/15 19:11:35 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:53 jlam Exp $ DISTNAME= teTeX-texmfsrc-1.0.1 PKGNAME= teTeX-sharesrc-1.0.1 @@ -19,7 +19,7 @@ EXTRACT_ONLY= # empty NO_CONFIGURE= yes NO_BUILD= yes NO_MTREE= yes -PKGSRC_USE_TOOLS+= patch +USE_TOOLS+= patch FILESDIR= ${.CURDIR}/../../print/teTeX1-share/files EXTRA_PATCH= ${FILESDIR}/latex.ltx.diff diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile index 3954012ca5a..5b24f0b39bd 100644 --- a/print/texfamily/Makefile +++ b/print/texfamily/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:20 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/15 18:27:53 jlam Exp $ DISTNAME= TeXfamily-1.2.1 PKGREVISION= 5 @@ -35,11 +35,9 @@ TETEX_DIR= ${PKGSRCDIR}/print/teTeX1-bin/${WRKDIR:T}/teTeX-1.0 WRKSRC= ${TETEX_DIR} EXTRACT_ONLY= # none -PKGSRC_USE_TOOLS+= gtar - BUILD_TARGET= all INSTALL_TARGET= install strip -USE_TOOLS+= gmake +USE_TOOLS+= gmake gtar PLIST_SUBST+= MV="${MV}" CFLAGS+= -Dunix MAKEFLAGS+= PREFIX=${PREFIX:Q} diff --git a/security/gnupg/options.mk b/security/gnupg/options.mk index 5fc22c81ebd..367487fc14c 100644 --- a/security/gnupg/options.mk +++ b/security/gnupg/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/05/15 04:26:24 jlam Exp $ +# $NetBSD: options.mk,v 1.4 2005/07/15 18:27:53 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnupg PKG_SUPPORTED_OPTIONS= i586-optimized curl idea ldap m68060-optimized @@ -25,7 +25,7 @@ LICENCE= fee-based-commercial-use DISTFILES+= idea.c.gz SITES_idea.c.gz=ftp://ftp.gnupg.dk/pub/contrib-dk/ \ http://www.gnupg.dk/contrib-dk/ -PKGSRC_USE_TOOLS+= gzcat +USE_TOOLS+= gzcat pre-configure: ${GZCAT} ${DISTDIR}/idea.c.gz > ${WRKSRC}/cipher/idea.c diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile index 2e484f81142..c61098fb911 100644 --- a/security/mit-krb5/Makefile +++ b/security/mit-krb5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/06/20 06:39:59 kristerw Exp $ +# $NetBSD: Makefile,v 1.28 2005/07/15 18:27:53 jlam Exp $ DISTNAME= krb5-1.4 PKGNAME= mit-${DISTNAME:S/-signed$//} @@ -21,8 +21,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src CONFLICTS+= heimdal-[0-9]* CONFLICTS+= kth-krb4-[0-9]* -PKGSRC_USE_TOOLS+= gzcat -USE_TOOLS+= autoconf yacc +USE_TOOLS+= autoconf gzcat yacc GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile index 2b295eb53ed..5030078a8ef 100644 --- a/security/pgp2/Makefile +++ b/security/pgp2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/06/17 03:50:32 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2005/07/15 18:27:53 jlam Exp $ DISTNAME= pgp263is CATEGORIES= security @@ -65,7 +65,7 @@ CFLAGS+= -DHIGHFIRST BUILD_DEFS+= USE_RSAREF2 M68060 ASMFLAG -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar INSTALLATION_DIRS= bin man/man1 .if !defined(USE_RSAREF2) || ${USE_RSAREF2} != YES && ${USE_RSAREF2} != NO diff --git a/shells/bash2-doc/Makefile b/shells/bash2-doc/Makefile index a8628ec1373..641550478ae 100644 --- a/shells/bash2-doc/Makefile +++ b/shells/bash2-doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/15 22:02:28 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/15 18:27:53 jlam Exp $ DISTNAME= bash-doc-2.05b PKGNAME= bash-doc-2.05.2 @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/doc NO_CONFIGURE= # defined NO_BUILD= # defined -PKGSRC_USE_TOOLS+= gzip +USE_TOOLS+= gzip DOCDIR= ${PREFIX}/share/doc/bash HTMLDIR= ${PREFIX}/share/doc/html/bash diff --git a/sysutils/cpuburn/Makefile b/sysutils/cpuburn/Makefile index bf06b7bcad1..ea6da1bb1b6 100644 --- a/sysutils/cpuburn/Makefile +++ b/sysutils/cpuburn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:33 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/15 18:27:53 jlam Exp $ # DISTNAME= cpuburn_1_4 @@ -15,7 +15,7 @@ COMMENT= CPU load testing utilities for Pentium pro and later ONLY_FOR_PLATFORM= *-*-i[3456]86 EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${GTAR} -xf - -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/sysutils/tdir/Makefile b/sysutils/tdir/Makefile index 3103c4a0de4..7186273f448 100644 --- a/sysutils/tdir/Makefile +++ b/sysutils/tdir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:35 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/07/15 18:27:53 jlam Exp $ # DISTNAME= tdir-1.58 @@ -11,7 +11,7 @@ COMMENT= Display directories with files ordered by ending "extension" LICENSE= tdir-license -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gunzip PYTHON_PATCH_SCRIPTS= tdir INSTALLATION_DIRS= bin man/man1 diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile index d5a1e41633b..3fe55d484d1 100644 --- a/textproc/eb/Makefile +++ b/textproc/eb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:34 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/07/15 18:27:53 jlam Exp $ DISTNAME= eb-4.1.3 CATEGORIES= textproc japanese @@ -52,11 +52,10 @@ DIST_SUBDIR= ${PKGNAME_NOREV} PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGINSTALL= YES -USE_TOOLS+= gmake +USE_TOOLS+= gmake gtar USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_PERL5= build -PKGSRC_USE_TOOLS+= gtar CONFIGURE_ARGS+= --with-zlib CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile index f210d2c122c..7983579ff84 100644 --- a/textproc/html2text/Makefile +++ b/textproc/html2text/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:36 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/15 18:27:53 jlam Exp $ DISTNAME= html2text-1.3.2a CATEGORIES= textproc @@ -12,7 +12,7 @@ USE_LANGUAGES= c c++ GCC_REQD= 3.0 HAS_CONFIGURE= yes CONFIGURE_ENV+= ECHO="${ECHO}" -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gunzip INSTALLATION_DIRS= bin man/man1 man/man5 post-build: diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile index 49d0d16590f..0c05b60b740 100644 --- a/time/cardboard-schedule/Makefile +++ b/time/cardboard-schedule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/17 03:50:38 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/07/15 18:27:53 jlam Exp $ # DISTNAME= cs113ins @@ -18,7 +18,7 @@ RESTRICTED= "License prohibits redistribution on CDROM" NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar EXTRACT_CMD= (cd ${WRKDIR} && unzip -x ${DOWNLOADED_DISTFILE}) || ${TRUE} WRKSRC= ${WRKDIR} diff --git a/wm/ethemes/Makefile b/wm/ethemes/Makefile index 5930fae38fe..80cf71b7f1d 100644 --- a/wm/ethemes/Makefile +++ b/wm/ethemes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:24 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/15 18:27:54 jlam Exp $ DISTNAME= ethemes-0.1 PKGREVISION= 2 @@ -17,7 +17,7 @@ NO_BUILD= yes NO_CONFIGURE= yes EXTRACT_ONLY= -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar E_DATADIR= share/enlightenment/themes diff --git a/www/album_themes/Makefile b/www/album_themes/Makefile index e0a13510c19..c1b0976c8b1 100644 --- a/www/album_themes/Makefile +++ b/www/album_themes/Makefile @@ -16,7 +16,7 @@ NO_CONFIGURE= # defined NO_BUILD= # defined EXTRACT_ONLY= # defined -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= tar A_DATADIR= share/Album A_HTTPDIR= share/httpd/htdocs/Album diff --git a/www/ap-iasp/Makefile b/www/ap-iasp/Makefile index 3ef241497e3..5cbdb387070 100644 --- a/www/ap-iasp/Makefile +++ b/www/ap-iasp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/16 01:15:34 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:54 jlam Exp $ .include "../iasp/Makefile.common" @@ -13,7 +13,7 @@ WRKSRC= ${WRKDIR}/${IASP_SRCDIR} APACHE_MODULE= # defined MESSAGE_SUBST+= IASP_DESTDIR=${IASP_DESTDIR} -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar post-extract: cd ${WRKDIR}; ${GTAR} -xf ${IASP_TARFILE} ${IASP_SRCDIR} diff --git a/www/iasp/Makefile b/www/iasp/Makefile index 33104da0ddd..d322a74c5b8 100644 --- a/www/iasp/Makefile +++ b/www/iasp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/16 01:15:34 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:54 jlam Exp $ .include "../iasp/Makefile.common" @@ -6,7 +6,7 @@ PKGNAME= iasp-${IASP_VERSION} PKGREVISION= 2 COMMENT= Instant ASP: Java implementation of Active Server Pages -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar SCRIPTS_ENV+= CAT=${CAT:Q} SCRIPTS_ENV+= CHMOD=${CHMOD:Q} diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile index cbb47781cdf..a5d8ef05a00 100644 --- a/www/jakarta-tomcat5/Makefile +++ b/www/jakarta-tomcat5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/16 01:32:23 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:54 jlam Exp $ PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION} DISTNAME= jakarta-tomcat-${TOMCAT_VERSION} @@ -23,7 +23,7 @@ CATALINA_DIR= Catalina/localhost EGDIR= ${TOMCAT_LIB}/share/examples/jakarta-tomcat EGDIR2= ${EGDIR}/${CATALINA_DIR} -PKGSRC_USE_TOOLS+= gunzip tar +USE_TOOLS+= gunzip tar # Work around a horrible interaction with the gzip in NetBSD 2.0 (at least RC4) # If gzip is used in a pipeline the tarfile fails to extract. PR bin/27228 diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile index 2f1660d2b6a..1ee0e2e8758 100644 --- a/www/jakarta-tomcat55/Makefile +++ b/www/jakarta-tomcat55/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/25 13:46:43 abs Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:54 jlam Exp $ DISTNAME= jakarta-tomcat-${TOMCAT_VERSION} PKGREVISION= 1 @@ -22,7 +22,7 @@ CATALINA_DIR= Catalina/localhost EGDIR= ${TOMCAT_LIB}/share/examples/jakarta-tomcat EGDIR2= ${EGDIR}/${CATALINA_DIR} -PKGSRC_USE_TOOLS+= gunzip tar +USE_TOOLS+= gunzip tar # Work around a horrible interaction with the gzip in NetBSD 2.0 (at least RC4) # If gzip is used in a pipeline the tarfile fails to extract. PR bin/27228 diff --git a/www/jsdk20/Makefile b/www/jsdk20/Makefile index 949931218c0..baf46422d3d 100644 --- a/www/jsdk20/Makefile +++ b/www/jsdk20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/16 01:15:34 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/15 18:27:54 jlam Exp $ # STOP! Don't update this to a later version of this software. # The JSDK and Apache Jakarta projects have merged, making the # jakarta-tomcat package the current version of this software. @@ -25,7 +25,7 @@ BUILD_DEFS+= JSDK_HOME NO_CONFIGURE= NO_BUILD= -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar RESTRICTED= "Read license before redistributing the Java(tm) Servlet Development Kit" NO_SRC_ON_FTP= ${RESTRICTED} diff --git a/www/mozilla-bin-nightly/Makefile.common b/www/mozilla-bin-nightly/Makefile.common index d09d61bf4af..cbd8b2d1c76 100644 --- a/www/mozilla-bin-nightly/Makefile.common +++ b/www/mozilla-bin-nightly/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2005/05/16 04:45:40 jlam Exp $ +# $NetBSD: Makefile.common,v 1.6 2005/07/15 18:27:54 jlam Exp $ MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/ \ ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/ @@ -9,7 +9,7 @@ NO_SRC_ON_FTP= # defined .include "../../mk/bsd.prefs.mk" -PKGSRC_USE_TOOLS+= date +USE_TOOLS+= date .if !defined(MOZ_VER) || empty(MOZ_VER) MOZ_VER!= ${DATE} +%Y%m%d diff --git a/www/opera/Makefile b/www/opera/Makefile index 0eae75ff413..c8404f32926 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/06/17 19:06:43 jdolecek Exp $ +# $NetBSD: Makefile,v 1.39 2005/07/15 18:27:54 jlam Exp $ DISTNAME= opera-${OPERA_PKG_VERSION:S/u/pl/} PKGREVISION= # empty @@ -110,7 +110,7 @@ post-install: post-install-manpage .include "../../emulators/suse_linux/Makefile.application" .if defined(MANCOMPRESSED) && !empty(MANCOMPRESSED:M[yY][eE][sS]) -PKGSRC_USE_TOOLS+= gzip +USE_TOOLS+= gzip .endif post-install-manpage: @@ -137,7 +137,7 @@ post-install: # regenerate distinfo for all ports supported by this package opera-distinfo: - ( echo '$$NetBSD: Makefile,v 1.38 2005/06/17 19:06:43 jdolecek Exp $$'; echo ''; \ + ( echo '$$NetBSD: Makefile,v 1.39 2005/07/15 18:27:54 jlam Exp $$'; echo ''; \ _OPERA_OPSYS=NetBSD ${MAKE} distinfo 1>&2; \ ${GREP} opera distinfo; \ _OPERA_OPSYS=FreeBSD ${MAKE} distinfo 1>&2; \ diff --git a/x11/tk-BWidget/Makefile b/x11/tk-BWidget/Makefile index 130b581bf03..d8f811b892b 100644 --- a/x11/tk-BWidget/Makefile +++ b/x11/tk-BWidget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/05/16 01:15:34 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/07/15 18:27:54 jlam Exp $ DISTNAME= BWidget-1.7.0 PKGNAME= tk-${DISTNAME} @@ -18,7 +18,7 @@ NO_EXTRACT= YES NO_BUILD= YES NO_CONFIGURE= YES -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile index 30281ab810b..4b500791d3f 100644 --- a/x11/xservers/Makefile +++ b/x11/xservers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:33 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/07/15 18:27:54 jlam Exp $ DISTNAME= xservers-3.3.6.3 CATEGORIES= x11 @@ -23,7 +23,7 @@ PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution" . endif .endif -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar X11_SUBDIR= X11R6.3 X11_SRCS= Imakefile Makefile config fonts include lib nls \ |