bl3ify

3 files changed, 50 insertions, 16 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 0e028755283..15673b8b91a 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/25 18:02:08 jmmv Exp $
 #
 
 .include "Makefile.common"
@@ -11,14 +11,14 @@ PLIST_SRC=		${PKGDIR}/PLIST.i386
 .endif
 PLIST_SRC+=		${PKGDIR}/PLIST
 
-.include "../../audio/flac/buildlink2.mk"
-.include "../../audio/libvorbis/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/SDL/buildlink2.mk"
-.include "../../graphics/aalib/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
-.include "../../graphics/mng/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../multimedia/xvidcore/buildlink2.mk"
+.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/aalib/buildlink3.mk"
+.include "../../graphics/Mesa/buildlink3.mk"
+.include "../../graphics/mng/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../multimedia/xvidcore/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 33bd41275f7..ce2de897177 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2004/02/14 18:26:28 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/02/25 18:02:08 jmmv Exp $
 #
 
 DISTNAME=		xine-lib-1-rc0a
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	libtool libtool-nofpic
 PKGCONFIG_OVERRIDE=	misc/libxine.pc.in
@@ -34,6 +34,6 @@ PLIST_SUBST+=		XV_WORKAROUND="@comment "
 PLIST_SUBST+=		XV_WORKAROUND=""
 .endif
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk
new file mode 100644
index 00000000000..5348ea56482
--- /dev/null
+++ b/multimedia/xine-lib/buildlink3.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/25 18:02:08 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use xine-lib.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+XINE_LIB_BUILDLINK3_MK:=	${XINE_LIB_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xine-lib
+.endif
+
+.if !empty(XINE_LIB_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			xine-lib
+BUILDLINK_DEPENDS.xine-lib+=		xine-lib>=1rc0anb2
+BUILDLINK_PKGSRCDIR.xine-lib?=		../../multimedia/xine-lib
+
+.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/aalib/buildlink3.mk"
+.include "../../graphics/Mesa/buildlink3.mk"
+.include "../../graphics/mng/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../multimedia/xvidcore/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+
+.endif # XINE_LIB_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}