4 files changed, 32 insertions, 20 deletions

diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 55c97fdbfdb0..42005dc65980 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -6,27 +6,27 @@
 #
 
 PORTNAME=	xfce4-fsguard-plugin
-PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTVERSION=	0.3.0
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://ftp.lug.udel.edu/pub/NetBSD/packages/distfiles/ \
 		http://ftp.citkit.ru/pub/NetBSD/packages/distfiles/ \
 		${MASTER_SITES_NETBSD}
 DIST_SUBDIR=	xfce4
+PATCH_SITES=	http://people.freebsd.org/~oliver/xfce/
+PATCHFILES=	gcc295-xfce4-fsguard-plugin.patch
 
 MAINTAINER=	jfb@minet.net
 COMMENT=	XFce4 panel plugin to check a mountpoint for free disk space
 
-BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-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
-
-USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+INSTALLS_ICONS= 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-fsguard-plugin/distinfo b/sysutils/xfce4-fsguard-plugin/distinfo
index 6c4e01c59cc0..fcf2a086a53f 100644
--- a/sysutils/xfce4-fsguard-plugin/distinfo
+++ b/sysutils/xfce4-fsguard-plugin/distinfo
@@ -1,3 +1,6 @@
-MD5 (xfce4/xfce4-fsguard-plugin-0.2.1.tar.gz) = 6fa6c2b734ee8d4c0a5901f6d704b6c9
-SHA256 (xfce4/xfce4-fsguard-plugin-0.2.1.tar.gz) = c3250ce091a164e37413a962f99755beb7c517c0ab29201c4335cd43537479a4
-SIZE (xfce4/xfce4-fsguard-plugin-0.2.1.tar.gz) = 339959
+MD5 (xfce4/xfce4-fsguard-plugin-0.3.0.tar.gz) = 59a73ec4cdcfcc46aa6900ce15cfe725
+SHA256 (xfce4/xfce4-fsguard-plugin-0.3.0.tar.gz) = c11bb58e89a8f55fdb7557300a43233abd6131cc5cc9b3402fbc398e21300201
+SIZE (xfce4/xfce4-fsguard-plugin-0.3.0.tar.gz) = 158953
+MD5 (xfce4/gcc295-xfce4-fsguard-plugin.patch) = 5e4c5b1cc472a2e68297b6f1de61d165
+SHA256 (xfce4/gcc295-xfce4-fsguard-plugin.patch) = 670c5f72b21cc75316b0bda981767a24a291e6246c7b9ac88a03c774d1915f43
+SIZE (xfce4/gcc295-xfce4-fsguard-plugin.patch) = 491
diff --git a/sysutils/xfce4-fsguard-plugin/pkg-descr b/sysutils/xfce4-fsguard-plugin/pkg-descr
index 6d6e0d56fe8e..f0526e7a887d 100644
--- a/sysutils/xfce4-fsguard-plugin/pkg-descr
+++ b/sysutils/xfce4-fsguard-plugin/pkg-descr
@@ -7,4 +7,4 @@ If you left-click on its icon, it opens the
 mountpoint directory in the file manager.
 
 Author:	Andre Lerche <a.lerche@gmx.net>
-WWW:	http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin
diff --git a/sysutils/xfce4-fsguard-plugin/pkg-plist b/sysutils/xfce4-fsguard-plugin/pkg-plist
index dcae113035d8..8587585879e2 100644
--- a/sysutils/xfce4-fsguard-plugin/pkg-plist
+++ b/sysutils/xfce4-fsguard-plugin/pkg-plist
@@ -1,5 +1,14 @@
 @comment $FreeBSD$
-lib/xfce4/panel-plugins/libfsguard.a
-lib/xfce4/panel-plugins/libfsguard.la
-lib/xfce4/panel-plugins/libfsguard.so
-@dirrmtry lib/xfce4/panel-plugins
+libexec/xfce4/panel-plugins/xfce4-fsguard-plugin
+share/icons/hicolor/48x48/apps/xfce-fsguard.png
+share/locale/de/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/xfce4/panel-plugins/fsguard.desktop
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4