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

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

31 files changed, 116 insertions, 85 deletions

diff --git a/www/ap-DBI/Makefile b/www/ap-DBI/Makefile
index ae7cf6553f3..beb93be1117 100644
--- a/www/ap-DBI/Makefile
+++ b/www/ap-DBI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:49 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:28 jlam Exp $
 #
 
 DISTNAME=       ApacheDBI-0.87
@@ -12,10 +12,11 @@ COMMENT=	perl5 Apache modules for DBI connections
 DEPENDS+=	ap-perl-[0-9]*:../../www/ap-perl
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
 
-USE_PERL5=	# defined
-PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Apache/DBI/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/DBI/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index ba6377e4582..99fe27ebd4d 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/11/23 10:53:12 martti Exp $
+# $NetBSD: Makefile,v 1.17 2001/11/26 06:50:28 jlam Exp $
 #
 
 DISTNAME=		mod_perl-1.25
@@ -12,15 +12,17 @@ HOMEPAGE=		http://perl.apache.org/
 COMMENT=		Module that embeds a Perl interpreter into Apache
 
 DEPENDS+=		libperl>=${LIBPERL5_REQD}:../../lang/libperl
-DEPENDS+=		apache{,6}-1.3.*:../../www/apache
 DEPENDS+=		p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 LIBPERL5_REQD=		${PERL5_REQD}
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/mod_perl/.packlist
 
+REPLACE_BUILDLINK=	blib/lib/Apache/MyConfig.pm
+REPLACE_BUILDLINK_SED=	-e "s|${APXS}|${PREFIX}/sbin/apxs|g"
+
 MAKE_PARAMS+=		USE_APXS=1
-MAKE_PARAMS+=		WITH_APXS=${PREFIX}/sbin/apxs
+MAKE_PARAMS+=		WITH_APXS=${APXS}
 MAKE_PARAMS+=		EVERYTHING=1
 
 do-configure:
@@ -31,6 +33,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/mod_perl.html \
 		${PREFIX}/share/httpd/htdocs/manual/mod
 
+.include "../../lang/perl5/buildlink.mk"
+.include "../../www/apache/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .if exists(${PERL5_ARCHLIB}/DynaLoader_pic.o)
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index b3983c27ab1..c3ba13bc204 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/10/18 15:20:46 veego Exp $
+# $NetBSD: Makefile,v 1.13 2001/11/26 06:50:28 jlam Exp $
 #
 
 DISTNAME=	Apache-ASP-2.21
@@ -24,10 +24,11 @@ DEPENDS+=	p5-Time-HiRes>=01.20:../../devel/p5-Time-HiRes
 DEPENDS+=	p5-XML-XSLT>=0.32:../../textproc/p5-XML-XSLT
 DEPENDS+=	p5-libwww>=5.48:../../www/p5-libwww
 
-USE_PERL5=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Apache/ASP/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/ASP/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-DBILogConfig/Makefile b/www/p5-Apache-DBILogConfig/Makefile
index f7dc1708cff..0aac6bb7bf6 100644
--- a/www/p5-Apache-DBILogConfig/Makefile
+++ b/www/p5-Apache-DBILogConfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:46 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:29 jlam Exp $
 #
 
 DISTNAME=	Apache-DBILogConfig-0.01
@@ -13,10 +13,11 @@ COMMENT=	A database-independent Apache database logger
 DEPENDS+=	ap-DBI-[0-9]*:../../www/ap-DBI
 DEPENDS+=	p5-TimeDate-[0-9]*:../../devel/p5-TimeDate
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Apache/DBILogConfig/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/DBILogConfig/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-DBILogger/Makefile b/www/p5-Apache-DBILogger/Makefile
index 42668ce1fe8..ed22b62cd32 100644
--- a/www/p5-Apache-DBILogger/Makefile
+++ b/www/p5-Apache-DBILogger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:46 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:29 jlam Exp $
 #
 
 DISTNAME=	Apache-DBILogger-0.93
@@ -12,12 +12,12 @@ HOMEPAGE=	http://ask.netcetera.dk/
 COMMENT=	Database-independent httpd database logging module
 
 DEPENDS+=	p5-Apache-DBILogConfig-[0-9]*:../../www/p5-Apache-DBILogConfig
-DEPENDS+=	ap-DBI-[0-9]*:../../www/ap-DBI
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Apache/DBILogger/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/DBILogger/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-Filter/Makefile b/www/p5-Apache-Filter/Makefile
index 214c959aef7..80ba61683f1 100644
--- a/www/p5-Apache-Filter/Makefile
+++ b/www/p5-Apache-Filter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:46 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:29 jlam Exp $
 
 DISTNAME=	Apache-Filter-1.019
 PKGNAME=	p5-${DISTNAME}
@@ -11,10 +11,11 @@ COMMENT=	perl5 module to alter the output of previous Apache handlers
 
 DEPENDS+=	ap-perl>=1.25:../../www/ap-perl
 
-USE_PERL5=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Apache/Filter/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/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/www/p5-Apache-SSI/Makefile b/www/p5-Apache-SSI/Makefile
index e3143ed40ad..dbdfb3c97c7 100644
--- a/www/p5-Apache-SSI/Makefile
+++ b/www/p5-Apache-SSI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:47 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:30 jlam Exp $
 
 DISTNAME=	Apache-SSI-2.16
 PKGNAME=	p5-${DISTNAME}
@@ -12,10 +12,11 @@ COMMENT=	perl5 module to implement Server Side Includes
 DEPENDS+=	ap-perl>=1.19:../../www/ap-perl
 DEPENDS+=	p5-HTML-SimpleParse>=0.06:../../www/p5-HTML-SimpleParse
 
-USE_PERL5=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Apache/SSI/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/SSI/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-Session/Makefile b/www/p5-Apache-Session/Makefile
index 2089ff74119..6e70168874a 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:47 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:30 jlam Exp $
 #
 
 DISTNAME=		Apache-Session-1.53
@@ -13,10 +13,11 @@ COMMENT=		perl5 module to provide persistent storage
 DEPENDS+=		p5-Storable>=1.0.11:../../devel/p5-Storable/
 DEPENDS+=		p5-Digest-MD5>=2.16:../../security/p5-Digest-MD5/
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/Session/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-CGI-Application/Makefile b/www/p5-CGI-Application/Makefile
index 2a902a8b18a..9a6a5dcd170 100644
--- a/www/p5-CGI-Application/Makefile
+++ b/www/p5-CGI-Application/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:48 veego Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:31 jlam Exp $
 
 DISTNAME=		CGI-Application-1.2
 PKGNAME=		p5-${DISTNAME}
@@ -12,10 +12,11 @@ COMMENT=		perl5 module to create sophisticated, reusable web-based applications
 DEPENDS+=		{p5-CGI>=2.66,perl>=5.6.1nb2}:../../www/p5-CGI
 DEPENDS+=		p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/CGI/Application/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-CGI-FastTemplate/Makefile b/www/p5-CGI-FastTemplate/Makefile
index f90c3f22d45..1910bdd4766 100644
--- a/www/p5-CGI-FastTemplate/Makefile
+++ b/www/p5-CGI-FastTemplate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/11/12 09:17:08 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/11/26 06:50:31 jlam Exp $
 
 DISTNAME=	CGI-FastTemplate-1.09
 PKGNAME=	p5-${DISTNAME}
@@ -9,10 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=CGI/}
 MAINTAINER=	jlam@netbsd.org
 COMMENT=	perl5 extension for managing templates
 
-USE_PERL5=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/CGI/FastTemplate/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/CGI/FastTemplate/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-CGI-Minimal/Makefile b/www/p5-CGI-Minimal/Makefile
index 9a7718c2d14..246fee8dce5 100644
--- a/www/p5-CGI-Minimal/Makefile
+++ b/www/p5-CGI-Minimal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:48 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:32 jlam Exp $
 
 DISTNAME=		CGI-Minimal-1.06
 PKGNAME=		p5-${DISTNAME}
@@ -9,10 +9,11 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=CGI/}
 MAINTAINER=		norm@sandbox.org.uk
 COMMENT=		perl5 module for simple CGI scripts
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/CGI/Minimal/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 4719e4ad508..1ffe7f4ff2b 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/10/18 15:20:47 veego Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/26 06:50:31 jlam Exp $
 #
 
 DISTNAME=       	CGI.pm-2.752
@@ -14,8 +14,9 @@ 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.
-DEPENDS+=               {perl-5.0*,perl-5.6.0nb2,perl-base>=5.6.0,perl>=5.6.1nb2}:../../lang/perl5
+BUILDLINK_DEPENDS.perl=	{perl-5.0*,perl-5.6.0nb2,perl-base>=5.6.0,perl>=5.6.1nb2}
 
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/CGI/.packlist
 HTMLDIR=		${PREFIX}/share/doc/html/p5-CGI
 
@@ -40,9 +41,5 @@ post-install:
 	${INSTALL_DATA} *.gif *.html *.txt *.xbm ${HTMLDIR}/examples;	\
 	${INSTALL_SCRIPT} *.cgi ${HTMLDIR}/examples
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
-
-.if !defined(PERL5_SITEARCH)
-PERL5_SITEARCH!=	eval `${PERL5} -V:installsitearch 2>/dev/null`;	\
-			${ECHO} $${installsitearch}
-.endif
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index d6859edd490..1de5bd0410e 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/18 15:20:48 veego Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/26 06:50:32 jlam Exp $
 #
 
 DISTNAME=       	CGI-Lite-2.0
@@ -10,7 +10,7 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=CGI/}
 MAINTAINER=		bad@netbsd.org
 COMMENT=		simple perl5 module for writing forms-based CGI programs
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/CGI/Lite/.packlist
 
 pre-configure:
@@ -19,4 +19,5 @@ pre-configure:
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-FCGI/Makefile b/www/p5-FCGI/Makefile
index e89cae7d6ca..a9e5dbbf279 100644
--- a/www/p5-FCGI/Makefile
+++ b/www/p5-FCGI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/18 15:20:48 veego Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/26 06:50:33 jlam Exp $
 #
 
 PKGVER=			0.58
@@ -12,10 +12,11 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.fastcgi.com/
 COMMENT=		perl5 library for FastCGI, a fast startup alternative to CGI
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/FCGI/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-Clean/Makefile b/www/p5-HTML-Clean/Makefile
index c22059dc8a2..caf3482ac49 100644
--- a/www/p5-HTML-Clean/Makefile
+++ b/www/p5-HTML-Clean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:48 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:33 jlam Exp $
 
 DISTNAME=	HTML-Clean-0.8
 PKGNAME=	p5-${DISTNAME}
@@ -9,10 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTML/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 module that cleans up HTML code for web browsers
 
-USE_PERL5=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/HTML/Clean/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/Clean/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-FillInForm/Makefile b/www/p5-HTML-FillInForm/Makefile
index ce0b90d4a27..897db9aaf89 100644
--- a/www/p5-HTML-FillInForm/Makefile
+++ b/www/p5-HTML-FillInForm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:49 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:33 jlam Exp $
 
 DISTNAME=	HTML-FillInForm-0.19
 PKGNAME=	p5-${DISTNAME}
@@ -11,10 +11,11 @@ COMMENT=	perl5 module that populates HTML Forms with CGI data
 
 DEPENDS+=	p5-HTML-Parser>=3.08:../../www/p5-HTML-Parser
 
-USE_PERL5=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/HTML/FillInForm/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/FillInForm/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-Format/Makefile b/www/p5-HTML-Format/Makefile
index dd2ded58263..4634ff74ea6 100644
--- a/www/p5-HTML-Format/Makefile
+++ b/www/p5-HTML-Format/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:49 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:34 jlam Exp $
 
 DISTNAME=		HTML-Format-1.23
 PKGNAME=		p5-${DISTNAME}
@@ -12,10 +12,11 @@ COMMENT=		perl5 modules for converting HTML to other text formats
 DEPENDS+=		p5-Font-AFM>=1.18:../../print/p5-Font-AFM
 DEPENDS+=		p5-HTML-Tree>=3.04:../../www/p5-HTML-Tree
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML-Format/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 964e3c98ddc..d1fe5224c78 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:49 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:34 jlam Exp $
 
 DISTNAME=		HTML-Mason-1.03
 PKGNAME=		p5-${DISTNAME}
@@ -11,12 +11,14 @@ HOMEPAGE=		http://www.masonhq.com/
 COMMENT=		Perl-based web site development and delivery system
 
 DEPENDS+=               p5-MLDBM>=2.0:../../databases/p5-MLDBM
+DEPENDS+=		p5-gdbm-[0-9]*:../../databases/p5-gdbm
 DEPENDS+=               p5-Params-Validate>=0.04:../../devel/p5-Params-Validate
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/Mason/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index e7094203b5c..35dea532c72 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/10/18 15:20:49 veego Exp $
+# $NetBSD: Makefile,v 1.15 2001/11/26 06:50:35 jlam Exp $
 #
 
 DISTNAME=		HTML-Parser-3.25
@@ -12,10 +12,11 @@ COMMENT=		perl5 module to parse HTML text documents
 
 DEPENDS+=		p5-HTML-Tagset>=3.0:../../www/p5-HTML-Tagset
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/Parser/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-PrettyPrinter/Makefile b/www/p5-HTML-PrettyPrinter/Makefile
index c3df04ce220..91df494aa71 100644
--- a/www/p5-HTML-PrettyPrinter/Makefile
+++ b/www/p5-HTML-PrettyPrinter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:49 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:35 jlam Exp $
 
 DISTNAME=		HTML-PrettyPrinter-0.03
 PKGNAME=		p5-${DISTNAME}
@@ -12,10 +12,11 @@ COMMENT=		perl5 module for pretty-printing HTML
 DEPENDS+=		p5-HTML-Tree>=3.0:../../www/p5-HTML-Tree
 DEPENDS+=		p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/PrettyPrinter/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-SimpleParse/Makefile b/www/p5-HTML-SimpleParse/Makefile
index 53cb95fe0bc..1405da65e9d 100644
--- a/www/p5-HTML-SimpleParse/Makefile
+++ b/www/p5-HTML-SimpleParse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:50 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:35 jlam Exp $
 
 DISTNAME=	HTML-SimpleParse-0.10
 PKGNAME=	p5-${DISTNAME}
@@ -9,10 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTML/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 module implementing a bare-bones HTML parser
 
-USE_PERL5=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/HTML/SimpleParse/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/SimpleParse/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-Table/Makefile b/www/p5-HTML-Table/Makefile
index 798b88bbb54..1b699cfba8c 100644
--- a/www/p5-HTML-Table/Makefile
+++ b/www/p5-HTML-Table/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:50 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:36 jlam Exp $
 
 DISTNAME=		HTML-Table-1.04
 PKGNAME=		p5-${DISTNAME}
@@ -9,10 +9,11 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=HTML/}
 MAINTAINER=		jlam@netbsd.org
 COMMENT=		perl5 module to simplify creating HTML tables
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/Table/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-TableExtract/Makefile b/www/p5-HTML-TableExtract/Makefile
index 969ade41d46..ea145612464 100644
--- a/www/p5-HTML-TableExtract/Makefile
+++ b/www/p5-HTML-TableExtract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/30 13:34:47 damon Exp $
+# $NetBSD: Makefile,v 1.2 2001/11/26 06:50:36 jlam Exp $
 
 DISTNAME=		HTML-TableExtract-1.06
 PKGNAME=		p5-${DISTNAME}
@@ -11,10 +11,11 @@ COMMENT=		perl5 module to simplify extracting HTML tables
 
 DEPENDS+=		p5-HTML-Parser>=3.08:../../www/p5-HTML-Parser
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML-TableExtract/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-Tagset/Makefile b/www/p5-HTML-Tagset/Makefile
index 487c5adf7be..e382ba82ed1 100644
--- a/www/p5-HTML-Tagset/Makefile
+++ b/www/p5-HTML-Tagset/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:50 veego Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:36 jlam Exp $
 #
 
 DISTNAME=		HTML-Tagset-3.03
@@ -10,10 +10,11 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=HTML/}
 MAINTAINER=		jlam@netbsd.org
 COMMENT=		perl5 module of data tables useful in parsing HTML
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/Tagset/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-Template/Makefile b/www/p5-HTML-Template/Makefile
index 29c039b0de3..edcfffc84de 100644
--- a/www/p5-HTML-Template/Makefile
+++ b/www/p5-HTML-Template/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:50 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:36 jlam Exp $
 
 DISTNAME=		HTML-Template-2.2
 PKGNAME=		p5-${DISTNAME}
@@ -9,10 +9,11 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=HTML/}
 MAINTAINER=		jlam@netbsd.org
 COMMENT=		perl5 module to create HTML templates by extending HTML with simple tags
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/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/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index 705d274a8f7..26efdadb510 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:51 veego Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:37 jlam Exp $
 
 DISTNAME=		HTML-Tree-3.11
 PKGNAME=		p5-${DISTNAME}
@@ -12,10 +12,11 @@ COMMENT=		perl5 modules for manipulating HTML syntax trees
 DEPENDS+=		p5-HTML-Parser>=2.19:../../www/p5-HTML-Parser
 DEPENDS+=		p5-HTML-Tagset>=3.02:../../www/p5-HTML-Tagset
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML-Tree/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTTP-Request-Form/Makefile b/www/p5-HTTP-Request-Form/Makefile
index f4a819b5a2f..3793f429a3a 100644
--- a/www/p5-HTTP-Request-Form/Makefile
+++ b/www/p5-HTTP-Request-Form/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:51 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:37 jlam Exp $
 #
 
 DISTNAME=	HTTP-Request-Form-0.7
@@ -15,10 +15,11 @@ DEPENDS+=       p5-URI-[0-9]*:../../www/p5-URI
 DEPENDS+=       p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
 DEPENDS+=       p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
 
-USE_PERL5=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/HTTP/Request/Form/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTTP/Request/Form/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index a7007ab6c75..4b95782d038 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 05:18:32 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:38 jlam Exp $
 
 DISTNAME=	HTTPD-User-Manage-1.58
 PKGNAME=	p5-${DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://stein.cshl.org/~lstein/user_manage/
 COMMENT=	Perl script/modules for managing web access control
 
-USE_PERL5=              # defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=         ${PERL5_SITEARCH}/auto/HTTPD-User-Manage/.packlist
 REPLACE_PERL=		user_manage
 
@@ -36,4 +36,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/user_manage.html \
 		${PREFIX}/share/doc/user_manage/user_manage.html
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-URI/Makefile b/www/p5-URI/Makefile
index 123962354f6..a8ee376a58d 100644
--- a/www/p5-URI/Makefile
+++ b/www/p5-URI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/10/18 15:20:51 veego Exp $
+# $NetBSD: Makefile,v 1.14 2001/11/26 06:50:38 jlam Exp $
 #
 
 DISTNAME=	URI-1.17
@@ -14,10 +14,11 @@ BUILD_DEPENDS=	p5-MIME-Base64>=2.12:../../converters/p5-MIME-Base64
 
 CONFLICTS+=	p5-libwww-5.36	# URI used to be part of that package
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/URI/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/URI/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-VRML/Makefile b/www/p5-VRML/Makefile
index 9319d83e936..5fd48ac9662 100644
--- a/www/p5-VRML/Makefile
+++ b/www/p5-VRML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:52 veego Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:39 jlam Exp $
 #
 
 DISTNAME=	VRML-1.04
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gfz-potsdam.de/~palm/software/VRML/doc/VRML.pm.html
 COMMENT=	Set of VRML classes for Perl
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/VRML/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/VRML/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index ee867174780..8969ddf376a 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/11/22 09:11:08 martti Exp $
+# $NetBSD: Makefile,v 1.23 2001/11/26 06:50:39 jlam Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/09/14 04:00:11 jfitz Exp
 #
 
@@ -17,10 +17,12 @@ DEPENDS+=	p5-Net-[0-9]*:../../net/p5-Net
 DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
 DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/libwww-perl/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/libwww-perl/.packlist
+MAKE_PARAMS=		-n
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL -n
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"