summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-07-16 19:10:37 +0000
committerjlam <jlam@pkgsrc.org>2005-07-16 19:10:37 +0000
commit83147ffa6886cc46382e68a213e4e42ae33953e8 (patch)
tree5e673c0121797154e662e294d0aa49ba7abfcf99
parent30133dc8a6a8da07fb55b611ca5542c068cc87e8 (diff)
downloadpkgsrc-83147ffa6886cc46382e68a213e4e42ae33953e8.tar.gz
Remove some unnecessarily strong dependencies on perl that resulted
from including perl5/buildlink3.mk. These packages just need the Perl interpreter, and can just add "perl" to USE_TOOLS instead.
-rw-r--r--audio/disc-cover/Makefile4
-rw-r--r--audio/ices-mp3/Makefile4
-rw-r--r--benchmarks/hbench/Makefile4
-rw-r--r--benchmarks/lmbench/Makefile5
-rw-r--r--biology/mummer/Makefile5
-rw-r--r--cad/spiceprm/Makefile4
-rw-r--r--chat/sirc/Makefile4
-rw-r--r--comms/fidogate/Makefile5
-rw-r--r--comms/pilot-link/Makefile5
-rw-r--r--converters/rpm2cpio/Makefile4
-rw-r--r--converters/txt2html/Makefile4
-rw-r--r--databases/gnome-mime-data/buildlink3.mk9
-rw-r--r--databases/jdb/Makefile4
-rw-r--r--devel/autoconf/Makefile5
-rw-r--r--devel/autoconf213/Makefile5
-rw-r--r--devel/automake/Makefile5
-rw-r--r--devel/automake14/Makefile4
-rw-r--r--devel/global/Makefile4
-rw-r--r--devel/sdcc/Makefile5
-rw-r--r--devel/tet3/Makefile4
-rw-r--r--editors/vile/Makefile4
-rw-r--r--editors/xvile/Makefile4
-rw-r--r--games/minami/Makefile4
-rw-r--r--games/netmaj/Makefile4
-rw-r--r--games/openmortal/Makefile3
-rw-r--r--games/xboard/Makefile4
-rw-r--r--graphics/claraocr/Makefile6
-rw-r--r--graphics/gnome-icon-theme/buildlink3.mk8
-rw-r--r--inputmethod/xcin/Makefile4
-rw-r--r--lang/cim/Makefile4
-rw-r--r--lang/dylan-interpreter/Makefile.common5
-rw-r--r--mail/demime/Makefile4
-rw-r--r--mail/faces/Makefile4
-rw-r--r--mail/ja-squirrelmail/Makefile4
-rw-r--r--mail/squirrelmail/Makefile4
-rw-r--r--math/pari/Makefile4
-rw-r--r--misc/gkrellm-weather/Makefile5
-rw-r--r--misc/openoffice/Makefile3
-rw-r--r--misc/vfu/Makefile4
-rw-r--r--net/ddclient/Makefile4
-rw-r--r--net/freewais-sf/Makefile4
-rw-r--r--net/net-snmp/Makefile3
-rw-r--r--news/inn/Makefile5
-rw-r--r--pkgtools/pkgdiff/Makefile4
-rw-r--r--print/chktex/Makefile5
-rw-r--r--security/fprot-workstation-bin/Makefile4
-rw-r--r--shells/mudsh/Makefile4
-rw-r--r--sysutils/stow/Makefile4
-rw-r--r--textproc/gtk-doc/Makefile4
-rw-r--r--textproc/html2wml/Makefile4
-rw-r--r--textproc/intltool/Makefile5
-rw-r--r--textproc/intltool/buildlink3.mk4
-rw-r--r--textproc/kdoc/Makefile6
-rw-r--r--textproc/libxslt/Makefile3
-rw-r--r--textproc/libxslt/buildlink3.mk3
-rw-r--r--textproc/texi2html/Makefile8
-rw-r--r--time/titrax/Makefile4
-rw-r--r--wm/bbkeys/Makefile5
-rw-r--r--www/apache2/Makefile4
-rw-r--r--www/bannerfilter/Makefile4
-rw-r--r--www/bins/Makefile6
-rw-r--r--www/screws/Makefile4
-rw-r--r--www/wdg-validate/Makefile4
-rw-r--r--www/weblint/Makefile5
-rw-r--r--x11/gdkxft/Makefile4
-rw-r--r--x11/p5-gtk/Makefile.subpackage4
-rw-r--r--x11/xephem/Makefile4
67 files changed, 143 insertions, 154 deletions
diff --git a/audio/disc-cover/Makefile b/audio/disc-cover/Makefile
index 030faa002f5..94af37d9447 100644
--- a/audio/disc-cover/Makefile
+++ b/audio/disc-cover/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/16 06:57:38 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 19:10:37 jlam Exp $
#
DISTNAME= disc-cover-1.5.4
@@ -11,6 +11,7 @@ COMMENT= Generation of CD covers
DEPENDS+= p5-Audio-CD>=0.05:../../audio/p5-Audio-CD
+USE_TOOLS+= perl:run
REPLACE_PERL= disc-cover
DCTMPL= ${PREFIX}/share/disc-cover/templates
@@ -29,5 +30,4 @@ do-install:
${INSTALL_DATA_DIR} ${DCTMPL}
${INSTALL_DATA} ${WRKSRC}/templates/* ${DCTMPL}
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/ices-mp3/Makefile b/audio/ices-mp3/Makefile
index 800cbf8eee7..408494845e8 100644
--- a/audio/ices-mp3/Makefile
+++ b/audio/ices-mp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/24 05:56:25 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 19:10:37 jlam Exp $
#
DISTNAME= ices-${ICES_VERSION}
@@ -59,7 +59,7 @@ do-install:
.include "../../audio/libvorbis/buildlink3.mk"
.if defined(ICES_USE_PERL) && (${ICES_USE_PERL} == "YES")
PERL5_REQD+= 5.8.0
-.include "../../lang/perl5/buildlink3.mk"
+USE_TOOLS+= perl:run
CONFIGURE_ARGS+= --with-perl=${PERL5}
.endif
.if defined(ICES_USE_PYTHON) && (${ICES_USE_PYTHON} == "YES")
diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile
index c162d86737f..99e1d760120 100644
--- a/benchmarks/hbench/Makefile
+++ b/benchmarks/hbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/07/16 19:10:37 jlam Exp $
DISTNAME= hbench-OS-1.0
PKGNAME= hbench-1.0
@@ -17,6 +17,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/hbench-OS
OSVERSION_SPECIFIC= YES
BUILD_TARGET= build
+USE_TOOLS+= perl:run
DIST_SUBDIR= ${PKGNAME_NOREV}
@@ -55,5 +56,4 @@ results:
-@cd ${WRKSRC} ; \
tar -cf /tmp/benches/`domainname`/hbench.`uname`-`uname -m`-`uname -r`.`hostname`.tar results conf
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index 54171b1d5de..b6bc549f160 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:40 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/07/16 19:10:38 jlam Exp $
DISTNAME= lmbench-2alpha11
PKGNAME= lmbench-2.11a
@@ -12,7 +12,7 @@ COMMENT= Complete benchmark that gives a large amount of information
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
BUILD_TARGET= build
MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
@@ -60,5 +60,4 @@ results:
-@cd ${PREFIX}/share/lmbench ; \
tar -cf /tmp/benches/`domainname`/lmbench.`uname`-`uname -m`-`uname -r`.`hostname`.tar results
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/biology/mummer/Makefile b/biology/mummer/Makefile
index d3c35a66244..48c8c9b814b 100644
--- a/biology/mummer/Makefile
+++ b/biology/mummer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/19 01:13:23 kristerw Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 19:10:38 jlam Exp $
#
DISTNAME= MUMmer3.15
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.tigr.org/software/mummer/
COMMENT= System for aligning whole genome sequences
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
MAKE_ENV+= SH="${SH}"
MAKE_ENV+= PERL="${PERL5}"
@@ -45,5 +45,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/docs/${DOC} ${PREFIX}/share/doc/mummer
.endfor
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/spiceprm/Makefile b/cad/spiceprm/Makefile
index 3477c11cf66..ff329dd19cf 100644
--- a/cad/spiceprm/Makefile
+++ b/cad/spiceprm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/16 06:57:41 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/16 19:10:38 jlam Exp $
#
DISTNAME= spiceprm-0.11
@@ -10,6 +10,7 @@ COMMENT= Spice preprocessor for parameterized subcircuits
WRKSRC= ${WRKDIR}/spiceprm
NO_BUILD= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= spiceprm
INSTALLATION_DIRS= bin
@@ -20,5 +21,4 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/spiceprm
${INSTALL_DATA} ${WRKSRC}/EXAMPLES ${PREFIX}/share/examples/spiceprm
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/sirc/Makefile b/chat/sirc/Makefile
index bc36da9518c..eb420041299 100644
--- a/chat/sirc/Makefile
+++ b/chat/sirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 19:10:38 jlam Exp $
DISTNAME= sirc-2.211
PKGREVISION= 1
@@ -20,6 +20,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
BUILD_DEFS+= USE_INET6
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+USE_TOOLS+= perl:run
SIRC_SCRIPTS= \
adcc.pl \
akickban.pl \
@@ -78,5 +79,4 @@ do-install:
${ECHO} installing $$i ; \
${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$i ${PREFIX}/lib/sirc/scripts/$$i ; done
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index 056632c3d4d..f7baf139944 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/05/22 20:07:43 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/07/16 19:10:38 jlam Exp $
#
DISTNAME= fidogate-4.4.9
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.fidogate.org/
COMMENT= FidoNet (FTN) <-> Internet mail and news gateway
USE_PKGINSTALL= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
MAKE_ENV= DEBUG="${CFLAGS} -Werror"
BUILDLINK_SETENV.CC= CC="cc ${_STRIPFLAG_CC}"
@@ -65,5 +65,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/fidogate.txt ${PREFIX}/share/doc/fidogate
${INSTALL_DATA} ${WRKSRC}/fidogate.conf ${EGDIR}
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index 37f42e4b581..428fc70d542 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/06/01 18:02:41 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2005/07/16 19:10:38 jlam Exp $
.include "../../comms/pilot-link/Makefile.common"
@@ -8,7 +8,7 @@ COMMENT= Tools to talk to the 3Com Pilot PDA
BUILDLINK_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS}
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
USE_GNU_READLINE= YES
CONFIGURE_ARGS+= --with-perl5=${PERL5}
@@ -32,7 +32,6 @@ post-patch:
.include "../../comms/pilot-link-libs/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../lang/tcl/buildlink3.mk"
.include "../../x11/tk/buildlink3.mk"
diff --git a/converters/rpm2cpio/Makefile b/converters/rpm2cpio/Makefile
index e1655e9a674..86e47576dd0 100644
--- a/converters/rpm2cpio/Makefile
+++ b/converters/rpm2cpio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:43 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 19:10:38 jlam Exp $
DISTNAME= rpm2cpio
PKGNAME= rpm2cpio-1.1
@@ -14,6 +14,7 @@ COMMENT= Convert .rpm files for extraction with cpio, needs just perl
WRKSRC= ${WRKDIR}
DIST_SUBDIR= ${PKGNAME_NOREV}
+USE_TOOLS+= perl:run
REPLACE_PERL= rpm2cpio
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} .
@@ -27,5 +28,4 @@ do-build:
do-install:
${INSTALL_SCRIPT} ${WRKDIR}/rpm2cpio ${PREFIX}/bin/rpm2cpio.pl
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/txt2html/Makefile b/converters/txt2html/Makefile
index 9cf0af79044..ab59320229e 100644
--- a/converters/txt2html/Makefile
+++ b/converters/txt2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:43 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 19:10:38 jlam Exp $
DISTNAME= txt2html-1.28
CATEGORIES= converters www
@@ -9,6 +9,7 @@ HOMEPAGE= http://www.aigeek.com/txt2html/
COMMENT= Text to HTML converter
NO_BUILD= YES
+USE_TOOLS+= perl:run
REPLACE_PERL= txt2html.pl
INSTALLATION_DIRS= bin
@@ -25,5 +26,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/sample.html ${PREFIX}/share/txt2html
${INSTALL_DATA} ${WRKSRC}/sample.txt ${PREFIX}/share/txt2html
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/gnome-mime-data/buildlink3.mk b/databases/gnome-mime-data/buildlink3.mk
index c5f3b9b4ed8..77d2f1de055 100644
--- a/databases/gnome-mime-data/buildlink3.mk
+++ b/databases/gnome-mime-data/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/07/16 19:10:38 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_MIME_DATA_BUILDLINK3_MK:= ${GNOME_MIME_DATA_BUILDLINK3_MK}+
@@ -13,9 +13,14 @@ BUILDLINK_PACKAGES+= gnome-mime-data
.if !empty(GNOME_MIME_DATA_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.gnome-mime-data+= gnome-mime-data>=2.4.0
BUILDLINK_PKGSRCDIR.gnome-mime-data?= ../../databases/gnome-mime-data
+
+# intltool-{extract,merge,update} are Perl scripts included in the sources
+# of packages that use gnome-mime-data and are executed during build.
+#
+USE_TOOLS+= perl
+
.endif # GNOME_MIME_DATA_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/jdb/Makefile b/databases/jdb/Makefile
index 89132c77a7d..54130e83df1 100644
--- a/databases/jdb/Makefile
+++ b/databases/jdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 19:10:38 jlam Exp $
DISTNAME= jdb-1.13
CATEGORIES= databases
@@ -9,9 +9,9 @@ HOMEPAGE= http://www.isi.edu/~johnh/SOFTWARE/JDB/index.html
COMMENT= Commands for manipulating flat-ASCII databases
GNU_CONFIGURE= # defined
+USE_TOOLS+= perl:run
CONFIGURE_ARGS+= --with-perl=${LOCALBASE}/bin
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/jdb
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 97c931fd3ef..91133e9c24c 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/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 19:10:38 jlam Exp $
DISTNAME= autoconf-2.59
PKGREVISION= 2
@@ -10,7 +10,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/autoconf/autoconf.html
COMMENT= Generates automatic source code configuration scripts
-USE_TOOLS+= gm4:run
+USE_TOOLS+= gm4:run perl:run
# The next line is for conflicts with old versions of this package,
# which had autoconf-devel as PKGNAME.
@@ -40,5 +40,4 @@ CHECK_WRKREF_SKIP+= ${PREFIX}/share/autoconf/m4sugar/m4sh.m4f
post-install:
${RM} -rf ${WRKSRC}/lib/emacs/no
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index c3a4c68d5f0..e8912871ad3 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/15 20:14:03 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/16 19:10:38 jlam Exp $
DISTNAME= autoconf-2.13
PKGNAME= autoconf213-2.13
@@ -10,7 +10,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/autoconf/autoconf.html
COMMENT= Generates automatic source code configuration scripts (old version)
-USE_TOOLS+= gm4:run
+USE_TOOLS+= gm4:run perl:run
CONFLICTS= autoconf-devel-[0-9]*
CONFLICTS= autoconf<2.50
@@ -23,5 +23,4 @@ CONFIGURE_ARGS+= --program-transform-name='s/$$/-2.13/'
USE_MAKEINFO= YES
INFO_FILES= autoconf213.info
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 01da182dfd4..95a838b65f5 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2005/07/15 20:14:03 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2005/07/16 19:10:38 jlam Exp $
#
DISTNAME= automake-1.9.6
@@ -13,7 +13,7 @@ COMMENT= GNU Standards-compliant Makefile generator
DEPENDS= autoconf>=2.58:../../devel/autoconf
-USE_TOOLS+= gm4:run
+USE_TOOLS+= gm4:run perl:run
#PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -29,5 +29,4 @@ PERL5_REQD+= 5.5
# from autoconf too well
#TEST_TARGET= check
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 2c86aeba830..fdecc366f76 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 05:35:32 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 19:10:38 jlam Exp $
#
DISTNAME= automake-1.4-p6
@@ -19,10 +19,10 @@ CONFLICTS= automake<1.6
GNU_CONFIGURE= YES
_STRIPFLAG_INSTALL= # none
+USE_TOOLS+= perl:run
USE_MAKEINFO= YES
INFO_FILES= automake14.info
TEST_TARGET= check
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/global/Makefile b/devel/global/Makefile
index 4cf7d7c1209..70c79d8ce5b 100644
--- a/devel/global/Makefile
+++ b/devel/global/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:24 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/16 19:10:38 jlam Exp $
#
DISTNAME= global-4.8
@@ -11,6 +11,7 @@ COMMENT= Source code tag system including web browser output
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
+USE_TOOLS+= perl:run
INFO_FILES= global.info
LDFLAGS+= -L../libutil
@@ -22,5 +23,4 @@ MAKE_ENV+= BINDIR="${PREFIX}/bin"
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/libdata/lint
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index e71004410af..fcefce2c434 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/22 20:28:47 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/07/16 19:10:38 jlam Exp $
DISTNAME= sdcc-2.4.0
PKGNAME= ${DISTNAME:S/-src//}
@@ -15,6 +15,8 @@ COMMENT= Cross compile 8051 code
#
USE_TOOLS+= bison
+USE_TOOLS+= perl:run
+
BUILD_TARGET= dep all
WRKSRC= ${WRKDIR}/${DISTNAME:S/-2.4.0//}
@@ -54,5 +56,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/z80/README ${PREFIX}/share/doc/sdcc/z80
.include "../../devel/boehm-gc/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/tet3/Makefile b/devel/tet3/Makefile
index 378529bcc86..ae0426a74c6 100644
--- a/devel/tet3/Makefile
+++ b/devel/tet3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:39 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 19:10:38 jlam Exp $
DISTNAME= tet3.3h-unsup.src
PKGNAME= tet3-3.3h
@@ -13,6 +13,7 @@ COMMENT= The Open Group test harness
WRKSRC= ${WRKDIR}/src
HAS_CONFIGURE= yes
+USE_TOOLS+= perl:run
REPLACE_PERL= ../contrib/suite/src/common.pl ../contrib/NTperldemo/ts/tc1.pl
REPLACE_PERL+= ../contrib/NTperldemo/ts/tc2.pl ../contrib/NTperldemo/ts/tc3.pl
REPLACE_PERL+= ../contrib/tetreport/TetJournal.pl ../contrib/tetreport/TetReports.pl
@@ -38,5 +39,4 @@ PTHREAD_OPTS= native # only native threads make sense
PKG_SKIP_REASON= "Native threads are needed for this package"
.endif
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index 06837990554..405690f6205 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.40 2005/07/16 19:10:38 jlam Exp $
DISTNAME= vile-9.4
PKGREVISION= 1
@@ -15,6 +15,7 @@ GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-perl
CONFIGURE_ARGS+= --datadir=${DATADIR}
CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR}
+USE_TOOLS+= perl:run
# Until the source catches up to the current Perl API, we need PERL_POLLUTE
# to look like an older perl.
@@ -37,5 +38,4 @@ post-install:
done
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index cf4f65eafc1..cb4601acd8a 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2005/07/16 19:10:38 jlam Exp $
DISTNAME= vile-9.4
PKGNAME= xvile-9.4
@@ -17,6 +17,7 @@ GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-perl
CONFIGURE_ARGS+= --datadir=${DATADIR}
CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR}
+USE_TOOLS+= perl:run
MAKEFILE= makefile
INSTALL_TARGET= install install-perl
@@ -46,7 +47,6 @@ post-install:
done
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/xaw.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/minami/Makefile b/games/minami/Makefile
index 3d719984c6c..e30ff60ace4 100644
--- a/games/minami/Makefile
+++ b/games/minami/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 19:10:39 jlam Exp $
#
DISTNAME= minami-1.0.2
@@ -10,6 +10,7 @@ MAINTAINER= kei@NetBSD.org
HOMEPAGE= http://www.guru.gr.jp/~issei/minami/
COMMENT= Text adventure
+USE_TOOLS+= perl:run
REPLACE_PERL= gen_act gen_dun gen_itm gen_scn minflag
INSTALLATION_DIRS= bin
@@ -18,5 +19,4 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/minami ${PREFIX}/bin
.include "../../devel/readline/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/netmaj/Makefile b/games/netmaj/Makefile
index a9d251e1cc3..afce83d9cba 100644
--- a/games/netmaj/Makefile
+++ b/games/netmaj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:55 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 19:10:39 jlam Exp $
#
DISTNAME= netmaj-2.0.7
@@ -10,6 +10,7 @@ HOMEPAGE= http://www.sfc.wide.ad.jp/~kusune/netmaj/
COMMENT= Mahjongg game with network and 1-4 player(s) support
WRKSRC= ${WRKDIR}/netmaj
+USE_TOOLS+= perl:run
INSTALL_TARGET= install install-pf
HTMLDIR= ${PREFIX}/share/doc/html/netmaj
@@ -22,5 +23,4 @@ post-install:
${INSTALL_DATA_DIR} ${HTMLDIR}
${INSTALL_DATA} ${WRKSRC}/html/* ${HTMLDIR}
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile
index e9680db14ee..7931443498d 100644
--- a/games/openmortal/Makefile
+++ b/games/openmortal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:10 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/16 19:10:39 jlam Exp $
#
DISTNAME= openmortal-0.7
@@ -20,6 +20,5 @@ REPLACE_PERL= data/script/*.pl
.include "../../devel/SDL/buildlink3.mk"
.include "../../graphics/SDL_image/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../net/SDL_net/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 1ddf3cbc985..7bf9266e6b8 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/06/24 16:49:08 kristerw Exp $
+# $NetBSD: Makefile,v 1.29 2005/07/16 19:10:39 jlam Exp $
DISTNAME= xboard-4.2.6
PKGREVISION= 2
@@ -13,6 +13,7 @@ CONFIGURE_ARGS+= --enable-xpm
CONFIGURE_ARGS+= --enable-zippy # interface to ICS
CONFIGURE_ENV+= PERLPATH="${PERL5}"
GNU_CONFIGURE= # defined
+USE_TOOLS+= perl:run
INFO_FILES= xboard.info
@@ -22,7 +23,6 @@ INFO_FILES= xboard.info
CONFIGURE_ARGS+= --with-Xaw3d
.endif
-.include "../../lang/perl5/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
.include "../../mk/xaw.buildlink3.mk"
diff --git a/graphics/claraocr/Makefile b/graphics/claraocr/Makefile
index 1f1c8c6e2fb..c6dcf486cf6 100644
--- a/graphics/claraocr/Makefile
+++ b/graphics/claraocr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:54 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 19:10:39 jlam Exp $
#
DISTNAME= clara-0.9.9
@@ -15,12 +15,12 @@ COMMENT= Optical Character Recognition (OCR) program for books
DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm
-REPLACE_PERL= clara.pl mkdoc.pl selthresh.pl
+USE_TOOLS+= perl:run
+REPLACE_PERL= clara.pl mkdoc.pl selthresh.pl
# install a example input file
post-install:
${INSTALL_DATA} ${WRKSRC}/imre.pbm ${PREFIX}/share/doc/clara
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk
index 546a76f49eb..d20f3a4a69c 100644
--- a/graphics/gnome-icon-theme/buildlink3.mk
+++ b/graphics/gnome-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/09/21 16:48:38 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/07/16 19:10:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_ICON_THEME_BUILDLINK3_MK:= ${GNOME_ICON_THEME_BUILDLINK3_MK}+
@@ -14,6 +14,11 @@ BUILDLINK_PACKAGES+= gnome-icon-theme
BUILDLINK_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.8.0
BUILDLINK_PKGSRCDIR.gnome-icon-theme?= ../../graphics/gnome-icon-theme
+# intltool-{extract,merge,update} are Perl scripts included in the sources
+# of packages that use gnome-icon-theme and are executed during build.
+#
+USE_TOOLS+= perl
+
. include "../../mk/bsd.prefs.mk"
dirs!= ${GREP} "^@dirrm" ${.CURDIR}/../../graphics/gnome-icon-theme/PLIST | \
@@ -28,6 +33,5 @@ PRINT_PLIST_AWK+= /^@dirrm ${d:S/\//\\\//g}$$/ \
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/inputmethod/xcin/Makefile b/inputmethod/xcin/Makefile
index 3d02b4367bf..b358d3dabbb 100644
--- a/inputmethod/xcin/Makefile
+++ b/inputmethod/xcin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/26 16:45:57 rxg Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 19:10:39 jlam Exp $
#
DISTNAME= xcin-2.5.3.pre2
@@ -15,6 +15,7 @@ WRKSRC= ${WRKDIR}/xcin
USE_PKGLOCALEDIR= yes
USE_X11BASE= yes
USE_LIBTOOL= yes
+USE_TOOLS+= perl:run
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-db-lib=${BUILDLINK_PREFIX.db3}/lib
@@ -31,7 +32,6 @@ post-install:
.include "../../databases/db3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../inputmethod/libtabe/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 4fa404ba4f6..a2a5686b68a 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:12 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 19:10:39 jlam Exp $
DISTNAME= cim-3.30
PKGREVISION= 1
@@ -10,6 +10,7 @@ HOMEPAGE= http://www.gnu.org/software/cim/cim.html
COMMENT= Simula compiler based on the C programming language
GNU_CONFIGURE= YES
+USE_TOOLS+= perl:run
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
@@ -24,5 +25,4 @@ SUBST_SED.x+= -e "s|SLDFLAGS|\"-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/l
SUBST_SED.x+= -e "s|= LIBDIR|= \"${PREFIX}/lib\"|"
SUBST_SED.x+= -e "s|= INCLUDEDIR|= \"${PREFIX}/include\"|"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/dylan-interpreter/Makefile.common b/lang/dylan-interpreter/Makefile.common
index 5b66bd3f661..8d076fe3afe 100644
--- a/lang/dylan-interpreter/Makefile.common
+++ b/lang/dylan-interpreter/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/06/01 20:08:00 jlam Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/07/16 19:10:39 jlam Exp $
#
DISTNAME= gwydion-dylan-${DYLAN_VERSION}
@@ -16,7 +16,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gwydiondylan.org/
COMMENT= Functional language
-USE_TOOLS+= automake14 gmake
+USE_TOOLS+= automake14 gmake perl:run
USE_LIBTOOL= yes
MAKEFILE= GNUmakefile
BUILD_TARGET= default
@@ -56,7 +56,6 @@ pre-configure:
cd ${WRKSRC} && autoconf
.include "../../devel/boehm-gc/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
index 166ce094b38..dcf53037a5d 100644
--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/16 19:10:39 jlam Exp $
#
DISTNAME= demime-1.1d
@@ -20,6 +20,7 @@ DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
DIST_SUBDIR= ${PKGNAME_NOREV}
NO_BUILD= YES
+USE_TOOLS+= perl:run
USE_PKGINSTALL= YES
POD2MAN?= ${BUILDLINK_PREFIX.perl}/bin/pod2man
@@ -44,5 +45,4 @@ do-install:
${POD2MAN} ${WRKSRC}/demime > ${WRKSRC}/demime.1
${INSTALL_MAN} ${WRKSRC}/demime.1 ${PREFIX}/man/man1/demime.1
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 0f4ac45a227..52b39bbea79 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/06/01 18:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2005/07/16 19:10:39 jlam Exp $
DISTNAME= faces-1.6.1
PKGREVISION= 3
@@ -19,6 +19,7 @@ RESTRICTED= "Distribution not allowed if money exchanged"
WRKSRC= ${WRKDIR}/faces
USE_X11BASE= YES
USE_LIBTOOL= YES
+USE_TOOLS+= perl:run
MAKE_FLAGS+= PREFIX="${PREFIX}"
MAKE_FLAGS+= CCOMP="${CFLAGS}"
@@ -60,6 +61,5 @@ do-configure:
${MV} -f $${FILE}.fixed $${FILE}; \
done
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index 694879021bc..01c72f1f831 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/13 04:08:57 martti Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/16 19:10:39 jlam Exp $
DISTNAME= squirrelmail-1.4.4
PKGNAME= ja-${DISTNAME}
@@ -25,6 +25,7 @@ DEPENDS+= php-mbstring>=4.3.3:../../misc/php-mbstring
USE_LANGUAGES= # empty
USE_PKGINSTALL= yes
NO_BUILD= yes
+USE_TOOLS+= perl:run
REPLACE_PERL= config/conf.pl config/ri_once.pl
.include "../../mk/bsd.prefs.mk"
@@ -80,5 +81,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/data/index.php ${USER_PREFS_DIR}/
${INSTALL_DATA} ${WRKSRC}/data/.htaccess ${USER_PREFS_DIR}/
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 6e8f51b380a..62a712fa9d2 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/07/07 08:32:51 martti Exp $
+# $NetBSD: Makefile,v 1.55 2005/07/16 19:10:39 jlam Exp $
DISTNAME= squirrelmail-1.4.4
PKGREVISION= 1
@@ -19,6 +19,7 @@ DEPENDS+= php-gettext>=4.3.3:../../devel/php-gettext
USE_LANGUAGES= # empty
USE_PKGINSTALL= yes
NO_BUILD= yes
+USE_TOOLS+= perl:run
REPLACE_PERL= config/conf.pl config/ri_once.pl
.include "../../mk/bsd.prefs.mk"
@@ -73,5 +74,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/data/index.php ${USER_PREFS_DIR}/
${INSTALL_DATA} ${WRKSRC}/data/.htaccess ${USER_PREFS_DIR}/
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/pari/Makefile b/math/pari/Makefile
index 5ec47780e6a..22fc3bbe6e4 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/08 22:10:45 kristerw Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 19:10:39 jlam Exp $
DISTNAME= pari-2.1.5
PKGREVISION= 5
@@ -14,6 +14,7 @@ BUILD_DEPENDS+= teTeX-[0-9]*:../../print/teTeX
USE_LIBTOOL= yes
USE_GNU_READLINE= # rl_save_prompt
+USE_TOOLS+= perl:run
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ${WRKSRC}/Configure
@@ -27,6 +28,5 @@ TEST_TARGET= test-compat bench
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gkrellm-weather/Makefile b/misc/gkrellm-weather/Makefile
index 1974c2352b7..34d94e52cfc 100644
--- a/misc/gkrellm-weather/Makefile
+++ b/misc/gkrellm-weather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:15 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 19:10:39 jlam Exp $
DISTNAME= gkrellweather-2.0.6
PKGNAME= gkrellm-weather-2.0.6
@@ -14,7 +14,7 @@ COMMENT= Gkrellm2 weather plugin
DEPENDS+= wget>=1.8:../../net/wget
BUILD_USES_MSGFMT= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
USE_PKGLOCALEDIR= YES
BUILD_TARGET= gkrellweather.so
@@ -31,7 +31,6 @@ pre-build:
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index 18a99890c31..55721bc5f76 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/07/16 01:19:14 jlam Exp $
+# $NetBSD: Makefile,v 1.68 2005/07/16 19:10:39 jlam Exp $
DISTNAME= openoffice-1.1.4
PKGREVISION= 2
@@ -114,7 +114,6 @@ PLIST_SRC+= PLIST.common_end
.include "../../mk/compiler.mk"
.include "../../mk/pthread.buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile
index a6c5a8eab67..3b8809d32d7 100644
--- a/misc/vfu/Makefile
+++ b/misc/vfu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/04/11 21:46:40 tv Exp $
+# $NetBSD: Makefile,v 1.40 2005/07/16 19:10:39 jlam Exp $
#
DISTNAME= vfu-3.04
@@ -11,6 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.biscom.net/~cade/away/vfu/
COMMENT= Small, handy, easy-to-use file manager
+USE_TOOLS+= perl:run
USE_LANGUAGES= c c++
USE_PKGINSTALL= YES
@@ -39,5 +40,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/vfu.conf ${EGDIR}/vfu.conf
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index 273f1604d91..41f2fd7f3b6 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:45 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 19:10:39 jlam Exp $
DISTNAME= ddclient-3.6.2
PKGREVISION= 1
@@ -11,6 +11,7 @@ COMMENT= Client to update dynamic DNS entries
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= perl:run
USE_LANGUAGES= # empty
USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
@@ -47,5 +48,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/README.cisco ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/sample-* ${EGDIR}
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index bdcfc698e72..de71dc379e2 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/23 22:12:44 kristerw Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/16 19:10:40 jlam Exp $
#
DISTNAME= freeWAIS-sf-2.2.12
@@ -14,6 +14,7 @@ COMMENT= Enhanced Wide Area Information Server
NOT_FOR_PLATFORM= Darwin-*-*
USE_LIBTOOL= # defined
+USE_TOOLS+= perl:run
HAS_CONFIGURE= # defined
CONFIGURE_ENV+= PREFIX=${PREFIX}
@@ -32,5 +33,4 @@ post-build:
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/SF/fwsf.info* ${PREFIX}/info
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index cab290a630d..dd2ed4419a5 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/07/13 18:01:34 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/07/16 19:10:40 jlam Exp $
DISTNAME= net-snmp-5.2.1.2
CATEGORIES= net
@@ -107,7 +107,6 @@ OWN_DIRS= ${PREFIX}/share/snmp
RCD_SCRIPTS= snmpd snmptrapd
.include "../../lang/perl5/module.mk"
-.include "../../lang/perl5/buildlink3.mk"
post-wrapper:
.if !empty(MACHINE_PLATFORM:MNetBSD-1.5.[123]*-i386)
diff --git a/news/inn/Makefile b/news/inn/Makefile
index b9e6b990282..720efe4c958 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2005/07/15 23:23:15 kristerw Exp $
+# $NetBSD: Makefile,v 1.66 2005/07/16 19:10:40 jlam Exp $
DISTNAME= inn-2.4.1
PKGREVISION= 6
@@ -41,7 +41,7 @@ CONFIGURE_ENV+= _PATH_SED="${TOOLS_SED}"
CONFIGURE_ENV+= _PATH_SH="${TOOLS_SH}"
CONFIGURE_ENV+= _PATH_SORT="${TOOLS_SORT}"
CONFIGURE_ENV+= GZIP="${TOOLS_GZIP_CMD:Q:C/\\\\ .*//}"
-USE_TOOLS+= awk egrep gzip sed sh sort yacc
+USE_TOOLS+= awk egrep gzip perl:run sed sh sort yacc
PKG_USERS= ${INN_USER}:${INN_GROUP}::Internet\\ News:${INN_DATA_DIR}:${SH}
PKG_GROUPS= ${INN_GROUP}
@@ -123,6 +123,5 @@ post-install:
${INSTALL_DATA} $$FILE ${EXAMPLEDIR}; \
done
-.include "../../lang/perl5/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index b082b30d7cb..466b8dd0d06 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/05/21 01:24:34 rh Exp $
+# $NetBSD: Makefile,v 1.56 2005/07/16 19:10:40 jlam Exp $
#
DISTNAME= pkgdiff-0.117
@@ -20,6 +20,7 @@ NO_CONFIGURE= yes
WRKSRC= ${WRKDIR}
USE_LANGUAGES= # empty
+USE_TOOLS+= perl:run
MAKE_ENV= PKGSRCDIR=${_PKGSRCDIR:Q}
@@ -78,5 +79,4 @@ do-install:
. endif
.endfor
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/chktex/Makefile b/print/chktex/Makefile
index f31bc3d403e..274ef8c260a 100644
--- a/print/chktex/Makefile
+++ b/print/chktex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/24 22:23:05 kristerw Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 19:10:40 jlam Exp $
#
DISTNAME= chktex-1.6.1
@@ -12,12 +12,11 @@ COMMENT= LaTeX semantic checker
DEPENDS+= lynx-[0-9]*:../../www/lynx
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
GNU_CONFIGURE= YES
CFLAGS+= -D__unix__
CONFIGURE_ENV+= PERL5="${PERL5}"
MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../print/teTeX-bin/kpathsea.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/fprot-workstation-bin/Makefile b/security/fprot-workstation-bin/Makefile
index 4a83e965691..61ecc5a6447 100644
--- a/security/fprot-workstation-bin/Makefile
+++ b/security/fprot-workstation-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/17 03:50:31 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 19:10:40 jlam Exp $
#
DISTNAME= #defined
@@ -25,6 +25,7 @@ LICENSE= fprot-workstation-license
WRKSRC= ${WRKDIR}/f-prot
NO_BUILD= yes
USE_PKGINSTALL= yes
+USE_TOOLS+= perl:run
DATDIR= ${PREFIX}/share/fprot-workstation-bin
DOCDIR= ${PREFIX}/share/doc/fprot-workstation-bin
@@ -85,5 +86,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/ENGLISH.TX0 ${FPDIR}
${INSTALL_PROGRAM} ${WRKSRC}/f-prot ${FPDIR}
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/mudsh/Makefile b/shells/mudsh/Makefile
index 53a3b8b4b28..99cabb62757 100644
--- a/shells/mudsh/Makefile
+++ b/shells/mudsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:33 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 19:10:40 jlam Exp $
#
DISTNAME= mudsh
@@ -13,6 +13,7 @@ COMMENT= M.U.D. game-like shell
WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
+USE_TOOLS+= perl:run
INSTALLATION_DIRS= bin
@@ -24,5 +25,4 @@ do-build:
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/mudsh ${PREFIX}/bin
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/stow/Makefile b/sysutils/stow/Makefile
index 954c6698b1f..c8e7f5c33b1 100644
--- a/sysutils/stow/Makefile
+++ b/sysutils/stow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:29 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 19:10:40 jlam Exp $
#
DISTNAME= stow-1.3.3
@@ -12,8 +12,8 @@ COMMENT= Maps several separate packages into a tree without merging them
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
+USE_TOOLS+= perl:run
INFO_FILES= stow.info
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index f74ecc1473b..09fd0df6614 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/30 19:18:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 19:10:40 jlam Exp $
#
DISTNAME= gtk-doc-1.3
@@ -17,10 +17,10 @@ DEPENDS+= dsssl-docbook-modular-[0-9]*:../../textproc/dsssl-docbook-modular
GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= gtk-doc.pc.in
CONFIGURE_ARGS+= --with-xml-catalog=${XML_DEFAULT_CATALOG}
+USE_TOOLS+= perl:run
SGML_CATALOGS= ${PREFIX}/share/sgml/gtk-doc/gtk-doc.cat
-.include "../../lang/perl5/buildlink3.mk"
.include "../../textproc/jade/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/xmlcatmgr/catalogs.mk"
diff --git a/textproc/html2wml/Makefile b/textproc/html2wml/Makefile
index ec8db3afcbe..b5bd88efb41 100644
--- a/textproc/html2wml/Makefile
+++ b/textproc/html2wml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:36 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 19:10:40 jlam Exp $
DISTNAME= html2wml-0.4.8r2
PKGNAME= html2wml-0.4.8.2
@@ -17,6 +17,7 @@ DEPENDS+= p5-XML-LibXML>=1.31:../../textproc/p5-XML-LibXML
NO_BUILD= # defined
+USE_TOOLS+= perl:run
REPLACE_PERL= ${WRKSRC}/html2wml.cgi
INSTALLATION_DIRS= bin man/man1
@@ -25,5 +26,4 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/html2wml.cgi ${PREFIX}/bin/html2wml
${INSTALL_MAN} ${WRKSRC}/doc/html2wml.man ${PREFIX}/man/man1/html2wml.1
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index cfe3be3b8a7..ba09cb5ac89 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/06/01 19:11:41 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/07/16 19:10:40 jlam Exp $
#
DISTNAME= intltool-0.33
@@ -16,11 +16,10 @@ DEPENDS+= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
CONFLICTS= xml-i18n-tools-[0-9]*
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
GNU_CONFIGURE= YES
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/intltool/buildlink3.mk b/textproc/intltool/buildlink3.mk
index ab081d81c47..f348ec95c20 100644
--- a/textproc/intltool/buildlink3.mk
+++ b/textproc/intltool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/05/31 19:48:18 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2005/07/16 19:10:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
INTLTOOL_BUILDLINK3_MK:= ${INTLTOOL_BUILDLINK3_MK}+
@@ -18,8 +18,6 @@ BUILDLINK_DEPMETHOD.intltool?= build
USE_TOOLS+= perl
-.include "../../lang/perl5/buildlink3.mk"
-
.if !empty(INTLTOOL_BUILDLINK3_MK:M+)
CONFIGURE_ENV+= INTLTOOL_PERL="${PERL5}"
INTLTOOLIZE= ${BUILDLINK_PREFIX.intltool}/bin/intltoolize
diff --git a/textproc/kdoc/Makefile b/textproc/kdoc/Makefile
index 0d21c28c649..cb0354c0a26 100644
--- a/textproc/kdoc/Makefile
+++ b/textproc/kdoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/08 20:53:49 kristerw Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 19:10:40 jlam Exp $
DISTNAME= kdoc-2.0a54
PKGNAME= kdoc-3.0
@@ -13,12 +13,12 @@ MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/3.0/src/ \
MAINTAINER= wulf@NetBSD.org
COMMENT= C++ and IDL Class Documentation Tool
+USE_TOOLS+= perl:run
+
SUBST_CLASSES+= vars
SUBST_STAGE.vars= do-configure
SUBST_FILES.vars= Makefile.in
SUBST_SED.vars= -e 's|@perl@|${PERL5}|g'
.include "../../meta-pkgs/kde3/Makefile.kde3"
-
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index a8901c81f66..f4bb6c282d8 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/07/16 01:19:24 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2005/07/16 19:10:40 jlam Exp $
DISTNAME= libxslt-1.1.14
PKGNAME= ${DISTNAME}
@@ -28,5 +28,4 @@ BUILDLINK_DEPENDS.libxml2+= libxml2>=2.6.17
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libxslt/buildlink3.mk b/textproc/libxslt/buildlink3.mk
index 757965494a6..3f7b95f2fdf 100644
--- a/textproc/libxslt/buildlink3.mk
+++ b/textproc/libxslt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/12/30 16:42:22 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2005/07/16 19:10:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXSLT_BUILDLINK3_MK:= ${LIBXSLT_BUILDLINK3_MK}+
@@ -16,7 +16,6 @@ BUILDLINK_RECOMMENDED.libxslt+= libxslt>=1.1.10nb1
BUILDLINK_PKGSRCDIR.libxslt?= ../../textproc/libxslt
.endif # LIBXSLT_BUILDLINK3_MK
-.include "../../lang/perl5/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile
index 660cee52dd8..42716103205 100644
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:42 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 19:10:40 jlam Exp $
#
DISTNAME= texi2html-1.76
@@ -17,9 +17,9 @@ CONFLICTS= teTeX-bin-1.0 teTeX-bin-1.0.[1234567]
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
-INFO_FILES= texi2html.info
-
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-.include "../../lang/perl5/buildlink3.mk"
+USE_TOOLS+= perl:run
+INFO_FILES= texi2html.info
+
.include "../../mk/bsd.pkg.mk"
diff --git a/time/titrax/Makefile b/time/titrax/Makefile
index f7a90730c29..e734d0f3718 100644
--- a/time/titrax/Makefile
+++ b/time/titrax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:45 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 19:10:40 jlam Exp $
#
DISTNAME= titrax-1.98
@@ -11,6 +11,7 @@ HOMEPAGE= http://www.alvestrand.no/domen/titrax/TimeTracker.html
COMMENT= Little X11 tool to track project times
USE_IMAKE= YES
+USE_TOOLS+= perl:run
RESTRICTED= "Do not sell for profit"
@@ -23,5 +24,4 @@ post-patch:
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/libexec/titrax
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbkeys/Makefile b/wm/bbkeys/Makefile
index 50b199bc69e..962581f0043 100644
--- a/wm/bbkeys/Makefile
+++ b/wm/bbkeys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:24 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/16 19:10:40 jlam Exp $
#
DISTNAME= bbkeys-0.8.6
@@ -11,8 +11,7 @@ COMMENT= General X Window keygrabber
GNU_CONFIGURE= YES
USE_LANGUAGES= c++
+USE_TOOLS+= perl:run
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 1efe245961e..ed15b4b7e4f 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2005/05/21 04:10:18 jlam Exp $
+# $NetBSD: Makefile,v 1.76 2005/07/16 19:10:40 jlam Exp $
.include "Makefile.common"
@@ -13,6 +13,7 @@ CONFLICTS= apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]*
BUILD_DEFS+= USE_INET6
+USE_TOOLS+= perl:run
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
@@ -29,7 +30,6 @@ CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr}
.include "../../mk/bsd.prefs.mk"
.include "../../devel/apr/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
diff --git a/www/bannerfilter/Makefile b/www/bannerfilter/Makefile
index 35756998516..e1c44b4b11a 100644
--- a/www/bannerfilter/Makefile
+++ b/www/bannerfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:40 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/16 19:10:41 jlam Exp $
#
DISTNAME= bannerfilter-1.31
@@ -11,6 +11,7 @@ COMMENT= Blocks advertising banners as squid redirector script
USE_PKGINSTALL= YES
NO_BUILD= YES
+USE_TOOLS+= perl:run
SHAREDIR= ${PREFIX}/share/bannerfilter
CONF_FILES= ${SHAREDIR}/bannerfilter.conf ${PKG_SYSCONFDIR}/bannerfilter.conf
@@ -32,5 +33,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/bannerfilter.conf ${SHAREDIR}/
${INSTALL_SCRIPT} ${WRKSRC}/redirector.pl ${PREFIX}/bin/bannerfilter-redirector.pl
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/bins/Makefile b/www/bins/Makefile
index 1d75bb2d1eb..66439c4ad2d 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/06/17 03:50:40 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/07/16 19:10:41 jlam Exp $
#
DISTNAME= bins-1.1.27
@@ -26,9 +26,12 @@ DEPENDS+= p5-HTML-Template>=2.5:../../www/p5-HTML-Template
DEPENDS+= p5-URI>=1.19:../../www/p5-URI
USE_PKGLOCALEDIR= YES
+
# bins-edit-gui not installed because many needed packages are missing
# bins_txt2xml not installed because it's an upgrade tool, and we didn't
# have previous versions in pkgsrc.
+#
+USE_TOOLS+= perl:run
REPLACE_PERL= bins bins_edit bins-edit-gui bins_cleanupgallery bins_txt2xml
INSTALLATION_DIRS= bin man/man1
@@ -111,5 +114,4 @@ do-install:
${PREFIX}/${PKGLOCALEDIR}/locale/$$lang/LC_MESSAGES/bins.mo; \
done
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/screws/Makefile b/www/screws/Makefile
index e64ad852ca0..359a3589ed7 100644
--- a/www/screws/Makefile
+++ b/www/screws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/19 20:12:05 kristerw Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 19:10:41 jlam Exp $
#
DISTNAME= screws-0.56
@@ -11,6 +11,7 @@ HOMEPAGE= http://www.nopcode.org/?t=screws
COMMENT= SCRipt Enhanced Web Server
USE_PKGINSTALL= YES
+USE_TOOLS+= perl:run
BUILD_DEFS+= SCREWS_USER SCREWS_GROUP
@@ -34,5 +35,4 @@ SUBST_SED.paths= -e 's|/var/log|${VARBASE}/log|g'
.include "options.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/wdg-validate/Makefile b/www/wdg-validate/Makefile
index a82ff523cab..5cdf91a6a1a 100644
--- a/www/wdg-validate/Makefile
+++ b/www/wdg-validate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/30 05:49:15 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/16 19:10:41 jlam Exp $
#
DISTNAME= validate-1.2.2
@@ -20,6 +20,7 @@ DIST_SUBDIR= validate
EXTRACT_ONLY= wdg-sgml-lib-1.1.4.tar.gz
SITES_wdg-sgml-lib-1.1.4.tar.gz= http://www.htmlhelp.com/tools/validator/src/
+USE_TOOLS+= perl:run
REPLACE_PERL= validate
NO_BUILD= YES
@@ -42,5 +43,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/validate.README
cd ${WRKSRC}/wdg/sgml-lib && ${PAX} -rw * ${PREFIX}/share/wdg/sgml-lib/
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/weblint/Makefile b/www/weblint/Makefile
index 28e3ff3fa88..995a4aeced9 100644
--- a/www/weblint/Makefile
+++ b/www/weblint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:48:03 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 19:10:41 jlam Exp $
#
DISTNAME= weblint-1.020
@@ -15,8 +15,7 @@ COMMENT= HTML validator and sanity checker
PKG_INSTALLATION_TYPES= overwrite pkgviews
-
+USE_TOOLS+= perl:run
INSTALLATION_DIRS+= bin man/man1
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 0df7645e0ba..e168cbdfff6 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/31 22:12:18 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/07/16 19:10:41 jlam Exp $
#
DISTNAME= gdkxft-1.5
@@ -19,6 +19,7 @@ PKG_FAIL_REASON= "${PKGNAME} requires XFree86-4.0 or higher"
USE_DIRS+= xdg-1.1
USE_X11BASE= YES
USE_LIBTOOL= YES
+USE_TOOLS+= perl:run
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-static
@@ -35,7 +36,6 @@ post-install:
.include "../../devel/libglade/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
.include "../../x11/control-center/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
diff --git a/x11/p5-gtk/Makefile.subpackage b/x11/p5-gtk/Makefile.subpackage
index aefc30613f3..1f6112bf54a 100644
--- a/x11/p5-gtk/Makefile.subpackage
+++ b/x11/p5-gtk/Makefile.subpackage
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.subpackage,v 1.8 2005/01/22 17:26:22 adrianp Exp $
+# $NetBSD: Makefile.subpackage,v 1.9 2005/07/16 19:10:41 jlam Exp $
#
# makefile fragment for p5-gtk sub-packages. you need to
# set SUBPACKAGE before including this.
@@ -12,8 +12,6 @@ DEPENDS+= p5-gtk-[0-9]*:../../x11/p5-gtk
WRKSRC= ${WRKDIR}/${DISTNAME}/${SUBPACKAGE}
-.include "../../lang/perl5/buildlink3.mk"
-
post-patch:
cd ${GTKDIR} && ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
cd ${GTKDIR} && ${SETENV} ${MAKE_ENV} \
diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index 26d651b977a..78d23685b4d 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/20 13:17:11 drochner Exp $
+# $NetBSD: Makefile,v 1.32 2005/07/16 19:10:41 jlam Exp $
DISTNAME= xephem-3.6.4
CATEGORIES= x11
@@ -13,6 +13,7 @@ LICENSE= no-commercial-use
WRKSRC= ${WRKDIR}/${DISTNAME}/GUI/xephem
USE_IMAKE= yes
+USE_TOOLS+= perl:run
LIBSRC1= ${WRKDIR}/${DISTNAME}/libastro
LIBSRC2= ${WRKDIR}/${DISTNAME}/libip
@@ -34,6 +35,5 @@ post-install:
${PREFIX}/share/xephem
${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/xephem
-.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/motif.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"