diff --git a/databases/php3-ldap/Makefile b/databases/php3-ldap/Makefile
index f19cfbaf021b..5af3d6999ce7 100644
--- a/databases/php3-ldap/Makefile
+++ b/databases/php3-ldap/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/10 13:03:15 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/09 11:55:53 wiz Exp $
 
 MODNAME=		ldap
 CATEGORIES+=		databases
 PKGREVISION=		# empty
 COMMENT=		PHP3 extension for LDAP database access
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 
 .include "../../www/php3/Makefile.module"
 
-CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap}
 MOD_LIBS+=		-lldap -llber
 
-.include "../../databases/openldap/buildlink.mk"
+.include "../../databases/openldap/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php3-mysql/Makefile b/databases/php3-mysql/Makefile
index fe7fe1d584da..c6c038ede504 100644
--- a/databases/php3-mysql/Makefile
+++ b/databases/php3-mysql/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/10 13:03:47 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/09 11:55:53 wiz Exp $
 
 MODNAME=		mysql
 CATEGORIES+=		databases
 PKGREVISION=		# empty
 COMMENT=		PHP3 extension for MySQL database access
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 
 .include "../../www/php3/Makefile.module"
 
 BUILDLINK_DEPENDS.mysql-client=	mysql-client>=3.23.35
 
-CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_DIR}
-MOD_CPPFLAGS+=		-I${BUILDLINK_DIR}/include/mysql
-MOD_LDFLAGS+=		-L${BUILDLINK_DIR}/lib/mysql -R${LOCALBASE}/lib/mysql
+CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
+MOD_CPPFLAGS+=		-I${BUILDLINK_PREFIX.mysql-client}/include/mysql
+MOD_LDFLAGS+=		-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql -R${LOCALBASE}/lib/mysql
 MOD_LIBS+=		-lmysqlclient -lm
 
-.include "../../databases/mysql-client/buildlink.mk"
+.include "../../databases/mysql-client/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php3-pgsql/Makefile b/databases/php3-pgsql/Makefile
index 5785ca4162d0..03d894fa8386 100644
--- a/databases/php3-pgsql/Makefile
+++ b/databases/php3-pgsql/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/10 13:04:15 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/09 11:55:54 wiz Exp $
 
 MODNAME=		pgsql
 CATEGORIES+=		databases
 PKGREVISION=		# empty
 COMMENT=		PHP3 extension for PostgreSQL database access
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 
 .include "../../www/php3/Makefile.module"
 
-CONFIGURE_ARGS+=	--with-pgsql=${BUILDLINK_DIR}
-MOD_CPPFLAGS+=		-I${BUILDLINK_DIR}/include/pgsql
+CONFIGURE_ARGS+=	--with-pgsql=${BUILDLINK_PREFIX.postgresql-lib}
+MOD_CPPFLAGS+=		-I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
 MOD_LIBS+=		-lpq -lcrypt
 
-.include "../../databases/postgresql-lib/buildlink.mk"
+.include "../../databases/postgresql-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index 29378e2a7408..d9c11487b711 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/07/05 12:16:33 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2002/10/09 11:58:18 wiz Exp $
 
 DISTNAME=		magicpoint-1.09a
 PKGREVISION=		1
@@ -11,6 +11,7 @@ COMMENT=		X11 based presentation tool
 
 CONFLICTS=		mgp-[0-9]*
 
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_IMAKE=		yes
 CONFIGURE_ARGS+=	--enable-freetype-charset16
@@ -43,10 +44,10 @@ post-install:
 	${INSTALL_DATA} README* *.jpg *.eps *.mgp *.xbm mgprc-sample \
 		${PREFIX}/share/examples/mgp
 
-.include "../../graphics/freetype-lib/buildlink.mk"
-.include "../../graphics/libungif/buildlink.mk"
-.include "../../graphics/mng/buildlink.mk"
-.include "../../graphics/netpbm/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../print/ja-vflib-lib/buildlink.mk"
+.include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../graphics/libungif/buildlink2.mk"
+.include "../../graphics/mng/buildlink2.mk"
+.include "../../graphics/netpbm/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../print/ja-vflib-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/php3-gd/Makefile b/graphics/php3-gd/Makefile
index d7975cba2d41..ab3670f5f8cb 100644
--- a/graphics/php3-gd/Makefile
+++ b/graphics/php3-gd/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:15 fredb Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/09 11:55:54 wiz Exp $
 
 MODNAME=		gd
 CATEGORIES+=		graphics
 PKGREVISION=		1
 COMMENT=		PHP3 extension for GD graphics library
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 
 .include "../../www/php3/Makefile.module"
 
@@ -17,5 +17,5 @@ PLIST_SRC+=		${.CURDIR}/PLIST.extras
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/extra/gd/bdf2gdfont ${PREFIX}/bin
 
-.include "../../graphics/gd/buildlink.mk"
+.include "../../graphics/gd/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/php3-pdflib/Makefile b/print/php3-pdflib/Makefile
index de546577168f..e1d1ccc166d0 100644
--- a/print/php3-pdflib/Makefile
+++ b/print/php3-pdflib/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:38 fredb Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/09 11:55:54 wiz Exp $
 
 MODNAME=		pdf
 CATEGORIES+=		print
 PKGREVISION=		2
 COMMENT=		PHP3 extension for PDFlib on-the-fly PDF generation
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 
 .include "../../www/php3/Makefile.module"
 
@@ -18,5 +18,5 @@ LIBS+=			-lpng -lz
 
 MOD_LIBS+=		-lpdf -lm -ltiff -ljpeg -lpng -lz
 
-.include "../../print/pdflib/buildlink.mk"
+.include "../../print/pdflib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-php3/Makefile b/www/ap-php3/Makefile
index 46b6c073e82f..80f319506e1d 100644
--- a/www/ap-php3/Makefile
+++ b/www/ap-php3/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2002/02/28 15:07:16 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/09 11:55:54 wiz Exp $
 #
 
 PKGNAME=		ap-php-${BASE_VERS}
 PKGREVISION=		1
 COMMENT=		Apache module for PHP3
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 
 .include "../../www/php3/Makefile.common"
 
@@ -17,5 +17,5 @@ CPPFLAGS+=		-DPHP_INTERNAL_FUNCS
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libphp3.so ${PREFIX}/lib/httpd/mod_php3.so
 
-.include "../../www/apache/buildlink.mk"
+.include "../../www/apache/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php3/Makefile b/www/php3/Makefile
index 1a5ccb9632ab..d305dff41fad 100644
--- a/www/php3/Makefile
+++ b/www/php3/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.35 2002/08/22 18:51:12 jschauma Exp $
+# $NetBSD: Makefile,v 1.36 2002/10/09 11:55:54 wiz Exp $
 
 PKGNAME=		php-${BASE_VERS}
 PKGREVISION?=		1
 CATEGORIES+=		lang
 COMMENT=		HTML-embedded programming language
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 
 .include "Makefile.common"
 
diff --git a/www/php3/Makefile.common b/www/php3/Makefile.common
index 60a21f5e8de8..bf5e5e3df1d0 100644
--- a/www/php3/Makefile.common
+++ b/www/php3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2002/01/10 13:17:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.2 2002/10/09 11:55:54 wiz Exp $
 
 DISTNAME=		php-${DIST_VERS}
 CATEGORIES+=		www php3
@@ -53,5 +53,5 @@ post-extract: copy-abstractions-c
 copy-abstractions-c:
 	@${CP} ${FILESDIR}/abstractions.c ${WRKSRC}
 
-.include "../../databases/gdbm/buildlink.mk"
-.include "../../devel/zlib/buildlink.mk"
+.include "../../databases/gdbm/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"