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.

6 files changed, 14 insertions, 13 deletions

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"