[pkgsrc/trunk]: pkgsrc/multimedia Update mplayer to 1.0rc9nb8 and gmplayer to...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4d9f2b64d09
branches:  trunk
changeset: 532993:c4d9f2b64d09
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Sep 06 18:11:57 2007 +0000

description:
Update mplayer to 1.0rc9nb8 and gmplayer to 1.0rc9nb3
sync mplayer and gmplayer buildlink includes. Add the following:
   - to gmplayer to match mplayer: libXinerama libXv
   - to gmplayer only:             libdvdnav
   - to both:                      libXvMC libXxf86dga libXxf86vm

diffstat:

 multimedia/gmplayer/Makefile |  15 +++++++++++----
 multimedia/mplayer/Makefile  |  17 ++++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diffs (74 lines):

diff -r 01d62f9c695d -r c4d9f2b64d09 multimedia/gmplayer/Makefile
--- a/multimedia/gmplayer/Makefile      Thu Sep 06 16:31:55 2007 +0000
+++ b/multimedia/gmplayer/Makefile      Thu Sep 06 18:11:57 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2007/06/07 13:19:54 tron Exp $
+# $NetBSD: Makefile,v 1.61 2007/09/06 18:11:57 abs Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,7 +9,7 @@
 #
 
 PKGNAME=       gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 
 BROKEN_IN=             pkgsrc-2006Q4
 
@@ -79,9 +79,16 @@
        ${RM} -rf ${PREFIX}/share/mplayer/Skin/Blue/.svn
        ${RM} -rf ${PREFIX}/share/mplayer/Skin/Blue/icons/.svn
 
-.include "../../multimedia/mplayer-share/Makefile.depends"
+.include "../../multimedia/libdvdnav/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
+.include "../../x11/libXvMC/buildlink3.mk"
+.include "../../x11/libXxf86dga/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+
+.include "../../multimedia/mplayer-share/Makefile.depends"
 
 .include "../../mk/bsd.pkg.mk"
 .include "../../multimedia/mplayer-share/Makefile.cflags"
diff -r 01d62f9c695d -r c4d9f2b64d09 multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Thu Sep 06 16:31:55 2007 +0000
+++ b/multimedia/mplayer/Makefile       Thu Sep 06 18:11:57 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2007/06/08 10:07:17 tron Exp $
+# $NetBSD: Makefile,v 1.44 2007/09/06 18:11:57 abs Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   7
+PKGREVISION=   8
 
 COMMENT=       Software-only MPEG-1/2/4 video decoder
 
@@ -19,15 +19,18 @@
 
 INSTALLATION_DIRS+=    bin
 
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
-
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${DESTDIR}${PREFIX}/bin
 
+.include "../../x11/libXt/buildlink3.mk"
+
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
+.include "../../x11/libXvMC/buildlink3.mk"
+.include "../../x11/libXxf86dga/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+
 .include "../../multimedia/mplayer-share/Makefile.depends"
 
 .include "../../mk/bsd.pkg.mk"
-
 .include "../../multimedia/mplayer-share/Makefile.cflags"