Use buildlink2. Use perl5/module.mk.

35 files changed, 120 insertions, 219 deletions

diff --git a/converters/p5-Convert-TNEF/Makefile b/converters/p5-Convert-TNEF/Makefile
index 259cd1a3fd4..4c0480f9651 100644
--- a/converters/p5-Convert-TNEF/Makefile
+++ b/converters/p5-Convert-TNEF/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:39 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/27 20:48:56 seb Exp $
 
 DISTNAME=		Convert-TNEF-0.12
 PKGNAME=		p5-${DISTNAME}
@@ -11,11 +11,8 @@ COMMENT=		perl5 module interface to read TNEF files
 
 DEPENDS+=		p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Convert/TNEF/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/p5-Jcode/Makefile b/converters/p5-Jcode/Makefile
index abc9f2bb916..db0b59288fc 100644
--- a/converters/p5-Jcode/Makefile
+++ b/converters/p5-Jcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/09/23 23:39:58 taca Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/27 20:48:56 seb Exp $
 #
 
 DISTNAME=	Jcode-0.82
@@ -13,17 +13,14 @@ COMMENT=	perl5 module for handling various Japanese charsets
 
 DEPENDS+=	p5-MIME-Base64>=2.1:../../converters/p5-MIME-Base64
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Jcode/.packlist
 
 pre-configure:
 	@cd ${WRKSRC}; ${RM} -f mac_install.pl win_install.pl
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 test:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} test
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/p5-AddressBook/Makefile b/databases/p5-AddressBook/Makefile
index b3b04837209..2758a30f6dc 100644
--- a/databases/p5-AddressBook/Makefile
+++ b/databases/p5-AddressBook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/28 02:22:59 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/27 20:49:02 seb Exp $
 
 DISTNAME=	AddressBook-0.16
 PKGNAME=	p5-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=	p5-XML-DOM>=1.25:../../textproc/p5-XML-DOM
 DEPENDS+=	p5-perl-ldap>=0.20:../../databases/p5-perl-ldap
 DEPENDS+=	p5-pilot-link-[0-9]*:../../comms/p5-pilot-link
 
-USE_PERL5=	YES
+USE_BUILDLINK2=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/AddressBook/.packlist
 
 REPLACE_PERL=	examples/SyncAbook.pm
@@ -25,9 +25,6 @@ REPLACE_PERL+=	examples/phonelist.cgi
 
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC};							\
@@ -35,4 +32,5 @@ post-install:
 		${INSTALL_DATA} $${file} ${EGDIR};			\
 	done
 
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/p5-Apache-DBI/Makefile b/databases/p5-Apache-DBI/Makefile
index 8215ce1b2e2..1b9f020305e 100644
--- a/databases/p5-Apache-DBI/Makefile
+++ b/databases/p5-Apache-DBI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/16 20:43:10 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/27 20:48:55 seb Exp $
 #
 
 DISTNAME=	ApacheDBI-0.88
@@ -13,11 +13,8 @@ COMMENT=	DBI support for Apache+mod_perl
 
 DEPENDS+=		p5-DBI>=1.13:../../databases/p5-DBI
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/p5-perl-ldap/Makefile b/databases/p5-perl-ldap/Makefile
index 777139cf6eb..ecf30534bca 100644
--- a/databases/p5-perl-ldap/Makefile
+++ b/databases/p5-perl-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/01/28 01:12:24 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2002/10/27 20:48:56 seb Exp $
 #
 
 DISTNAME=     	perl-ldap-0.25
@@ -17,11 +17,8 @@ DEPENDS+=	p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
 DEPENDS+=	p5-URI>=1.08:../../www/p5-URI
 DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/perl-ldap/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index c5d1cf8b78b..9e2ccfa47a0 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/10/18 15:20:18 veego Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/27 20:49:00 seb Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/06/24 18:43:28 jfitz Exp
 #
 
@@ -13,13 +13,11 @@ COMMENT=	Perl5 library for text-mode user interface widgets
 
 DEPENDS+=	p5-Curses>=1.02:../../devel/p5-Curses
 
-USE_PERL5=	# defined
+USE_BUILDLINK2=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/PV/.packlist
 
 pre-configure:
 	@${CP} ${FILESDIR}/Makefile.PL ${WRKSRC}/Makefile.PL
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/p5-finance-quote/Makefile b/finance/p5-finance-quote/Makefile
index 63fb6bc3516..e590d34ca38 100644
--- a/finance/p5-finance-quote/Makefile
+++ b/finance/p5-finance-quote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/11/26 06:49:57 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/27 20:48:59 seb Exp $
 
 DISTNAME=	Finance-Quote-1.06
 PKGNAME=	p5-finance-quote-1.06
@@ -12,11 +12,8 @@ COMMENT=	perl module to get stock quotes from Yahoo
 DEPENDS+=	p5-HTML-TableExtract-1.*:../../www/p5-HTML-TableExtract
 DEPENDS+=	p5-libwww>=5.48:../../www/p5-libwww
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Finance/Quote/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/p5-GDTextUtil/Makefile b/graphics/p5-GDTextUtil/Makefile
index 36125b5576a..3300e0f0a8a 100644
--- a/graphics/p5-GDTextUtil/Makefile
+++ b/graphics/p5-GDTextUtil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:14 fredb Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/27 20:49:02 seb Exp $
 #
 
 DISTNAME=	GDTextUtil-0.80
@@ -14,11 +14,8 @@ COMMENT=	Perl 5 text utilities for use with the GD drawing package
 
 DEPENDS+=	p5-GD>=1.30:../../graphics/p5-GD
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GD/Text/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
index 209412581df..eceb36b55db 100644
--- a/mail/p5-Email-Valid/Makefile
+++ b/mail/p5-Email-Valid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:03 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/27 20:48:59 seb Exp $
 
 DISTNAME=		Email-Valid-0.13
 PKGNAME=		p5-${DISTNAME}
@@ -12,11 +12,8 @@ COMMENT=		perl5 module for testing validity of an email address
 DEPENDS+=		p5-MailTools-[0-9]*:../../mail/p5-MailTools
 DEPENDS+=		p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Email/Valid/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
index af1445373a7..1fc27dc4412 100644
--- a/mail/p5-Mail-Audit/Makefile
+++ b/mail/p5-Mail-Audit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/12/12 14:39:59 martti Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 20:49:02 seb Exp $
 
 DISTNAME=	Mail-Audit-2.0
 PKGNAME=	p5-${DISTNAME}
@@ -14,11 +14,8 @@ DEPENDS+=	p5-Mail-ListDetector-[0-9]*:../../mail/p5-Mail-ListDetector
 # We need Net::SMTP from p5-Net.
 DEPENDS+=	p5-Net>=1.0:../../net/p5-Net
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Mail/Audit/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-ListDetector/Makefile b/mail/p5-Mail-ListDetector/Makefile
index 1ad7f22d626..410696eb607 100644
--- a/mail/p5-Mail-ListDetector/Makefile
+++ b/mail/p5-Mail-ListDetector/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:05 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/27 20:49:02 seb Exp $
 
 DISTNAME=		Mail-ListDetector-0.18
 PKGNAME=		p5-${DISTNAME}
@@ -14,11 +14,8 @@ DEPENDS+=		p5-Email-Valid-[0-9]*:../../mail/p5-Email-Valid
 DEPENDS+=		p5-URI-[0-9]*:../../www/p5-URI
 DEPENDS+=		p5-Test-Simple-[0-9]*:../../devel/p5-Test-Simple
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Mail/ListDetector/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Business-UPS/Makefile b/misc/p5-Business-UPS/Makefile
index 1f5479c43a2..b0b7863df35 100644
--- a/misc/p5-Business-UPS/Makefile
+++ b/misc/p5-Business-UPS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:08 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/27 20:48:59 seb Exp $
 #
 
 DISTNAME=		Business-UPS-1.13
@@ -13,11 +13,8 @@ COMMENT=		Perl5 module to handle UPS rate calculation and package tracking
 
 DEPENDS+=		p5-libwww>=5.48:../../www/p5-libwww
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Business/UPS/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-Net-SNMP/Makefile b/net/p5-Net-SNMP/Makefile
index b35657fa1eb..254a16f2179 100644
--- a/net/p5-Net-SNMP/Makefile
+++ b/net/p5-Net-SNMP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/01/18 22:50:16 mjl Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/27 20:48:58 seb Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
 #
 
@@ -17,11 +17,8 @@ DEPENDS+=	p5-Digest-MD5>=2.11:../../security/p5-Digest-MD5
 DEPENDS+=	p5-Digest-SHA1>=1.02:../../security/p5-Digest-SHA1
 DEPENDS+=	p5-Digest-HMAC>=1.00:../../security/p5-Digest-HMAC
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/SNMP/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-SNMP/Makefile b/net/p5-SNMP/Makefile
index 21267b53a62..6a73fc130e8 100644
--- a/net/p5-SNMP/Makefile
+++ b/net/p5-SNMP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/04/20 18:46:07 fredb Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/27 20:48:58 seb Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:53:13 jfitz Exp
 #
 
@@ -12,9 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=SNMP/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl5 module for interfacing to the UCD SNMP library
 
-DEPENDS=	ucd-snmp-4.2.4*:../../net/ucd-snmp
-
-USE_PERL5=	# defined
+USE_BUILDLINK2=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/SNMP/.packlist
 
 # Until the source catches up to the current Perl API, we need PERL_POLLUTE
@@ -24,9 +22,6 @@ PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/SNMP/.packlist
 PLFILES=	async1.pl async2.pl ipforward.pl mibtree.pl mibwalk.pl
 PLFILES+=	pingmib.pl tablewalk.pl testleak.pl
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
-
 post-build:
 	@for i in ${PLFILES} ; do ${ECHO} "#! ${PREFIX}/bin/perl" | ${CAT} - ${WRKSRC}/examples/$$i > ${WRKDIR}/$$i ; done
 
@@ -38,4 +33,6 @@ post-install:
 test:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} test
 
+.include "../../lang/perl5/module.mk"
+.include "../../net/ucd-snmp/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-Wais/Makefile b/net/p5-Wais/Makefile
index 196c2543ee3..a0c2d6e9bd1 100644
--- a/net/p5-Wais/Makefile
+++ b/net/p5-Wais/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/18 15:20:33 veego Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/27 20:48:58 seb Exp $
 #
 
 DISTNAME=	Wais-2.311
@@ -10,16 +10,14 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Wais/}
 MAINTAINER=	bad@netbsd.org
 COMMENT=	perl5 module for accessing WAIS servers
 
-DEPENDS+=	freewais-sf-2.2.12:../../net/freewais-sf
 DEPENDS+=	p5-Curses>=1.02:../../devel/p5-Curses
 
-USE_PERL5=	# defined
+USE_BUILDLINK2=	YES
 PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Wais/.packlist
 
 post-patch:
 	${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
+.include "../../lang/perl5/module.mk"
+.include "../../net/freewais-sf/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-ispman/Makefile b/net/p5-ispman/Makefile
index 2e7ec5a2e33..d079c930f4d 100644
--- a/net/p5-ispman/Makefile
+++ b/net/p5-ispman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:13 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 20:48:59 seb Exp $
 #
 
 DISTNAME=		ispman-0.5
@@ -19,33 +19,33 @@ DEPENDS+=		p5-IMAP-Admin>=1.2.5:../../mail/p5-IMAP-Admin
 DEPENDS+=		p5-Convert-ASN1>=0.07:../../textproc/p5-Convert-ASN1
 DEPENDS+=		p5-IO-stringy>=1.213:../../devel/p5-IO-stringy
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/ISPMan/.packlist
 PLIST_SRC=		${WRKDIR}/PLIST
+PERL5_CONFIGURE_DIRS=	${WRKSRC} ${WRKSRC}/../IO-stringy-1.212_patched
+BUILD_DIRS=		${PERL5_CONFIGURE_DIRS}
+INSTALL_DIRS=		${WRKSRC}
 
 MAKE_PARAMS+=		--noprompt
 
-do-configure:
+pre-configure:
 	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	cd ${WRKSRC} &&							\
 	for i in `${FIND} * -type f -print` ; do			\
 		${CP} $$i $$i.old &&					\
 		${SED} < $$i.old > $$i -e 's:/etc:${PREFIX}/etc:g' &&	\
 		${RM} $$i.old ;						\
-	done &&								\
-	${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
-	cd ${WRKSRC}/../IO-stringy-1.212_patched &&			\
-	${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
+	done
 
 post-build:
-	cd ${WRKSRC}/../IO-stringy-1.212_patched &&			\
-	${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET} && 			\
 	${ECHO} >> ${PLIST_SRC}						\
-	"`${GREP} ^INSTALLSITELIB Makefile | ${CUT} -d/ -f2-`/IO/ScalarPatched.pm"
+	"`${GREP} ^INSTALLSITELIB					\
+	   ${WRKSRC}/../IO-stringy-1.212_patched/Makefile		\
+	   | ${CUT} -d/ -f2-`/IO/ScalarPatched.pm"
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/../IO-stringy-1.212_patched/lib/IO/Scalar.pm \
 		${PREFIX}/`${TAIL} -n 1 ${PLIST_SRC}`
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/p5-Tie-EncryptedHash/Makefile b/security/p5-Tie-EncryptedHash/Makefile
index 1f457f51385..dcc8fd0d37e 100644
--- a/security/p5-Tie-EncryptedHash/Makefile
+++ b/security/p5-Tie-EncryptedHash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:19 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/27 20:48:58 seb Exp $
 #
 
 DISTNAME=		Tie-EncryptedHash-1.1
@@ -15,11 +15,8 @@ DEPENDS+=		p5-Crypt-CBC-[0-9]*:../../security/p5-Crypt-CBC
 DEPENDS+=		p5-Crypt-Blowfish-[0-9]*:../../security/p5-Crypt-Blowfish
 DEPENDS+=		p5-Crypt-DES-[0-9]*:../../security/p5-Crypt-DES
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Tie/EncryptedHash/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Checker/Makefile b/textproc/p5-XML-Checker/Makefile
index 87457b708b1..2b1018157bd 100644
--- a/textproc/p5-XML-Checker/Makefile
+++ b/textproc/p5-XML-Checker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/04/27 19:17:02 shell Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/27 20:49:01 seb Exp $
 
 DISTNAME=	XML-Checker-0.12
 PKGNAME=	p5-${DISTNAME}
@@ -12,11 +12,8 @@ CONFLICTS+=	p5-libxml-enno-[0-9]*
 
 DEPENDS+=	p5-XML-DOM-[0-9]*:../../textproc/p5-XML-DOM
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Checker/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile
index 790b1a58e54..ce92fd9cde2 100644
--- a/textproc/p5-XML-DOM/Makefile
+++ b/textproc/p5-XML-DOM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/04/17 10:59:55 shell Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/27 20:49:00 seb Exp $
 #
 
 DISTNAME=	XML-DOM-1.39
@@ -16,11 +16,8 @@ DEPENDS+=	p5-XML-RegExp-[0-9]*:../../textproc/p5-XML-RegExp
 
 CONFLICTS+=	p5-libxml-enno-[0-9]*
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-XQL/Makefile b/textproc/p5-XML-XQL/Makefile
index 07d76a35198..8fa5cc92781 100644
--- a/textproc/p5-XML-XQL/Makefile
+++ b/textproc/p5-XML-XQL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/07/26 12:09:20 mjl Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 20:49:01 seb Exp $
 #
 
 DISTNAME=	XML-XQL-0.67
@@ -16,11 +16,8 @@ DEPENDS+=	p5-Date-Manip-[0-9]*:../../devel/p5-Date-Manip
 
 CONFLICTS+=	p5-libxml-enno-[0-9]*
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/XQL/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-XSLT/Makefile b/textproc/p5-XML-XSLT/Makefile
index e395945fa00..7be76cd12cd 100644
--- a/textproc/p5-XML-XSLT/Makefile
+++ b/textproc/p5-XML-XSLT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/27 20:49:01 seb Exp $
 
 DISTNAME=	XML-XSLT-0.32
 PKGNAME=	p5-${DISTNAME}
@@ -13,11 +13,8 @@ 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_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-libxml-enno/Makefile b/textproc/p5-libxml-enno/Makefile
index c7a6e9a0a36..13ef0ece14e 100644
--- a/textproc/p5-libxml-enno/Makefile
+++ b/textproc/p5-libxml-enno/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/11/29 13:27:47 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/27 20:48:57 seb Exp $
 
 DISTNAME=	libxml-enno-1.05a
 PKGNAME=	p5-${DISTNAME}
@@ -21,11 +21,8 @@ CONFLICTS+=	p5-XML-Checker-[0-9]* p5-XML-RegExp-[0-9]*
 
 WRKSRC=		${WRKDIR}/libxml-enno-1.05
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/libxml-enno/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 1562caa7226..df8a7da6e2c 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/07/05 07:05:49 tron Exp $
+# $NetBSD: Makefile,v 1.15 2002/10/27 20:49:03 seb Exp $
 #
 
 DISTNAME=	Apache-ASP-2.21
@@ -11,7 +11,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.apache-asp.org/
 COMMENT=	perl5/Apache module of Perl-coded Active Server Pages
 
-DEPENDS+=	ap-perl>=1.25:../../www/ap-perl
 DEPENDS+=	p5-Apache-Filter>=1.019:../../www/p5-Apache-Filter
 DEPENDS+=	p5-Apache-SSI>=2.16:../../www/p5-Apache-SSI
 DEPENDS+=	p5-Compress-Zlib>=1.14:../../devel/p5-Compress-Zlib
@@ -24,11 +23,9 @@ DEPENDS+=	p5-Time-HiRes>=01.20:../../time/p5-Time-HiRes
 DEPENDS+=	p5-XML-XSLT>=0.32:../../textproc/p5-XML-XSLT
 DEPENDS+=	p5-libwww>=5.48:../../www/p5-libwww
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../www/ap-perl/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-DBILogConfig/Makefile b/www/p5-Apache-DBILogConfig/Makefile
index 49495865e6e..84e2488f21e 100644
--- a/www/p5-Apache-DBILogConfig/Makefile
+++ b/www/p5-Apache-DBILogConfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/09/25 18:39:36 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 20:49:03 seb Exp $
 #
 
 DISTNAME=	Apache-DBILogConfig-0.01
@@ -13,11 +13,8 @@ COMMENT=	database-independent Apache database logger
 DEPENDS+=	p5-Apache-DBI>=0.87:../../databases/p5-Apache-DBI
 DEPENDS+=	p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-Filter/Makefile b/www/p5-Apache-Filter/Makefile
index 80ba61683f1..1f68de53d51 100644
--- a/www/p5-Apache-Filter/Makefile
+++ b/www/p5-Apache-Filter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/27 20:49:01 seb Exp $
 
 DISTNAME=	Apache-Filter-1.019
 PKGNAME=	p5-${DISTNAME}
@@ -9,13 +9,9 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 module to alter the output of previous Apache handlers
 
-DEPENDS+=	ap-perl>=1.25:../../www/ap-perl
-
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../www/ap-perl/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-SSI/Makefile b/www/p5-Apache-SSI/Makefile
index dbdfb3c97c7..fbf7d151dc8 100644
--- a/www/p5-Apache-SSI/Makefile
+++ b/www/p5-Apache-SSI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/27 20:49:01 seb Exp $
 
 DISTNAME=	Apache-SSI-2.16
 PKGNAME=	p5-${DISTNAME}
@@ -9,14 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 MAINTAINER=	packages@netbsd.org
 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_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../www/ap-perl/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-ePerl/Makefile b/www/p5-Apache-ePerl/Makefile
index cc8ce805f99..d725d8b984b 100644
--- a/www/p5-Apache-ePerl/Makefile
+++ b/www/p5-Apache-ePerl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:47 veego Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 20:49:00 seb Exp $
 #
 
 DISTNAME=		eperl-2.2.14
@@ -12,14 +12,12 @@ HOMEPAGE=		http://www.engelschall.com/sw/eperl/
 COMMENT=		perl5/Apache module of an ePerl text parser
 
 DEPENDS+=		eperl-2.2.14:../../textproc/eperl
-DEPENDS+=		ap-perl>=1.19:../../www/ap-perl
 
-USE_PERL5=		# defined
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/ePerl/.packlist
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/mod/Apache
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
+.include "../../www/ap-perl/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-Format/Makefile b/www/p5-HTML-Format/Makefile
index 078813111f5..f222a9b2a6b 100644
--- a/www/p5-HTML-Format/Makefile
+++ b/www/p5-HTML-Format/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/07/16 15:29:33 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/27 20:48:59 seb Exp $
 
 DISTNAME=		HTML-Format-1.23
 PKGNAME=		p5-${DISTNAME}
@@ -12,11 +12,8 @@ COMMENT=		perl5 modules for converting HTML to other text formats
 DEPENDS+=		p5-Font-AFM>=1.18:../../fonts/p5-Font-AFM
 DEPENDS+=		p5-HTML-Tree>=3.04:../../www/p5-HTML-Tree
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 5e39d47b54f..857b01f4f36 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/04/17 10:46:04 shell Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/27 20:49:00 seb Exp $
 
 DISTNAME=		HTML-Mason-1.04
 PKGNAME=		p5-${DISTNAME}
@@ -14,11 +14,8 @@ 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_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-PrettyPrinter/Makefile b/www/p5-HTML-PrettyPrinter/Makefile
index 91df494aa71..f5a949baa03 100644
--- a/www/p5-HTML-PrettyPrinter/Makefile
+++ b/www/p5-HTML-PrettyPrinter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/27 20:48:57 seb Exp $
 
 DISTNAME=		HTML-PrettyPrinter-0.03
 PKGNAME=		p5-${DISTNAME}
@@ -12,11 +12,8 @@ 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_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index 26efdadb510..0e9132d5b18 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:37 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 20:48:56 seb Exp $
 
 DISTNAME=		HTML-Tree-3.11
 PKGNAME=		p5-${DISTNAME}
@@ -12,11 +12,8 @@ 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_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTTP-Request-Form/Makefile b/www/p5-HTTP-Request-Form/Makefile
index 3793f429a3a..fefa411d616 100644
--- a/www/p5-HTTP-Request-Form/Makefile
+++ b/www/p5-HTTP-Request-Form/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:37 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/27 20:48:57 seb Exp $
 #
 
 DISTNAME=	HTTP-Request-Form-0.7
@@ -15,11 +15,8 @@ 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_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-WWW-Amazon-Wishlist/Makefile b/www/p5-WWW-Amazon-Wishlist/Makefile
index a588ccf085b..e6db99a9512 100644
--- a/www/p5-WWW-Amazon-Wishlist/Makefile
+++ b/www/p5-WWW-Amazon-Wishlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/04 19:01:43 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/27 20:48:57 seb Exp $
 #
 
 DISTNAME=	WWW-Amazon-Wishlist-0.65
@@ -13,11 +13,8 @@ COMMENT=	perl5 module to get details from your Amazon wishlist
 
 DEPENDS+=	p5-libwww-*:../../www/p5-libwww
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/WWW/Amazon/Wishlist/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index b2eba1e5040..6377f49328c 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:52 veego Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/27 20:49:00 seb Exp $
 
 DISTNAME=	libapreq-0.33
 PKGNAME=	p5-${DISTNAME}
@@ -10,12 +10,9 @@ MAINTAINER=	packages@NetBSD.org
 HOMEPAGE=	http://trainedmonkey.com/
 COMMENT=	Lots of Apache specific httpd handling modules
 
-DEPENDS+=	ap-perl-1.*:../../www/ap-perl
-
-USE_PERL5=	# defined
+USE_BUILDLINK2=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/libapreq/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
+.include "../../lang/perl5/module.mk"
+.include "../../www/ap-perl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 93091f4cefe..1ac4b593d3d 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/03/15 12:52:51 martti Exp $
+# $NetBSD: Makefile,v 1.28 2002/10/27 20:48:56 seb Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/09/14 04:00:11 jfitz Exp
 #
 
@@ -19,12 +19,9 @@ DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
 DEPENDS+=	p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 DEPENDS+=	p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/libwww-perl/.packlist
 MAKE_PARAMS=		-n
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"