From ecd4dcaec56a8e5afb1beeb4abdd1d391d7a5dd5 Mon Sep 17 00:00:00 2001 From: jmmv Date: Fri, 2 Apr 2004 12:10:12 +0000 Subject: Move libgtop to the sysutils category, coming from devel. This is version 1.0.13nb4. --- sysutils/libgtop/DESCR | 4 ++ sysutils/libgtop/PLIST | 115 ++++++++++++++++++++++++++++++++++++++ sysutils/libgtop/buildlink2.mk | 35 ++++++++++++ sysutils/libgtop/distinfo | 18 ++++++ sysutils/libgtop/patches/patch-an | 15 +++++ sysutils/libgtop/patches/patch-ao | 13 +++++ sysutils/libgtop/patches/patch-ap | 22 ++++++++ sysutils/libgtop/patches/patch-aq | 46 +++++++++++++++ sysutils/libgtop/patches/patch-ar | 69 +++++++++++++++++++++++ sysutils/libgtop/patches/patch-as | 38 +++++++++++++ 10 files changed, 375 insertions(+) create mode 100644 sysutils/libgtop/DESCR create mode 100644 sysutils/libgtop/PLIST create mode 100644 sysutils/libgtop/buildlink2.mk create mode 100644 sysutils/libgtop/distinfo create mode 100644 sysutils/libgtop/patches/patch-an create mode 100644 sysutils/libgtop/patches/patch-ao create mode 100644 sysutils/libgtop/patches/patch-ap create mode 100644 sysutils/libgtop/patches/patch-aq create mode 100644 sysutils/libgtop/patches/patch-ar create mode 100644 sysutils/libgtop/patches/patch-as (limited to 'sysutils/libgtop') diff --git a/sysutils/libgtop/DESCR b/sysutils/libgtop/DESCR new file mode 100644 index 00000000000..55f3012d616 --- /dev/null +++ b/sysutils/libgtop/DESCR @@ -0,0 +1,4 @@ +libgtop is a library that fetches system information about the running +system such as cpu and memory usage, active processes etc. It +provides a setgid server that fetches the information and a +client-side library that talks to this server. diff --git a/sysutils/libgtop/PLIST b/sysutils/libgtop/PLIST new file mode 100644 index 00000000000..215c4cd9597 --- /dev/null +++ b/sysutils/libgtop/PLIST @@ -0,0 +1,115 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/02 12:10:12 jmmv Exp $ +bin/libgtop-config +bin/libgtop_daemon +bin/libgtop_server +include/libgtop-1.0/glibtop.h +include/libgtop-1.0/glibtop/close.h +include/libgtop-1.0/glibtop/command.h +include/libgtop-1.0/glibtop/cpu.h +include/libgtop-1.0/glibtop/error.h +include/libgtop-1.0/glibtop/fsusage.h +include/libgtop-1.0/glibtop/global.h +include/libgtop-1.0/glibtop/gnuserv.h +include/libgtop-1.0/glibtop/inodedb.h +include/libgtop-1.0/glibtop/loadavg.h +include/libgtop-1.0/glibtop/mem.h +include/libgtop-1.0/glibtop/mountlist.h +include/libgtop-1.0/glibtop/msg_limits.h +include/libgtop-1.0/glibtop/netload.h +include/libgtop-1.0/glibtop/open.h +include/libgtop-1.0/glibtop/parameter.h +include/libgtop-1.0/glibtop/ppp.h +include/libgtop-1.0/glibtop/procargs.h +include/libgtop-1.0/glibtop/prockernel.h +include/libgtop-1.0/glibtop/proclist.h +include/libgtop-1.0/glibtop/procmap.h +include/libgtop-1.0/glibtop/procmem.h +include/libgtop-1.0/glibtop/procsegment.h +include/libgtop-1.0/glibtop/procsignal.h +include/libgtop-1.0/glibtop/procstate.h +include/libgtop-1.0/glibtop/proctime.h +include/libgtop-1.0/glibtop/procuid.h +include/libgtop-1.0/glibtop/read.h +include/libgtop-1.0/glibtop/read_data.h +include/libgtop-1.0/glibtop/sem_limits.h +include/libgtop-1.0/glibtop/shm_limits.h +include/libgtop-1.0/glibtop/signal.h +include/libgtop-1.0/glibtop/swap.h +include/libgtop-1.0/glibtop/sysdeps.h +include/libgtop-1.0/glibtop/sysinfo.h +include/libgtop-1.0/glibtop/types.h +include/libgtop-1.0/glibtop/union.h +include/libgtop-1.0/glibtop/uptime.h +include/libgtop-1.0/glibtop/version.h +include/libgtop-1.0/glibtop/write.h +include/libgtop-1.0/glibtop/xmalloc.h +include/libgtop-1.0/glibtop_machine.h +include/libgtop-1.0/glibtop_server.h +include/libgtop-1.0/glibtop_suid.h +lib/libgtop-features.def +lib/libgtop.a +lib/libgtop.la +lib/libgtop.so +lib/libgtop.so.1 +lib/libgtop.so.1.12 +lib/libgtopConf.sh +lib/libgtop_common.a +lib/libgtop_common.la +lib/libgtop_common.so +lib/libgtop_common.so.1 +lib/libgtop_common.so.1.12 +lib/libgtop_names.a +lib/libgtop_names.la +lib/libgtop_names.so +lib/libgtop_names.so.1 +lib/libgtop_names.so.1.12 +lib/libgtop_suid_common.a +lib/libgtop_suid_common.la +lib/libgtop_suid_common.so +lib/libgtop_suid_common.so.1 +lib/libgtop_suid_common.so.1.12 +lib/libgtop_sysdeps.a +lib/libgtop_sysdeps.la +lib/libgtop_sysdeps.so +lib/libgtop_sysdeps.so.1 +lib/libgtop_sysdeps.so.1.12 +lib/libgtop_sysdeps_suid.a +lib/libgtop_sysdeps_suid.la +lib/libgtop_sysdeps_suid.so +lib/libgtop_sysdeps_suid.so.1 +lib/libgtop_sysdeps_suid.so.1.12 +${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/es_DO/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/es_GT/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/es_HN/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/es_PA/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/es_PE/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/es_SV/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/libgtop.mo +${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgtop.mo +@dirrm include/libgtop-1.0/glibtop +@dirrm include/libgtop-1.0 diff --git a/sysutils/libgtop/buildlink2.mk b/sysutils/libgtop/buildlink2.mk new file mode 100644 index 00000000000..6e42a78d852 --- /dev/null +++ b/sysutils/libgtop/buildlink2.mk @@ -0,0 +1,35 @@ +# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/04/02 12:10:12 jmmv Exp $ +# +# This Makefile fragment is included by packages that use libgtop. +# +# This file was created automatically using createbuildlink 2.2. +# + +.if !defined(LIBGTOP_BUILDLINK2_MK) +LIBGTOP_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libgtop +BUILDLINK_DEPENDS.libgtop?= libgtop>=1.0.13nb4 +BUILDLINK_PKGSRCDIR.libgtop?= ../../sysutils/libgtop + +EVAL_PREFIX+= BUILDLINK_PREFIX.libgtop=libgtop +BUILDLINK_PREFIX.libgtop_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.libgtop+= include/libgtop-1.0/*.h +BUILDLINK_FILES.libgtop+= include/libgtop-1.0/glibtop/*.h +BUILDLINK_FILES.libgtop+= lib/libgtop-features.def +BUILDLINK_FILES.libgtop+= lib/libgtop.* +BUILDLINK_FILES.libgtop+= lib/libgtopConf.sh +BUILDLINK_FILES.libgtop+= lib/libgtop_common.* +BUILDLINK_FILES.libgtop+= lib/libgtop_names.* +BUILDLINK_FILES.libgtop+= lib/libgtop_suid_common.* +BUILDLINK_FILES.libgtop+= lib/libgtop_sysdeps.* +BUILDLINK_FILES.libgtop+= lib/libgtop_sysdeps_suid.* + +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../x11/gnome-libs/buildlink2.mk" + +BUILDLINK_TARGETS+= libgtop-buildlink + +libgtop-buildlink: _BUILDLINK_USE + +.endif # LIBGTOP_BUILDLINK2_MK diff --git a/sysutils/libgtop/distinfo b/sysutils/libgtop/distinfo new file mode 100644 index 00000000000..148f51745bf --- /dev/null +++ b/sysutils/libgtop/distinfo @@ -0,0 +1,18 @@ +$NetBSD: distinfo,v 1.1.1.1 2004/04/02 12:10:12 jmmv Exp $ + +SHA1 (libgtop-1.0.13.tar.bz2) = 7002d37ab43ebac14315298472a170ceaedbd072 +Size (libgtop-1.0.13.tar.bz2) = 733873 bytes +SHA1 (patch-aa) = a640afa2d6a8b7f418052fabbdb04bfc6805b42d +SHA1 (patch-ab) = 3ce99bf4d72cf4e4203364d78361c8a2df081d8d +SHA1 (patch-ac) = 644bfe717bdcc993a668a3d075acda8ef39571d8 +SHA1 (patch-ad) = 9522d20b1467b73678003d5c0f98dcac7d312893 +SHA1 (patch-ae) = cf277165382c17d938593934b59d8035175fd8d0 +SHA1 (patch-af) = 6874f04a186a4dccfecadaa2e40a372bc9f2e2fe +SHA1 (patch-ag) = eb02b990d1316ac5f2ec0430e49b9c4487c6dab8 +SHA1 (patch-al) = 15c860638199d3d8c260b89b3fb70ced5054a69c +SHA1 (patch-an) = 339df94fd374d99565be913d1f8b59ea2f7b7881 +SHA1 (patch-ao) = 09cb66ba7ee9a7368ec1cd1d4bd40ea3f6637a31 +SHA1 (patch-ap) = 07a83340eb9d6a36a3f5b2db33eb50c74fbc4777 +SHA1 (patch-aq) = 93ebb47710f1c4cc70406a92503bdc4a5bfa50d2 +SHA1 (patch-ar) = 470e29d999b079a5f75993978b3cdcdec2fd7d9c +SHA1 (patch-as) = 0374fc36c418871e929fbb3c53ab4979e780e8d5 diff --git a/sysutils/libgtop/patches/patch-an b/sysutils/libgtop/patches/patch-an new file mode 100644 index 00000000000..0bb131ac4c4 --- /dev/null +++ b/sysutils/libgtop/patches/patch-an @@ -0,0 +1,15 @@ +$NetBSD: patch-an,v 1.1.1.1 2004/04/02 12:10:18 jmmv Exp $ + +--- doc/libgtop.texi.orig Fri Jan 21 16:19:04 2000 ++++ doc/libgtop.texi Mon May 1 14:09:27 2000 +@@ -2,6 +2,10 @@ + @c %**start of header + @setfilename libgtop.info + @settitle LibGTop Reference Manual ++@dircategory Gnome ++@direntry ++* LibGTop: (libgtop). A library to retrieve system information. ++@end direntry + @setchapternewpage odd + @c %**end of header + diff --git a/sysutils/libgtop/patches/patch-ao b/sysutils/libgtop/patches/patch-ao new file mode 100644 index 00000000000..dff77a8a404 --- /dev/null +++ b/sysutils/libgtop/patches/patch-ao @@ -0,0 +1,13 @@ +$NetBSD: patch-ao,v 1.1.1.1 2004/04/02 12:10:18 jmmv Exp $ + +--- src/daemon/Makefile.in.orig Tue Feb 27 15:02:08 2001 ++++ src/daemon/Makefile.in +@@ -196,7 +196,7 @@ + @ENABLE_STATIC_TRUE@libgtop_daemon_LDFLAGS = -static + + libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h +-libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la ++libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la -lintl + + + @ENABLE_STATIC_TRUE@libgtop_server_LDFLAGS = -static diff --git a/sysutils/libgtop/patches/patch-ap b/sysutils/libgtop/patches/patch-ap new file mode 100644 index 00000000000..92b717358c1 --- /dev/null +++ b/sysutils/libgtop/patches/patch-ap @@ -0,0 +1,22 @@ +$NetBSD: patch-ap,v 1.1.1.1 2004/04/02 12:10:18 jmmv Exp $ + +--- sysdeps/freebsd/mem.c.orig Sun Feb 13 10:47:58 2000 ++++ sysdeps/freebsd/mem.c Sat Jul 29 22:32:44 2000 +@@ -29,7 +29,9 @@ + + #include + #include ++#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) + #include ++#endif + + #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) + #include +@@ -74,7 +76,6 @@ + }; + + /* MIB array for sysctl */ +-static int mib_length=2; + #ifdef __bsdi__ + static int mib [] = { CTL_VM, VM_TOTAL }; + #else diff --git a/sysutils/libgtop/patches/patch-aq b/sysutils/libgtop/patches/patch-aq new file mode 100644 index 00000000000..b20a26382bd --- /dev/null +++ b/sysutils/libgtop/patches/patch-aq @@ -0,0 +1,46 @@ +$NetBSD: patch-aq,v 1.1.1.1 2004/04/02 12:10:18 jmmv Exp $ + +--- sysdeps/freebsd/procmap.c.orig Thu May 27 20:56:48 1999 ++++ sysdeps/freebsd/procmap.c Wed Nov 29 21:57:15 2000 +@@ -32,9 +32,13 @@ + #include + #include + #include ++#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) + #include + #include + #include ++#else ++#include ++#endif + + #include + #include +@@ -46,9 +50,12 @@ + #include + #endif + #include ++#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) + #include ++#endif + +-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) ++#if defined(__NetBSD__) && \ ++ (__NetBSD_Version__ >= 104000000) && (__NetBSD_Version < 105020000) + /* Fixme ... */ + #undef _KERNEL + #define _UVM_UVM_AMAP_I_H_ 1 +@@ -214,11 +221,13 @@ + #endif + + #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) ++#if defined(UVM_VNODE_VALID) + if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID) + continue; + + if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) || + !vnode.v_data) continue; ++#endif + + if (kvm_read (server->machine.kd, + (unsigned long) vnode.v_data, diff --git a/sysutils/libgtop/patches/patch-ar b/sysutils/libgtop/patches/patch-ar new file mode 100644 index 00000000000..e896045f16b --- /dev/null +++ b/sysutils/libgtop/patches/patch-ar @@ -0,0 +1,69 @@ +$NetBSD: patch-ar,v 1.1.1.1 2004/04/02 12:10:18 jmmv Exp $ + +--- sysdeps/freebsd/procmem.c.orig Thu May 27 20:56:49 1999 ++++ sysdeps/freebsd/procmem.c +@@ -31,8 +31,12 @@ + #include + #include + #include ++#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) + #include + #include ++#else ++#include ++#endif + + #include + #include +@@ -43,9 +47,14 @@ + #include + #endif + #include ++#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) + #include ++#else ++#include ++#endif + +-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) ++#if defined(__NetBSD__) && \ ++ (__NetBSD_Version__ >= 104000000) && (__NetBSD_Version__ < 105020000) + /* Fixme ... */ + #undef _KERNEL + #define _UVM_UVM_AMAP_I_H_ 1 +@@ -113,7 +122,6 @@ + struct vmspace *vms, vmspace; + #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) + struct vnode vnode; +- struct inode inode; + #else + struct vm_object object; + #endif +@@ -233,17 +241,27 @@ + /* If the object is of type vnode, add its size */ + + #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) ++#if defined(UVM_VNODE_VALID) + if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID) + continue; ++#endif + + if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) || + !vnode.v_data) continue; + ++#if (__NetBSD_Version__ >= 105250000) ++ /* Reference count must be at least two. */ ++ if (vnode.v_usecount <= 1) ++ continue; ++ ++ buf->share += pagetok (vnode.v_uobj.uo_npages) << LOG1024; ++#else + /* Reference count must be at least two. */ + if (vnode.v_uvm.u_obj.uo_refs <= 1) + continue; + + buf->share += pagetok (vnode.v_uvm.u_obj.uo_npages) << LOG1024; ++#endif /* __NetBSD_Version__ >= 105250000 */ + #endif + + #ifdef __FreeBSD__ diff --git a/sysutils/libgtop/patches/patch-as b/sysutils/libgtop/patches/patch-as new file mode 100644 index 00000000000..c2fd14058f2 --- /dev/null +++ b/sysutils/libgtop/patches/patch-as @@ -0,0 +1,38 @@ +$NetBSD: patch-as,v 1.1.1.1 2004/04/02 12:10:18 jmmv Exp $ + +--- sysdeps/freebsd/uptime.c.orig Thu May 27 16:04:16 1999 ++++ sysdeps/freebsd/uptime.c +@@ -49,6 +49,27 @@ + void + glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf) + { ++#ifdef __NetBSD__ ++ time_t now; ++ time_t uptime; ++ int mib[2]; ++ struct timeval boottime; ++ size_t size; ++ ++ mib[0] = CTL_KERN; ++ mib[1] = KERN_BOOTTIME; ++ size = sizeof(boottime); ++ if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1 && ++ boottime.tv_sec != 0) { ++ time(&now); ++ buf->uptime = now - boottime.tv_sec; ++ /* XXX: don't know a useful value to put here. */ ++ buf->idletime = 0; ++ buf->flags = _glibtop_sysdeps_uptime; ++ } ++#else ++ buf->flags = _glibtop_sysdeps_uptime; ++ + glibtop_cpu cpu; + + glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0); +@@ -70,4 +91,5 @@ + buf->idletime = (double) cpu.idle / (double) cpu.frequency; + + buf->flags = _glibtop_sysdeps_uptime; ++#endif + } -- cgit v1.2.3