Updated to Xfce 4.4.1

See http://www.xfce.org/documentation/changelogs/4.4.1 for details.

5 files changed, 27 insertions, 29 deletions

diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index fbc42f50422..828c336a5b9 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/04/12 09:55:15 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.2.1
+XFCE4_VERSION=	0.3.0
 
 DISTNAME=	xfce4-fsguard-plugin-${XFCE4_VERSION}
-PKGREVISION=	3
+#PKGREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-fsguard-plugin/
 COMMENT=	Xfce disk space plugin
 
+USE_TOOLS+=	intltool
+
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-fsguard-plugin/PLIST b/sysutils/xfce4-fsguard-plugin/PLIST
index 46b52707ea2..ba7ac841d45 100644
--- a/sysutils/xfce4-fsguard-plugin/PLIST
+++ b/sysutils/xfce4-fsguard-plugin/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/17 07:07:35 jlam Exp $
-lib/xfce4/panel-plugins/libfsguard.la
-share/locale/de/LC_MESSAGES/xfce4-fsguard.mo
-share/locale/ko/LC_MESSAGES/xfce4-fsguard.mo
-share/locale/lt/LC_MESSAGES/xfce4-fsguard.mo
-share/locale/pl/LC_MESSAGES/xfce4-fsguard.mo
+@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:16 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-fsguard-plugin
+share/locale/de/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/xfce4/panel-plugins/fsguard.desktop
diff --git a/sysutils/xfce4-fsguard-plugin/buildlink3.mk b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
index be7502c4bf3..427a47af4e4 100644
--- a/sysutils/xfce4-fsguard-plugin/buildlink3.mk
+++ b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/10/12 09:24:19 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/04/12 09:55:16 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-fsguard-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-fsguard-plugin
 
 .if ${XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+=	xfce4-fsguard-plugin>=0.2.1nb3
+BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+=	xfce4-fsguard-plugin>=0.3.0
 BUILDLINK_PKGSRCDIR.xfce4-fsguard-plugin?=	../../sysutils/xfce4-fsguard-plugin
 .endif	# XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-fsguard-plugin/distinfo b/sysutils/xfce4-fsguard-plugin/distinfo
index d0e33500022..ae1207d6e0e 100644
--- a/sysutils/xfce4-fsguard-plugin/distinfo
+++ b/sysutils/xfce4-fsguard-plugin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/01/23 17:07:58 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/04/12 09:55:16 martti Exp $
 
-SHA1 (xfce4-fsguard-plugin-0.2.1.tar.gz) = 86ad7752fdab209cd460f2da562f979196a1e643
-RMD160 (xfce4-fsguard-plugin-0.2.1.tar.gz) = 194290bf0e5d471cefb1d1446330d0320af38763
-Size (xfce4-fsguard-plugin-0.2.1.tar.gz) = 339959 bytes
-SHA1 (patch-aa) = c6a814bf0fa779099b8f24ca8f754d373dcd70eb
+SHA1 (xfce4-fsguard-plugin-0.3.0.tar.bz2) = 63241ada67681eff66f269bfd53d6d6b11a37d4b
+RMD160 (xfce4-fsguard-plugin-0.3.0.tar.bz2) = 7989c2209b0f363cc4a2ac778d8ea627fa22378e
+Size (xfce4-fsguard-plugin-0.3.0.tar.bz2) = 113601 bytes
+SHA1 (patch-aa) = 7d34aa74ab207c47a8f1208519089e42f8b97ba4
diff --git a/sysutils/xfce4-fsguard-plugin/patches/patch-aa b/sysutils/xfce4-fsguard-plugin/patches/patch-aa
index 9ed35d56017..cdb0e1124d7 100644
--- a/sysutils/xfce4-fsguard-plugin/patches/patch-aa
+++ b/sysutils/xfce4-fsguard-plugin/patches/patch-aa
@@ -1,19 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2007/01/23 17:07:58 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2007/04/12 09:55:16 martti Exp $
 
---- panel-plugin/fsguard.c.orig	2005-10-11 20:27:09.000000000 +0000
-+++ panel-plugin/fsguard.c
-@@ -41,10 +41,13 @@
- #include <sys/stat.h>
- #if defined(__linux__)
- #include <sys/vfs.h>
--#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+--- panel-plugin/fsguard.c.orig	2006-09-07 10:10:41.000000000 +0000
++++ panel-plugin/fsguard.c	2006-09-07 10:11:25.000000000 +0000
+@@ -43,6 +43,9 @@
  #include <sys/param.h>
  #include <sys/mount.h>
  #endif
 +#if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900) /* NetBSD 2.99.9 */
 +#define statfs statvfs
 +#endif
- #include <panel/plugins.h>
- #include <panel/xfce.h>
- #include <panel/xfce_support.h>
+ 
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>