summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/mytop/Makefile4
-rw-r--r--databases/p5-Palm/Makefile4
-rw-r--r--databases/p5-SQL-Statement/Makefile4
-rw-r--r--databases/p5-gdbm/Makefile6
-rw-r--r--databases/postgresql-client/Makefile10
-rw-r--r--databases/postgresql-docs/Makefile4
-rw-r--r--databases/postgresql-plperl/Makefile8
-rw-r--r--databases/postgresql-server/Makefile8
-rw-r--r--databases/ruby-mysql/Makefile8
-rw-r--r--databases/ruby-postgresql/Makefile8
-rw-r--r--devel/GConf/Makefile12
-rw-r--r--devel/gcvs/Makefile8
-rw-r--r--devel/id-utils/Makefile6
-rw-r--r--devel/ldapsdk/Makefile6
-rw-r--r--devel/ldapsdk/buildlink2.mk28
-rw-r--r--devel/ldapsdk/buildlink3.mk18
-rw-r--r--devel/p5-Exception-Class/Makefile4
-rw-r--r--devel/p5-LDAP/Makefile6
-rw-r--r--devel/p5-Log-Dispatch-Config/Makefile4
-rw-r--r--devel/p5-Log-Dispatch-FileRotate/Makefile4
-rw-r--r--devel/p5-Log-Dispatch/Makefile4
-rw-r--r--devel/p5-Module-Dependency/Makefile4
-rw-r--r--devel/py-checker/Makefile4
-rw-r--r--devel/py-readline/Makefile6
-rw-r--r--devel/py-zconfig/Makefile4
-rw-r--r--security/p5-Authen-SASL/Makefile4
-rw-r--r--security/p5-Crypt-OpenSSL-Bignum/Makefile6
-rw-r--r--security/p5-Crypt-OpenSSL-DSA/Makefile6
-rw-r--r--security/p5-Crypt-OpenSSL-Random/Makefile6
-rw-r--r--security/p5-Crypt-Rijndael/Makefile4
-rw-r--r--security/p5-Digest-BubbleBabble/Makefile4
-rw-r--r--security/p5-Digest-Hashcash/Makefile4
-rw-r--r--security/p5-Digest-MD2/Makefile4
-rw-r--r--security/p5-Digest-MD4/Makefile4
-rw-r--r--security/p5-Digest-Nilsimsa/Makefile4
-rw-r--r--security/p5-Net-DNS-SEC/Makefile4
-rw-r--r--security/p5-SHA/Makefile4
-rw-r--r--security/p5-Tie-EncryptedHash/Makefile4
-rw-r--r--security/py-amkCrypto/Makefile6
-rw-r--r--security/py-cryptkit/Makefile4
-rw-r--r--security/pyca/Makefile4
-rw-r--r--security/ruby-openssl/Makefile8
-rw-r--r--www/amaya/Makefile10
-rw-r--r--www/apachetop/Makefile8
-rw-r--r--www/bins/Makefile6
-rw-r--r--www/cadaver/Makefile10
-rw-r--r--www/chimera/Makefile8
-rw-r--r--www/clearsilver/Makefile4
-rw-r--r--www/elinks/Makefile14
-rw-r--r--www/gtkasp2php/Makefile6
-rw-r--r--www/http_load/Makefile6
-rw-r--r--www/kannel/Makefile8
-rw-r--r--www/lhs/Makefile6
-rw-r--r--www/mMosaic/Makefile12
-rw-r--r--www/p5-CGI-FastTemplate/Makefile4
-rw-r--r--www/p5-CGI-FormBuilder/Makefile4
-rw-r--r--www/p5-CGI-Minimal/Makefile4
-rw-r--r--www/p5-CGI_Lite/Makefile4
-rw-r--r--www/p5-FCGI/Makefile4
-rw-r--r--www/p5-HTML-Mason/Makefile4
-rw-r--r--www/p5-HTML-TableExtract/Makefile4
-rw-r--r--www/p5-HTTP-DAV/Makefile4
-rw-r--r--www/p5-HTTP-Request-Form/Makefile4
-rw-r--r--www/p5-HTTPD-User-Manage/Makefile4
-rw-r--r--www/squidGuard/Makefile6
-rw-r--r--www/wApua/Makefile4
66 files changed, 200 insertions, 210 deletions
diff --git a/databases/mytop/Makefile b/databases/mytop/Makefile
index d55d1189f1e..462267e4174 100644
--- a/databases/mytop/Makefile
+++ b/databases/mytop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:39:06 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/27 05:44:21 snj Exp $
#
DISTNAME= mytop-0.8
@@ -13,7 +13,7 @@ DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI
DEPENDS+= p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey
DEPENDS+= p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/mytop/.packlist
REPLACE_PERL= mytop
NO_BUILD= YES
diff --git a/databases/p5-Palm/Makefile b/databases/p5-Palm/Makefile
index 6a2eb960dab..5a69b24f47a 100644
--- a/databases/p5-Palm/Makefile
+++ b/databases/p5-Palm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/20 12:12:49 agc Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= p5-Palm-1.3.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.ooblick.com/software/coldsync/
COMMENT= Access Palm .pdb and .prc database files
WRKSRC= ${WRKDIR}/p5-Palm-1.003_000
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Palm/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/databases/p5-SQL-Statement/Makefile b/databases/p5-SQL-Statement/Makefile
index 68dcd287230..99254573771 100644
--- a/databases/p5-SQL-Statement/Makefile
+++ b/databases/p5-SQL-Statement/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/21 16:39:11 martti Exp $
+# $NetBSD: Makefile,v 1.14 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= SQL-Statement-1.005
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
# HOMEPAGE= http://
COMMENT= Small, abstract SQL engine
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/SQL/Statement/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/databases/p5-gdbm/Makefile b/databases/p5-gdbm/Makefile
index 417ac9f1532..1772db0fb0d 100644
--- a/databases/p5-gdbm/Makefile
+++ b/databases/p5-gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/20 12:12:49 agc Exp $
+# $NetBSD: Makefile,v 1.21 2004/04/27 05:44:22 snj Exp $
.include "../../lang/perl5/Makefile.common"
@@ -11,11 +11,11 @@ MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Perl interface to gdbm - GNU database manager
WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS}
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/GDBM_File/.packlist
EXTRACT_ELEMENTS= ${DISTNAME}/ext/GDBM_File
-.include "../../databases/gdbm/buildlink2.mk"
+.include "../../databases/gdbm/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index b3f95f38491..6aa40543741 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.23 2004/03/26 02:27:36 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/27 05:44:22 snj Exp $
PKGNAME= postgresql-client-${BASE_VERS}
PKGREVISION= 2
SVR4_PKGNAME= pstgc
COMMENT= PostgreSQL database client programs
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
.include "../../databases/postgresql/Makefile.common"
@@ -31,8 +31,8 @@ post-install:
cd ${PREFIX}/man && \
${PAX} -O -crzf ${WRKSRC}/doc/man.tar.gz `${GREP} -v ^# ${FILESDIR}/exclude`
-.include "../../databases/postgresql-lib/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile
index 9540090b67f..5074db2ef82 100644
--- a/databases/postgresql-docs/Makefile
+++ b/databases/postgresql-docs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 14:11:50 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/27 05:44:22 snj Exp $
PKGNAME= postgresql-docs-${BASE_VERS}
SVR4_PKGNAME= pstgd
COMMENT= PostgreSQL database system documentation
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
.include "../../databases/postgresql/Makefile.common"
diff --git a/databases/postgresql-plperl/Makefile b/databases/postgresql-plperl/Makefile
index 9b668cee631..7a9c9ca3f3b 100644
--- a/databases/postgresql-plperl/Makefile
+++ b/databases/postgresql-plperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:37 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/27 05:44:22 snj Exp $
PKGNAME= postgresql-plperl-${BASE_VERS}
PKGREVISION= 2
@@ -6,7 +6,7 @@ COMMENT= PL/Perl procedural language for the PostgreSQL backend
DEPENDS+= postgresql-server>=${BASE_VERS}:../../databases/postgresql-server
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
.include "../postgresql/Makefile.common"
@@ -17,7 +17,7 @@ CONFIGURE_ENV+= PERL="${PERL5}"
BUILD_DIRS= ${WRKSRC}/src/pl/plperl
MAKEFILE= GNUmakefile
-.include "../postgresql-lib/buildlink2.mk"
-.include "../../lang/libperl/buildlink2.mk"
+.include "../postgresql-lib/buildlink3.mk"
+.include "../../lang/libperl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 604d82878ab..7900b460af7 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2004/03/26 02:27:37 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2004/04/27 05:44:22 snj Exp $
PKGNAME= postgresql-server-${BASE_VERS}
PKGREVISION= 4
@@ -10,7 +10,7 @@ DEPENDS+= postgresql-client>=${BASE_VERS}:../../databases/postgresql-client
# mips has no TAS implementation
NOT_FOR_PLATFORM= *-*-mips
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
.include "../../databases/postgresql/Makefile.common"
@@ -22,7 +22,7 @@ BUILD_DIRS= ${WRKSRC}/src/backend
BUILD_DIRS+= ${WRKSRC}/src/backend/utils/mb/conversion_procs
.if defined(USE_PAM)
-. include "../../security/PAM/buildlink2.mk"
+. include "../../security/PAM/buildlink3.mk"
CONFIGURE_ARGS+= --with-pam
.endif
@@ -70,5 +70,5 @@ post-install:
${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \
`${SED} -e "s|^#.*||" ${FILESDIR}/man.server`
-.include "../../databases/postgresql-lib/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-mysql/Makefile b/databases/ruby-mysql/Makefile
index a98e2c3d39a..815ca68f268 100644
--- a/databases/ruby-mysql/Makefile
+++ b/databases/ruby-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/03/16 02:01:10 taca Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= mysql-ruby-2.4.5
@@ -10,7 +10,7 @@ MAINTAINER= neumann@s-direktnet.de
HOMEPAGE= http://www.tmtm.org/mysql/ruby/
COMMENT= Ruby extension for MySQL
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
DIST_SUBDIR= ruby
USE_RUBY_EXTCONF= yes
@@ -38,6 +38,6 @@ post-install:
.endfor
.include "../../lang/ruby-base/Makefile.common"
-.include "../../lang/ruby-base/buildlink2.mk"
-.include "../../databases/mysql-client/buildlink2.mk"
+.include "../../lang/ruby-base/buildlink3.mk"
+.include "../../databases/mysql-client/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-postgresql/Makefile b/databases/ruby-postgresql/Makefile
index 82597580de4..4c52e2d8327 100644
--- a/databases/ruby-postgresql/Makefile
+++ b/databases/ruby-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/03/26 02:27:37 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/04/27 05:44:22 snj Exp $
DISTNAME= ruby-postgres-${VERSION}
PKGNAME= ${RUBY_PKGNAMEPREFIX}postgresql-${VERSION}
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.postgresql.jp/interfaces/ruby/
COMMENT= Ruby extension for postgresql
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= yes
VERSION= 0.7.1
DIST_SUBDIR= ruby
@@ -42,7 +42,7 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/sample/$f ${RUBY_EXAMPLESDIR}/postgresql
.endfor
-.include "../../databases/postgresql-lib/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink3.mk"
.include "../../lang/ruby-base/Makefile.common"
-.include "../../lang/ruby-base/buildlink2.mk"
+.include "../../lang/ruby-base/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 9312607b89e..df1250742bc 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2004/02/14 18:26:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.44 2004/04/27 04:59:42 snj Exp $
#
DISTNAME= GConf-1.0.9
@@ -14,7 +14,7 @@ COMMENT= Configuration database system used by GNOME
BUILD_USES_MSGFMT= yes
#DEPENDS+= guile>=1.3.4:../../lang/guile
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
GNU_CONFIGURE= YES
@@ -37,9 +37,9 @@ post-install:
${CP} -p ${PREFIX}/etc/gconf/1/path.example \
${PREFIX}/etc/gconf/1/path
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../databases/db3/buildlink2.mk"
-.include "../../devel/oaf/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../databases/db3/buildlink3.mk"
+.include "../../devel/oaf/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index d314d773cc4..1d084d2667a 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/27 04:59:42 snj Exp $
DISTNAME= gcvs-1.0a7
PKGREVISION= 2
@@ -11,7 +11,7 @@ COMMENT= GTK interface for CVS
CONFLICTS= cvs-[0-9]*
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
USE_X11= yes
USE_GNU_TOOLS+= make
GNU_CONFIGURE= yes
@@ -21,7 +21,7 @@ INFO_FILES= cvs.info cvsclient.info
CONFIGURE_ARGS+= --with-tclinclude="${BUILDLINK_PREFIX.tcl}/include" \
--with-tcllib="${BUILDLINK_PREFIX.tcl}/lib"
-.include "../../lang/tcl83/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../lang/tcl83/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index bf0312e786f..320f7483854 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/08/09 10:44:43 seb Exp $
+# $NetBSD: Makefile,v 1.35 2004/04/27 04:59:42 snj Exp $
# FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp
#
@@ -15,7 +15,7 @@ CONFLICTS= sh-utils>=2.0nb2
BUILD_USES_MSGFMT= yes
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
USE_PKGLOCALEDIR= yes
INFO_FILES= id-utils.info
@@ -53,5 +53,5 @@ MAKE_ENV+= BSD_SETENV=${SETENV}
PLIST_SUBST+= LISPDIR=${LISPDIR}
PLIST_SUBST+= CLISPDIR=${CLISPDIR}
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ldapsdk/Makefile b/devel/ldapsdk/Makefile
index 4eca6ed2b34..b7ee99e7a8f 100644
--- a/devel/ldapsdk/Makefile
+++ b/devel/ldapsdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/02/04 02:52:33 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/27 04:59:42 snj Exp $
DISTNAME= ldapsdk_12311998
PKGNAME= ${DISTNAME:S/_/-/}
@@ -15,7 +15,7 @@ CONFLICTS+= openldap-[0-9]*
WRKSRC= ${WRKDIR}/mozilla
USE_GNU_TOOLS+= make
USE_PERL5= build
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
PKG_SYSCONFSUBDIR= ldapsdk
EGDIR= ${PREFIX}/share/examples/ldapsdk
@@ -34,5 +34,5 @@ do-build:
do-install:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/pre-install
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ldapsdk/buildlink2.mk b/devel/ldapsdk/buildlink2.mk
deleted file mode 100644
index 336aed65d1f..00000000000
--- a/devel/ldapsdk/buildlink2.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/10/20 21:48:17 seb Exp $
-#
-# This Makefile fragment is included by packages that use ldapsdk.
-#
-# This file was created automatically using createbuildlink 2.2.
-#
-
-.if !defined(LDAPSDK_BUILDLINK2_MK)
-LDAPSDK_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= ldapsdk
-BUILDLINK_DEPENDS.ldapsdk?= ldapsdk>=12311998
-BUILDLINK_PKGSRCDIR.ldapsdk?= ../../devel/ldapsdk
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.ldapsdk=ldapsdk
-BUILDLINK_PREFIX.ldapsdk_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.ldapsdk+= include/disptmpl.h
-BUILDLINK_FILES.ldapsdk+= include/lber.h
-BUILDLINK_FILES.ldapsdk+= include/ldap.h
-BUILDLINK_FILES.ldapsdk+= include/srchpref.h
-BUILDLINK_FILES.ldapsdk+= lib/liblber.*
-BUILDLINK_FILES.ldapsdk+= lib/libldap.*
-
-BUILDLINK_TARGETS+= ldapsdk-buildlink
-
-ldapsdk-buildlink: _BUILDLINK_USE
-
-.endif # LDAPSDK_BUILDLINK2_MK
diff --git a/devel/ldapsdk/buildlink3.mk b/devel/ldapsdk/buildlink3.mk
new file mode 100644
index 00000000000..56cb0bdaa74
--- /dev/null
+++ b/devel/ldapsdk/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 04:59:42 snj Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+LDAPSDK_BUILDLINK3_MK:= ${LDAPSDK_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= ldapsdk
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nldapsdk}
+BUILDLINK_PACKAGES+= ldapsdk
+
+.if !empty(LDAPSDK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.ldapsdk+= ldapsdk>=12311998
+BUILDLINK_PKGSRCDIR.ldapsdk?= ../../devel/ldapsdk
+.endif # LDAPSDK_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/p5-Exception-Class/Makefile b/devel/p5-Exception-Class/Makefile
index adcc7ffed5c..0314905c2dd 100644
--- a/devel/p5-Exception-Class/Makefile
+++ b/devel/p5-Exception-Class/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/10 19:06:36 kristerw Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/27 04:59:42 snj Exp $
DISTNAME= Exception-Class-1.14
PKGNAME= p5-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+= p5-Class-Data-Inheritable>=0.02:../../devel/p5-Class-Data-Inheritable
DEPENDS+= p5-Devel-StackTrace>=1.03:../../devel/p5-Devel-StackTrace
USE_BUILDLINK_ONLY= YES
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Exception/Class/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/devel/p5-LDAP/Makefile b/devel/p5-LDAP/Makefile
index 392859e8ce1..0c00e8bb436 100644
--- a/devel/p5-LDAP/Makefile
+++ b/devel/p5-LDAP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/27 04:59:42 snj Exp $
#
DISTNAME= perldap-1.2.2
@@ -13,13 +13,13 @@ HOMEPAGE= http://www.mozilla.org/directory/perldap.html
COMMENT= Perl5 module to build LDAP clients with perl
WRKSRC= ${WRKDIR}/perldap
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Mozilla/LDAP/API/.packlist
MAKE_ENV+= LDAPSDKDIR=${BUILDLINK_PREFIX.ldapsdk}
MAKE_ENV+= LDAPSDKSSL="no"
MAKE_ENV+= LDAPV3ON="yes"
-.include "../../devel/ldapsdk/buildlink2.mk"
+.include "../../devel/ldapsdk/buildlink3.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 9925b2195cd..6e395ca1768 100644
--- a/devel/p5-Log-Dispatch-Config/Makefile
+++ b/devel/p5-Log-Dispatch-Config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:32:41 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/27 04:59:42 snj Exp $
DISTNAME= Log-Dispatch-Config-0.12
PKGNAME= p5-${DISTNAME}
@@ -15,7 +15,7 @@ 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_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Log/Dispatch/Config/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Log-Dispatch-FileRotate/Makefile b/devel/p5-Log-Dispatch-FileRotate/Makefile
index 5362228a75b..c4afa48dec9 100644
--- a/devel/p5-Log-Dispatch-FileRotate/Makefile
+++ b/devel/p5-Log-Dispatch-FileRotate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/29 13:19:34 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/27 04:59:42 snj Exp $
DISTNAME= Log-Dispatch-FileRotate-1.11
PKGNAME= p5-${DISTNAME}
@@ -12,7 +12,7 @@ DEPENDS+= p5-Date-Manip>=5.0:../../devel/p5-Date-Manip
DEPENDS+= p5-Log-Dispatch>=2.08:../../devel/p5-Log-Dispatch
DEPENDS+= p5-Params-Validate>=0.15:../../devel/p5-Params-Validate
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Log/Dispatch/FileRotate/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index b2908a4d739..382a177b931 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/29 12:20:48 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/27 04:59:42 snj Exp $
DISTNAME= Log-Dispatch-2.08
PKGNAME= p5-${DISTNAME}
@@ -14,7 +14,7 @@ BUILD_DEPENDS+= p5-Module-Build>=0.20:../../devel/p5-Module-Build
DEPENDS+= p5-Params-Validate>=0.15:../../devel/p5-Params-Validate
DEPENDS+= p5-Test-Simple>=0.17:../../devel/p5-Test-Simple
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Module-Dependency/Makefile b/devel/p5-Module-Dependency/Makefile
index 2153a7c12b5..4a12a28c2ac 100644
--- a/devel/p5-Module-Dependency/Makefile
+++ b/devel/p5-Module-Dependency/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:32:42 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/27 04:59:42 snj Exp $
#
DISTNAME= Module-Dependency-1.8
@@ -13,7 +13,7 @@ COMMENT= Build perl program/module dependency graph
DEPENDS+= p5-Storable>=1.0.14:../../devel/p5-Storable
DEPENDS+= p5-GD>=1.32nb1:../../graphics/p5-GD
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Module/Dependency/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/devel/py-checker/Makefile b/devel/py-checker/Makefile
index 2411f11f96f..d9c1053d3f2 100644
--- a/devel/py-checker/Makefile
+++ b/devel/py-checker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/02 23:37:26 recht Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/27 04:59:42 snj Exp $
DISTNAME= pychecker-0.8.13
PKGNAME= ${PYPKGPREFIX}-checker-0.8.13
@@ -9,7 +9,7 @@ MAINTAINER= shell@NetBSD.org
HOMEPAGE= http://pychecker.sourceforge.net/
COMMENT= Python code checker
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
PYDISTUTILSPKG= # defined
PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile
index 06b58afc8ac..1b204105bf3 100644
--- a/devel/py-readline/Makefile
+++ b/devel/py-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/05 03:42:32 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/27 04:59:42 snj Exp $
#
PKGNAME= ${PYPKGPREFIX}-readline-0
@@ -10,7 +10,7 @@ COMMENT= Line editing support for Python
EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/readline.c
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= yes
USE_GNU_READLINE= # defined
PYDISTUTILSPKG= yes
@@ -26,7 +26,7 @@ do-patch:
${PATCH} --batch <$$f || true; \
done)
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
.include "../../lang/python/extension.mk"
.include "../../lang/python/srcdist.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-zconfig/Makefile b/devel/py-zconfig/Makefile
index e26936622a2..21068411d87 100644
--- a/devel/py-zconfig/Makefile
+++ b/devel/py-zconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/25 16:04:09 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/27 04:59:43 snj Exp $
#
DISTNAME= ZConfig-1.0
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.zope.org/Members/fdrake/zconfig/
COMMENT= Configuration library
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
PYDISTUTILSPKG= yes
.include "../../lang/python/extension.mk"
diff --git a/security/p5-Authen-SASL/Makefile b/security/p5-Authen-SASL/Makefile
index 0211a30becb..e0e8617dd24 100644
--- a/security/p5-Authen-SASL/Makefile
+++ b/security/p5-Authen-SASL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/09/09 09:59:29 salo Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= Authen-SASL-2.04
@@ -10,7 +10,7 @@ MAINTAINER= cube@cubidou.net
HOMEPAGE= http://search.cpan.org/dist/Authen-SASL/
COMMENT= Perl module to handle SASL authentication
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Authen/SASL/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/security/p5-Crypt-OpenSSL-Bignum/Makefile b/security/p5-Crypt-OpenSSL-Bignum/Makefile
index 72bb03711b2..0e4907868f3 100644
--- a/security/p5-Crypt-OpenSSL-Bignum/Makefile
+++ b/security/p5-Crypt-OpenSSL-Bignum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/03/26 02:27:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= Crypt-OpenSSL-Bignum-0.03
@@ -13,9 +13,9 @@ MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://perl-openssl.sourceforge.net/
COMMENT= Perl5 wrapper module for the OpenSSL Bignum functions
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Crypt/OpenSSL/Bignum/.packlist
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/p5-Crypt-OpenSSL-DSA/Makefile b/security/p5-Crypt-OpenSSL-DSA/Makefile
index 929c736a49a..01f359a8c00 100644
--- a/security/p5-Crypt-OpenSSL-DSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-DSA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/03/26 02:27:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= Crypt-OpenSSL-DSA-0.11
@@ -13,9 +13,9 @@ MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://perl-openssl.sourceforge.net/
COMMENT= Perl5 wrapper module for the OpenSSL DSA functions
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Crypt/OpenSSL/DSA/.packlist
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/p5-Crypt-OpenSSL-Random/Makefile b/security/p5-Crypt-OpenSSL-Random/Makefile
index 7ec469891fc..231ff464835 100644
--- a/security/p5-Crypt-OpenSSL-Random/Makefile
+++ b/security/p5-Crypt-OpenSSL-Random/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/03/26 02:27:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= Crypt-OpenSSL-Random-0.03
@@ -12,9 +12,9 @@ MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://perl-openssl.sourceforge.net/
COMMENT= Perl5 wrapper module for OpenSSL pseudo-random number generator
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Crypt/OpenSSL/Random/.packlist
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/p5-Crypt-Rijndael/Makefile b/security/p5-Crypt-Rijndael/Makefile
index 51004179ac9..8fcef2f05fd 100644
--- a/security/p5-Crypt-Rijndael/Makefile
+++ b/security/p5-Crypt-Rijndael/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:20:18 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= Crypt-Rijndael-0.05
@@ -10,7 +10,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/}
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Perl5 module of the Rijndael symmetric key algorithm
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Crypt/Rijndael/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/security/p5-Digest-BubbleBabble/Makefile b/security/p5-Digest-BubbleBabble/Makefile
index eb9bff30773..61bdabb71b4 100644
--- a/security/p5-Digest-BubbleBabble/Makefile
+++ b/security/p5-Digest-BubbleBabble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 19:53:28 heinz Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= Digest-BubbleBabble-0.01
@@ -14,7 +14,7 @@ COMMENT= Perl5 module for bubble babble fingerprints
DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Digest/BubbleBabble/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/security/p5-Digest-Hashcash/Makefile b/security/p5-Digest-Hashcash/Makefile
index 2c050c66cc7..574a9b6db40 100644
--- a/security/p5-Digest-Hashcash/Makefile
+++ b/security/p5-Digest-Hashcash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/28 01:07:58 heinz Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= Digest-Hashcash-0.02
@@ -13,7 +13,7 @@ COMMENT= Perl5 extension module for hashcash hashes
DEPENDS+= p5-Time-HiRes>=1.2:../../time/p5-Time-HiRes
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_CONFIGURE= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Digest/Hashcash/.packlist
diff --git a/security/p5-Digest-MD2/Makefile b/security/p5-Digest-MD2/Makefile
index a6a89a16cf9..214a98d7c66 100644
--- a/security/p5-Digest-MD2/Makefile
+++ b/security/p5-Digest-MD2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/12/10 22:00:28 heinz Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= Digest-MD2-2.03
@@ -12,7 +12,7 @@ COMMENT= Perl5 module for MD2
CONFLICTS+= p5-Digest-MD5<=2.12
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Digest/MD2/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/security/p5-Digest-MD4/Makefile b/security/p5-Digest-MD4/Makefile
index 15f8ee98825..98d82fbd2d2 100644
--- a/security/p5-Digest-MD4/Makefile
+++ b/security/p5-Digest-MD4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/10 21:56:21 heinz Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= Digest-MD4-1.3
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/Digest-MD4/
COMMENT= Perl5 module for MD4 hash algorithm
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Digest/MD4/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/security/p5-Digest-Nilsimsa/Makefile b/security/p5-Digest-Nilsimsa/Makefile
index fa897b734c8..8be786336ce 100644
--- a/security/p5-Digest-Nilsimsa/Makefile
+++ b/security/p5-Digest-Nilsimsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/09/13 06:22:51 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= Digest-Nilsimsa-0.06
@@ -14,7 +14,7 @@ COMMENT= Perl5 extension module for Nilsimsa signatures
# _might_ work with earlier version but author says, it was only tested
# with 5.6.1 :-/
BUILDLINK_DEPENDS.perl= perl>=5.6.1
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_CONFIGURE= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Digest/Nilsimsa/.packlist
diff --git a/security/p5-Net-DNS-SEC/Makefile b/security/p5-Net-DNS-SEC/Makefile
index 34600c19c19..72a9dd37aba 100644
--- a/security/p5-Net-DNS-SEC/Makefile
+++ b/security/p5-Net-DNS-SEC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/26 02:27:53 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= Net-DNS-SEC-0.11
@@ -21,7 +21,7 @@ DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
DEPENDS+= p5-Digest-BubbleBabble>=0.01:../../security/p5-Digest-BubbleBabble
BUILDLINK_DEPENDS.perl= perl>=5.6.1
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_PKGINSTALL= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Net/DNS/SEC/.packlist
diff --git a/security/p5-SHA/Makefile b/security/p5-SHA/Makefile
index b1249e01a2e..89f8211517b 100644
--- a/security/p5-SHA/Makefile
+++ b/security/p5-SHA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:20:24 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= SHA-1.2
@@ -10,7 +10,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=SHA/}
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Perl5 interface to the SHA1 algorithm
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/SHA/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/security/p5-Tie-EncryptedHash/Makefile b/security/p5-Tie-EncryptedHash/Makefile
index d738ebd1664..85006a96a27 100644
--- a/security/p5-Tie-EncryptedHash/Makefile
+++ b/security/p5-Tie-EncryptedHash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:20:26 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= Tie-EncryptedHash-1.1
@@ -15,7 +15,7 @@ DEPENDS+= p5-Crypt-CBC-[0-9]*:../../security/p5-Crypt-CBC
DEPENDS+= p5-Crypt-Blowfish-[0-9]*:../../security/p5-Crypt-Blowfish
DEPENDS+= p5-Crypt-DES-[0-9]*:../../security/p5-Crypt-DES
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Tie/EncryptedHash/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/security/py-amkCrypto/Makefile b/security/py-amkCrypto/Makefile
index 35f66f97949..11ae5897529 100644
--- a/security/py-amkCrypto/Makefile
+++ b/security/py-amkCrypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/03/26 02:27:53 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= pycrypto-1.9a6
@@ -11,10 +11,10 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.amk.ca/python/code/crypto.html
COMMENT= Cryptographic and hash functions for Python
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
PYBINMODULE= yes
PYDISTUTILSPKG= yes
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/py-cryptkit/Makefile b/security/py-cryptkit/Makefile
index 33255aa8b39..915be4b52f1 100644
--- a/security/py-cryptkit/Makefile
+++ b/security/py-cryptkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/09/18 04:17:12 jmc Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/27 05:44:22 snj Exp $
DISTNAME= cryptkit-0.9
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT= Python Cryptographic Toolkit
PYBINMODULE= yes
PYDISTUTILSPKG= yes
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/pyca/Makefile b/security/pyca/Makefile
index 05e74368ac8..e6d2003dba1 100644
--- a/security/pyca/Makefile
+++ b/security/pyca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/27 05:44:22 snj Exp $
# Date-based distfile name for pre-releases leading to 0.6.6.
DISTNAME= pyca-20031021
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.pyca.de/
COMMENT= Administration tools for X.509/PKIX CA
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= yes
NO_BUILD= # defined
.include "../../mk/bsd.prefs.mk"
diff --git a/security/ruby-openssl/Makefile b/security/ruby-openssl/Makefile
index 6f268bdf13b..e10b2a39a7a 100644
--- a/security/ruby-openssl/Makefile
+++ b/security/ruby-openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/26 02:27:54 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/27 05:44:22 snj Exp $
DISTNAME= ossl-0.1.4a
PKGNAME= ${RUBY_PKGNAMEPREFIX}openssl-0.1.4.1
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/ossl
DIST_SUBDIR= ruby
USE_RUBY_EXTCONF= yes
RUBY_REQD= 1.6.4
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= yes
CONFLICTS= ruby-ossl-*
CONFIGURE_ARGS= --with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \
@@ -29,6 +29,6 @@ post-install:
.endfor
.include "../../lang/ruby-base/Makefile.common"
-.include "../../lang/ruby-base/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../lang/ruby-base/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 6e15320e601..9fc582a4e58 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/01/24 15:23:46 grant Exp $
+# $NetBSD: Makefile,v 1.33 2004/04/27 05:44:22 snj Exp $
#
DISTNAME= amaya-src-8.2
@@ -17,7 +17,7 @@ COMMENT= Web browser/editor from the World Wide Web Consortium (W3C)
EXTRACT_ELEMENTS= Amaya libwww
WRKSRC= ${WRKDIR}/Amaya/work
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_X11= YES
USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
@@ -42,8 +42,8 @@ post-patch:
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/Amaya
-.include "../../graphics/imlib/buildlink2.mk"
-.include "../../textproc/expat/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/apachetop/Makefile b/www/apachetop/Makefile
index 4868ce9dd4b..080952b671e 100644
--- a/www/apachetop/Makefile
+++ b/www/apachetop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/08 16:28:38 sketch Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/27 05:44:23 snj Exp $
#
DISTNAME= apachetop-0.8.2
@@ -9,13 +9,13 @@ MAINTAINER= sketch@NetBSD.org
HOMEPAGE= http://clueful.shagged.org/apachetop/
COMMENT= Real time apache log display
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
GNU_CONFIGURE= YES
# NetBSD releases which do not include wattr_on() et al.
INCOMPAT_CURSES= NetBSD-1.5*-*
INCOMPAT_CURSES= NetBSD-1.6-* NetBSD-1.6.*-* NetBSD-1.6[A-Q]-*
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/bins/Makefile b/www/bins/Makefile
index 65cf5368245..24cb305b1ba 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/02/29 13:08:55 martti Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/27 05:44:23 snj Exp $
#
DISTNAME= bins-1.1.25
@@ -25,7 +25,7 @@ DEPENDS+= p5-HTML-Parser>=3.26:../../www/p5-HTML-Parser
DEPENDS+= p5-HTML-Template>=2.5:../../www/p5-HTML-Template
DEPENDS+= p5-URI>=1.19:../../www/p5-URI
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_PKGLOCALEDIR= YES
# bins-edit-gui not installed because many needed packages are missing
# bins_txt2xml not installed because it's an upgrade tool, and we didn't
@@ -90,5 +90,5 @@ do-install:
${PREFIX}/${PKGLOCALEDIR}/locale/$$lang/LC_MESSAGES/bins.mo; \
done
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 618818f9a57..2636297b2dc 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/04/24 22:46:12 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2004/04/27 05:44:23 snj Exp $
DISTNAME= cadaver-0.22.1
CATEGORIES= www
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.webdav.org/cadaver/
COMMENT= Command-line WebDAV client
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
ALL_TARGET= cadaver
GNU_CONFIGURE= YES
@@ -21,9 +21,9 @@ CONFIGURE_ARGS+= --with-ssl=yes
CONFIGURE_ENV+= ac_cv_lib_curses_tputs=no
LIBS+= -ltermcap
-.include "../../devel/readline/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-.include "../../textproc/expat/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
# DON'T make this package depend on the www/neon package until neon
# becomes stable; keep it using its internal copy of neon as with
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index df782541e1e..4de9a3e2c3b 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:55:31 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/27 05:44:23 snj Exp $
#
DISTNAME= chimera-2.0a19
@@ -10,7 +10,7 @@ MAINTAINER= fredb@NetBSD.org
HOMEPAGE= http://www.chimera.org/
COMMENT= World Wide Web Browser for X Windows
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
USE_IMAKE= yes
pre-configure:
@@ -25,6 +25,6 @@ post-install:
cd ${WRKSRC}/doc && ${INSTALL_DATA} \
HINTS INFO LICENSE ${X11PREFIX}/share/doc/chimera
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/clearsilver/Makefile b/www/clearsilver/Makefile
index f2ce498f11b..36d6bcec28a 100644
--- a/www/clearsilver/Makefile
+++ b/www/clearsilver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/03/26 02:27:56 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/27 05:44:23 snj Exp $
DISTNAME= clearsilver-0.9.7
PKGREVISION= 1
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.clearsilver.net/
COMMENT= Fast, powerful HTML template system
GNU_CONFIGURE= yes
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
USE_GNU_TOOLS+= make
# All these really ought to be supported as separate packages...
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 7671574a7a1..908d4986ee4 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/04/05 15:21:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/27 05:44:23 snj Exp $
DISTNAME= elinks-0.9.1
PKGREVISION= 2
@@ -10,7 +10,7 @@ MAINTAINER= dawszy@arhea.net
HOMEPAGE= http://elinks.or.cz/
COMMENT= Extended/Enhanced Links
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_GNU_TOOLS+= make
@@ -19,10 +19,10 @@ CONFIGURE_ARGS+= --without-x
CONFIGURE_ARGS+= --enable-256-colors
CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
-.include "../../archivers/bzip2/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../lang/lua/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/gtkasp2php/Makefile b/www/gtkasp2php/Makefile
index f6aeb3a2037..72b88baeb4b 100644
--- a/www/gtkasp2php/Makefile
+++ b/www/gtkasp2php/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/22 04:14:23 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/27 05:44:23 snj Exp $
DISTNAME= asp2php-0.76.10
PKGREVISION= 2
@@ -10,9 +10,9 @@ MAINTAINER= shell@NetBSD.org
HOMEPAGE= http://asp2php.naken.cc/
COMMENT= Gtk+ version of utility to convert asp pages to php pages
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
ALL_TARGET= all gui
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/http_load/Makefile b/www/http_load/Makefile
index cec88dd9463..aad8d02c9fa 100644
--- a/www/http_load/Makefile
+++ b/www/http_load/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/03/26 02:27:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/27 05:44:23 snj Exp $
DISTNAME= http_load-04jan2002
PKGNAME= http_load-20020104
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.acme.com/software/http_load/
COMMENT= Multiprocessing http test client
MAKE_ENV+= SSLBASE="${SSLBASE}"
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 5af3be06708..0674846b68b 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/01/24 15:23:47 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/04/27 05:44:23 snj Exp $
#
DISTNAME= gateway-${KANNEL_VER}
@@ -14,7 +14,7 @@ COMMENT= Open source WAP and SMS gateway
KANNEL_VER= 1.2.1
GNU_CONFIGURE= YES
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_GNU_TOOLS+= make
USE_PERL5= YES
PTHREAD_OPTS+= require
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --disable-docs
CONFIGURE_ARGS+= --disable-ssl
CFLAGS+= -I${BUILDLINK_PREFIX.libxml2}/include/libxml2/libxml
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/lhs/Makefile b/www/lhs/Makefile
index 5f89a5184ba..10000faad94 100644
--- a/www/lhs/Makefile
+++ b/www/lhs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/03/26 02:27:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/27 05:44:23 snj Exp $
#
DISTNAME= lhs-0.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://dev.null.pl/
COMMENT= Lightweight HTTP Server, IPv6-aware and SSL-enabled
WRKSRC= ${WRKDIR}/lhs
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
BUILD_DEFS+= USE_INET6
@@ -22,5 +22,5 @@ MAKE_ENV+= DEFAULT_ROOT_DIR=${PREFIX}/share/httpd/htdocs
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/lhs ${PREFIX}/sbin/lhs
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile
index 5648c85354d..04ee61ac6c2 100644
--- a/www/mMosaic/Makefile
+++ b/www/mMosaic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:27:59 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/27 05:44:23 snj Exp $
#
DISTNAME= mMosaic-3.7.2
@@ -10,15 +10,15 @@ HOMEPAGE= http://perso.enst.fr/~dauphin/mMosaic/
COMMENT= Modern derivative of NCSA XMosaic
WRKSRC= ${WRKDIR}/mMosaic-src-3.7.2
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_X11= YES
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/mMosaic ${PREFIX}/bin/
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../mk/motif.buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/motif.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-CGI-FastTemplate/Makefile b/www/p5-CGI-FastTemplate/Makefile
index 127b390992b..821ee5d8114 100644
--- a/www/p5-CGI-FastTemplate/Makefile
+++ b/www/p5-CGI-FastTemplate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/24 22:46:12 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/27 05:44:23 snj Exp $
DISTNAME= CGI-FastTemplate-1.09
PKGNAME= p5-${DISTNAME}
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=CGI/}
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Perl5 extension for managing templates
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/CGI/FastTemplate/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index a3a2aac1784..52cd5b26fed 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/04 15:32:27 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/27 05:44:23 snj Exp $
DISTNAME= CGI-FormBuilder-2.12
PKGNAME= p5-${DISTNAME}
@@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=CGI/}
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Perl5 module for building HTML forms
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/CGI-FormBuilder/.packlist
DEPENDS+= p5-HTML-Template>=2.6:../../www/p5-HTML-Template
diff --git a/www/p5-CGI-Minimal/Makefile b/www/p5-CGI-Minimal/Makefile
index 84ddb1ba8d0..fa28e05209b 100644
--- a/www/p5-CGI-Minimal/Makefile
+++ b/www/p5-CGI-Minimal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/22 04:14:29 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/27 05:44:23 snj Exp $
DISTNAME= CGI-Minimal-1.06
PKGNAME= p5-${DISTNAME}
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=CGI/}
MAINTAINER= norm@sandbox.org.uk
COMMENT= Perl5 module for simple CGI scripts
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/CGI/Minimal/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 0059faca79d..e7945326854 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/22 04:14:30 martti Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/27 05:44:23 snj Exp $
#
NAME= CGI-Lite-2.001
@@ -11,7 +11,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=CGI/}
MAINTAINER= bad@NetBSD.org
COMMENT= Simple perl5 module for writing forms-based CGI programs
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/CGI/Lite/.packlist
pre-configure:
diff --git a/www/p5-FCGI/Makefile b/www/p5-FCGI/Makefile
index 8fa10f3ff8c..4f03b3427fc 100644
--- a/www/p5-FCGI/Makefile
+++ b/www/p5-FCGI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/22 04:14:30 martti Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/27 05:44:23 snj Exp $
#
PKGVER= 0.67
@@ -12,7 +12,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.fastcgi.com/
COMMENT= Perl5 library for FastCGI, a fast startup alternative to CGI
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/FCGI/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 209a3a1b7b2..be05a888e81 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/06 23:04:34 epg Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/27 05:44:23 snj Exp $
DISTNAME= HTML-Mason-1.24
PKGNAME= p5-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+= p5-Params-Validate>=0.04:../../devel/p5-Params-Validate
DEPENDS+= p5-Exception-Class>=1.14:../../devel/p5-Exception-Class
DEPENDS+= p5-Class-Container>=0.10:../../devel/p5-Class-Container
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/HTML/Mason/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTML-TableExtract/Makefile b/www/p5-HTML-TableExtract/Makefile
index c8cd12a919b..d94c594e161 100644
--- a/www/p5-HTML-TableExtract/Makefile
+++ b/www/p5-HTML-TableExtract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/25 12:30:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/27 05:44:23 snj Exp $
DISTNAME= HTML-TableExtract-1.08
PKGNAME= p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT= Perl5 module to simplify extracting HTML tables
DEPENDS+= p5-HTML-Parser>=3.08:../../www/p5-HTML-Parser
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/HTML-TableExtract/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTTP-DAV/Makefile b/www/p5-HTTP-DAV/Makefile
index 6984dfd34b6..61f66a3a89d 100644
--- a/www/p5-HTTP-DAV/Makefile
+++ b/www/p5-HTTP-DAV/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/26 02:27:57 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/27 05:44:23 snj Exp $
#
DISTNAME= HTTP-DAV-0.31
@@ -15,7 +15,7 @@ COMMENT= HTTP::DAV interface and 'dave'
DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
DEPENDS+= p5-XML-DOM-[0-9]*:../../textproc/p5-XML-DOM
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/HTTP/DAV/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTTP-Request-Form/Makefile b/www/p5-HTTP-Request-Form/Makefile
index 0e59393cb9a..f97ffe25d35 100644
--- a/www/p5-HTTP-Request-Form/Makefile
+++ b/www/p5-HTTP-Request-Form/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/26 02:27:57 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/27 05:44:23 snj Exp $
#
DISTNAME= HTTP-Request-Form-0.7
@@ -16,7 +16,7 @@ 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_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/HTTP/Request/Form/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index 5a3e7f1f35b..dfaf91823be 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:55:53 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/27 05:44:23 snj Exp $
DISTNAME= HTTPD-User-Manage-1.58
PKGNAME= p5-${DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://stein.cshl.org/~lstein/user_manage/
COMMENT= Perl script/modules for managing web access control
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/HTTPD-User-Manage/.packlist
REPLACE_PERL= user_manage
diff --git a/www/squidGuard/Makefile b/www/squidGuard/Makefile
index 97504fc06d1..9861bc807a2 100644
--- a/www/squidGuard/Makefile
+++ b/www/squidGuard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/10/19 10:22:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/27 05:44:23 snj Exp $
#
DISTNAME= squidGuard-1.2.0
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.squidguard.org/
COMMENT= Ultrafast and free filter, redirector and access controller for Squid
GNU_CONFIGURE= YES
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
CONFIGURE_ARGS+= --with-db-inc=${BUILDLINK_PREFIX.db3}/include/db3
CONFIGURE_ARGS+= --with-db-lib=${BUILDLINK_PREFIX.db3}/lib/db3
@@ -20,5 +20,5 @@ CONFIGURE_ARGS+= --with-sg-config=${PKG_SYSCONFDIR}/squidguard/filter.conf
CONFIGURE_ARGS+= --with-sg-logdir=/var/squidguard/log
CONFIGURE_ARGS+= --with-sg-dbhome=/var/squidguard/db
-.include "../../databases/db3/buildlink2.mk"
+.include "../../databases/db3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/wApua/Makefile b/www/wApua/Makefile
index 0c457482569..6b3396bc529 100644
--- a/www/wApua/Makefile
+++ b/www/wApua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/03/26 02:27:58 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/27 05:44:23 snj Exp $
#
DISTNAME= wApua-0.05
@@ -17,7 +17,7 @@ DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
DEPENDS+= p5-MIME-Base64-*:../../converters/p5-MIME-Base64
DEPENDS+= p5-Net-[0-9]*:../../net/p5-Net
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/wApua/.packlist
post-install: