Convert to buildlink2. Use perl5/module.mk.

18 files changed, 54 insertions, 108 deletions

diff --git a/devel/p5-WeakRef/Makefile b/devel/p5-WeakRef/Makefile
index b6b8657dc6c..215689e3471 100644
--- a/devel/p5-WeakRef/Makefile
+++ b/devel/p5-WeakRef/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:56 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/07 22:34:27 seb Exp $
 
 DISTNAME=	WeakRef-0.01
 PKGNAME=	p5-${DISTNAME}
@@ -9,11 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/LUKKA/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Provide weak references in Perl
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/WeakRef/.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/fonts/p5-Font-AFM/Makefile b/fonts/p5-Font-AFM/Makefile
index 0afc3e46514..998f40b6a32 100644
--- a/fonts/p5-Font-AFM/Makefile
+++ b/fonts/p5-Font-AFM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/16 15:26:01 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/07 22:34:26 seb Exp $
 
 DISTNAME=		Font-AFM-1.18
 PKGNAME=		p5-${DISTNAME}
@@ -9,11 +9,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Font/}
 MAINTAINER=		packages@netbsd.org
 COMMENT=		perl5 modules for parsing PostScript font metrics files
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Font/AFM/.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/fonts/p5-Font-TTF/Makefile b/fonts/p5-Font-TTF/Makefile
index 24a062aa802..8c0d5fb2b89 100644
--- a/fonts/p5-Font-TTF/Makefile
+++ b/fonts/p5-Font-TTF/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/29 14:11:24 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/07 22:34:26 seb Exp $
 #
 
 DISTNAME=	Font-TTF-0.28
@@ -9,11 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Font/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl module for TrueType font hacking
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Font/TTF/.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-Size/Makefile b/graphics/p5-Image-Size/Makefile
index 3e2d42abea2..077c1224d6e 100644
--- a/graphics/p5-Image-Size/Makefile
+++ b/graphics/p5-Image-Size/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/03/15 12:14:51 martti Exp $
+# $NetBSD: Makefile,v 1.10 2002/10/07 22:34:26 seb Exp $
 #
 
 DISTNAME=	Image-Size-2.98
@@ -11,11 +11,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Image-Size/
 COMMENT=	Read the dimensions of an image in several popular formats
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Image/Size/.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-Lite/Makefile b/mail/p5-MIME-Lite/Makefile
index ffdf685a9ac..18f251e8496 100644
--- a/mail/p5-MIME-Lite/Makefile
+++ b/mail/p5-MIME-Lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:03 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/07 22:34:25 seb Exp $
 
 DISTNAME=		MIME-Lite-2.111
 PKGNAME=		p5-${DISTNAME}
@@ -9,11 +9,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=HTML/}
 MAINTAINER=		norm@sandbox.org.uk
 COMMENT=		perl5 module for simple creation of MIME email messages
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/MIME/Lite/.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-MailTools/Makefile b/mail/p5-MailTools/Makefile
index c1d7ae169e2..721dc2b948e 100644
--- a/mail/p5-MailTools/Makefile
+++ b/mail/p5-MailTools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/08/31 01:37:14 mjl Exp $
+# $NetBSD: Makefile,v 1.19 2002/10/07 22:34:26 seb Exp $
 
 DISTNAME=	MailTools-1.49
 PKGNAME=	p5-${DISTNAME}
@@ -11,11 +11,8 @@ COMMENT=	perl5 modules related to mail applications
 
 BUILD_DEPENDS+=	p5-Net>=1.09:../../net/p5-Net
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Mail/.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-Sendmail-AccessDB/Makefile b/mail/p5-Sendmail-AccessDB/Makefile
index f9cc5bfb621..b60308bd0f8 100644
--- a/mail/p5-Sendmail-AccessDB/Makefile
+++ b/mail/p5-Sendmail-AccessDB/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/17 11:00:53 grant Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/07 22:34:25 seb Exp $
 
 DISTNAME=	Sendmail-AccessDB-0.07
 PKGNAME=	p5-${DISTNAME}
@@ -9,11 +9,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.megacity.org/software.html
 COMMENT=	perl5 module for manipulating the sendmail accessdb
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Sendmail/AccessDB/.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-Math-BigInteger/Makefile b/math/p5-Math-BigInteger/Makefile
index 9ca6afb54cd..a286ecf5617 100644
--- a/math/p5-Math-BigInteger/Makefile
+++ b/math/p5-Math-BigInteger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:06 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/07 22:34:25 seb Exp $
 
 DISTNAME=	Math-BigInteger-1.0
 PKGNAME=	p5-${DISTNAME}
@@ -9,11 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Math/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Arbitrary length integer extension module for Perl
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Math/BigInteger/.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-Math-Interpolate/Makefile b/math/p5-Math-Interpolate/Makefile
index 75c4f0ef97b..557cd5b1131 100644
--- a/math/p5-Math-Interpolate/Makefile
+++ b/math/p5-Math-Interpolate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:06 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/07 22:34:24 seb Exp $
 
 DISTNAME=	Math-Interpolate-1.05
 PKGNAME=	p5-${DISTNAME}
@@ -9,11 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Math/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl module for interpolating data
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Math/Interpolate/.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-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index b11ba767081..f1360157922 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/11/26 06:50:07 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/07 22:34:24 seb Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/09/14 02:54:03 jfitz Exp
 #
 
@@ -12,11 +12,8 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/Array-PrintCols/PrintCols.html
 COMMENT=		perl5 module to print arrays of elements in sorted columns
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Array/PrintCols/.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-CreditCard/Makefile b/misc/p5-Business-CreditCard/Makefile
index 0943369b356..be99be48614 100644
--- a/misc/p5-Business-CreditCard/Makefile
+++ b/misc/p5-Business-CreditCard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/11/26 06:50:07 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/07 22:34:24 seb Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:06 jfitz Exp
 #
 
@@ -12,14 +12,11 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/Business-CreditCard/CreditCard.html
 COMMENT=		perl5 module to validate/generate credit card checksums/names
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Business/CreditCard/.packlist
 
 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/misc/p5-Business-ISBN/Makefile b/misc/p5-Business-ISBN/Makefile
index 91396ed8841..c39c978f968 100644
--- a/misc/p5-Business-ISBN/Makefile
+++ b/misc/p5-Business-ISBN/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:07 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/07 22:34:24 seb Exp $
 #
 
 DISTNAME=		Business-ISBN-1.60
@@ -11,11 +11,8 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/Business-ISBN/ISBN.html
 COMMENT=		perl5 module to work with International Standard Book Numbers (ISBNs)
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Business/ISBN/.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-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index b89bcb14826..2c2476cf93e 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/11/26 06:50:09 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/07 22:34:23 seb Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:51:12 jfitz Exp
 #
 
@@ -12,11 +12,8 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/Locale-Codes/Locale/Country.html
 COMMENT=		perl5 module providing access to ISO3166 and ISO639 Country Codes
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Locale/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_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/Makefile b/net/p5-Net/Makefile
index b11cf1f57b8..00c258494c4 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/06/03 13:06:20 shell Exp $
+# $NetBSD: Makefile,v 1.28 2002/10/07 22:34:25 seb Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
 #
 
@@ -12,11 +12,8 @@ MAINTAINER=	shell@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/libnet/Net/libnetFAQ.html
 COMMENT=	perl5 modules to access and use network protocols
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/.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-SHA1/Makefile b/security/p5-Digest-SHA1/Makefile
index ad421359a50..72e98b79c4f 100644
--- a/security/p5-Digest-SHA1/Makefile
+++ b/security/p5-Digest-SHA1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:17 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/07 22:34:25 seb Exp $
 #
 
 DISTNAME=		Digest-SHA1-2.00
@@ -12,11 +12,8 @@ COMMENT=		perl5 module for SHA1
 
 CONFLICTS+=		p5-Digest-MD5<=2.12
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Digest/SHA1/.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-Template/Makefile b/textproc/p5-Text-Template/Makefile
index 5838e99036b..f40825c7ed8 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/08/20 14:41:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/07 22:34:27 seb Exp $
 #
 
 DISTNAME=       Text-Template-1.43
@@ -11,11 +11,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.plover.com/~mjd/perl/Template/
 COMMENT=	perl5 library for generating form letters
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Template/.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-TimeDate/Makefile b/time/p5-TimeDate/Makefile
index 3c073e0dc5e..5198e60170b 100644
--- a/time/p5-TimeDate/Makefile
+++ b/time/p5-TimeDate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2002/07/05 06:58:34 tron Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/07 22:34:27 seb Exp $
 #
 
 DISTNAME=      	TimeDate-1.10
@@ -10,11 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Date/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 TimeDate distribution
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/TimeDate/.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-CGI/Makefile b/www/p5-CGI/Makefile
index 4d04df3c3e5..243ca0f309c 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/02/27 16:28:48 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2002/10/07 22:34:27 seb Exp $
 #
 
 DISTNAME=       	CGI.pm-2.79
@@ -21,13 +21,10 @@ COMMENT=		perl5 module for writing forms-based CGI programs
 # Can't simply define USE_PERL5.
 BUILDLINK_DEPENDS.perl=	{perl-5.0*,perl-5.6.0nb2,perl-base>=5.6.0,perl>=5.6.1nb2}
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/CGI/.packlist
 HTMLDIR=		${PREFIX}/share/doc/html/p5-CGI
 
-do-configure:
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 post-build:
 	cd ${WRKSRC}/examples;						\
 	for file in *.cgi *.pl; do					\
@@ -46,5 +43,5 @@ post-install:
 	${INSTALL_DATA} *.gif *.html *.txt *.xbm ${HTMLDIR}/examples;	\
 	${INSTALL_SCRIPT} *.cgi ${HTMLDIR}/examples
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"