pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Drop distinction between PKGSRC_USE_TOOLS and USE_TOOL...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1495c9f085ea
branches: trunk
changeset: 496917:1495c9f085ea
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Jul 15 18:27:48 2005 +0000
description:
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.
diffstat:
Makefile | 10 +++++-----
audio/gqmpeg-skins/Makefile | 4 ++--
benchmarks/bonnie/Makefile | 4 ++--
benchmarks/xengine/Makefile | 4 ++--
biology/arka/Makefile | 4 ++--
biology/rasmol/Makefile | 4 ++--
cross/COMMON/cross.mk | 4 ++--
cross/avr-gcc/Makefile | 5 ++---
cross/i386-mingw32/Makefile | 5 ++---
databases/postgresql73-lib/Makefile | 4 ++--
databases/postgresql73-server/Makefile | 4 ++--
databases/postgresql74-client/Makefile | 4 ++--
databases/postgresql74-docs/Makefile | 4 ++--
databases/postgresql74-lib/Makefile | 4 ++--
databases/postgresql74-server/Makefile | 4 ++--
databases/tcl-postgresql73/Makefile | 4 ++--
databases/tk-postgresql73/Makefile | 4 ++--
devel/ddd/Makefile | 5 ++---
devel/device-driver-doc-de/Makefile | 6 +++---
devel/newt/Makefile | 5 ++---
devel/pwlib/Makefile | 5 ++---
editors/ted-en-us/Makefile | 4 ++--
editors/ted/Makefile | 4 ++--
editors/xemacs-packages/Makefile | 4 ++--
editors/xemacs/Makefile.common | 4 ++--
emulators/linuxppc_lib/Makefile | 4 ++--
emulators/spim/Makefile | 5 ++---
fonts/XFree86-fontsEncodings/Makefile.common | 4 ++--
fonts/acroread-font-share/Makefile.common | 4 ++--
fonts/acroread5-font-share/Makefile.common | 4 ++--
fonts/arphic-ttf/Makefile | 4 ++--
fonts/biznet-iso8859_2/Makefile | 4 ++--
fonts/chkfontpath/Makefile | 5 ++---
fonts/cyr-rfx-share/Makefile.common | 4 ++--
fonts/efont-unicode/Makefile | 6 +++---
fonts/freefonts/Makefile | 4 ++--
fonts/ja-elisat/Makefile | 4 ++--
fonts/ja-elisau/Makefile | 5 ++---
fonts/ja-kaname/Makefile | 4 ++--
fonts/ja-naga10/Makefile | 4 ++--
fonts/jisx0212fonts/Makefile | 4 ++--
fonts/jisx0213fonts/Makefile | 6 +++---
fonts/ko-kaist/Makefile | 5 ++---
fonts/ko-mizi/Makefile | 5 ++---
fonts/sgi-fonts/Makefile | 5 ++---
games/abuse/Makefile | 5 ++---
games/battalion/Makefile | 4 ++--
games/crossfire-cli/Makefile | 5 ++---
games/crossfire-srv/Makefile | 5 ++---
games/et/Makefile | 4 ++--
games/genecys-data/Makefile | 4 ++--
games/heretic2-demo/Makefile | 4 ++--
games/majesty-demo/Makefile | 4 ++--
games/quake3arena-demo/Makefile | 4 ++--
games/quake3arena/Makefile | 4 ++--
games/quake3server/Makefile | 4 ++--
games/rollemup/Makefile | 4 ++--
games/rtcw/Makefile | 4 ++--
games/xdoom/Makefile | 6 ++----
games/xjewel/Makefile | 6 +++---
games/xrick/Makefile | 5 ++---
graphics/Ngraph/Makefile | 5 ++---
graphics/jhead/Makefile | 4 ++--
lang/blackdown-jre13/Makefile.common | 4 ++--
lang/brandybasic/Makefile | 4 ++--
lang/f2c/Makefile | 5 ++---
lang/jbuilder-jit/Makefile | 4 ++--
lang/snobol/Makefile | 4 ++--
mail/postfix-current/options.mk | 4 ++--
mail/qmail/Makefile | 4 ++--
mail/squirrelmail-locales/Makefile | 4 ++--
math/gap/Makefile | 4 ++--
math/scilab/Makefile | 4 ++--
meta-pkgs/xorg/Makefile.common | 4 ++--
misc/bbweather/Makefile | 4 ++--
misc/colorize/Makefile | 4 ++--
misc/dnetc/Makefile | 4 ++--
misc/figlet-fonts/Makefile | 4 ++--
misc/ja-man/Makefile | 4 ++--
misc/kdrill/Makefile | 6 +++---
misc/lile/Makefile | 4 ++--
misc/routeplanner-cli/Makefile | 4 ++--
mk/bsd.pkg.check.mk | 4 ++--
mk/bsd.pkg.extract.mk | 20 ++++++++++----------
mk/bsd.pkg.mk | 20 ++++++++++----------
mk/bsd.pkg.patch.mk | 10 +++++-----
mk/bsd.prefs.mk | 9 ++++-----
mk/buildlink3/find-files.mk | 10 +++++-----
mk/buildlink3/find-libs.mk | 10 +++++-----
mk/buildlink3/imake-check.mk | 6 +++---
mk/tools/defaults.mk | 8 ++++----
mk/tools/imake.mk | 14 ++++----------
mk/tools/replace.mk | 26 ++++++++++----------------
multimedia/gmplayer/Makefile | 4 ++--
multimedia/xanim/Makefile | 6 +++---
net/cisco-mibs/Makefile | 4 ++--
net/dgd/Makefile | 4 ++--
net/lambdamoo-core/Makefile | 6 +++---
net/netperf/Makefile | 6 +++---
net/openh323/Makefile | 5 ++---
net/ppp-lzs/Makefile | 4 ++--
net/wakeup/Makefile | 4 ++--
pkgtools/prereq-readme/Makefile | 22 +++++++++++-----------
print/cnprint/Makefile | 4 ++--
print/hpijs/Makefile | 4 ++--
print/teTeX1-sharesrc/Makefile | 4 ++--
print/texfamily/Makefile | 6 ++----
security/gnupg/options.mk | 4 ++--
security/mit-krb5/Makefile | 5 ++---
security/pgp2/Makefile | 4 ++--
shells/bash2-doc/Makefile | 4 ++--
sysutils/cpuburn/Makefile | 4 ++--
sysutils/tdir/Makefile | 4 ++--
textproc/eb/Makefile | 5 ++---
textproc/html2text/Makefile | 4 ++--
time/cardboard-schedule/Makefile | 4 ++--
wm/ethemes/Makefile | 4 ++--
www/album_themes/Makefile | 2 +-
www/ap-iasp/Makefile | 4 ++--
www/iasp/Makefile | 4 ++--
www/jakarta-tomcat5/Makefile | 4 ++--
www/jakarta-tomcat55/Makefile | 4 ++--
www/jsdk20/Makefile | 4 ++--
www/mozilla-bin-nightly/Makefile.common | 4 ++--
www/opera/Makefile | 6 +++---
x11/tk-BWidget/Makefile | 4 ++--
x11/xservers/Makefile | 4 ++--
127 files changed, 314 insertions(+), 351 deletions(-)
diffs (truncated from 2567 to 300 lines):
diff -r 42c4f788c78a -r 1495c9f085ea Makefile
--- a/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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 -r 42c4f788c78a -r 1495c9f085ea audio/gqmpeg-skins/Makefile
--- a/audio/gqmpeg-skins/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/audio/gqmpeg-skins/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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 @@
WRKSRC= ${WRKDIR}/Makefile PLIST distinfo
NO_BUILD= yes
-PKGSRC_USE_TOOLS+= gtar
+USE_TOOLS+= gtar
INSTALLATION_DIRS= share/gqmpeg/skins
diff -r 42c4f788c78a -r 1495c9f085ea benchmarks/bonnie/Makefile
--- a/benchmarks/bonnie/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/benchmarks/bonnie/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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 @@
NO_CONFIGURE= yes
WRKSRC= ${WRKDIR}
-PKGSRC_USE_TOOLS+= expr
+USE_TOOLS+= expr
MANCOMPRESSED_IF_MANZ= yes
INSTALLATION_DIRS= bin man/cat1 man/man1
diff -r 42c4f788c78a -r 1495c9f085ea benchmarks/xengine/Makefile
--- a/benchmarks/xengine/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/benchmarks/xengine/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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 @@
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 -r 42c4f788c78a -r 1495c9f085ea biology/arka/Makefile
--- a/biology/arka/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/biology/arka/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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_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 -r 42c4f788c78a -r 1495c9f085ea biology/rasmol/Makefile
--- a/biology/rasmol/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/biology/rasmol/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_IMAKE= YES
-PKGSRC_USE_TOOLS+= gunzip
+USE_TOOLS+= gunzip
MAKE_ENV+= DEPTHDEF="${DEPTHDEF}"
diff -r 42c4f788c78a -r 1495c9f085ea cross/COMMON/cross.mk
--- a/cross/COMMON/cross.mk Fri Jul 15 16:06:05 2005 +0000
+++ b/cross/COMMON/cross.mk Fri Jul 15 18:27:48 2005 +0000
@@ -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 @@
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 -r 42c4f788c78a -r 1495c9f085ea cross/avr-gcc/Makefile
--- a/cross/avr-gcc/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/cross/avr-gcc/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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 @@
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 -r 42c4f788c78a -r 1495c9f085ea cross/i386-mingw32/Makefile
--- a/cross/i386-mingw32/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/cross/i386-mingw32/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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 @@
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 -r 42c4f788c78a -r 1495c9f085ea databases/postgresql73-lib/Makefile
--- a/databases/postgresql73-lib/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/databases/postgresql73-lib/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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 @@
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 -r 42c4f788c78a -r 1495c9f085ea databases/postgresql73-server/Makefile
--- a/databases/postgresql73-server/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/databases/postgresql73-server/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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 @@
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 -r 42c4f788c78a -r 1495c9f085ea databases/postgresql74-client/Makefile
--- a/databases/postgresql74-client/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/databases/postgresql74-client/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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 @@
# 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 -r 42c4f788c78a -r 1495c9f085ea databases/postgresql74-docs/Makefile
--- a/databases/postgresql74-docs/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/databases/postgresql74-docs/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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 @@
NO_BUILD= yes
NO_CONFIGURE= yes
-PKGSRC_USE_TOOLS+= tar
+USE_TOOLS+= tar
#BUILD_DIRS= ${WRKSRC}/doc
DOCDIR= ${PREFIX}/share/doc/postgresql
diff -r 42c4f788c78a -r 1495c9f085ea databases/postgresql74-lib/Makefile
--- a/databases/postgresql74-lib/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/databases/postgresql74-lib/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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 @@
.include "../../databases/postgresql74/Makefile.common"
-PKGSRC_USE_TOOLS+= tar
+USE_TOOLS+= tar
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
.include "../../mk/bsd.prefs.mk"
diff -r 42c4f788c78a -r 1495c9f085ea databases/postgresql74-server/Makefile
--- a/databases/postgresql74-server/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/databases/postgresql74-server/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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 @@
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 -r 42c4f788c78a -r 1495c9f085ea databases/tcl-postgresql73/Makefile
--- a/databases/tcl-postgresql73/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/databases/tcl-postgresql73/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -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_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 -r 42c4f788c78a -r 1495c9f085ea databases/tk-postgresql73/Makefile
--- a/databases/tk-postgresql73/Makefile Fri Jul 15 16:06:05 2005 +0000
+++ b/databases/tk-postgresql73/Makefile Fri Jul 15 18:27:48 2005 +0000
@@ -1,4 +1,4 @@
Home |
Main Index |
Thread Index |
Old Index