3 files changed, 28 insertions, 15 deletions

diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index a40a4d07c559..6130ec084b81 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -6,10 +6,12 @@
 #
 
 PORTNAME=	xfce4-xmms-plugin
-PORTVERSION=	0.4.2
+PORTVERSION=	0.5.1
 CATEGORIES=	multimedia audio xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
+PATCH_SITES=	http://people.freebsd.org/~oliver/xfce/
+PATCHFILES=	gcc295-xfce4-xmms-plugin.patch
 
 MAINTAINER=	jfb@minet.net
 COMMENT=	XFce 4 xmms control plugin for xfce4-panel
@@ -24,17 +26,23 @@ USE_GNOME=	gnometarget gtk20 intltool intlhack pango pkgconfig
 USE_XFCE=	configenv libgui libutil panel
 USE_XLIB=	yes
 
-OPTIONS=	BEEP	"Use Beep media player instead of xmms" 	off
+OPTIONS=	XMMS		"Enable xmms support"			on \
+		BEEP		"Enable beep-media-player support" 	off \
+		AUDACIOUS	"Enable audacious support"		off
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
 
 .if defined(WITH_BEEP)
-LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player
-CONFIGURE_ARGS+=--with-player=beep
-.else
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
-CONFIGURE_ARGS+=--with-player=xmms
+RUN_DEPENDS+=	beep-media-player:${PORTSDIR}/multimedia/beep-media-player
+.endif
+
+.if defined(WITH_XMMS)
+RUN_DEPENDS+=	xmms:${PORTSDIR}/multimedia/xmms
+.endif
+
+.if defined(WITH_AUDACIOUS)
+RUN_DEPENDS+=	audacious:${PORTSDIR}/multimedia/audacious
 .endif
 
 post-patch:
diff --git a/multimedia/xfce4-xmms-plugin/distinfo b/multimedia/xfce4-xmms-plugin/distinfo
index bebf19d94a35..a60059270b19 100644
--- a/multimedia/xfce4-xmms-plugin/distinfo
+++ b/multimedia/xfce4-xmms-plugin/distinfo
@@ -1,3 +1,6 @@
-MD5 (xfce4/xfce4-xmms-plugin-0.4.2.tar.bz2) = d621fa744d534c17590848dc34884824
-SHA256 (xfce4/xfce4-xmms-plugin-0.4.2.tar.bz2) = e851f0e24e17ac12a7865952fce7caa788d4b5bf116c6b1a57bafccd0b329efa
-SIZE (xfce4/xfce4-xmms-plugin-0.4.2.tar.bz2) = 361752
+MD5 (xfce4/xfce4-xmms-plugin-0.5.1.tar.bz2) = e2e48ba8f2de32e4fd7ab09083458e3f
+SHA256 (xfce4/xfce4-xmms-plugin-0.5.1.tar.bz2) = ae3028d62dcf2f52bd3d9c9c6932b3b3fe91094a56390605f525bc8f02f009e9
+SIZE (xfce4/xfce4-xmms-plugin-0.5.1.tar.bz2) = 314121
+MD5 (xfce4/gcc295-xfce4-xmms-plugin.patch) = 0997849e6b250b5a0ea15371b5769c34
+SHA256 (xfce4/gcc295-xfce4-xmms-plugin.patch) = 11f9b31d52fc4e90abdaf55e628b4888fa02d0add622fca41468331e3a4d38c6
+SIZE (xfce4/gcc295-xfce4-xmms-plugin.patch) = 792
diff --git a/multimedia/xfce4-xmms-plugin/pkg-plist b/multimedia/xfce4-xmms-plugin/pkg-plist
index d68e4be2272b..ee603a97de74 100644
--- a/multimedia/xfce4-xmms-plugin/pkg-plist
+++ b/multimedia/xfce4-xmms-plugin/pkg-plist
@@ -1,21 +1,23 @@
 libexec/xfce4/panel-plugins/xfce4-xmms-plugin
+share/locale/ca/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/locale/cs/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/locale/de/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/locale/eu/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/locale/fr/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/locale/hu/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/locale/ja/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/locale/lt/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/locale/tr/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/locale/vi/LC_MESSAGES/xfce4-xmms-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-xmms-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/xfce4/panel-plugins/xfce4-xmms-plugin.desktop
-share/xfce4/xfce4-xmms-plugin/xmms-plugin-prev.png
-share/xfce4/xfce4-xmms-plugin/xmms-plugin-play.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-menu.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-next.png
 share/xfce4/xfce4-xmms-plugin/xmms-plugin-pause.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-play.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-prev.png
 share/xfce4/xfce4-xmms-plugin/xmms-plugin-stop.png
-share/xfce4/xfce4-xmms-plugin/xmms-plugin-next.png
 @dirrm share/xfce4/xfce4-xmms-plugin
 @dirrmtry share/xfce4/panel-plugins
 @dirrmtry share/xfce4