pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/libgtop2 Update to 2.5.2:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/211342c7f6cb
branches:  trunk
changeset: 471909:211342c7f6cb
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Thu Apr 01 18:34:27 2004 +0000

description:
Update to 2.5.2:

- plenty of code cleanups
- removed the dependency on libgnome, only glib required now
- Linux 2.6 support, NetBSD support and better FreeBSD support
- Make the block size available for filesystem statistics

diffstat:

 devel/libgtop2/Makefile         |    8 +-
 devel/libgtop2/PLIST            |   40 +-------
 devel/libgtop2/buildlink3.mk    |    4 +-
 devel/libgtop2/distinfo         |   25 +----
 devel/libgtop2/patches/patch-aa |   11 +--
 devel/libgtop2/patches/patch-ab |   76 ----------------
 devel/libgtop2/patches/patch-ac |   18 ---
 devel/libgtop2/patches/patch-ad |   17 ---
 devel/libgtop2/patches/patch-ae |   81 -----------------
 devel/libgtop2/patches/patch-af |   38 --------
 devel/libgtop2/patches/patch-ag |  109 -----------------------
 devel/libgtop2/patches/patch-ah |   96 --------------------
 devel/libgtop2/patches/patch-ai |   22 ----
 devel/libgtop2/patches/patch-aj |   13 --
 devel/libgtop2/patches/patch-ak |  102 ---------------------
 devel/libgtop2/patches/patch-al |  189 ++-------------------------------------
 devel/libgtop2/patches/patch-am |   92 -------------------
 devel/libgtop2/patches/patch-an |   89 ------------------
 devel/libgtop2/patches/patch-ao |   83 -----------------
 devel/libgtop2/patches/patch-ap |   19 ----
 devel/libgtop2/patches/patch-aq |   32 ------
 21 files changed, 27 insertions(+), 1137 deletions(-)

diffs (truncated from 1315 to 300 lines):

diff -r a8205d306025 -r 211342c7f6cb devel/libgtop2/Makefile
--- a/devel/libgtop2/Makefile   Thu Apr 01 18:33:20 2004 +0000
+++ b/devel/libgtop2/Makefile   Thu Apr 01 18:34:27 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2004/03/19 22:55:30 kristerw Exp $
+# $NetBSD: Makefile,v 1.27 2004/04/01 18:34:27 jmmv Exp $
 
-DISTNAME=              libgtop-2.0.8
+DISTNAME=              libgtop-2.5.2
 PKGNAME=               ${DISTNAME:S/-/2-/}
 CATEGORIES=            devel gnome
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/libgtop/2.0/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/libgtop/2.5/}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            tech-pkg%NetBSD.org@localhost
@@ -14,6 +14,7 @@
 
 NOT_FOR_PLATFORM=      SunOS-*-*
 OSVERSION_SPECIFIC=    YES
+USE_MSGFMT_PLURALS=    YES
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -65,6 +66,7 @@
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a8205d306025 -r 211342c7f6cb devel/libgtop2/PLIST
--- a/devel/libgtop2/PLIST      Thu Apr 01 18:33:20 2004 +0000
+++ b/devel/libgtop2/PLIST      Thu Apr 01 18:34:27 2004 +0000
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2004/03/12 22:30:36 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/01 18:34:27 jmmv Exp $
 bin/libgtop_daemon2
 ${LIBGTOP_SERVER}bin/libgtop_server2
-include/gnome/gnomesupport.h
 include/libgtop-2.0/glibtop.h
 include/libgtop-2.0/glibtop/close.h
 include/libgtop-2.0/glibtop/command.h
@@ -42,46 +41,14 @@
 include/libgtop-2.0/glibtop/uptime.h
 include/libgtop-2.0/glibtop/version.h
 include/libgtop-2.0/glibtop/write.h
-include/libgtop-2.0/glibtop/xmalloc.h
 include/libgtop-2.0/glibtop_machine.h
 include/libgtop-2.0/glibtop_server.h
 ${LIBGTOP_SERVER}include/libgtop-2.0/glibtop_suid.h
-lib/libgnomesupport-2.0.a
-lib/libgnomesupport-2.0.la
-lib/libgnomesupport-2.0.so
-lib/libgnomesupport-2.0.so.0
-lib/libgnomesupport-2.0.so.0.0
 lib/libgtop-2.0.a
 lib/libgtop-2.0.la
 lib/libgtop-2.0.so
-lib/libgtop-2.0.so.0
-lib/libgtop-2.0.so.0.8
-lib/libgtop_common-2.0.a
-lib/libgtop_common-2.0.la
-lib/libgtop_common-2.0.so
-lib/libgtop_common-2.0.so.0
-lib/libgtop_common-2.0.so.0.8
-lib/libgtop_names-2.0.a
-lib/libgtop_names-2.0.la
-lib/libgtop_names-2.0.so
-lib/libgtop_names-2.0.so.0
-lib/libgtop_names-2.0.so.0.8
-lib/libgtop_suid_common-2.0.a
-lib/libgtop_suid_common-2.0.la
-lib/libgtop_suid_common-2.0.so
-lib/libgtop_suid_common-2.0.so.0
-lib/libgtop_suid_common-2.0.so.0.8
-lib/libgtop_sysdeps-2.0.a
-lib/libgtop_sysdeps-2.0.la
-lib/libgtop_sysdeps-2.0.so
-lib/libgtop_sysdeps-2.0.so.0
-lib/libgtop_sysdeps-2.0.so.0.8
-${LIBGTOP_SERVER}lib/libgtop_sysdeps_suid-2.0.a
-${LIBGTOP_SERVER}lib/libgtop_sysdeps_suid-2.0.la
-${LIBGTOP_SERVER}lib/libgtop_sysdeps_suid-2.0.so
-${LIBGTOP_SERVER}lib/libgtop_sysdeps_suid-2.0.so.0
-${LIBGTOP_SERVER}lib/libgtop_sysdeps_suid-2.0.so.0.8
-lib/pkgconfig/gnome-support-2.0.pc
+lib/libgtop-2.0.so.3
+lib/libgtop-2.0.so.3.0
 lib/pkgconfig/libgtop-2.0.pc
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgtop-2.0.mo
@@ -104,6 +71,7 @@
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgtop-2.0.mo
diff -r a8205d306025 -r 211342c7f6cb devel/libgtop2/buildlink3.mk
--- a/devel/libgtop2/buildlink3.mk      Thu Apr 01 18:33:20 2004 +0000
+++ b/devel/libgtop2/buildlink3.mk      Thu Apr 01 18:34:27 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/04/01 18:34:27 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.0.0nb4
+BUILDLINK_DEPENDS.libgtop2+=   libgtop2>=2.5.2
 BUILDLINK_PKGSRCDIR.libgtop2?= ../../devel/libgtop2
 .endif # LIBGTOP2_BUILDLINK3_MK
 
diff -r a8205d306025 -r 211342c7f6cb devel/libgtop2/distinfo
--- a/devel/libgtop2/distinfo   Thu Apr 01 18:33:20 2004 +0000
+++ b/devel/libgtop2/distinfo   Thu Apr 01 18:34:27 2004 +0000
@@ -1,21 +1,6 @@
-$NetBSD: distinfo,v 1.9 2004/03/19 22:55:30 kristerw Exp $
+$NetBSD: distinfo,v 1.10 2004/04/01 18:34:27 jmmv Exp $
 
-SHA1 (libgtop-2.0.8.tar.bz2) = 32f6f3b94a42a9cd53ad9715d3922debcf3ebbba
-Size (libgtop-2.0.8.tar.bz2) = 916084 bytes
-SHA1 (patch-aa) = b01ba86612ed2613034bfbfdc878ce5178eede6b
-SHA1 (patch-ab) = 83d16a720eaaa113bf714fa8d60fcb9acf11c988
-SHA1 (patch-ac) = 644bfe717bdcc993a668a3d075acda8ef39571d8
-SHA1 (patch-ad) = 9522d20b1467b73678003d5c0f98dcac7d312893
-SHA1 (patch-ae) = cf277165382c17d938593934b59d8035175fd8d0
-SHA1 (patch-af) = 0374fc36c418871e929fbb3c53ab4979e780e8d5
-SHA1 (patch-ag) = 7d46fc3b996e39e8532d2e20a47587a54e37b654
-SHA1 (patch-ah) = 29cfc8b7f98610efb2b6013367c06f0e09a32312
-SHA1 (patch-ai) = 07a83340eb9d6a36a3f5b2db33eb50c74fbc4777
-SHA1 (patch-aj) = 0a0ca01be2a33a1a3b9f17e1d52db1a1b7502177
-SHA1 (patch-ak) = 95170aa2786c5313f859b2381031be9bc7f7cd76
-SHA1 (patch-al) = e18c0d13a3aeb6a4357147e32c9cc650a5e2a1ad
-SHA1 (patch-am) = cc12e383f36e7f3c0f25fd3a3ea2e0ceff04d43c
-SHA1 (patch-an) = 5ea04c27db91067733ab75d4ce4959446031cb91
-SHA1 (patch-ao) = f54754a2bdcce99a0d953186aee6d2bcbc5d7bae
-SHA1 (patch-ap) = c47c57d77424d18a3184a0625e0d953745d929fe
-SHA1 (patch-aq) = 8efdb60a0bf66b6d0614620a0523238b41e72b8b
+SHA1 (libgtop-2.5.2.tar.bz2) = 0ef139ccfd7a6a11b9f94c17e3a9d382ded1dad3
+Size (libgtop-2.5.2.tar.bz2) = 935545 bytes
+SHA1 (patch-aa) = 5ebb407abdaedb77ed02c01adbaba70113b333b6
+SHA1 (patch-al) = 4fad51ee02aa13c8f53d8716fb230bef2f282d4d
diff -r a8205d306025 -r 211342c7f6cb devel/libgtop2/patches/patch-aa
--- a/devel/libgtop2/patches/patch-aa   Thu Apr 01 18:33:20 2004 +0000
+++ b/devel/libgtop2/patches/patch-aa   Thu Apr 01 18:34:27 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2003/12/13 20:27:42 xtraeme Exp $
+$NetBSD: patch-aa,v 1.4 2004/04/01 18:34:27 jmmv Exp $
 
 --- configure.orig     2003-12-13 08:32:17.000000000 +0100
 +++ configure  2003-12-13 08:33:16.000000000 +0100
@@ -18,12 +18,3 @@
          ;;
          aix*)
          libgtop_sysdeps_dir=aix
-@@ -30160,7 +30160,7 @@
- 
- 
- if test x$libgtop_need_server = xyes ; then
--   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
-+   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la \$(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la"
-    server_programs='libgtop_server2'
- else
-    sysdeps_suid_lib=
diff -r a8205d306025 -r 211342c7f6cb devel/libgtop2/patches/patch-ab
--- a/devel/libgtop2/patches/patch-ab   Thu Apr 01 18:33:20 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/12/13 20:27:42 xtraeme Exp $
-
---- sysdeps/freebsd/procsignal.c.orig  Sat Sep  6 00:25:33 2003
-+++ sysdeps/freebsd/procsignal.c       Sat Sep  6 00:30:38 2003
-@@ -67,11 +67,30 @@
-               return;
-       }
- 
-+#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
-+
-+#define       XXX_P_SIGLIST   ki_siglist
-+#define       XXX_P_SIGMASK   ki_sigmask
-+#define       XXX_P_SIGIGNORE ki_sigignore
-+#define       XXX_P_SIGCATCH  ki_sigcatch
-+
-+#else
-+
-+#define       XXX_P_SIGLIST   kp_proc.p_siglist
-+#define       XXX_P_SIGMASK   kp_proc.p_sigmask
-+#define       XXX_P_SIGIGNORE kp_proc.p_sigignore
-+#define       XXX_P_SIGCATCH  kp_proc.p_sigcatch
-+
-+#endif
-+
-+
-       /* signal: mask of pending signals.
-        *         pinfo [0].kp_proc.p_siglist
-        */
--#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
--      buf->signal [0] = pinfo [0].kp_proc.p_siglist.__bits[0];
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
-+      buf->signal [0] = pinfo [0].kp_proc.p_sigctx.ps_siglist.__bits[0];
-+#elif (defined(__NetBSD__) && (NSIG > 32)) || defined(__FreeBSD__) && (__FreeBSD_version >= 400011)
-+      buf->signal [0] = pinfo [0].XXX_P_SIGLIST.__bits[0];
- #else
-       buf->signal [0] = pinfo [0].kp_proc.p_siglist;
- #endif
-@@ -79,8 +98,10 @@
-       /* blocked: mask of blocked signals.
-        *          pinfo [0].kp_proc.p_sigmask
-        */
--#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
--      buf->blocked [0] = pinfo [0].kp_proc.p_sigmask.__bits[0];
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
-+      buf->blocked [0] = pinfo [0].kp_proc.p_sigctx.ps_sigmask.__bits[0];
-+#elif (defined(__NetBSD__) && (NSIG > 32)) || defined(__FreeBSD__) && (__FreeBSD_version >= 400011)
-+      buf->blocked [0] = pinfo [0].XXX_P_SIGMASK.__bits[0];
- #else
-       buf->blocked [0] = pinfo [0].kp_proc.p_sigmask;
- #endif
-@@ -88,8 +109,10 @@
-       /* sigignore: mask of ignored signals.
-        *            pinfo [0].kp_proc.p_sigignore
-       */
--#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
--      buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore.__bits[0];
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
-+      buf->sigignore [0] = pinfo [0].kp_proc.p_sigctx.ps_sigignore.__bits[0];
-+#elif (defined(__NetBSD__) && (NSIG > 32)) || defined(__FreeBSD__) && (__FreeBSD_version >= 400011)
-+      buf->sigignore [0] = pinfo [0].XXX_P_SIGIGNORE.__bits[0];
- #else
-       buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore;
- #endif
-@@ -97,8 +120,10 @@
-       /* sigcatch: mask of caught signals.
-        *           pinfo [0].kp_proc.p_sigcatch
-       */
--#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
--      buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch.__bits[0];
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
-+      buf->sigcatch [0] = pinfo [0].kp_proc.p_sigctx.ps_sigcatch.__bits[0];
-+#elif (defined(__NetBSD__) && (NSIG > 32)) || defined(__FreeBSD__) && (__FreeBSD_version >= 400011)
-+      buf->sigcatch [0] = pinfo [0].XXX_P_SIGCATCH.__bits[0];
- #else
-       buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch;
- #endif
diff -r a8205d306025 -r 211342c7f6cb devel/libgtop2/patches/patch-ac
--- a/devel/libgtop2/patches/patch-ac   Thu Apr 01 18:33:20 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
-
---- include/glibtop/procstate.h.orig   Tue Feb 23 06:43:11 1999
-+++ include/glibtop/procstate.h        Sun Aug 29 19:50:34 1999
-@@ -36,6 +36,13 @@
- 
- #define GLIBTOP_MAX_PROC_STATE                4
- 
-+#define GLIBTOP_PROCESS_RUNNING                       1
-+#define GLIBTOP_PROCESS_INTERRUPTIBLE         2
-+#define GLIBTOP_PROCESS_UNINTERRUPTIBLE               4
-+#define GLIBTOP_PROCESS_ZOMBIE                        8
-+#define GLIBTOP_PROCESS_STOPPED                       16
-+#define GLIBTOP_PROCESS_SWAPPING              32
-+
- typedef struct _glibtop_proc_state    glibtop_proc_state;
- 
- /* Name and status */
diff -r a8205d306025 -r 211342c7f6cb devel/libgtop2/patches/patch-ad
--- a/devel/libgtop2/patches/patch-ad   Thu Apr 01 18:33:20 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
-
---- sysdeps/freebsd/procargs.c.orig    Thu May 27 16:04:01 1999
-+++ sysdeps/freebsd/procargs.c Sat Jun  3 23:18:52 2000
-@@ -83,9 +83,9 @@
- 
-       args = kvm_getargv (server->machine.kd, pinfo, max_len);
-       if (args == NULL) {
--              glibtop_suid_leave (server);
--              glibtop_warn_io_r (server, "kvm_getargv (%d)", pid);
--              return NULL;
-+              static char *dummy = NULL;
-+
-+              args = &dummy;
-       }
- 
-       glibtop_suid_leave (server);
diff -r a8205d306025 -r 211342c7f6cb devel/libgtop2/patches/patch-ae
--- a/devel/libgtop2/patches/patch-ae   Thu Apr 01 18:33:20 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
-



Home | Main Index | Thread Index | Old Index