4 files changed, 24 insertions, 23 deletions

diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index d8ee434f6f14..69469c865b74 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -3,27 +3,26 @@
 # Whom:			Matt Lancereau <ports@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/xfce4-genmon-plugin/Makefile,v 1.1 2006/10/02 20:33:19 ahze Exp $
+#
 
 PORTNAME=	xfce4-genmon-plugin
-PORTVERSION=	1.1
-PORTREVISION=	3
+PORTVERSION=	2.0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
 DIST_SUBDIR=	xfce4
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd@unixfreunde.de
 COMMENT=	Generic Monitor XFce4 panel plugin
 
-BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
-		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME=	gtk20 libxml2
+#USE_AUTOTOOLS=	aclocal:19 autoheader:259 automake:19 autoconf:259
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	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-genmon-plugin/distinfo b/sysutils/xfce4-genmon-plugin/distinfo
index 7bd92c9e3b87..1e27c31ede0f 100644
--- a/sysutils/xfce4-genmon-plugin/distinfo
+++ b/sysutils/xfce4-genmon-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-genmon-plugin-1.1.tar.gz) = 130be5e17d4ae41f86bbb952adb6a95d
-SHA256 (xfce4/xfce4-genmon-plugin-1.1.tar.gz) = be43ef66dd753a151301c475c1b0b85c36702a8e17ac4008d118c973052e2a28
-SIZE (xfce4/xfce4-genmon-plugin-1.1.tar.gz) = 229388
+MD5 (xfce4/xfce4-genmon-plugin-2.0.tar.bz2) = ecf5f2dab90733abc81e7ef4a4146620
+SHA256 (xfce4/xfce4-genmon-plugin-2.0.tar.bz2) = 291a2be7958fbfd3bc6b02defad963c7725a59b7fdf02e106abb9e5d62d1a091
+SIZE (xfce4/xfce4-genmon-plugin-2.0.tar.bz2) = 171190
diff --git a/sysutils/xfce4-genmon-plugin/pkg-descr b/sysutils/xfce4-genmon-plugin/pkg-descr
index 896780449070..e48cf066c05a 100644
--- a/sysutils/xfce4-genmon-plugin/pkg-descr
+++ b/sysutils/xfce4-genmon-plugin/pkg-descr
@@ -3,4 +3,4 @@ captures its output and displays it as a string into the panel.
 
 Author: Roger Seguin <roger_seguin@msn.com>
 
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin
diff --git a/sysutils/xfce4-genmon-plugin/pkg-plist b/sysutils/xfce4-genmon-plugin/pkg-plist
index b3cceee20e4f..7779c38ce0a0 100644
--- a/sysutils/xfce4-genmon-plugin/pkg-plist
+++ b/sysutils/xfce4-genmon-plugin/pkg-plist
@@ -1,4 +1,6 @@
-lib/xfce4/panel-plugins/libgenmon.a
-lib/xfce4/panel-plugins/libgenmon.la
-lib/xfce4/panel-plugins/libgenmon.so
-@dirrmtry lib/xfce4/panel-plugins
+libexec/xfce4/panel-plugins/xfce4-genmon-plugin
+share/xfce4/panel-plugins/genmon.desktop
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4