bl3ify

9 files changed, 47 insertions, 27 deletions

diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 37af3875c44..1d374f213ae 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/25 12:02:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/05 22:16:24 jlam Exp $
 #
 
 DISTNAME=     	DateManip-5.42a
@@ -11,7 +11,9 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://www.cpan.org/
 COMMENT=	Perl5 module for date calculations
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Date/Manip/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Event/Makefile b/devel/p5-Event/Makefile
index 0c439598012..e156a14bd14 100644
--- a/devel/p5-Event/Makefile
+++ b/devel/p5-Event/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:32:21 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/05 22:16:25 jlam Exp $
 
 DISTNAME=	Event-0.83
 PKGNAME=	p5-${DISTNAME}
@@ -9,7 +9,9 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/J/JP/JPRIT/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Event library for Perl
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Event/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-File-Temp/Makefile b/devel/p5-File-Temp/Makefile
index c51e6bfc249..dc6d52c1487 100644
--- a/devel/p5-File-Temp/Makefile
+++ b/devel/p5-File-Temp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:43:38 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=	File-Temp-0.12
@@ -10,7 +10,9 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Provides functions for generating temporary files
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/File/Temp/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Inline/Makefile b/devel/p5-Inline/Makefile
index bf0c195ac37..c7c9a0e83df 100644
--- a/devel/p5-Inline/Makefile
+++ b/devel/p5-Inline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/09/06 03:33:18 kim Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=     	Inline-0.44
@@ -14,7 +14,9 @@ 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_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Inline/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Parse-RecDescent/Makefile b/devel/p5-Parse-RecDescent/Makefile
index 34ba9460215..bc869dce76f 100644
--- a/devel/p5-Parse-RecDescent/Makefile
+++ b/devel/p5-Parse-RecDescent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:43:40 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=	Parse-RecDescent-1.94
@@ -7,12 +7,14 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Parse/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
-COMMENT=		Generate recursive-descent parsers
-
-USE_BUILDLINK2=		YES
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Parse/RecDescent/.packlist
+COMMENT=	Generate recursive-descent parsers
 
 DEPENDS+=	p5-Text-Balanced-[0-9]*:../../textproc/p5-Text-Balanced
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Parse/RecDescent/.packlist
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index e03eb7f594e..fbe08c58874 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/09/17 16:52:10 seb Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/05 22:16:25 jlam Exp $
 
 DISTNAME=	Storable-2.06
 PKGNAME=	p5-${DISTNAME}
@@ -9,7 +9,9 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Storable/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl extension module for persistent data storage
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Storable/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Test-Harness/Makefile b/devel/p5-Test-Harness/Makefile
index 80942946058..c4f92ad0415 100644
--- a/devel/p5-Test-Harness/Makefile
+++ b/devel/p5-Test-Harness/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/21 16:43:42 martti Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/05 22:16:25 jlam Exp $
 
 DISTNAME=		Test-Harness-2.28
 PKGNAME=		p5-${DISTNAME}
@@ -9,7 +9,9 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Test/}
 MAINTAINER=		shell@NetBSD.org
 COMMENT=		Perl5 module for testing
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Test/Harness/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Test-Simple/Makefile b/devel/p5-Test-Simple/Makefile
index 23afc5e6e7d..054b1245538 100644
--- a/devel/p5-Test-Simple/Makefile
+++ b/devel/p5-Test-Simple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/21 16:43:42 martti Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/05 22:16:25 jlam Exp $
 
 DISTNAME=		Test-Simple-0.47
 PKGNAME=		p5-${DISTNAME}
@@ -11,7 +11,9 @@ COMMENT=		Perl5 module with a simple framework for writing tests
 
 DEPENDS+=		p5-Test-Harness-[0-9]*:../../devel/p5-Test-Harness
 
-USE_BUILDLINK2=	YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Test/Simple/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-perl-headers/Makefile b/devel/p5-perl-headers/Makefile
index d27804c3911..4178cb490df 100644
--- a/devel/p5-perl-headers/Makefile
+++ b/devel/p5-perl-headers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/09/21 21:04:39 tron Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/05 22:16:25 jlam Exp $
 
 DISTNAME=		p5-perl-headers
 PKGNAME=		${DISTNAME}-${OS_VERSION}
@@ -12,11 +12,14 @@ MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://language.perl.com/index.html
 COMMENT=		Perl header files
 
-USE_BUILDLINK2=		yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		yes
 PERL5_PACKLIST=		${PERL5_SITEARCH}/.packlist.h2ph
 
 EXTRACT_ONLY=		# empty
 NO_CHECKSUM=		yes
+NO_CONFIGURE=		yes
 OSVERSION_SPECIFIC=     yes
 
 # Since this package will be named, for instance, p5-perl-headers-1.5.1,
@@ -29,21 +32,22 @@ NO_BIN_ON_FTP=		FTP servers do not distinguish A.B.X revisions of versions
 do-build:
 	${MKDIR} ${WRKSRC}/h2ph
 	${RM} -f ${WRKSRC}/h2ph_log ${WRKSRC}/packlist
-	( cd /usr/include; ${PREFIX}/bin/h2ph -d ${WRKSRC}/h2ph -r -l . ) \
+	( cd /usr/include; \
+	  ${BUILDLINK_PREFIX.perl}/bin/h2ph -d ${WRKSRC}/h2ph -r -l . ) \
 		> ${WRKSRC}/h2ph_log
-	( ${ECHO} "${PERL5_SITEARCH}/_h2ph_pre.ph"; \
+	( ${ECHO} "${PERL5_INSTALLSITEARCH}/_h2ph_pre.ph"; \
 	  ${CAT} ${WRKSRC}/h2ph_log \
 		| ${GREP} -- "->" \
-		| ${SED} -e "s,.*\./,${PERL5_SITEARCH}/,g" ) \
+		| ${SED} -e "s,.*\./,${PERL5_INSTALLSITEARCH}/,g" ) \
 		| ${SORT} -u \
 		> ${WRKSRC}/packlist
 
 do-install:
-	${INSTALL_DATA_DIR} ${PERL5_SITEARCH}
-	${CP} -R ${WRKSRC}/h2ph/* ${PERL5_SITEARCH}
+	${INSTALL_DATA_DIR} ${PERL5_INSTALLSITEARCH}
+	${CP} -R ${WRKSRC}/h2ph/* ${PERL5_INSTALLSITEARCH}
 	${INSTALL_DATA} ${WRKSRC}/packlist ${PERL5_PACKLIST}
 	${CAT} ${PERL5_PACKLIST} | ${XARGS} ${CHMOD} a-w
 	${CAT} ${PERL5_PACKLIST} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"