Convert to buildlink3.

23 files changed, 78 insertions, 84 deletions

diff --git a/devel/cmdline/Makefile b/devel/cmdline/Makefile
index cfbe3c808f9..d541ec06c77 100644
--- a/devel/cmdline/Makefile
+++ b/devel/cmdline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/04/24 22:46:09 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/27 03:09:57 snj Exp $
 
 DISTNAME=	CmdLine
 PKGNAME=	cmdline-${PKG_VERS}
@@ -13,7 +13,7 @@ COMMENT=	C++ library for parsing command arguments
 
 DIST_SUBDIR=	cmdline-${DIST_VERS}
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		# defined
 USE_LIBTOOL=		# defined
 
 MOREUSRDEFS=	-I${BUILDLINK_PREFIX.readline}/include/readline
@@ -24,5 +24,5 @@ MAKE_ENV+=	OPT="${CXXFLAGS}"
 MAKE_ENV+=	MOREUSRDEFS="${MOREUSRDEFS}"
 MAKE_ENV+=	MOREUSRLIBS="${MOREUSRLIBS}"
 
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile
index 43efe15b8f3..331308dd4c0 100644
--- a/devel/dmalloc/Makefile
+++ b/devel/dmalloc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/15 18:54:29 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/27 03:09:58 snj Exp $
 
 DISTNAME=		dmalloc-5.3.0
 CATEGORIES=		devel
@@ -9,7 +9,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.dmalloc.com/
 COMMENT=		Run-time configurable debugging malloc library
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shlib
@@ -23,5 +23,5 @@ post-install:
 
 INFO_FILES=		dmalloc.info
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/dmalloc/buildlink2.mk b/devel/dmalloc/buildlink2.mk
deleted file mode 100644
index 510f6e22541..00000000000
--- a/devel/dmalloc/buildlink2.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/07/15 12:56:36 drochner Exp $
-#
-
-.if !defined(DMALLOC_BUILDLINK2_MK)
-DMALLOC_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			dmalloc
-BUILDLINK_DEPENDS.dmalloc?=		dmalloc>=4.8.2nb2
-BUILDLINK_PKGSRCDIR.dmalloc?=		../../devel/dmalloc
-
-BUILDLINK_DEPMETHOD.dmalloc?=		build
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.dmalloc=dmalloc
-BUILDLINK_PREFIX.dmalloc_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.dmalloc+=	include/dmalloc.h
-BUILDLINK_FILES.dmalloc+=	lib/libdmalloc.*
-BUILDLINK_FILES.dmalloc+=	lib/libdmallocxx.*
-BUILDLINK_FILES.dmalloc+=	lib/libdmallocth.*
-BUILDLINK_FILES.dmalloc+=	lib/libdmallocthcxx.*
-
-BUILDLINK_TARGETS+=	dmalloc-buildlink
-
-dmalloc-buildlink: _BUILDLINK_USE
-
-.endif	# DMALLOC_BUILDLINK2_MK
diff --git a/devel/dmalloc/buildlink3.mk b/devel/dmalloc/buildlink3.mk
new file mode 100644
index 00000000000..3891135fe73
--- /dev/null
+++ b/devel/dmalloc/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 03:09:58 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+DMALLOC_BUILDLINK3_MK:=	${DMALLOC_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	dmalloc
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndmalloc}
+BUILDLINK_PACKAGES+=	dmalloc
+
+.if !empty(DMALLOC_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.dmalloc+=	dmalloc>=4.8.2nb2
+BUILDLINK_PKGSRCDIR.dmalloc?=	../../devel/dmalloc
+BUILDLINK_DEPMETHOD.dmalloc?=	build
+.endif	# DMALLOC_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/exctags/Makefile b/devel/exctags/Makefile
index 215764ea1e8..f28b88f1ecd 100644
--- a/devel/exctags/Makefile
+++ b/devel/exctags/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:30:27 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/27 03:09:58 snj Exp $
 #
 
 DISTNAME=	ctags-5.5
@@ -10,7 +10,7 @@ MAINTAINER=	seb@NetBSD.org
 HOMEPAGE=	http://ctags.sourceforge.net/
 COMMENT=	Exuberant (feature-filled) tagfile generator for vi, emacs and clones
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--enable-macro-patterns
 CONFIGURE_ARGS+=	--with-readlib
diff --git a/devel/global/Makefile b/devel/global/Makefile
index ceea10a23da..2fdf863ccb7 100644
--- a/devel/global/Makefile
+++ b/devel/global/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/08/09 10:44:41 seb Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/27 03:09:58 snj Exp $
 #
 
 DISTNAME=	global-4.5
@@ -9,7 +9,7 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.tamacom.com/global/
 COMMENT=	Source code tag system including web browser output
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 INFO_FILES=		global.info
 
@@ -22,5 +22,5 @@ MAKE_ENV+=      BINDIR="${PREFIX}/bin"
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/libdata/lint
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gnome2-libole2/Makefile b/devel/gnome2-libole2/Makefile
index 70e0f34e928..2648b66dfe4 100644
--- a/devel/gnome2-libole2/Makefile
+++ b/devel/gnome2-libole2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:37 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/27 03:09:58 snj Exp $
 #
 
 DISTNAME=		libole2-2.2.8
@@ -15,10 +15,10 @@ COMMENT=		OLE2 streams parsing library for GNOME2
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_X11=		YES
 USE_LIBTOOL=		YES
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gscope/Makefile b/devel/gscope/Makefile
index 15895ca49ed..f8bbda2be48 100644
--- a/devel/gscope/Makefile
+++ b/devel/gscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/25 04:16:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/27 03:09:58 snj Exp $
 #
 
 DISTNAME=		gscope-0.4.1
@@ -12,14 +12,14 @@ COMMENT=		Software oscilloscope library
 
 BUILD_DEPENDS+=		gtk-doc-[0-9]*:../../textproc/gtk-doc
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 USE_X11=		# defined
 GNU_CONFIGURE=		# defined
 USE_LIBTOOL=		# defined
 
-.include "../../devel/popt/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/hptools/Makefile b/devel/hptools/Makefile
index 02b958bd06e..d0ae1d4b03b 100644
--- a/devel/hptools/Makefile
+++ b/devel/hptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:13:28 agc Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/27 03:09:58 snj Exp $
 #
 
 DISTNAME=	hptools-src-3.0.8
@@ -18,7 +18,7 @@ LICENSE=	hptools-license
 
 WRKSRC=		${WRKDIR}/Hptools/support
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 post-build:
 	${CHMOD} ${SHAREMODE} ${WRKSRC}/../doc/*
diff --git a/devel/libctl/Makefile b/devel/libctl/Makefile
index abe0558ae15..9c92aade5bf 100644
--- a/devel/libctl/Makefile
+++ b/devel/libctl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 21:31:22 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/27 03:09:58 snj Exp $
 
 DISTNAME=	libctl-2.2
 PKGREVISION=	1
@@ -10,7 +10,7 @@ HOMEPAGE=	http://ab-initio.mit.edu/libctl/
 COMMENT=	Guile-based flexible control file library for scientific simulations
 
 GNU_CONFIGURE=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libctl
@@ -18,5 +18,5 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} COPYING COPYRIGHT ChangeLog 	\
 		NEWS README ${PREFIX}/share/doc/libctl/
 
-.include "../../lang/guile/buildlink2.mk"
+.include "../../lang/guile/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile
index f52156e204c..c57b300587b 100644
--- a/devel/libelf/Makefile
+++ b/devel/libelf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/03/04 11:27:59 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/27 03:09:58 snj Exp $
 #
 
 DISTNAME=		libelf-0.8.5
@@ -9,7 +9,7 @@ MAINTAINER=		petrov@NetBSD.org
 HOMEPAGE=		http://www.stud.uni-hannover.de/~michael/software/
 COMMENT=		ELF object file access library
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/devel/p5-Class-ReturnValue/Makefile b/devel/p5-Class-ReturnValue/Makefile
index 2a3b7c011e9..7b25c89a40c 100644
--- a/devel/p5-Class-ReturnValue/Makefile
+++ b/devel/p5-Class-ReturnValue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/04/25 04:09:38 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/27 03:09:58 snj Exp $
 #
 
 DISTNAME=		Class-ReturnValue-0.51
@@ -11,7 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/Class-ReturnValue/
 COMMENT=		Perl5 module for return-value object
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Class/ReturnValue/.packlist
 
 DEPENDS+=		p5-Devel-StackTrace-[0-9]*:../p5-Devel-StackTrace
diff --git a/devel/p5-Devel-Profile/Makefile b/devel/p5-Devel-Profile/Makefile
index 9918f1ff60f..763c9c37e66 100644
--- a/devel/p5-Devel-Profile/Makefile
+++ b/devel/p5-Devel-Profile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/30 04:30:20 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/27 03:09:58 snj Exp $
 
 DISTNAME=	Devel-Profile-1.03
 PKGNAME=	p5-${DISTNAME}
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/~jaw/Devel-Profile-1.03/Profile.pm
 COMMENT=	Perl5 module for profiling perl programs
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Devel/Profile/.packlist
 
 DEPENDS+=	p5-Time-HiRes>=1.20:../../time/p5-Time-HiRes
diff --git a/devel/p5-Devel-StackTrace/Makefile b/devel/p5-Devel-StackTrace/Makefile
index ecb754c2a10..8edffbe03cf 100644
--- a/devel/p5-Devel-StackTrace/Makefile
+++ b/devel/p5-Devel-StackTrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/09/19 09:33:33 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/27 03:09:58 snj Exp $
 #
 
 DISTNAME=		Devel-StackTrace-1.03
@@ -11,7 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/author/DROLSKY/Devel-StackTrace-1.03/
 COMMENT=		Perl5 module for stack trace and stack trace frame objects
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Devel/StackTrace/.packlist
 
 DEPENDS+=	p5-Test-Simple>=0.46:../p5-Test-Simple
diff --git a/devel/p5-Test-Inline/Makefile b/devel/p5-Test-Inline/Makefile
index d4c8fcc16f3..51fe2c60197 100644
--- a/devel/p5-Test-Inline/Makefile
+++ b/devel/p5-Test-Inline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:32:52 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/27 03:09:58 snj Exp $
 
 DISTNAME=		Test-Inline-0.15
 PKGNAME=		p5-${DISTNAME}
@@ -9,7 +9,7 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Test/}
 MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Inlining your tests next to the code being tested
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Test/Inline/.packlist
 
 DEPENDS+=		p5-Test-Simple>=0.33:../p5-Test-Simple
diff --git a/devel/ptl2/Makefile b/devel/ptl2/Makefile
index 37b48ba20f8..5b8afac5585 100644
--- a/devel/ptl2/Makefile
+++ b/devel/ptl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2004/01/27 00:53:12 heinz Exp $
+# $NetBSD: Makefile,v 1.44 2004/04/27 03:09:58 snj Exp $
 
 DISTNAME=		PTL-2.1.9
 PKGNAME=		ptl-2.1.9
@@ -11,7 +11,7 @@ MAINTAINER=		msaitoh@NetBSD.org
 HOMEPAGE=		http://www.media.osaka-cu.ac.jp/~k-abe/PTL/
 COMMENT=		Portable user-level Thread Library 2 written by Kota Abe
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PERL5=		build
 MAKE_ENV=		INSTALL_PROGRAM="${INSTALL_SCRIPT}"
 PLIST_SRC=		${WRKDIR}/PLIST
diff --git a/devel/py-TPG/Makefile b/devel/py-TPG/Makefile
index ecaa299a15b..3032c1eeaaf 100644
--- a/devel/py-TPG/Makefile
+++ b/devel/py-TPG/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/09/25 15:43:35 recht Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/27 03:09:58 snj Exp $
 #
 
 DISTNAME=		TPG-2.1.6
@@ -11,7 +11,7 @@ COMMENT=		ToyParserGenerator for Python
 
 PYTHON_VERSIONS_ACCEPTED=	23 23pth 22 22pth
 PYDISTUTILSPKG=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-kjbuckets/Makefile b/devel/py-kjbuckets/Makefile
index 62524dff84c..41552c5e7a4 100644
--- a/devel/py-kjbuckets/Makefile
+++ b/devel/py-kjbuckets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/27 03:09:58 snj Exp $
 #
 
 DISTNAME=	gadfly-1.0.0
@@ -14,7 +14,7 @@ EXTRACT_ELEMENTS=	${DISTNAME}/kjbuckets
 EXTRACT_ELEMENTS+=	${DISTNAME}/doc/kjbuckets.txt
 WRKSRC=			${WRKDIR}/${DISTNAME}/kjbuckets
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 PYDISTUTILSPKG=	yes
 PYBINMODULE=	yes
diff --git a/devel/py-pqueue/Makefile b/devel/py-pqueue/Makefile
index 40a402c94a0..305b5bfe5ba 100644
--- a/devel/py-pqueue/Makefile
+++ b/devel/py-pqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/21 06:57:31 snj Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/27 03:09:58 snj Exp $
 #
 
 DISTNAME=		PQueue-0.2
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.csse.monash.edu.au/hons/projects/1999/Andrew.Snare/
 COMMENT=		Priority-queues using fibonacci heaps
 
 WRKSRC=		${WRKDIR}/PQueue
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
 ALL_TARGET=		default
diff --git a/devel/ruby-readline/Makefile b/devel/ruby-readline/Makefile
index fd34b900055..ccf14ff9c79 100644
--- a/devel/ruby-readline/Makefile
+++ b/devel/ruby-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/16 02:01:10 taca Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/27 03:09:58 snj Exp $
 #
 
 DISTNAME=		${RUBY_DISTNAME}
@@ -14,7 +14,7 @@ COMMENT=		Ruby extension to readline library
 WRKSRC=			${RUBY_WRKSRC}/ext/readline
 DIST_SUBDIR=		ruby
 USE_GNU_READLINE=	# uses rl_event_hook interface to GNU readline
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 
 EXTRACT_ELEMENTS=	${RUBY_DISTNAME}/ext/readline
 USE_RUBY_EXTCONF=	yes
@@ -26,7 +26,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${RUBY_DOCDIR}/readline
 .endfor
 
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/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/sgi-stl/Makefile b/devel/sgi-stl/Makefile
index abc8b06dcc2..401ca5ef2be 100644
--- a/devel/sgi-stl/Makefile
+++ b/devel/sgi-stl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/04/24 22:46:09 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/27 03:09:58 snj Exp $
 
 DISTNAME=		stl
 PKGNAME=		sgi-stl-3.3
@@ -12,7 +12,7 @@ COMMENT=		SGI Standard Template Library
 WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		${PKGNAME}
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 NO_CONFIGURE=		# defined
 NO_BUILD=		# defined
 
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index ae61cbe4e5e..24a853eb55e 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/02/14 17:39:29 mrauch Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/27 03:09:58 snj Exp $
 
 DISTNAME=	STLport-4.6
 PKGNAME=	stlport-4.6
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.stlport.org/
 COMMENT=	Complete C++ standard library
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	# defined
 USE_LANGUAGES=	c c++
@@ -46,5 +46,5 @@ do-install:
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.css *.html ${HTMLDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} images/* ${HTMLDIR}/images
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile
index f6ce9bb3f87..e07fbfabc2a 100644
--- a/games/crossfire-srv/Makefile
+++ b/games/crossfire-srv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/24 13:30:55 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/04/27 03:09:58 snj Exp $
 #
 
 DISTNAME=	crossfire-1.0.0
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	${CF_SRC}
 CF_SRC=		crossfire-1.0.0.tar.bz2
 CF_MAPS=	crossfire-1.0.0-maps.tar.bz2
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_X11=	yes
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
@@ -43,8 +43,8 @@ post-install:
 	@${CHOWN} -R ${ROOT_USER}:games ${LOCALBASE}/var/crossfire
 	@${CHMOD} -R g+w ${LOCALBASE}/var/crossfire
 
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../devel/dmalloc/buildlink2.mk"
-.include "../../mk/xaw.buildlink2.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../devel/dmalloc/buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"