pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia bl3ify
details: https://anonhg.NetBSD.org/pkgsrc/rev/81ea4bf59e1a
branches: trunk
changeset: 469184:81ea4bf59e1a
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Fri Feb 20 17:23:44 2004 +0000
description:
bl3ify
diffstat:
multimedia/gmencoder/Makefile | 11 ++++++-----
multimedia/gmplayer/Makefile | 6 +++---
multimedia/mencoder/Makefile | 6 +++---
multimedia/mplayer-share/Makefile.common | 4 ++--
multimedia/mplayer-share/Makefile.depends | 26 +++++++++++++-------------
multimedia/mplayer/Makefile | 4 ++--
multimedia/xvidcore/Makefile | 4 ++--
multimedia/xvidcore/buildlink3.mk | 22 ++++++++++++++++++++++
8 files changed, 53 insertions(+), 30 deletions(-)
diffs (217 lines):
diff -r c0feb4d64174 -r 81ea4bf59e1a multimedia/gmencoder/Makefile
--- a/multimedia/gmencoder/Makefile Fri Feb 20 17:02:06 2004 +0000
+++ b/multimedia/gmencoder/Makefile Fri Feb 20 17:23:44 2004 +0000
@@ -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+= 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 @@
${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 -r c0feb4d64174 -r 81ea4bf59e1a multimedia/gmplayer/Makefile
--- a/multimedia/gmplayer/Makefile Fri Feb 20 17:02:06 2004 +0000
+++ b/multimedia/gmplayer/Makefile Fri Feb 20 17:23:44 2004 +0000
@@ -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 @@
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 @@
.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 -r c0feb4d64174 -r 81ea4bf59e1a multimedia/mencoder/Makefile
--- a/multimedia/mencoder/Makefile Fri Feb 20 17:02:06 2004 +0000
+++ b/multimedia/mencoder/Makefile Fri Feb 20 17:23:44 2004 +0000
@@ -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 @@
.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 @@
.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 -r c0feb4d64174 -r 81ea4bf59e1a multimedia/mplayer-share/Makefile.common
--- a/multimedia/mplayer-share/Makefile.common Fri Feb 20 17:02:06 2004 +0000
+++ b/multimedia/mplayer-share/Makefile.common Fri Feb 20 17:23:44 2004 +0000
@@ -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_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 -r c0feb4d64174 -r 81ea4bf59e1a multimedia/mplayer-share/Makefile.depends
--- a/multimedia/mplayer-share/Makefile.depends Fri Feb 20 17:02:06 2004 +0000
+++ b/multimedia/mplayer-share/Makefile.depends Fri Feb 20 17:23:44 2004 +0000
@@ -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 @@
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 @@
.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 -r c0feb4d64174 -r 81ea4bf59e1a multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile Fri Feb 20 17:02:06 2004 +0000
+++ b/multimedia/mplayer/Makefile Fri Feb 20 17:23:44 2004 +0000
@@ -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 @@
.include "../../multimedia/mplayer-share/Makefile.common"
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= YES
CONFIGURE_ARGS+= --disable-mencoder
CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer
diff -r c0feb4d64174 -r 81ea4bf59e1a multimedia/xvidcore/Makefile
--- a/multimedia/xvidcore/Makefile Fri Feb 20 17:02:06 2004 +0000
+++ b/multimedia/xvidcore/Makefile Fri Feb 20 17:23:44 2004 +0000
@@ -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 @@
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 -r c0feb4d64174 -r 81ea4bf59e1a multimedia/xvidcore/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xvidcore/buildlink3.mk Fri Feb 20 17:23:44 2004 +0000
@@ -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/+$//}
Home |
Main Index |
Thread Index |
Old Index