7 files changed, 99 insertions, 70 deletions

diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 89293e15336e..48d31c8479d3 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -16,46 +16,50 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	r.c.ladan@gmail.com
 COMMENT=	Lightweight media player for Xfce4 based on the xine engine
 
-LIB_DEPENDS=	xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
-		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
-		xine.16:${PORTSDIR}/multimedia/libxine \
-		exo-0.3.0:${PORTSDIR}/x11/libexo
-
-OPTIONS=	TAGLIB	"Enable metadata editing"	off \
-		DBUS	"Enable remote control support" off
+LIB_DEPENDS=	xine.16:${PORTSDIR}/multimedia/libxine \
+		exo-0.3:${PORTSDIR}/x11/libexo
 
+GNU_CONFIGURE=	yes
+INSTALLS_ICONS= yes
 USE_BZIP2=	yes
+USE_GCC=	3.4+
 USE_GETOPT_LONG=yes
 USE_GETTEXT=	yes
-#NLS is hardcoded to "yes" in source, so no WITHOUT_NLS
 USE_GMAKE=	yes
-USE_GNOME=	libxml2 intlhack
+USE_GNOME=	glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE=	configenv libexo libgui libutilpanel
 USE_XLIB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
-USE_LDCONFIG=	yes
-INSTALLS_ICONS=	yes
+OPTIONS=	TAGLIB	"Enable metadata editing"		off \
+		DBUS	"Enable D-BUS support"			on \
+		STARTUP "Enable startup notification support"	on
 
 .include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
 
 .if defined(WITH_TAGLIB)
 LIB_DEPENDS+=	tag.5:${PORTSDIR}/audio/taglib
-CONFIGURE_ARGS+=	--with-taglib
+CONFIGURE_ARGS+=--with-taglib
 .else
-CONFIGURE_ARGS+=	--without-taglib
+CONFIGURE_ARGS+=--without-taglib
 .endif
 
-.if defined(WITH_DBUS)
+.if !defined(WITHOUT_DBUS)
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-CONFIGURE_ARGS+=	--enable-dbus
+CONFIGURE_ARGS+=--enable-dbus
+.else
+CONFIGURE_ARGS+=--disable-dbus
+.endif
+
+.if !defined(WITHOUT_STARTUP)
+LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+CONFIGURE_ARGS+=--enable-startup-notification
 .else
-CONFIGURE_ARGS+=	--disable-dbus
+CONFIGURE_ARGS+=--disable-startup-notification
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g" \
-		${WRKSRC}/xfmedia/Makefile.in
+	@${REINPLACE_CMD} -e "s|xfmedia_remote_LDADD = |&@LIBXFCEGUI4_LIBS@|" \
+		${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/xfce4-media/files/patch-src_xfmedia-xine.c b/multimedia/xfce4-media/files/patch-src_xfmedia-xine.c
new file mode 100644
index 000000000000..fc68d41e27c7
--- /dev/null
+++ b/multimedia/xfce4-media/files/patch-src_xfmedia-xine.c
@@ -0,0 +1,20 @@
+--- src/xfmedia-xine.c.orig	Thu Nov 30 17:49:55 2006
++++ src/xfmedia-xine.c	Thu Nov 30 17:50:48 2006
+@@ -38,14 +38,14 @@
+ #ifdef HAVE_MATH_H
+ #include <math.h>
+ #endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+-#endif
+-#ifdef HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+ #endif
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
diff --git a/multimedia/xfce4-xmms-controller-plugin/Makefile b/multimedia/xfce4-xmms-controller-plugin/Makefile
index 98e594372878..8c246d2ee1a3 100644
--- a/multimedia/xfce4-xmms-controller-plugin/Makefile
+++ b/multimedia/xfce4-xmms-controller-plugin/Makefile
@@ -16,11 +16,10 @@ MAINTAINER=	robin.schoonover@gmail.com
 COMMENT=	XMMS controller plugin for the xfce4 panel
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
-		xmms.4:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+RUN_DEPENDS=	${BUILD_DEPENDS}
+LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
+IGNORE=		Does not support xfce 4.4
 USE_GNOME=	gtk20
 INSTALLS_SHLIB=	yes
 
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index b4b29f178815..95a3843109b0 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -6,31 +6,36 @@
 #
 
 PORTNAME=	xfce4-xmms-plugin
-PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTVERSION=	0.4.2
 CATEGORIES=	multimedia audio xfce
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
-		http://download2.berlios.de/xfce-goodies/
+MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	jfb@minet.net
 COMMENT=	XFce 4 xmms control plugin for xfce4-panel
 
-BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
-		xmms-config:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
-		xmms:${PORTSDIR}/multimedia/xmms
-
-USE_BZIP2=	yes
-USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
-		CPPFLAGS=-I${LOCALBASE}/include \
-		LIBS=-L${LOCALBASE}/lib
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+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
+
+.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
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|== x|= x|g' ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/xfce4-xmms-plugin/distinfo b/multimedia/xfce4-xmms-plugin/distinfo
index cf8eec1fbbe3..bebf19d94a35 100644
--- a/multimedia/xfce4-xmms-plugin/distinfo
+++ b/multimedia/xfce4-xmms-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-xmms-plugin-0.3.1.tar.bz2) = 0dac8795b192383c13b1d5cd072b754a
-SHA256 (xfce4/xfce4-xmms-plugin-0.3.1.tar.bz2) = bd01bd8b9075835f067fb46080a30ae047f60733b5009dc7a0f0cf4c9b5d0a1f
-SIZE (xfce4/xfce4-xmms-plugin-0.3.1.tar.bz2) = 518730
+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
diff --git a/multimedia/xfce4-xmms-plugin/pkg-descr b/multimedia/xfce4-xmms-plugin/pkg-descr
index 8dccb3584125..61e85c363d4b 100644
--- a/multimedia/xfce4-xmms-plugin/pkg-descr
+++ b/multimedia/xfce4-xmms-plugin/pkg-descr
@@ -1,4 +1,4 @@
 XFce 4 XMMS control module for xfce4-panel.
 
 Author: Patrick van Staveren <pvanstav@cs.wmich.edu>
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-xmms-plugin
diff --git a/multimedia/xfce4-xmms-plugin/pkg-plist b/multimedia/xfce4-xmms-plugin/pkg-plist
index 54c513600da8..d68e4be2272b 100644
--- a/multimedia/xfce4-xmms-plugin/pkg-plist
+++ b/multimedia/xfce4-xmms-plugin/pkg-plist
@@ -1,23 +1,24 @@
-lib/xfce4/panel-plugins/libxmms_plugin.a
-lib/xfce4/panel-plugins/libxmms_plugin.la
-lib/xfce4/panel-plugins/libxmms_plugin.so
+libexec/xfce4/panel-plugins/xfce4-xmms-plugin
+share/locale/cs/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/locale/de/LC_MESSAGES/xfce4-xmms-plugin.mo
-share/locale/ko/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/lt/LC_MESSAGES/xfce4-xmms-plugin.mo
-share/xfce4/xmms-plugin/xmms-plugin-menu-eject.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-icon.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-next.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-pause.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-play.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-prev.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-stop.png
-share/xfce4/xmms-plugin/xmms-plugin-next.png
-share/xfce4/xmms-plugin/xmms-plugin-pause.png
-share/xfce4/xmms-plugin/xmms-plugin-play.png
-share/xfce4/xmms-plugin/xmms-plugin-prev.png
-share/xfce4/xmms-plugin/xmms-plugin-stop.png
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4
-@dirrm share/xfce4/xmms-plugin
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
+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-pause.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
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
+