Convert to buildlink3.

3 files changed, 45 insertions, 47 deletions

diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index eea1fde93ce..904e69c60d4 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/02/14 17:21:33 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/19 11:39:24 wiz Exp $
 #
 
 DISTNAME=	sweep-0.8.2
@@ -14,7 +14,7 @@ DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
 
 BUILD_USES_MSGFMT=	YES
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	YES
@@ -27,15 +27,15 @@ CONFIGURE_ARGS+=	--disable-vorbistest
 CPPFLAGS+=		-DDEVOSSAUDIO=\"\\\"${DEVOSSAUDIO}\\\"\"
 MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS}
 
-.include "../../audio/libvorbis/buildlink2.mk"
-.include "../../audio/libsamplerate/buildlink2.mk"
-.include "../../audio/libsndfile/buildlink2.mk"
-.include "../../audio/libmad/buildlink2.mk"
-.include "../../audio/speex/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../databases/tdb/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/ossaudio.buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/speex/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/tdb/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/sweep/buildlink2.mk b/audio/sweep/buildlink2.mk
deleted file mode 100644
index 27afe8caa13..00000000000
--- a/audio/sweep/buildlink2.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/12/08 14:41:38 wiz Exp $
-#
-# This Makefile fragment is included by packages that use sweep.
-#
-# This file was created automatically using createbuildlink 2.4.
-#
-
-.if !defined(SWEEP_BUILDLINK2_MK)
-SWEEP_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			sweep
-BUILDLINK_DEPENDS.sweep?=		sweep>=0.8.2nb6
-BUILDLINK_PKGSRCDIR.sweep?=		../../audio/sweep
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.sweep=sweep
-BUILDLINK_PREFIX.sweep_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.sweep+=	include/sweep/*
-BUILDLINK_FILES.sweep+=	lib/sweep/*
-
-.include "../../audio/libmad/buildlink2.mk"
-.include "../../audio/libvorbis/buildlink2.mk"
-.include "../../audio/libsamplerate/buildlink2.mk"
-.include "../../audio/libsndfile/buildlink2.mk"
-.include "../../audio/speex/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../databases/tdb/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	sweep-buildlink
-
-sweep-buildlink: _BUILDLINK_USE
-
-.endif	# SWEEP_BUILDLINK2_MK
diff --git a/audio/sweep/buildlink3.mk b/audio/sweep/buildlink3.mk
new file mode 100644
index 00000000000..89ef4727cb0
--- /dev/null
+++ b/audio/sweep/buildlink3.mk
@@ -0,0 +1,32 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 11:39:24 wiz Exp $
+#
+# This Makefile fragment is included by packages that use sweep.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+SWEEP_BUILDLINK3_MK:=	${SWEEP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	sweep
+.endif
+
+.if !empty(SWEEP_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			sweep
+BUILDLINK_DEPENDS.sweep+=		sweep>=0.8.2nb6
+BUILDLINK_PKGSRCDIR.sweep?=		../../audio/sweep
+
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/speex/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/tdb/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+.endif # SWEEP_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}