5 files changed, 37 insertions, 32 deletions

diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index b12e5df04504..f5ffc533845f 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -6,24 +6,22 @@
 #
 
 PORTNAME=	xfce4-systemload-plugin
-PORTVERSION=	0.3.4
-PORTREVISION=	6
+PORTVERSION=	0.4.2
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	thorsten.greiner@web.de
 COMMENT=	System Load plugin for XFce4
 
-BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE=	configenv panel
+USE_XLIB=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-systemload-plugin/distinfo b/sysutils/xfce4-systemload-plugin/distinfo
index 07c9b75948e2..596381b9c0f6 100644
--- a/sysutils/xfce4-systemload-plugin/distinfo
+++ b/sysutils/xfce4-systemload-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-systemload-plugin-0.3.4.tar.gz) = e9feb00af63e9953d9e690c145cc087e
-SHA256 (xfce4/xfce4-systemload-plugin-0.3.4.tar.gz) = c7e7d29f7a9735eb224f94a8baeb161022983ed294e01c618606714823956735
-SIZE (xfce4/xfce4-systemload-plugin-0.3.4.tar.gz) = 219362
+MD5 (xfce4/xfce4-systemload-plugin-0.4.2.tar.bz2) = cc5777bb1621704927513eb8eef5f07c
+SHA256 (xfce4/xfce4-systemload-plugin-0.4.2.tar.bz2) = 0ca193fd7a21403566b452e42951e5ab816dcc69cfcca816b245da00f41ffc55
+SIZE (xfce4/xfce4-systemload-plugin-0.4.2.tar.bz2) = 184575
diff --git a/sysutils/xfce4-systemload-plugin/files/patch-configure b/sysutils/xfce4-systemload-plugin/files/patch-configure
deleted file mode 100644
index 32a52a34ab9d..000000000000
--- a/sysutils/xfce4-systemload-plugin/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jul 23 22:20:56 2003
-+++ configure	Fri Aug  1 12:56:48 2003
-@@ -19567,7 +19568,7 @@
- 
-     echo "$as_me:$LINENO: checking where to install panel plugins" >&5
- echo $ECHO_N "checking where to install panel plugins... $ECHO_C" >&6
--  XFCE4_PANEL_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir xfce4-panel-1.0`
-+  XFCE4_PANEL_PLUGINSDIR=${prefix}/lib/xfce4/panel-plugins
- 
-   echo "$as_me:$LINENO: result: $XFCE4_PANEL_PLUGINSDIR" >&5
- echo "${ECHO_T}$XFCE4_PANEL_PLUGINSDIR" >&6
diff --git a/sysutils/xfce4-systemload-plugin/pkg-descr b/sysutils/xfce4-systemload-plugin/pkg-descr
index bcb49c69b4b8..40f5a6da297c 100644
--- a/sysutils/xfce4-systemload-plugin/pkg-descr
+++ b/sysutils/xfce4-systemload-plugin/pkg-descr
@@ -1,4 +1,4 @@
 System Load plugin for XFce4.
 
 Author: Riccardo Persichetti <riccardo.persichetti@tin.it>
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
diff --git a/sysutils/xfce4-systemload-plugin/pkg-plist b/sysutils/xfce4-systemload-plugin/pkg-plist
index bb54a79ca642..2bfb734a65eb 100644
--- a/sysutils/xfce4-systemload-plugin/pkg-plist
+++ b/sysutils/xfce4-systemload-plugin/pkg-plist
@@ -1,4 +1,22 @@
-lib/xfce4/panel-plugins/libsystemload.a
-lib/xfce4/panel-plugins/libsystemload.la
-lib/xfce4/panel-plugins/libsystemload.so
-@dirrmtry lib/xfce4/panel-plugins
+libexec/xfce4/panel-plugins/xfce4-systemload-plugin
+share/locale/ca/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/sv/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/uk/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/vi/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/xfce4/panel-plugins/systemload.desktop
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4