Convert to buildlink3.

3 files changed, 12 insertions, 30 deletions

diff --git a/audio/lame/buildlink2.mk b/audio/lame/buildlink2.mk
deleted file mode 100644
index 76fff687ac1..00000000000
--- a/audio/lame/buildlink2.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/07/13 13:50:26 wiz Exp $
-
-.if !defined(LAME_BUILDLINK2_MK)
-LAME_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		lame
-BUILDLINK_DEPENDS.lame?=	lame>=3.93.1nb2
-BUILDLINK_PKGSRCDIR.lame?=	../../audio/lame
-
-EVAL_PREFIX+=			BUILDLINK_PREFIX.lame=lame
-BUILDLINK_PREFIX.lame_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.lame=		include/lame/lame.h
-BUILDLINK_FILES.lame+=		lib/libmp3lame.*
-
-BUILDLINK_TARGETS+=	lame-buildlink
-
-lame-buildlink: _BUILDLINK_USE
-
-.endif	# LAME_BUILDLINK2_MK
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index fbcf4db06e1..2964a292eae 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2003/12/08 14:41:38 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2004/04/12 00:31:18 snj Exp $
 #
 
 DISTNAME=	TiMidity++-2.11.3
@@ -20,11 +20,12 @@ CONFIGURE_ARGS+=--enable-vt100 --enable-audio=sun,vorbis --disable-debug \
 		--with-ogg-prefix="${BUILDLINK_DIR}/include" \
 		--with-vorbis-prefix="${BUILDLINK_DIR}/include"
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
+
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
 
-.include "../../audio/libvorbis/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/xaw.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index 44cda734171..604145b42b2 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/20 12:09:09 agc Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/12 00:35:17 snj Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
@@ -13,7 +13,7 @@ COMMENT=		Free system for introductory level finite element analysis
 EXTRACT_ONLY=		felt-3.05.src.tar.gz
 
 WRKSRC=			${WRKDIR}/FElt-3.05
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 USE_X11BASE=		# defined
 XAW_TYPE?=		3d
 
@@ -34,7 +34,7 @@ post-install:
 		COPYING CHANGELOG TODO ${PREFIX}/share/doc/felt
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/felt
 
-.include "../../devel/readline/buildlink2.mk"
-.include "../../mk/xaw.buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"