[pkgsrc/trunk]: pkgsrc/multimedia Move extra X11 includes to Makefile.common ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b7319966536
branches:  trunk
changeset: 522019:0b7319966536
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Nov 30 15:00:45 2006 +0000

description:
Move extra X11 includes to Makefile.common and bump revision of mplayer.

diffstat:

 multimedia/gmplayer/Makefile             |  5 ++---
 multimedia/mplayer-share/Makefile.common |  3 ++-
 multimedia/mplayer/Makefile              |  3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 5a9e8ac7cbdb -r 0b7319966536 multimedia/gmplayer/Makefile
--- a/multimedia/gmplayer/Makefile      Thu Nov 30 14:08:54 2006 +0000
+++ b/multimedia/gmplayer/Makefile      Thu Nov 30 15:00:45 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/11/29 15:52:33 joerg Exp $
+# $NetBSD: Makefile,v 1.57 2006/11/30 15:00:45 joerg Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -57,8 +57,7 @@
 
 USE_TOOLS+=            gtar pkg-config
 CONFIGURE_ARGS+=       --enable-gui --disable-mencoder \
-                       --confdir=${PREFIX}/share/mplayer \
-                       --with-extraincdir=${X11BASE}/include
+                       --confdir=${PREFIX}/share/mplayer
 
 INSTALLATION_DIRS=     bin
 
diff -r 5a9e8ac7cbdb -r 0b7319966536 multimedia/mplayer-share/Makefile.common
--- a/multimedia/mplayer-share/Makefile.common  Thu Nov 30 14:08:54 2006 +0000
+++ b/multimedia/mplayer-share/Makefile.common  Thu Nov 30 15:00:45 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2006/11/06 14:06:17 joerg Exp $
+# $NetBSD: Makefile.common,v 1.35 2006/11/30 15:00:45 joerg Exp $
 
 MPLAYER_DIST_VERSION=  1.0rc1
 
@@ -44,6 +44,7 @@
                        --with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2:${LOCALBASE}/include/cdparanoia:${LOCALBASE}/include/freetype2" \
                        --with-extralibdir="${LOCALBASE}/lib" \
                        --with-x11libdir="${X11BASE}/lib" \
+                       --with-extraincdir=${X11BASE}/include \
                        --disable-mpdvdkit \
                        --disable-smb
 
diff -r 5a9e8ac7cbdb -r 0b7319966536 multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Thu Nov 30 14:08:54 2006 +0000
+++ b/multimedia/mplayer/Makefile       Thu Nov 30 15:00:45 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2006/11/06 14:06:17 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2006/11/30 15:00:45 joerg Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
+PKGREVISION=   1
 
 COMMENT=       Software-only MPEG-1/2/4 video decoder