[pkgsrc/trunk]: pkgsrc/sysutils/libgtop2 Update to 2.12.0. Thanks go to the ...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/85c42701101b
branches:  trunk
changeset: 500768:85c42701101b
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Oct 12 21:49:39 2005 +0000

description:
Update to 2.12.0.  Thanks go to the FreeBSD GNOME developers for all the
patches I borrowed from them (patch-b*).

September 4, 2005: Overview of changes from 2.11.92 to 2.12.0
=============================================================
* Updated translations.

August 22, 2005: Overview of changes from 2.11.91 to 2.11.92
============================================================
* Linux:
  - fixed for 2.6 without /sys
  - glibtop_get_cpu() : Do not add irq, softirq and iowait to idle.

August 9, 2005: Overview of changes from 2.11.90 to 2.11.91
===========================================================
* All:
  - cleaned some headers.
  - removed static examples.
* Linux:
  - fixed some issues with 2.6 without /sys

July 24, 2005: Overview of changes from 2.11.2 to 2.11.90
=========================================================
* Linux:
  - fixed glibtop_uptime .flags.

July &3, 2005: Overview of changes from 2.11.1 to 2.11.2
========================================================
* Linux:
  - little improvements for 2.6.

July 3, 2005: Overview of changes from 2.11.0 to 2.11.1
=======================================================
* Linux:
  - glibtop_get_swap : added page(in|out) for linux 2.6.

June 8, 2005: Overview of changes from 2.10.x to 2.11.0
=======================================================
* Replaced a lot of macros by functions
* Got rid of dozens of useless files.
* libgtop 2.11.x are and will stay API and ABI compatible with 2.10.x, i swear.

diffstat:

 sysutils/libgtop2/Makefile         |    6 +-
 sysutils/libgtop2/buildlink3.mk    |    4 +-
 sysutils/libgtop2/distinfo         |   20 +++++-
 sysutils/libgtop2/patches/patch-aa |   95 +++++++++++++++++++++++++++++++++-
 sysutils/libgtop2/patches/patch-ba |   34 ++++++++++++
 sysutils/libgtop2/patches/patch-bb |   32 +++++++++++
 sysutils/libgtop2/patches/patch-bc |   61 ++++++++++++++++++++++
 sysutils/libgtop2/patches/patch-bd |   22 ++++++++
 sysutils/libgtop2/patches/patch-be |   25 +++++++++
 sysutils/libgtop2/patches/patch-bf |  100 +++++++++++++++++++++++++++++++++++++
 sysutils/libgtop2/patches/patch-bg |   19 +++++++
 sysutils/libgtop2/patches/patch-bh |   15 +++++
 sysutils/libgtop2/patches/patch-bi |   35 ++++++++++++
 sysutils/libgtop2/patches/patch-bj |   39 ++++++++++++++
 14 files changed, 493 insertions(+), 14 deletions(-)

diffs (truncated from 599 to 300 lines):

diff -r 18f2866b361a -r 85c42701101b sysutils/libgtop2/Makefile
--- a/sysutils/libgtop2/Makefile        Wed Oct 12 21:47:59 2005 +0000
+++ b/sysutils/libgtop2/Makefile        Wed Oct 12 21:49:39 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2005/08/21 11:25:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2005/10/12 21:49:39 jmmv Exp $
 
-DISTNAME=              libgtop-2.10.2
+DISTNAME=              libgtop-2.12.0
 PKGNAME=               ${DISTNAME:S/-/2-/}
 CATEGORIES=            sysutils gnome
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/libgtop/2.10/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/libgtop/2.12/}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            tech-pkg%NetBSD.org@localhost
diff -r 18f2866b361a -r 85c42701101b sysutils/libgtop2/buildlink3.mk
--- a/sysutils/libgtop2/buildlink3.mk   Wed Oct 12 21:47:59 2005 +0000
+++ b/sysutils/libgtop2/buildlink3.mk   Wed Oct 12 21:49:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/03/22 16:03:37 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/10/12 21:49:39 jmmv Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 LIBGTOP2_BUILDLINK3_MK:=       ${LIBGTOP2_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=   libgtop2
 
 .if !empty(LIBGTOP2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgtop2+=   libgtop2>=2.10.0
+BUILDLINK_DEPENDS.libgtop2+=   libgtop2>=2.12.0
 BUILDLINK_PKGSRCDIR.libgtop2?= ../../sysutils/libgtop2
 .endif # LIBGTOP2_BUILDLINK3_MK
 
diff -r 18f2866b361a -r 85c42701101b sysutils/libgtop2/distinfo
--- a/sysutils/libgtop2/distinfo        Wed Oct 12 21:47:59 2005 +0000
+++ b/sysutils/libgtop2/distinfo        Wed Oct 12 21:49:39 2005 +0000
@@ -1,9 +1,19 @@
-$NetBSD: distinfo,v 1.13 2005/08/21 11:25:48 jmmv Exp $
+$NetBSD: distinfo,v 1.14 2005/10/12 21:49:39 jmmv Exp $
 
-SHA1 (libgtop-2.10.2.tar.bz2) = 532028cb83cf61142cf0ad845be302c471207b62
-RMD160 (libgtop-2.10.2.tar.bz2) = db3ebf1e9853b0fdfae03aaa809f3ba8a41667ed
-Size (libgtop-2.10.2.tar.bz2) = 751695 bytes
-SHA1 (patch-aa) = 5fe5ccdf8444b3efaaa1bc3cff4c2d4944729f1e
+SHA1 (libgtop-2.12.0.tar.bz2) = 9969b5b96ef6298cf61e00e1b5ff62bd4ef1290f
+RMD160 (libgtop-2.12.0.tar.bz2) = 86800ea47ccead46812d969b1112bab734117ac1
+Size (libgtop-2.12.0.tar.bz2) = 740843 bytes
+SHA1 (patch-aa) = 94c3affb12ad78aa5020d81963f7898b38e3ef72
 SHA1 (patch-ab) = 55f4c875e4886194cba25874ab042da8e17261c7
 SHA1 (patch-ac) = dea1b6fba42d77a4fe6b2e9269cdab0521d3a305
 SHA1 (patch-ad) = c707545313bd4382825cedde30032f9083003823
+SHA1 (patch-ba) = ebe5f9a5148ff72ae978934b259e63ce15f2d4c8
+SHA1 (patch-bb) = 2e98f16668f74b64848f54db57037289623ed3f2
+SHA1 (patch-bc) = a48255606b5c340a20d01cc7f4e2c1e821d9d629
+SHA1 (patch-bd) = 7825fd4d2e6c06510fa3d76b4efa4d2ffab2a7d8
+SHA1 (patch-be) = ba1b688ea04f41a88b5d65b8af90927843619c0f
+SHA1 (patch-bf) = 86578d0779b706da3fcf02507ce8515571d9ed1a
+SHA1 (patch-bg) = 330de57b732550a92b4e077ad8e850acf7e0e24d
+SHA1 (patch-bh) = afdf0dec92984528efd181a24d3ef8f3eb383173
+SHA1 (patch-bi) = 56ec02e230f0c4401b95ce728d63a3d0798971e8
+SHA1 (patch-bj) = 48c46dec8d1f8ed35e452b66f3a5283a6a8f521f
diff -r 18f2866b361a -r 85c42701101b sysutils/libgtop2/patches/patch-aa
--- a/sysutils/libgtop2/patches/patch-aa        Wed Oct 12 21:47:59 2005 +0000
+++ b/sysutils/libgtop2/patches/patch-aa        Wed Oct 12 21:49:39 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/05/04 23:36:16 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2005/10/12 21:49:39 jmmv Exp $
 
---- configure.orig     2004-04-07 05:19:43.000000000 -0500
+--- configure.orig     2005-09-04 17:54:58.000000000 +0200
 +++ configure
-@@ -20463,13 +20463,13 @@ echo $ECHO_N "checking for libgtop sysde
+@@ -20141,13 +20141,13 @@ echo $ECHO_N "checking for libgtop sysde
          libgtop_sysdeps_dir=freebsd
          libgtop_use_machine_h=yes
          libgtop_need_server=yes
@@ -18,7 +18,86 @@
          ;;
          aix*)
          libgtop_sysdeps_dir=aix
-@@ -30110,7 +30110,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23761,6 +23761,78 @@ fi
+ esac
+ 
+ 
++echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
++echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6
++if test "${ac_cv_lib_mach_kvm_open+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lkvm  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char kvm_open ();
++int
++main ()
++{
++kvm_open ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++       { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++       { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_mach_kvm_open=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_mach_kvm_open=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_mach_kvm_open" >&5
++echo "${ECHO_T}$ac_cv_lib_mach_kvm_open" >&6
++if test $ac_cv_lib_mach_kvm_open = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBMACH 1
++_ACEOF
++
++  KVM_LIBS="-lkvm $KVM_LIBS"
++
++fi
++
+ echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5
+ echo $ECHO_N "checking for vm_statistics in -lmach... $ECHO_C" >&6
+ if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then
+@@ -30106,7 +30178,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -27,3 +106,11 @@
    ok=yes
  fi
  rm -f conftest*
+@@ -31512,6 +31584,7 @@ s,@ECHO_C@,$ECHO_C,;t t
+ s,@ECHO_N@,$ECHO_N,;t t
+ s,@ECHO_T@,$ECHO_T,;t t
+ s,@LIBS@,$LIBS,;t t
++s,@KVM_LIBS@,$KVM_LIBS,;t t
+ s,@build@,$build,;t t
+ s,@build_cpu@,$build_cpu,;t t
+ s,@build_vendor@,$build_vendor,;t t
diff -r 18f2866b361a -r 85c42701101b sysutils/libgtop2/patches/patch-ba
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/libgtop2/patches/patch-ba        Wed Oct 12 21:49:39 2005 +0000
@@ -0,0 +1,34 @@
+$NetBSD: patch-ba,v 1.1 2005/10/12 21:49:39 jmmv Exp $
+
+From FreeBSD's GNOME development repository.
+
+--- lib/read.c.orig    2005-06-06 14:33:42.000000000 +0200
++++ lib/read.c
+@@ -22,6 +22,7 @@
+ */
+ 
+ #include <config.h>
++#include <errno.h>
+ #include <glibtop/read.h>
+ #include <glibtop/error.h>
+ #include <glib/gi18n-lib.h>
+@@ -56,14 +57,18 @@ glibtop_read_l (glibtop *server, size_t 
+       fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
+ #endif
+ 
++retry:
+       if (server->socket) {
+               do_read (server->socket, buf, size);
+       } else {
+-              if(read (server->input [0], buf, size) < 0)
++              if(read (server->input [0], buf, size) < 0) {
++                      if (errno == EINTR)
++                              goto retry;
+                       glibtop_error_io_r (
+                               server,
+                               ngettext ("read %d byte",
+                                         "read %d bytes", size),
+                               size);
++              }
+       }
+ }
diff -r 18f2866b361a -r 85c42701101b sysutils/libgtop2/patches/patch-bb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/libgtop2/patches/patch-bb        Wed Oct 12 21:49:39 2005 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-bb,v 1.1 2005/10/12 21:49:39 jmmv Exp $
+
+From FreeBSD's GNOME development repository.
+
+--- lib/write.c.orig   2005-06-06 14:33:42.000000000 +0200
++++ lib/write.c
+@@ -22,6 +22,7 @@
+ */
+ 
+ #include <config.h>
++#include <errno.h>
+ 
+ #include <glibtop/write.h>
+ #include <glibtop/error.h>
+@@ -42,12 +43,16 @@ glibtop_write_l (glibtop *server, size_t
+       fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size);
+ #endif
+ 
++retry:
+       if (server->socket) {
+               ret = send (server->socket, buf, size, 0);
+       } else {
+               ret = write (server->output [1], buf, size);
+       }
+ 
+-      if (ret < 0)
++      if (ret < 0) {
++              if (errno == EINTR)
++                      goto retry;
+               glibtop_error_io_r (server, ngettext ("wrote %d byte", "wrote %d bytes", size), size);
++      }
+ }
diff -r 18f2866b361a -r 85c42701101b sysutils/libgtop2/patches/patch-bc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/libgtop2/patches/patch-bc        Wed Oct 12 21:49:39 2005 +0000
@@ -0,0 +1,61 @@
+$NetBSD: patch-bc,v 1.1 2005/10/12 21:49:39 jmmv Exp $
+
+From FreeBSD's GNOME development repository.
+
+--- src/daemon/io.c.orig       Mon Apr 11 03:30:12 2005
++++ src/daemon/io.c    Mon Apr 11 03:33:22 2005
+@@ -21,6 +21,7 @@
+    Boston, MA 02111-1307, USA.
+ */
+ 
++#include <errno.h>
+ #include "daemon.h"
+ #include <glibtop/error.h>
+ 
+@@ -36,9 +37,13 @@
+       resp->offset = offset;
+       resp->data_size = data_size;
+ 
++retry1:
+       if (s == 0) {
+-              if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0)
++              if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0) {
++                      if (errno == EINTR)
++                              goto retry1;
+                       glibtop_warn_io ("write");
++              }
+       } else {
+               if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0)
+                       glibtop_warn_io ("send");
+@@ -49,9 +54,13 @@
+               fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size);
+ #endif
+ 
++retry2:
+               if (s == 0) {
+-                      if (write (1, data, resp->data_size) < 0)
++                      if (write (1, data, resp->data_size) < 0) {
++                              if (errno == EINTR)
++                                      goto retry2;
+                               glibtop_warn_io ("write");
++                      }
+               } else {
+                       if (send (s, data, resp->data_size, 0) , 0)
+                               glibtop_warn_io ("send");
+@@ -67,6 +76,7 @@