[pkgsrc/trunk]: pkgsrc/multimedia Move fontconfig/buildlink3.mk to a common m...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/51f8e7da292e
branches:  trunk
changeset: 522345:51f8e7da292e
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Dec 07 14:09:02 2006 +0000

description:
Move fontconfig/buildlink3.mk to a common makefile fragment, so that
mencoder gets it too. Without that, fontconfig vertions from pkg and
X11R6 get mixed which is bad. Bump mencoder's PKGREVISION.

diffstat:

 multimedia/mencoder/Makefile              |  4 +++-
 multimedia/mplayer-share/Makefile.depends |  3 ++-
 multimedia/mplayer/Makefile               |  4 +---
 3 files changed, 6 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 8aead7dc2cb8 -r 51f8e7da292e multimedia/mencoder/Makefile
--- a/multimedia/mencoder/Makefile      Thu Dec 07 13:58:03 2006 +0000
+++ b/multimedia/mencoder/Makefile      Thu Dec 07 14:09:02 2006 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2006/10/31 22:33:29 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2006/12/07 14:09:02 drochner Exp $
 
 PKGNAME=       mencoder-${MPLAYER_PKG_VERSION}
 
+PKGREVISION=   1
+
 COMMENT=       Simple movie encoder for MPlayer-playable movies
 
 .include "../../multimedia/mplayer-share/Makefile.common"
diff -r 8aead7dc2cb8 -r 51f8e7da292e multimedia/mplayer-share/Makefile.depends
--- a/multimedia/mplayer-share/Makefile.depends Thu Dec 07 13:58:03 2006 +0000
+++ b/multimedia/mplayer-share/Makefile.depends Thu Dec 07 14:09:02 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.16 2006/11/06 14:06:17 joerg Exp $
+# $NetBSD: Makefile.depends,v 1.17 2006/12/07 14:09:03 drochner Exp $
 #
 
 DEPENDS+=      mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share
@@ -9,5 +9,6 @@
 .  include "../../devel/binutils/buildlink3.mk"
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff -r 8aead7dc2cb8 -r 51f8e7da292e multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Thu Dec 07 13:58:03 2006 +0000
+++ b/multimedia/mplayer/Makefile       Thu Dec 07 14:09:02 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/11/30 15:00:45 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2006/12/07 14:09:03 drochner Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
 PKGREVISION=   1
@@ -19,8 +19,6 @@
 
 INSTALLATION_DIRS+=    bin
 
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"