Use buildlink2. Use perl5/module.mk.

13 files changed, 44 insertions, 83 deletions

diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 1562caa7226..df8a7da6e2c 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/07/05 07:05:49 tron Exp $
+# $NetBSD: Makefile,v 1.15 2002/10/27 20:49:03 seb Exp $
 #
 
 DISTNAME=	Apache-ASP-2.21
@@ -11,7 +11,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.apache-asp.org/
 COMMENT=	perl5/Apache module of Perl-coded Active Server Pages
 
-DEPENDS+=	ap-perl>=1.25:../../www/ap-perl
 DEPENDS+=	p5-Apache-Filter>=1.019:../../www/p5-Apache-Filter
 DEPENDS+=	p5-Apache-SSI>=2.16:../../www/p5-Apache-SSI
 DEPENDS+=	p5-Compress-Zlib>=1.14:../../devel/p5-Compress-Zlib
@@ -24,11 +23,9 @@ DEPENDS+=	p5-Time-HiRes>=01.20:../../time/p5-Time-HiRes
 DEPENDS+=	p5-XML-XSLT>=0.32:../../textproc/p5-XML-XSLT
 DEPENDS+=	p5-libwww>=5.48:../../www/p5-libwww
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/ASP/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../www/ap-perl/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-DBILogConfig/Makefile b/www/p5-Apache-DBILogConfig/Makefile
index 49495865e6e..84e2488f21e 100644
--- a/www/p5-Apache-DBILogConfig/Makefile
+++ b/www/p5-Apache-DBILogConfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/09/25 18:39:36 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 20:49:03 seb Exp $
 #
 
 DISTNAME=	Apache-DBILogConfig-0.01
@@ -13,11 +13,8 @@ COMMENT=	database-independent Apache database logger
 DEPENDS+=	p5-Apache-DBI>=0.87:../../databases/p5-Apache-DBI
 DEPENDS+=	p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/DBILogConfig/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-Filter/Makefile b/www/p5-Apache-Filter/Makefile
index 80ba61683f1..1f68de53d51 100644
--- a/www/p5-Apache-Filter/Makefile
+++ b/www/p5-Apache-Filter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/27 20:49:01 seb Exp $
 
 DISTNAME=	Apache-Filter-1.019
 PKGNAME=	p5-${DISTNAME}
@@ -9,13 +9,9 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 module to alter the output of previous Apache handlers
 
-DEPENDS+=	ap-perl>=1.25:../../www/ap-perl
-
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/Filter/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../www/ap-perl/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-SSI/Makefile b/www/p5-Apache-SSI/Makefile
index dbdfb3c97c7..fbf7d151dc8 100644
--- a/www/p5-Apache-SSI/Makefile
+++ b/www/p5-Apache-SSI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/27 20:49:01 seb Exp $
 
 DISTNAME=	Apache-SSI-2.16
 PKGNAME=	p5-${DISTNAME}
@@ -9,14 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 module to implement Server Side Includes
 
-DEPENDS+=	ap-perl>=1.19:../../www/ap-perl
 DEPENDS+=	p5-HTML-SimpleParse>=0.06:../../www/p5-HTML-SimpleParse
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/SSI/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../www/ap-perl/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-ePerl/Makefile b/www/p5-Apache-ePerl/Makefile
index cc8ce805f99..d725d8b984b 100644
--- a/www/p5-Apache-ePerl/Makefile
+++ b/www/p5-Apache-ePerl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:47 veego Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 20:49:00 seb Exp $
 #
 
 DISTNAME=		eperl-2.2.14
@@ -12,14 +12,12 @@ HOMEPAGE=		http://www.engelschall.com/sw/eperl/
 COMMENT=		perl5/Apache module of an ePerl text parser
 
 DEPENDS+=		eperl-2.2.14:../../textproc/eperl
-DEPENDS+=		ap-perl>=1.19:../../www/ap-perl
 
-USE_PERL5=		# defined
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/ePerl/.packlist
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/mod/Apache
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
+.include "../../www/ap-perl/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-Format/Makefile b/www/p5-HTML-Format/Makefile
index 078813111f5..f222a9b2a6b 100644
--- a/www/p5-HTML-Format/Makefile
+++ b/www/p5-HTML-Format/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/07/16 15:29:33 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/27 20:48:59 seb Exp $
 
 DISTNAME=		HTML-Format-1.23
 PKGNAME=		p5-${DISTNAME}
@@ -12,11 +12,8 @@ COMMENT=		perl5 modules for converting HTML to other text formats
 DEPENDS+=		p5-Font-AFM>=1.18:../../fonts/p5-Font-AFM
 DEPENDS+=		p5-HTML-Tree>=3.04:../../www/p5-HTML-Tree
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML-Format/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 5e39d47b54f..857b01f4f36 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/04/17 10:46:04 shell Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/27 20:49:00 seb Exp $
 
 DISTNAME=		HTML-Mason-1.04
 PKGNAME=		p5-${DISTNAME}
@@ -14,11 +14,8 @@ DEPENDS+=               p5-MLDBM>=2.0:../../databases/p5-MLDBM
 DEPENDS+=		p5-gdbm-[0-9]*:../../databases/p5-gdbm
 DEPENDS+=               p5-Params-Validate>=0.04:../../devel/p5-Params-Validate
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/Mason/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-PrettyPrinter/Makefile b/www/p5-HTML-PrettyPrinter/Makefile
index 91df494aa71..f5a949baa03 100644
--- a/www/p5-HTML-PrettyPrinter/Makefile
+++ b/www/p5-HTML-PrettyPrinter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/27 20:48:57 seb Exp $
 
 DISTNAME=		HTML-PrettyPrinter-0.03
 PKGNAME=		p5-${DISTNAME}
@@ -12,11 +12,8 @@ COMMENT=		perl5 module for pretty-printing HTML
 DEPENDS+=		p5-HTML-Tree>=3.0:../../www/p5-HTML-Tree
 DEPENDS+=		p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/PrettyPrinter/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index 26efdadb510..0e9132d5b18 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:37 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 20:48:56 seb Exp $
 
 DISTNAME=		HTML-Tree-3.11
 PKGNAME=		p5-${DISTNAME}
@@ -12,11 +12,8 @@ COMMENT=		perl5 modules for manipulating HTML syntax trees
 DEPENDS+=		p5-HTML-Parser>=2.19:../../www/p5-HTML-Parser
 DEPENDS+=		p5-HTML-Tagset>=3.02:../../www/p5-HTML-Tagset
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML-Tree/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-HTTP-Request-Form/Makefile b/www/p5-HTTP-Request-Form/Makefile
index 3793f429a3a..fefa411d616 100644
--- a/www/p5-HTTP-Request-Form/Makefile
+++ b/www/p5-HTTP-Request-Form/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:37 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/27 20:48:57 seb Exp $
 #
 
 DISTNAME=	HTTP-Request-Form-0.7
@@ -15,11 +15,8 @@ DEPENDS+=       p5-URI-[0-9]*:../../www/p5-URI
 DEPENDS+=       p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
 DEPENDS+=       p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTTP/Request/Form/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-WWW-Amazon-Wishlist/Makefile b/www/p5-WWW-Amazon-Wishlist/Makefile
index a588ccf085b..e6db99a9512 100644
--- a/www/p5-WWW-Amazon-Wishlist/Makefile
+++ b/www/p5-WWW-Amazon-Wishlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/04 19:01:43 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/27 20:48:57 seb Exp $
 #
 
 DISTNAME=	WWW-Amazon-Wishlist-0.65
@@ -13,11 +13,8 @@ COMMENT=	perl5 module to get details from your Amazon wishlist
 
 DEPENDS+=	p5-libwww-*:../../www/p5-libwww
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/WWW/Amazon/Wishlist/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index b2eba1e5040..6377f49328c 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:52 veego Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/27 20:49:00 seb Exp $
 
 DISTNAME=	libapreq-0.33
 PKGNAME=	p5-${DISTNAME}
@@ -10,12 +10,9 @@ MAINTAINER=	packages@NetBSD.org
 HOMEPAGE=	http://trainedmonkey.com/
 COMMENT=	Lots of Apache specific httpd handling modules
 
-DEPENDS+=	ap-perl-1.*:../../www/ap-perl
-
-USE_PERL5=	# defined
+USE_BUILDLINK2=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/libapreq/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
+.include "../../lang/perl5/module.mk"
+.include "../../www/ap-perl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 93091f4cefe..1ac4b593d3d 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/03/15 12:52:51 martti Exp $
+# $NetBSD: Makefile,v 1.28 2002/10/27 20:48:56 seb Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/09/14 04:00:11 jfitz Exp
 #
 
@@ -19,12 +19,9 @@ DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
 DEPENDS+=	p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 DEPENDS+=	p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/libwww-perl/.packlist
 MAKE_PARAMS=		-n
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"