Use buildlink2. Use perl5/module.mk.

31 files changed, 94 insertions, 185 deletions

diff --git a/archivers/p5-Archive-Tar/Makefile b/archivers/p5-Archive-Tar/Makefile
index 8fd833c90ce..0b89a2517df 100644
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:36 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/20 17:46:03 seb Exp $
 
 DISTNAME=		Archive-Tar-0.22
 PKGNAME=		p5-${DISTNAME}
@@ -11,11 +11,8 @@ COMMENT=		perl5 module interface to manipulate tar files
 
 DEPENDS+=		p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Archive/Tar/.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/archivers/p5-Archive-Zip/Makefile b/archivers/p5-Archive-Zip/Makefile
index cb8fd911d83..185a2608c97 100644
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/27 03:19:21 explorer Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/20 17:46:03 seb Exp $
 
 DISTNAME=		Archive-Zip-0.11
 PKGNAME=		p5-${DISTNAME}
@@ -11,11 +11,8 @@ COMMENT=		perl5 module interface to manipulate zip files
 
 DEPENDS+=		p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Archive/Zip/.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/audio/p5-Audio-Wav/Makefile b/audio/p5-Audio-Wav/Makefile
index 91f83c9865a..a238818828c 100644
--- a/audio/p5-Audio-Wav/Makefile
+++ b/audio/p5-Audio-Wav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/26 01:46:41 grant Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/20 17:46:01 seb Exp $
 #
 
 DISTNAME=	Audio-Wav-0.02
@@ -10,11 +10,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://search.cpan.org/dist/Audio-Wav/
 COMMENT=	perl modules for reading & writing Microsoft WAV files
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Audio/Wav/.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/audio/p5-MP3-Info/Makefile b/audio/p5-MP3-Info/Makefile
index ee5dfea94a8..2415caf52f4 100644
--- a/audio/p5-MP3-Info/Makefile
+++ b/audio/p5-MP3-Info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/05/26 10:39:22 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/20 17:46:02 seb Exp $
 
 DISTNAME=	MP3-Info-1.01
 PKGNAME=	p5-${DISTNAME}
@@ -9,11 +9,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://search.cpan.org/search?module=MP3::Info
 COMMENT=	Manipulate / fetch info from MP3 audio files
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/MP3/Info/.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/audio/p5-MP3-Tag/Makefile b/audio/p5-MP3-Tag/Makefile
index cc71745703f..83b1ace4249 100644
--- a/audio/p5-MP3-Tag/Makefile
+++ b/audio/p5-MP3-Tag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:38 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/20 17:46:01 seb Exp $
 
 DISTNAME=	tagged-0.30
 PKGNAME=	p5-MP3-Tag-0.30
@@ -12,11 +12,8 @@ COMMENT=	this is a perl module to read/write tags of mp3-files
 
 DEPENDS=        p5-Compress-Zlib-1.*:../../devel/p5-Compress-Zlib
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/MP3/Tag/.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/chat/p5-Net-Goofey/Makefile b/chat/p5-Net-Goofey/Makefile
index f653ce78f6e..e1b33dd7b43 100644
--- a/chat/p5-Net-Goofey/Makefile
+++ b/chat/p5-Net-Goofey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/20 01:07:10 grant Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/20 17:46:01 seb Exp $
 #
 
 DISTNAME=	Net-Goofey-1.5
@@ -10,11 +10,8 @@ MAINTAINER=	grant@netbsd.org
 HOMEPAGE=	http://tertius.net.au/~gossamer/code/
 COMMENT=	perl module for communicating with a Goofey server
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/Goofey/.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/chat/p5-Net-ICQ2000/Makefile b/chat/p5-Net-ICQ2000/Makefile
index 5c3137ace07..b88693da0c6 100644
--- a/chat/p5-Net-ICQ2000/Makefile
+++ b/chat/p5-Net-ICQ2000/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/11/28 12:28:23 martti Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/20 17:46:01 seb Exp $
 #
 
 DISTNAME=	Net-ICQ2000-0.2.1
@@ -10,10 +10,8 @@ MAINTAINER=	shell@shellhung.org
 HOMEPAGE=	http://icq2000.phase3solutions.com/
 COMMENT=	perl5 modules for the ICQv7 protocol realisation
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Net/ICQ2000/.packlist
-
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+USE_BUILDLINK2=		YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/ICQ2000/.packlist
 
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/p5-Device-SerialPort/Makefile b/comms/p5-Device-SerialPort/Makefile
index e8f4ce3e941..b1938dc6c29 100644
--- a/comms/p5-Device-SerialPort/Makefile
+++ b/comms/p5-Device-SerialPort/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/11/26 06:49:38 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/20 17:46:00 seb Exp $
 #
 
 DISTNAME=	Device-SerialPort-0.070
@@ -12,13 +12,10 @@ MAINTAINER=	damon@brodiefamily.org
 HOMEPAGE=	http://members.aol.com/Bbirthisel/alpha.html
 COMMENT=	POSIX-based Perl module to control your serial port
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Device/SerialPort/.packlist
 
 MAKE_PARAMS=	${DEFAULT_SERIAL_DEVICE}
 
-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"
diff --git a/converters/p5-Convert-UUlib/Makefile b/converters/p5-Convert-UUlib/Makefile
index c2d6370c3b4..7cac7a2ce8c 100644
--- a/converters/p5-Convert-UUlib/Makefile
+++ b/converters/p5-Convert-UUlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/31 17:03:39 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/20 17:46:00 seb Exp $
 
 DISTNAME=		Convert-UUlib-0.213
 PKGNAME=		p5-${DISTNAME}
@@ -9,11 +9,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Convert/}
 MAINTAINER=		packages@netbsd.org
 COMMENT=		perl5 module interface to the uulib library
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Convert/UUlib/.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-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index 26214db91fe..6e8e5c26bb4 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/11/26 06:49:39 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2002/10/20 17:46:00 seb Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/08/04 22:47:16 ache Exp
 #
 
@@ -13,11 +13,8 @@ MAINTAINER=		hubertf@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/MIME-Base64/Base64.html
 COMMENT=		perl5 module for Base64 and Quoted-Printable encodings
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/MIME/Base64/.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-nkf/Makefile b/converters/p5-nkf/Makefile
index f68e8b3bba8..fd39b0ee093 100644
--- a/converters/p5-nkf/Makefile
+++ b/converters/p5-nkf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:00:22 seb Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/20 17:45:59 seb Exp $
 #
 
 DISTNAME=	nkf-1.7
@@ -10,13 +10,10 @@ MASTER_SITES=	ftp://ftp.sra.co.jp/pub/cmd/nkf/
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 COMMENT=	Perl library for Network Kanji code conversion Filter
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/NKF/.packlist
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/NKF
 
-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-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index 8510066e113..b3221fc88ba 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/12/19 10:43:20 mjl Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/20 17:46:02 seb Exp $
 #
 
 DISTNAME=	Config-IniFiles-2.23
@@ -11,11 +11,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://sourceforge.net/projects/config-inifiles/
 COMMENT=	Perl module for reading .ini-style configuration files
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Config/IniFiles/.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-Image-Info/Makefile b/graphics/p5-Image-Info/Makefile
index 598c8b95fa6..04238910776 100644
--- a/graphics/p5-Image-Info/Makefile
+++ b/graphics/p5-Image-Info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/08/05 14:28:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/20 17:46:06 seb Exp $
 #
 
 DISTNAME=	Image-Info-1.10
@@ -13,11 +13,8 @@ COMMENT=	perl module to extract meta information from images
 
 DEPENDS+=	p5-IO-String>=1.01:../../devel/p5-IO-String
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Image/Info/.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-MIME-tools/Makefile b/mail/p5-MIME-tools/Makefile
index 50ea46ae978..921b6e98476 100644
--- a/mail/p5-MIME-tools/Makefile
+++ b/mail/p5-MIME-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/09/26 02:01:42 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/10/20 17:46:00 seb Exp $
 #
 
 DISTNAME=       MIME-tools-5.411a
@@ -15,13 +15,10 @@ DEPENDS+=	p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
 DEPENDS+=	p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
 DEPENDS+=	p5-MailTools-[0-9]*:../../mail/p5-MailTools
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/MIME-tools/.packlist
 
 WRKSRC=		${WRKDIR}/MIME-tools-5.411
 
-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-Sendmail/Makefile b/mail/p5-Mail-Sendmail/Makefile
index 1a0dd3d9625..1f1ed5d5d12 100644
--- a/mail/p5-Mail-Sendmail/Makefile
+++ b/mail/p5-Mail-Sendmail/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/20 17:46:06 seb Exp $
 
 DISTNAME=	Mail-Sendmail-0.78
 PKGNAME=	p5-${DISTNAME}
@@ -12,11 +12,8 @@ COMMENT=	perl5 module dedicated to Sendmail
 
 DEPENDS+=	p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Mail/Sendmail/.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/math/p5-Spreadsheet-WriteExcel/Makefile b/math/p5-Spreadsheet-WriteExcel/Makefile
index e8b84c9ab6d..a8c7578cc66 100644
--- a/math/p5-Spreadsheet-WriteExcel/Makefile
+++ b/math/p5-Spreadsheet-WriteExcel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/19 15:03:31 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/20 17:46:05 seb Exp $
 #
 
 DISTNAME=	Spreadsheet-WriteExcel-0.35
@@ -11,11 +11,8 @@ COMMENT=	Create Excel data files
 
 DEPENDS+=	p5-Parse-RecDescent-*:../../devel/p5-Parse-RecDescent
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Spreadsheet/WriteExcel/.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-ControlX10-CM11/Makefile b/misc/p5-ControlX10-CM11/Makefile
index 6eebe4c4cc2..031ba95511f 100644
--- a/misc/p5-ControlX10-CM11/Makefile
+++ b/misc/p5-ControlX10-CM11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:08 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/20 17:46:05 seb Exp $
 #
 
 DISTNAME=	ControlX10-CM11-2.09
@@ -13,11 +13,8 @@ COMMENT=	perl5 module for controlling the X10 CM11A controller
 
 DEPENDS+=	p5-Device-SerialPort>=0.070:../../comms/p5-Device-SerialPort
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/ControlX10/CM11/.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-ControlX10-CM17/Makefile b/misc/p5-ControlX10-CM17/Makefile
index e63906ed48a..f867c964968 100644
--- a/misc/p5-ControlX10-CM17/Makefile
+++ b/misc/p5-ControlX10-CM17/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/20 17:46:05 seb Exp $
 
 DISTNAME=	ControlX10-CM17-0.07
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	perl5 module for controlling the X10 CM17A controller
 
 DEPENDS+=	p5-Device-SerialPort>=0.070:../../comms/p5-Device-SerialPort
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/ControlX10/CM17/.packlist
 
 # We don't actually install the example perl script, but we patch it
@@ -29,8 +29,5 @@ post-patch:
 		${MV} -f $${file}.fixed $${file};			\
 	done
 
-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-Socket-Multicast/Makefile b/net/p5-IO-Socket-Multicast/Makefile
index c36b4f1bc8c..178979f93c3 100644
--- a/net/p5-IO-Socket-Multicast/Makefile
+++ b/net/p5-IO-Socket-Multicast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/15 12:19:02 he Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/20 17:46:05 seb Exp $
 #
 
 DISTNAME=		IO-Socket-Multicast-0.25
@@ -12,11 +12,8 @@ COMMENT=		IO::Socket::Multicast - perl multicast socket IO
 
 DEPENDS+=		p5-IO-Interface>=0.94:../../net/p5-IO-Interface
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IO/Socket/Multicast/.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-Socket6/Makefile b/net/p5-Socket6/Makefile
index b2e6ab00ec6..b00520600b4 100644
--- a/net/p5-Socket6/Makefile
+++ b/net/p5-Socket6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/11/26 06:50:12 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/20 17:46:01 seb Exp $
 #
 
 DISTNAME=		Socket6-0.08
@@ -11,7 +11,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/libnet/FAQ.html
 COMMENT=		perl5 module to support getaddrinfo() and getnameinfo()
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Socket6/.packlist
 
 # supports IPv6 (actually, af independent)
@@ -19,8 +19,5 @@ BUILD_DEFS+=		USE_INET6
 
 MAKE_ENV+=		CCFLAGS="${CFLAGS} ${CPPFLAGS}"
 
-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-CBC/Makefile b/security/p5-Crypt-CBC/Makefile
index 5c2783ea90e..a90f293ff08 100644
--- a/security/p5-Crypt-CBC/Makefile
+++ b/security/p5-Crypt-CBC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/01/28 14:19:14 martti Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/20 17:46:04 seb Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:23 jfitz Exp
 #
 
@@ -13,11 +13,8 @@ COMMENT=		perl5 cipher block chaining mode for various crypto algorithms
 
 DEPENDS+=		p5-Digest-MD5>=2.16:../../security/p5-Digest-MD5
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Crypt/CBC/.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-HMAC/Makefile b/security/p5-Digest-HMAC/Makefile
index f88cedff899..0831b65d412 100644
--- a/security/p5-Digest-HMAC/Makefile
+++ b/security/p5-Digest-HMAC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/11/30 15:20:45 mjl Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/20 17:46:05 seb Exp $
 #
 
 DISTNAME=		Digest-HMAC-1.01
@@ -13,10 +13,8 @@ COMMENT=		perl5 module for HMAC
 DEPENDS+=		p5-Digest-SHA1>=1.00:../p5-Digest-SHA1
 DEPENDS+=		p5-Digest-MD5>=2.00:../p5-Digest-MD5
 
-USE_PERL5=		# defined
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Digest/HMAC/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Convert-ASCII-Armour/Makefile b/textproc/p5-Convert-ASCII-Armour/Makefile
index c781c3c68df..f05bb5e26da 100644
--- a/textproc/p5-Convert-ASCII-Armour/Makefile
+++ b/textproc/p5-Convert-ASCII-Armour/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/20 17:46:04 seb Exp $
 #
 
 DISTNAME=		Convert-ASCII-Armour-1.4
@@ -15,11 +15,8 @@ DEPENDS+=		p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=		p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
 DEPENDS+=		p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Convert/ASCII/Armour/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Convert-PEM/Makefile b/textproc/p5-Convert-PEM/Makefile
index 1b117d4bf56..b6338b96cb1 100644
--- a/textproc/p5-Convert-PEM/Makefile
+++ b/textproc/p5-Convert-PEM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:20 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/20 17:46:04 seb Exp $
 #
 
 DISTNAME=		Convert-PEM-0.06
@@ -17,11 +17,8 @@ DEPENDS+=		p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=		p5-Crypt-DES-[0-9]*:../../security/p5-Crypt-DES
 DEPENDS+=		p5-Crypt-DES_EDE3-[0-9]*:../../security/p5-Crypt-DES_EDE3
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Convert/PEM/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-String-ShellQuote/Makefile b/textproc/p5-String-ShellQuote/Makefile
index 1491e64d6fe..2370351c17a 100644
--- a/textproc/p5-String-ShellQuote/Makefile
+++ b/textproc/p5-String-ShellQuote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/02 02:40:00 rxg Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/20 17:46:02 seb Exp $
 
 DISTNAME=	String-ShellQuote-1.00
 PKGNAME=	p5-String-ShellQuote-1.00
@@ -9,11 +9,8 @@ MAINTAINER=	rxg@netbsd.org
 HOMEPAGE=	http://search.cpan.org/search?module=String::ShellQuote
 COMMENT=	quote strings for passing through the shell
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/String/ShellQuote/.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-RSS/Makefile b/textproc/p5-XML-RSS/Makefile
index c433799dcc8..15decfcef20 100644
--- a/textproc/p5-XML-RSS/Makefile
+++ b/textproc/p5-XML-RSS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:25 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/20 17:46:04 seb Exp $
 
 DISTNAME=	XML-RSS-0.97
 PKGNAME=	p5-${DISTNAME}
@@ -12,11 +12,8 @@ COMMENT=	XML-RSS helps to create and update RSS files
 
 DEPENDS+=	p5-XML-Parser>=2.29:../../textproc/p5-XML-Parser
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/RSS/.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-Simple/Makefile b/textproc/p5-XML-Simple/Makefile
index 64f45670313..76461cb1c97 100644
--- a/textproc/p5-XML-Simple/Makefile
+++ b/textproc/p5-XML-Simple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/22 06:34:58 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/20 17:46:03 seb Exp $
 #
 
 DISTNAME=	XML-Simple-1.08
@@ -12,11 +12,8 @@ COMMENT=	Easy Perl API to read/write XML
 
 DEPENDS+=       p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Simple/.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/Makefile b/textproc/p5-libxml/Makefile
index 0b1b3f37d03..27db000654b 100644
--- a/textproc/p5-libxml/Makefile
+++ b/textproc/p5-libxml/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/20 17:46:04 seb Exp $
 
 DISTNAME=	libxml-perl-0.07
 PKGNAME=	p5-libxml-0.07
@@ -12,11 +12,8 @@ COMMENT=	perl module collection for working with XML
 
 DEPENDS+=	p5-XML-Parser>=2.29:../../textproc/p5-XML-Parser
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/libxml-perl/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-Time-HiRes/Makefile b/time/p5-Time-HiRes/Makefile
index 9df75433d80..96c08bdaea8 100644
--- a/time/p5-Time-HiRes/Makefile
+++ b/time/p5-Time-HiRes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2002/07/05 06:58:32 tron Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/20 17:46:02 seb Exp $
 #
 
 DISTNAME=		Time-HiRes-01.20
@@ -10,13 +10,10 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Time/}
 MAINTAINER=		bad@netbsd.org
 COMMENT=		perl5 module for high resolution time, sleep, and alarm
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Time/HiRes/.packlist
 
 WRKSRC=			${WRKDIR}/Time-HiRes-01.20
 
-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-CGI-Application/Makefile b/www/p5-CGI-Application/Makefile
index 225989641b6..3aa0c68eddd 100644
--- a/www/p5-CGI-Application/Makefile
+++ b/www/p5-CGI-Application/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/01/18 22:36:36 mjl Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/20 17:46:03 seb Exp $
 
 DISTNAME=		CGI-Application-2.1
 PKGNAME=		p5-${DISTNAME}
@@ -12,11 +12,8 @@ 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_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-FillInForm/Makefile b/www/p5-HTML-FillInForm/Makefile
index 68ac6747a03..8c07cd4c16a 100644
--- a/www/p5-HTML-FillInForm/Makefile
+++ b/www/p5-HTML-FillInForm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/06/03 13:12:49 shell Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/20 17:46:03 seb Exp $
 
 DISTNAME=	HTML-FillInForm-0.29
 PKGNAME=	p5-${DISTNAME}
@@ -11,11 +11,8 @@ COMMENT=	perl5 module that populates HTML Forms with CGI data
 
 DEPENDS+=	p5-HTML-Parser>=3.08:../../www/p5-HTML-Parser
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		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 "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"