Use buildlink2. Use perl5/module.mk.

13 files changed, 42 insertions, 81 deletions

diff --git a/databases/p5-DBD-CSV/Makefile b/databases/p5-DBD-CSV/Makefile
index 9d88d0b6808..5eef4a963c8 100644
--- a/databases/p5-DBD-CSV/Makefile
+++ b/databases/p5-DBD-CSV/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/02/14 15:55:20 mjl Exp $
+# $NetBSD: Makefile,v 1.10 2002/10/20 23:35:11 seb Exp $
 #
 
 DISTNAME=	DBD-CSV-0.2001
@@ -15,11 +15,8 @@ DEPENDS+=               p5-DBI>=1.13:../../databases/p5-DBI
 DEPENDS+=               p5-SQL-Statement>=0.1016:../../databases/p5-SQL-Statement
 DEPENDS+=               p5-Text-CSV_XS>=0.20:../../textproc/p5-Text-CSV_XS
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/DBD/CSV/.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-Sync/Makefile b/databases/p5-MLDBM-Sync/Makefile
index 14848034234..fb26d7a99c7 100644
--- a/databases/p5-MLDBM-Sync/Makefile
+++ b/databases/p5-MLDBM-Sync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:49:42 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/20 23:35:11 seb Exp $
 
 DISTNAME=	MLDBM-Sync-0.15
 PKGNAME=	p5-${DISTNAME}
@@ -12,11 +12,8 @@ COMMENT=	perl5 module for safe concurrent access to MLDBM databases
 DEPENDS+= 	p5-MLDBM-[0-9]*:../../databases/p5-MLDBM
 DEPENDS+= 	p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/MLDBM/Sync/.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-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index 489e8f0fdd3..ded8a78dd7d 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/11/26 17:38:11 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/20 23:35:11 seb Exp $
 #
 
 DISTNAME=     	Date-Calc-5.0
@@ -13,14 +13,11 @@ COMMENT=	perl5 module for Gregorian calendar date calculations
 
 DEPENDS+=	p5-Bit-Vector-[0-9]*:../../devel/p5-Bit-Vector
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Date/Calc/.packlist
 
 post-patch:
 	@rm -rf ${WRKSRC}/lib/Carp
 
-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-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile
index fdade1747df..21925268903 100644
--- a/devel/p5-Devel-SmallProf/Makefile
+++ b/devel/p5-Devel-SmallProf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/07/05 07:03:17 tron Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/20 23:35:10 seb Exp $
 #
 
 DISTNAME=		Devel-SmallProf-0.9
@@ -12,11 +12,8 @@ COMMENT=		perl5 module for line-by-line profiling perl programs
 
 DEPENDS=		p5-Time-HiRes>=01.20:../../time/p5-Time-HiRes
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Devel/SmallProf/.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-Shareable/Makefile b/devel/p5-IPC-Shareable/Makefile
index 83900297ad7..dee93c1ec8e 100644
--- a/devel/p5-IPC-Shareable/Makefile
+++ b/devel/p5-IPC-Shareable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2002/03/15 06:24:29 cjs Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/20 23:35:10 seb Exp $
 #
 
 DISTNAME=	IPC-Shareable-0.60
@@ -11,11 +11,8 @@ COMMENT=	Tie a variable to shared memory
 
 DEPENDS+=	p5-Storable>=1.0.14:../../devel/p5-Storable
 
-USE_BUILDLINK_ONLY=	 YES
+USE_BUILDLINK2=		 YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IPC/Shareable/.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"
diff --git a/devel/p5-IPC-SharedCache/Makefile b/devel/p5-IPC-SharedCache/Makefile
index 9e94698d001..5591da2af1f 100644
--- a/devel/p5-IPC-SharedCache/Makefile
+++ b/devel/p5-IPC-SharedCache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/19 07:22:31 cjs Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/20 23:35:10 seb Exp $
 #
 
 DISTNAME=	IPC-SharedCache-1.3
@@ -11,11 +11,8 @@ COMMENT=	Cache data in shared memory
 
 DEPENDS+=	p5-IPC-ShareLite>=0.06:../../devel/p5-IPC-ShareLite
 
-USE_BUILDLINK_ONLY=	 YES
+USE_BUILDLINK2=		 YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IPC/SharedCache/.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"
diff --git a/devel/p5-Inline/Makefile b/devel/p5-Inline/Makefile
index f04d279cc1c..b003059d9ca 100644
--- a/devel/p5-Inline/Makefile
+++ b/devel/p5-Inline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/01 22:39:23 kim Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/20 23:35:10 seb Exp $
 #
 
 DISTNAME=     	Inline-0.43
@@ -14,11 +14,8 @@ COMMENT=	perl5 module for writing Perl subroutines in other languages
 DEPENDS+=	p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=	p5-Parse-RecDescent-[0-9]*:../../devel/p5-Parse-RecDescent
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Inline/.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-LDAP/Makefile b/devel/p5-LDAP/Makefile
index 2180f58b96d..4a0b91deb5e 100644
--- a/devel/p5-LDAP/Makefile
+++ b/devel/p5-LDAP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:17 veego Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/20 23:35:10 seb Exp $
 #
 
 DISTNAME=	perldap-1.2.2
@@ -12,18 +12,15 @@ MAINTAINER=	packages@netbd.org
 HOMEPAGE=	http://www.mozilla.org/directory/perldap.html
 COMMENT=	Perl5 module to build LDAP clients with perl
 
-DEPENDS+=	ldapsdk-12311998:../../devel/ldapsdk
-
-USE_PERL5=	# defined
+USE_BUILDLINK2=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Mozilla/LDAP/API/.packlist
 
 WRKSRC=		${WRKDIR}/perldap
 
-MAKE_ENV+=	LDAPSDKDIR=${LOCALBASE}
+MAKE_ENV+=	LDAPSDKDIR=${BUILDLINK_PREFIX.ldapsdk}
 MAKE_ENV+=	LDAPSDKSSL="no"
 MAKE_ENV+=	LDAPV3ON="yes"
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
+.include "../../devel/ldapsdk/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Log-Dispatch-Config/Makefile b/devel/p5-Log-Dispatch-Config/Makefile
index 307825b878d..e1bbe6557f9 100644
--- a/devel/p5-Log-Dispatch-Config/Makefile
+++ b/devel/p5-Log-Dispatch-Config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/18 07:49:38 cjs Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/20 23:35:09 seb Exp $
 
 DISTNAME=	Log-Dispatch-Config-0.12
 PKGNAME=	p5-${DISTNAME}
@@ -15,11 +15,8 @@ DEPENDS+=	p5-IO-stringy>=2.108:../../devel/p5-IO-stringy
 DEPENDS+=	p5-AppConfig>=1.52:../../devel/p5-AppConfig
 DEPENDS+=	p5-Log-Dispatch>=1.79:../../devel/p5-Log-Dispatch
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Log/Dispatch/Config/.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-Params-Validate/Makefile b/devel/p5-Params-Validate/Makefile
index 68c9f8e8c45..ce76a0483c1 100644
--- a/devel/p5-Params-Validate/Makefile
+++ b/devel/p5-Params-Validate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/04/27 19:22:40 shell Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/20 23:35:09 seb Exp $
 
 DISTNAME=	Params-Validate-0.15
 PKGNAME=	p5-${DISTNAME}
@@ -11,11 +11,8 @@ COMMENT=	Validate method/function parameters
 
 DEPENDS+=	p5-Attribute-Handlers>=0.76:../../devel/p5-Attribute-Handlers
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Params/Validate/.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-ReadLine/Makefile b/devel/p5-Term-ReadLine/Makefile
index 53d5474ef63..272ab5c7ce2 100644
--- a/devel/p5-Term-ReadLine/Makefile
+++ b/devel/p5-Term-ReadLine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/05/31 09:52:05 uebayasi Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/20 23:35:09 seb Exp $
 
 DISTNAME=	Term-ReadLine-Gnu-1.12
 PKGNAME=	p5-Term-ReadLine-1.12
@@ -10,13 +10,10 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Term-ReadLine-Gnu/
 COMMENT=	interface to the GNU Readline Library
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 USE_GNU_READLINE=	yes
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Term/ReadLine/Gnu/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../devel/readline/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
+.include "../../devel/readline/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-Session/Makefile b/www/p5-Apache-Session/Makefile
index fd69c896263..2aa646ec82f 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/12/04 01:35:54 mjl Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/20 23:35:09 seb Exp $
 #
 
 DISTNAME=		Apache-Session-1.54
@@ -13,11 +13,8 @@ COMMENT=		perl5 module to provide persistent storage
 DEPENDS+=		p5-Storable>=1.0.11:../../devel/p5-Storable/
 DEPENDS+=		p5-Digest-MD5>=2.16:../../security/p5-Digest-MD5/
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/Session/.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-TableExtract/Makefile b/www/p5-HTML-TableExtract/Makefile
index ea145612464..7a917be5762 100644
--- a/www/p5-HTML-TableExtract/Makefile
+++ b/www/p5-HTML-TableExtract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/11/26 06:50:36 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/20 23:35:09 seb Exp $
 
 DISTNAME=		HTML-TableExtract-1.06
 PKGNAME=		p5-${DISTNAME}
@@ -11,11 +11,8 @@ COMMENT=		perl5 module to simplify extracting HTML tables
 
 DEPENDS+=		p5-HTML-Parser>=3.08:../../www/p5-HTML-Parser
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML-TableExtract/.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"