bl3ify

8 files changed, 53 insertions, 30 deletions

diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index a3c952d1b2b..35835204e00 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/09 18:47:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/20 17:32:33 jmmv Exp $
 #
 
 DISTNAME=	gmencoder-0.1.0
@@ -17,7 +17,7 @@ DEPENDS+=       	mencoder>=0.90:../../multimedia/mencoder
 DEPENDS+=       	mplayer>=0.90:../../multimedia/mplayer
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
@@ -36,7 +36,8 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/gmencoder_opts ${EGDIR}
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index d036ab76b56..8e5253fa42a 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 12:09:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/20 17:32:33 jmmv Exp $
 
 PKGNAME=	gmplayer-${MPLAYER_PKG_VERSION}
 PKGREVISION=	1
@@ -41,7 +41,7 @@ SITES_${skin}= ${SKIN_SITES}
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=	${SKINS}
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		YES
 CONFIGURE_ARGS+=	--enable-gui --disable-mencoder \
 			--confdir=${PREFIX}/share/mplayer
 
@@ -57,7 +57,7 @@ do-install:
 
 .include "../../multimedia/mplayer-share/Makefile.depends"
 
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
 .include "../../multimedia/mplayer-share/Makefile.cflags"
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 74997742244..0bac9464353 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/26 12:25:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/20 17:32:33 jmmv Exp $
 #
 
 PKGNAME=	mencoder-${MPLAYER_PKG_VERSION}
@@ -7,7 +7,7 @@ COMMENT=	Simple movie encoder for MPlayer-playable movies
 
 .include "../../multimedia/mplayer-share/Makefile.common"
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		YES
 CONFIGURE_ARGS+=	--disable-nas
 CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
 
@@ -27,7 +27,7 @@ do-install:
 
 .include "../../multimedia/mplayer-share/Makefile.depends"
 
-.include "../../audio/lame/buildlink2.mk"
+.include "../../audio/lame/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
 .include "../../multimedia/mplayer-share/Makefile.cflags"
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 77515cbe43a..0ec3774cebb 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/02/17 05:28:31 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/02/20 17:32:33 jmmv Exp $
 #
 
 MPLAYER_DIST_VERSION=	1.0pre3
@@ -24,7 +24,7 @@ NO_BIN_ON_CD=		"a dependency is restricted"
 NO_BIN_ON_FTP=		"a dependency is restricted"
 NO_SRC_ON_FTP=		"prohibited by USAs DMCA"
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 HAS_CONFIGURE=		YES
 
diff --git a/multimedia/mplayer-share/Makefile.depends b/multimedia/mplayer-share/Makefile.depends
index fa025022a44..ff95f7557c3 100644
--- a/multimedia/mplayer-share/Makefile.depends
+++ b/multimedia/mplayer-share/Makefile.depends
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.4 2004/02/01 01:43:29 jlam Exp $
+# $NetBSD: Makefile.depends,v 1.5 2004/02/20 17:32:33 jmmv Exp $
 #
 
 DEPENDS+=	mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share
@@ -6,11 +6,11 @@ DEPENDS+=	mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share
 GCC_REQD+=	2.95.3
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
-.  include "../../audio/cdparanoia/buildlink2.mk"
+.  include "../../audio/cdparanoia/buildlink3.mk"
 .endif
 
 .if ${OPSYS} == "NetBSD"
-.  include "../../devel/binutils/buildlink2.mk"
+.  include "../../devel/binutils/buildlink3.mk"
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
@@ -25,19 +25,19 @@ USE_X11=	YES
 
 .for drv pkg in ${MPLAYER_DRIVERS}
 .  if empty(MPLAYER_DISABLE_DRIVERS:M${drv})
-.    include "../../${pkg}/buildlink2.mk"
+.    include "../../${pkg}/buildlink3.mk"
 .  endif
 .endfor
 
-.include "../../audio/libmad/buildlink2.mk"
-.include "../../audio/libvorbis/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/libungif/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../multimedia/libdvdread/buildlink2.mk"
-.include "../../multimedia/xvidcore/buildlink2.mk"
+.include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../multimedia/xvidcore/buildlink3.mk"
 
 .if defined(USE_OSS)
-.  include "../../mk/ossaudio.buildlink2.mk"
+.  include "../../mk/ossaudio.buildlink3.mk"
 .endif
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 8d403b8bf85..bfe3ffae165 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 12:08:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/20 17:32:33 jmmv Exp $
 
 PKGNAME=	mplayer-${MPLAYER_PKG_VERSION}
 PKGREVISION=	1
@@ -6,7 +6,7 @@ COMMENT=	Software-only MPEG-1/2/4 video decoder
 
 .include "../../multimedia/mplayer-share/Makefile.common"
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		YES
 CONFIGURE_ARGS+=	--disable-mencoder
 CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
 
diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index b77ebee3352..097088204b1 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 12:38:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/20 17:23:44 jmmv Exp $
 #
 
 DISTNAME=	xvidcore-0.9.2
@@ -13,7 +13,7 @@ COMMENT=	ISO MPEG-4 compliant video codec
 BUILD_DEPENDS+=	nasm>=0.98.34:../../devel/nasm
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build/generic
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xvidcore/buildlink3.mk b/multimedia/xvidcore/buildlink3.mk
new file mode 100644
index 00000000000..4db98a95b3b
--- /dev/null
+++ b/multimedia/xvidcore/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/20 17:23:44 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use xvidcore.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+XVIDCORE_BUILDLINK3_MK:=	${XVIDCORE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xvidcore
+.endif
+
+.if !empty(XVIDCORE_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			xvidcore
+BUILDLINK_DEPENDS.xvidcore+=		xvidcore>=0.9.1
+BUILDLINK_PKGSRCDIR.xvidcore?=		../../multimedia/xvidcore
+
+.endif # XVIDCORE_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}