Use buildlink2. Use perl5/module.mk.

11 files changed, 34 insertions, 59 deletions

diff --git a/graphics/p5-GDGraph/Makefile b/graphics/p5-GDGraph/Makefile
index f0e34478d05..988215b61dc 100644
--- a/graphics/p5-GDGraph/Makefile
+++ b/graphics/p5-GDGraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:14 fredb Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/27 21:20:38 seb Exp $
 #
 
 DISTNAME=	GDGraph-1.33
@@ -14,11 +14,8 @@ COMMENT=	GDGraph is a package to generate charts, using Lincoln Stein's GD.pm
 
 DEPENDS+=       p5-GDTextUtil>=0.75:../../graphics/p5-GDTextUtil
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GD/Graph/.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-GDGraph3d/Makefile b/graphics/p5-GDGraph3d/Makefile
index 746b9760d93..cd7163f9399 100644
--- a/graphics/p5-GDGraph3d/Makefile
+++ b/graphics/p5-GDGraph3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:14 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/27 21:20:39 seb Exp $
 
 DISTNAME=	GDGraph3d-0.55
 PKGNAME=	p5-${DISTNAME}
@@ -12,11 +12,8 @@ COMMENT=	GDGraph3d is a pkg to generate charts, using Lincoln Stein's GD.pm
 
 DEPENDS+=       p5-GDGraph>=1.30:../../graphics/p5-GDGraph
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GD/Graph3d/.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-GIFgraph/Makefile b/graphics/p5-GIFgraph/Makefile
index 49e708bb7f4..c95975562f1 100644
--- a/graphics/p5-GIFgraph/Makefile
+++ b/graphics/p5-GIFgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:14 fredb Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/27 21:20:39 seb Exp $
 #
 
 DISTNAME=	GIFgraph-1.20
@@ -15,11 +15,8 @@ COMMENT=	GIFgraph is a package to generate graphs, using GD::Graph
 DEPENDS+=       p5-GDGraph>=1.33:../../graphics/p5-GDGraph
 DEPENDS+=	p5-PerlMagick>=5.3.9:../../graphics/p5-PerlMagick
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GIFgraph/.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-Pari/Makefile b/math/p5-Math-Pari/Makefile
index 56082143d78..d848ad56495 100644
--- a/math/p5-Math-Pari/Makefile
+++ b/math/p5-Math-Pari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:24 fredb Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 21:20:37 seb Exp $
 #
 
 DISTNAME=		Math-Pari-2.001804
@@ -16,7 +16,7 @@ DEPENDS+=		pari-[0-9]*:../../math/pari
 # XXX: to use or not to use...
 #DEPENDS+=		gnuplot-[0-9]*:../../graphics/gnuplot
 
-USE_PERL5=		# defined
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Math/Pari/.packlist
 
 # XXX: could be improved...
@@ -27,10 +27,8 @@ post-extract:
 	${RM} -f ${WRKSRC}/pari-*
 	${LN} -sf ${_PKGSRCDIR}/math/pari/${WRKDIR_BASENAME}/pari-* ${WRKSRC}/
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 pre-clean:
 	cd ${_PKGSRCDIR}/math/pari && ${MAKE} clean
 
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/p5-Crypt-DSA/Makefile b/security/p5-Crypt-DSA/Makefile
index a72d11a76f2..cbc0058e5b8 100644
--- a/security/p5-Crypt-DSA/Makefile
+++ b/security/p5-Crypt-DSA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:40 fredb Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 21:20:39 seb Exp $
 #
 
 DISTNAME=		Crypt-DSA-0.12
@@ -19,10 +19,8 @@ DEPENDS+=		p5-Data-Buffer-[0-9]*:../../devel/p5-Data-Buffer
 DEPENDS+=		p5-Convert-PEM-[0-9]*:../../textproc/p5-Convert-PEM
 DEPENDS+=		p5-Class-Loader-[0-9]*:../../devel/p5-Class-Loader
 
-USE_PERL5=		# defined
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Crypt/DSA/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile
index 509b0694c8d..b16316dfd98 100644
--- a/security/p5-Crypt-OpenPGP/Makefile
+++ b/security/p5-Crypt-OpenPGP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/07/02 11:41:57 agc Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/27 21:20:40 seb Exp $
 #
 
 DISTNAME=		Crypt-OpenPGP-0.17
@@ -29,11 +29,9 @@ DEPENDS+=		p5-Crypt-DSA-[0-9]*:../../security/p5-Crypt-DSA
 
 INTERACTIVE_STAGE=	configure # need to select ciphers and digests
 
-USE_PERL5=		# defined
+USE_BUILDLINK2=		YES
 # more than one?
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Crypt/OpenPGP/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/p5-Crypt-Primes/Makefile b/security/p5-Crypt-Primes/Makefile
index d7be91367c0..f675a52ffa5 100644
--- a/security/p5-Crypt-Primes/Makefile
+++ b/security/p5-Crypt-Primes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:41 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/27 21:20:39 seb Exp $
 #
 
 DISTNAME=		Crypt-Primes-0.49
@@ -15,10 +15,8 @@ COMMENT=		perl5 module for provable prime number generation
 DEPENDS+=		p5-Math-Pari-[0-9]*:../../math/p5-Math-Pari
 DEPENDS+=		p5-Crypt-Random-[0-9]*:../../security/p5-Crypt-Random
 
-USE_PERL5=		# defined
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Crypt/Primes/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/p5-Crypt-RSA/Makefile b/security/p5-Crypt-RSA/Makefile
index 774f1f3cdb7..b74cf2581b7 100644
--- a/security/p5-Crypt-RSA/Makefile
+++ b/security/p5-Crypt-RSA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:41 fredb Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 21:20:40 seb Exp $
 #
 
 DISTNAME=		Crypt-RSA-1.47
@@ -24,10 +24,8 @@ DEPENDS+=		p5-Digest-MD2-[0-9]*:../../security/p5-Digest-MD2
 DEPENDS+=		p5-Class-Loader-[0-9]*:../../devel/p5-Class-Loader
 DEPENDS+=		p5-Data-Buffer-[0-9]*:../../devel/p5-Data-Buffer
 
-USE_PERL5=		# defined
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Crypt/RSA/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/p5-Crypt-Random/Makefile b/security/p5-Crypt-Random/Makefile
index d991cfebfb6..392fccdc4d1 100644
--- a/security/p5-Crypt-Random/Makefile
+++ b/security/p5-Crypt-Random/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:42 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/27 21:20:38 seb Exp $
 #
 
 DISTNAME=		Crypt-Random-1.11
@@ -15,10 +15,8 @@ COMMENT=		perl5 interface to /dev/random
 DEPENDS+=		p5-Class-Loader-[0-9]*:../../devel/p5-Class-Loader
 DEPENDS+=		p5-Math-Pari-[0-9]*:../../math/p5-Math-Pari
 
-USE_PERL5=		# defined
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Crypt/Random/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-DBILogger/Makefile b/www/p5-Apache-DBILogger/Makefile
index ed22b62cd32..c372a52724b 100644
--- a/www/p5-Apache-DBILogger/Makefile
+++ b/www/p5-Apache-DBILogger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/27 21:20:38 seb Exp $
 #
 
 DISTNAME=	Apache-DBILogger-0.93
@@ -13,11 +13,8 @@ COMMENT=	Database-independent httpd database logging module
 
 DEPENDS+=	p5-Apache-DBILogConfig-[0-9]*:../../www/p5-Apache-DBILogConfig
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/DBILogger/.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-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index 19622bcb09a..d1741511c9f 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/09/25 18:39:37 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 21:20:39 seb Exp $
 #
 
 DISTNAME=	Template-Toolkit-2.07
@@ -26,11 +26,10 @@ DEPENDS+=	p5-XML-RSS>=0.9:../../textproc/p5-XML-RSS
 DEPENDS+=	p5-XML-XPath>=1.08:../../textproc/p5-XML-XPath
 DEPENDS+=	teTeX>=1.0.7:../../print/teTeX
 
-USE_PERL5=	# defined
+USE_BUILDLINK2=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Template/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		 TT_PREFIX=${PREFIX}/share/tt2 TT_ACCEPT=y
+MAKE_PARAMS=	TT_PREFIX=${PREFIX}/share/tt2 TT_ACCEPT=y
 
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"