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.

8 files changed, 16 insertions, 21 deletions

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"