[pkgsrc/trunk]: pkgsrc/sysutils/libgtop2 Update to 2.14.2. Grrr, how much I ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ccb6722611ed
branches:  trunk
changeset: 517235:ccb6722611ed
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Aug 06 19:06:44 2006 +0000

description:
Update to 2.14.2.  Grrr, how much I hate this package -- and its collection
of patches --, you can't imagine.

July 27, 2006: Overview of changes in 2.14.2
============================================
* Updated solaris support (hua.zhang%sun.com@localhost)
* Small linux updates and improvments.

April 10, 2006: Overview of changes in 2.14.1
=============================================
* Updated translations.
* Fixed NetBSD port (Julio M. Merino Vidal  <jmmv%NetBSD.org@localhost>).
* Fixed some warnings.

diffstat:

 sysutils/libgtop2/Makefile         |   8 +-
 sysutils/libgtop2/PLIST            |   8 ++-
 sysutils/libgtop2/distinfo         |  22 +++-----
 sysutils/libgtop2/patches/patch-aa |  11 +---
 sysutils/libgtop2/patches/patch-ab |  21 ++-----
 sysutils/libgtop2/patches/patch-ad |  39 +-------------
 sysutils/libgtop2/patches/patch-aq |  13 -----
 sysutils/libgtop2/patches/patch-ba |   8 +-
 sysutils/libgtop2/patches/patch-bb |  13 +++-
 sysutils/libgtop2/patches/patch-be |  25 ---------
 sysutils/libgtop2/patches/patch-bf |  98 --------------------------------------
 sysutils/libgtop2/patches/patch-bj |  42 ----------------
 12 files changed, 41 insertions(+), 267 deletions(-)

diffs (truncated from 512 to 300 lines):

diff -r d70408266ccf -r ccb6722611ed sysutils/libgtop2/Makefile
--- a/sysutils/libgtop2/Makefile        Sun Aug 06 19:05:14 2006 +0000
+++ b/sysutils/libgtop2/Makefile        Sun Aug 06 19:06:44 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2006/04/13 18:23:38 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2006/08/06 19:06:44 jmmv Exp $
 
-DISTNAME=              libgtop-2.14.0
+DISTNAME=              libgtop-2.14.2
 PKGNAME=               ${DISTNAME:S/-/2-/}
 CATEGORIES=            sysutils gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/libgtop/2.14/}
@@ -17,7 +17,7 @@
 USE_LIBTOOL=           YES
 PKGCONFIG_OVERRIDE=    libgtop-2.0.pc.in
 PKGCONFIG_OVERRIDE+=   support/gnome-support-2.0.pc.in
-INFO_FILES=            # PLIST
+INFO_FILES=            YES
 TEXINFO_REQD=          4.6
 
 # The following flags are for debugging purposes.  They don't need to
@@ -66,7 +66,7 @@
 
 .if ${OPSYS} != "Linux"
 post-install:
-       @${CHMOD} g+s ${PREFIX}/bin/libgtop_server2
+       ${CHMOD} g+s ${PREFIX}/bin/libgtop_server2
 .endif
 
 # XXX This needs a check in the configure script, which should be clean
diff -r d70408266ccf -r ccb6722611ed sysutils/libgtop2/PLIST
--- a/sysutils/libgtop2/PLIST   Sun Aug 06 19:05:14 2006 +0000
+++ b/sysutils/libgtop2/PLIST   Sun Aug 06 19:06:44 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/04/17 07:07:34 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/08/06 19:06:44 jmmv Exp $
 bin/libgtop_daemon2
 ${LIBGTOP_SERVER}bin/libgtop_server2
 include/libgtop-2.0/glibtop.h
@@ -51,6 +51,7 @@
 share/locale/be/LC_MESSAGES/libgtop-2.0.mo
 share/locale/bg/LC_MESSAGES/libgtop-2.0.mo
 share/locale/bn/LC_MESSAGES/libgtop-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/libgtop-2.0.mo
 share/locale/bs/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ca/LC_MESSAGES/libgtop-2.0.mo
 share/locale/cs/LC_MESSAGES/libgtop-2.0.mo
@@ -60,6 +61,7 @@
 share/locale/el/LC_MESSAGES/libgtop-2.0.mo
 share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo
 share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo
+share/locale/eo/LC_MESSAGES/libgtop-2.0.mo
 share/locale/es/LC_MESSAGES/libgtop-2.0.mo
 share/locale/et/LC_MESSAGES/libgtop-2.0.mo
 share/locale/eu/LC_MESSAGES/libgtop-2.0.mo
@@ -76,11 +78,13 @@
 share/locale/id/LC_MESSAGES/libgtop-2.0.mo
 share/locale/it/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ja/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ka/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ko/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ku/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ky/LC_MESSAGES/libgtop-2.0.mo
 share/locale/lt/LC_MESSAGES/libgtop-2.0.mo
 share/locale/lv/LC_MESSAGES/libgtop-2.0.mo
+share/locale/mg/LC_MESSAGES/libgtop-2.0.mo
 share/locale/mi/LC_MESSAGES/libgtop-2.0.mo
 share/locale/mk/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ml/LC_MESSAGES/libgtop-2.0.mo
@@ -90,7 +94,6 @@
 share/locale/ne/LC_MESSAGES/libgtop-2.0.mo
 share/locale/nl/LC_MESSAGES/libgtop-2.0.mo
 share/locale/nn/LC_MESSAGES/libgtop-2.0.mo
-share/locale/no/LC_MESSAGES/libgtop-2.0.mo
 share/locale/or/LC_MESSAGES/libgtop-2.0.mo
 share/locale/pa/LC_MESSAGES/libgtop-2.0.mo
 share/locale/pl/LC_MESSAGES/libgtop-2.0.mo
@@ -112,6 +115,7 @@
 share/locale/vi/LC_MESSAGES/libgtop-2.0.mo
 share/locale/xh/LC_MESSAGES/libgtop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/libgtop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
 @dirrm include/libgtop-2.0/glibtop
 @dirrm include/libgtop-2.0
diff -r d70408266ccf -r ccb6722611ed sysutils/libgtop2/distinfo
--- a/sysutils/libgtop2/distinfo        Sun Aug 06 19:05:14 2006 +0000
+++ b/sysutils/libgtop2/distinfo        Sun Aug 06 19:06:44 2006 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.23 2006/06/26 12:14:25 drochner Exp $
+$NetBSD: distinfo,v 1.24 2006/08/06 19:06:44 jmmv Exp $
 
-SHA1 (libgtop-2.14.0.tar.bz2) = a396a72c415c678efb94ad3cdc9a2543d543c248
-RMD160 (libgtop-2.14.0.tar.bz2) = f6622a5e8b27e18fde9b5a728f18371afe95858a
-Size (libgtop-2.14.0.tar.bz2) = 659522 bytes
-SHA1 (patch-aa) = db6132ff556d1a20e24a817bb6d8ba247f202659
-SHA1 (patch-ab) = 20d01f064e5dae28abf3ad9cdd631d2bc5ca7676
+SHA1 (libgtop-2.14.2.tar.bz2) = 20e79a58c08e06e5f5e68d8ebbd575471f754e96
+RMD160 (libgtop-2.14.2.tar.bz2) = cb51f7252e015e17dcf3f1f991b36bf3e5496efe
+Size (libgtop-2.14.2.tar.bz2) = 664817 bytes
+SHA1 (patch-aa) = 5c4429cbd87b732b766794d57de8a81c558cbe2b
+SHA1 (patch-ab) = 27d2cac2281cb2bc2214fddcdb505c6b46b39dfd
 SHA1 (patch-ac) = c645307376eddb5c469ab00bd7ec8217feb3e2d5
-SHA1 (patch-ad) = b91a701e92e9594b27925cdb9a982866f06483d4
+SHA1 (patch-ad) = ada3c0128c0b7d3b670f8d30c910fe4c1e2e351a
 SHA1 (patch-ae) = 035419a4e8a505c672f727c843dbd977acd8ce35
 SHA1 (patch-af) = 520dbdec4a8cba6e82b08c169d97c3caebacd419
 SHA1 (patch-ag) = 74d20bdc56224ae553935cc81ce47504e98701fe
@@ -19,13 +19,9 @@
 SHA1 (patch-an) = 57a79bddc3f0e8237b72486aa8f8906f318ca38d
 SHA1 (patch-ao) = 72aa455cbc10afc6a744fd0684ec2d7a2e2c19c7
 SHA1 (patch-ap) = 1b842a59b821b2703b68935f59a65ffb6db3a68f
-SHA1 (patch-aq) = ca24cc64eaa6a27f7d140b2999edf5f0b524140f
-SHA1 (patch-ba) = ebe5f9a5148ff72ae978934b259e63ce15f2d4c8
-SHA1 (patch-bb) = 2e98f16668f74b64848f54db57037289623ed3f2
+SHA1 (patch-ba) = fc99c68ec9765439bc82a38223a74bde319d26d5
+SHA1 (patch-bb) = 2940eeb9468f34683bd6d8adca196b669c412bfd
 SHA1 (patch-bc) = 3638dfee30a4f10bc9662c23063df3f6a8cdc914
 SHA1 (patch-bd) = 7825fd4d2e6c06510fa3d76b4efa4d2ffab2a7d8
-SHA1 (patch-be) = ba1b688ea04f41a88b5d65b8af90927843619c0f
-SHA1 (patch-bf) = 1cf732d7ad22fbf34aa3511e77d17cacedbc810f
 SHA1 (patch-bg) = f4adb1f60c777a92e63f4ad0fef6d9addea5f856
 SHA1 (patch-bh) = afdf0dec92984528efd181a24d3ef8f3eb383173
-SHA1 (patch-bj) = f0d1a877f7aab9d1c191cd24172d39a032ead5f2
diff -r d70408266ccf -r ccb6722611ed sysutils/libgtop2/patches/patch-aa
--- a/sysutils/libgtop2/patches/patch-aa        Sun Aug 06 19:05:14 2006 +0000
+++ b/sysutils/libgtop2/patches/patch-aa        Sun Aug 06 19:06:44 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2006/03/30 21:09:48 jmmv Exp $
+$NetBSD: patch-aa,v 1.7 2006/08/06 19:06:44 jmmv Exp $
 
 --- configure.orig     2006-03-13 10:04:55.000000000 +0100
 +++ configure
@@ -23,15 +23,6 @@
          ;;
        aix*)
          libgtop_sysdeps_dir=aix
-@@ -20300,7 +20300,7 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6
- 
- 
-       case "$host_os" in
--      *bsd*)
-+      *bsd*|dragonfly*)
- 
- for ac_header in net/if_var.h
- do
 @@ -20472,7 +20472,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <net/netisr.h>
  #include <net/route.h>
diff -r d70408266ccf -r ccb6722611ed sysutils/libgtop2/patches/patch-ab
--- a/sysutils/libgtop2/patches/patch-ab        Sun Aug 06 19:05:14 2006 +0000
+++ b/sysutils/libgtop2/patches/patch-ab        Sun Aug 06 19:06:44 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2006/06/26 12:14:25 drochner Exp $
+$NetBSD: patch-ab,v 1.6 2006/08/06 19:06:44 jmmv Exp $
 
---- sysdeps/freebsd/proctime.c.orig    2005-12-12 11:09:39.000000000 +0100
+--- sysdeps/freebsd/proctime.c.orig    2006-04-04 22:01:43.000000000 +0200
 +++ sysdeps/freebsd/proctime.c
 @@ -32,6 +32,10 @@
  #include <osreldate.h>
@@ -22,16 +22,7 @@
  
  #ifndef __FreeBSD__
  static void
-@@ -138,20 +142,19 @@ glibtop_get_proc_time_p (glibtop *server
- #if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000))
-       if (server->sysdeps.proc_time == 0)
-               return;
--
--#ifndef __bsdi__
--      sprintf (filename, "/proc/%d/mem", (int) pid);
--      if (stat (filename, &statb)) return;
--#endif
- #endif
+@@ -142,11 +146,15 @@ glibtop_get_proc_time_p (glibtop *server
  
        /* Get the process information */
        pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
@@ -45,11 +36,11 @@
  #if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
        buf->rtime = pinfo [0].ki_runtime;
 +#elif defined(__DragonFly__)
-+      buf->rtime = pinfo[0].kp_eproc.e_uticks / 100000;
++      buf->rtime = pinfo [0].kp_eproc.e.uticks / 100000;
  #elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013)
        buf->rtime = pinfo [0].kp_proc.p_runtime;
  #else
-@@ -194,18 +197,26 @@ glibtop_get_proc_time_p (glibtop *server
+@@ -189,18 +197,26 @@ glibtop_get_proc_time_p (glibtop *server
         if ((pinfo [0].ki_flag & P_INMEM)) {
  #endif
             buf->utime = pinfo [0].ki_runtime;
@@ -79,7 +70,7 @@
              kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
                         (unsigned long) &u_addr->u_stats,
                         (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
-@@ -215,13 +226,21 @@ glibtop_get_proc_time_p (glibtop *server
+@@ -210,13 +226,21 @@ glibtop_get_proc_time_p (glibtop *server
                         buf->stime = tv2sec (pinfo[0].kp_eproc.e_stats.p_ru.ru_stime);
                         buf->cutime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_utime);
                         buf->cstime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_stime);
diff -r d70408266ccf -r ccb6722611ed sysutils/libgtop2/patches/patch-ad
--- a/sysutils/libgtop2/patches/patch-ad        Sun Aug 06 19:05:14 2006 +0000
+++ b/sysutils/libgtop2/patches/patch-ad        Sun Aug 06 19:06:44 2006 +0000
@@ -1,41 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2006/06/06 22:11:57 minskim Exp $
+$NetBSD: patch-ad,v 1.5 2006/08/06 19:06:44 jmmv Exp $
 
---- sysdeps/freebsd/fsusage.c.orig     2005-12-12 10:09:39.000000000 +0000
+--- sysdeps/freebsd/fsusage.c.orig     2006-04-09 18:52:45.000000000 +0200
 +++ sysdeps/freebsd/fsusage.c
-@@ -1,4 +1,8 @@
- #include <config.h>
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <glibtop.h>
- #include <glibtop/error.h>
- #include <glibtop/fsusage.h>
-@@ -10,6 +14,9 @@
- #include <unistd.h>
- #include <sys/param.h>
- #include <sys/mount.h>
-+#ifdef HAVE_SYS_STATVFS_H
-+#include <sys/statvfs.h>
-+#endif
- 
- #include <stdio.h>
- #include <string.h>
-@@ -27,16 +34,26 @@ _glibtop_freebsd_get_fsusage_read_write(
-                                     const char *path)
- {
-       int result;
-+#ifdef STAT_STATVFS
-+      struct statvfs sfs;
-+
-+      result = statvfs (path, &sfs);
-+#else
-       struct statfs sfs;
- 
-       result = statfs (path, &sfs);
-+#endif
- 
-       if (result == -1) {
+@@ -47,8 +47,12 @@ _glibtop_freebsd_get_fsusage_read_write(
                return;
        }
  
diff -r d70408266ccf -r ccb6722611ed sysutils/libgtop2/patches/patch-aq
--- a/sysutils/libgtop2/patches/patch-aq        Sun Aug 06 19:05:14 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/03/30 21:09:48 jmmv Exp $
-
---- sysdeps/freebsd/msg_limits.c.orig  2005-12-12 11:09:39.000000000 +0100
-+++ sysdeps/freebsd/msg_limits.c
-@@ -49,7 +49,7 @@ glibtop_get_msg_limits_p (glibtop *serve
- 
- #if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || (defined __bsdi__)
- #define KERNEL 1
--#else
-+#elif !defined(__NetBSD__)
- #define _KERNEL 1
- #endif
- 
diff -r d70408266ccf -r ccb6722611ed sysutils/libgtop2/patches/patch-ba
--- a/sysutils/libgtop2/patches/patch-ba        Sun Aug 06 19:05:14 2006 +0000
+++ b/sysutils/libgtop2/patches/patch-ba        Sun Aug 06 19:06:44 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1 2005/10/12 21:49:39 jmmv Exp $
+$NetBSD: patch-ba,v 1.2 2006/08/06 19:06:44 jmmv Exp $
 
 From FreeBSD's GNOME development repository.
 
---- lib/read.c.orig    2005-06-06 14:33:42.000000000 +0200
+--- lib/read.c.orig    2006-04-10 10:41:46.000000000 +0200
 +++ lib/read.c
 @@ -22,6 +22,7 @@
  */
@@ -13,7 +13,7 @@
  #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);
+       fprintf (stderr, "LIBRARY: really reading %d bytes.\n", (int)size);
  #endif
  
 +retry:
@@ -28,7 +28,7 @@
                                server,
                                ngettext ("read %d byte",
                                          "read %d bytes", size),
-                               size);
+                               (int)size);
 +              }
        }
  }
diff -r d70408266ccf -r ccb6722611ed sysutils/libgtop2/patches/patch-bb