Use buildlink2. Use perl5/module.mk.

42 files changed, 128 insertions, 251 deletions

diff --git a/databases/p5-DBIx-Datasource/Makefile b/databases/p5-DBIx-Datasource/Makefile
index ae8338a483d..fc34ebf5944 100644
--- a/databases/p5-DBIx-Datasource/Makefile
+++ b/databases/p5-DBIx-Datasource/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:49:41 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/13 22:22:53 seb Exp $
 #
 
 DISTNAME=	DBIx-DataSource-0.02
@@ -11,11 +11,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.420.am/dbix-datasource
 COMMENT=	create and drop functions for databases
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/DBIx/DataSource/.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-DBIx-SearchBuilder/Makefile b/databases/p5-DBIx-SearchBuilder/Makefile
index 66a79d18d03..9cb350388a9 100644
--- a/databases/p5-DBIx-SearchBuilder/Makefile
+++ b/databases/p5-DBIx-SearchBuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/08/31 01:19:08 mjl Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/13 22:22:53 seb Exp $
 #
 
 DISTNAME=	DBIx-SearchBuilder-0.61
@@ -10,11 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBIx/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	extension for easy SQL SELECT Statement generation
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/DBIx/SearchBuilder/.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-MLDBM/Makefile b/databases/p5-MLDBM/Makefile
index ffa4256b6f1..48b428ff266 100644
--- a/databases/p5-MLDBM/Makefile
+++ b/databases/p5-MLDBM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/07/24 19:45:23 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/13 22:22:53 seb Exp $
 #
 
 DISTNAME=		MLDBM-2.00
@@ -13,14 +13,11 @@ COMMENT=		perl5 module for storing arbitrary data in tied hashes
 
 DEPENDS+= 		{p5-Data-Dumper-[0-9]*,perl>=5.6.1nb2}:${PERL5_PKGSRCDIR}
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/MLDBM/.packlist
 
 post-patch:
 	${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
 
-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-SQL-Statement/Makefile b/databases/p5-SQL-Statement/Makefile
index 100d69c4f9d..f4d7d73fa02 100644
--- a/databases/p5-SQL-Statement/Makefile
+++ b/databases/p5-SQL-Statement/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/02/14 16:02:50 mjl Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/13 22:22:54 seb Exp $
 #
 
 DISTNAME=	SQL-Statement-1.002
@@ -11,11 +11,8 @@ MAINTAINER=	packages@netbsd.org
 # HOMEPAGE=	http://
 COMMENT=	small, abstract SQL engine
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/SQL/Statement/.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-AppConfig/Makefile b/devel/p5-AppConfig/Makefile
index b2f9f3e24c1..9d0535ba9be 100644
--- a/devel/p5-AppConfig/Makefile
+++ b/devel/p5-AppConfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:44 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/13 22:22:52 seb Exp $
 
 DISTNAME=	AppConfig-1.52
 PKGNAME=	p5-${DISTNAME}
@@ -10,11 +10,8 @@ MAINTAINER=	packages@NetBSD.org
 HOMEPAGE=	http://www.kfs.org/~abw/
 COMMENT=	perl5 module for parsing config files and command line arguments
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/AppConfig/.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-AtExit/Makefile b/devel/p5-AtExit/Makefile
index 5e92afc4b75..78bda195b9c 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/26 06:49:45 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/13 22:22:52 seb Exp $
 #
 
 DISTNAME=	AtExit-2.01
@@ -10,11 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=AtExit/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Provides an ANSI C style atexit() function to Perl programs
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_ARCHLIB}/auto/AtExit/.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-Attribute-Handlers/Makefile b/devel/p5-Attribute-Handlers/Makefile
index e199d663b8e..51e97d09dbb 100644
--- a/devel/p5-Attribute-Handlers/Makefile
+++ b/devel/p5-Attribute-Handlers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/10 02:35:49 shell Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/13 22:22:52 seb Exp $
 
 DISTNAME=	Attribute-Handlers-0.77
 PKGNAME=	p5-${DISTNAME}
@@ -10,11 +10,8 @@ MAINTAINER=	packages@netbsd.org
 # HOMEPAGE=	
 COMMENT=	Simpler definition of attribute handlers
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Attribute/Handlers/.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-Bit-Vector/Makefile b/devel/p5-Bit-Vector/Makefile
index 96c7022b857..6e25bf720d0 100644
--- a/devel/p5-Bit-Vector/Makefile
+++ b/devel/p5-Bit-Vector/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/11/26 06:49:45 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/13 22:22:52 seb Exp $
 #
 
 DISTNAME=	Bit-Vector-6.1
@@ -11,11 +11,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Bit-Vector/Vector.html
 COMMENT=	Efficient base class implementing bit vectors
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Bit/Vector/.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-Class-Loader/Makefile b/devel/p5-Class-Loader/Makefile
index e19860589f5..d3de7813050 100644
--- a/devel/p5-Class-Loader/Makefile
+++ b/devel/p5-Class-Loader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:45 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/13 22:22:51 seb Exp $
 #
 
 DISTNAME=		Class-Loader-2.02
@@ -12,11 +12,8 @@ MAINTAINER=		mcr@netbsd.org
 #HOMEPAGE=	
 COMMENT=		perl5 module for module loading and on-demand object creation
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Class/Loader/.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-Class-ObjectTemplate/Makefile b/devel/p5-Class-ObjectTemplate/Makefile
index c9d0f213614..6b1ec0a56dc 100644
--- a/devel/p5-Class-ObjectTemplate/Makefile
+++ b/devel/p5-Class-ObjectTemplate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/01 02:32:35 abs Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/13 22:22:51 seb Exp $
 
 DISTNAME=	Class-ObjectTemplate-0.4
 PKGNAME=	p5-${DISTNAME}
@@ -10,11 +10,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.oreilly.com/catalog/advperl/
 COMMENT=	Perl extension for optimized template builder base class
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Class/ObjectTemplate/.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-Data-Buffer/Makefile b/devel/p5-Data-Buffer/Makefile
index 2ef9af6a707..9fb7bc3318c 100644
--- a/devel/p5-Data-Buffer/Makefile
+++ b/devel/p5-Data-Buffer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:47 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/13 22:22:51 seb Exp $
 #
 
 DISTNAME=		Data-Buffer-0.04
@@ -12,11 +12,8 @@ MAINTAINER=		mcr@netbsd.org
 #HOMEPAGE=	
 COMMENT=		perl5 module for low-level binary buffer
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Data/Buffer/.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-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index 933a2b7e895..c375a665687 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/11/26 06:49:48 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/13 22:22:54 seb Exp $
 #
 
 DISTNAME=		Data-ShowTable-3.3
@@ -10,11 +10,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Data/}
 MAINTAINER=		bad@netbsd.org
 COMMENT=		Perl module to print arrays of data in nicely formatted listings
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Data/ShowTable/.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-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 63327850fb4..c0e1d0e4514 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/11/26 06:49:48 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/13 22:22:54 seb Exp $
 #
 
 DISTNAME=     	DateManip-5.39
@@ -11,11 +11,8 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.cpan.org/
 COMMENT=	perl5 module for date calculations
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Date/Manip/.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-Devel-Symdump/Makefile b/devel/p5-Devel-Symdump/Makefile
index c12346bcb30..b16c48828c8 100644
--- a/devel/p5-Devel-Symdump/Makefile
+++ b/devel/p5-Devel-Symdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/26 06:49:49 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/13 22:22:51 seb Exp $
 #
 
 DISTNAME=	Devel-Symdump-2.01
@@ -10,11 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Devel/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 module for inspecting perl's symtable/class hiers
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Devel/Symdump/.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-Event/Makefile b/devel/p5-Event/Makefile
index 6a4762bb3f5..f4cc68c491a 100644
--- a/devel/p5-Event/Makefile
+++ b/devel/p5-Event/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/01/12 17:47:20 explorer Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/13 22:22:51 seb Exp $
 
 DISTNAME=	Event-0.83
 PKGNAME=	p5-${DISTNAME}
@@ -9,11 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/J/JP/JPRIT/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Event library for Perl
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Event/.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-Expect/Makefile b/devel/p5-Expect/Makefile
index 074aa0a6ca9..9873f8cea46 100644
--- a/devel/p5-Expect/Makefile
+++ b/devel/p5-Expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/04/17 10:29:49 shell Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/13 22:22:50 seb Exp $
 
 DISTNAME=	Expect-1.15
 PKGNAME=	p5-expect-1.15
@@ -12,11 +12,8 @@ COMMENT=	perl version of the TCL "expect" tool
 DEPENDS+=	p5-IO-stty-[0-9]*:../../devel/p5-IO-Stty
 DEPENDS+=	p5-IO-tty-[0-9]*:../../devel/p5-IO-Tty
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Expect/.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-ExtUtils-F77/Makefile b/devel/p5-ExtUtils-F77/Makefile
index ce8f3085430..3d5cc8b251b 100644
--- a/devel/p5-ExtUtils-F77/Makefile
+++ b/devel/p5-ExtUtils-F77/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/11/26 06:49:49 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/13 22:22:50 seb Exp $
 
 DISTNAME=	ExtUtils-F77-1.13
 PKGNAME=	p5-${DISTNAME}
@@ -9,11 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=ExtUtils/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl module for determining how to link Fortran and C
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/ExtUtils/F77/.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-File-FlockDir/Makefile b/devel/p5-File-FlockDir/Makefile
index 227fc312469..a43bdad6cd1 100644
--- a/devel/p5-File-FlockDir/Makefile
+++ b/devel/p5-File-FlockDir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:50 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/13 22:22:50 seb Exp $
 #
 
 DISTNAME=	File-FlockDir-1.02
@@ -10,11 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	FlockDir - override perl flock() for network or portability purposes
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/File/FlockDir/.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-File-PathConvert/Makefile b/devel/p5-File-PathConvert/Makefile
index b785d03fb51..d40126836b6 100644
--- a/devel/p5-File-PathConvert/Makefile
+++ b/devel/p5-File-PathConvert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/03/15 12:11:10 martti Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/13 22:22:49 seb Exp $
 #
 
 DISTNAME=	File-PathConvert-0.9
@@ -11,11 +11,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/File-PathConvert/
 COMMENT=	Convert paths and URLs from absolute to relative and vice versa
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/File/PathConvert/.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-File-Temp/Makefile b/devel/p5-File-Temp/Makefile
index 65c1b2d5834..d51b3d698cc 100644
--- a/devel/p5-File-Temp/Makefile
+++ b/devel/p5-File-Temp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:50 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/13 22:22:49 seb Exp $
 #
 
 DISTNAME=	File-Temp-0.12
@@ -10,11 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	provides functions for generating temporary files
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/File/Temp/.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-FileKGlob/Makefile b/devel/p5-FileKGlob/Makefile
index f43e1c9c5c2..3d770a0da74 100644
--- a/devel/p5-FileKGlob/Makefile
+++ b/devel/p5-FileKGlob/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/11/26 06:49:50 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/13 22:22:49 seb Exp $
 #
 
 DISTNAME=	FileKGlob
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Expand a Unix file glob into a list of matching file names
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/File/KGlob/.packlist
 
 DIST_SUBDIR=	${PKGNAME}
@@ -19,8 +19,5 @@ DIST_SUBDIR=	${PKGNAME}
 pre-configure:
 	${CP} ${FILESDIR}/Makefile.PL ${WRKSRC}/Makefile.PL
 
-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-FreezeThaw/Makefile b/devel/p5-FreezeThaw/Makefile
index 24f8a8cfb9e..37ca3c75ad0 100644
--- a/devel/p5-FreezeThaw/Makefile
+++ b/devel/p5-FreezeThaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:51 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/13 22:22:49 seb Exp $
 #
 
 DISTNAME=	FreezeThaw-0.41
@@ -10,11 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=FreezeThaw/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	converting Perl structures to strings and back
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/FreezeThaw/.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-Heap/Makefile b/devel/p5-Heap/Makefile
index 1218896901d..09ff3c1ef7e 100644
--- a/devel/p5-Heap/Makefile
+++ b/devel/p5-Heap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/28 19:23:55 seb Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/13 22:22:48 seb Exp $
 
 DISTNAME=	Heap-0.50
 PKGNAME=	p5-${DISTNAME}
@@ -11,8 +11,5 @@ COMMENT=	Perl collection of routines for managing a heap data structure
 USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Heap/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-IO-String/Makefile b/devel/p5-IO-String/Makefile
index 376a02bc749..c8fba2d6928 100644
--- a/devel/p5-IO-String/Makefile
+++ b/devel/p5-IO-String/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/30 02:02:50 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/13 22:22:48 seb Exp $
 #
 
 DISTNAME=	IO-String-1.01
@@ -9,11 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IO/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl module for I/O on in-core objects like strings and arrays
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IO/String/.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-IO-Stty/Makefile b/devel/p5-IO-Stty/Makefile
index 74953540527..dac3dabfb73 100644
--- a/devel/p5-IO-Stty/Makefile
+++ b/devel/p5-IO-Stty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/26 06:49:51 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/13 22:22:50 seb Exp $
 
 DISTNAME=	IO-Stty-.02
 PKGNAME=	p5-IO-stty-0.02
@@ -9,11 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IO/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl class for I/O on tty devices
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IO/Stty/.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-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index 6f5ed7b79d1..c4c789e079a 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/04/17 10:22:28 shell Exp $
+# $NetBSD: Makefile,v 1.10 2002/10/13 22:22:50 seb Exp $
 #
 
 DISTNAME=	IO-Tty-1.02
@@ -10,11 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IO/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Another Perl class for I/O on tty and pseudo-tty devices
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IO/Tty/.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-IO-stringy/Makefile b/devel/p5-IO-stringy/Makefile
index 84dc5ad5c14..d6c8708c19d 100644
--- a/devel/p5-IO-stringy/Makefile
+++ b/devel/p5-IO-stringy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/11/26 06:49:52 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/13 22:22:48 seb Exp $
 #
 
 DISTNAME=	IO-stringy-2.108
@@ -11,11 +11,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.zeegee.com/code/perl/IO-stringy/
 COMMENT=	Perl class for I/O on in-core objects like strings and arrays
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IO-stringy/.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-IPC-ShareLite/Makefile b/devel/p5-IPC-ShareLite/Makefile
index dd305ed9884..dacfbab69a1 100644
--- a/devel/p5-IPC-ShareLite/Makefile
+++ b/devel/p5-IPC-ShareLite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/11/28 05:20:47 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/13 22:22:48 seb Exp $
 #
 
 DISTNAME=	IPC-ShareLite-0.08
@@ -9,11 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IPC/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Light-weight interface to shared memory
 
-USE_BUILDLINK_ONLY=	 YES
+USE_BUILDLINK2=		 YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IPC/ShareLite/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL </dev/null
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
+
+# ensure this is at the end of MAKE_PARAMS
+MAKE_PARAMS+=	</dev/null
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index a1d55ff2904..bdc65f7670e 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:49:52 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/13 22:22:47 seb Exp $
 
 DISTNAME=	Log-Dispatch-1.79
 PKGNAME=	p5-${DISTNAME}
@@ -9,11 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Log/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl module for logging messages to multiple outputs
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Log/Dispatch/.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-Make/Makefile b/devel/p5-Make/Makefile
index ac510ad05ec..f3c749e7448 100644
--- a/devel/p5-Make/Makefile
+++ b/devel/p5-Make/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:52 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/13 22:22:47 seb Exp $
 
 DISTNAME=	Make-1.00
 PKGNAME=	p5-Make-1.00
@@ -10,11 +10,8 @@ MAINTAINER=	packages@netbd.org
 HOMEPAGE=	http://www.ni-s.u-net.com/
 COMMENT=	Perl5 module implementing 'make' in Perl
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Make/.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-Memoize/Makefile b/devel/p5-Memoize/Makefile
index 5bcee3551b4..f17c60c2132 100644
--- a/devel/p5-Memoize/Makefile
+++ b/devel/p5-Memoize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:49:52 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/13 22:22:46 seb Exp $
 #
 
 DISTNAME=	Memoize-0.65
@@ -11,11 +11,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://perl.plover.com/
 COMMENT=	Transparently speed up functions by caching return values
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Memoize/.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-Parse-RecDescent/Makefile b/devel/p5-Parse-RecDescent/Makefile
index 6af1d7a62b6..c55a405cb72 100644
--- a/devel/p5-Parse-RecDescent/Makefile
+++ b/devel/p5-Parse-RecDescent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/19 14:48:25 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/13 22:22:47 seb Exp $
 #
 
 DISTNAME=	Parse-RecDescent-1.80
@@ -9,11 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Parse/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=		generate recursive-descent parsers
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Parse/RecDescent/.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-Parse-Yapp/Makefile b/devel/p5-Parse-Yapp/Makefile
index ee98d3f172b..0db256b3f85 100644
--- a/devel/p5-Parse-Yapp/Makefile
+++ b/devel/p5-Parse-Yapp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/28 11:25:26 martti Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/13 22:22:46 seb Exp $
 #
 
 DISTNAME=      	Parse-Yapp-1.05
@@ -10,11 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Parse/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 LALR parser
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Parse/Yapp/.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-Safe-Hole/Makefile b/devel/p5-Safe-Hole/Makefile
index 69396e87aaa..0933b745382 100644
--- a/devel/p5-Safe-Hole/Makefile
+++ b/devel/p5-Safe-Hole/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:53 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/13 22:22:46 seb Exp $
 #
 
 DISTNAME=	Safe-Hole-0.08
@@ -11,11 +11,8 @@ MAINTAINER=	eric@cirr.com
 HOMEPAGE=	http://theoryx5.uwinnipeg.ca/CPAN/data/Safe-Hole/Hole.html
 COMMENT=	Exec subs in the original package from within a Safe object
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Safe/Hole/.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-SortVersions/Makefile b/devel/p5-SortVersions/Makefile
index 1119debac82..86388642d0e 100644
--- a/devel/p5-SortVersions/Makefile
+++ b/devel/p5-SortVersions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:54 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/13 22:22:46 seb Exp $
 #
 
 DISTNAME=		SortVersions-1.1
@@ -11,11 +11,8 @@ MAINTAINER=		mcr@netbsd.org
 #HOMEPAGE=	
 COMMENT=		perl5 module for sorting of revision-like numbers
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Sort/Versions/.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-Storable/Makefile b/devel/p5-Storable/Makefile
index dd521d98ff0..bb21673a961 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/06/19 07:36:27 skrll Exp $
+# $NetBSD: Makefile,v 1.10 2002/10/13 22:22:47 seb Exp $
 
 DISTNAME=	Storable-2.04
 PKGNAME=	p5-${DISTNAME}
@@ -9,11 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Storable/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl extension module for persistent data storage
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_ARCHLIB}/auto/Storable/.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-Term-ReadKey/Makefile b/devel/p5-Term-ReadKey/Makefile
index 8ec100f37e5..8cc4dbc2f66 100644
--- a/devel/p5-Term-ReadKey/Makefile
+++ b/devel/p5-Term-ReadKey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/07/30 01:49:56 grant Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/13 22:22:54 seb Exp $
 #
 
 VERS=		2.21
@@ -12,11 +12,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/TermReadKey/
 COMMENT=	Change terminal modes and perform non-blocking reads
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Term/ReadKey/.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-Test-Cmd/Makefile b/devel/p5-Test-Cmd/Makefile
index 0e271e3d8e5..cf7e5e17ad1 100644
--- a/devel/p5-Test-Cmd/Makefile
+++ b/devel/p5-Test-Cmd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/11/26 06:49:54 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/13 22:22:46 seb Exp $
 
 DISTNAME=	Test-Cmd-1.04
 PKGNAME=        p5-${DISTNAME}
@@ -10,11 +10,8 @@ MAINTAINER=	wulf@netbsd.org
 HOMEPAGE=	http://www.baldmt.com/Test-Cmd/
 COMMENT=	perl5 module for testing of external commands and scripts
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Test/Cmd/.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-Test-Harness/Makefile b/devel/p5-Test-Harness/Makefile
index 9a8a7eef2a6..6783cb2affc 100644
--- a/devel/p5-Test-Harness/Makefile
+++ b/devel/p5-Test-Harness/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/06/03 13:08:56 shell Exp $
+# $NetBSD: Makefile,v 1.10 2002/10/13 22:22:47 seb Exp $
 
 DISTNAME=		Test-Harness-2.24
 PKGNAME=		p5-${DISTNAME}
@@ -9,11 +9,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Test/}
 MAINTAINER=		shell@netbsd.org
 COMMENT=		perl5 module for testing
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Test/Harness/.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-Tie-IxHash/Makefile b/devel/p5-Tie-IxHash/Makefile
index b51ece88c90..83fa37a3f88 100644
--- a/devel/p5-Tie-IxHash/Makefile
+++ b/devel/p5-Tie-IxHash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:55 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/13 22:22:45 seb Exp $
 #
 
 DISTNAME=      	Tie-IxHash-1.21
@@ -10,11 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Tie/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl module that implements ordered in-memory associative arrays
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Tie/IxHash/.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-ASN1/Makefile b/textproc/p5-Convert-ASN1/Makefile
index 656a0847d69..4e778668aeb 100644
--- a/textproc/p5-Convert-ASN1/Makefile
+++ b/textproc/p5-Convert-ASN1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/08/20 14:37:41 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/10/13 22:22:52 seb Exp $
 #
 
 DISTNAME=		Convert-ASN1-0.16
@@ -11,11 +11,8 @@ MAINTAINER=		packages@netbsd.org
 #HOMEPAGE=	
 COMMENT=		perl5 module to encode/decode ASN.1 data
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-CSV_XS/Makefile b/textproc/p5-Text-CSV_XS/Makefile
index c439be98115..2bb5ea9f918 100644
--- a/textproc/p5-Text-CSV_XS/Makefile
+++ b/textproc/p5-Text-CSV_XS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/30 14:23:02 mjl Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/13 22:22:54 seb Exp $
 #
 
 DISTNAME=	Text-CSV_XS-0.23
@@ -11,11 +11,8 @@ MAINTAINER=	packages@netbsd.org
 # HOMEPAGE=	http://
 COMMENT=	Routines for composition and decomposition of comma-separated values
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"