head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.152 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.150 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.148 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.146 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.144 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.142 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.140 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.138 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.136 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.134 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.132 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.130 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.128 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.126 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.124 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.122 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.120 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.118 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.116 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.114 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.112 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.110 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.108 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.104 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.84 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.106 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.102 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.100 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.98 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.96 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.94 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.92 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.90 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.88 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.86 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.82 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.80 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.78 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.76 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.74 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.72 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.70 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.68 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.66 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.64 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.62 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.60 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.58 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.56 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.54 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.52 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.50 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.48 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.46 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.44 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.42 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.40 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.38 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.36 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.34 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.32 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.30 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.28 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.26 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.24 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.22 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.20 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.18 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.16 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.14 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.12 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.10 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.8 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.6 pkgsrc-2008Q1:1.6.0.4 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.2 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.5.0.2 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.4.0.18 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.16 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.14 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.12 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.10 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.8 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.6 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.4 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.2 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.3.0.8 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.6 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.4 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.2 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 pkgsrc-base:1.1.1.2 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2007.11.05.19.06.04; author drochner; state Exp; branches; next 1.5; 1.5 date 2007.09.20.21.12.08; author wiz; state Exp; branches; next 1.4; 1.4 date 2005.05.18.22.02.21; author wiz; state dead; branches; next 1.3; 1.3 date 2004.04.02.12.13.57; author jmmv; state Exp; branches; next 1.2; 1.2 date 98.11.01.23.24.18; author tron; state dead; branches; next 1.1; 1.1 date 98.10.07.13.11.35; author agc; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 98.10.07.13.11.35; author agc; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2004.04.02.12.10.12; author jmmv; state Exp; branches; next ; desc @@ 1.6 log @update to 2.20.0 This switches to the new gnome-2.20 branch. pkgsrc notes: -System dependant parts were reorganized upstream, in particular there if a subtree for FreeBSD now, and one for the other BSDs. I didn't pull in the DragonFly patches because I can't decide whether to base them on the freebsd or the rest. -I've changed the NetBSD code to use kinfo_proc2 almost completely. Some vm statistics reporting might be less accurate now because some fields in proc2 seem to be unmaintained by the current kernel (eg ixrss). -Also, some libgtop functions might be able to run in the non-privileged part now, but dealing with this would require even more #ifdefs, so we should consider setting up a private subtree as FreeBSD did. -I didn't verify with older NetBSDs; kvm_getproc2() has been in the tree for quite some time so I hope it will just work without the need for excessive "#if __NetBSD_Version__ > t". @ text @$NetBSD$ --- sysdeps/bsd/mem.c.orig 2007-04-27 00:27:34.000000000 +0200 +++ sysdeps/bsd/mem.c @@@@ -81,7 +81,9 @@@@ static int mib [] = { CTL_VM, VM_TOTAL } static int mib [] = { CTL_VM, VM_METER }; #endif -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__) +#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) +static int mib_uvmexp [] = { CTL_VM, VM_UVMEXP2 }; +#elif defined(__OpenBSD__) static int mib_uvmexp [] = { CTL_VM, VM_UVMEXP }; #endif @@@@ -117,7 +119,10 @@@@ glibtop_get_mem_p (glibtop *server, glib { struct vmtotal vmt; size_t length_vmt; -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__) +#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) + struct uvmexp_sysctl uvmexp; + size_t length_uvmexp; +#elif defined(__OpenBSD__) struct uvmexp uvmexp; size_t length_uvmexp; #else @ 1.5 log @Rename libgtop2 to libgtop, to match upstream name. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.2 2006/09/22 15:57:47 drochner Exp $ d3 3 a5 30 --- sysdeps/freebsd/mem.c.orig 2005-12-12 11:09:39.000000000 +0100 +++ sysdeps/freebsd/mem.c @@@@ -28,6 +28,10 @@@@ #include +#if defined(__DragonFly__) +#include +#endif + #include #include #if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) @@@@ -58,6 +62,7 @@@@ static int pageshift; /* log base 2 of /* define pagetok in terms of pageshift */ #define pagetok(size) ((size) << pageshift) +#if !defined(__DragonFly__) /* nlist structure for kernel access */ static struct nlist nlst [] = { #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__) @@@@ -75,6 +80,7 @@@@ static struct nlist nlst [] = { { 0 } #endif }; +#endif /* MIB array for sysctl */ #ifdef __bsdi__ @@@@ -83,7 +89,9 @@@@ static int mib [] = { CTL_VM, VM_TOTAL } d16 1 a16 14 @@@@ -94,10 +102,12 @@@@ glibtop_init_mem_p (glibtop *server) { register int pagesize; +#if !defined(__DragonFly__) if (kvm_nlist (server->machine.kd, nlst) < 0) { glibtop_warn_io_r (server, "kvm_nlist (mem)"); return; } +#endif /* get the page size with "getpagesize" and calculate pageshift * from it */ @@@@ -119,9 +129,15 @@@@ glibtop_get_mem_p (glibtop *server, glib d24 1 a24 1 +#elif defined(__OpenBSD__) a26 63 +#elif defined(__DragonFly__) + struct vmstats vms; + size_t vms_size; #else struct vmmeter vmm; #endif @@@@ -142,11 +158,19 @@@@ glibtop_get_mem_p (glibtop *server, glib * here.] */ /* Get the data from sysctl */ +#if defined(__DragonFly__) + length_vmt = sizeof (vmt); + if (sysctlbyname ("vm.vmtotal", &vmt, &length_vmt, NULL, 0)) { + glibtop_warn_io_r (server, "sysctl (vmt)"); + return; + } +#else length_vmt = sizeof (vmt); if (sysctl (mib, 2, &vmt, &length_vmt, NULL, 0)) { glibtop_warn_io_r (server, "sysctl (vmt)"); return; } +#endif #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__) length_uvmexp = sizeof (uvmexp); @@@@ -154,6 +178,12 @@@@ glibtop_get_mem_p (glibtop *server, glib glibtop_warn_io_r (server, "sysctl (uvmexp)"); return; } +#elif defined(__DragonFly__) + vms_size = sizeof(vms); + if (sysctlbyname("vm.vmstats", &vms, &vms_size, NULL, 0)) { + glibtop_warn_io_r (server, "kvm_read (vms)"); + return; + } #else /* Get the data from kvm_* */ if (kvm_read (server->machine.kd, nlst[1].n_value, @@@@ -163,15 +193,24 @@@@ glibtop_get_mem_p (glibtop *server, glib } #endif +#if defined(__DragonFly__) + if (kinfo_get_vfs_bufspace(&bufspace)) { + glibtop_warn_io_r (server, "kinfo_get_vfs_bufspace"); + return; + } +#else if (kvm_read (server->machine.kd, nlst[0].n_value, &bufspace, sizeof (bufspace)) != sizeof (bufspace)) { glibtop_warn_io_r (server, "kvm_read (bufspace)"); return; } +#endif /* convert memory stats to Kbytes */ -#if defined(__FreeBSD__) +#if defined(__DragonFly__) + v_total_count = vms.v_page_count; +#elif defined(__FreeBSD__) v_total_count = vmm.v_page_count; a27 29 #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__) @@@@ -189,6 +228,9 @@@@ glibtop_get_mem_p (glibtop *server, glib #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__) v_used_count = uvmexp.active + uvmexp.inactive; v_free_count = uvmexp.free; +#elif defined(__DragonFly__) + v_used_count = vms.v_active_count + vms.v_inactive_count; + v_free_count = vms.v_free_count; #else v_used_count = vmm.v_active_count + vmm.v_inactive_count; v_free_count = vmm.v_free_count; @@@@ -198,12 +240,16 @@@@ glibtop_get_mem_p (glibtop *server, glib buf->used = (guint64) pagetok (v_used_count) << LOG1024; buf->free = (guint64) pagetok (v_free_count) << LOG1024; -#ifdef __FreeBSD__ +#if defined(__DragonFly__) + buf->cached = (guint64) pagetok (vms.v_cache_count) << LOG1024; +#elif defined(__FreeBSD__) buf->cached = (guint64) pagetok (vmm.v_cache_count) << LOG1024; #endif #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__) buf->locked = (guint64) pagetok (uvmexp.wired) << LOG1024; +#elif defined(__DragonFly__) + buf->locked = (guint64) pagetok (vms.v_wire_count) << LOG1024; #else buf->locked = (guint64) pagetok (vmm.v_wire_count) << LOG1024; #endif @ 1.4 log @Remove gnome1 packages except as needed for gnucash. Ok'd by jmmv@@ and rh@@ (gnome 1 maintainers). @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.3 2004/04/02 12:13:57 jmmv Exp $ d3 80 a82 8 --- sysdeps/freebsd/procuid.c.orig Mon Nov 26 23:37:59 2001 +++ sysdeps/freebsd/procuid.c Sun Jan 19 23:26:08 2003 @@@@ -94,7 +94,11 @@@@ buf->tpgid = pinfo [0].kp_eproc.e_tpgid; buf->nice = pinfo [0].kp_proc.p_nice; +#if defined(__NetBSD__) && defined(SACTIVE) + buf->priority = 0; d84 5 a88 1 buf->priority = pinfo [0].kp_proc.p_priority; d91 69 a159 2 /* Set the flags for the data we're about to return*/ buf->flags = _glibtop_sysdeps_proc_uid; @ 1.3 log @Finish move of libgtop from devel to sysutils, incomplete due to conflicts... So I now see the package was previously here; the reason for the move is to lighten a bit the devel category, which has lots of packages. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.6 2003/01/21 10:12:31 tron Exp $ @ 1.2 log @Move "libgtop" package to "devel" category. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.1 1998/10/07 13:11:35 agc Exp $ d3 4 a6 3 --- sysdeps/bsd/msg_limits.c 1998/10/06 17:10:11 1.1 +++ sysdeps/bsd/msg_limits.c 1998/10/06 17:10:53 @@@@ -27,7 +27,12 @@@@ d8 3 a10 5 /* #define KERNEL to get declaration of `struct msginfo'. */ +/* You gotta remember those namespaces. OTOH, maybe not ... */ +#ifdef __NetBSD__ +#define _KERNEL d12 1 a12 1 #define KERNEL d15 2 a16 2 #include #include @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of libgtop-0.26 into the Packages Collection. This is part of the GNOME project, and is used to retrieve system information, such as CPU usage etc. This is not yet complete, but is functional to the point where the whole thing compiles and installs. Someone else can pick this up and run with it now. @ text @@ 1.1.1.2 log @Move libgtop to the sysutils category, coming from devel. This is version 1.0.13nb4. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.6 2003/01/21 10:12:31 tron Exp $ d3 3 a5 4 --- sysdeps/freebsd/procuid.c.orig Mon Nov 26 23:37:59 2001 +++ sysdeps/freebsd/procuid.c Sun Jan 19 23:26:08 2003 @@@@ -94,7 +94,11 @@@@ buf->tpgid = pinfo [0].kp_eproc.e_tpgid; d7 5 a11 3 buf->nice = pinfo [0].kp_proc.p_nice; +#if defined(__NetBSD__) && defined(SACTIVE) + buf->priority = 0; d13 1 a13 1 buf->priority = pinfo [0].kp_proc.p_priority; d16 2 a17 2 /* Set the flags for the data we're about to return*/ buf->flags = _glibtop_sysdeps_proc_uid; @