update to 2.28.4

changes:
-Fix numerous bugs in the FreeBSD backend
-Split off OpenBSD code in its own backend, and fixes
-Updated translations

7 files changed, 36 insertions, 37 deletions

diff --git a/sysutils/libgtop/Makefile b/sysutils/libgtop/Makefile
index 3eda02f4487..994bb798ae0 100644
--- a/sysutils/libgtop/Makefile
+++ b/sysutils/libgtop/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2011/11/12 00:40:34 dholland Exp $
+# $NetBSD: Makefile,v 1.37 2012/01/19 19:43:56 drochner Exp $
 
-DISTNAME=		libgtop-2.28.3
-PKGREVISION=		2
+DISTNAME=		libgtop-2.28.4
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtop/2.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/libgtop/distinfo b/sysutils/libgtop/distinfo
index b974dddefb8..694ec8b1b96 100644
--- a/sysutils/libgtop/distinfo
+++ b/sysutils/libgtop/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2011/11/24 20:36:48 marino Exp $
+$NetBSD: distinfo,v 1.26 2012/01/19 19:43:57 drochner Exp $
 
-SHA1 (libgtop-2.28.3.tar.bz2) = cb97c9f24af7bf25df31d517999cab6a4793ab11
-RMD160 (libgtop-2.28.3.tar.bz2) = 122832350b2b16e327032b4e353fd6ec9b186fc3
-Size (libgtop-2.28.3.tar.bz2) = 793252 bytes
+SHA1 (libgtop-2.28.4.tar.bz2) = b6f002cc80a61dc0908dd96e0b543113a46bc4b7
+RMD160 (libgtop-2.28.4.tar.bz2) = 96ac76aa409bbd202bedacd94df14cd549e10d6b
+Size (libgtop-2.28.4.tar.bz2) = 819576 bytes
 SHA1 (patch-aa) = b056c00edebf3578364de50bcd1345bff67b45bc
 SHA1 (patch-ab) = cd11ad54870ab54fb940f922c1cc55d1c7ec2161
 SHA1 (patch-ac) = 3dd59355e36657df4c8575c35ef11c28d4192d77
@@ -15,17 +15,17 @@ SHA1 (patch-al) = 8d69828a73fd8f87cef08786bc5c3cd864210da6
 SHA1 (patch-am) = e69e9fd4ea90d2bb467050b5b4e8490baa162ef7
 SHA1 (patch-an) = 169366e6dc034db05eb54d6abb1416889f17a8e2
 SHA1 (patch-ao) = f58a1bd19d63377b86478e72f23bd5a4cca5af76
-SHA1 (patch-aq) = bb44484df341a009aa269fbaf5039e351e105e6c
+SHA1 (patch-aq) = 1d6f04fa2674f66a5702847c03f4740074b5dd24
 SHA1 (patch-bc) = 3638dfee30a4f10bc9662c23063df3f6a8cdc914
 SHA1 (patch-bd) = 7825fd4d2e6c06510fa3d76b4efa4d2ffab2a7d8
 SHA1 (patch-ca) = 06bc86bce721155315a1905b750f795629460ff7
 SHA1 (patch-cb) = cabc971530d8113694ff6d04108490749d40bcec
 SHA1 (patch-cc) = 2cb1d2da57a8622c93ed255a416ed9c811e775a2
 SHA1 (patch-cd) = cf96896ddde9c830c1e808d8bf37b9fdb611ed24
-SHA1 (patch-da) = 31c0e36155d80079779d7aec4552e0084f593ff2
-SHA1 (patch-db) = e3efc8ac9cf2320fef788b6265b0012ea4d3d660
-SHA1 (patch-dc) = ada7813f4a4203cc8d1bfa46bce7b87ecee06bc0
-SHA1 (patch-dd) = fea61bea21b1d1ae52f614ce9804a1132f3f368f
+SHA1 (patch-da) = 62c34addf08890cf1aa28a2604347f69e2c8ad0c
+SHA1 (patch-db) = 35174f7d45aeae95c33e440cae59830f7a964915
+SHA1 (patch-dc) = 3922128034b005f0b86c98abb3e10c1b1d5107ac
+SHA1 (patch-dd) = 7f35b3263189d43473adc0ac13244159b58ac9ff
 SHA1 (patch-de) = 85c5cb3d1185c8cc68ab09c7d16ed39e22a12093
 SHA1 (patch-df) = 8c1dab41b7449a2c706792036cf393553cebf9f0
 SHA1 (patch-dg) = b10933f50a1561d211afb6e817be9613cab37607
diff --git a/sysutils/libgtop/patches/patch-aq b/sysutils/libgtop/patches/patch-aq
index b79ae12a297..1c3643de0cf 100644
--- a/sysutils/libgtop/patches/patch-aq
+++ b/sysutils/libgtop/patches/patch-aq
@@ -1,13 +1,13 @@
-$NetBSD: patch-aq,v 1.3 2007/09/20 21:12:12 wiz Exp $
+$NetBSD: patch-aq,v 1.4 2012/01/19 19:43:57 drochner Exp $
 
---- sysdeps/common/fsusage.c.orig	2006-09-22 16:31:47.000000000 +0200
+--- sysdeps/common/fsusage.c.orig	2011-07-24 19:13:56.000000000 +0000
 +++ sysdeps/common/fsusage.c
-@@ -270,7 +270,7 @@ glibtop_get_fsusage_s (glibtop *server, 
+@@ -279,7 +279,7 @@ glibtop_get_fsusage_s (glibtop *server, 
      return;
  
  #if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \
--	|| defined(__FreeBSD__)
-+	|| defined(__FreeBSD__) || defined(__NetBSD__)
+-	|| defined(__FreeBSD__) || defined(__OpenBSD__)
++	|| defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
    /* Solaris but not SunOS and FreeBSD */
    buf->block_size = fsd.f_frsize;
  #else
diff --git a/sysutils/libgtop/patches/patch-da b/sysutils/libgtop/patches/patch-da
index 76bd2dce1dc..2d8232e2c26 100644
--- a/sysutils/libgtop/patches/patch-da
+++ b/sysutils/libgtop/patches/patch-da
@@ -1,17 +1,17 @@
-$NetBSD: patch-da,v 1.6 2011/11/24 20:36:48 marino Exp $
+$NetBSD: patch-da,v 1.7 2012/01/19 19:43:57 drochner Exp $
 
---- configure.orig	2011-03-25 14:54:05.000000000 +0000
+--- configure.orig	2011-08-30 11:25:43.000000000 +0000
 +++ configure
-@@ -13055,7 +13055,7 @@ $as_echo_n "checking for libgtop sysdeps
+@@ -13159,7 +13159,7 @@ $as_echo_n "checking for libgtop sysdeps
  	  libgtop_need_server=yes
- 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
+ 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2555 $(bindir)/libgtop_server2'
  	  ;;
 -	freebsd*|kfreebsd*)
 +	freebsd*|kfreebsd*|dragonfly*)
  	  libgtop_sysdeps_dir=freebsd
  	  libgtop_use_machine_h=yes
  	  libgtop_need_server=yes
-@@ -13129,7 +13129,7 @@ $as_echo "$libgtop_sysdeps_dir" >&6; }
+@@ -13233,7 +13233,7 @@ $as_echo "$libgtop_sysdeps_dir" >&6; }
  
  
  	case "$host_os" in
diff --git a/sysutils/libgtop/patches/patch-db b/sysutils/libgtop/patches/patch-db
index 8458fc06207..2c7e1f17f7d 100644
--- a/sysutils/libgtop/patches/patch-db
+++ b/sysutils/libgtop/patches/patch-db
@@ -1,10 +1,10 @@
-$NetBSD: patch-db,v 1.1 2009/07/11 13:14:13 hasso Exp $
+$NetBSD: patch-db,v 1.2 2012/01/19 19:43:57 drochner Exp $
 
---- sysdeps/freebsd/glibtop_machine.h.orig	2009-07-10 22:47:31 +0300
-+++ sysdeps/freebsd/glibtop_machine.h	2009-07-10 22:47:58 +0300
-@@ -25,7 +25,9 @@
- #include <sys/param.h>
+--- sysdeps/freebsd/glibtop_machine.h.orig	2011-07-24 19:13:56.000000000 +0000
++++ sysdeps/freebsd/glibtop_machine.h
+@@ -26,7 +26,9 @@
  #include <nlist.h>
+ #include <limits.h>
  #include <kvm.h>
 +#ifndef __DragonFly__
  #include <sys/dkstat.h>
diff --git a/sysutils/libgtop/patches/patch-dc b/sysutils/libgtop/patches/patch-dc
index 3e4a3944094..89a8aa8e1ab 100644
--- a/sysutils/libgtop/patches/patch-dc
+++ b/sysutils/libgtop/patches/patch-dc
@@ -1,16 +1,16 @@
-$NetBSD: patch-dc,v 1.1 2009/07/11 13:14:13 hasso Exp $
+$NetBSD: patch-dc,v 1.2 2012/01/19 19:43:57 drochner Exp $
 
---- sysdeps/freebsd/cpu.c.orig	2009-07-10 22:48:38 +0300
-+++ sysdeps/freebsd/cpu.c	2009-07-10 22:51:26 +0300
+--- sysdeps/freebsd/cpu.c.orig	2011-07-24 19:13:56.000000000 +0000
++++ sysdeps/freebsd/cpu.c
 @@ -53,6 +53,7 @@ _glibtop_init_cpu_s (glibtop *server)
  void
  glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
  {
 +#ifndef __DragonFly__
  	long cpts [CPUSTATES];
+ 	long *cp_times = NULL;
  	struct clockinfo ci;
- 	size_t length;
-@@ -111,4 +112,5 @@ glibtop_get_cpu_s (glibtop *server, glib
+@@ -132,4 +133,5 @@ glibtop_get_cpu_s (glibtop *server, glib
  	if (ncpu > 1) {
  		buf->flags |= _glibtop_sysdeps_cpu_smp;
  	}
diff --git a/sysutils/libgtop/patches/patch-dd b/sysutils/libgtop/patches/patch-dd
index c9ced319d8f..269686c0b12 100644
--- a/sysutils/libgtop/patches/patch-dd
+++ b/sysutils/libgtop/patches/patch-dd
@@ -1,9 +1,9 @@
-$NetBSD: patch-dd,v 1.1 2009/07/11 13:14:13 hasso Exp $
+$NetBSD: patch-dd,v 1.2 2012/01/19 19:43:57 drochner Exp $
 
---- sysdeps/freebsd/open.c.orig	2009-07-10 22:52:03 +0300
-+++ sysdeps/freebsd/open.c	2009-07-10 22:53:37 +0300
-@@ -65,6 +65,8 @@ glibtop_open_p (glibtop *server, const c
- 	server->machine.egid = getegid ();
+--- sysdeps/freebsd/open.c.orig	2011-07-24 19:13:56.000000000 +0000
++++ sysdeps/freebsd/open.c
+@@ -45,6 +45,8 @@ glibtop_open_s (glibtop *server, const c
+ 
  #if defined(__FreeBSD_kernel__)
  	server->os_version_code = __FreeBSD_kernel_version;
 +#elif defined(__DragonFly__)