Buildlinkify, in the sense that only the perl headers are found in

${PREFIX} -- everything else is pickup up from ${BUILDLINK_DIR}.

26 files changed, 112 insertions, 85 deletions

diff --git a/textproc/p5-Convert-ASCII-Armour/Makefile b/textproc/p5-Convert-ASCII-Armour/Makefile
index 32e49018278..c781c3c68df 100644
--- a/textproc/p5-Convert-ASCII-Armour/Makefile
+++ b/textproc/p5-Convert-ASCII-Armour/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:40 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:19 jlam Exp $
 #
 
 DISTNAME=		Convert-ASCII-Armour-1.4
@@ -15,10 +15,11 @@ DEPENDS+=		p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=		p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
 DEPENDS+=		p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Convert/ASCII/Armour/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Convert-ASN1/Makefile b/textproc/p5-Convert-ASN1/Makefile
index e224908af18..eb8443967d3 100644
--- a/textproc/p5-Convert-ASN1/Makefile
+++ b/textproc/p5-Convert-ASN1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/18 15:20:40 veego Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/26 06:50:20 jlam Exp $
 #
 
 DISTNAME=		Convert-ASN1-0.14
@@ -11,10 +11,11 @@ MAINTAINER=		packages@netbsd.org
 #HOMEPAGE=	
 COMMENT=		perl5 module to encode/decode ASN.1 data
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Convert/ASN1/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Convert-BER/Makefile b/textproc/p5-Convert-BER/Makefile
index 585682b1bd6..16d789d043e 100644
--- a/textproc/p5-Convert-BER/Makefile
+++ b/textproc/p5-Convert-BER/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/31 14:39:19 tv Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/26 06:50:20 jlam Exp $
 #
 
 DISTNAME=	Convert-BER-1.31
@@ -10,10 +10,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Convert/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl class to encode and decode objects using Basic Encoding Rules (BER)
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Convert/BER/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Convert/BER/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Convert-PEM/Makefile b/textproc/p5-Convert-PEM/Makefile
index f09535d1e83..1b117d4bf56 100644
--- a/textproc/p5-Convert-PEM/Makefile
+++ b/textproc/p5-Convert-PEM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:40 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:20 jlam Exp $
 #
 
 DISTNAME=		Convert-PEM-0.06
@@ -17,10 +17,11 @@ DEPENDS+=		p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=		p5-Crypt-DES-[0-9]*:../../security/p5-Crypt-DES
 DEPENDS+=		p5-Crypt-DES_EDE3-[0-9]*:../../security/p5-Crypt-DES_EDE3
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Convert/PEM/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Filter/Makefile b/textproc/p5-Filter/Makefile
index b1243455ed8..2e1b758954f 100644
--- a/textproc/p5-Filter/Makefile
+++ b/textproc/p5-Filter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:41 veego Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:21 jlam Exp $
 #
 
 DISTNAME=	Filter-1.16
@@ -10,10 +10,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Filter/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl5 classes representing a number of source filters
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Filter/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Filter/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-PDF-Create/Makefile b/textproc/p5-PDF-Create/Makefile
index 4be73d25b56..e9e4196bbb1 100644
--- a/textproc/p5-PDF-Create/Makefile
+++ b/textproc/p5-PDF-Create/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:41 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:21 jlam Exp $
 #
 
 DISTNAME=	PDF-Create-0.01
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 #HOMEPAGE=	
 COMMENT=	perl5 module for creating pdf documents
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/PDF/Create/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/PDF/Create/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-PDF/Makefile b/textproc/p5-PDF/Makefile
index bf97c38ca3e..01b53ff3397 100644
--- a/textproc/p5-PDF/Makefile
+++ b/textproc/p5-PDF/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:41 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:21 jlam Exp $
 #
 
 DISTNAME=	PDF-111
@@ -12,12 +12,13 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.geocities.com/CapeCanaveral/Hangar/4794/
 COMMENT=	perl5 module for pdf document manipulation
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/PDF/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/PDF/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 WRKSRC=		${WRKDIR}/PDF
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Pod-POM/Makefile b/textproc/p5-Pod-POM/Makefile
index 6f1183cc563..364c75716ca 100644
--- a/textproc/p5-Pod-POM/Makefile
+++ b/textproc/p5-Pod-POM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:42 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:22 jlam Exp $
 #
 
 DISTNAME=       Pod-POM-0.02
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.kfs.org/~abw/
 COMMENT=	p5 module to format POD into an object format, hence POM
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Pod/POM/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Pod/POM/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Autoformat/Makefile b/textproc/p5-Text-Autoformat/Makefile
index 7c6de7a01e2..b88157ec6ca 100644
--- a/textproc/p5-Text-Autoformat/Makefile
+++ b/textproc/p5-Text-Autoformat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:42 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:22 jlam Exp $
 
 DISTNAME=       Text-Autoformat-1.04
 PKGNAME=        p5-${DISTNAME}
@@ -10,10 +10,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.cs.monash.edu.au/~damian/
 COMMENT=	perl module for text wrapping and reformatting
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Text/Autoformat/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Autoformat/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Balanced/Makefile b/textproc/p5-Text-Balanced/Makefile
index 1c2ed4748f3..b80214e1889 100644
--- a/textproc/p5-Text-Balanced/Makefile
+++ b/textproc/p5-Text-Balanced/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:42 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:22 jlam Exp $
 #
 
 DISTNAME=	Text-Balanced-1.85
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 #HOMEPAGE=	
 COMMENT=	Extract delimited text sequences from strings
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Text/Balanced/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Balanced/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-BibTeX/Makefile b/textproc/p5-Text-BibTeX/Makefile
index 5aa446a5ee9..09a5a0e098f 100644
--- a/textproc/p5-Text-BibTeX/Makefile
+++ b/textproc/p5-Text-BibTeX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:42 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:23 jlam Exp $
 
 DISTNAME=	Text-BibTeX-0.33
 PKGNAME=	p5-${DISTNAME}
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://starship.python.net/~gward/btOOL/
 COMMENT=	Perl library for reading, parsing, and processing BibTeX files
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Text/BibTeX/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/BibTeX/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-CSV_XS/Makefile b/textproc/p5-Text-CSV_XS/Makefile
index f3a82794961..125dbbacaaa 100644
--- a/textproc/p5-Text-CSV_XS/Makefile
+++ b/textproc/p5-Text-CSV_XS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:42 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:23 jlam Exp $
 #
 
 DISTNAME=	Text-CSV_XS-0.22
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 # HOMEPAGE=	http://
 COMMENT=	Routines for composition and decomposition of comma-separated values
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Text/CSV_XS/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/CSV_XS/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-DelimMatch/Makefile b/textproc/p5-Text-DelimMatch/Makefile
index 3399f1e6198..6e4056adf0d 100644
--- a/textproc/p5-Text-DelimMatch/Makefile
+++ b/textproc/p5-Text-DelimMatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:43 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:23 jlam Exp $
 #
 
 DISTNAME=	DelimMatch-1.03
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/DelimMatch/
 COMMENT=	Find regexp delimited strings with proper nesting
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Text/DelimMatch/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/DelimMatch/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Template/Makefile b/textproc/p5-Text-Template/Makefile
index 378e4bae51b..cd17a0f05fe 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/22 09:45:21 martti Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/26 06:50:24 jlam Exp $
 #
 
 DISTNAME=       Text-Template-1.42
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.plover.com/~mjd/perl/Template/
 COMMENT=	perl5 library for generating form letters
 
-USE_PERL5=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Text/Template/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Template/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Wrapper/Makefile b/textproc/p5-Text-Wrapper/Makefile
index a8efa560fa2..e0abebdd1a4 100644
--- a/textproc/p5-Text-Wrapper/Makefile
+++ b/textproc/p5-Text-Wrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:43 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:24 jlam Exp $
 #
 
 DISTNAME=       Text-Wrapper-1.000
@@ -10,11 +10,12 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 module that provides simple word wrapping
 
-USE_PERL5=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Text/Wrapper/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Wrapper/.packlist
 
 do-configure:
-	@cd ${WRKSRC} && ${ECHO} >.test && \
+	@cd ${WRKSRC} && ${TOUCH} ${TOUCH_ARGS} .test && \
 		${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile
index 21251f79979..be6fbecb884 100644
--- a/textproc/p5-XML-DOM/Makefile
+++ b/textproc/p5-XML-DOM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:43 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:24 jlam Exp $
 #
 
 DISTNAME=	XML-DOM-1.31
@@ -11,15 +11,17 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	Extend XML::Parser to build DOM Level 1 compliant data structure
 
 DEPENDS+=	p5-Parse-Yapp-[0-9]*:../../devel/p5-Parse-Yapp
+DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=	p5-libxml-[0-9]*:../../textproc/p5-libxml
 DEPENDS+=	p5-XML-RegExp-[0-9]*:../../textproc/p5-XML-RegExp
 
 CONFLICTS+=	p5-libxml-enno-[0-9]*
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML-DOM/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML-DOM/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Grove/Makefile b/textproc/p5-XML-Grove/Makefile
index 235a4e62fb3..c53ed27b351 100644
--- a/textproc/p5-XML-Grove/Makefile
+++ b/textproc/p5-XML-Grove/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:43 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:25 jlam Exp $
 #
 
 DISTNAME=	XML-Grove-0.46alpha
@@ -11,10 +11,11 @@ MAINTAINER=	explorer@netbsd.org
 #HOMEPAGE=	
 COMMENT=	Perl 5 module providing simple objects for parsed XML documents
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Grove/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Grove/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Node/Makefile b/textproc/p5-XML-Node/Makefile
index a09f1a77bd7..039b766eae8 100644
--- a/textproc/p5-XML-Node/Makefile
+++ b/textproc/p5-XML-Node/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:44 veego Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:25 jlam Exp $
 #
 
 DISTNAME=	XML-Node-0.10
@@ -14,18 +14,19 @@ COMMENT=	Node-based XML parsing: an simplified interface to XML::Parser
 
 DEPENDS+=	p5-XML-Parser-2.*:../p5-XML-Parser
 
-USE_PERL5=	yes
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Node/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Node/.packlist
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 post-install:
-		${INSTALL_DATA} \
-			${WRKSRC}/orders.xml \
-			${WRKSRC}/test.xml \
-			${WRKSRC}/foo.xml \
-			${WRKSRC}/README \
-			${PERL5_SITELIB}/XML
+	${INSTALL_DATA} \
+		${WRKSRC}/orders.xml \
+		${WRKSRC}/test.xml \
+		${WRKSRC}/foo.xml \
+		${WRKSRC}/README \
+		${PERL5_SITELIB}/XML
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index 0d9d8cb8fde..5be05043755 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/10/18 15:20:44 veego Exp $
+# $NetBSD: Makefile,v 1.12 2001/11/26 06:50:25 jlam Exp $
 #
 
 DISTNAME=	XML-Parser.2.30
@@ -12,11 +12,12 @@ MAINTAINER=	bad@netbsd.org
 HOMEPAGE=	http://wwwx.netheaven.com/~coopercc/xmlparser/intro.html
 COMMENT=	Perl extension interface to James Clark's XML parser, expat
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Parser/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Parser/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../textproc/expat/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-RSS/Makefile b/textproc/p5-XML-RSS/Makefile
index a4504e88a6d..c433799dcc8 100644
--- a/textproc/p5-XML-RSS/Makefile
+++ b/textproc/p5-XML-RSS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:44 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:25 jlam Exp $
 
 DISTNAME=	XML-RSS-0.97
 PKGNAME=	p5-${DISTNAME}
@@ -12,10 +12,11 @@ COMMENT=	XML-RSS helps to create and update RSS files
 
 DEPENDS+=	p5-XML-Parser>=2.29:../../textproc/p5-XML-Parser
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/RSS/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/RSS/.packlist
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-RegExp/Makefile b/textproc/p5-XML-RegExp/Makefile
index 52c22fcd698..f4f987c4a99 100644
--- a/textproc/p5-XML-RegExp/Makefile
+++ b/textproc/p5-XML-RegExp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:44 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:26 jlam Exp $
 #
 
 DISTNAME=	XML-RegExp-0.03
@@ -12,10 +12,11 @@ COMMENT=	Provide regular expressions for some XML tokens
 
 CONFLICTS+=	p5-libxml-enno-[0-9]*
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/RegExp/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/RegExp/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Writer/Makefile b/textproc/p5-XML-Writer/Makefile
index 320be415189..5cf55da738f 100644
--- a/textproc/p5-XML-Writer/Makefile
+++ b/textproc/p5-XML-Writer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:44 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:26 jlam Exp $
 #
 
 DISTNAME=	XML-Writer-0.4
@@ -10,10 +10,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl module for writing XML documents
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Writer/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Writer/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-XPath/Makefile b/textproc/p5-XML-XPath/Makefile
index 5defdad4875..6e306c2f3ee 100644
--- a/textproc/p5-XML-XPath/Makefile
+++ b/textproc/p5-XML-XPath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:45 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:26 jlam Exp $
 
 DISTNAME=	XML-XPath-1.08
 PKGNAME=	p5-${DISTNAME}
@@ -10,10 +10,11 @@ MAINTAINER=	packages@NetBSD.org
 HOMEPAGE=	http://sergeant.org
 COMMENT=	XML XPath software
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/XPath/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/XPath/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-XQL/Makefile b/textproc/p5-XML-XQL/Makefile
index 22fc08919b1..8571d2815c3 100644
--- a/textproc/p5-XML-XQL/Makefile
+++ b/textproc/p5-XML-XQL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:45 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:27 jlam Exp $
 #
 
 DISTNAME=	XML-XQL-0.66
@@ -16,10 +16,11 @@ DEPENDS+=	p5-Date-Manip-[0-9]*:../../devel/p5-Date-Manip
 
 CONFLICTS+=	p5-libxml-enno-[0-9]*
 
-USE_PERL5=	yes
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/XQL/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/XQL/.packlist
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-XSLT/Makefile b/textproc/p5-XML-XSLT/Makefile
index c9a3405ab88..e395945fa00 100644
--- a/textproc/p5-XML-XSLT/Makefile
+++ b/textproc/p5-XML-XSLT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:45 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:27 jlam Exp $
 
 DISTNAME=	XML-XSLT-0.32
 PKGNAME=	p5-${DISTNAME}
@@ -13,10 +13,11 @@ DEPENDS+=	p5-XML-DOM>=1.25:../../textproc/p5-XML-DOM
 DEPENDS+=	p5-XML-Parser>=2.23:../../textproc/p5-XML-Parser
 DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 
-USE_PERL5=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/XSLT/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/XSLT/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-libxml/Makefile b/textproc/p5-libxml/Makefile
index 0281e9059b4..0b1b3f37d03 100644
--- a/textproc/p5-libxml/Makefile
+++ b/textproc/p5-libxml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:45 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:27 jlam Exp $
 
 DISTNAME=	libxml-perl-0.07
 PKGNAME=	p5-libxml-0.07
@@ -12,10 +12,11 @@ COMMENT=	perl module collection for working with XML
 
 DEPENDS+=	p5-XML-Parser>=2.29:../../textproc/p5-XML-Parser
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/libxml-perl/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/libxml-perl/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"