summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-07-16 01:19:06 +0000
committerjlam <jlam@pkgsrc.org>2005-07-16 01:19:06 +0000
commit3e474a90d85b83de40c67c12687951e9d8d925ae (patch)
treefb130b4b27029c9f82bb28dd306abe9510817ec8
parenta20960acbebade3471260a264615c3573cf14d1f (diff)
downloadpkgsrc-3e474a90d85b83de40c67c12687951e9d8d925ae.tar.gz
Get rid of USE_PERL5. The new way to express needing the Perl executable
around at either build-time or at run-time is: USE_TOOLS+= perl # build-time USE_TOOLS+= perl:run # run-time Also remove some places where perl5/buildlink3.mk was being included by a package Makefile, but all that the package wanted was the Perl executable.
-rw-r--r--audio/mp32ogg/Makefile5
-rw-r--r--audio/mserv_irman/Makefile4
-rw-r--r--audio/mstream/Makefile4
-rw-r--r--audio/oggasm/Makefile4
-rw-r--r--audio/rip/Makefile4
-rw-r--r--benchmarks/bonnie++/Makefile5
-rw-r--r--benchmarks/skampi/Makefile4
-rw-r--r--cad/covered-current/Makefile5
-rw-r--r--cad/covered/Makefile5
-rw-r--r--cad/dinotrace/Makefile5
-rw-r--r--cad/geda-utils/Makefile4
-rw-r--r--chat/bitchbot/Makefile4
-rw-r--r--chat/centericq/Makefile6
-rw-r--r--chat/cgiirc/Makefile4
-rw-r--r--chat/dircproxy-devel/Makefile4
-rw-r--r--chat/dircproxy/Makefile4
-rw-r--r--chat/ircservices/Makefile6
-rw-r--r--comms/esms/Makefile4
-rw-r--r--comms/linuxsms/Makefile5
-rw-r--r--converters/2vcard/Makefile4
-rw-r--r--converters/bibtex2html/Makefile4
-rw-r--r--converters/code2html/Makefile4
-rw-r--r--converters/doc2html/Makefile4
-rw-r--r--converters/p5-chkjis/Makefile5
-rw-r--r--cross/avr-gcc/Makefile5
-rw-r--r--cross/i386-mingw32/Makefile5
-rw-r--r--databases/gnome-mime-data/Makefile5
-rw-r--r--databases/lbdb/Makefile5
-rw-r--r--databases/mergeant/Makefile5
-rw-r--r--databases/mysql-client/Makefile.common5
-rw-r--r--databases/mysql4-client/Makefile.common5
-rw-r--r--databases/rdb/Makefile4
-rw-r--r--devel/GConf2/Makefile.common5
-rw-r--r--devel/adocman/Makefile5
-rw-r--r--devel/cvs2html/Makefile4
-rw-r--r--devel/cvs2p4/Makefile4
-rw-r--r--devel/devhelp/Makefile5
-rw-r--r--devel/eel/Makefile5
-rw-r--r--devel/gettext-lib/builtin.mk4
-rw-r--r--devel/glib2/Makefile5
-rw-r--r--devel/kdesdk3/Makefile5
-rw-r--r--devel/kdevelop-base/Makefile4
-rw-r--r--devel/ldapsdk/Makefile6
-rw-r--r--devel/libgnomeui/Makefile5
-rw-r--r--devel/nasm/Makefile5
-rw-r--r--devel/nss/Makefile5
-rw-r--r--devel/p4pr/Makefile4
-rw-r--r--devel/papaya/Makefile5
-rw-r--r--devel/patchutils/Makefile4
-rw-r--r--devel/rpc2/Makefile7
-rw-r--r--devel/tmake/Makefile4
-rw-r--r--devel/yasm/Makefile4
-rw-r--r--doc/Makefile-example4
-rw-r--r--editors/conglomerate/Makefile5
-rw-r--r--editors/gedit/Makefile5
-rw-r--r--editors/lyx-qt/Makefile.common5
-rw-r--r--emulators/fuse/Makefile4
-rw-r--r--emulators/libspectrum/Makefile5
-rw-r--r--emulators/palmosemulator/Makefile6
-rw-r--r--emulators/raine/Makefile5
-rw-r--r--finance/gkrellm1-stock/Makefile4
-rw-r--r--fonts/ja-shinonome/Makefile5
-rw-r--r--fonts/monafonts/Makefile3
-rw-r--r--fonts/type1inst/Makefile4
-rw-r--r--games/crossfire-cli/Makefile5
-rw-r--r--games/crossfire-srv/Makefile5
-rw-r--r--games/frozen-bubble/Makefile5
-rw-r--r--games/openmortal/Makefile5
-rw-r--r--games/xracer/Makefile5
-rw-r--r--games/zoom/Makefile5
-rw-r--r--graphics/cdlabelgen/Makefile4
-rw-r--r--graphics/fly/Makefile5
-rw-r--r--graphics/get_ds7/Makefile4
-rw-r--r--graphics/gnome-icon-theme/Makefile6
-rw-r--r--graphics/gri/Makefile5
-rw-r--r--graphics/gtkglext/Makefile5
-rw-r--r--graphics/magicpoint/Makefile4
-rw-r--r--graphics/p5-Image-Imlib2/Makefile4
-rw-r--r--graphics/p5-PerlMagick/Makefile3
-rw-r--r--lang/drscheme/Makefile5
-rw-r--r--lang/erlang/Makefile5
-rw-r--r--lang/fort77/Makefile5
-rw-r--r--lang/ghc/Makefile5
-rw-r--r--lang/mono/Makefile5
-rw-r--r--lang/moscow_ml/Makefile4
-rw-r--r--lang/parrot/Makefile4
-rw-r--r--lang/perl5/buildlink3.mk6
-rw-r--r--mail/YoSucker/Makefile4
-rw-r--r--mail/anomy-sanitizer/Makefile4
-rw-r--r--mail/balsa2/Makefile5
-rw-r--r--mail/courier-imap/Makefile6
-rw-r--r--mail/courier-maildir/Makefile5
-rw-r--r--mail/distribute/Makefile4
-rw-r--r--mail/dspam/Makefile4
-rw-r--r--mail/exim/Makefile4
-rw-r--r--mail/exim3/Makefile5
-rw-r--r--mail/fix-mime-charset/Makefile4
-rw-r--r--mail/fromto/Makefile4
-rw-r--r--mail/mailagent/Makefile4
-rw-r--r--mail/mailgraph/Makefile10
-rw-r--r--mail/mailscanner/Makefile4
-rw-r--r--mail/mailserv/Makefile4
-rw-r--r--mail/majordomo/Makefile4
-rw-r--r--mail/mb2md/Makefile4
-rw-r--r--mail/mdfrm/Makefile4
-rw-r--r--mail/mhonarc/Makefile5
-rw-r--r--mail/mimedefang/Makefile4
-rw-r--r--mail/mutt-devel/Makefile4
-rw-r--r--mail/poppy/Makefile4
-rw-r--r--mail/postgrey/Makefile4
-rw-r--r--mail/prayer/Makefile6
-rw-r--r--mail/qgreylist/Makefile4
-rw-r--r--mail/qmHandle/Makefile4
-rw-r--r--mail/qmail-lint/Makefile4
-rw-r--r--mail/sendmail/options.mk4
-rw-r--r--mail/sqwebmail/Makefile5
-rw-r--r--mail/turba/Makefile4
-rw-r--r--math/R/Makefile5
-rw-r--r--math/ess/Makefile6
-rw-r--r--math/gnumeric/Makefile5
-rw-r--r--math/gnumeric14/Makefile5
-rw-r--r--math/maxima/Makefile4
-rw-r--r--math/yacas/Makefile5
-rw-r--r--meta-pkgs/netbsd-www/Makefile4
-rw-r--r--misc/bbweather/Makefile5
-rw-r--r--misc/colorize/Makefile5
-rw-r--r--misc/cowsay/Makefile4
-rw-r--r--misc/dpkg/Makefile6
-rw-r--r--misc/gnome2-utils/Makefile5
-rw-r--r--misc/kanjipad/Makefile5
-rw-r--r--misc/libcdio/Makefile4
-rw-r--r--misc/loco/Makefile4
-rw-r--r--misc/nxtvepg/Makefile5
-rw-r--r--misc/openoffice/Makefile5
-rw-r--r--misc/pdmenu/Makefile5
-rw-r--r--misc/reed/Makefile4
-rw-r--r--misc/tds/Makefile4
-rw-r--r--mk/bsd.pkg.mk4
-rw-r--r--mk/tools/replace.mk13
-rw-r--r--multimedia/acidrip/Makefile4
-rw-r--r--multimedia/gnome2-media/Makefile5
-rw-r--r--multimedia/gst-plugins/Makefile4
-rw-r--r--multimedia/gstreamer/Makefile5
-rw-r--r--multimedia/kmplayer/Makefile5
-rw-r--r--multimedia/xawtv/Makefile5
-rw-r--r--net/dctc/Makefile7
-rw-r--r--net/dlint/Makefile4
-rw-r--r--net/ethereal/Makefile4
-rw-r--r--net/freeradius/Makefile5
-rw-r--r--net/gnapfetch/Makefile5
-rw-r--r--net/ipcalc/Makefile4
-rw-r--r--net/irrd/Makefile5
-rw-r--r--net/ispman/Makefile4
-rw-r--r--net/md-whois/Makefile6
-rw-r--r--net/mirror/Makefile5
-rw-r--r--net/mldonkey/Makefile.common5
-rw-r--r--net/nasd/Makefile4
-rw-r--r--net/neat/Makefile4
-rw-r--r--net/netatalk/Makefile5
-rw-r--r--net/netdisco/Makefile4
-rw-r--r--net/netsaint-base/Makefile.common6
-rw-r--r--net/nocol/Makefile4
-rw-r--r--net/ns/Makefile4
-rw-r--r--net/ntp4/Makefile4
-rw-r--r--net/oinkmaster/Makefile6
-rw-r--r--net/pfnet/Makefile4
-rw-r--r--net/quagga/Makefile5
-rw-r--r--net/ripe-whois/Makefile4
-rw-r--r--net/sitescooper/Makefile4
-rw-r--r--net/smokeping/Makefile4
-rw-r--r--net/spread/Makefile4
-rw-r--r--net/stripes/Makefile6
-rw-r--r--net/tightvnc/Makefile4
-rw-r--r--net/torrentutils/Makefile6
-rw-r--r--net/tsclient/Makefile6
-rw-r--r--net/vino/Makefile5
-rw-r--r--net/vnc/Makefile4
-rw-r--r--net/wol/Makefile5
-rw-r--r--news/pan/Makefile4
-rw-r--r--news/trn/Makefile6
-rw-r--r--parallel/mpi-ch/Makefile4
-rw-r--r--parallel/sge/Makefile5
-rw-r--r--pkgtools/pkg_filecheck/Makefile4
-rw-r--r--pkgtools/pkg_notify/Makefile4
-rw-r--r--pkgtools/pkgdep/Makefile4
-rw-r--r--pkgtools/pkgdepgraph/Makefile4
-rw-r--r--pkgtools/pkgse/Makefile4
-rw-r--r--pkgtools/port2pkg/Makefile5
-rw-r--r--pkgtools/revbump/Makefile4
-rw-r--r--print/a2ps/Makefile5
-rw-r--r--print/cjk-lyx/Makefile4
-rw-r--r--print/cupsomatic/Makefile4
-rw-r--r--print/foomatic-filters/Makefile5
-rw-r--r--print/foomatic-gswrapper/Makefile4
-rw-r--r--print/html2ps/Makefile4
-rw-r--r--print/if-psprint/Makefile4
-rw-r--r--print/ja-a2ps/Makefile4
-rw-r--r--print/psutils/Makefile4
-rw-r--r--print/yup/Makefile4
-rw-r--r--security/amavisd-new/Makefile4
-rw-r--r--security/antonym/Makefile6
-rw-r--r--security/apg/Makefile4
-rw-r--r--security/courier-authlib/Makefile5
-rw-r--r--security/gpg2dot/Makefile4
-rw-r--r--security/hackbot/Makefile4
-rw-r--r--security/mhash/Makefile5
-rw-r--r--security/msf/Makefile4
-rw-r--r--security/nikto/Makefile4
-rw-r--r--security/openssh+gssapi/Makefile6
-rw-r--r--security/openssh/Makefile4
-rw-r--r--security/openssl/Makefile5
-rw-r--r--security/pgp5/Makefile4
-rw-r--r--security/sfs/Makefile4
-rw-r--r--security/skey/Makefile5
-rw-r--r--security/snortsnarf/Makefile4
-rw-r--r--security/tinyca/Makefile5
-rw-r--r--security/zebedee/Makefile5
-rw-r--r--shells/xsh/Makefile3
-rw-r--r--sysutils/adjustkernel/Makefile5
-rw-r--r--sysutils/amanda-server/Makefile5
-rw-r--r--sysutils/cdbkup/Makefile5
-rw-r--r--sysutils/coreutils/Makefile4
-rw-r--r--sysutils/cpogm/Makefile4
-rw-r--r--sysutils/dmassage/Makefile5
-rw-r--r--sysutils/dmesg2gif/Makefile4
-rw-r--r--sysutils/lavaps/Makefile4
-rw-r--r--sysutils/libgtop2/Makefile5
-rw-r--r--sysutils/mgm/Makefile4
-rw-r--r--sysutils/pflogsumm/Makefile4
-rw-r--r--sysutils/rconfig/Makefile4
-rw-r--r--sysutils/roller/Makefile4
-rw-r--r--sysutils/rox-archive/Makefile4
-rw-r--r--sysutils/rsnapshot/Makefile4
-rw-r--r--sysutils/safetynet/Makefile4
-rw-r--r--sysutils/sarah/Makefile4
-rw-r--r--sysutils/webmin/Makefile4
-rw-r--r--sysutils/xps/Makefile5
-rw-r--r--textproc/btparse/Makefile4
-rw-r--r--textproc/cdif/Makefile4
-rw-r--r--textproc/eb/Makefile5
-rw-r--r--textproc/freepwing/Makefile5
-rw-r--r--textproc/groff/Makefile4
-rw-r--r--textproc/ispell-german/Makefile5
-rw-r--r--textproc/latex2html/Makefile4
-rw-r--r--textproc/libpathan/Makefile5
-rw-r--r--textproc/libxslt/Makefile5
-rw-r--r--textproc/openjade/Makefile5
-rw-r--r--textproc/opensp/Makefile4
-rw-r--r--textproc/postgresql-autodoc/Makefile5
-rw-r--r--textproc/rfcutil/Makefile4
-rw-r--r--textproc/troffcvt/Makefile4
-rw-r--r--wm/afterstep/Makefile5
-rw-r--r--wm/enlightenment/Makefile5
-rw-r--r--wm/fvwm2-themes/Makefile4
-rw-r--r--wm/pekwm/Makefile6
-rw-r--r--wm/waimea/Makefile6
-rw-r--r--www/SpeedyCGI/Makefile4
-rw-r--r--www/adzap/Makefile4
-rw-r--r--www/album/Makefile2
-rw-r--r--www/ap-jserv/Makefile5
-rw-r--r--www/apache/buildlink3.mk4
-rw-r--r--www/apache2/buildlink3.mk4
-rw-r--r--www/awstats/Makefile6
-rw-r--r--www/calamaris/Makefile4
-rw-r--r--www/cvsweb/Makefile4
-rw-r--r--www/htmlfix/Makefile4
-rw-r--r--www/htmllint/Makefile4
-rw-r--r--www/kannel/Makefile5
-rw-r--r--www/kdewebdev3/Makefile5
-rw-r--r--www/make_album/Makefile4
-rw-r--r--www/mknmz-wwwoffle/Makefile4
-rw-r--r--www/mozilla/Makefile.common5
-rw-r--r--www/p5-Apache-Gallery/Makefile3
-rw-r--r--www/p5-CGI/Makefile6
-rw-r--r--www/p5-HTML-Mason/Makefile6
-rw-r--r--www/privoxy/Makefile4
-rw-r--r--www/swish-e/Makefile6
-rw-r--r--www/w3m/Makefile.common4
-rw-r--r--www/webnew/Makefile4
-rw-r--r--www/whisker/Makefile4
-rw-r--r--x11/XFree86-server/Makefile4
-rw-r--r--x11/gnome-desktop/Makefile5
-rw-r--r--x11/gnome-panel/Makefile5
-rw-r--r--x11/gnome-session/Makefile5
-rw-r--r--x11/gnome2-terminal/Makefile5
-rw-r--r--x11/gtk/Makefile5
-rw-r--r--x11/gtk2-chtheme/Makefile5
-rw-r--r--x11/gtkmm/Makefile5
-rw-r--r--x11/gtkmm24/Makefile5
-rw-r--r--x11/gtksourceview/Makefile5
-rw-r--r--x11/kdelibs3/Makefile4
-rw-r--r--x11/xkbset/Makefile4
-rw-r--r--x11/xorg-server/Makefile4
293 files changed, 584 insertions, 764 deletions
diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
index fc6df6a074b..dd147e580fa 100644
--- a/audio/mp32ogg/Makefile
+++ b/audio/mp32ogg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:06 jlam Exp $
DISTNAME= mp32ogg-0.11
PKGREVISION= 2
@@ -15,12 +15,11 @@ DEPENDS+= vorbis-tools>=1.0.0.7:../../audio/vorbis-tools
DEPENDS+= p5-MP3-Info>=1.00:../../audio/p5-MP3-Info
DEPENDS+= p5-String-ShellQuote>=1.00:../../textproc/p5-String-ShellQuote
-USE_PERL5= yes
-
WRKSRC= ${WRKDIR}
EXTRACT_ONLY= # empty
NO_BUILD= yes
+USE_TOOLS+= perl:run
REPLACE_PERL= ${WRKSRC}/${DISTNAME}
INSTALLATION_DIRS= bin
diff --git a/audio/mserv_irman/Makefile b/audio/mserv_irman/Makefile
index 91181eab56e..29bed371c5b 100644
--- a/audio/mserv_irman/Makefile
+++ b/audio/mserv_irman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/12/31 20:31:19 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:06 jlam Exp $
#
DISTNAME= mserv_irman-0.20
@@ -17,7 +17,7 @@ DEPENDS+= p5-Config-IniFiles-[0-9]*:../../devel/p5-Config-IniFiles
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= mserv_irman.pl
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mstream/Makefile b/audio/mstream/Makefile
index f061c91b875..4b399009838 100644
--- a/audio/mstream/Makefile
+++ b/audio/mstream/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/24 13:45:14 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/16 01:19:06 jlam Exp $
#
DISTNAME= mstream-1.0
@@ -13,7 +13,7 @@ DEPENDS+= ices-mp3>=0.3:../../audio/ices-mp3
DEPENDS+= p5-MP3-Info>=1.0:../../audio/p5-MP3-Info
NO_CONFIGURE= yes
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
MODDIR= ${PREFIX}/share/ices-mp3
diff --git a/audio/oggasm/Makefile b/audio/oggasm/Makefile
index b161f4b5e80..5dfaf8ae541 100644
--- a/audio/oggasm/Makefile
+++ b/audio/oggasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:07 jlam Exp $
#
DISTNAME= oggasm_1.4.0
@@ -16,7 +16,7 @@ DEPENDS+= vorbis-tools>=1.0.0.7:../../audio/vorbis-tools
DEPENDS+= p5-MP3-Info>=1.00:../../audio/p5-MP3-Info
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_PERL5= yes
+USE_TOOLS+= perl:run
REPLACE_PERL= oggasm
NO_BUILD= yes
diff --git a/audio/rip/Makefile b/audio/rip/Makefile
index ec9b4f6fc77..72f58f6a9ec 100644
--- a/audio/rip/Makefile
+++ b/audio/rip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/16 01:19:07 jlam Exp $
#
DISTNAME= rip-1.07
@@ -12,8 +12,8 @@ COMMENT= Command-line based audio CD ripper and encoder
DEPENDS+= p5-CDDB_get>=2.23:../../audio/p5-CDDB_get
DEPENDS+= p5-MP3-Info>=1.00:../../audio/p5-MP3-Info
-USE_PERL5= yes
NO_BUILD= # defined
+USE_TOOLS+= perl:run
REPLACE_PERL= rip
DOCFILES= BUGS CHANGELOG COPYING FAQ INSTALLING README
diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile
index 710fc22196c..30bd4bdb3af 100644
--- a/benchmarks/bonnie++/Makefile
+++ b/benchmarks/bonnie++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/23 08:51:46 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:07 jlam Exp $
#
DISTNAME= bonnie++-1.03a
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
REPLACE_PERL= bon_csv2txt.in bon_csv2html.in
INSTALLATION_DIRS= bin man/man1 man/man8 sbin
@@ -26,5 +26,4 @@ results:
@${MKDIR} /tmp/benches/`domainname`
-@${CP} ${WRKSRC}/bonnie.out /tmp/benches/`domainname`/bonnie++.`uname`-`uname -m`-`uname -r`.`hostname`
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/skampi/Makefile b/benchmarks/skampi/Makefile
index d37dacb75b5..d9e0152a508 100644
--- a/benchmarks/skampi/Makefile
+++ b/benchmarks/skampi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:07 jlam Exp $
#
DISTNAME= skampi4
@@ -18,7 +18,7 @@ DEPENDS+= teTeX>=1.0.7:../../print/teTeX
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-USE_PERL5= run
+USE_TOOLS+= perl:run
REPLACE_PERL= report_generator/dorep4.pl
DIST_SUBDIR= ${PKGNAME_NOREV}
diff --git a/cad/covered-current/Makefile b/cad/covered-current/Makefile
index fc5f33ec573..d406155539b 100644
--- a/cad/covered-current/Makefile
+++ b/cad/covered-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:40 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:07 jlam Exp $
#
DISTNAME= covered-${SNAPDATE}
@@ -18,10 +18,9 @@ DEPENDS+= verilog{,-current}-[0-9]*:../../cad/verilog
CONFLICTS+= covered-[0-9]*
SNAPDATE= 20040325
-USE_PERL5= YES
REPLACE_PERL= diags/verilog/check_test
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
TEST_DIRS= ${WRKSRC}/diags/regress
TEST_TARGET= iverilog
diff --git a/cad/covered/Makefile b/cad/covered/Makefile
index 3886cbb5155..e6823c65dfd 100644
--- a/cad/covered/Makefile
+++ b/cad/covered/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:40 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:07 jlam Exp $
#
DISTNAME= covered-0.3
@@ -16,10 +16,9 @@ DEPENDS+= verilog{,-current}-[0-9]*:../../cad/verilog
CONFLICTS+= covered-current-[0-9]*
-USE_PERL5= YES
REPLACE_PERL= diags/verilog/check_test
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
TEST_DIRS= ${WRKSRC}/diags/regress
TEST_TARGET= iverilog
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 0f4b5dd33d6..4c2dfd8bb73 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:40 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/07/16 01:19:07 jlam Exp $
#
DISTNAME= dinotrace-9.2a
@@ -11,8 +11,7 @@ COMMENT= Tool for viewing the output of digital simulators
GNU_CONFIGURE= YES
INFO_FILES= dinotrace.info
-USE_PERL5= build
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
.include "../../mk/motif.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index b10024f1198..a870ad20801 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/07/16 01:19:07 jlam Exp $
#
DISTNAME= geda-utils-${PKGVERSION}
@@ -20,7 +20,7 @@ CONFLICTS+= gEDA<19991011
.include "../../cad/geda/Makefile.common"
GNU_CONFIGURE= YES
-USE_PERL5= YES
+USE_TOOLS+= perl:run
# let (f)lex rebuild this file. The distributed one doesn't
# always work.
diff --git a/chat/bitchbot/Makefile b/chat/bitchbot/Makefile
index a79b08e6ada..47bc2c52f12 100644
--- a/chat/bitchbot/Makefile
+++ b/chat/bitchbot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:07 jlam Exp $
DISTNAME= bitchbot-1.0.2
CATEGORIES= chat
@@ -10,7 +10,7 @@ COMMENT= Bitchbot is a perl-based IRC bot
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_PERL5= YES
+USE_TOOLS+= perl:run
USE_PKGINSTALL= YES
REPLACE_PERL= bitch.pl genstats.pl
diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index f4905eb9cde..c8f7867227c 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/05/22 20:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2005/07/16 01:19:07 jlam Exp $
#
DISTNAME= centericq-4.20.0
@@ -12,7 +12,7 @@ HOMEPAGE= http://konst.org.ua/eng/software/centericq/info.html
COMMENT= Instant Messenger interface supporting many protocols
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
@@ -20,7 +20,6 @@ CONFIGURE_ARGS+= --with-ssl --with-openssl=${SSLBASE}
CONFIGURE_ARGS+= --with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
LIBS= ${LDFLAGS}
-USE_PERL5= run
REPLACE_PERL= misc/cicqconv
INCOMPAT_CURSES+= NetBSD-1.[45]*-* NetBSD-1.6-* NetBSD-1.6.[1-9]-*
@@ -45,7 +44,6 @@ GCC_REQD+= 3.0 # see PR 29185
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
diff --git a/chat/cgiirc/Makefile b/chat/cgiirc/Makefile
index 84076ff6d7c..bf394e5e75d 100644
--- a/chat/cgiirc/Makefile
+++ b/chat/cgiirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/20 22:12:28 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:07 jlam Exp $
DISTNAME= cgiirc-0.5.6
CATEGORIES= chat
@@ -8,7 +8,7 @@ MAINTAINER= adrianp@NetBSD.org
HOMEPAGE= http://cgiirc.sourceforge.net/
COMMENT= Access IRC from a web browser
-USE_PERL5= run
+USE_TOOLS+= perl:run
NO_BUILD= YES
USE_PKGINSTALL= YES
diff --git a/chat/dircproxy-devel/Makefile b/chat/dircproxy-devel/Makefile
index 7f7ac65a043..16084c4e29a 100644
--- a/chat/dircproxy-devel/Makefile
+++ b/chat/dircproxy-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:07 jlam Exp $
DISTNAME= dircproxy-1.1.0
CATEGORIES= chat
@@ -9,7 +9,7 @@ HOMEPAGE= http://dircproxy.securiweb.net/
COMMENT= Detachable internet relay chat proxy server
GNU_CONFIGURE= YES
-USE_PERL5= YES
+USE_TOOLS+= perl:run
USE_PKGINSTALL= YES
CONFLICTS= dircproxy-1.0.[0-9]*
diff --git a/chat/dircproxy/Makefile b/chat/dircproxy/Makefile
index 0b739a37a13..33a892aaf96 100644
--- a/chat/dircproxy/Makefile
+++ b/chat/dircproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:07 jlam Exp $
DISTNAME= dircproxy-1.0.5
PKGREVISION= 2
@@ -10,7 +10,7 @@ HOMEPAGE= http://dircproxy.securiweb.net/
COMMENT= Detachable internet relay chat proxy server
GNU_CONFIGURE= YES
-USE_PERL5= YES
+USE_TOOLS+= perl:run
USE_PKGINSTALL= YES
CONFLICTS= dircproxy-1.1.[0-9]*
diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile
index bffcc9544ee..48531f7427a 100644
--- a/chat/ircservices/Makefile
+++ b/chat/ircservices/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/21 16:18:52 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:07 jlam Exp $
#
DISTNAME= ircservices-5.0.49
@@ -14,8 +14,7 @@ COMMENT= Services for IRC networks
HAS_CONFIGURE= YES
USE_PKGINSTALL= YES
-USE_TOOLS+= gmake grep gsed
-USE_PERL5= build
+USE_TOOLS+= gmake grep gsed perl
RCD_SCRIPTS= ircservices
CONFIGURE_ARGS= -prefix ${PREFIX}
@@ -79,5 +78,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/data/example-modules.conf \
${PREFIX}/share/examples/ircservices/modules.conf
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/esms/Makefile b/comms/esms/Makefile
index 142a6a0c263..38dd318826b 100644
--- a/comms/esms/Makefile
+++ b/comms/esms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/03/26 02:27:35 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:07 jlam Exp $
DISTNAME= esms-0.9.5
PKGREVISION= 1
@@ -15,7 +15,7 @@ DEPENDS+= p5-HTML-Tree>=3.11:../../www/p5-HTML-Tree
GNU_CONFIGURE= YES
-USE_PERL5= YES
+USE_TOOLS+= perl:run
PERL5_REQD+= 5.6.1
REPLACE_PERL= esms
diff --git a/comms/linuxsms/Makefile b/comms/linuxsms/Makefile
index 55059edce95..44446993adb 100644
--- a/comms/linuxsms/Makefile
+++ b/comms/linuxsms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:42 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:07 jlam Exp $
#
DISTNAME= linuxsms-0.65
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://linuxsms.sourceforge.net/
COMMENT= Perl script to send short messages to GSM phones
-USE_PERL5= yes
+USE_TOOLS+= perl:run
NO_BUILD= yes
REPLACE_PERL= linuxsms
@@ -25,5 +25,4 @@ do-install:
.endfor
.undef f
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/2vcard/Makefile b/converters/2vcard/Makefile
index cf550a04814..83029e51ce9 100644
--- a/converters/2vcard/Makefile
+++ b/converters/2vcard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:42 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:07 jlam Exp $
#
DISTNAME= 2vcard-0.5
@@ -10,7 +10,7 @@ MAINTAINER= jschauma@NetBSD.org
HOMEPAGE= http://www.netmeister.org/apps/2vcard/
COMMENT= Convert an addressbook to the popular VCARD file format
-USE_PERL5= run
+USE_TOOLS+= perl:run
REPLACE_PERL= src/2vcard
NO_BUILD= yes
diff --git a/converters/bibtex2html/Makefile b/converters/bibtex2html/Makefile
index badb8569155..28729cebfa7 100644
--- a/converters/bibtex2html/Makefile
+++ b/converters/bibtex2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:43 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:07 jlam Exp $
DISTNAME= bibtex2html-1.75
CATEGORIES= converters
@@ -12,7 +12,7 @@ BUILD_DEPENDS+= hevea-[0-9]*:../../textproc/hevea
DEPENDS+= teTeX-bin-[0-9]*:../../print/teTeX-bin
GNU_CONFIGURE= yes
-USE_PERL5= run
+USE_TOOLS+= perl:run
SUBST_CLASSES+= paths
SUBST_MESSAGE.paths= "Fixing hardcoded paths."
diff --git a/converters/code2html/Makefile b/converters/code2html/Makefile
index 36c687fafd4..a462af0f4ef 100644
--- a/converters/code2html/Makefile
+++ b/converters/code2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:43 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:08 jlam Exp $
#
DISTNAME= code2html-0.9.1
@@ -11,7 +11,7 @@ COMMENT= Convert a program source code to syntax highlighted HTML
NO_BUILD= # defined
REPLACE_PERL= code2html
-USE_PERL5= run
+USE_TOOLS+= perl:run
INSTALLATION_DIRS= bin man/man1
diff --git a/converters/doc2html/Makefile b/converters/doc2html/Makefile
index cecb150feef..7d36189f878 100644
--- a/converters/doc2html/Makefile
+++ b/converters/doc2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/16 06:57:43 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/16 01:19:08 jlam Exp $
#
DISTNAME= doc2html
@@ -16,7 +16,7 @@ DEPENDS+= rtf2html-[0-9]*:../../converters/rtf2html
DEPENDS+= xpdf-[0-9]*:../../print/xpdf
DEPENDS+= catdoc-[0-9]*:../../textproc/catdoc
-USE_PERL5= YES
+USE_TOOLS+= perl:run
INSTALLATION_DIRS= bin
diff --git a/converters/p5-chkjis/Makefile b/converters/p5-chkjis/Makefile
index 14a37ee7e45..307c590110c 100644
--- a/converters/p5-chkjis/Makefile
+++ b/converters/p5-chkjis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:43 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:08 jlam Exp $
#
DISTNAME= chkjis
@@ -19,7 +19,8 @@ EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
VERSION= 0.18
DIST_SUBDIR= chkjis-${VERSION}
WRKSRC= ${WRKDIR}
-USE_PERL5= yes
+USE_TOOLS+= perl:run
+
NO_BUILD= yes
NO_CONFIGURE= yes
NO_WRAPPER= yes
diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile
index f918d28dc9e..4d721f873ba 100644
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/15 18:27:48 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:08 jlam Exp $
DISTNAME= gcc-3.3.2003.05.11
PKGNAME= avr-gcc-3.3.2003.05.11
@@ -21,9 +21,8 @@ EXTRACT_ONLY= gcc-core+g++-3.3.2003.05.11${EXTRACT_SUFX}
# Unfortunately, only some mirrors have it as a .bz2 file, while
# the original master site still uses .gz.
GNU_CONFIGURE= yes
-USE_PERL5= build
USE_BZIP2= yes
-USE_TOOLS+= bison gmake lex tar
+USE_TOOLS+= bison gmake lex perl tar
USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS= --target=avr --prefix=${PREFIX}
diff --git a/cross/i386-mingw32/Makefile b/cross/i386-mingw32/Makefile
index 1d6dd54d8c3..3f11892a9fe 100644
--- a/cross/i386-mingw32/Makefile
+++ b/cross/i386-mingw32/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/07/15 18:27:48 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:08 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 tar
-USE_PERL5= build
+USE_TOOLS+= gmake perl tar
WRKSRC= ${WRKDIR} # for the patch target
AS_FOR_TARGET= ${BINUTILS_WRKSRC}/gas/as-new
diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile
index 848637b4abd..e3ec0aeafbb 100644
--- a/databases/gnome-mime-data/Makefile
+++ b/databases/gnome-mime-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:08 jlam Exp $
#
DISTNAME= gnome-mime-data-2.4.2
@@ -19,7 +19,7 @@ CONFLICTS= gnome-vfs<=1.0.3
USE_DIRS+= gnome2-1.5
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
-USE_PERL5= build
+USE_TOOLS+= perl
GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= gnome-mime-data-2.0.pc.in
@@ -31,7 +31,6 @@ CONF_FILES= ${EGDIR}/gnome-vfs-mime-magic \
${PKG_SYSCONFDIR}/gnome-vfs-mime-magic
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile
index d9081d95f6f..aad67cfe06b 100644
--- a/databases/lbdb/Makefile
+++ b/databases/lbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/22 20:07:45 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:08 jlam Exp $
DISTNAME= ${PKGNAME:S/-/_/}
PKGNAME= lbdb-0.29
@@ -12,8 +12,7 @@ COMMENT= The little brother's database
DEPENDS+= p5-perl-ldap>=0.20:../../databases/p5-perl-ldap
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-USE_PERL5= yes
+USE_TOOLS+= gmake perl:run
USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec/lbdb/
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 05d50670976..364546b78a4 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:42 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/07/16 01:19:08 jlam Exp $
#
DISTNAME= mergeant-0.52
@@ -10,9 +10,8 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnome-db.org/
COMMENT= GNOME2 GNOME-DB database front-end
-USE_PERL5= build
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --disable-gtk-doc
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index d901aae04ff..f122415f762 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.45 2005/07/05 08:49:44 grant Exp $
+# $NetBSD: Makefile.common,v 1.46 2005/07/16 01:19:08 jlam Exp $
DISTNAME= mysql-4.0.24
CATEGORIES= databases
@@ -79,8 +79,7 @@ CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no
.endif
USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
-USE_PERL5= yes
+USE_TOOLS+= gmake perl:run
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
SUBST_CLASSES+= mk scripts
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 41c9afe92a3..125aecc94cd 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2005/05/23 14:00:20 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.41 2005/07/16 01:19:08 jlam Exp $
DISTNAME= mysql-4.1.12
CATEGORIES= databases
@@ -88,8 +88,7 @@ CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no
.endif
USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
-USE_PERL5= yes
+USE_TOOLS+= gmake perl:run
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
SUBST_CLASSES+= mk scripts
diff --git a/databases/rdb/Makefile b/databases/rdb/Makefile
index c9a90273fa8..e6a7292e3af 100644
--- a/databases/rdb/Makefile
+++ b/databases/rdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/04/17 19:25:28 snj Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:08 jlam Exp $
DISTNAME= RDB-2.6d
PKGNAME= rdb-2.6.4
@@ -12,7 +12,7 @@ COMMENT= Relational database system that uses standard filters via pipes
WRKSRC= ${WRKDIR}/rdb
NO_BUILD= yes
NO_CONFIGURE= yes
-USE_PERL5= yes
+USE_TOOLS+= perl:run
REPLACE_PERL= column compute dataent etbl headchg jointbl lst2tbl mergetbl
REPLACE_PERL+= mktbl ptbl rdb rdbt repair reporttbl row search sorttbl
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index cec2a9ea15c..261532bf9b3 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2005/05/22 20:07:47 jlam Exp $
+# $NetBSD: Makefile.common,v 1.29 2005/07/16 01:19:08 jlam Exp $
#
DISTNAME= GConf-2.10.0
@@ -22,8 +22,7 @@ PATCHDIR= ${.CURDIR}/../GConf2/patches
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
PKGCONFIG_OVERRIDE= gconf-2.0.pc.in
diff --git a/devel/adocman/Makefile b/devel/adocman/Makefile
index 9ec785a6dc2..bce0276a4bc 100644
--- a/devel/adocman/Makefile
+++ b/devel/adocman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:44 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:08 jlam Exp $
#
DISTNAME= adocman-0.10
@@ -13,7 +13,7 @@ COMMENT= DocManager operation automation tool
DEPENDS+= p5-Term-ReadKey>=2.21:../../devel/p5-Term-ReadKey
DEPENDS+= p5-Crypt-SSLeay>=0.47:../../security/p5-SSLeay
-USE_PERL5= YES
+USE_TOOLS+= perl:run
NO_BUILD= YES
REPLACE_PERL= adocman xml_export
@@ -33,5 +33,4 @@ do-install:
.endfor
.undef f
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs2html/Makefile b/devel/cvs2html/Makefile
index f8a19e502ac..0fc857a5485 100644
--- a/devel/cvs2html/Makefile
+++ b/devel/cvs2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:45 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:08 jlam Exp $
#
DISTNAME= cvs2html-1.82
@@ -10,7 +10,7 @@ HOMEPAGE= http://cvs.sslug.dk/cvs2html/
COMMENT= Perl script to turn ``cvs log'' output into HTML
NO_BUILD= YES
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
REPLACE_PERL= cvs2html
INSTALLATION_DIRS= bin
diff --git a/devel/cvs2p4/Makefile b/devel/cvs2p4/Makefile
index 25f0e63a015..00a12439d55 100644
--- a/devel/cvs2p4/Makefile
+++ b/devel/cvs2p4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:45 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:08 jlam Exp $
#
DISTNAME= cvs2p4-2.3.3
@@ -17,7 +17,7 @@ DEPENDS+= rcs-[0-9]*:../../devel/rcs
.endif
USE_PKGINSTALL= yes
-USE_PERL5= yes
+USE_TOOLS+= perl:run
NO_BUILD= yes
DOCDIR= share/doc/${PKGBASE}
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 3b487d35b1e..e608a234493 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:08 jlam Exp $
DISTNAME= devhelp-0.7
PKGREVISION= 11
@@ -11,9 +11,8 @@ HOMEPAGE= http://www.imendio.com/projects/devhelp/
COMMENT= Documentation viewer based on GNOME2
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_LIBTOOL= yes
-USE_PERL5= build
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index 937565789b8..6dc89669768 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:08 jlam Exp $
DISTNAME= eel-1.0.2
CATEGORIES= devel gnome
@@ -11,9 +11,8 @@ COMMENT= Eazel Extensions Library
BUILD_USES_MSGFMT= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_LIBTOOL= yes
-USE_PERL5= build
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index 3617a83168f..75042ba7c37 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.25 2005/06/05 09:25:37 jlam Exp $
+# $NetBSD: builtin.mk,v 1.26 2005/07/16 01:19:08 jlam Exp $
BUILTIN_PKG:= gettext
@@ -210,7 +210,7 @@ CONFIGURE_ARGS+= --without-libintl-prefix
. endif
. if defined(USE_MSGFMT_PLURALS) && !empty(USE_MSGFMT_PLURALS:M[Yy][Ee][Ss])
-USE_PERL5?= build
+USE_TOOLS+= perl
CONFIGURE_ENV+= MSGFMT=${BUILDLINK_DIR}/bin/msgfmt
# XXX _USE_NEW_TOOLS=yes should make "msgfmt" and "msgfmt-plural" into
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 54bb744c3a2..ed602469e80 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2005/07/06 07:00:10 reed Exp $
+# $NetBSD: Makefile,v 1.75 2005/07/16 01:19:09 jlam Exp $
DISTNAME= glib-2.6.5
PKGNAME= ${DISTNAME:S/glib/glib2/}
@@ -18,8 +18,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
BUILD_USES_MSGFMT= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
-USE_PERL5= yes
+USE_TOOLS+= gmake perl:run
USE_LIBTOOL= yes
TEST_TARGET= check
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index e2d61105053..dda082e1ef6 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/06/19 13:10:33 markd Exp $
+# $NetBSD: Makefile,v 1.36 2005/07/16 01:19:09 jlam Exp $
DISTNAME= kdesdk-${_KDE_VERSION}
PKGREVISION= 1
@@ -11,8 +11,7 @@ CONFLICTS+= umbrello-[0-9]*
.include "../../meta-pkgs/kde3/Makefile.kde3"
USE_DIRS+= xdg-1.1
-USE_TOOLS+= lex
-USE_PERL5= run
+USE_TOOLS+= lex perl:run
REPLACE_PERL= cervisia/change_colors.pl \
cervisia/move_repositories.pl \
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index a68fe6c44e4..ea5044bf59c 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/05/31 15:14:04 markd Exp $
+# $NetBSD: Makefile,v 1.43 2005/07/16 01:19:09 jlam Exp $
DISTNAME= kdevelop-3.2.1
PKGNAME= kdevelop-base-3.2.1
@@ -22,7 +22,7 @@ DEPENDS+= qt3-tools>=3.1.1:../../x11/qt3-tools
CONFLICTS+= kdevelop<=1.3
-USE_PERL5= run
+USE_TOOLS+= perl:run
REPLACE_PERL= \
kdevprj2kdevelop \
diff --git a/devel/ldapsdk/Makefile b/devel/ldapsdk/Makefile
index b5e20788c26..059a251d96f 100644
--- a/devel/ldapsdk/Makefile
+++ b/devel/ldapsdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:52 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:09 jlam Exp $
DISTNAME= ldapsdk_12311998
PKGNAME= ${DISTNAME:S/_/-/}
@@ -13,8 +13,7 @@ COMMENT= LDAP C-SDK from the Mozilla project
CONFLICTS+= openldap-[0-9]*
WRKSRC= ${WRKDIR}/mozilla
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
PKG_SYSCONFSUBDIR= ldapsdk
EGDIR= ${PREFIX}/share/examples/ldapsdk
@@ -33,5 +32,4 @@ do-build:
do-install:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/pre-install
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index d2240b0792d..b6bf93798c1 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/06/01 18:02:44 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2005/07/16 01:19:09 jlam Exp $
#
DISTNAME= libgnomeui-2.10.0
@@ -17,8 +17,7 @@ CONFLICTS+= gnome-libs<=1.4.2nb1
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --disable-gtk-doc
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 0c06184d7af..26b1e092dcd 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:53 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/07/16 01:19:09 jlam Exp $
DISTNAME= nasm-0.98.39
PKGREVISION= 1
@@ -12,10 +12,9 @@ COMMENT= General-purpose x86 assembler
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
GCC_REQD+= 3.0
USE_MAKEINFO= yes
-USE_PERL5= build
GNU_CONFIGURE= yes
INFO_FILES= nasm.info
diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 0d5ceffaf76..277f992a2da 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:54 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:09 jlam Exp $
DISTNAME= nss-3.9.2
PKGREVISION= 2
@@ -13,8 +13,7 @@ BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/security/nss
-USE_PERL5= build
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
DIST= ${WRKSRC}/../../dist
BUILD_TARGET= nss_build_all
MAKE_ENV= BSD_LDOPTS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss"
diff --git a/devel/p4pr/Makefile b/devel/p4pr/Makefile
index e936a457802..061f932ddd5 100644
--- a/devel/p4pr/Makefile
+++ b/devel/p4pr/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/16 01:19:09 jlam Exp $
#
DISTNAME= p4pr
@@ -15,7 +15,7 @@ DEPENDS+= p4-[0-9]*:../../devel/p4
WRKSRC= ${WRKDIR}
EXTRACT_ONLY= # none
NO_BUILD= # defined
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
REPLACE_PERL= ${DISTFILES}
INSTALLATION_DIRS= bin
diff --git a/devel/papaya/Makefile b/devel/papaya/Makefile
index d2ec38d3ac2..365226f23b7 100644
--- a/devel/papaya/Makefile
+++ b/devel/papaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/10 10:32:33 kristerw Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:09 jlam Exp $
#
DISTNAME= papaya-0.1.7
@@ -15,12 +15,11 @@ BUILD_DEPENDS+= texi2html>=1.76:../../textproc/texi2html
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_PERL5= run
USE_LANGUAGES= # empty
GNU_CONFIGURE= YES
CONFIGURE_ENV+= sh_command=${TOOLS_SH}
CONFIGURE_ENV+= tar_command=${TOOLS_TAR}
-USE_TOOLS+= sh tar
+USE_TOOLS+= sh perl:run tar
INFO_FILES= papaya.info
CONFIGURE_ENV+= perl_command=${PERL5:Q}
diff --git a/devel/patchutils/Makefile b/devel/patchutils/Makefile
index e19aa291cb4..caa4847cbbc 100644
--- a/devel/patchutils/Makefile
+++ b/devel/patchutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:09 jlam Exp $
#
DISTNAME= patchutils-0.2.30
@@ -14,7 +14,7 @@ COMMENT= Some programs for manipulating patch files
DEPENDS+= patch-[0-9]*:../../devel/patch
USE_PKGLOCALEDIR= yes
-USE_PERL5= yes
+USE_TOOLS+= perl:run
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-patch=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}patch
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index cb268c42f43..c56d9a5b307 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:54 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/07/16 01:19:09 jlam Exp $
#
DISTNAME= rpc2-1.26
@@ -10,11 +10,8 @@ MAINTAINER= phil@cs.wwu.edu
HOMEPAGE= http://www.coda.cs.cmu.edu/
COMMENT= CMU (Coda) remote procedure call package
-USE_TOOLS+= gmake
-
+USE_TOOLS+= gmake perl
GNU_CONFIGURE= YES
-
-USE_PERL5= build
USE_LIBTOOL= YES
.include "../../devel/lwp/buildlink3.mk"
diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile
index 0ce8ad46e16..f6d5374afab 100644
--- a/devel/tmake/Makefile
+++ b/devel/tmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:48 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:09 jlam Exp $
#
DISTNAME= tmake-1.11
@@ -13,7 +13,7 @@ RESTRICTED= No paid redistribution
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
-USE_PERL5= YES
+USE_TOOLS+= perl:run
TMAKEPATH= ${PREFIX}/lib/tmake/netbsd-g++
GLBASE= ${X11BASE}
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 517c279c25f..3423c2bb6b7 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:39 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:09 jlam Exp $
#
DISTNAME= yasm-0.2.2
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_PERL5= build
+USE_TOOLS+= perl
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/doc/Makefile-example b/doc/Makefile-example
index 36885d99cba..8ac1f1ed4e8 100644
--- a/doc/Makefile-example
+++ b/doc/Makefile-example
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-example,v 1.9 2005/04/11 21:45:39 tv Exp $
+# $NetBSD: Makefile-example,v 1.10 2005/07/16 01:19:09 jlam Exp $
# First paragraph - distfile and binary package data
# DISTNAME PKGNAME PKGREVISION SVR4_PKGNAME CATEGORIES MASTER_SITES
@@ -30,7 +30,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews # needed for package views-ready pack
# Fifth paragraph - all build definitions that describe things used by
# the package. These include: WRKSRC, GNU_CONFIGURE,
# HAS_CONFIGURE, USE_PKGLOCALEDIR, USE_INSTALL, TEXINFO_REQD, USE_JAVA,
-# USE_PERL5, INFO_FILES, DIST_SUBDIR, etc.
+# INFO_FILES, DIST_SUBDIR, etc.
DIST_SUBDIR= gmake
GNU_CONFIGURE= yes
INFO_FILES= make.info # any info files, whitespace delimited
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index cd26aac9e07..64968d46d71 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:55 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/07/16 01:19:09 jlam Exp $
#
DISTNAME= conglomerate-0.9.0
@@ -16,8 +16,7 @@ DEPENDS+= docbook-xml>=4.2nb6:../../textproc/docbook-xml
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS+= --enable-printing
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 5f22ad0c859..3adab3faf9f 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2005/06/10 09:21:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.49 2005/07/16 01:19:09 jlam Exp $
#
DISTNAME= gedit-2.10.3
@@ -12,10 +12,9 @@ COMMENT= Lightweight GNOME2 text editor
BUILD_USES_MSGFMT= YES
-USE_PERL5= build
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_LIBTOOL= YES
USE_MSGFMT_PLURALS= YES
GNU_CONFIGURE= YES
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index 560332a5ddd..7a32b528b0c 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2005/06/01 18:02:45 jlam Exp $
+# $NetBSD: Makefile.common,v 1.25 2005/07/16 01:19:09 jlam Exp $
#
DISTNAME= lyx-1.3.5
@@ -25,9 +25,8 @@ UNLIMIT_RESOURCES+= datasize
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
USE_LIBTOOL= YES
-USE_PERL5= YES
USE_PKGLOCALEDIR= YES
GCC_REQD+= 2.95
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 85759142b24..09d69b81208 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:47 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:09 jlam Exp $
DISTNAME= fuse-0.7.0
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://fuse-emulator.sourceforge.net/
COMMENT= ZX Spectrum Emulator
-USE_PERL5= build
+USE_TOOLS+= perl
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-gtk2
LIBS+= ${LIBOSSAUDIO}
diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile
index 233b4f5a19e..4f42e1e3e2f 100644
--- a/emulators/libspectrum/Makefile
+++ b/emulators/libspectrum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/22 05:35:32 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:10 jlam Exp $
DISTNAME= libspectrum-0.2.2
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://fuse-emulator.sourceforge.net/libspectrum.php
COMMENT= ZX Spectrum emulator file format library
-USE_PERL5= build
+USE_TOOLS+= perl
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -22,7 +22,6 @@ post-install:
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index 567df177134..9e8999e33d6 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/16 06:57:51 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:10 jlam Exp $
#
DISTNAME= emulator_src_${POSE_VERSION}
@@ -32,8 +32,7 @@ CPPFLAGS+= -DFLTK_1_0_COMPAT
CONFIGURE_DIRS= ${POSE_BUILD_DIR}
BUILD_DIRS= ${POSE_BUILD_DIR}
-USE_PERL5= build
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-fltk=${BUILDLINK_PREFIX.fltk}
@@ -74,7 +73,6 @@ do-install:
done
.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../x11/fltk/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 1f9c18d5359..0fb3652c908 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:48 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:10 jlam Exp $
#
DISTNAME= raines-0.40.2
@@ -15,10 +15,9 @@ COMMENT= 680x0 Arcade Emulator
BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
WRKSRC= ${WRKDIR}/raine
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
MAKEFILE= makefile
MAKE_ENV+= OSTYPE=linux
-USE_PERL5= run
REPLACE_PERL= makedep
PTHREAD_OPTS+= require
diff --git a/finance/gkrellm1-stock/Makefile b/finance/gkrellm1-stock/Makefile
index 5e931caccf7..18a8f73460e 100644
--- a/finance/gkrellm1-stock/Makefile
+++ b/finance/gkrellm1-stock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:10 jlam Exp $
DISTNAME= gkrellstock-0.2
PKGNAME= gkrellm-stock-0.2
@@ -13,7 +13,7 @@ COMMENT= gkrellm stock ticker plugin
DEPENDS+= p5-finance-quote-1.*:../../finance/p5-finance-quote
WRKSRC= ${WRKDIR}/gkrellStock-0.2
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
do-configure:
.for FILE in GetQuote Asia.pm
diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile
index dde21cdeab4..478ae1a677d 100644
--- a/fonts/ja-shinonome/Makefile
+++ b/fonts/ja-shinonome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:49 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:10 jlam Exp $
#
DISTNAME= shinonome-0.9.10-src
@@ -13,9 +13,8 @@ HOMEPAGE= http://openlab.ring.gr.jp/efont/shinonome/
COMMENT= 12, 14, 16 dots bitmap fonts for Japanese, iso8859-1
GNU_CONFIGURE= YES
-USE_PERL5= build
USE_X11BASE= YES
-USE_TOOLS+= gawk gmake
+USE_TOOLS+= gawk gmake perl
FONTDIR= ${PREFIX}/lib/X11/fonts/local
FOUNDRY= Misc
ALIAS_SHINONOME= ${PREFIX}/share/examples/fonts.alias.shinonome
diff --git a/fonts/monafonts/Makefile b/fonts/monafonts/Makefile
index 715456ab124..58fb2b816ea 100644
--- a/fonts/monafonts/Makefile
+++ b/fonts/monafonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/16 18:20:16 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:10 jlam Exp $
DISTNAME= monafont-2.90
PKGNAME= ${DISTNAME:S/font/fonts/}
@@ -12,7 +12,6 @@ COMMENT= Japanese fonts for "Mona" seen at 2ch.net
USE_X11BASE= yes
USE_PKGINSTALL= yes
-USE_PERL5= build
BUILD_TARGET= bdf
USE_TOOLS+= gzip perl sed
MAKE_FLAGS+= SED_CMD=${SED:Q}
diff --git a/fonts/type1inst/Makefile b/fonts/type1inst/Makefile
index 2c587eae08e..2c5c9b9f4a4 100644
--- a/fonts/type1inst/Makefile
+++ b/fonts/type1inst/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/16 01:19:10 jlam Exp $
#
DISTNAME= type1inst-0.6.1
@@ -8,8 +8,8 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/xutils/}
MAINTAINER= groo@NetBSD.org
COMMENT= Automatically generate fonts.scale/fonts.dir for Type1 fonts
-USE_PERL5= yes
USE_X11BASE= yes
+USE_TOOLS+= perl:run
REPLACE_PERL= t1embed type1inst
NO_BUILD= yes
diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile
index e75d8ef296d..6c69a017f48 100644
--- a/games/crossfire-cli/Makefile
+++ b/games/crossfire-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/07/15 18:27:50 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:10 jlam Exp $
#
DISTNAME= crossfire-client-1.0.0
@@ -17,8 +17,7 @@ CF_SRC= crossfire-client-1.0.0.tar.gz
CF_SND= client-0.95.2-au-sounds.tgz
CF_RAW= client-0.95.2-raw-sounds.tgz
-USE_PERL5= yes
-USE_TOOLS+= gmake gtar
+USE_TOOLS+= gmake gtar perl:run
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-sound-dir=${PREFIX}/share/cfclient/sounds
diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile
index a9a3e871aa3..63a2102ba18 100644
--- a/games/crossfire-srv/Makefile
+++ b/games/crossfire-srv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/07/15 18:27:50 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:10 jlam Exp $
#
DISTNAME= crossfire-1.0.0
@@ -17,9 +17,8 @@ EXTRACT_ONLY= ${CF_SRC}
CF_SRC= crossfire-1.0.0.tar.bz2
CF_MAPS= crossfire-1.0.0-maps.tar.bz2
-USE_TOOLS+= gmake gtar
+USE_TOOLS+= gmake gtar perl:run
GNU_CONFIGURE= yes
-USE_PERL5= yes
CONFIGURE_ARGS+= --with-includes=-I${LOCALBASE}/include
MAKE_ENV+= EXTRA_INCLUDES=-I${LOCALBASE}/include
diff --git a/games/frozen-bubble/Makefile b/games/frozen-bubble/Makefile
index bc07bfca6e1..b94c2edeb22 100644
--- a/games/frozen-bubble/Makefile
+++ b/games/frozen-bubble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/13 18:01:30 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:10 jlam Exp $
#
DISTNAME= frozen-bubble-1.0.0
@@ -13,8 +13,7 @@ COMMENT= Pop the frozen bubbles
DEPENDS+= p5-SDL>=1.19.2:../../devel/p5-SDL
-USE_PERL5= run
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
MAKE_ENV+= PERL5="${PERL5}" CP="${CP}"
diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile
index 23409850cd7..e9680db14ee 100644
--- a/games/openmortal/Makefile
+++ b/games/openmortal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:51 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:10 jlam Exp $
#
DISTNAME= openmortal-0.7
@@ -12,8 +12,7 @@ HOMEPAGE= http://apocalypse.rulez.org/~upi/Mortal/
COMMENT= Parody of Mortal Kombat with real characters
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-USE_PERL5= yes
+USE_TOOLS+= gmake perl:run
REPLACE_PERL= data/script/*.pl
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index f9031660cbc..b916c00a249 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/07/13 18:01:30 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/07/16 01:19:10 jlam Exp $
#
DISTNAME= xracer-0.96.9
@@ -12,8 +12,7 @@ COMMENT= XRacer is a clone of the popular Psygnosis game Wipeout
BUILD_USES_MSGFMT= # defined
-USE_TOOLS+= automake14 gmake
-USE_PERL5= # defined
+USE_TOOLS+= automake14 gmake perl:run
PERL5_PACKLIST= auto/XRacer/.packlist
USE_LIBTOOL= # defined
diff --git a/games/zoom/Makefile b/games/zoom/Makefile
index 3139be0d66a..925f8de13f0 100644
--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 04:49:46 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/16 01:19:10 jlam Exp $
#
DISTNAME= zoom-1.0.1
@@ -18,8 +18,7 @@ COMMENT= Plays Infocom-compatible games, with graphics support
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
.if ${MACHINE_ARCH} == "alpha"
GCC_REQD+= 3.0
diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile
index 40b31865e9b..32e51c81547 100644
--- a/graphics/cdlabelgen/Makefile
+++ b/graphics/cdlabelgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:01 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:10 jlam Exp $
DISTNAME= cdlabelgen-2.7.0
CATEGORIES= graphics
@@ -9,7 +9,7 @@ MAINTAINER= cube@NetBSD.org
HOMEPAGE= http://www.aczone.com/tools/cdinsert/
COMMENT= Generate frontcards and traycards for CDs
-USE_PERL5= run
+USE_TOOLS+= perl:run
USE_LANGUAGES= # empty
MAKE_ENV+= SED="${SED}"
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index b0526881abf..a327b6955b1 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/06/16 06:57:57 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/07/16 01:19:10 jlam Exp $
DISTNAME= fly-1.6.5
PKGREVISION= 6
@@ -11,8 +11,7 @@ COMMENT= Command-file interface for creating and modifying PNG images
BUILD_DEPENDS+= gif2png>=2.4.2:../../graphics/gif2png
-USE_PERL5= YES
-
+USE_TOOLS+= perl:run
REPLACE_PERL= examples/cgi-perl-example.pl \
examples/fly-tester.pl \
examples/size.pl \
diff --git a/graphics/get_ds7/Makefile b/graphics/get_ds7/Makefile
index 73526449fd6..283af75705d 100644
--- a/graphics/get_ds7/Makefile
+++ b/graphics/get_ds7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:57 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:10 jlam Exp $
#
DISTNAME= get_ds7_1.2.4
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.yk.rim.or.jp/~mamo/Computer/DS-7/index-e.html
COMMENT= Read pictures from a FUJIFILM DS-7(DS series) digital camera
-USE_PERL5= # defined
+USE_TOOLS+= perl
WRKSRC= ${WRKDIR}/ds-7_1.2.4
DECOMPRESS_CMD= ${CAT}
diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile
index 7be88adfb96..cac02000f33 100644
--- a/graphics/gnome-icon-theme/Makefile
+++ b/graphics/gnome-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:05 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:11 jlam Exp $
#
DISTNAME= gnome-icon-theme-2.10.1
@@ -14,8 +14,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE= gnome-icon-theme.pc.in
@@ -24,6 +23,5 @@ BUILDLINK_DEPENDS.hicolor-icon-theme= hicolor-icon-theme>=0.5
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile
index a8859c16731..165717bb137 100644
--- a/graphics/gri/Makefile
+++ b/graphics/gri/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:56 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:11 jlam Exp $
DISTNAME= gri-2.12.5
PKGREVISION= 1
@@ -13,8 +13,7 @@ COMMENT= Language for scientific graphics applications
BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
REPLACE_PERL= gri_merge gri_unpage
USE_MAKEINFO= yes
diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile
index 0a8745f81a4..79c77e14297 100644
--- a/graphics/gtkglext/Makefile
+++ b/graphics/gtkglext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:56 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:11 jlam Exp $
DISTNAME= gtkglext-1.0.6
CATEGORIES= graphics
@@ -10,9 +10,8 @@ HOMEPAGE= http://gtkglext.sourceforge.net/
COMMENT= OpenGL extension to GTK
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_LIBTOOL= yes
-USE_PERL5= build
PKGCONFIG_OVERRIDE= gdkglext.pc.in
PKGCONFIG_OVERRIDE+= gtkglext.pc.in
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index b3a987800a0..699037c40d2 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/06/17 16:27:58 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2005/07/16 01:19:11 jlam Exp $
DISTNAME= magicpoint-1.10a
PKGREVISION= 7
@@ -15,7 +15,7 @@ CONFLICTS= mgp-[0-9]*
GNU_CONFIGURE= yes
USE_IMAKE= yes
-USE_PERL5= build
+USE_TOOLS+= perl
PKG_OPTIONS_VAR= PKG_OPTIONS.magicpoint
PKG_SUPPORTED_OPTIONS= freetype vflib xft2
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 1acddbd34b8..8334a507e9d 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/13 18:01:31 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:11 jlam Exp $
#
DISTNAME= Image-Imlib2-1.04
@@ -11,8 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Image-Imlib2/
COMMENT= Interface to the Imlib2 image library
-USE_PERL5= run
-
# versions before that contained a broken imlib2-config
BUILDLINK_DEPENDS.imlib2+= imlib2>=1.2.0nb2
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index c2703a000da..b28f44f3a97 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/07/13 18:01:31 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/07/16 01:19:11 jlam Exp $
.include "../../graphics/ImageMagick/Makefile.common"
@@ -18,7 +18,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LIBTOOL= YES
-USE_PERL5= run
PERL5_CONFIGURE= NO
PERL5_PACKLIST= auto/Image/Magick/.packlist
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index 576ecddd2c7..613d268ad90 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/06/17 04:49:47 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/07/16 01:19:11 jlam Exp $
#
DISTNAME= plt-${DRSCHEME_VERSION}-src-unix
@@ -23,8 +23,7 @@ COMMENT= R4RS-compliant and nearly R5RS-compliant scheme tailored for teaching
CONFLICTS+= mzscheme-[0-9]*:../../lang/mzscheme
WRKSRC= ${WRKDIR}/plt/src
-USE_TOOLS+= gmake
-USE_PERL5= yes
+USE_TOOLS+= gmake perl:run
GNU_CONFIGURE= yes
DRSCHEME_VERSION= 209
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index b919169f085..bf98887cf05 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/12 09:40:46 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:11 jlam Exp $
DISTNAME= otp_src_R9C-0
PKGNAME= erlang-9.2
@@ -12,9 +12,8 @@ COMMENT= Concurrent functional programming language
DIST_SUBDIR= erlang
-USE_PERL5= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
USE_JAVA= yes
USE_JAVA2= yes
diff --git a/lang/fort77/Makefile b/lang/fort77/Makefile
index cac2d47984d..e2250c9231c 100644
--- a/lang/fort77/Makefile
+++ b/lang/fort77/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/12/03 15:15:00 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:11 jlam Exp $
#
DISTNAME= fort77-1.14a
@@ -23,8 +23,7 @@ PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution"
.endif
BUILD_TARGET= test
-
-USE_PERL5= YES
+USE_TOOLS+= perl:run
post-patch:
for f in `${FIND} ${WRKDIR} -type f -print | ${XARGS} ${GREP} -l '/usr'`; \
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 217c07f9c2c..0554b50dcac 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:09 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/07/16 01:19:11 jlam Exp $
DISTNAME= ghc-6.4
CATEGORIES= lang
@@ -19,8 +19,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-ghc=${WRKDIR}/bootstrap/bin/ghc
CONFIGURE_ENV+= PerlCmd=${PERL5}
USE_GNU_READLINE= yes # uses the UNDO_ constants
-USE_PERL5= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
pre-configure:
${MV} ${WRKDIR}/ghc-6.2.1/mk/bootstrap.mk \
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 5d45110c6b8..380111c996a 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:10 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/07/16 01:19:11 jlam Exp $
DISTNAME= mono-1.1.6
CATEGORIES= lang
@@ -22,7 +22,7 @@ NOT_FOR_PLATFORM+= NetBSD-2.9*-* NetBSD-3.*-*
# LP64 problems
NOT_FOR_PLATFORM+= *-*-alpha *-*-sparc64
-USE_TOOLS+= bison gmake
+USE_TOOLS+= bison gmake perl
USE_PKGINSTALL= yes
USE_LIBTOOL= yes
@@ -42,7 +42,6 @@ PKGCONFIG_OVERRIDE+= mono.pc.in
PKGCONFIG_OVERRIDE+= scripts/mono-nunit.pc.in
#PKG_SYSCONFSUBDIR= mono
-USE_PERL5= build
REPLACE_PERL= mcs/errors/do-tests.pl
REPLACE_PERL+= mcs/mbas/Test/test-mbas.pl
REPLACE_PERL+= mcs/tools/scan-tests.pl
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index e7d45b71008..d228a05d1f3 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/12/03 15:15:01 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/07/16 01:19:11 jlam Exp $
DISTNAME= mos20src
PKGNAME= moscow_ml-2.00
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.dina.kvl.dk/~sestoft/mosml.html
COMMENT= Moscow ML, a version of Standard ML
WRKSRC= ${WRKDIR}/mosml/src
-USE_PERL5= build
+USE_TOOLS+= perl
BUILD_TARGET= clean world
diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index f9bc5e78352..362940dac2b 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:58:00 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:11 jlam Exp $
#
DISTNAME= parrot-0.0.1
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.python.org/parrot.html
COMMENT= Bytecode language possibly to be used by Perl/Python
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
BUILD_TARGET= test_prog
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index 286af9a3e27..2ad9613a90f 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2005/07/15 20:14:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2005/07/16 01:19:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+
@@ -19,10 +19,6 @@ BUILDLINK_DEPENDS.perl+= {perl>=${PERL5_REQD},perl-thread>=${PERL5_REQD}}
BUILDLINK_RECOMMENDED.perl+= perl>=5.8.5nb6
BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5
-.if defined(USE_PERL5) && !empty(USE_PERL5:Mbuild)
-BUILDLINK_DEPMETHOD.perl?= build
-.endif
-
PERL5_OPTIONS?= # empty
.if !empty(PERL5_OPTIONS:Mthreads)
USE_PKGINSTALL= yes
diff --git a/mail/YoSucker/Makefile b/mail/YoSucker/Makefile
index 00349d97753..7ec0afe44b3 100644
--- a/mail/YoSucker/Makefile
+++ b/mail/YoSucker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:12 jlam Exp $
#
DISTNAME= YoSucker-pr37
@@ -16,7 +16,7 @@ DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
DEPENDS+= p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
REPLACE_PERL= bin/EncProxyPasswd bin/EncPasswd bin/YoSucker
NO_BUILD= # defined
diff --git a/mail/anomy-sanitizer/Makefile b/mail/anomy-sanitizer/Makefile
index c8493c4e9ad..dec82068206 100644
--- a/mail/anomy-sanitizer/Makefile
+++ b/mail/anomy-sanitizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:12 jlam Exp $
#
DISTNAME= anomy-sanitizer-1.69
@@ -18,7 +18,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/anomy
NO_CONFIGURE= # defined
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
ANOMYLIB= ${PREFIX}/lib/anomy-sanitizer
ANOMYDOC= ${PREFIX}/share/doc/anomy-sanitizer
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index f8810abcd0b..5baf5a5940a 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/06/26 18:45:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.41 2005/07/16 01:19:12 jlam Exp $
DISTNAME= balsa-2.2.6
PKGREVISION= 2
@@ -14,12 +14,11 @@ COMMENT= GNOME2 EMail client
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_PERL5= build
USE_PKGINSTALL= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
CONFIGURE_ARGS= --with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
CONFIGURE_ARGS+= --disable-more-warnings
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 7a5b1cfe07b..04f36d7a034 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/05/22 20:08:11 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2005/07/16 01:19:12 jlam Exp $
DISTNAME= courier-imap-4.0.2
PKGBASE= ${DISTNAME:C/-[^-]*$//}
@@ -12,11 +12,9 @@ HOMEPAGE= http://www.courier-mta.org/imap/
DEPENDS+= courier-maildir>=0.48.2:../../mail/courier-maildir
-USE_TOOLS+= gmake
+USE_TOOLS+= env gmake perl
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-USE_PERL5= build
-USE_TOOLS+= env
.include "../../mail/courier-maildir/Makefile.common"
diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
index af06995adb0..a9f62114d38 100644
--- a/mail/courier-maildir/Makefile
+++ b/mail/courier-maildir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:11 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:12 jlam Exp $
DISTNAME= courier-0.49.0
PKGNAME= ${DISTNAME:S/-/-maildir-/}
@@ -13,9 +13,8 @@ HOMEPAGE= http://www.courier-mta.org/
CONFLICTS= courier-maildirmake-[0-9]*
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
USE_LANGUAGES= c c++
-USE_PERL5= yes
PERL5_REQD+= 5.8.0
.include "Makefile.common"
diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile
index e024fb9ff1a..95ee687d724 100644
--- a/mail/distribute/Makefile
+++ b/mail/distribute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/03/24 21:12:55 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:12 jlam Exp $
DISTNAME= distribute-2.1-pl19
PKGNAME= distribute-2.1.26
@@ -15,7 +15,7 @@ HOMEPAGE= http://www.foretune.co.jp/people/shigeya/distribute/
COMMENT= Mail dispatcher for mailing list. Fits nicely with majordomo
WRKSRC= ${WRKDIR}/distribute-pl19
-USE_PERL5= YES
+USE_TOOLS+= perl:run
MAN1= distribute.1
DIST_SUBDIR= distribute
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 2b1682f2364..6462e6193bb 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/06/15 16:26:36 xtraeme Exp $
+# $NetBSD: Makefile,v 1.35 2005/07/16 01:19:12 jlam Exp $
DISTNAME= dspam-3.4.8
CATEGORIES= mail
@@ -11,7 +11,7 @@ COMMENT= Extremely scalable, statistical-hybrid anti-spam filter
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_PERL5= yes
+USE_TOOLS+= perl:run
REPLACE_PERL= tools/dspam_genaliases.in \
tools/dspam_corpus.in \
cgi/*.cgi cgi/configure.pl.in
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 25bdfd36187..87dc6addb2e 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/07/12 04:07:41 grant Exp $
+# $NetBSD: Makefile,v 1.59 2005/07/16 01:19:12 jlam Exp $
DISTNAME= exim-4.51
CATEGORIES= mail net
@@ -13,7 +13,7 @@ COMMENT= The Exim mail transfer agent, a replacement for sendmail
CONFLICTS+= exim-exiscan-[0-9]*
-USE_PERL5= yes
+USE_TOOLS+= perl:run
USE_PKGINSTALL= yes
MAKE_ENV+= SSLBASE=${SSLBASE:Q}
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index 655e16e54e4..6b3c5b6d05d 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/12 04:07:41 grant Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:12 jlam Exp $
DISTNAME= exim-3.36
PKGREVISION= 4
@@ -13,7 +13,6 @@ COMMENT= The Exim mail transfer agent, a replacement for sendmail
CONFLICTS+= exim-exiscan-[0-9]*
-USE_PERL5= YES
USE_PKGINSTALL= YES
BUILD_DEFS+= EXIM_USER EXIM_GROUP
@@ -35,7 +34,7 @@ PKG_GROUPS= ${EXIM_GROUP}
.include "../../mk/bsd.prefs.mk"
-USE_TOOLS+= gzip gzcat
+USE_TOOLS+= gzip gzcat perl:run
FILES_SUBST+= GZIP_CMD="${GZIP_CMD:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"
FILES_SUBST+= GZCAT="${GZCAT}"
diff --git a/mail/fix-mime-charset/Makefile b/mail/fix-mime-charset/Makefile
index 95a1eaf7a78..1503e03be0d 100644
--- a/mail/fix-mime-charset/Makefile
+++ b/mail/fix-mime-charset/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:19 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:12 jlam Exp $
#
DISTNAME= fix-mime-charset-0.5.3
@@ -10,7 +10,7 @@ HOMEPAGE= http://fix-mime-chr.sourceforge.net/
COMMENT= Correct MIME charset type in mail headers
USE_PKGLOCALEDIR= yes
-USE_PERL5= build
+USE_TOOLS+= perl
GNU_CONFIGURE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/fromto/Makefile b/mail/fromto/Makefile
index 9b067f3ba2d..c15437e479f 100644
--- a/mail/fromto/Makefile
+++ b/mail/fromto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:12 jlam Exp $
#
DISTNAME= fromto-1.5
@@ -12,7 +12,7 @@ COMMENT= Sendmail logfile viewer
RESTRICTED= "Redistribution allowed for non-commercial purposes only"
WRKSRC= ${WRKDIR}
-USE_PERL5= yes
+USE_TOOLS+= perl:run
INSTALLATION_DIRS= bin
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index da858857cd9..2e88d368883 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/24 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:12 jlam Exp $
DISTNAME= mailagent-3.0.73
CATEGORIES= mail
@@ -7,7 +7,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/by-module/by-authors\/id\/RAM/g}
MAINTAINER= itojun@itojun.org
COMMENT= Sophisticated automatic mail-processing tool
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
NO_PACKAGE= "Correct FQDN needs to be hardcoded"
INTERACTIVE_STAGE= configure
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index 9ace88c5770..86863743b6b 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:13 jlam Exp $
#
DISTNAME= mailgraph-1.10
@@ -10,14 +10,11 @@ MAINTAINER= kim@tac.nyc.ny.us
HOMEPAGE= http://people.ee.ethz.ch/~dws/software/mailgraph/
COMMENT= RRDtool frontend for mail statistics
-USE_PKGINSTALL= yes
-USE_PERL5= yes
-
DEPENDS+= rrdtool-1*:../../databases/rrdtool
DEPENDS+= p5-File-Tail-[0-9]*:../../misc/p5-File-Tail
-USE_LANGUAGES= yes
-USE_PERL5= # defined
+USE_PKGINSTALL= yes
+USE_TOOLS+= perl:run
.include "../../mk/bsd.prefs.mk"
@@ -62,5 +59,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${DOCDIR}/$i
.endfor
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 097eb9e7627..91ac824bdf7 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/16 01:19:12 jlam Exp $
#
DISTNAME= MailScanner-4.30.3-2
@@ -23,7 +23,7 @@ DEPENDS+= p5-MIME-tools>=0:../../mail/p5-MIME-tools
DEPENDS+= tnef>=1.0:../../mail/tnef
NO_BUILD= YES
-USE_PERL5= YES
+USE_TOOLS= perl:run
REPLACE_PERL= bin/MailScanner
DOCSDIR= ${LOCALBASE}/share/doc/MailScanner
diff --git a/mail/mailserv/Makefile b/mail/mailserv/Makefile
index 4b0b2e7bd3c..27a3f4960a9 100644
--- a/mail/mailserv/Makefile
+++ b/mail/mailserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:12 jlam Exp $
#
DISTNAME= mailserv
@@ -13,7 +13,7 @@ COMMENT= WWW interface to several types of mailing list servers
WRKSRC= ${WRKDIR}
DIST_SUBDIR= ${PKGNAME_NOREV}
-USE_PERL5= YES
+USE_TOOLS+= perl:run
USE_PKGINSTALL= YES
NO_BUILD= YES
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 950cbd31959..e668be311a5 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:13 jlam Exp $
DISTNAME= majordomo-1.94.5
CATEGORIES= mail
@@ -21,7 +21,7 @@ ADDUSER= ${LOCALBASE}/sbin/useradd
ADDGROUP= ${LOCALBASE}/sbin/groupadd
.endif
-USE_PERL5= yes
+USE_TOOLS+= perl:run
NO_BIN_ON_FTP= requires compiled-in hardcoded uid/gid
NO_BIN_ON_CDROM= ${NO_BIN_ON_FTP}
diff --git a/mail/mb2md/Makefile b/mail/mb2md/Makefile
index 23e43206fce..4c88bf641ee 100644
--- a/mail/mb2md/Makefile
+++ b/mail/mb2md/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/06/16 06:58:03 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:12 jlam Exp $
#
DISTNAME= mb2md-3.20.pl
@@ -15,7 +15,7 @@ DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
WRKSRC= ${WRKDIR}
-USE_PERL5= run
+USE_TOOLS+= perl:run
REPLACE_PERL= ${DISTNAME}
NO_BUILD= # defined
diff --git a/mail/mdfrm/Makefile b/mail/mdfrm/Makefile
index 14df5596dad..c8d476c2f43 100644
--- a/mail/mdfrm/Makefile
+++ b/mail/mdfrm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:58:03 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:13 jlam Exp $
#
DISTNAME= mdfrm.pl
@@ -15,7 +15,7 @@ DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
WRKSRC= ${WRKDIR}
-USE_PERL5= yes
+USE_TOOLS+= perl:run
NO_BUILD= yes
INSTALLATION_DIRS= bin
diff --git a/mail/mhonarc/Makefile b/mail/mhonarc/Makefile
index ef47e83935d..3bea2340d2c 100644
--- a/mail/mhonarc/Makefile
+++ b/mail/mhonarc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/05/27 11:41:03 adrianp Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:13 jlam Exp $
#
DISTNAME= MHonArc-2.6.11
@@ -11,8 +11,7 @@ MAINTAINER= jwise@NetBSD.org
HOMEPAGE= http://www.mhonarc.org/
COMMENT= Mailbox to HTML converter, suitable for list archives
-USE_PERL5= YES
-
+USE_TOOLS+= perl:run
NO_BUILD= YES
pre-install:
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 42a0ca5e4b5..c467f1a36ce 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/06/20 10:20:45 markd Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:13 jlam Exp $
DISTNAME= mimedefang-2.52
PKGREVISION= 1
@@ -18,7 +18,7 @@ DEPENDS+= p5-MIME-Base64>=2.11:../../converters/p5-MIME-Base64
DEPENDS+= p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools
DEPENDS+= spamassassin>=2.31:../../mail/spamassassin
-USE_PERL5= YES
+USE_TOOLS+= perl:run
GNU_CONFIGURE= YES
PKG_SYSCONFSUBDIR?= mimedefang
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 6795c075e25..718ee7014f2 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/29 05:09:55 minskim Exp $
+# $NetBSD: Makefile,v 1.32 2005/07/16 01:19:13 jlam Exp $
DISTNAME= mutt-1.5.6i
PKGNAME= ${DISTNAME:C/i$//}
@@ -21,7 +21,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${DISTNAME:C/i$$//}
BUILD_USES_MSGFMT= yes
USE_PKGLOCALEDIR= yes
-USE_PERL5= yes
+USE_TOOLS+= perl:run
REPLACE_PERL= smime_keys */*.pl
GNU_CONFIGURE= yes
diff --git a/mail/poppy/Makefile b/mail/poppy/Makefile
index 59b08f3b0dc..6c9b07419bf 100644
--- a/mail/poppy/Makefile
+++ b/mail/poppy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:58:03 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:13 jlam Exp $
#
DISTNAME= poppy-3.1
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.cnpbagwell.com/projects.html
COMMENT= Client to perform simple tasks with a POP3/IMAP server
NO_BUILD= YES
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= poppy
INSTALLATION_DIRS= bin man/man1
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index dd9104615a4..970f523b9a1 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/16 06:58:08 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:13 jlam Exp $
#
DISTNAME= postgrey-1.21
@@ -17,7 +17,7 @@ DEPENDS+= p5-Net-Server-[0-9]*:../../net/p5-Net-Server
NO_CONFIGURE= yes
USE_PKGINSTALL= yes
-USE_PERL5= yes
+USE_TOOLS+= perl:run
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index d9939f21d77..d2de6a26658 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:13 jlam Exp $
#
DISTNAME= prayer-1.0.12
@@ -10,8 +10,7 @@ HOMEPAGE= http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
COMMENT= Small, fast, web mail interface
USE_PKGINSTALL= yes
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
PRAYER_USER= prayer
PRAYER_GROUP= prayer
PKG_GROUPS= ${PRAYER_GROUP}
@@ -47,7 +46,6 @@ post-patch:
.include "../../databases/db4/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mail/imap-uw/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff --git a/mail/qgreylist/Makefile b/mail/qgreylist/Makefile
index 0cb5493ed7e..37b8c252123 100644
--- a/mail/qgreylist/Makefile
+++ b/mail/qgreylist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:23 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:13 jlam Exp $
#
DISTNAME= qgreylist-0.2
@@ -14,7 +14,7 @@ DEPENDS+= ${DEPENDS_QMAIL}
WRKSRC= ${WRKDIR}/qgreylist
-USE_PERL5= run
+USE_TOOLS+= perl:run
USE_PKGINSTALL= yes
OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/greylist qmaild wheel 0755
NO_BUILD= # defined
diff --git a/mail/qmHandle/Makefile b/mail/qmHandle/Makefile
index 4e5c92e6605..1d46217a9b6 100644
--- a/mail/qmHandle/Makefile
+++ b/mail/qmHandle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/16 06:58:08 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/16 01:19:13 jlam Exp $
#
DISTNAME= qmhandle-1.2.0
@@ -12,7 +12,7 @@ HOMEPAGE= http://qmhandle.sourceforge.net/
COMMENT= Tool to view and manage the qmail message queue
WRKSRC= ${WRKDIR}
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= qmHandle
NO_BUILD= YES
diff --git a/mail/qmail-lint/Makefile b/mail/qmail-lint/Makefile
index acd9802ef30..2fae28da80a 100644
--- a/mail/qmail-lint/Makefile
+++ b/mail/qmail-lint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:58:08 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:13 jlam Exp $
#
DISTNAME= qmail-lint-0.55
@@ -14,7 +14,7 @@ COMMENT= Examine the qmail configuration for common errors
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
WRKSRC= ${WRKDIR}
-USE_PERL5= yes
+USE_TOOLS+= perl:run
REPLACE_PERL= ${DISTNAME}
NO_BUILD= yes
diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk
index c330a4f0c93..ab83ca44633 100644
--- a/mail/sendmail/options.mk
+++ b/mail/sendmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2005/07/02 01:12:52 tv Exp $
+# $NetBSD: options.mk,v 1.8 2005/07/16 01:19:13 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail
PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl starttls tcpwrappers \
@@ -48,7 +48,7 @@ PKG_SUGGESTED_OPTIONS= tcpwrappers
### Enable Sendmail SOCKETMAP support
###
.if !empty(PKG_OPTIONS:Msocketmap)
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= contrib/socketmapClient.pl contrib/socketmapServer.pl
.endif
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 24bdfdd6ed4..9757d36a95a 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/07/16 01:19:13 jlam Exp $
DISTNAME= sqwebmail-5.0.1
PKGBASE= ${DISTNAME:C/-[^-]*$//}
@@ -13,10 +13,9 @@ HOMEPAGE= http://www.courier-mta.org/sqwebmail/
DEPENDS+= courier-maildir>=0.48.2:../../mail/courier-maildir
DEPENDS+= maildrop>=1.8.0:../../mail/maildrop
-USE_TOOLS+= env gmake
+USE_TOOLS+= env gmake perl:run
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-USE_PERL5= yes
.include "../../mail/courier-maildir/Makefile.common"
.include "../../security/courier-authlib/Makefile.common"
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 22eea64c332..6d0f025f114 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/09 16:15:06 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:13 jlam Exp $
DISTNAME= turba-h3-${TURBAVER}
PKGNAME= turba-${TURBAVER}
@@ -19,7 +19,7 @@ HORDEDIR= ${PREFIX}/share/horde
TURBADIR= ${HORDEDIR}/turba
TURBAVER= 2.0.2
PAXDIRS= lib locale po scripts templates themes
-USE_PERL5= YES
+USE_TOOLS+= perl:run
MESSAGE_SUBST+= TURBADIR=${TURBADIR}
MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
diff --git a/math/R/Makefile b/math/R/Makefile
index b1c561a0aac..229dd357e9e 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2005/06/24 12:28:31 markd Exp $
+# $NetBSD: Makefile,v 1.72 2005/07/16 01:19:13 jlam Exp $
DISTNAME= R-2.1.1
CATEGORIES= math
@@ -15,8 +15,7 @@ NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
PKG_INSTALLATION_TYPES= overwrite pkgviews
TEST_TARGET= check
-USE_PERL5= # defined
-USE_TOOLS+= gmake xmkmf sed
+USE_TOOLS+= gmake perl:run sed xmkmf
USE_GNU_READLINE= # uses callback interface
USE_LANGUAGES= c fortran
USE_MAKEINFO= # defined
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 36663d48715..22586bbfade 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:20 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:13 jlam Exp $
DISTNAME= ess-5.1.24
CATEGORIES= math
@@ -10,7 +10,8 @@ COMMENT= Emacs Speaks Statistics
MAKEFLAGS+= EMACS=${EMACS_BIN}
-USE_MAKEINFO= YES
+USE_MAKEINFO= YES
+USE_TOOLS+= perl
.if defined(USE_XEMACS)
LISPDIR= ${EMACS_LISPPREFIX}
@@ -24,7 +25,6 @@ INSTALLATION_DIRS= ${INFODIR}
MAKE_ENV+= LISPDIR=${EMACS_LISPPREFIX}/ess
PLIST_SUBST+= INFODIR=${INFODIR}
-USE_PERL5= build
do-install:
${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/ess
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 667480a85be..af6437e9360 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2005/06/01 18:03:03 jlam Exp $
+# $NetBSD: Makefile,v 1.96 2005/07/16 01:19:14 jlam Exp $
#
DISTNAME= gnumeric-1.2.13
@@ -14,8 +14,7 @@ COMMENT= Spreadsheet program from the GNOME project
BUILD_USES_MSGFMT= YES
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
-USE_PERL5= YES
+USE_TOOLS+= gmake perl:run
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/math/gnumeric14/Makefile b/math/gnumeric14/Makefile
index 06b2ff2824a..a71a57cf486 100644
--- a/math/gnumeric14/Makefile
+++ b/math/gnumeric14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:03 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:14 jlam Exp $
#
DISTNAME= gnumeric-1.4.3
@@ -13,8 +13,7 @@ COMMENT= Spreadsheet program from the GNOME project
BUILD_USES_MSGFMT= YES
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
-USE_PERL5= YES
+USE_TOOLS+= gmake perl:run
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index df21d969164..3d418f6cb99 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/07 15:21:19 kristerw Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:14 jlam Exp $
#
DISTNAME= maxima-5.9.1
@@ -14,6 +14,6 @@ DEPENDS+= tk-[0-9]*:../../x11/tk
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-clisp
-USE_PERL5= build
+USE_TOOLS+= perl
.include "../../mk/bsd.pkg.mk"
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index c1eb703a21f..33be4dd52ed 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:04 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:14 jlam Exp $
#
DISTNAME= yacas-1.0.57
@@ -11,9 +11,8 @@ COMMENT= Yet Another Computer Algebra System
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_LIBTOOL= YES
-USE_PERL5= build
TEST_TARGET= test
diff --git a/meta-pkgs/netbsd-www/Makefile b/meta-pkgs/netbsd-www/Makefile
index 95ebf54b135..6ccb7f073ea 100644
--- a/meta-pkgs/netbsd-www/Makefile
+++ b/meta-pkgs/netbsd-www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/03/02 18:00:15 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/16 01:19:14 jlam Exp $
#
DISTNAME= netbsd-www-1.3
@@ -20,7 +20,7 @@ DEPENDS+= xearth>=1.1:../../x11/xearth
DEPENDS+= opensp>=1.1:../../textproc/opensp
DEPENDS+= w3m>=0.4:../../www/w3m
-USE_PERL5= run
+USE_TOOLS+= perl:run
EXTRACT_ONLY= # defined
NO_CHECKSUM= # defined
NO_CONFIGURE= # defined
diff --git a/misc/bbweather/Makefile b/misc/bbweather/Makefile
index 8c5ace9428a..7022222cd47 100644
--- a/misc/bbweather/Makefile
+++ b/misc/bbweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/15 18:27:52 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/16 01:19:14 jlam Exp $
#
DISTNAME= bbweather-0.6.2
@@ -14,8 +14,7 @@ DEPENDS+= wget>=1.7:../../net/wget
GNU_CONFIGURE= YES
REPLACE_PERL= GrabWeather
-USE_PERL5= run
-USE_TOOLS+= gunzip
+USE_TOOLS+= gunzip perl:run
.include "../../mk/x11.buildlink3.mk"
diff --git a/misc/colorize/Makefile b/misc/colorize/Makefile
index 9135aa32c7a..7585608b339 100644
--- a/misc/colorize/Makefile
+++ b/misc/colorize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:52 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:14 jlam Exp $
#
DISTNAME= colorize_0.3.0
@@ -13,9 +13,8 @@ COMMENT= Log colorize perl script
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
NO_BUILD= yes
-USE_PERL5= yes
-USE_TOOLS+= gunzip
+USE_TOOLS+= gunzip perl:run
INSTALLATION_DIRS= bin man/man1
post-patch:
diff --git a/misc/cowsay/Makefile b/misc/cowsay/Makefile
index 38a6d230a3b..4c0c7e84254 100644
--- a/misc/cowsay/Makefile
+++ b/misc/cowsay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:14 jlam Exp $
DISTNAME= cowsay-3.03
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.nog.net/~tony/warez/cowsay.shtml
COMMENT= Configurable talking cow
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
SUBST_CLASSES+= pap
SUBST_STAGE.pap= pre-install # after patch to avoid sneaking into patches
diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile
index 293aaa4a53b..eae033b786d 100644
--- a/misc/dpkg/Makefile
+++ b/misc/dpkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:15 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:14 jlam Exp $
#
DISTNAME= ${PKGNAME:S,-,_,}
@@ -16,9 +16,8 @@ WRKSRC= ${WRKDIR}/${PKGNAME}
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_NCURSES= # tigetstr()
-USE_PERL5= build
USE_PKGINSTALL= yes
REPLACE_PERL= ${WRKSRC}/scripts/*.pl
@@ -35,5 +34,4 @@ CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/share/dpkg
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 341e8a60748..a017574abbf 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/06/01 18:03:05 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2005/07/16 01:19:14 jlam Exp $
#
DISTNAME= gnome-utils-2.10.1
@@ -12,8 +12,7 @@ COMMENT= Set of useful GNOME2 utilities and applications
BUILD_USES_MSGFMT= yes
-USE_PERL5= build
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/misc/kanjipad/Makefile b/misc/kanjipad/Makefile
index 887eb97e962..73cc21b83c7 100644
--- a/misc/kanjipad/Makefile
+++ b/misc/kanjipad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:15 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:14 jlam Exp $
#
DISTNAME= kanjipad-2.0.0
@@ -10,8 +10,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://fishsoup.net/software/kanjipad/
COMMENT= Japanese handwriting recognition
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile
index 9f5c632091a..6033b18293c 100644
--- a/misc/libcdio/Makefile
+++ b/misc/libcdio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/05/31 17:05:36 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:14 jlam Exp $
#
DISTNAME= libcdio-0.74
@@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE+= libcdio_paranoia.pc.in
PKGCONFIG_OVERRIDE+= libiso9660.pc.in
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-versioned-libs
-USE_PERL5= build
+USE_TOOLS+= perl:run
INFO_FILES= libcdio.info
diff --git a/misc/loco/Makefile b/misc/loco/Makefile
index 91dd59aae3f..4c7ae996e52 100644
--- a/misc/loco/Makefile
+++ b/misc/loco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/03 15:15:04 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:14 jlam Exp $
#
DISTNAME= loco-0.32
@@ -9,7 +9,7 @@ MAINTAINER= zuntum@NetBSD.org
HOMEPAGE= http://zjuul.net/~jules/loco/
COMMENT= Colorize file or standard input and print on the standard output
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= loco
BUILD_TARGET= # defined
diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index c3ac7753537..0415a3b32b7 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/06/01 18:03:05 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2005/07/16 01:19:14 jlam Exp $
DISTNAME= nxtvepg-2.7.5
CATEGORIES= misc
@@ -12,8 +12,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
NetBSD-1.5_ALPHA-* NetBSD-1.[5-9]*-* \
NetBSD-[2-9]*-*
-USE_PERL5= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
PTHREAD_AUTO_VARS= yes
.include "../../mk/pthread.buildlink3.mk"
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index a3e6d8bf303..18a99890c31 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2005/06/17 03:50:22 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2005/07/16 01:19:14 jlam Exp $
DISTNAME= openoffice-1.1.4
PKGREVISION= 2
@@ -27,8 +27,7 @@ USE_LANGUAGES+= c c++
.include "../../mk/bsd.prefs.mk"
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
PTHREAD_OPTS+= require
PTHREAD_AUTO_VARS= yes
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index 23587640675..d8770052e16 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:17 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:14 jlam Exp $
#
DISTNAME= pdmenu_1.2.65
@@ -13,8 +13,7 @@ COMMENT= Simple console menu program
WRKSRC= ${WRKDIR}/pdmenu
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
-USE_PERL5= YES
+USE_TOOLS+= gmake perl:run
REPLACE_PERL= examples/showdir.pl
diff --git a/misc/reed/Makefile b/misc/reed/Makefile
index ff92b009a0e..bdf8e2f5781 100644
--- a/misc/reed/Makefile
+++ b/misc/reed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/17 03:50:22 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:15 jlam Exp $
DISTNAME= reed-5.4
PKGREVISION= 2
@@ -12,7 +12,7 @@ COMMENT= Auto-scrolling file viewer
CONFIGURE_SCRIPT= ./configures
CONFIGURE_ARGS+= -p ${PREFIX}
HAS_CONFIGURE= YES
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= breed fix_bookmarks.pl wrap
# wgetnstr()
diff --git a/misc/tds/Makefile b/misc/tds/Makefile
index 80606c50075..6315fad4da9 100644
--- a/misc/tds/Makefile
+++ b/misc/tds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/08 20:27:05 kristerw Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:15 jlam Exp $
#
DISTNAME= tds-1.4.2
@@ -10,7 +10,7 @@ MAINTAINER= kei@NetBSD.org
HOMEPAGE= http://tds.dive-in.to/
COMMENT= Web diary system
-USE_PERL5= YES
+USE_TOOLS+= perl:run
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PERL5="${PERL5}"
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 8e49d1d8c17..1dd0b5551e1 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1707 2005/07/15 18:27:54 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1708 2005/07/16 01:19:27 jlam Exp $
#
# This file is in the public domain.
#
@@ -4225,7 +4225,7 @@ pre-install-fake-pkg:
. if !empty(USE_LANGUAGES)
@${ECHO} "CC_VERSION=${CC_VERSION}" >> ${BUILD_INFO_FILE}
. endif
-. if defined(USE_PERL5) && (${USE_PERL5} == "run")
+. if !empty(USE_TOOLS:Mperl\:run)
@${ECHO} "PERL=`${PERL5} --version 2>/dev/null | ${GREP} 'This is perl'`" >> ${BUILD_INFO_FILE}
. endif
. if defined(_USE_GMAKE) || !empty(USE_TOOLS:Mgmake)
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 97c5d6a4aaa..b44b58badf4 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.109 2005/07/15 20:14:04 jlam Exp $
+# $NetBSD: replace.mk,v 1.110 2005/07/16 01:19:27 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -75,17 +75,6 @@
# USE_TOOLS+= perl:run
#
-# Continue to allow USE_PERL5 until packages have been taught to use the
-# new syntax.
-#
-.if defined(USE_PERL5)
-. if empty(USE_PERL5:Mbuild)
-USE_TOOLS+= perl:run
-. else
-USE_TOOLS+= perl
-. endif
-.endif
-
# XXX Keep this hack here until the day that msgfmt and msgfmt-plurals
# XXX is handled directly by the tools framework.
# XXX
diff --git a/multimedia/acidrip/Makefile b/multimedia/acidrip/Makefile
index 5bf452ec170..f92139baecd 100644
--- a/multimedia/acidrip/Makefile
+++ b/multimedia/acidrip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/13 18:01:34 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:15 jlam Exp $
#
DISTNAME= acidrip-0.14
@@ -15,8 +15,6 @@ DEPENDS+= mencoder-[0-9]*:../../multimedia/mencoder
DEPENDS+= mplayer-[0-9]*:../../multimedia/mplayer
DEPENDS+= p5-gtk2>=1.040:../../x11/p5-gtk2
-USE_PERL5= yes
-
PERL5_REQD= 5.8
PERL5_PACKLIST= auto/AcidRip/.packlist
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index 36e325f0052..bfb62981767 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:06 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:15 jlam Exp $
DISTNAME= gnome-media-2.10.2
CATEGORIES= multimedia gnome
@@ -18,8 +18,7 @@ GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins/Makefile
index 6fdb71c9a4e..f88445ca74b 100644
--- a/multimedia/gst-plugins/Makefile
+++ b/multimedia/gst-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/06/26 09:30:09 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:15 jlam Exp $
#
.include "Makefile.common"
@@ -6,7 +6,7 @@
PKGREVISION= 1
COMMENT+= base plugins
-USE_PERL5= run
+USE_TOOLS+= perl:run
PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-gconf.pc.in
PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-interfaces.pc.in
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 8d88d1510d8..8472d009e6e 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:06 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:15 jlam Exp $
#
DISTNAME= gstreamer-0.8.10
@@ -16,8 +16,7 @@ GNU_CONFIGURE= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
CONFIGURE_ARGS+= --disable-plugin-builddir
CONFIGURE_ARGS+= --localstatedir=${PREFIX}/libdata/gstreamer-0.8
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 135d10d80ac..a03519f37ef 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:15 jlam Exp $
#
DISTNAME= kmplayer-0.8.4b
@@ -16,10 +16,9 @@ DEPENDS+= mencoder>=1.0rc3:../../multimedia/mencoder
DEPENDS+= xine-arts>=1rc0a:../../audio/xine-arts
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-USE_PERL5= build
CONFIGURE_ARGS+= --without-gstreamer
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index e6e2cd9d429..62f3f1095cb 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/11 16:58:08 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:15 jlam Exp $
#
DISTNAME= xawtv_3.90
@@ -13,8 +13,7 @@ COMMENT= TV application for Brooktree 848 compatible cards
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
CONFIGURE_ARGS+= --disable-aalib
CONFIGURE_ARGS+= --disable-motif
diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index ac462ce70a3..509e6c709ca 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:23 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:15 jlam Exp $
#
DISTNAME= dctc-0.85.4
@@ -11,10 +11,9 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.ac2i.tzo.com/dctc/
COMMENT= Direct Connect clone (Direct Connect Text Client)
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-manual-db-detect
-USE_PERL5= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
CPPFLAGS+= -I${BUILDLINK_PREFIX.db4}/include/db4
diff --git a/net/dlint/Makefile b/net/dlint/Makefile
index a056fbdb83a..c0e0abb5d18 100644
--- a/net/dlint/Makefile
+++ b/net/dlint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/02/21 20:26:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:15 jlam Exp $
#
DISTNAME= dlint1.4.0
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.domtools.com/dns/
COMMENT= Internet Domain Name System (DNS) error checking utility
-USE_PERL5= YES
+USE_TOOLS+= perl:run
NO_BUILD= YES
do-configure:
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 6032941b7c2..382e4917651 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2005/07/13 10:01:53 drochner Exp $
+# $NetBSD: Makefile,v 1.111 2005/07/16 01:19:15 jlam Exp $
DISTNAME= ethereal-0.10.11
PKGREVISION= 1
@@ -22,7 +22,7 @@ MAINTAINER= frueauf@NetBSD.org
HOMEPAGE= http://www.ethereal.com/
COMMENT= Network protocol analyzer
-USE_PERL5= build
+USE_TOOLS+= perl
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= libtool
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 4b33a358a6d..9043fa8cf0f 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/07/09 17:25:00 adrianp Exp $
+# $NetBSD: Makefile,v 1.31 2005/07/16 01:19:15 jlam Exp $
DISTNAME= freeradius-1.0.4
CATEGORIES= net
@@ -12,10 +12,9 @@ COMMENT= Free RADIUS server implementation
.include "../../mk/bsd.prefs.mk"
CONFLICTS+= radiusd-cistron*
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
GNU_CONFIGURE= YES
USE_PKGINSTALL= YES
-USE_PERL5= YES
LIBTOOLIZE_PLIST= NO
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
FILES_SUBST+= ROOT_USER=${ROOT_USER}
diff --git a/net/gnapfetch/Makefile b/net/gnapfetch/Makefile
index 291529f2c45..6f2a2c39ca9 100644
--- a/net/gnapfetch/Makefile
+++ b/net/gnapfetch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:25 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:15 jlam Exp $
DISTNAME= gnapfetch-0.3
CATEGORIES= net
@@ -8,8 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://entropy.atlantic.net/gnapfetch/
COMMENT= Update/maintain opennap servers for gnapster/TekNap
-USE_PERL5= # defined
-
+USE_TOOLS+= perl:run
INSTALLATION_DIRS= bin
do-build:
diff --git a/net/ipcalc/Makefile b/net/ipcalc/Makefile
index 867de505aeb..e9ae1a20137 100644
--- a/net/ipcalc/Makefile
+++ b/net/ipcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/10 21:48:32 seb Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:15 jlam Exp $
DISTNAME= ipcalc-0.40
CATEGORIES= net
@@ -8,7 +8,7 @@ MAINTAINER= zuntum@NetBSD.org
HOMEPAGE= http://jodies.de/ipcalc/
COMMENT= IP Calculator
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= ipcalc
NO_BUILD= YES
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 16ef5bf97c6..14763690eea 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/06/01 20:08:01 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/07/16 01:19:15 jlam Exp $
DISTNAME= irrd2.2.3
PKGNAME= irrd-2.2.3
@@ -15,8 +15,7 @@ COMMENT= Internet Routing Registry Daemon
DEPENDS+= gnupg-[0-9]*:../../security/gnupg
DEPENDS+= wget-[0-9]*:../../net/wget
-USE_PERL5= # defined
-USE_TOOLS+= automake
+USE_TOOLS+= automake perl:run
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/net/ispman/Makefile b/net/ispman/Makefile
index 818c8f872da..e3c21db1111 100644
--- a/net/ispman/Makefile
+++ b/net/ispman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/10/07 05:37:47 rh Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/16 01:19:16 jlam Exp $
#
DISTNAME= ispman-0.5
@@ -18,7 +18,7 @@ DEPENDS+= p5-ispman>=0.5:../../net/p5-ispman
DEPENDS+= {postfix>=20010228,postfix-1.*,postfix-2.*}:../../mail/postfix
.endif
-USE_PERL5= YES
+USE_TOOLS+= perl:run
WRKSRC= ${WRKDIR}/ispman
ISPMAN_HTDOCS?= ${PREFIX}/share/ispman/virtual
diff --git a/net/md-whois/Makefile b/net/md-whois/Makefile
index afc2d63e585..6e41f103eaa 100644
--- a/net/md-whois/Makefile
+++ b/net/md-whois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:25 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:16 jlam Exp $
#
# todo: set location of [md-]whois.conf and fix in man page too
# todo: build and install the po/ files and add to PLIST
@@ -17,8 +17,8 @@ COMMENT= Improved whois client
VERSION= 4.7.2
WRKSRC= ${WRKDIR}/whois-${VERSION}
-USE_PERL5= build
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
+
INSTALLATION_DIRS+= bin man/man1
do-install:
diff --git a/net/mirror/Makefile b/net/mirror/Makefile
index e052319ae01..aa5f0c67763 100644
--- a/net/mirror/Makefile
+++ b/net/mirror/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/03/24 21:12:58 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/07/16 01:19:16 jlam Exp $
DISTNAME= mirror-2.9
PKGREVISION= 1
@@ -9,12 +9,11 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://sunsite.org.uk/packages/mirror/
COMMENT= Mirror packages on remote sites
-USE_PERL5= # defined
-
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
SCRIPTS_ENV+= PERL5=${PERL5}
+USE_TOOLS+= perl:run
REPLACE_PERL= do_unlinks.pl mirror.pl mm.pl pkgs_to_mmin.pl
pre-configure:
diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common
index 822317db5ba..298e6510120 100644
--- a/net/mldonkey/Makefile.common
+++ b/net/mldonkey/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:25 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/07/16 01:19:16 jlam Exp $
#
DISTNAME= mldonkey-2.5.28
@@ -14,8 +14,7 @@ DISTINFO_FILE= ${.CURDIR}/../../net/mldonkey/distinfo
PATCHDIR= ${.CURDIR}/../../net/mldonkey/patches
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
CONFIGURE_ENV+= WGET=""
CONFIGURE_ENV+= ac_cv_prog_WGET="no"
diff --git a/net/nasd/Makefile b/net/nasd/Makefile
index b1a575cd025..2c50023f0f0 100644
--- a/net/nasd/Makefile
+++ b/net/nasd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/04 08:56:49 agc Exp $
+# $NetBSD: Makefile,v 1.2 2005/07/16 01:19:16 jlam Exp $
DISTNAME= repackaged-${PKGNAME}
PKGNAME= nasd-1.3
@@ -12,7 +12,7 @@ COMMENT= Prototype storage implementation
ONLY_FOR_PLATFORM= NetBSD-*-* SunOS-*-* Linux-*-*
USE_IMAKE= yes
-USE_PERL5= build
+USE_TOOLS+= perl
WRKSRC= ${WRKDIR}/${PKGNAME}
pre-patch:
diff --git a/net/neat/Makefile b/net/neat/Makefile
index d60a52da3ed..90ed778c878 100644
--- a/net/neat/Makefile
+++ b/net/neat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:26 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:16 jlam Exp $
#
DISTNAME= neatv4.6
@@ -14,7 +14,7 @@ COMMENT= Netsaint Easy Administration Tool
DEPENDS+= netsaint-base>=0.0.6:../../net/netsaint-base
WRKSRC= ${WRKDIR}/neat4
-USE_PERL5= YES
+USE_TOOLS+= perl:run
NO_BUILD= YES
INSTALLATION_DIRS= etc libexec/netsaint/cgi-bin share/netsaint/images
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index d8223d33397..c5d8694b23b 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/05/26 05:47:40 markd Exp $
+# $NetBSD: Makefile,v 1.43 2005/07/16 01:19:16 jlam Exp $
DISTNAME= netatalk-2.0.3
CATEGORIES= net print
@@ -10,8 +10,7 @@ HOMEPAGE= http://netatalk.sourceforge.net/
COMMENT= Netatalk appletalk file and print services
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
-USE_PERL5= YES
+USE_TOOLS+= gmake perl:run
USE_LIBTOOL= YES
USE_OLD_DES_API=YES
diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index 15ccd7d2fdd..4e439bc744f 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/25 17:06:48 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2005/07/16 01:19:17 jlam Exp $
#
DISTNAME= netdisco-0.94_with_mibs
@@ -30,7 +30,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME}
EGDIR= ${PREFIX}/share/examples/${PKGNAME_NOREV}
-USE_PERL5= yes
+USE_TOOLS+= perl:run
REPLACE_PERL= bin/doc_munge
REPLACE_PERL+= bin/test_cdp.pl
REPLACE_PERL+= bin/test_fwtable.pl
diff --git a/net/netsaint-base/Makefile.common b/net/netsaint-base/Makefile.common
index b30e9621e3b..67901b6eb4c 100644
--- a/net/netsaint-base/Makefile.common
+++ b/net/netsaint-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/06/01 18:03:08 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/07/16 01:19:16 jlam Exp $
#
CATEGORIES= net sysutils
@@ -16,9 +16,7 @@ PKG_USERS+= ${NETSAINT_USER}:${NETSAINT_GROUP}::NetSaint\\ Runtime\\ User
PKG_USERS+= ${NETSTADM_USER}:${NETSTADM_GROUP}::NetSaint\\ Administrator:${PREFIX}/etc/netsaint:${SH}
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
-
-USE_PERL5= YES
+USE_TOOLS+= gmake perl:run
PKG_SYSCONFSUBDIR= netsaint
diff --git a/net/nocol/Makefile b/net/nocol/Makefile
index 38efc1cf285..36ddad26e57 100644
--- a/net/nocol/Makefile
+++ b/net/nocol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/07/10 20:19:11 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:16 jlam Exp $
#
DISTNAME= nocol-4.3.1
@@ -14,7 +14,7 @@ HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./Configure
CONFIGURE_ARGS+= < ${WRKSRC}/answers
-USE_PERL5= yes
+USE_TOOLS+= perl:run
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/cmu-snmp/snmp/libtool \
${WRKSRC}/cmu-snmp/snmpapps/libtool
diff --git a/net/ns/Makefile b/net/ns/Makefile
index fc2451cd24f..9f33742d9eb 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:08 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:16 jlam Exp $
DISTNAME= ns-src-2.27
PKGNAME= ${DISTNAME:S/-src//}
@@ -17,7 +17,7 @@ USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
PTHREAD_OPTS+= require
# Perl is only needed if you want to run the validation tests.
-#USE_PERL5= build
+#USE_TOOLS+= perl
CONFIGURE_ARGS+= LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; echo $$TCL_LIBS'`"
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}
diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index 013df1a75da..dbc80bad984 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/06/01 19:07:34 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/07/16 01:19:16 jlam Exp $
#
DISTNAME= ntp-4.2.0
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
CONFLICTS+= openntpd-[0-9]*
GNU_CONFIGURE= YES
-USE_PERL5= build
+USE_TOOLS+= perl
USE_PKGINSTALL= YES
CONFIGURE_ENV+= PATH_PERL="${PERL5}" ac_cv_header_sys_soundcard_h=no
diff --git a/net/oinkmaster/Makefile b/net/oinkmaster/Makefile
index 76372f404d6..0c41fe08766 100644
--- a/net/oinkmaster/Makefile
+++ b/net/oinkmaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:26 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:16 jlam Exp $
DISTNAME= oinkmaster-1.2
PKGREVISION= 1
@@ -13,16 +13,16 @@ DEPENDS+= wget>=1.00:../../net/wget
DEPENDS+= snort{,-mysql,-pgsql}-[0-9]*:../../net/snort
USE_PKGINSTALL= yes
-USE_PERL5= yes
NO_BUILD= yes
CONF_FILES= ${PREFIX}/share/examples/oinkmaster/oinkmaster.conf \
${PKG_SYSCONFDIR}/oinkmaster.conf
-PERL5_REQD+= 5.6.1
EGDIR= ${PREFIX}/share/examples/oinkmaster
DOCDIR= ${PREFIX}/share/doc/oinkmaster
DOCS= INSTALL LICENSE README README.templates UPGRADING FAQ
+USE_TOOLS+= perl:run
+PERL5_REQD+= 5.6.1
REPLACE_PERL+= ${WRKSRC}/oinkmaster.pl
PKG_SYSCONFSUBDIR= snort
diff --git a/net/pfnet/Makefile b/net/pfnet/Makefile
index 4798b3f9514..e03c1af74fc 100644
--- a/net/pfnet/Makefile
+++ b/net/pfnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:16 jlam Exp $
#
DISTNAME= fnet.pl-1.4
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.abattoir.com/~banshee/Tech/
COMMENT= Minimal FNET-like ICB client written in Perl
WRKSRC= ${WRKDIR}/fnet-1.4
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
INSTALLATION_DIRS= bin
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 981d4c1e12f..3ebc5a5ddc2 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:26 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:16 jlam Exp $
# Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
#
@@ -13,9 +13,8 @@ COMMENT= Free multithreaded routing daemon software (fork of zebra)
.include "../../mk/bsd.prefs.mk"
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_LIBTOOL= YES
-USE_PERL5= build
PKG_SYSCONFSUBDIR?= zebra
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/net/ripe-whois/Makefile b/net/ripe-whois/Makefile
index 1d8489c2351..c3a205541cb 100644
--- a/net/ripe-whois/Makefile
+++ b/net/ripe-whois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:22:21 agc Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:16 jlam Exp $
#
DISTNAME= ripe-whois-3.1.1v6
@@ -12,7 +12,7 @@ COMMENT= RIPE very simple and generic whois client
WRKSRC= ${WRKDIR}/whois-3.1.1v6
GNU_CONFIGURE= YES
-USE_PERL5= build
+USE_TOOLS+= perl
MAKE_ENV+= PERL5=${PERL5}
BUILD_DEFS+= USE_INET6
diff --git a/net/sitescooper/Makefile b/net/sitescooper/Makefile
index 3ecd7317391..b99e0e2ec5d 100644
--- a/net/sitescooper/Makefile
+++ b/net/sitescooper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:28 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:16 jlam Exp $
#
DISTNAME= sitescooper-2.2.8
@@ -13,7 +13,7 @@ COMMENT= Retrieve stories from websites and convert to Palm readable format
DEPENDS+= p5-libwww>=5.46:../../www/p5-libwww
DEPENDS+= pilotmgr-[0-9]*:../../comms/pilotmgr
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
NO_BUILD= # defined
INSTALLATION_DIRS= bin etc man/man1
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index ab3f6b18838..ae11f2c7a14 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:28 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:16 jlam Exp $
DISTNAME= smokeping-1.37
CATEGORIES= net
@@ -13,7 +13,7 @@ DEPENDS+= fping>=2.4b2:../../net/fping
DEPENDS+= p5-Digest-MD5>=2.20:../../security/p5-Digest-MD5
DEPENDS+= p5-libwww>=5.64:../../www/p5-libwww
-USE_PERL5= YES
+USE_TOOLS+= perl:run
PERL5_REQD+= 5.6.0
USE_PKGINSTALL= YES
NO_BUILD= YES
diff --git a/net/spread/Makefile b/net/spread/Makefile
index 23aee41d1b8..c385f5ac6f8 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:00 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:16 jlam Exp $
#
DISTNAME= spread-src-3.17.3
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.spread.org/
COMMENT= Group communication system providing a number of messaging services
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_PERL5= build
+USE_TOOLS+= perl
USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --includedir=${PREFIX}/include/spread
diff --git a/net/stripes/Makefile b/net/stripes/Makefile
index 0f6d5b6e1ec..da81a070e20 100644
--- a/net/stripes/Makefile
+++ b/net/stripes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/12/03 15:15:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:17 jlam Exp $
#
DISTNAME= stripes-2.1
@@ -12,12 +12,12 @@ COMMENT= Looking Glass for Zebra and Cisco Routers
DEPENDS+= {p5-CGI>=2.66,perl>=5.6.1nb2}:../../www/p5-CGI
DEPENDS+= p5-Net-Telnet>=3.02:../../net/p5-Net-Telnet
-USE_PERL5= # defined
-
PKG_SYSCONFSUBDIR?= httpd
BUILD_TARGET= all
MAKE_FLAGS+= DEST=${PREFIX} PERL=${PERL5} \
CONFIGFILE=${PKG_SYSCONFDIR}/lg.conf
+
+USE_TOOLS+= perl:run
REPLACE_PERL= lg.pl
.include "../../mk/bsd.pkg.mk"
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 5ad75e68ea3..1fea43ce324 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/17 04:49:47 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:17 jlam Exp $
#
DISTNAME= tightvnc-1.2.9
@@ -16,8 +16,8 @@ CONFLICTS= vnc-[0-9]*
WRKSRC= ${WRKDIR}/vnc_unixsrc
CRYPTO= yes
USE_IMAKE= yes
+USE_TOOLS+= perl:run
NO_INSTALL_MANPAGES= yes
-USE_PERL5= yes
BUILD_TARGET= World
diff --git a/net/torrentutils/Makefile b/net/torrentutils/Makefile
index dc2f06604da..5d48aba3bf1 100644
--- a/net/torrentutils/Makefile
+++ b/net/torrentutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:26 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:17 jlam Exp $
#
DISTNAME= torrentutils-0.3.0
@@ -14,9 +14,7 @@ DEPENDS+= bash-[0-9]*:../../shells/bash
DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
-USE_TOOLS= gmake
-USE_PERL5= yes
-
+USE_TOOLS= gmake perl:run
REPLACE_PERL= torrenttool.in
post-build:
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 9e8160c22a2..15fa8fc6c4a 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:08 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/07/16 01:19:17 jlam Exp $
#
DISTNAME= tsclient-0.132
@@ -15,14 +15,12 @@ DEPENDS+= vncviewer-[0-9]*:../../net/vncviewer
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
USE_PKGLOCALEDIR= yes
-USE_PERL5= run
GNU_CONFIGURE= yes
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 158c85fc363..b6bb6af9f63 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:08 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:17 jlam Exp $
#
DISTNAME= vino-2.10.0
@@ -12,10 +12,9 @@ COMMENT= VNC server for GNOME
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_PERL5= build
GCONF2_SCHEMAS= vino-server.schemas
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index a54a474da7d..ed2056f6653 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/06/17 04:49:47 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/07/16 01:19:17 jlam Exp $
DISTNAME= vnc-3.3.3r2
PKGNAME= vnc-3.3.3.2
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/vnc_unixsrc
CRYPTO= yes
NO_INSTALL_MANPAGES= yes
USE_IMAKE= yes
-USE_PERL5= yes
+USE_TOOLS+= perl:run
BUILD_DEFS+= USE_INET6
BUILD_TARGET= World
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 1f930471800..6ced2d49d06 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:26 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:17 jlam Exp $
DISTNAME= wol-0.7.1
CATEGORIES= net
@@ -9,10 +9,9 @@ HOMEPAGE= http://ahh.sourceforge.net/wol/
COMMENT= Small Wake On Lan client
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_PKGLOCALEDIR= yes
INFO_FILES= wol.info
-USE_PERL5= build
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 0cd351f37d0..b1abc45f754 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/05/09 05:27:58 minskim Exp $
+# $NetBSD: Makefile,v 1.41 2005/07/16 01:19:17 jlam Exp $
#
DISTNAME= pan-0.14.2
@@ -13,7 +13,7 @@ COMMENT= Newsreader for GTK2
BUILD_USES_MSGFMT= YES
-USE_PERL5= build
+USE_TOOLS+= perl
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
diff --git a/news/trn/Makefile b/news/trn/Makefile
index d876a4c3336..caa8f066aaa 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/08 20:42:35 kristerw Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:17 jlam Exp $
DISTNAME= trn-4.0-test76
PKGNAME= trn-4.76
@@ -29,13 +29,11 @@ DEPENDS= nntpclnt>=1.6.1:../nntpclnt
# foo.y.z.com for the purposes of allowing cancels.
TRN_HOSTBITS?= 0
-USE_PERL5= # defined
-
HAS_CONFIGURE= # defined
CONFIGURE_SCRIPT= ./Configure
CONFIGURE_ENV= PREFIX=${PREFIX}
USE_TOOLS+= awk basename cat cp diff echo egrep expr grep mkdir mv
-USE_TOOLS+= rm sed tail tr
+USE_TOOLS+= perl:run rm sed tail tr
CONFIGURE_ENV+= TOOLS_AWK="${TOOLS_AWK}"
CONFIGURE_ENV+= TOOLS_BASENAME="${TOOLS_BASENAME}"
CONFIGURE_ENV+= TOOLS_CAT="${TOOLS_CAT}"
diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index e78082619cb..5de75c12284 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/07/12 19:41:43 kristerw Exp $
+# $NetBSD: Makefile,v 1.38 2005/07/16 01:19:17 jlam Exp $
DISTNAME= mpich-1.2.6
PKGREVISION= 1
@@ -16,7 +16,7 @@ DEPENDS+= {openssh-[0-9]*,ssh{,6}-1.2.27*}:../../security/openssh
BUILD_TARGET= ALL examples
INSTALL_TARGET= install-all
-USE_PERL5= yes
+USE_TOOLS+= perl:run
HAS_CONFIGURE= yes
USE_FORTRAN= yes
PKG_SYSCONFSUBDIR= mpi-ch
diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile
index f4f827c5457..ce68e0a93bf 100644
--- a/parallel/sge/Makefile
+++ b/parallel/sge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:17 jlam Exp $
#
DISTNAME= sge-5.3p6
@@ -13,8 +13,7 @@ COMMENT= Sun Grid Engine distributed resource management system
BUILD_DEPENDS+= {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
-USE_PERL5= YES
+USE_TOOLS+= gmake perl:run
CFLAGS+= -D${UPPER_OPSYS}
CONFIGURE_ENV+= REMOTE=sge
diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile
index bb807c9a0fb..0b81d8ea78b 100644
--- a/pkgtools/pkg_filecheck/Makefile
+++ b/pkgtools/pkg_filecheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/17 03:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:17 jlam Exp $
#
DISTNAME= pkg_filecheck-0.1
@@ -11,7 +11,7 @@ MAINTAINER= dillo@NetBSD.org
COMMENT= Check for files not owned by any package
WRKSRC= ${WRKDIR}
-USE_PERL5= run
+USE_TOOLS+= perl:run
USE_PKGINSTALL= yes
EXTRACT_ONLY= # empty
diff --git a/pkgtools/pkg_notify/Makefile b/pkgtools/pkg_notify/Makefile
index ce9e97e2587..65978debeba 100644
--- a/pkgtools/pkg_notify/Makefile
+++ b/pkgtools/pkg_notify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:05 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:17 jlam Exp $
#
DISTNAME= pkg_notify-0.4.2
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
NO_BUILD= yes
NO_CONFIGURE= yes
-USE_PERL5= yes
+USE_TOOLS+= perl:run
USE_PKGINSTALL= yes
WRKSRC= ${WRKDIR}/pkg_notify
diff --git a/pkgtools/pkgdep/Makefile b/pkgtools/pkgdep/Makefile
index b5bce3f9d3a..bc43a1118b8 100644
--- a/pkgtools/pkgdep/Makefile
+++ b/pkgtools/pkgdep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:17 jlam Exp $
#
DISTNAME= pkgdep-1.0
@@ -10,7 +10,7 @@ MAINTAINER= sakamoto@NetBSD.org
COMMENT= Script for displaying dependence information on software packages
WRKSRC= ${WRKDIR}
-USE_PERL5= YES
+USE_TOOLS+= perl:run
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
diff --git a/pkgtools/pkgdepgraph/Makefile b/pkgtools/pkgdepgraph/Makefile
index ca112f80b65..9879daebf9c 100644
--- a/pkgtools/pkgdepgraph/Makefile
+++ b/pkgtools/pkgdepgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/26 17:34:19 atatat Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:17 jlam Exp $
#
DISTNAME= pkgdepgraph-2.8
@@ -14,7 +14,7 @@ COMMENT= Visual representation of installed NetBSD packages
# DEPENDS+= graphviz-[0-9]*:../../graphics/graphviz
WRKSRC= ${WRKDIR}
-USE_PERL5= YES
+USE_TOOLS+= perl:run
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
diff --git a/pkgtools/pkgse/Makefile b/pkgtools/pkgse/Makefile
index 282683c8ca5..c3b9a416107 100644
--- a/pkgtools/pkgse/Makefile
+++ b/pkgtools/pkgse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/08/12 13:15:45 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:17 jlam Exp $
#
DISTNAME= pkgse-0.2
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_PERL5= yes
+USE_TOOLS+= perl:run
INSTALLATION_DIRS= bin
diff --git a/pkgtools/port2pkg/Makefile b/pkgtools/port2pkg/Makefile
index cb4ca9d17d2..4b566386eb4 100644
--- a/pkgtools/port2pkg/Makefile
+++ b/pkgtools/port2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/06/17 03:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:18 jlam Exp $
#
DISTNAME= port2pkg-1.11
@@ -13,12 +13,11 @@ COMMENT= Convert from a FreeBSD port to a NetBSD package
DEPENDS+= pkglint-[0-9]*:../../pkgtools/pkglint
WRKSRC= ${WRKDIR}
-USE_PERL5= YES
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
NO_CONFIGURE= yes
-USE_TOOLS+= gtar
+USE_TOOLS+= gtar perl:run
.include "../../mk/bsd.prefs.mk"
diff --git a/pkgtools/revbump/Makefile b/pkgtools/revbump/Makefile
index 60e106e6785..1d76774db67 100644
--- a/pkgtools/revbump/Makefile
+++ b/pkgtools/revbump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:18 jlam Exp $
#
DISTNAME= revbump-1.0
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_CONFIGURE= yes
-USE_PERL5= run
+USE_TOOLS+= perl:run
USE_LANGUAGES= # empty
INSTALLATION_DIRS= bin man/man8
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 3eb46ee23eb..fb6c3ec8a71 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2005/07/15 20:14:03 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2005/07/16 01:19:18 jlam Exp $
DISTNAME= a2ps-4.13b
PKGNAME= a2ps-4.13.0.2
@@ -19,10 +19,9 @@ DEPENDS+= psutils>=1.17:../../print/psutils
WRKSRC= ${WRKDIR}/a2ps-4.13
STRIP= # empty
-USE_PERL5= yes
USE_LIBTOOL= yes
-USE_TOOLS+= file:run gmake mktemp:run
+USE_TOOLS+= file:run gmake mktemp:run perl:run
CONFIGURE_ENV+= file_prog=${FILE_CMD:Q}
USE_PKGINSTALL= YES
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index de9bece9dd7..be3d261d379 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:09 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/16 01:19:18 jlam Exp $
DISTNAME= lyx-${LYX_VERS}
PKGNAME= cjk-${DISTNAME}
@@ -25,7 +25,7 @@ DEPENDS+= teTeX-bin>=1.0.7nb1:../../print/teTeX-bin
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
-USE_PERL5= yes
+USE_TOOLS+= perl:run
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/print/cupsomatic/Makefile b/print/cupsomatic/Makefile
index da8b40b4d9e..b2210f08764 100644
--- a/print/cupsomatic/Makefile
+++ b/print/cupsomatic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:18 jlam Exp $
DISTNAME= cupsomatic
PKGNAME= ${DISTNAME}-2.2
@@ -31,7 +31,7 @@ DEPENDS+= cups>=1.1.14nb1:../../print/cups
DEPENDS+= foomatic-gswrapper>=1.2:../../print/foomatic-gswrapper
DEPENDS+= mpage-[0-9]*:../../print/mpage
-USE_PERL5= yes
+USE_TOOLS+= perl:run
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME}
FILTERDIR= ${PREFIX}/libexec/cups/filter
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 50b86c61c2c..95d77c00623 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/22 20:08:27 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:18 jlam Exp $
DISTNAME= foomatic-filters-3.0.2
CATEGORIES= print
@@ -25,8 +25,7 @@ CONFIGURE_ENV+= CUPS=${LOCALBASE}/share/cups
CONFIGURE_ENV+= CUPS_FILTERS=${LOCALBASE}/lib/cups/filter
CONFIGURE_ENV+= PRINTCAP=/etc/printcap
-USE_TOOLS+= gmake
-USE_PERL5= yes
+USE_TOOLS+= gmake perl:run
USE_PKGINSTALL= yes
PERL5_REQD= 5.6
INSTALL_TARGET= install-bin install-man
diff --git a/print/foomatic-gswrapper/Makefile b/print/foomatic-gswrapper/Makefile
index 727ce8b484f..6809999fae5 100644
--- a/print/foomatic-gswrapper/Makefile
+++ b/print/foomatic-gswrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/16 01:19:18 jlam Exp $
DISTNAME= foomatic-gswrapper
PKGNAME= foomatic-gswrapper-1.2
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}
DIST_SUBDIR= ${PKGNAME_NOREV}
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME}
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
NO_BUILD= # defined
REPLACE_PERL= ${DISTNAME}
diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile
index 724584343d4..f5f45f446a4 100644
--- a/print/html2ps/Makefile
+++ b/print/html2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/08 19:23:28 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:18 jlam Exp $
#
DISTNAME= html2ps-1.0b4
@@ -17,7 +17,7 @@ DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
DEPENDS+= teTeX-bin>=1.0.6:../../print/teTeX3-bin
DEPENDS+= weblint-[0-9]*:../../www/weblint
-USE_PERL5= yes
+USE_TOOLS+= perl:run
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/print/if-psprint/Makefile b/print/if-psprint/Makefile
index 018a390bc14..a165e0a5e20 100644
--- a/print/if-psprint/Makefile
+++ b/print/if-psprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:18 jlam Exp $
#
DISTNAME= if-psprint-1.7
@@ -12,7 +12,7 @@ COMMENT= Print text or postscript to arbitrary printer, can use smb
DEPENDS+= enscript>=1.6.3nb1:../../print/enscript
-USE_PERL5= YES
+USE_TOOLS+= perl:run
INSTALLATION_DIRS= libexec man/man1
diff --git a/print/ja-a2ps/Makefile b/print/ja-a2ps/Makefile
index 82c3f33da57..4cd7399325f 100644
--- a/print/ja-a2ps/Makefile
+++ b/print/ja-a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:18 jlam Exp $
DISTNAME= a2ps.pl-1.45
PKGNAME= ja-a2ps-1.45
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org
COMMENT= Text file to postscript converter (with Japanese support)
WRKSRC= ${WRKDIR}
-USE_PERL5= YES
+USE_TOOLS+= perl:run
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} .
NO_BUILD= yes
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index f0805854230..25113555ef8 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/07/16 01:19:18 jlam Exp $
DISTNAME= psutils-p17
PKGNAME= psutils-1.17
@@ -13,7 +13,7 @@ COMMENT= Utilities for manipulating PostScript documents
DEPENDS+= papersize-[0-9]*:../../print/papersize
WRKSRC= ${WRKDIR}/psutils
-USE_PERL5= yes
+USE_TOOLS+= perl:run
USE_PKGINSTALL= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/print/yup/Makefile b/print/yup/Makefile
index 449efd6d1f6..19b374a4b9b 100644
--- a/print/yup/Makefile
+++ b/print/yup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/05/29 16:35:15 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:18 jlam Exp $
#
DISTNAME= yup-r1-rel
@@ -12,7 +12,7 @@ COMMENT= Print multiple PostScript/ASCII pages per sheet
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
WRKSRC= ${WRKDIR}/yup-r1
NO_CONFIGURE= # defined
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 4bd3efc52f3..01219acab26 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:31 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:18 jlam Exp $
DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL}
PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -37,7 +37,7 @@ CONFLICTS+= amavis-perl-[0-9]*
.include "../../mk/bsd.prefs.mk"
-USE_PERL5= yes
+USE_TOOLS+= perl:run
PERL5_REQD= 5.8.2
REPLACE_PERL+= amavisd amavisd-nanny
diff --git a/security/antonym/Makefile b/security/antonym/Makefile
index 68a6cd88c47..9e4c2324d5a 100644
--- a/security/antonym/Makefile
+++ b/security/antonym/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/17 03:50:31 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:18 jlam Exp $
#
DISTNAME= antonym-1.9
@@ -13,9 +13,9 @@ DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
DEPENDS+= pgp-2.*:../../security/pgp2
WRKSRC= ${WRKDIR}/antonym
-USE_PERL5= yes
-
+USE_TOOLS+= perl:run
REPLACE_PERL= antonym
+
PKG_INSTALLATION_TYPES= overwrite pkgviews
INSTALLATION_DIRS= bin
diff --git a/security/apg/Makefile b/security/apg/Makefile
index f3f4f835bd2..65a9a8ff143 100644
--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/27 10:32:01 zuntum Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:18 jlam Exp $
#
DISTNAME= apg-2.2.3
@@ -11,7 +11,7 @@ COMMENT= Tool set for random password generation
MAKE_ENV+= FLAGS="${CFLAGS}" INSTALL_PREFIX="${PREFIX}"
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= perl/apgcli.pl
OPSYSVARS+= CS_LIBS
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 43b12cc45c0..240ca5d5650 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/24 17:31:28 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:19 jlam Exp $
.include "Makefile.common"
@@ -17,11 +17,10 @@ CONFLICTS+= courier-authldap-[0-9]*
CONFLICTS+= courier-authmysql-[0-9]*
CONFLICTS+= courier-authpgsql-[0-9]*
-USE_TOOLS+= cat gmake
+USE_TOOLS+= cat gmake perl:run
USE_LIBTOOL= yes
PKG_SYSCONFSUBDIR= authlib
-USE_PERL5= run
REPLACE_PERL= sysconftool
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
diff --git a/security/gpg2dot/Makefile b/security/gpg2dot/Makefile
index 7ea80da0dc4..a3e46120074 100644
--- a/security/gpg2dot/Makefile
+++ b/security/gpg2dot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:31 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:18 jlam Exp $
#
DISTNAME= gpg2dot-1.4
@@ -11,7 +11,7 @@ HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
COMMENT= Converts your GnuPG keyring to a graph of associations
USE_LANGUAGES= # empty
-USE_PERL5= YES
+USE_TOOLS+= perl:run
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
diff --git a/security/hackbot/Makefile b/security/hackbot/Makefile
index 863bfae56fe..1d5313b623d 100644
--- a/security/hackbot/Makefile
+++ b/security/hackbot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/17 03:50:32 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:19 jlam Exp $
DISTNAME= hackbot-2.15
CATEGORIES= security net
@@ -13,7 +13,7 @@ COMMENT= Vulnerability scanner written in Perl
WRKSRC= ${WRKDIR}/hackbot
MANCOMPRESSED= YES
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= hackbot.pl
INSTALLATION_DIRS= bin man/man1
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 60f5e55af32..e1dd5a774b4 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:30 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:19 jlam Exp $
DISTNAME= mhash-0.9.2
CATEGORIES= security devel
@@ -9,9 +9,8 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://mhash.sourceforge.net/
COMMENT= Hash algorithms library
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_LIBTOOL= yes
-USE_PERL5= build
GNU_CONFIGURE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/security/msf/Makefile b/security/msf/Makefile
index 67fa5acb90f..86cd9b3f5ac 100644
--- a/security/msf/Makefile
+++ b/security/msf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/02 12:12:33 adrianp Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:19 jlam Exp $
#
DISTNAME= framework-2.4
@@ -22,7 +22,7 @@ MSFDOC?= ${PREFIX}/share/doc/msf
MESSAGE_SUBST+= MSFDIR=${MSFDIR}
PERL5_REQD= 5.6.0
-USE_PERL5= YES
+USE_TOOLS+= perl:run
PERL_FILES= msfcli msfconsole msfencode msflogdump msfpayload \
msfpescan msfweb msfupdate msfelfscan
REPLACE_PERL+= ${PERL_FILES} tools/socketNinja.pl sdk/formatGen.pl \
diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index 94c4050b00f..9710956de47 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/02 11:30:01 adrianp Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:19 jlam Exp $
DISTNAME= nikto-1.35
CATEGORIES= security www
@@ -11,7 +11,7 @@ COMMENT= URL scanner used to search for known vulnerable CGIs on websites
DEPENDS+= p5-Net-SSLeay>=1.20:../../security/p5-Net-SSLeay
DEPENDS+= nmap>=2.00:../../net/nmap
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= nikto.pl
NO_BUILD= YES
USE_PKGINSTALL= YES
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index fc9467f1c06..d948d1c9661 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/06/01 20:08:01 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:19 jlam Exp $
# NOTE: This package is modeled on ../openssh, but does not share
# files with it as that package may update faster than the gssapi
@@ -31,8 +31,6 @@ CONFLICTS+= ssh-[0-9]* ssh6-[0-9]* ssh2-[0-9]*
CONFLICTS+= openssh-[0-9]*
CONFLICTS+= lsh>2.0
-USE_PERL5= build
-
CRYPTO= yes
KERBEROS= yes
@@ -57,7 +55,7 @@ MANDIR= man
PLIST_SUBST+= MANDIR=${MANDIR}
USE_PKGINSTALL= yes
-USE_TOOLS+= autoconf
+USE_TOOLS+= autoconf perl
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --mandir=${PREFIX}/${MANDIR}
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 3089422956f..82f8794988e 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.151 2005/05/25 23:17:11 reed Exp $
+# $NetBSD: Makefile,v 1.152 2005/07/16 01:19:19 jlam Exp $
DISTNAME= openssh-3.9p1
PKGNAME= openssh-3.9.1
@@ -24,7 +24,7 @@ CONFLICTS+= ssh2-[0-9]* ssh2-nox11-[0-9]*
CONFLICTS+= openssh+gssapi-[0-9]*
CONFLICTS+= lsh>2.0
-USE_PERL5= build
+USE_TOOLS+= perl
CRYPTO= yes
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index db5a1188da6..c26187215ea 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2005/06/11 22:16:15 jlam Exp $
+# $NetBSD: Makefile,v 1.106 2005/07/16 01:19:18 jlam Exp $
OPENSSL_SNAPSHOT?= # empty
OPENSSL_STABLE?= # empty
@@ -39,9 +39,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
.include "../../mk/bsd.prefs.mk"
.include "../../mk/compiler.mk"
-USE_PERL5= build # perl is used throughout the build
USE_PKGINSTALL= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
TEST_TARGET= tests
HAS_CONFIGURE= yes
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 2c62e296e8f..94f7d274269 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/20 12:25:34 agc Exp $
+# $NetBSD: Makefile,v 1.24 2005/07/16 01:19:19 jlam Exp $
#
DISTNAME= pgp50i-unix-src
@@ -17,7 +17,7 @@ MAINTAINER= mjl@NetBSD.org
HOMEPAGE= http://www.pgpi.com/
COMMENT= Public-key encryption and digital signature utilities (v5)
-USE_PERL5= build
+USE_TOOLS+= perl
CONFLICTS= pgraf-[0-9]* # Both have a `pgps' executable
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index 65cd25bc11d..e37f4c90e79 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:19 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:19 jlam Exp $
#
DISTNAME= sfs-0.7.2
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --disable-uvfs
USE_PKGINSTALL= yes
USE_LANGUAGES= c c++
-USE_PERL5= yes
+USE_TOOLS+= perl:run
GCC_REQD+= 2.95.3
diff --git a/security/skey/Makefile b/security/skey/Makefile
index b63b1268cec..bd91aa9a112 100644
--- a/security/skey/Makefile
+++ b/security/skey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/30 04:06:39 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:19 jlam Exp $
#
DISTNAME= skey-1.1.5
@@ -11,8 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= ${MASTER_SITES}
COMMENT= Port of OpenBSD s/key implementation
-USE_PERL5= build
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
GNU_CONFIGURE= yes
USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index 4998727f592..5c2880e56ed 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:32 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:19 jlam Exp $
#
DISTNAME= SnortSnarf-050314.1
@@ -13,8 +13,8 @@ COMMENT= Generate HTML report summaries from snort incident alerts
DEPENDS+= p5-Time>=101.062101:../../time/p5-Time
NO_BUILD= YES
-USE_PERL5= run
+USE_TOOLS+= perl:run
REPLACE_PERL= snortsnarf.pl include/ann_xml.pl include/web_utils.pl \
include/xml_help.pl
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index 07c2f3a3c7e..d534f1cf060 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:33 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/16 01:19:19 jlam Exp $
DISTNAME= tinyca-0.6.8
CATEGORIES= security
@@ -15,10 +15,11 @@ DEPENDS+= p5-gettext-[0-9]*:../../devel/p5-gettext
DEPENDS+= zip-[0-9]*:../../archivers/zip
NO_BUILD= YES
-USE_PERL5= YES
CADIR= ${PREFIX}/share/tinyca
+USE_TOOLS+= perl:run
REPLACE_PERL= tinyca
+
BUILDLINK_DEPENDS.openssl+= openssl>=0.9.7d
SUBST_CLASSES+= script
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 2002582a532..885f24c287c 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:31 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:19 jlam Exp $
DISTNAME= zebedee-2.5.2
CATEGORIES= security
@@ -10,8 +10,7 @@ COMMENT= Simple tunneling program for TCP or UDP with encryption
DEPENDS+= tcl-[0-9]*:../../lang/tcl
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
MAKE_ENV+= PERL5=${PERL5}
MAKE_FLAGS= OS=${LOWER_OPSYS}
diff --git a/shells/xsh/Makefile b/shells/xsh/Makefile
index 2c8355c0f68..c1470f6ffef 100644
--- a/shells/xsh/Makefile
+++ b/shells/xsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/13 18:01:40 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/16 01:19:20 jlam Exp $
DISTNAME= XML-XSH-1.8.2
PKGNAME= ${DISTNAME:S/XML-XSH/xsh/}
@@ -16,7 +16,6 @@ DEPENDS+= p5-XML-LibXML-Iterator-[0-9]*:../../textproc/p5-XML-LibXML-Iterator
DEPENDS+= p5-XML-NodeFilter-[0-9]*:../../textproc/p5-XML-NodeFilter
DEPENDS+= p5-XML-LibXML-XPathContext-[0-9]*:../../textproc/p5-XML-LibXML-XPathContext
-USE_PERL5= yes
USE_TOOLS+= gmake
PKG_SHELL= ${PREFIX}/bin/xsh
diff --git a/sysutils/adjustkernel/Makefile b/sysutils/adjustkernel/Makefile
index 547e325bda9..3bf270bd4e5 100644
--- a/sysutils/adjustkernel/Makefile
+++ b/sysutils/adjustkernel/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/16 01:19:20 jlam Exp $
DISTNAME= adjustkernel-1.7
CATEGORIES= sysutils
@@ -13,8 +13,7 @@ NO_CHECKSUM= yes
NO_BUILD= yes
NO_MTREE= yes
-USE_PERL5= YES
-
+USE_TOOLS+= perl:run
REPLACE_PERL= adjustkernel
INSTALLATION_DIRS= bin man/man1
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index eec25c600ba..4f87ea6d68d 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:31 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/07/16 01:19:20 jlam Exp $
PKGNAME= amanda-server-${VERS}
# PKGREVISION= 1
@@ -6,8 +6,7 @@ SVR4_PKGNAME= amase
COMMENT= Server part of Amanda, a network backup system
-USE_PERL5= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
.include "../../mk/bsd.prefs.mk"
.include "../../sysutils/amanda-common/Makefile.common"
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
index f86599d7b81..69bf3bf3250 100644
--- a/sysutils/cdbkup/Makefile
+++ b/sysutils/cdbkup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/15 23:02:08 kristerw Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:20 jlam Exp $
DISTNAME= cdbkup-1.0
PKGREVISION= 3
@@ -16,8 +16,7 @@ COMMENT= CD-R(W) backup/restore system
DEPENDS+= cdrecord>=1.10:../../sysutils/cdrecord
GNU_CONFIGURE= YES
-USE_PERL5= YES
-USE_TOOLS+= cat date gtar
+USE_TOOLS+= cat date gtar perl:run
CONFIGURE_ENV+= CAT="${TOOLS_CAT}"
CONFIGURE_ENV+= DATE="${TOOLS_DATE}"
CONFIGURE_ENV+= GNUTAR="${TOOLS_TAR}"
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 2afc8a0057b..69374ff7d65 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:47:23 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:20 jlam Exp $
DISTNAME= coreutils-5.2.1
PKGREVISION= 1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= YES
CONFLICTS= fileutils-* linuxls-* sh-utils-* textutils-*
GNU_CONFIGURE= YES
-USE_PERL5= build
+USE_TOOLS+= perl
USE_PKGLOCALEDIR= YES
INFO_FILES= coreutils.info
diff --git a/sysutils/cpogm/Makefile b/sysutils/cpogm/Makefile
index e8c267dc7c3..015a0ff2ddd 100644
--- a/sysutils/cpogm/Makefile
+++ b/sysutils/cpogm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/03 15:15:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/16 01:19:20 jlam Exp $
#
DISTNAME= cpogm-1.0
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.gw.com/pub/people/kim/
MAINTAINER= kim@tac.nyc.ny.us
COMMENT= Copy owner, group and mode of a file
-USE_PERL5= yes
+USE_TOOLS+= perl:run
NO_CONFIGURE= yes
BUILD_TARGET= all PREFIX=${PREFIX}
diff --git a/sysutils/dmassage/Makefile b/sysutils/dmassage/Makefile
index 3192a1b911d..8f325e411f2 100644
--- a/sysutils/dmassage/Makefile
+++ b/sysutils/dmassage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/06/07 18:36:13 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:20 jlam Exp $
#
DISTNAME= dmassage-0.6
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
ONLY_FOR_PLATFORM= NetBSD-*-* OpenBSD-*-*
NO_BUILD= yes
-USE_PERL5= run
+USE_TOOLS+= perl:run
REPLACE_PERL= dmassage
INSTALLATION_DIRS= bin share/doc/${PKGBASE}
@@ -23,5 +23,4 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/dmassage ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PKGBASE}
-.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dmesg2gif/Makefile b/sysutils/dmesg2gif/Makefile
index ba434ac9cde..c1c80fb6fe9 100644
--- a/sysutils/dmesg2gif/Makefile
+++ b/sysutils/dmesg2gif/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/16 01:19:20 jlam Exp $
#
DISTNAME= dmesg2gif-1.3
@@ -16,7 +16,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= yes
NO_CHECKSUM= yes
NO_CONFIGURE= yes
-USE_PERL5= run
+USE_TOOLS+= perl:run
INSTALLATION_DIRS= bin man/man1
do-install:
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 294e7745440..0f9d768cd18 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:22 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:20 jlam Exp $
#
DISTNAME= lavaps-1.20
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
COMMENT= Lava lamp of currently running processes
-USE_PERL5= build
+USE_TOOLS+= perl
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --with-additional-includes='-I${LOCALBASE}/include' \
diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index ca1c79365d2..7a80110652b 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:33 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:20 jlam Exp $
DISTNAME= libgtop-2.10.1
PKGNAME= ${DISTNAME:S/-/2-/}
@@ -15,9 +15,8 @@ BUILD_USES_MSGFMT= YES
OSVERSION_SPECIFIC= YES
USE_MSGFMT_PLURALS= YES
-USE_PERL5= build
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libgtop-2.0.pc.in
PKGCONFIG_OVERRIDE+= support/gnome-support-2.0.pc.in
diff --git a/sysutils/mgm/Makefile b/sysutils/mgm/Makefile
index 25c410a545a..d6484c381f2 100644
--- a/sysutils/mgm/Makefile
+++ b/sysutils/mgm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:34 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:20 jlam Exp $
DISTNAME= mgm-1.1
CATEGORIES= sysutils
@@ -13,7 +13,7 @@ DEPENDS+= p5-Tk-[0-9]*:../../x11/p5-Tk
WRKSRC= ${WRKDIR}/${DISTNAME:C/-.*$//}
NO_BUILD= # defined
-USE_PERL5= YES
+USE_TOOLS+= perl:run
PERL_SCRIPTS= mgm
MGM_PERL_DIR= ${PREFIX}/lib/${DISTNAME:C/-.*$//}
diff --git a/sysutils/pflogsumm/Makefile b/sysutils/pflogsumm/Makefile
index 99e7a40c34b..b6285894c04 100644
--- a/sysutils/pflogsumm/Makefile
+++ b/sysutils/pflogsumm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:34 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:20 jlam Exp $
#
DISTNAME= pflogsumm-1.1.0
@@ -14,7 +14,7 @@ DEPENDS+= p5-Date-Calc-[0-9]*:../../devel/p5-Date-Calc
.include "../../mk/bsd.prefs.mk"
NO_CONFIGURE= # defined
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
INSTALLATION_DIRS= man/man1 sbin
do-build:
diff --git a/sysutils/rconfig/Makefile b/sysutils/rconfig/Makefile
index d75a459e124..fc86b3af28e 100644
--- a/sysutils/rconfig/Makefile
+++ b/sysutils/rconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/12/22 14:50:30 abs Exp $
+# $NetBSD: Makefile,v 1.31 2005/07/16 01:19:20 jlam Exp $
DISTNAME= rconfig-0.42
CATEGORIES= sysutils
@@ -13,6 +13,6 @@ DEPENDS+= fping-[0-9]*:../../net/fping
DEPENDS+= freerdist-[0-9]*:../../net/rdist6
DEPENDS+= shmux-[0-9]*:../../sysutils/shmux
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/roller/Makefile b/sysutils/roller/Makefile
index c0a5f47f729..e5b495e5ce6 100644
--- a/sysutils/roller/Makefile
+++ b/sysutils/roller/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/01/20 09:11:18 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/07/16 01:19:20 jlam Exp $
#
DISTNAME= roller-1.19
@@ -17,7 +17,7 @@ DEPENDS+= pflogsumm-[0-9]*:../../sysutils/pflogsumm
.include "../../mk/bsd.prefs.mk"
NO_CONFIGURE= # defined
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
MAKE_PARAMS+= PREFIX=${PREFIX}
MAKE_PARAMS+= GAWK=${AWK}
diff --git a/sysutils/rox-archive/Makefile b/sysutils/rox-archive/Makefile
index 755a35f15d7..04fbf498bf5 100644
--- a/sysutils/rox-archive/Makefile
+++ b/sysutils/rox-archive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:23 jlam Exp $
#
DISTNAME= Archive-0.1.2
@@ -18,7 +18,7 @@ DEPENDS+= rox-lib>=0.1.4nb1:../../sysutils/rox-lib
WRKSRC= ${WRKDIR}/Archive
DIST_SUBDIR= rox
-USE_PERL5= yes
+USE_TOOLS+= perl:run
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile
index 776bbc60382..5e6e4266aba 100644
--- a/sysutils/rsnapshot/Makefile
+++ b/sysutils/rsnapshot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/17 03:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:23 jlam Exp $
#
DISTNAME= rsnapshot-1.1.6
@@ -14,7 +14,7 @@ DEPENDS+= rsync>=2.3.1:../../net/rsync
DEPENDS+= p5-Lchown>=0.07:../../sysutils/p5-Lchown
GNU_CONFIGURE= yes
-USE_PERL5= yes
+USE_TOOLS+= perl:run
USE_PKGINSTALL= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/safetynet/Makefile b/sysutils/safetynet/Makefile
index 99b1afb1a25..9baf7c7f5b0 100644
--- a/sysutils/safetynet/Makefile
+++ b/sysutils/safetynet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:23 jlam Exp $
#
DISTNAME= safetynet-1.15
@@ -11,7 +11,7 @@ COMMENT= Safetynet is a perl script intended to monitor system services
WRKSRC= ${WRKDIR}
NO_BUILD= YES
-USE_PERL5= YES
+USE_TOOLS+= perl:run
INSTALLATION_DIRS= bin etc
diff --git a/sysutils/sarah/Makefile b/sysutils/sarah/Makefile
index aae6c9421fd..dd5d8118a75 100644
--- a/sysutils/sarah/Makefile
+++ b/sysutils/sarah/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:23 jlam Exp $
DISTNAME= sarah-0.7b
CATEGORIES= sysutils
@@ -14,7 +14,7 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= sarah
NO_BUILD= YES
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 40e5e3e8ec1..d9a9681cddf 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:30 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:23 jlam Exp $
DISTNAME= webmin-1.170-minimal
PKGNAME= ${DISTNAME:S/-minimal$//}
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_LANGUAGES= # empty
NO_BUILD= yes
-USE_PERL5= yes
+USE_TOOLS+= perl:run
REPLACE_PERL= *.cgi */*.cgi *.pl */*.pl
WEBMIN_DIR= ${PREFIX}/${WEBMIN_SUBDIR}
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index f548f933f4d..7dce7a248a4 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:34 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/07/16 01:19:23 jlam Exp $
DISTNAME= xps-4.2
CATEGORIES= sysutils
@@ -8,8 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://motif-pstree.sourceforge.net/
COMMENT= Displays the Unix process list as a hierarchical tree
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
GNU_CONFIGURE= yes
.include "../../mk/motif.buildlink3.mk"
diff --git a/textproc/btparse/Makefile b/textproc/btparse/Makefile
index eebe8fe66d0..636a6f89904 100644
--- a/textproc/btparse/Makefile
+++ b/textproc/btparse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:33 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:23 jlam Exp $
#
DISTNAME= btparse-0.33
@@ -11,7 +11,7 @@ COMMENT= BibTeX parsing library
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_PERL5= build
+USE_TOOLS+= perl
GNU_CONFIGURE= YES
BUILD_TARGET= lib
TEST_TARGET= test
diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile
index 159d47bfda3..22e05e96c8b 100644
--- a/textproc/cdif/Makefile
+++ b/textproc/cdif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/17 03:50:36 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:23 jlam Exp $
#
DISTNAME= cdif-1.15
@@ -12,7 +12,7 @@ COMMENT= Word context diff
LICENSE= no-commercial-use
WRKSRC= ${WRKDIR}
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
NO_CONFIGURE= # defined
NO_BUILD= # defined
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index 3fe55d484d1..520fe4aff80 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/07/15 18:27:53 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/07/16 01:19:23 jlam Exp $
DISTNAME= eb-4.1.3
CATEGORIES= textproc japanese
@@ -52,10 +52,9 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PKGINSTALL= YES
-USE_TOOLS+= gmake gtar
+USE_TOOLS+= gmake gtar perl
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-USE_PERL5= build
CONFIGURE_ARGS+= --with-zlib
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/textproc/freepwing/Makefile b/textproc/freepwing/Makefile
index ab535501f68..22e8de45709 100644
--- a/textproc/freepwing/Makefile
+++ b/textproc/freepwing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/08 21:35:03 kristerw Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:23 jlam Exp $
DISTNAME= freepwing-1.4.4
PKGREVISION= 2
@@ -14,7 +14,6 @@ DEPENDS+= p5-Jcode-[0-9]*:../../converters/p5-Jcode
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-pkgdocdir=${PREFIX}/share/doc/freepwing
CONFIGURE_ENV+= GNUMAKE="${GMAKE}"
-USE_TOOLS+= gmake
-USE_PERL5= yes
+USE_TOOLS+= gmake perl:run
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 56c4eb535ff..d33ae3a6a2a 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/06/24 20:53:20 kristerw Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:24 jlam Exp $
#
DISTNAME= groff-1.19.1
@@ -16,7 +16,7 @@ DEPENDS+= psutils>=1.17:../../print/psutils
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PERLPATH="${PERL5}"
-USE_PERL5= YES
+USE_TOOLS+= perl:run
INFO_FILES= groff
diff --git a/textproc/ispell-german/Makefile b/textproc/ispell-german/Makefile
index 071afd46c0e..929e80a144a 100644
--- a/textproc/ispell-german/Makefile
+++ b/textproc/ispell-german/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/16 01:19:24 jlam Exp $
#
DISTNAME= igerman98-20030222
@@ -14,8 +14,7 @@ COMMENT= German dictionary for interactive spelling checker
DEPENDS+= ispell-base>=3.1.20nb1:../../textproc/ispell-base
BUILD_TARGET= german.hash
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
REPLACE_PERL= bin/dic2iso.pl bin/grepl bin/sq.pl bin/myspellfixprefix.pl \
bin/clear_affix.pl bin/unsq.pl bin/uniqflag.pl
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index d156f7d08e2..540ff6e090f 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/01/06 03:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/16 01:19:24 jlam Exp $
DISTNAME= latex2html-2002-2-1
PKGNAME= latex2html-2002.2.1
@@ -13,7 +13,7 @@ COMMENT= LaTeX to HTML converter
DEPENDS+= teTeX-bin>=1.0.6:../../print/teTeX-bin
DEPENDS+= netpbm>=9.7nb1:../../graphics/netpbm
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
GNU_CONFIGURE= # defined
.include "../../mk/bsd.prefs.mk"
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index 93f9bd3bf06..c728f1aa3eb 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/22 20:28:47 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:24 jlam Exp $
DISTNAME= libpathan-1.2-2-src
PKGNAME= ${DISTNAME:S/-2-src/.2/}
@@ -14,9 +14,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${DISTNAME:S/-2-src//}
GNU_CONFIGURE= YES
-USE_TOOLS+= bison gmake
+USE_TOOLS+= bison gmake perl
USE_LIBTOOL= YES
-USE_PERL5= build
USE_LANGUAGES= c++
CONFIGURE_ARGS+= XERCESCROOT=${LOCALBASE}
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 7f48fe020f0..a8901c81f66 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2005/05/22 20:08:35 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2005/07/16 01:19:24 jlam Exp $
DISTNAME= libxslt-1.1.14
PKGNAME= ${DISTNAME}
@@ -12,9 +12,8 @@ COMMENT= XSLT parser library from the GNOME project
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_LIBTOOL= yes
-USE_PERL5= build
PKGCONFIG_OVERRIDE= libxslt.pc.in
PKGCONFIG_OVERRIDE+= libexslt.pc.in
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index f31efc42ba5..118dbfe03b9 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:35 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:24 jlam Exp $
#
DISTNAME= openjade-1.3.2
@@ -10,8 +10,7 @@ MAINTAINER= kogule@mars.dti.ne.jp
HOMEPAGE= http://openjade.sourceforge.net/
COMMENT= SGML/XML parser toolkit and DSSSL engine, successor to "jade"
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 463fef1eb72..fc9d41825f7 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:24 jlam Exp $
#
DISTNAME= OpenSP-1.5.1
@@ -14,7 +14,7 @@ COMMENT= SGML parser, successor to "sp"
CONFLICTS+= sp-[0-9]*
BUILD_USES_MSGFMT= yes
-USE_PERL5= build
+USE_TOOLS+= perl
USE_LIBTOOL= yes
PTHREAD_OPTS+= require
USE_PKGLOCALEDIR= yes
diff --git a/textproc/postgresql-autodoc/Makefile b/textproc/postgresql-autodoc/Makefile
index 23c2412c4b8..8c5fff560ff 100644
--- a/textproc/postgresql-autodoc/Makefile
+++ b/textproc/postgresql-autodoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/08 21:28:15 kristerw Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:24 jlam Exp $
#
DISTNAME= postgresql_autodoc-1.24
@@ -14,8 +14,7 @@ DEPENDS= p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql
DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
WRKSRC= ${WRKDIR}/postgresql_autodoc
-USE_PERL5= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datadir=${PREFIX}/share/${PKGBASE}
CONFIGURE_ENV+= ac_cv_path_PERL=${PERL5}
diff --git a/textproc/rfcutil/Makefile b/textproc/rfcutil/Makefile
index 14fed443c95..d8553cf7e66 100644
--- a/textproc/rfcutil/Makefile
+++ b/textproc/rfcutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/17 03:50:37 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:24 jlam Exp $
#
DISTNAME= rfc-3.2
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}
EXTRACT_ONLY= #
NO_BUILD= YES
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= rfc
INSTALLATION_DIRS= bin
diff --git a/textproc/troffcvt/Makefile b/textproc/troffcvt/Makefile
index f461bddddd5..71c62dd411b 100644
--- a/textproc/troffcvt/Makefile
+++ b/textproc/troffcvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/17 03:50:37 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:24 jlam Exp $
#
DISTNAME= troffcvt-1.04
@@ -10,7 +10,7 @@ MAINTAINER= ben@NetBSD.org
HOMEPAGE= ${MASTER_SITES}
COMMENT= Troff/groff to RTF/HTML/TEXT converter
-USE_PERL5= yes
+USE_TOOLS+= perl:run
INSTALL_TARGET= install install.man
INSTALLATION_DIRS= bin man/man1
diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index a622e923558..b6bcf832420 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/06/01 18:03:24 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/07/16 01:19:24 jlam Exp $
#
DISTNAME= AfterStep-2.00.01
@@ -14,8 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
-USE_PERL5= run
+USE_TOOLS+= gmake perl:run
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index 3f3537cb83d..db5c7c3755c 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/06/01 18:03:24 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/07/16 01:19:24 jlam Exp $
DISTNAME= enlightenment-0.16.7.2
CATEGORIES= x11 gnome wm
@@ -8,8 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.enlightenment.org/
COMMENT= Highly themeable and configurable window manager
-USE_TOOLS+= bison
-USE_PERL5= YES
+USE_TOOLS+= bison perl:run
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-fsstd
diff --git a/wm/fvwm2-themes/Makefile b/wm/fvwm2-themes/Makefile
index 952cb1ae6b2..3a2b9665bdc 100644
--- a/wm/fvwm2-themes/Makefile
+++ b/wm/fvwm2-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:25 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:24 jlam Exp $
#
DISTNAME= fvwm-themes-${THEM_VER}
@@ -19,7 +19,7 @@ DEPENDS+= {fvwm2,fvwm-devel}>=2.4.8:../../wm/fvwm2
THEM_VER= 0.6.2
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-USE_PERL5= YES
+USE_TOOLS+= perl:run
USE_X11BASE= YES
GNU_CONFIGURE= YES
diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile
index 4732a02fc00..09bf8bbd4c1 100644
--- a/wm/pekwm/Makefile
+++ b/wm/pekwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:25 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:24 jlam Exp $
#
DISTNAME= pekwm-0.1.3
@@ -12,8 +12,7 @@ HOMEPAGE= http://pekwm.org/
COMMENT= Window manager based on aewm++
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
-USE_PERL5= run
+USE_TOOLS+= gmake perl:run
USE_PKGINSTALL= YES
USE_LANGUAGES+= c++
@@ -38,6 +37,5 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
.undef f
-.include "../../lang/perl5/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile
index 78b70cb4bfd..a3f1328deb3 100644
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:25 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:24 jlam Exp $
#
DISTNAME= waimea-0.4.0
@@ -11,8 +11,7 @@ HOMEPAGE= http://www.waimea.org/
COMMENT= Fast and highly customizable virtual window manager
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
-USE_PERL5= run
+USE_TOOLS+= gmake perl:run
.include "../../mk/bsd.prefs.mk"
@@ -39,5 +38,4 @@ REPLACE_PERL = \
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/imlib2/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/SpeedyCGI/Makefile b/www/SpeedyCGI/Makefile
index f696723a10a..666a5b108ad 100644
--- a/www/SpeedyCGI/Makefile
+++ b/www/SpeedyCGI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/13 18:01:45 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:24 jlam Exp $
DISTNAME= CGI-SpeedyCGI-2.22
PKGNAME= SpeedyCGI-2.22
@@ -9,8 +9,6 @@ MAINTAINER= adrianp@stindustries.net
HOMEPAGE= http://daemoninc.com/speedycgi/
COMMENT= Speed up perl scripts by running them persistently
-USE_PERL5= YES
-
PERL5_PACKLIST= auto/CGI/SpeedyCGI/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 75c97a4d735..16668964890 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/06/17 03:50:39 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2005/07/16 01:19:24 jlam Exp $
#
DISTNAME= adzap-20050504
@@ -13,7 +13,7 @@ COMMENT= Filter out animated ad banners from web pages
WRKSRC= ${WRKDIR}/adzap
NO_BUILD= # defined
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
INSTALLATION_DIRS= libexec
diff --git a/www/album/Makefile b/www/album/Makefile
index 1ef533e2c14..abe57b66b45 100644
--- a/www/album/Makefile
+++ b/www/album/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
MY_SCRIPT= album
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
REPLACE_PERL= ${MY_SCRIPT}
NO_CONFIGURE= YES
diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile
index 14e4a3c5be2..b6c6911a66d 100644
--- a/www/ap-jserv/Makefile
+++ b/www/ap-jserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:44 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/07/16 01:19:25 jlam Exp $
DISTNAME= ApacheJServ-1.1.2
PKGNAME= ap-jserv-1.1.2
@@ -12,9 +12,8 @@ COMMENT= Older Java Servlet engine for Apache Server
DEPENDS+= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}:../../www/apache
# yes, this needs _exactly_ version 2.0
DEPENDS+= jsdk-2.0:../../www/jsdk20
-USE_PERL5= build # for "apxs"
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/src/scripts/build/unix/ltconfig
GNU_CONFIGURE= yes
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
index 2c0b88b8b23..9c320a7328f 100644
--- a/www/apache/buildlink3.mk
+++ b/www/apache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/12/19 04:02:43 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2005/07/16 01:19:25 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+
@@ -20,7 +20,7 @@ BUILDLINK_DEPMETHOD.apache+= full
BUILDLINK_DEPMETHOD.apache?= build
.endif
-USE_PERL5?= build # for "apxs"
+USE_TOOLS+= perl # for "apxs"
APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs
.if defined(GNU_CONFIGURE)
diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk
index 86313e811f4..afa994f6ee0 100644
--- a/www/apache2/buildlink3.mk
+++ b/www/apache2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/12/18 08:42:12 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2005/07/16 01:19:25 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+
@@ -20,7 +20,7 @@ BUILDLINK_DEPMETHOD.apache+= full
. endif
.endif # APACHE_BUILDLINK3_MK
-USE_PERL5?= build # for "apxs"
+USE_TOOLS+= perl # for "apxs"
CONFIGURE_ENV+= APR_LIBTOOL=${LIBTOOL} # make apxs use the libtool we specify
MAKE_ENV+= APR_LIBTOOL=${LIBTOOL}
APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index ce15ebd827f..f97904cc63f 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:51 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:25 jlam Exp $
#
DISTNAME= awstats-6.3
@@ -13,13 +13,11 @@ COMMENT= Free real-time logfile analyzer to get advanced web statistics
DIST_SUBDIR= ${PKGNAME}
NO_BUILD= YES
-USE_PERL5= run
+USE_TOOLS+= perl:run
REPLACE_PERL= tools/*.pl \
wwwroot/cgi-bin/*.pl
-.include "../../lang/perl5/buildlink3.mk"
-
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/awstats
${INSTALL_SCRIPT_DIR} ${PREFIX}/awstats/bin
diff --git a/www/calamaris/Makefile b/www/calamaris/Makefile
index bcc966e3fd4..3aee40b07f8 100644
--- a/www/calamaris/Makefile
+++ b/www/calamaris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:40 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:25 jlam Exp $
#
DISTNAME= calamaris-2.58
@@ -9,7 +9,7 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://cord.de/tools/squid/calamaris/
COMMENT= Squid logfile analyzer
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= calamaris
NO_BUILD= YES
diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index 4307f75cbd2..8503ff9ba62 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,5 +1,5 @@
#
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:47:52 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:25 jlam Exp $
#
DISTNAME= cvsweb-3.0.5
@@ -20,7 +20,7 @@ DEPENDS+= rcs-[0-9]*:../../devel/rcs
.endif
NO_BUILD= YES
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
USE_PKGINSTALL= YES
PERL5_REQD+= 5.6
diff --git a/www/htmlfix/Makefile b/www/htmlfix/Makefile
index abb39ccb2f4..5553cbf629c 100644
--- a/www/htmlfix/Makefile
+++ b/www/htmlfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:40 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:25 jlam Exp $
#
DISTNAME= htmlfix-1.03
@@ -10,7 +10,7 @@ COMMENT= Fix latin1 to html entities and/or line endings
DEPENDS+= p5-HTML-FixEntities-[0-9]*:../../www/p5-HTML-FixEntities
-USE_PERL5= YES
+USE_TOOLS+= perl:run
INSTALLATION_DIRS= bin man/man1
do-install:
diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile
index afb259f89b4..a51f5c252ce 100644
--- a/www/htmllint/Makefile
+++ b/www/htmllint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/17 04:49:49 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:25 jlam Exp $
#
DISTNAME= htmllint
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}
DIST_SUBDIR= ${PKGNAME_NOREV}
REPLACE_PERL= htmllint.cgi htmllint parsedtd.pl tagslist.cgi
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
NO_BUILD= # defined
CGIDIR= ${PREFIX}/libexec/cgi-bin
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 33df7601d23..a2e17a36587 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:45 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/07/16 01:19:25 jlam Exp $
#
DISTNAME= gateway-${KANNEL_VER}
@@ -14,8 +14,7 @@ COMMENT= Open source WAP and SMS gateway
KANNEL_VER= 1.4.0
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
-USE_PERL5= YES
+USE_TOOLS+= gmake perl:run
PTHREAD_OPTS+= require
CONFIGURE_ARGS+= --disable-docs
diff --git a/www/kdewebdev3/Makefile b/www/kdewebdev3/Makefile
index 706250b9287..528bf19e1a8 100644
--- a/www/kdewebdev3/Makefile
+++ b/www/kdewebdev3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/31 14:30:37 markd Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:25 jlam Exp $
DISTNAME= kdewebdev-${_KDE_VERSION}
CATEGORIES= www
@@ -6,8 +6,7 @@ COMMENT= HTML editor and tools suitable for experienced web developers
.include "../../meta-pkgs/kde3/Makefile.kde3"
-USE_PERL5= build
-
+USE_TOOLS+= perl
REPLACE_PERL= quanta/scripts/TemplateMagic.pl \
quanta/scripts/dwt.pl
diff --git a/www/make_album/Makefile b/www/make_album/Makefile
index d2b472f59e4..ee6b4c38bf2 100644
--- a/www/make_album/Makefile
+++ b/www/make_album/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:41 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:25 jlam Exp $
#
DISTNAME= make_album_1_6
@@ -15,7 +15,7 @@ DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
MY_SCRIPTS= index_albums ingest make_album newimagedir populate_master
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
REPLACE_PERL= ${MY_SCRIPTS}
NO_CONFIGURE= # defined
diff --git a/www/mknmz-wwwoffle/Makefile b/www/mknmz-wwwoffle/Makefile
index 0f145077647..f9621c8ce32 100644
--- a/www/mknmz-wwwoffle/Makefile
+++ b/www/mknmz-wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/22 04:14:24 martti Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:25 jlam Exp $
#
DISTNAME= mknmz-wwwoffle-0.7.0
@@ -12,7 +12,7 @@ COMMENT= Full text indexing and searching system for wwwoffle's cache directory
DEPENDS+= namazu>=2.0.5:../../textproc/namazu2
DEPENDS+= wwwoffle>=2.6:../../www/wwwoffle
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
GNU_CONFIGURE= # defined
CONFIG_ARGS+= --prefix=${PREFIX}/share/namazu
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 076d4c092c3..0ff8a184ac2 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.58 2005/06/03 14:41:19 wiz Exp $
+# $NetBSD: Makefile.common,v 1.59 2005/07/16 01:19:25 jlam Exp $
MOZ_DIST_VER?= ${MOZ_VER}
DISTNAME?= mozilla-${MOZ_DIST_VER}-source
@@ -15,8 +15,7 @@ BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
WRKSRC= ${WRKDIR}/mozilla
USE_LANGUAGES= c c++
-USE_PERL5= build
-USE_TOOLS+= autoconf213 gmake
+USE_TOOLS+= autoconf213 gmake perl
GNU_CONFIGURE= yes
CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 85a983cacbf..8b9509b74ef 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/13 18:01:45 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:25 jlam Exp $
#
DISTNAME= Apache-Gallery-0.9.1
@@ -21,7 +21,6 @@ DEPENDS+= p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template
DEPENDS+= p5-libapreq{,2}-[0-9]*:../../www/${LIBAPREQ}
USE_PKGINSTALL= YES
-USE_PERL5= run
PERL5_PACKLIST= auto/Apache/Gallery/.packlist
.include "../../mk/bsd.prefs.mk"
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 2dc02d9f2eb..1c35c7ce037 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/13 18:01:46 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/07/16 01:19:25 jlam Exp $
#
VERS= 3.10
@@ -12,10 +12,6 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://stein.cshl.org/WWW/software/CGI/
COMMENT= Perl5 module for writing forms-based CGI programs
-# Some perl packages install their own versions of this module.
-# Can't simply define USE_PERL5.
-BUILDLINK_DEPENDS.perl= {perl-5.0*,perl-5.6.0nb2,perl-base>=5.6.0,perl{,-thread}>=5.6.1nb2}
-
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= # empty
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 7f8bbdbac3c..7f61f8c02f5 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/13 18:01:46 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:26 jlam Exp $
DISTNAME= HTML-Mason-1.28
PKGNAME= p5-${DISTNAME}
@@ -18,10 +18,6 @@ DEPENDS+= p5-Class-Container>=0.10:../../devel/p5-Class-Container
PERL5_PACKLIST= auto/HTML/Mason/.packlist
-# In case apache.mk is included below which will result in USE_PERL5
-# being set to 'build' explicitly set it to 'run' here.
-USE_PERL5= run
-
PKG_OPTIONS_VAR= PKG_OPTIONS.p5-HTML-Mason
PKG_SUPPORTED_OPTIONS= modperl
PKG_SUGGESTED_OPTIONS= modperl
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index ccfa833b624..cc3092fabb9 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 20:08:01 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= ${PKGNAME_NOREV}-stable-src
@@ -33,7 +33,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}-stable
USE_TOOLS+= autoconf213 gmake
MAKEFILE= GNUmakefile
-USE_PERL5= build
+USE_TOOLS+= perl
PTHREAD_AUTO_VARS= yes
PTHREAD_OPTS+= require
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 13f11714db6..355bfc77ba7 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:26 jlam Exp $
DISTNAME= swish-e-2.4.1
PKGREVISION= 4
@@ -11,13 +11,13 @@ COMMENT= Simple web indexing for humans - enhanced
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_PERL5= yes
CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2}
CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre}
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
-REPLACE_PERL= prog-bin/*.pl conf/*.pl filter-bin/*.pl html/*.pl
+USE_TOOLS+= perl:run
+REPLACE_PERL= prog-bin/*.pl conf/*.pl filter-bin/*.pl html/*.pl
.include "../../mk/bsd.prefs.mk"
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index 8f31b7cd0d0..855ac65b1fb 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2005/06/03 19:22:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.39 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= w3m-${W3M_VERS}
@@ -16,7 +16,7 @@ USE_TOOLS+= gmake # Needed for some combinations of options...
W3M_VERS= 0.5.1
# For w3mman, xface2xpm, cgi scripts.
-USE_PERL5= run
+USE_TOOLS+= perl:run
DOCDIR= share/doc/w3m
diff --git a/www/webnew/Makefile b/www/webnew/Makefile
index 663a877627f..3d6a702b19d 100644
--- a/www/webnew/Makefile
+++ b/www/webnew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:43 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= webnew-1.3
@@ -9,7 +9,7 @@ MAINTAINER= kim@tac.nyc.ny.us
HOMEPAGE= http://www.tac.nyc.ny.us/kim/webnew/
COMMENT= Retrieve modification times of web documents
-USE_PERL5= # defined
+USE_TOOLS+= perl:run
NO_CONFIGURE= yes
BUILD_TARGET= all DEST=${PREFIX} PERL=${PERL5}
diff --git a/www/whisker/Makefile b/www/whisker/Makefile
index cc34810f52e..47d7ca77c04 100644
--- a/www/whisker/Makefile
+++ b/www/whisker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/17 03:50:43 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:26 jlam Exp $
DISTNAME= whisker-2.1
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= URL scanner used to search for known vulnerable CGIs on websites
DEPENDS+= p5-Net-SSLeay>=1.20:../../security/p5-Net-SSLeay
-USE_PERL5= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= whisker.pl
INSTALLATION_DIRS= bin
diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index d7c2939921f..59fe0ea766f 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:27 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:26 jlam Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-server-${XF_VER}
@@ -43,7 +43,7 @@ SUBST_MESSAGE.stubs= "Fixing stubs Makefile."
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} != "NetBSD"
-USE_PERL5= build # Yeah, we need this :-)
+USE_TOOLS+= perl # Yeah, we need this :-)
.endif
post-install:
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index b903a634d28..1c67cbc22c6 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/07/06 18:01:37 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= gnome-desktop-2.10.2
@@ -15,8 +15,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
-USE_PERL5= yes
+USE_TOOLS+= gmake perl:run
USE_LIBTOOL= yes
BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 14934526034..c3070ecc5e2 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/06/29 09:30:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.54 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= gnome-panel-2.10.2
@@ -12,8 +12,7 @@ COMMENT= GNOME2 panel application
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
-USE_PERL5= YES
+USE_TOOLS+= gmake perl:run
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libpanel-applet/libpanelapplet-2.0.pc.in
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 9d0d687c7d2..6e13f1e35fa 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/06/01 18:03:28 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= gnome-session-2.10.0
@@ -18,8 +18,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
USE_LIBTOOL= yes
MAKE_ENV+= REAL_GCONFTOOL="${GCONFTOOL2}"
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 6cf94fc5fe6..c0e806ef35a 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/06/01 18:03:28 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= gnome-terminal-2.10.0
@@ -15,11 +15,10 @@ BUILD_USES_MSGFMT= YES
CONFLICTS= gnome-core-[0-9]*
-USE_PERL5= build
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_LIBTOOL= YES
GCONF2_SCHEMAS= gnome-terminal.schemas
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index f9b9c14364a..d74273e3222 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2005/06/17 04:49:49 jlam Exp $
+# $NetBSD: Makefile,v 1.110 2005/07/16 01:19:26 jlam Exp $
DISTNAME= gtk+-1.2.10
PKGREVISION= 8
@@ -18,9 +18,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
BUILD_USES_MSGFMT= yes
USE_DIRS+= xdg-1.1
-USE_PERL5= build
USE_X11BASE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= gdk.pc.in
diff --git a/x11/gtk2-chtheme/Makefile b/x11/gtk2-chtheme/Makefile
index d4f02e23035..99807c9d8b5 100644
--- a/x11/gtk2-chtheme/Makefile
+++ b/x11/gtk2-chtheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:48 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:27 jlam Exp $
#
DISTNAME= gtk-chtheme-0.3.1
@@ -11,9 +11,8 @@ MAINTAINER= kirtai@users.sourceforge.net
HOMEPAGE= http://plasmasturm.org/programs/gtk-chtheme/
COMMENT= GTK+2 theme changer with preview
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
REPLACE_PERL= replace
-USE_PERL5= build
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 03096cc817c..b65dab3e7f4 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/06/01 18:03:29 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= gtkmm-2.2.12
@@ -12,8 +12,7 @@ COMMENT= C++ interface to Gtk+ v2
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_TOOLS+= gmake
-USE_PERL5= YES
+USE_TOOLS+= gmake perl:run
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE= atk/atkmm-1.0.pc.in
diff --git a/x11/gtkmm24/Makefile b/x11/gtkmm24/Makefile
index 3e84382aebe..15b26115db9 100644
--- a/x11/gtkmm24/Makefile
+++ b/x11/gtkmm24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:29 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:26 jlam Exp $
DISTNAME= gtkmm-2.4.8
PKGNAME= gtkmm24-2.4.8
@@ -10,10 +10,9 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.gtkmm.org/
COMMENT= C++ interface to Gtk+ v2
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-USE_PERL5= yes
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= atk/atkmm-1.6.pc.in
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index f0d5e6f406e..f370b2b9b11 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:48 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= gtksourceview-1.2.0
@@ -14,9 +14,8 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_PERL5= build
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
PKGCONFIG_OVERRIDE= gtksourceview-1.0.pc.in
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index bb51d1eee2f..8bc923f6f45 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2005/06/26 23:46:11 markd Exp $
+# $NetBSD: Makefile,v 1.89 2005/07/16 01:19:27 jlam Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
PKGREVISION= 1
@@ -10,7 +10,7 @@ COMMENT= Support libraries for the KDE integrated X11 desktop
CONFLICTS+= koffice3<=1.1.1
USE_DIRS+= xdg-1.2
-USE_PERL5= run
+USE_TOOLS+= perl:run
USE_PKGINSTALL= YES
MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index 6846c3a6bde..cf46ca1ee57 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:32 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:27 jlam Exp $
#
DISTNAME= xkbset-0.3
@@ -10,8 +10,8 @@ MAINTAINER= hubertf@NetBSD.org
HOMEPAGE= http://www.math.missouri.edu/~stephen/software/#xkbset
COMMENT= Manages XKB features of the X window system
-USE_PERL5= build
USE_X11BASE= yes
+USE_TOOLS+= perl
REPLACE_PERL= mskacc-gui
.include "../../mk/x11.buildlink3.mk"
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index 7d8ca477188..38851def342 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:33 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:27 jlam Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-server-${XORG_VER}
@@ -47,7 +47,7 @@ SUBST_MESSAGE.stubs= "Fixing stubs Makefile."
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} != "NetBSD"
-USE_PERL5= build # Yeah, we need this :-)
+USE_TOOLS+= perl # Yeah, we need this :-)
.endif
.if ${OPSYS} == "Darwin"