bl3ify

27 files changed, 125 insertions, 72 deletions

diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index b23151a5215..cd647e5c401 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/11/27 16:34:28 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/05 22:16:24 jlam Exp $
 #
 
 VERS=			2.21
@@ -12,7 +12,9 @@ MAINTAINER=		hubertf@NetBSD.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/MIME-Base64/Base64.html
 COMMENT=		Perl5 module for Base64 and Quoted-Printable encodings
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/MIME/Base64/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/databases/p5-DBD-postgresql/Makefile b/databases/p5-DBD-postgresql/Makefile
index d8a4bff0abd..aade1f2ea80 100644
--- a/databases/p5-DBD-postgresql/Makefile
+++ b/databases/p5-DBD-postgresql/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2003/07/21 16:39:07 martti Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/05 22:16:24 jlam Exp $
 #
 
 VER=		1.22
 DISTNAME=	DBD-Pg-${VER}
 PKGNAME=	p5-DBD-postgresql-${VER}
-# PKGREVISION=	3
 SVR4_PKGNAME=	p5dpo
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBD/}
@@ -13,16 +12,15 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://gborg.postgresql.org/project/dbdpg/projdisplay.php
 COMMENT=	Perl DBI/DBD driver for PostgreSQL databases
 
-USE_BUILDLINK2=	YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/DBD/Pg/.packlist
 
 PGUSER?=	pgsql
 PGPREFIX=	${PREFIX}/${PGUSER}
 
-MAKE_ENV+=	POSTGRES_INCLUDE=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
-MAKE_ENV+=	POSTGRES_LIB=${BUILDLINK_PREFIX.postgresql-lib}/lib
-
-.include "../../databases/p5-DBI/buildlink2.mk"
-.include "../../databases/postgresql-lib/buildlink2.mk"
+.include "../../databases/p5-DBI/buildlink3.mk"
+.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index b4f8b3d4dce..b06ed855381 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/07/21 16:39:08 martti Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/05 22:16:24 jlam Exp $
 #
 
 DISTNAME=	DBI-1.37
@@ -11,7 +11,9 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://dbi.perl.org/
 COMMENT=	The database-independent Perl database access API
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/DBI/.packlist
 
 .include "../../lang/perl5/module.mk"
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"
diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile
index 7d75fa7d2a0..1c81f9eb82e 100644
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/12/10 22:38:41 heinz Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=		Net-DNS-0.42
@@ -17,8 +17,10 @@ DEPENDS+=		p5-Digest-HMAC>=1.0:../../security/p5-Digest-HMAC
 DEPENDS+=		p5-MIME-Base64>=2.11:../../converters/p5-MIME-Base64
 DEPENDS+=		p5-Digest-MD5>=2.12:../../security/p5-Digest-MD5
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 BUILDLINK_DEPENDS.perl=	perl>=5.6.0
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/DNS/.packlist
 
diff --git a/security/p5-Digest-HMAC/Makefile b/security/p5-Digest-HMAC/Makefile
index 2c797381144..ea91edb878d 100644
--- a/security/p5-Digest-HMAC/Makefile
+++ b/security/p5-Digest-HMAC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/10/14 22:42:44 heinz Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=		Digest-HMAC-1.01
@@ -13,7 +13,9 @@ COMMENT=		Perl5 module for HMAC
 DEPENDS+=		p5-Digest-SHA1>=1.00:../p5-Digest-SHA1
 DEPENDS+=		p5-Digest-MD5>=2.00:../p5-Digest-MD5
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Digest/HMAC/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile
index f53540d5ef0..9fb5b8acfb5 100644
--- a/security/p5-Digest-MD5/Makefile
+++ b/security/p5-Digest-MD5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/12/10 22:08:59 heinz Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=	Digest-MD5-2.33
@@ -15,7 +15,9 @@ DEPENDS+=	p5-Digest>=1.00:../p5-Digest
 
 CONFLICTS+=	p5-MD5-[0-9]*
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Digest/MD5/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/security/p5-Digest-SHA1/Makefile b/security/p5-Digest-SHA1/Makefile
index 23dd445cf8f..4b121049514 100644
--- a/security/p5-Digest-SHA1/Makefile
+++ b/security/p5-Digest-SHA1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/12/10 22:12:32 heinz Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=		Digest-SHA1-2.07
@@ -15,7 +15,9 @@ DEPENDS+=		p5-Digest>=1.00:../p5-Digest
 
 CONFLICTS+=		p5-Digest-MD5<=2.12
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Digest/SHA1/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/security/p5-IO-Socket-SSL/Makefile b/security/p5-IO-Socket-SSL/Makefile
index 930c1dbcfee..99090d8b143 100644
--- a/security/p5-IO-Socket-SSL/Makefile
+++ b/security/p5-IO-Socket-SSL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/09/13 12:24:20 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/05 22:16:25 jlam Exp $
 
 DISTNAME=	IO-Socket-SSL-0.95
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,9 @@ COMMENT=	Perl5 SSL socket interface class
 
 DEPENDS+=	p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IO/Socket/SSL/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/security/p5-Net-SSLeay/Makefile b/security/p5-Net-SSLeay/Makefile
index a58cae027bc..8f39606fa3e 100644
--- a/security/p5-Net-SSLeay/Makefile
+++ b/security/p5-Net-SSLeay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/11/12 03:39:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/05 22:16:25 jlam Exp $
 
 DISTNAME=	Net_SSLeay.pm-1.25
 PKGNAME=	p5-${DISTNAME:S/Net_/Net-/:S/.pm//}
@@ -11,10 +11,12 @@ MAINTAINER=	shell@NetBSD.org
 HOMEPAGE=	http://symlabs.com/Net_SSLeay/
 COMMENT=	Perl5 module for using OpenSSL
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/SSLeay/.packlist
-MAKE_PARAMS+=		${BUILDLINK_PREFIX.openssl}
+MAKE_PARAMS+=		${SSLBASE}
 
 .include "../../lang/perl5/module.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Balanced/Makefile b/textproc/p5-Text-Balanced/Makefile
index 614dbc9d063..179a9ac3e32 100644
--- a/textproc/p5-Text-Balanced/Makefile
+++ b/textproc/p5-Text-Balanced/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:54:35 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=	Text-Balanced-1.94
@@ -11,7 +11,9 @@ MAINTAINER=	tech-pkg@NetBSD.org
 #HOMEPAGE=	
 COMMENT=	Extract delimited text sequences from strings
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Balanced/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-NamespaceSupport/Makefile b/textproc/p5-XML-NamespaceSupport/Makefile
index cd6ba8e82c9..4c2ffde0b64 100644
--- a/textproc/p5-XML-NamespaceSupport/Makefile
+++ b/textproc/p5-XML-NamespaceSupport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:54:40 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/05 22:16:25 jlam Exp $
 
 DISTNAME=	XML-NamespaceSupport-1.07
 PKGNAME=	p5-${DISTNAME}
@@ -8,7 +8,9 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl module to the SAX2 NamespaceSupport class
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/NamespaceSupport/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index aeec335ccdd..e407ee276ca 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/10/11 13:40:19 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=	XML-Parser-2.31
@@ -12,9 +12,11 @@ MAINTAINER=	bad@NetBSD.org
 #HOMEPAGE=	http://wwwx.netheaven.com/~coopercc/xmlparser/intro.html
 COMMENT=	Perl extension interface to James Clark's XML parser, expat
 
-USE_BUILDLINK2=	YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Parser/.packlist
 
 .include "../../lang/perl5/module.mk"
-.include "../../textproc/expat/buildlink2.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-SAX/Makefile b/textproc/p5-XML-SAX/Makefile
index 09b991eda20..e0a1845536d 100644
--- a/textproc/p5-XML-SAX/Makefile
+++ b/textproc/p5-XML-SAX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:41 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/05 22:16:25 jlam Exp $
 
 DISTNAME=	XML-SAX-0.12
 PKGNAME=	p5-${DISTNAME}
@@ -12,8 +12,11 @@ COMMENT=	Perl interface to the SAX2 XML Parser
 DEPENDS+=	p5-XML-NamespaceSupport>=0.03:../../textproc/p5-XML-NamespaceSupport
 DEPENDS+=	p5-File-Temp-[0-9]*:../../devel/p5-File-Temp
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/SAX/.packlist
+MAKE_ENV+=		PERL5LIB="${PREFIX}/${PERL5_SUB_INSTALLSITELIB}"
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Simple/Makefile b/textproc/p5-XML-Simple/Makefile
index 8e7339d58ce..03651037527 100644
--- a/textproc/p5-XML-Simple/Makefile
+++ b/textproc/p5-XML-Simple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:41 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=	XML-Simple-2.07
@@ -16,7 +16,9 @@ DEPENDS+=       p5-XML-NamespaceSupport-[0-9]*:../../textproc/p5-XML-NamespaceSu
 DEPENDS+=       p5-Storable-[0-9]*:../../devel/p5-Storable
 DEPENDS+=       p5-Test-Simple-[0-9]*:../../devel/p5-Test-Simple
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Simple/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/time/p5-Time-HiRes/Makefile b/time/p5-Time-HiRes/Makefile
index 082a21bfb76..764ce6796cc 100644
--- a/time/p5-Time-HiRes/Makefile
+++ b/time/p5-Time-HiRes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/12/28 00:27:08 heinz Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=		Time-HiRes-1.52
@@ -12,7 +12,9 @@ MAINTAINER=		bad@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/author/JHI/Time-HiRes/
 COMMENT=		Perl5 module for high resolution time, sleep, and alarm
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 
 PERL5_CONFIGURE=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Time/HiRes/.packlist
diff --git a/time/p5-TimeDate/Makefile b/time/p5-TimeDate/Makefile
index a6e17897859..8831eb3b055 100644
--- a/time/p5-TimeDate/Makefile
+++ b/time/p5-TimeDate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 17:28:43 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=      	TimeDate-1.14
@@ -10,7 +10,9 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Date/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl5 TimeDate distribution
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/TimeDate/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index 509bd071449..bff9cbf5f6e 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/11/27 16:33:59 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=		HTML-Parser-3.34
@@ -13,7 +13,9 @@ COMMENT=		Perl5 module to parse HTML text documents
 
 DEPENDS+=		p5-HTML-Tagset>=3.0:../../www/p5-HTML-Tagset
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/Parser/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTML-Tagset/Makefile b/www/p5-HTML-Tagset/Makefile
index 1e4dca78a72..f4c8d025746 100644
--- a/www/p5-HTML-Tagset/Makefile
+++ b/www/p5-HTML-Tagset/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/22 04:14:33 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/05 22:16:25 jlam Exp $
 #
 
 DISTNAME=		HTML-Tagset-3.03
@@ -10,7 +10,9 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=HTML/}
 MAINTAINER=		jlam@NetBSD.org
 COMMENT=		Perl5 module of data tables useful in parsing HTML
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/Tagset/.packlist
 
 .include "../../lang/perl5/module.mk"