summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/distmp3/Makefile5
-rw-r--r--audio/flac2mp3/Makefile5
-rw-r--r--cad/gnetlist/Makefile5
-rw-r--r--cad/pcb-current/Makefile5
-rw-r--r--devel/autoconf/Makefile5
-rw-r--r--devel/autoconf213/Makefile5
-rw-r--r--devel/automake/Makefile5
-rw-r--r--devel/bison/Makefile5
-rw-r--r--graphics/netpbm/Makefile6
-rw-r--r--lang/perl5/buildlink3.mk5
-rw-r--r--mk/tools/autoconf.mk29
-rw-r--r--mk/tools/automake.mk29
-rw-r--r--mk/tools/defaults.mk4
-rw-r--r--mk/tools/replace.mk78
-rw-r--r--net/argus/Makefile5
-rw-r--r--pkgtools/pkglint/Makefile5
-rw-r--r--print/a2ps/Makefile6
-rw-r--r--textproc/aspell/Makefile6
-rw-r--r--textproc/ispell-base/Makefile5
-rw-r--r--textproc/namazu2/Makefile5
-rw-r--r--www/squid/Makefile5
21 files changed, 132 insertions, 96 deletions
diff --git a/audio/distmp3/Makefile b/audio/distmp3/Makefile
index 155732fd1bf..bebf542c4df 100644
--- a/audio/distmp3/Makefile
+++ b/audio/distmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:38 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/15 20:14:02 jlam Exp $
#
DISTNAME= distmp3-0.1.9
@@ -10,8 +10,7 @@ MAINTAINER= grant@NetBSD.org
COMMENT= Distributed mp3 encoding across multiple hosts
USE_LANGUAGES= # empty
-USE_TOOLS+= perl
-TOOLS_DEPMETHOD.perl= DEPENDS
+USE_TOOLS+= perl:run
USE_PKGINSTALL= yes
NO_BUILD= yes
diff --git a/audio/flac2mp3/Makefile b/audio/flac2mp3/Makefile
index 95d861663ac..6715c120e97 100644
--- a/audio/flac2mp3/Makefile
+++ b/audio/flac2mp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:38 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/15 20:14:03 jlam Exp $
DISTNAME= flac2mp3
PKGNAME= flac2mp3-20041223
@@ -18,8 +18,7 @@ EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
PKG_INSTALLATION_TYPES= overwrite pkgviews
REPLACE_PERL= flac2mp3.pl
-USE_TOOLS+= perl
-TOOLS_DEPMETHOD.perl= DEPENDS
+USE_TOOLS+= perl:run
WRKSRC= ${WRKDIR}
NO_BUILD= yes
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 8979bb8a340..81b9004d219 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/05/22 20:51:45 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/07/15 20:14:03 jlam Exp $
#
DISTNAME= geda-gnetlist-${PKGVERSION}
@@ -11,8 +11,7 @@ COMMENT= Netlist generation program
DEPENDS+= geda-symbols-${PKGVERSION}:../../cad/geda-symbols
# needs GNU m4 for the PCBboard netlister
-USE_TOOLS+= gm4
-TOOLS_DEPMETHOD.gm4= DEPENDS
+USE_TOOLS+= gm4:run
.include "../../cad/geda/Makefile.common"
diff --git a/cad/pcb-current/Makefile b/cad/pcb-current/Makefile
index beb8bc8ab4d..363e88d7e61 100644
--- a/cad/pcb-current/Makefile
+++ b/cad/pcb-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:40 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/15 20:14:03 jlam Exp $
#
DISTNAME= pcb-${SNAPDATE}
@@ -18,8 +18,7 @@ CONFLICTS+= pcb-[0-9]*
SNAPDATE= 20050315
GNU_CONFIGURE= yes
-USE_TOOLS+= bison gm4 gmake lex
-TOOLS_DEPMETHOD.gm4= DEPENDS
+USE_TOOLS+= bison gm4:run gmake lex
INFO_FILES= pcb.info
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 1a4475f4f17..97c931fd3ef 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/06/15 13:27:15 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2005/07/15 20:14:03 jlam Exp $
DISTNAME= autoconf-2.59
PKGREVISION= 2
@@ -10,8 +10,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/autoconf/autoconf.html
COMMENT= Generates automatic source code configuration scripts
-USE_TOOLS+= gm4
-TOOLS_DEPMETHOD.gm4= DEPENDS
+USE_TOOLS+= gm4:run
# The next line is for conflicts with old versions of this package,
# which had autoconf-devel as PKGNAME.
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index 564a1b13a7d..c3a4c68d5f0 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/22 20:51:45 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/15 20:14:03 jlam Exp $
DISTNAME= autoconf-2.13
PKGNAME= autoconf213-2.13
@@ -10,8 +10,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/autoconf/autoconf.html
COMMENT= Generates automatic source code configuration scripts (old version)
-USE_TOOLS+= gm4
-TOOLS_DEPMETHOD.gm4= DEPENDS
+USE_TOOLS+= gm4:run
CONFLICTS= autoconf-devel-[0-9]*
CONFLICTS= autoconf<2.50
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 5f618b1ecf7..01da182dfd4 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2005/07/14 02:24:22 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2005/07/15 20:14:03 jlam Exp $
#
DISTNAME= automake-1.9.6
@@ -13,8 +13,7 @@ COMMENT= GNU Standards-compliant Makefile generator
DEPENDS= autoconf>=2.58:../../devel/autoconf
-USE_TOOLS+= gm4
-TOOLS_DEPMETHOD.gm4= DEPENDS
+USE_TOOLS+= gm4:run
#PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index d4c87990659..eaca7621ce7 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/05/22 20:51:45 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2005/07/15 20:14:03 jlam Exp $
DISTNAME= bison-2.0
CATEGORIES= devel
@@ -12,8 +12,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= YES
-USE_TOOLS+= gm4
-TOOLS_DEPMETHOD.gm4= DEPENDS
+USE_TOOLS+= gm4:run
INFO_FILES= bison.info
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index ae5c4733629..8b2a3ebb359 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2005/06/30 15:58:59 minskim Exp $
+# $NetBSD: Makefile,v 1.118 2005/07/15 20:14:03 jlam Exp $
DISTNAME= netpbm-10.26.11
CATEGORIES= graphics
@@ -11,9 +11,7 @@ COMMENT= Toolkit for conversion of images between different formats
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS+= bash gmake lex perl
-
-TOOLS_DEPMETHOD.bash= DEPENDS
+USE_TOOLS+= bash:run gmake lex perl
INSTALL_TARGET= install-dev install-run
MAKE_ENV+= INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}" \
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index f2c217428fb..286af9a3e27 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2005/06/24 06:43:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2005/07/15 20:14:03 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+
@@ -22,9 +22,6 @@ BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5
.if defined(USE_PERL5) && !empty(USE_PERL5:Mbuild)
BUILDLINK_DEPMETHOD.perl?= build
.endif
-.if defined(TOOLS_DEPMETHOD.perl) && !empty(TOOLS_DEPMETHOD.perl:MBUILD_DEPENDS)
-BUILDLINK_DEPMETHOD.perl?= build
-.endif
PERL5_OPTIONS?= # empty
.if !empty(PERL5_OPTIONS:Mthreads)
diff --git a/mk/tools/autoconf.mk b/mk/tools/autoconf.mk
index 42105311c04..1ff96fc59c4 100644
--- a/mk/tools/autoconf.mk
+++ b/mk/tools/autoconf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.11 2005/06/11 05:22:03 jlam Exp $
+# $NetBSD: autoconf.mk,v 1.12 2005/07/15 20:14:04 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -66,7 +66,8 @@
#
# Only allow one of "autoconf" and "autoconf213" in USE_TOOLS.
-.if !empty(USE_TOOLS:Mautoconf) && !empty(USE_TOOLS:Mautoconf213)
+.if !empty(USE_TOOLS:C/:.*//:Mautoconf) && \
+ !empty(USE_TOOLS:C/:.*//:Mautoconf213)
PKG_FAIL_REASON+= "\`\`autoconf'' and \`\`autoconf213'' conflict in USE_TOOLS."
.endif
@@ -85,16 +86,20 @@ _TOOLS_AC_NAMES+= ifnames ifnames-2.13
_TOOLS_AC_TYPE.${_t_}?= TOOLS_GNU_MISSING
.endfor _t_
-.if !defined(TOOLS_IGNORE.autoconf) && !empty(USE_TOOLS:Mautoconf)
+.if !defined(TOOLS_IGNORE.autoconf) && !empty(USE_TOOLS:C/:.*//:Mautoconf)
. if !empty(PKGPATH:Mdevel/autoconf)
MAKEFLAGS+= TOOLS_IGNORE.autoconf=
. else
AUTOCONF_REQD?= 2.50
-TOOLS_DEPMETHOD.autoconf?= BUILD_DEPENDS
+. if !empty(USE_TOOLS:Mautoconf\:run)
+_TOOLS_DEPMETHOD.autoconf= DEPENDS
+. else
+_TOOLS_DEPMETHOD.autoconf= BUILD_DEPENDS
+. endif
TOOLS_DEPENDS.autoconf?= autoconf>=${AUTOCONF_REQD}:../../devel/autoconf
-. if empty(${TOOLS_DEPMETHOD.autoconf}:M${TOOLS_DEPENDS.autoconf})
-${TOOLS_DEPMETHOD.autoconf}+= ${TOOLS_DEPENDS.autoconf}
+. if empty(${_TOOLS_DEPMETHOD.autoconf}:M${TOOLS_DEPENDS.autoconf})
+${_TOOLS_DEPMETHOD.autoconf}+= ${TOOLS_DEPENDS.autoconf}
. endif
EVAL_PREFIX+= _TOOLS_AC_PREFIX=autoconf
@@ -121,16 +126,20 @@ TOOLS_REAL_CMD.ifnames= ${_TOOLS_AC_PREFIX}/bin/ifnames
. endif
.endif
-.if !defined(TOOLS_IGNORE.autoconf213) && !empty(USE_TOOLS:Mautoconf213)
+.if !defined(TOOLS_IGNORE.autoconf213) && !empty(USE_TOOLS:C/:.*//:Mautoconf213)
. if !empty(PKGPATH:Mdevel/autoconf213)
MAKEFLAGS+= TOOLS_IGNORE.autoconf213=
. else
AUTOCONF_REQD?= 2.13
-TOOLS_DEPMETHOD.autoconf213?= BUILD_DEPENDS
+. if !empty(USE_TOOLS:Mautoconf213\:run)
+_TOOLS_DEPMETHOD.autoconf213= DEPENDS
+. else
+_TOOLS_DEPMETHOD.autoconf213= BUILD_DEPENDS
+. endif
TOOLS_DEPENDS.autoconf213?= autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213
-. if empty(${TOOLS_DEPMETHOD.autoconf213}:M${TOOLS_DEPENDS.autoconf213})
-${TOOLS_DEPMETHOD.autoconf213}+= ${TOOLS_DEPENDS.autoconf213}
+. if empty(${_TOOLS_DEPMETHOD.autoconf213}:M${TOOLS_DEPENDS.autoconf213})
+${_TOOLS_DEPMETHOD.autoconf213}+= ${TOOLS_DEPENDS.autoconf213}
. endif
EVAL_PREFIX+= _TOOLS_AC_PREFIX=autoconf213
diff --git a/mk/tools/automake.mk b/mk/tools/automake.mk
index 21acd800355..e35256af448 100644
--- a/mk/tools/automake.mk
+++ b/mk/tools/automake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.14 2005/06/11 05:22:03 jlam Exp $
+# $NetBSD: automake.mk,v 1.15 2005/07/15 20:14:04 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -79,7 +79,8 @@ USE_TOOLS+= gettext-m4
.endif
# Only allow one of "automake" and "automake14" in USE_TOOLS.
-.if !empty(USE_TOOLS:Mautomake) && !empty(USE_TOOLS:Mautomake14)
+.if !empty(USE_TOOLS:C/:.*//:Mautomake) && \
+ !empty(USE_TOOLS:C/:.*//:Mautomake14)
PKG_FAIL_REASON+= "\`\`automake'' and \`\`automake14'' conflict in USE_TOOLS."
.endif
@@ -103,17 +104,21 @@ _TOOLS_AM_NAMES+= automake automake-1.4 \
_TOOLS_AM_TYPE.${_t_}?= TOOLS_GNU_MISSING
.endfor
-.if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:Mautomake)
+.if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:C/:.*//:Mautomake)
. if !empty(PKGPATH:Mdevel/automake)
MAKEFLAGS+= TOOLS_IGNORE.automake=
. else
AUTOMAKE_REQD?= 1.9
AUTOCONF_REQD?= 2.58
-TOOLS_DEPMETHOD.automake?= BUILD_DEPENDS
+. if !empty(USE_TOOLS:Mautomake\:run)
+_TOOLS_DEPMETHOD.automake= DEPENDS
+. else
+_TOOLS_DEPMETHOD.automake= BUILD_DEPENDS
+. endif
TOOLS_DEPENDS.automake?= automake>=${AUTOMAKE_REQD}:../../devel/automake
-. if empty(${TOOLS_DEPMETHOD.automake}:M${TOOLS_DEPENDS.automake})
-${TOOLS_DEPMETHOD.automake}+= ${TOOLS_DEPENDS.automake}
+. if empty(${_TOOLS_DEPMETHOD.automake}:M${TOOLS_DEPENDS.automake})
+${_TOOLS_DEPMETHOD.automake}+= ${TOOLS_DEPENDS.automake}
. endif
EVAL_PREFIX+= _TOOLS_AM_PREFIX=automake
@@ -125,17 +130,21 @@ TOOLS_REAL_CMD.automake= ${_TOOLS_AM_PREFIX}/bin/automake
. endif
.endif
-.if !defined(TOOLS_IGNORE.automake14) && !empty(USE_TOOLS:Mautomake14)
+.if !defined(TOOLS_IGNORE.automake14) && !empty(USE_TOOLS:C/:.*//:Mautomake14)
. if !empty(PKGPATH:Mdevel/automake14)
MAKEFLAGS+= TOOLS_IGNORE.automake14=
. else
AUTOMAKE_REQD?= 1.4
AUTOCONF_REQD?= 2.13
-TOOLS_DEPMETHOD.automake14?= BUILD_DEPENDS
+. if !empty(USE_TOOLS:Mautomake14\:run)
+_TOOLS_DEPMETHOD.automake14= DEPENDS
+. else
+_TOOLS_DEPMETHOD.automake14= BUILD_DEPENDS
+. endif
TOOLS_DEPENDS.automake14?= automake14>=${AUTOMAKE_REQD}:../../devel/automake14
-. if empty(${TOOLS_DEPMETHOD.automake14}:M${TOOLS_DEPENDS.automake14})
-${TOOLS_DEPMETHOD.automake14}+= ${TOOLS_DEPENDS.automake14}
+. if empty(${_TOOLS_DEPMETHOD.automake14}:M${TOOLS_DEPENDS.automake14})
+${_TOOLS_DEPMETHOD.automake14}+= ${TOOLS_DEPENDS.automake14}
. endif
EVAL_PREFIX+= _TOOLS_AM_PREFIX=automake14
diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index 81ea80ef7f4..479e4145aec 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.35 2005/07/15 18:27:55 jlam Exp $
+# $NetBSD: defaults.mk,v 1.36 2005/07/15 20:14:04 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -178,7 +178,7 @@ _TOOLS_VARNAME_GNU.yacc= YACC
# just in the targets, so these must be defined here, and this file be
# included by bsd.prefs.mk.
#
-.for _t_ in ${USE_TOOLS:O:u}
+.for _t_ in ${USE_TOOLS:C/:.*//: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/replace.mk b/mk/tools/replace.mk
index c4b11cf7bd4..97c5d6a4aaa 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.108 2005/07/15 18:27:55 jlam Exp $
+# $NetBSD: replace.mk,v 1.109 2005/07/15 20:14:04 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -69,19 +69,20 @@
# to be generated that may be used as a yacc-replacement.
#
# By default, any dependencies on the pkgsrc tools are build dependencies,
-# but this may be changed by explicitly setting TOOLS_DEPMETHOD.<tool>,
+# but this may be changed by adding a :run modifier to the tool name,
# e.g.:
#
-# TOOLS_DEPMETHOD.tbl= DEPENDS
+# USE_TOOLS+= perl:run
#
# Continue to allow USE_PERL5 until packages have been taught to use the
# new syntax.
#
.if defined(USE_PERL5)
-USE_TOOLS+= perl
. if empty(USE_PERL5:Mbuild)
-TOOLS_DEPMETHOD.perl?= DEPENDS
+USE_TOOLS+= perl:run
+. else
+USE_TOOLS+= perl
. endif
.endif
@@ -93,7 +94,7 @@ USE_TOOLS+= perl
.endif
# bison implies "bison-yacc"
-.if !empty(USE_TOOLS:Mbison)
+.if !empty(USE_TOOLS:Mbison) || !empty(USE_TOOLS:Mbison\:*)
USE_TOOLS+= bison-yacc
.endif
@@ -103,20 +104,20 @@ USE_TOOLS+= bison-yacc
# ones that are overridden by superseding ones.
#
.if !defined(_USE_TOOLS)
-_USE_TOOLS:= ${USE_TOOLS:O:u}
-. if !empty(USE_TOOLS:Mbison-yacc) # bison-yacc > yacc
+_USE_TOOLS:= ${USE_TOOLS:C/:.*//:O:u}
+. if !empty(_USE_TOOLS:Mbison-yacc) # bison-yacc > yacc
_USE_TOOLS:= ${_USE_TOOLS:Nyacc}
. endif
-. if !empty(USE_TOOLS:Mflex) # flex > lex
+. if !empty(_USE_TOOLS:Mflex) # flex > lex
_USE_TOOLS:= ${_USE_TOOLS:Nlex}
. endif
-. if !empty(USE_TOOLS:Mgawk) # gawk > awk
+. if !empty(_USE_TOOLS:Mgawk) # gawk > awk
_USE_TOOLS:= ${_USE_TOOLS:Nawk}
. endif
-. if !empty(USE_TOOLS:Mgm4) # gm4 > m4
+. if !empty(_USE_TOOLS:Mgm4) # gm4 > m4
_USE_TOOLS:= ${_USE_TOOLS:Nm4}
. endif
-. if !empty(USE_TOOLS:Mgsed) # gsed > sed
+. if !empty(_USE_TOOLS:Mgsed) # gsed > sed
_USE_TOOLS:= ${_USE_TOOLS:Nsed}
. endif
.endif
@@ -124,6 +125,48 @@ MAKEVARS+= _USE_TOOLS
######################################################################
+# Set the type of dependency requested for the tool.
+#
+.for _t_ in ${USE_TOOLS:N*\:*} ${USE_TOOLS:M*\:build}
+_TOOLS_DEPMETHOD.${_t_:C/:.*//}= BUILD_DEPENDS
+.endfor
+.for _t_ in ${USE_TOOLS:M*\:run}
+_TOOLS_DEPMETHOD.${_t_:C/:.*//}= DEPENDS
+.endfor
+
+.if !empty(_USE_TOOLS:Mbison-yacc) # bison-yacc > yacc
+. if (${_TOOLS_DEPMETHOD.bison-yacc} == "BUILD_DEPENDS") && \
+ defined(_TOOLS_DEPMETHOD.yacc)
+_TOOLS_DEPMETHOD.bison-yacc= ${_TOOLS_DEPMETHOD.yacc}
+. endif
+.endif
+.if !empty(_USE_TOOLS:Mflex) # flex > lex
+. if (${_TOOLS_DEPMETHOD.flex} == "BUILD_DEPENDS") && \
+ defined(_TOOLS_DEPMETHOD.lex)
+_TOOLS_DEPMETHOD.flex= ${_TOOLS_DEPMETHOD.lex}
+. endif
+.endif
+.if !empty(_USE_TOOLS:Mgawk) # gawk > awk
+. if (${_TOOLS_DEPMETHOD.gawk} == "BUILD_DEPENDS") && \
+ defined(_TOOLS_DEPMETHOD.awk)
+_TOOLS_DEPMETHOD.gawk= ${_TOOLS_DEPMETHOD.awk}
+. endif
+.endif
+.if !empty(_USE_TOOLS:Mgm4) # gm4 > m4
+. if (${_TOOLS_DEPMETHOD.gm4} == "BUILD_DEPENDS") && \
+ defined(_TOOLS_DEPMETHOD.m4)
+_TOOLS_DEPMETHOD.gm4= ${_TOOLS_DEPMETHOD.m4}
+. endif
+.endif
+.if !empty(_USE_TOOLS:Mgsed) # gsed > sed
+. if (${_TOOLS_DEPMETHOD.gsed} == "BUILD_DEPENDS") && \
+ defined(_TOOLS_DEPMETHOD.sed)
+_TOOLS_DEPMETHOD.gsed= ${_TOOLS_DEPMETHOD.sed}
+. endif
+.endif
+
+######################################################################
+
# _TOOLS_USE_PKGSRC.<tool> is "yes" or "no" depending on whether we're
# using a pkgsrc-supplied tool to replace the system-supplied one. We
# use the system-supplied one if TOOLS_PLATFORM.<tool> is non-empty, or
@@ -136,11 +179,6 @@ _TOOLS_USE_PKGSRC.${_t_}?= no
_TOOLS_USE_PKGSRC.${_t_}?= yes
.endfor
-# TOOLS_DEPMETHOD.<tool> defaults to BUILD_DEPENDS.
-.for _t_ in ${_USE_TOOLS}
-TOOLS_DEPMETHOD.${_t_}?= BUILD_DEPENDS
-.endfor
-
######################################################################
# For each of the blocks below, we create either symlinks or wrappers
@@ -1188,10 +1226,10 @@ FIND_PREFIX:= ${TOOLS_FIND_PREFIX}
# Add the dependencies for each pkgsrc-supplied tool.
#
.for _t_ in ${_USE_TOOLS}
-. if defined(TOOLS_DEPMETHOD.${_t_}) && defined(TOOLS_DEPENDS.${_t_})
+. if defined(_TOOLS_DEPMETHOD.${_t_}) && defined(TOOLS_DEPENDS.${_t_})
. for _dep_ in ${TOOLS_DEPENDS.${_t_}}
-. if empty(${TOOLS_DEPMETHOD.${_t_}}:C/\:.*$//:M${_dep_:C/\:.*$//})
-${TOOLS_DEPMETHOD.${_t_}}+= ${_dep_}
+. if empty(${_TOOLS_DEPMETHOD.${_t_}}:C/\:.*$//:M${_dep_:C/\:.*$//})
+${_TOOLS_DEPMETHOD.${_t_}}+= ${_dep_}
. endif
. endfor
. endif
diff --git a/net/argus/Makefile b/net/argus/Makefile
index ca4369d694d..c5b08de6ea1 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/22 13:14:50 markd Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/15 20:14:03 jlam Exp $
#
DISTNAME= argus-3.3
@@ -18,8 +18,7 @@ DEPENDS+= p5-Digest-HMAC-[0-9]*:../../security/p5-Digest-HMAC
DEPENDS+= p5-Crypt-DES-[0-9]*:../../security/p5-Crypt-DES
DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI
-USE_TOOLS+= perl
-TOOLS_DEPMETHOD.perl= DEPENDS
+USE_TOOLS+= perl:run
USE_PKGINSTALL= yes
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ${WRKSRC}/Configure
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index bb41276af81..270191e4b9d 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.244 2005/07/05 01:09:17 rillig Exp $
+# $NetBSD: Makefile,v 1.245 2005/07/15 20:14:03 jlam Exp $
#
DISTNAME= pkglint-4.18
@@ -14,8 +14,7 @@ DEPENDS+= digest>=20010101:../../pkgtools/digest
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS+= perl
-TOOLS_DEPMETHOD.perl= DEPENDS
+USE_TOOLS+= perl:run
WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index eba59465411..3eb46ee23eb 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/06/10 18:44:31 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2005/07/15 20:14:03 jlam Exp $
DISTNAME= a2ps-4.13b
PKGNAME= a2ps-4.13.0.2
@@ -22,9 +22,7 @@ STRIP= # empty
USE_PERL5= yes
USE_LIBTOOL= yes
-USE_TOOLS+= file gmake mktemp
-TOOLS_DEPMETHOD.file= DEPENDS
-TOOLS_DEPMETHOD.mktemp= DEPENDS
+USE_TOOLS+= file:run gmake mktemp:run
CONFIGURE_ENV+= file_prog=${FILE_CMD:Q}
USE_PKGINSTALL= YES
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 9c815457a50..30735972a7e 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/06/28 14:18:55 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/07/15 20:14:03 jlam Exp $
#
DISTNAME= aspell-0.60.3
@@ -12,9 +12,9 @@ COMMENT= Spell checker with good multi-language support
CONFLICTS= libpspell-[0-9]*
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake
# for bin/aspell-import
-TOOLS_DEPMETHOD.perl= DEPENDS
+USE_TOOLS+= perl:run
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile
index fe309c367d0..62848b3aaa6 100644
--- a/textproc/ispell-base/Makefile
+++ b/textproc/ispell-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/07 12:42:20 markd Exp $
+# $NetBSD: Makefile,v 1.25 2005/07/15 20:14:03 jlam Exp $
#
DISTNAME= ispell-3.3.02
@@ -12,8 +12,7 @@ COMMENT= Interactive spelling checker
CONFLICTS+= ispell-[0-9]*
-USE_TOOLS+= mktemp
-TOOLS_DEPMETHOD.mktemp= DEPENDS
+USE_TOOLS+= mktemp:run
MAKE_FLAGS+= TMPDIR="${WRKDIR}"
diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile
index 41d3a9239dd..d15e69b3523 100644
--- a/textproc/namazu2/Makefile
+++ b/textproc/namazu2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/12 16:03:56 taca Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/15 20:14:03 jlam Exp $
DISTNAME= namazu-2.0.14
PKGREVISION= 2
@@ -18,8 +18,7 @@ CONFLICTS+= namazu-[0-9]*
USE_PKGLOCALEDIR= yes
USE_PKGINSTALL= yes
-USE_TOOLS= perl
-TOOLS_DEPMETHOD.perl= DEPENDS
+USE_TOOLS= perl:run
GNU_CONFIGURE= yes
USE_LANGUAGE= c
USE_LIBTOOL= yes
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 92c6e160f9e..a62c61204f5 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.153 2005/06/07 14:19:10 taca Exp $
+# $NetBSD: Makefile,v 1.154 2005/07/15 20:14:03 jlam Exp $
DISTNAME= squid-2.5.STABLE10
PKGNAME= squid-2.5.10
@@ -33,8 +33,7 @@ DOCFILES= ChangeLog RELEASENOTES.html doc/debug-sections.txt
PKG_SYSCONFSUBDIR?= squid
USE_PKGINSTALL= yes
-USE_TOOLS+= perl
-TOOLS_DEPMETHOD.perl?= DEPENDS
+USE_TOOLS+= perl:run
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
--localstatedir=${DATADIR}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 23:15:27 +0000