Updated to Xfce 4.4.1

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

7 files changed, 40 insertions, 94 deletions

diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index aa7935777fe..a2dba8aa0ce 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2007/01/19 16:28:15 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/04/12 09:55:17 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.3.6
+XFCE4_VERSION=	0.4.2
 
 DISTNAME=	xfce4-systemload-plugin-${XFCE4_VERSION}
-PKGREVISION=	4
+#PKGREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-systemload-plugin/
 COMMENT=	Xfce system load plugin
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/xfce4-systemload-plugin/PLIST b/sysutils/xfce4-systemload-plugin/PLIST
index f707f71f805..d047d224822 100644
--- a/sysutils/xfce4-systemload-plugin/PLIST
+++ b/sysutils/xfce4-systemload-plugin/PLIST
@@ -1,7 +1,19 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:35 jlam Exp $
-lib/xfce4/panel-plugins/libsystemload.la
-share/locale/ca/LC_MESSAGES/xfce4-systemload.mo
-share/locale/de/LC_MESSAGES/xfce4-systemload.mo
-share/locale/hu/LC_MESSAGES/xfce4-systemload.mo
-share/locale/lt/LC_MESSAGES/xfce4-systemload.mo
-share/locale/uk/LC_MESSAGES/xfce4-systemload.mo
+@comment $NetBSD: PLIST,v 1.5 2007/04/12 09:55:17 martti Exp $
+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
diff --git a/sysutils/xfce4-systemload-plugin/buildlink3.mk b/sysutils/xfce4-systemload-plugin/buildlink3.mk
index 86ad48586ed..5fa2774b767 100644
--- a/sysutils/xfce4-systemload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-systemload-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/10/12 09:24:20 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:17 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+=	xfce4-systemload-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-systemload-plugin
 
 .if ${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+=	xfce4-systemload-plugin>=0.3.6nb4
+BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+=	xfce4-systemload-plugin>=0.4.2
 BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?=	../../sysutils/xfce4-systemload-plugin
 .endif	# XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-systemload-plugin/distinfo b/sysutils/xfce4-systemload-plugin/distinfo
index cce2afc6ecd..2e469088ddb 100644
--- a/sysutils/xfce4-systemload-plugin/distinfo
+++ b/sysutils/xfce4-systemload-plugin/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.8 2007/01/20 12:15:38 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/04/12 09:55:17 martti Exp $
 
-SHA1 (xfce4-systemload-plugin-0.3.6.tar.gz) = ed477e9c8499b8e34031658237586a83bc12cef4
-RMD160 (xfce4-systemload-plugin-0.3.6.tar.gz) = a7b3f28326262eeb5aa66d5cd966474ac0a4554b
-Size (xfce4-systemload-plugin-0.3.6.tar.gz) = 229985 bytes
-SHA1 (patch-aa) = f997c210580541883fa47738d2cec667517efcac
-SHA1 (patch-ab) = 51adca6bf236f78645b0ad0741f215603b7de8bf
-SHA1 (patch-ac) = cd16d045e24b5a802faffb260f58a86a49989077
+SHA1 (xfce4-systemload-plugin-0.4.2.tar.bz2) = 517cc051633cc6f28147d5adeaf5db56219dddfb
+RMD160 (xfce4-systemload-plugin-0.4.2.tar.bz2) = 228ad33b12a6a1151be6d079bd4c5a18fd50ba76
+Size (xfce4-systemload-plugin-0.4.2.tar.bz2) = 184575 bytes
+SHA1 (patch-aa) = 5526126b144359686781e6ddc1ef43fcd0afc03a
+SHA1 (patch-ab) = 9b7c4c4fd0db26a3ac239d1ffe5f3be7c32902f8
diff --git a/sysutils/xfce4-systemload-plugin/patches/patch-aa b/sysutils/xfce4-systemload-plugin/patches/patch-aa
index fd834abba32..796ea5fafe2 100644
--- a/sysutils/xfce4-systemload-plugin/patches/patch-aa
+++ b/sysutils/xfce4-systemload-plugin/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2007/01/19 16:28:15 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2007/04/12 09:55:17 martti Exp $
 
---- panel-plugin/memswap.c.orig	2003-11-06 00:39:52.000000000 +0000
-+++ panel-plugin/memswap.c
-@@ -113,7 +113,7 @@ gint read_memswap(gulong *mem, gulong *s
+--- panel-plugin/memswap.c.orig	2007-01-17 18:01:09.000000000 +0000
++++ panel-plugin/memswap.c	2007-01-23 21:42:59.000000000 +0000
+@@ -113,7 +113,7 @@
      return 0;
  }
  
@@ -11,55 +11,3 @@ $NetBSD: patch-aa,v 1.3 2007/01/19 16:28:15 joerg Exp $
  /*
   * This is inspired by /usr/src/usr.bin/top/machine.c 
   *
-@@ -284,7 +284,24 @@ gint read_memswap(gulong *mem, gulong *s
- 
- #define ARRLEN(X) (sizeof(X)/sizeof(X[0]))
-     {
--        static int mib[]={ CTL_HW, HW_PHYSMEM };
-+        static int mib[2];
-+
-+#ifdef HW_PHYSMEM64
-+        /* 64-bit datatype */
-+        if (sizeof(size_t) == 8) {
-+                mib[0] = CTL_HW;
-+                mib[1] = HW_PHYSMEM64;
-+        }
-+        /* assume 32-bit datatype */
-+        else {
-+                mib[0] = CTL_HW;
-+                mib[1] = HW_PHYSMEM;
-+        }
-+#else
-+        mib[0] = CTL_HW;
-+        mib[1] = HW_PHYSMEM;
-+#endif
-+
-         len = sizeof(MTotal);
-         sysctl(mib, ARRLEN(mib), &MTotal, &len, NULL, 0);
-         MTotal >>= 10;
-@@ -395,7 +412,24 @@ gint read_memswap(gulong *mem, gulong *s
- 
- #define ARRLEN(X) (sizeof(X)/sizeof(X[0]))
-     {
--        static int mib[]={ CTL_HW, HW_PHYSMEM };
-+        static int mib[2];
-+
-+#ifdef HW_PHYSMEM64
-+        /* 64-bit datatype */
-+        if (sizeof(size_t) == 8) {
-+                mib[0] = CTL_HW;
-+                mib[1] = HW_PHYSMEM64;
-+        }
-+        /* assume 32-bit datatype */
-+        else {
-+                mib[0] = CTL_HW;
-+                mib[1] = HW_PHYSMEM;
-+        }
-+#else
-+        mib[0] = CTL_HW;
-+        mib[1] = HW_PHYSMEM;
-+#endif
-+
-         len = sizeof(MTotal);
-         sysctl(mib, ARRLEN(mib), &MTotal, &len, NULL, 0);
-         MTotal >>= 10;
diff --git a/sysutils/xfce4-systemload-plugin/patches/patch-ab b/sysutils/xfce4-systemload-plugin/patches/patch-ab
index 39cfef6c5f8..5f5da767e92 100644
--- a/sysutils/xfce4-systemload-plugin/patches/patch-ab
+++ b/sysutils/xfce4-systemload-plugin/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2007/01/19 16:28:15 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2007/04/12 09:55:17 martti Exp $
 
---- panel-plugin/cpu.c.orig	2007-01-19 15:10:47.000000000 +0000
-+++ panel-plugin/cpu.c
-@@ -81,6 +81,31 @@ gulong read_cpuload()
+--- panel-plugin/cpu.c.orig	2007-01-17 18:01:09.000000000 +0000
++++ panel-plugin/cpu.c	2007-01-23 21:46:41.000000000 +0000
+@@ -78,6 +78,31 @@
      return cpu_used;
  }
  
diff --git a/sysutils/xfce4-systemload-plugin/patches/patch-ac b/sysutils/xfce4-systemload-plugin/patches/patch-ac
deleted file mode 100644
index c8ac5f25e63..00000000000
--- a/sysutils/xfce4-systemload-plugin/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/01/20 12:15:38 joerg Exp $
-
-OS_LIBS contains -lkinfo on DragonFly.
-
---- panel-plugin/Makefile.in.orig	2007-01-19 15:42:16.000000000 +0000
-+++ panel-plugin/Makefile.in
-@@ -206,6 +206,7 @@ libsystemload_la_CFLAGS = \
- 	@XFCE4_PANEL_CFLAGS@
- 
- libsystemload_la_LIBADD = \
-+	${OS_LIBS} \
- 	@XFCE4_PANEL_LIBS@
- 
- all: all-am