diff --git a/devel/cbrowser/Makefile b/devel/cbrowser/Makefile
index 5d4b07eb6537..571d627b39ed 100644
--- a/devel/cbrowser/Makefile
+++ b/devel/cbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/11/14 11:27:03 agc Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/21 14:50:25 wiz Exp $
 #
 
 DISTNAME=       cbrowser-0.6
@@ -11,6 +11,7 @@ COMMENT=        graphical C/C++ source code browsing tool, and call graph viewer
 
 DEPENDS+=	cscope-[0-9]*:../../devel/cscope
 
+USE_BUILDLINK2=	# defined
 NO_BUILD=	# defined
 
 post-patch:
@@ -24,5 +25,5 @@ do-install:
 		${INSTALL_SCRIPT} ${WRKSRC}/$$f ${PREFIX}/share/cbrowser; \
 	done
 
-.include "../../x11/tk/buildlink.mk"
+.include "../../x11/tk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 5ba084a29133..f1cc8271c828 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/01/28 16:55:53 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2002/10/21 14:52:27 wiz Exp $
 #
 
 DISTNAME=	tkcvs-7_03
@@ -11,7 +11,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.twobarleycorns.net/tkcvs.html
 COMMENT=	Tcl/Tk frontends to CVS and diff
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 NO_BUILD=		YES
 
 do-install:
@@ -21,5 +21,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkcvs
 	${INSTALL_DATA} ${WRKSRC}/README.tkcvs ${PREFIX}/share/doc/tkcvs/
 
-.include "../../x11/tk/buildlink.mk"
+.include "../../x11/tk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index ab0e339f3bfe..6679959ffe6b 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/04/11 12:39:44 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/21 14:58:09 wiz Exp $
 #
 
 DISTNAME=	smalltalk-1.95.10
@@ -11,22 +11,22 @@ COMMENT=	GNU Smalltalk: A smalltalk-80 implementation
 
 USE_GMAKE=		YES
 USE_GNU_READLINE=	YES
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_DIR}/lib
-CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_DIR}/lib
-CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_DIR}/lib
+CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}/lib
+CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
+CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}/lib
 CONFIGURE_ARGS+=	--without-libiconv
 CONFIGURE_ARGS+=	--without-glib --without-gtk
 
-USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc *-*-powerpc
 
-.include "../../devel/readline/buildlink.mk"
-.include "../../lang/tcl/buildlink.mk"
-.include "../../x11/tk/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/readline/buildlink2.mk"
+.include "../../lang/tcl/buildlink2.mk"
+.include "../../x11/tk/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"