Convert to buildlink3.

24 files changed, 74 insertions, 74 deletions

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: