[pkgsrc/trunk]: pkgsrc/multimedia/vlc Fix PLIST with x11 option (default on) ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f2ae73a49b5
branches:  trunk
changeset: 580680:3f2ae73a49b5
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Sep 15 12:36:49 2010 +0000

description:
Fix PLIST with x11 option (default on) by always depending on libxcb,
since it's pulled in by libX11 anyway, nowadays.
Bump PKGREVISION.

diffstat:

 multimedia/vlc/Makefile   |  5 +++--
 multimedia/vlc/PLIST      |  3 ++-
 multimedia/vlc/options.mk |  3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r 967220a6a71d -r 3f2ae73a49b5 multimedia/vlc/Makefile
--- a/multimedia/vlc/Makefile   Wed Sep 15 12:18:14 2010 +0000
+++ b/multimedia/vlc/Makefile   Wed Sep 15 12:36:49 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.93 2010/09/14 11:13:14 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2010/09/15 12:36:49 wiz Exp $
 #
 
 DISTNAME=              vlc-${VLC_VERSION}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            multimedia
 MASTER_SITES=          http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=          .tar.bz2
@@ -12,6 +12,7 @@
 MAINTAINER=            ahoka%NetBSD.org@localhost
 HOMEPAGE=              http://videolan.org/
 COMMENT=               VLC media player and streaming server
+LICENSE=               gnu-gpl-v2
 
 CONFLICTS=             vlc07-[0-9]* vlc08-[0-9]*
 
diff -r 967220a6a71d -r 3f2ae73a49b5 multimedia/vlc/PLIST
--- a/multimedia/vlc/PLIST      Wed Sep 15 12:18:14 2010 +0000
+++ b/multimedia/vlc/PLIST      Wed Sep 15 12:36:49 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2010/05/04 18:30:10 drochner Exp $
+@comment $NetBSD: PLIST,v 1.36 2010/09/15 12:36:49 wiz Exp $
 ${PLIST.altivec}lib/vlc/misc/libmemcpyaltivec_plugin.la
 ${PLIST.altivec}lib/vlc/video_chroma/libi420_yuy2_altivec_plugin.la
 ${PLIST.cdda}lib/vlc/access/libcdda_plugin.la
@@ -26,6 +26,7 @@
 ${PLIST.x11}bin/qvlc
 ${PLIST.x11}lib/vlc/access/libx11_screen_plugin.la
 ${PLIST.x11}lib/vlc/codec/libpng_plugin.la
+${PLIST.x11}lib/vlc/control/libglobalhotkeys_plugin.la
 ${PLIST.x11}lib/vlc/gui/libqt4_plugin.la
 ${PLIST.x11}lib/vlc/misc/libfreetype_plugin.la
 ${PLIST.x11}lib/vlc/misc/libosd_parser_plugin.la
diff -r 967220a6a71d -r 3f2ae73a49b5 multimedia/vlc/options.mk
--- a/multimedia/vlc/options.mk Wed Sep 15 12:18:14 2010 +0000
+++ b/multimedia/vlc/options.mk Wed Sep 15 12:36:49 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2009/07/07 19:23:48 ahoka Exp $
+# $NetBSD: options.mk,v 1.16 2010/09/15 12:36:49 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.vlc
 PKG_SUPPORTED_OPTIONS=         debug faad dbus hal skins sdl pulseaudio x11 gnome
@@ -102,6 +102,7 @@
 .include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"