Convert to buildlink3.

15 files changed, 45 insertions, 44 deletions

diff --git a/lang/RScheme/Makefile b/lang/RScheme/Makefile
index 9354f914c15..3cfa21b3c08 100644
--- a/lang/RScheme/Makefile
+++ b/lang/RScheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/09/17 11:21:53 agc Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/28 05:06:28 snj Exp $
 
 DISTNAME=		rs-0.7.3.2
 PKGNAME=		RScheme-0.7.3.2
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.rscheme.org/
 COMMENT=		Object-oriented Scheme implementation
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 ALL_TARGET=		base
 
@@ -72,6 +72,6 @@ post-install:
 		${BUILDLINK_DIR}/lib/librs.a
 	${CHMOD} -R g+w ${WRKSRC}
 
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index 25e63467f01..80433116cb6 100644
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:43:56 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/28 05:06:28 snj Exp $
 
 DISTNAME=       	STk-4.0.1
 CATEGORIES=		lang
@@ -8,7 +8,7 @@ MAINTAINER=		perry@NetBSD.org
 HOMEPAGE=		http://kaolin.unice.fr/STk/
 COMMENT=		Scheme interpreter with full access to the Tk graphical package
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 OSVERSION_SPECIFIC=	yes
 GNU_CONFIGURE=		yes
 USE_X11=		yes
diff --git a/lang/cilk/Makefile b/lang/cilk/Makefile
index 594fe4343d1..3c380cca7c9 100644
--- a/lang/cilk/Makefile
+++ b/lang/cilk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:43 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/04/28 05:06:28 snj Exp $
 
 DISTNAME=		cilk-5.3.1
 PKGREVISION=		2
@@ -13,7 +13,7 @@ COMMENT=		Multithreaded parallel programming language based on ANSI C
 ONLY_FOR_PLATFORM=	*-*-alpha *-*-i386 -*-*mipse[bl] *-*-powerpc *-*-sparc
 
 GNU_CONFIGURE=		# defined
-USE_BUILDLINK2=	 	# defined
+USE_BUILDLINK3=	 	yes
 USE_GNU_TOOLS+=		make
 USE_PERL5=		yes
 USE_LIBTOOL=		yes
@@ -33,5 +33,5 @@ post-install:
 		${PREFIX}/share/examples/cilk
 	${INSTALL_DATA} ${WRKSRC}/FAQ/cilk-faq.info ${PREFIX}/info
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index c233e2d6bad..fa8be2ad9dc 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/24 13:51:14 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/28 05:06:28 snj Exp $
 #
 
 DISTNAME=	coq-7.4
@@ -11,7 +11,7 @@ HOMEPAGE=	http://coq.inria.fr/
 COMMENT=	Theorem prover which extracts programs from proofs
 
 USE_GNU_TOOLS+=	make
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS+=	-prefix ${PREFIX}
 CONFIGURE_ARGS+=	-emacslib ${PREFIX}/share/emacs/site-lisp
@@ -24,5 +24,5 @@ ALL_TARGET=	world
 PLIST_SRC=	${PKGDIR}/PLIST.opt ${PKGDIR}/PLIST
 .endif
 
-.include "../../lang/ocaml/buildlink2.mk"
+.include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index 81d2c971057..829f074dcd0 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/02/21 07:09:54 snj Exp $
+# $NetBSD: Makefile,v 1.19 2004/04/28 05:06:28 snj Exp $
 #
 
 DISTNAME=		plt.src.x
@@ -18,7 +18,7 @@ COMMENT=		R4RS-compliant and nearly R5RS-compliant scheme tailored for teaching
 CONFLICTS+=		mzscheme-[0-9]*:../../lang/mzscheme
 
 WRKSRC=                 ${WRKDIR}/plt/src
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_X11=		yes
 USE_GNU_TOOLS+=		make
 USE_PERL5=		yes
@@ -69,5 +69,5 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/../install ${PREFIX}/lib/plt
 	@cd ${PREFIX}/lib/plt && ${ECHO} y | ${SH} install
 
-.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 1b2e112efe4..846acb7a8b5 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/07/17 21:44:16 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/04/28 05:06:28 snj Exp $
 # FreeBSD Id: Makefile,v 1.15 1997/09/01 12:28:30 tg Exp
 #
 
@@ -15,7 +15,7 @@ COMMENT=		Embeddable Scheme interpreter
 NOT_FOR_PLATFORM=	*-*-alpha *-*-mips* *-*-sparc64
 
 ALL_TARGET=		default
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -29,14 +29,14 @@ BUILD_DEFS+=	ELK_GUI
 MAKE_ENV+=	X11_LDFLAGS="${X11_LDFLAGS:S/-Wl,//}"
 .  if !empty(ELK_GUI:Mxaw)
 USE_X11=	# defined
-.    include "../../mk/xaw.buildlink2.mk"
+.    include "../../mk/xaw.buildlink3.mk"
 LIBXAW:=	${LIBXAW:S/-Wl,//}
 ELK_SUBDIRS+=	lib/xlib lib/xt lib/xaw
 PLIST_SRC+=	${PKGDIR}/PLIST.X11
 BUILD_DEFS+=	XAW_TYPE
 .  endif
 .  if !empty(ELK_GUI:Mmotif)
-.    include "../../mk/motif.buildlink2.mk"
+.    include "../../mk/motif.buildlink3.mk"
 MOTIFLIB:=	${MOTIFLIB:S/-Wl,//}
 ELK_SUBDIRS+=	lib/xm lib/xm/xt
 PLIST_SRC+=	${PKGDIR}/PLIST.Motif
diff --git a/lang/focal/Makefile b/lang/focal/Makefile
index 8d1b80681de..edcaeda85e6 100644
--- a/lang/focal/Makefile
+++ b/lang/focal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/11 17:15:02 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/28 05:06:28 snj Exp $
 #
 
 DISTNAME=		focal
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://home.tiscali.be/be042720/44/focal.htm
 COMMENT=		Interpreted programming language
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 
 FOCALDOCDIR=	${PREFIX}/share/doc/focal
 
diff --git a/lang/gb/Makefile b/lang/gb/Makefile
index 14b974ee785..5a413fd54d0 100644
--- a/lang/gb/Makefile
+++ b/lang/gb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/03 18:49:45 reed Exp $
+# $NetBSD: Makefile,v 1.20 2004/04/28 05:06:28 snj Exp $
 #
 
 DISTNAME=		gb-0.0.20
@@ -13,12 +13,12 @@ COMMENT=		Basic for Gnome
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../print/gnome-print/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../print/gnome-print/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index 09c3aa2f777..1300f7b472b 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:19:16 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/28 05:06:28 snj Exp $
 
 DISTNAME=		gprolog-1.2.16
 CATEGORIES=		lang
@@ -11,7 +11,7 @@ COMMENT=		GNU prolog compiler and interpreter
 ONLY_FOR_PLATFORM=	*-*-i386 *-*-powerpc *-*-sparc
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-install-dir=${PREFIX}/libexec/${PKGNAME} \
 			--with-doc-dir=${PREFIX}/share/doc/gprolog \
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index ba142736f7a..238c1e6193b 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/01/20 12:19:16 agc Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/28 05:06:28 snj Exp $
 
 DISTNAME=	hugs98-Dec2001
 PKGNAME=	hugs98-200112
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.haskell.org/hugs/
 COMMENT=	Nottingham and Yale Haskell interpreter and programming environment
 
 WRKSRC=			${WRKDIR}/hugs98-Dec2001/src/unix
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-readline
 ALL_TARGET=		default
@@ -27,5 +27,5 @@ do-install:
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/../../docs/hugs.1 ${PREFIX}/man/man1/hugs.1
 
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 6a5422f7e62..41bc74680e7 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/07/24 16:01:41 jtb Exp $
+# $NetBSD: Makefile,v 1.30 2004/04/28 05:06:28 snj Exp $
 
 DISTNAME=       	icon.v942src
 PKGNAME=		icon-9.4.2
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.cs.arizona.edu/icon/index.htm
 COMMENT=		The Icon programming language
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_X11=		YES
 CONFIGURE_TARGET=	X-Configure
 ALL_TARGET=		All
@@ -22,7 +22,7 @@ TEST_TARGET=		Test
 	(${MACHINE_ARCH} == "m68k") || (${MACHINE_ARCH} == "vax")
 .else
 PTHREAD_OPTS+=		require native
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .endif
 
 pre-build:
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index a101587dac2..d11baeb4054 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/03/13 16:41:04 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/28 05:06:28 snj Exp $
 
 DISTNAME=		oo2c_${BITS}-2.0.11
 PKGNAME=		oo2c-2.0.11
@@ -21,7 +21,7 @@ BITS=64
 BITS=32
 .endif
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
@@ -40,5 +40,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
 	cd ${PREFIX}/share/emacs/site-lisp && ${LN} -sf ${PREFIX}/lib/oo2c/emacs oo2c
 
-.include "../../devel/boehm-gc/buildlink2.mk"
+.include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/py-pyrex/Makefile b/lang/py-pyrex/Makefile
index a596dc3ac0b..f402ad0c37a 100644
--- a/lang/py-pyrex/Makefile
+++ b/lang/py-pyrex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/12/10 15:58:09 recht Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/28 05:06:28 snj Exp $
 
 DISTNAME=	Pyrex-0.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/P/p/}
@@ -12,7 +12,7 @@ COMMENT=	A Language for Writing Python Extension Modules
 PYTHON_VERSIONS_ACCEPTED=	23 23pth 22 22pth
 
 PYDISTUTILSPKG= # defined
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/stalin/Makefile b/lang/stalin/Makefile
index 71c3c40443b..888824d561f 100644
--- a/lang/stalin/Makefile
+++ b/lang/stalin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/17 21:45:25 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/04/28 05:06:28 snj Exp $
 
 DISTNAME=		stalin-0.9
 PKGREVISION=		2
@@ -13,7 +13,8 @@ COMMENT=		Aggressively optimizing Scheme compiler
 # Only ported to these 4 archs
 ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc *-*-alpha *-*-mips
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
+USE_X11=		yes
 UNLIMIT_RESOURCES=	stacksize datasize
 
 .include "../../mk/bsd.prefs.mk"
@@ -39,6 +40,6 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ANNOUNCEMENT COPYING README	\
 		stalin.el ${PREFIX}/share/doc/stalin/
 
-.include "../../devel/boehm-gc/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../devel/boehm-gc/buildlink3.mk"
+.include "../../graphics/Mesa/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/yabasic/Makefile b/lang/yabasic/Makefile
index b88ce08d627..4f8cc3fb498 100644
--- a/lang/yabasic/Makefile
+++ b/lang/yabasic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/12/30 17:27:31 cjep Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/28 05:06:28 snj Exp $
 
 DISTNAME=		yabasic-2.722
 PKGREVISION=		1
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.yabasic.de/
 COMMENT=		Yet another Basic for Unix and Windows
 
 USE_X11=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 
 post-install:
@@ -18,5 +18,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/yabasic.htm \
 		${PREFIX}/share/doc/html/yabasic
 
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"