Convert to buildlink2. Use perl5/module.mk.

22 files changed, 66 insertions, 132 deletions

diff --git a/misc/p5-Search/Makefile b/misc/p5-Search/Makefile
index db6699c233a..3de2e63cd4e 100644
--- a/misc/p5-Search/Makefile
+++ b/misc/p5-Search/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/11/26 06:50:09 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/06 22:34:31 seb Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/06/24 18:43:31 jfitz Exp
 #
 
@@ -11,11 +11,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Search/}
 MAINTAINER=		packages@netbsd.org
 COMMENT=		perl5 module to provide framework for multiple searches
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Search/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/net/p5-IO-Interface/Makefile b/net/p5-IO-Interface/Makefile
index 8411b00644d..17b2d23e9c6 100644
--- a/net/p5-IO-Interface/Makefile
+++ b/net/p5-IO-Interface/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/15 12:16:10 he Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/06 22:33:18 seb Exp $
 #
 
 DISTNAME=		IO-Interface-0.97
@@ -10,11 +10,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=IO/}
 MAINTAINER=		he@netbsd.org
 COMMENT=		IO-Interface - get and set interface characteristics
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IO/Interface/.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-Daemon/Makefile b/net/p5-Net-Daemon/Makefile
index c4644c928a9..b2bf6978cd0 100644
--- a/net/p5-Net-Daemon/Makefile
+++ b/net/p5-Net-Daemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/07/24 19:45:26 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/06 22:31:11 seb Exp $
 #
 
 DISTNAME=	Net-Daemon-0.36
@@ -13,11 +13,8 @@ COMMENT=	perl5 module for writing networking daemons
 
 DEPENDS+= 	{p5-Data-Dumper-[0-9]*,perl>=5.6.1nb2}:${PERL5_PKGSRCDIR}
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/Daemon/.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-IRC/Makefile b/net/p5-Net-IRC/Makefile
index 7b5d7d2f5b0..2f1bd343439 100644
--- a/net/p5-Net-IRC/Makefile
+++ b/net/p5-Net-IRC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/01/26 06:51:17 martti Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/06 22:31:11 seb Exp $
 
 DISTNAME=		Net-IRC-0.73
 PKGNAME=		p5-${DISTNAME}
@@ -10,11 +10,8 @@ MAINTAINER=		damon@brodiefamily.org
 HOMEPAGE=		http://theoryx5.uwinnipeg.ca/CPAN/data/Net-IRC/Connection.html
 COMMENT=		Net::IRC - Perl Internet Relay Chat (IRC) Module
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/IRC/.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-TFTP/Makefile b/net/p5-Net-TFTP/Makefile
index e6dbf5fcdd1..9e570275411 100644
--- a/net/p5-Net-TFTP/Makefile
+++ b/net/p5-Net-TFTP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:11 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/06 22:31:10 seb Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
 #
 
@@ -12,11 +12,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 module for TFTP transfers
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/TFTP/.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-Telnet/Makefile b/net/p5-Net-Telnet/Makefile
index 285fd5acd11..c62e4dd9e01 100644
--- a/net/p5-Net-Telnet/Makefile
+++ b/net/p5-Net-Telnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:12 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/06 22:31:10 seb Exp $
 #
 
 DISTNAME=	Net-Telnet-3.02
@@ -10,11 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 module to use telnet
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/Telnet/.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_Session/Makefile b/net/p5-SNMP_Session/Makefile
index 279884192a9..07c2545d668 100644
--- a/net/p5-SNMP_Session/Makefile
+++ b/net/p5-SNMP_Session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:12 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/06 22:31:10 seb Exp $
 
 DISTNAME=	SNMP_Session-0.83
 PKGNAME=	p5-SNMP_Session-0.83
@@ -10,16 +10,13 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.switch.ch/misc/leinen/snmp/perl/
 COMMENT=	perl5 module providing rudimentary access to remote SNMP agents
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/SNMP_Session/.packlist
 
 CONFLICTS+=	mrtg-[0-9]*
 
-do-configure:
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PERL5_SITELIB}/README.SNMP_Session
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/p5-PostScript-MailLabels/Makefile b/print/p5-PostScript-MailLabels/Makefile
index c4adb55ead6..467177ee87b 100644
--- a/print/p5-PostScript-MailLabels/Makefile
+++ b/print/p5-PostScript-MailLabels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:13 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/06 22:31:09 seb Exp $
 
 DISTNAME=	PostScript-MailLabels-1.01
 PKGNAME=	p5-${DISTNAME}
@@ -10,11 +10,8 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.oplnk.net/~ajackson/software/maillabels/
 COMMENT=	create PostScript for printing on mailing label stock
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/PostScript/MailLabels/.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/security/p5-Crypt-Blowfish/Makefile b/security/p5-Crypt-Blowfish/Makefile
index 91ade868af5..aa92e16d97b 100644
--- a/security/p5-Crypt-Blowfish/Makefile
+++ b/security/p5-Crypt-Blowfish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:14 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/06 22:31:08 seb Exp $
 #
 
 DISTNAME=		Crypt-Blowfish-2.09
@@ -12,11 +12,8 @@ COMMENT=		perl5 Blowfish implementation
 
 CRYPTO=			YES
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Crypt/Blowfish/.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/security/p5-Crypt-DES/Makefile b/security/p5-Crypt-DES/Makefile
index 4a5774f52ce..18a86b722fd 100644
--- a/security/p5-Crypt-DES/Makefile
+++ b/security/p5-Crypt-DES/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:14 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/06 22:31:11 seb Exp $
 #
 
 DISTNAME=		Crypt-DES-2.03
@@ -10,11 +10,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Crypt/}
 MAINTAINER=		packages@netbsd.org
 COMMENT=		XS-based DES implementation for Perl
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Crypt/DES/.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/security/p5-Crypt-DES_EDE3/Makefile b/security/p5-Crypt-DES_EDE3/Makefile
index a1ef63c166e..035967ee90c 100644
--- a/security/p5-Crypt-DES_EDE3/Makefile
+++ b/security/p5-Crypt-DES_EDE3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:14 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/06 22:31:08 seb Exp $
 #
 
 DISTNAME=		Crypt-DES_EDE3-0.01
@@ -11,11 +11,8 @@ MAINTAINER=		packages@netbsd.org
 #HOMEPAGE=	
 COMMENT=		perl5 module for Triple-DES EDE encryption/decryption
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Crypt/DES_EDE3/.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/security/p5-Crypt-RIPEMD160/Makefile b/security/p5-Crypt-RIPEMD160/Makefile
index 8b78c70950c..740bc713bb0 100644
--- a/security/p5-Crypt-RIPEMD160/Makefile
+++ b/security/p5-Crypt-RIPEMD160/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:15 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/06 22:31:07 seb Exp $
 #
 
 DISTNAME=		Crypt-RIPEMD160-0.04
@@ -11,11 +11,8 @@ MAINTAINER=		packages@netbsd.org
 #HOMEPAGE=	
 COMMENT=		perl5 module of the RIPEMD160 hash function
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Crypt/RIPEMD160/.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/security/p5-Crypt-Rijndael/Makefile b/security/p5-Crypt-Rijndael/Makefile
index 9ccbefa3293..52659a9feb0 100644
--- a/security/p5-Crypt-Rijndael/Makefile
+++ b/security/p5-Crypt-Rijndael/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/12/10 15:34:40 martti Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/06 22:31:07 seb Exp $
 #
 
 DISTNAME=		Crypt-Rijndael-0.05
@@ -10,11 +10,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Crypt/}
 MAINTAINER=		packages@netbsd.org
 COMMENT=		perl5 module of the Rijndael symmetric key algorithm
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Crypt/Rijndael/.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/security/p5-Crypt-Twofish/Makefile b/security/p5-Crypt-Twofish/Makefile
index 1793cf1680d..47f03daa97c 100644
--- a/security/p5-Crypt-Twofish/Makefile
+++ b/security/p5-Crypt-Twofish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:16 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/06 22:31:08 seb Exp $
 #
 
 DISTNAME=		Crypt-Twofish-2.12
@@ -10,11 +10,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Crypt/}
 MAINTAINER=		packages@netbsd.org
 COMMENT=		perl5 module for the Twofish symmetric key algorithm
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Crypt/Twofish/.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/security/p5-Digest-MD2/Makefile b/security/p5-Digest-MD2/Makefile
index 10d767a736d..f84f3ee3cb9 100644
--- a/security/p5-Digest-MD2/Makefile
+++ b/security/p5-Digest-MD2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:16 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/06 22:31:07 seb Exp $
 #
 
 DISTNAME=		Digest-MD2-2.00
@@ -12,11 +12,8 @@ COMMENT=		perl5 module for MD2
 
 CONFLICTS+=		p5-Digest-MD5<=2.12
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Digest/MD2/.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/security/p5-Digest-MD4/Makefile b/security/p5-Digest-MD4/Makefile
index 6b054c0ee51..b88142eeec1 100644
--- a/security/p5-Digest-MD4/Makefile
+++ b/security/p5-Digest-MD4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:16 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/06 22:31:06 seb Exp $
 #
 
 DISTNAME=		Digest-MD4-1.1
@@ -11,11 +11,8 @@ MAINTAINER=		packages@netbsd.org
 #HOMEPAGE=	
 COMMENT=		perl5 module for MD4 hash algorithm
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Digest/MD4/.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/security/p5-SHA/Makefile b/security/p5-SHA/Makefile
index 7d2797c460d..985a0023b09 100644
--- a/security/p5-SHA/Makefile
+++ b/security/p5-SHA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:18 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/06 22:31:09 seb Exp $
 #
 
 DISTNAME=		SHA-1.2
@@ -10,11 +10,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=SHA/}
 MAINTAINER=		packages@netbsd.org
 COMMENT=		perl5 interface to the SHA1 algorithm
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/SHA/.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/sysutils/p5-Unix-Syslog/Makefile b/sysutils/p5-Unix-Syslog/Makefile
index 5cf99e0ba23..5f897ea52f1 100644
--- a/sysutils/p5-Unix-Syslog/Makefile
+++ b/sysutils/p5-Unix-Syslog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/08/19 09:58:10 shell Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/06 22:31:09 seb Exp $
 
 DISTNAME=	Unix-Syslog-0.99
 PKGNAME=	p5-${DISTNAME}
@@ -9,11 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Unix/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 module interface to the UNIX system logger
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Unix/Syslog/.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-Convert-BER/Makefile b/textproc/p5-Convert-BER/Makefile
index 16d789d043e..34a6a37213a 100644
--- a/textproc/p5-Convert-BER/Makefile
+++ b/textproc/p5-Convert-BER/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/11/26 06:50:20 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/06 22:31:05 seb Exp $
 #
 
 DISTNAME=	Convert-BER-1.31
@@ -10,11 +10,8 @@ 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_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Filter/Makefile b/textproc/p5-Filter/Makefile
index 2e1b758954f..db16d73ee52 100644
--- a/textproc/p5-Filter/Makefile
+++ b/textproc/p5-Filter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:21 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/06 22:31:05 seb Exp $
 #
 
 DISTNAME=	Filter-1.16
@@ -10,11 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Filter/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl5 classes representing a number of source filters
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Filter/.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-PDF/Makefile b/textproc/p5-PDF/Makefile
index 01b53ff3397..25be327ca57 100644
--- a/textproc/p5-PDF/Makefile
+++ b/textproc/p5-PDF/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:21 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/06 22:31:03 seb Exp $
 #
 
 DISTNAME=	PDF-111
@@ -12,13 +12,10 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.geocities.com/CapeCanaveral/Hangar/4794/
 COMMENT=	perl5 module for pdf document manipulation
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-Time/Makefile b/time/p5-Time/Makefile
index 4563b0f794e..4d0b03e1fc4 100644
--- a/time/p5-Time/Makefile
+++ b/time/p5-Time/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/04 22:04:19 tron Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/06 22:31:06 seb Exp $
 
 DISTNAME=      	Time-modules-101.062101
 PKGNAME=	p5-${DISTNAME:S/modules-//}
@@ -9,11 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Time/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 functions to convert and use time variables
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Time-modules/.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"