Import xfce 4.4

- remove all obsolete ports or plugins
- update all plugins to their latest version to support xfce 4.4
  (otherwise they won't compile with 4.4)

4 files changed, 51 insertions, 45 deletions

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
+