4 files changed, 48 insertions, 18 deletions

diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 8a549088c9bb..ed555efa0dc5 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xfce4-media
-PORTVERSION=	0.9.1
-PORTREVISION=	3
+PORTVERSION=	0.9.2
 CATEGORIES=	multimedia xfce
 MASTER_SITES=	http://spuriousinterrupt.org/files/xfmedia/
 DISTNAME=	xfmedia-${PORTVERSION}
@@ -21,7 +20,8 @@ LIB_DEPENDS=	xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		xine.15:${PORTSDIR}/multimedia/libxine \
 		exo-0.3.0:${PORTSDIR}/x11/libexo
 
-OPTIONS=	TAGLIB	"Enable metadata editing"	off
+OPTIONS=	TAGLIB	"Enable metadata editing"	off \
+		DBUS	"Enable remote control support" off
 
 USE_BZIP2=	yes
 USE_GETOPT_LONG=yes
@@ -45,6 +45,13 @@ CONFIGURE_ARGS=	--with-taglib
 CONFIGURE_ARGS=	--without-taglib
 .endif
 
+.if defined(WITH_DBUS)
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+CONFIGURE_ARGS+=	--enable-dbus
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g" \
 		${WRKSRC}/xfmedia/Makefile.in
diff --git a/multimedia/xfce4-media/distinfo b/multimedia/xfce4-media/distinfo
index 6f592f6af97d..99eb5196da5e 100644
--- a/multimedia/xfce4-media/distinfo
+++ b/multimedia/xfce4-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfmedia-0.9.1.tar.bz2) = 5ab3d25703d16ab4074dc63e677d0367
-SHA256 (xfce4/xfmedia-0.9.1.tar.bz2) = f396989b891dc676bec67a777ef217c9b0e7ccf212373a74984c0153aea0b8fa
-SIZE (xfce4/xfmedia-0.9.1.tar.bz2) = 806692
+MD5 (xfce4/xfmedia-0.9.2.tar.bz2) = 6eb8bd1f67201f829e0f45e733c02bd5
+SHA256 (xfce4/xfmedia-0.9.2.tar.bz2) = 451b67541527cde7f96693fa1ef7776eb03ac40edcef3023bfb2c1ebcf3e7e0c
+SIZE (xfce4/xfmedia-0.9.2.tar.bz2) = 893228
diff --git a/multimedia/xfce4-media/files/patch-src_remote.c b/multimedia/xfce4-media/files/patch-src_remote.c
deleted file mode 100644
index 48f3b0e262d2..000000000000
--- a/multimedia/xfce4-media/files/patch-src_remote.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/remote.c.orig	2006-04-08 16:24:13.000000000 +0000
-+++ src/remote.c
-@@ -489,8 +489,7 @@ xfmedia_remote_init(XfmediaMainwin *mwin
-     for(i = 0; i < MAX_INSTANCES; i++) {
-         g_snprintf(name, 64, XFMEDIA_DBUS_SERVICE_FMT, i);
-         dbus_error_init(&derr);
--        ret = dbus_bus_request_name(dbus_conn, name,
--                DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &derr);
-+        ret = dbus_bus_request_name(dbus_conn, name, 0, &derr);
-         if(ret < 0) {
-             g_warning("Unable to acquire D-BUS service '%s': %s." \
-                 "  Remote control interface will not be available.",
diff --git a/multimedia/xfce4-media/pkg-plist b/multimedia/xfce4-media/pkg-plist
index 6f6117f24e92..54b276dcff7f 100644
--- a/multimedia/xfce4-media/pkg-plist
+++ b/multimedia/xfce4-media/pkg-plist
@@ -8,6 +8,7 @@ include/xfmedia/xfmedia-plugin.h
 include/xfmedia/xfmedia-remote-client.h
 include/xfmedia/xfmedia-remote-common.h
 include/xfmedia/xfmedia-settings.h
+include/xfmedia/xfmedia-video-window.h
 lib/xfmedia/plugins/xfmedia-infopipe.a
 lib/xfmedia/plugins/xfmedia-infopipe.la
 lib/xfmedia/plugins/xfmedia-infopipe.so
@@ -29,6 +30,17 @@ share/locale/pt_BR/LC_MESSAGES/xfmedia.mo
 share/locale/sk/LC_MESSAGES/xfmedia.mo
 share/locale/vi/LC_MESSAGES/xfmedia.mo
 share/locale/zh_CN/LC_MESSAGES/xfmedia.mo
+share/locale/he/LC_MESSAGES/xfmedia.mo
+share/locale/it/LC_MESSAGES/xfmedia.mo
+share/locale/ja/LC_MESSAGES/xfmedia.mo
+share/locale/ka/LC_MESSAGES/xfmedia.mo
+share/locale/ru/LC_MESSAGES/xfmedia.mo
+share/locale/ca/LC_MESSAGES/xfmedia.mo
+share/locale/cs/LC_MESSAGES/xfmedia.mo
+share/locale/dz/LC_MESSAGES/xfmedia.mo
+share/locale/gl/LC_MESSAGES/xfmedia.mo
+share/locale/uk/LC_MESSAGES/xfmedia.mo
+share/locale/zh_TW/LC_MESSAGES/xfmedia.mo
 share/xfmedia/doc/C/ch01s02.html
 share/xfmedia/doc/C/ch01s03.html
 share/xfmedia/doc/C/ch01.html
@@ -64,3 +76,26 @@ share/xfmedia/doc/xfce.css
 @dirrmtry share/locale/pl
 @dirrmtry share/locale/fi/LC_MESSAGES
 @dirrmtry share/locale/fi
+@dirrmtry share/locale/he/LC_MESSAGES
+@dirrmtry share/locale/he
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/it
+@dirrmtry share/locale/ja/LC_MESSAGES
+@dirrmtry share/locale/ja
+@dirrmtry share/locale/ka/LC_MESSAGES
+@dirrmtry share/locale/ka
+@dirrmtry share/locale/ru/LC_MESSAGES
+@dirrmtry share/locale/ru
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+