head 1.5; access; symbols pkgsrc-2023Q4:1.5.0.54 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.52 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.50 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.48 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.46 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.44 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.42 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.40 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.38 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.36 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.34 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.32 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.30 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.28 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.24 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.4 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.26 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.22 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.20 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.18 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.16 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.14 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.12 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.10 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.8 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.6 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.2 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.4.0.80 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.78 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.76 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.74 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.72 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.70 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.68 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.66 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.64 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.62 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.60 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.58 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.56 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.54 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.52 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.50 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.48 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.46 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.44 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.42 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.40 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.38 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.36 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.34 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.32 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.30 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.28 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.26 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.24 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.22 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.20 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.18 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.16 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.14 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.12 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.10 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.8 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.6 pkgsrc-2008Q1:1.4.0.4 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.2 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.2.0.18 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.16 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.14 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.12 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.10 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.8 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.6 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.4 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.1.1.0.8 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.6 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.4 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.2 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2017.06.23.16.42.05; author kamil; state Exp; branches; next 1.4; commitid IKgDmhFKvn0NawWz; 1.4 date 2007.11.05.19.06.05; author drochner; state Exp; branches; next 1.3; 1.3 date 2007.09.20.21.12.11; author wiz; state Exp; branches; next 1.2; 1.2 date 2005.05.18.22.02.21; author wiz; state dead; branches; next 1.1; 1.1 date 2004.04.02.12.10.18; author jmmv; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.04.02.12.10.18; author jmmv; state Exp; branches; next ; desc @@ 1.5 log @Correct build failure on NetBSD 8.99.1 Fallout from removal. @ text @$NetBSD: patch-an,v 1.4 2007/11/05 19:06:05 drochner Exp $ --- sysdeps/bsd/procstate.c.orig 2011-06-01 15:40:47.000000000 +0000 +++ sysdeps/bsd/procstate.c @@@@ -26,7 +26,7 @@@@ #include -#if !defined(__OpenBSD__) +#if !defined(__OpenBSD__) && !defined(__NetBSD__) /* && (!defined __bsdi__) */ #include #endif @@@@ -54,7 +54,11 @@@@ glibtop_get_proc_state_p (glibtop *serve glibtop_proc_state *buf, pid_t pid) { +#if defined(__NetBSD__) + struct kinfo_proc2 *pinfo; +#else struct kinfo_proc *pinfo; +#endif int count = 0; glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_STATE), 0); @@@@ -65,7 +69,12 @@@@ glibtop_get_proc_state_p (glibtop *serve if (pid == 0) return; /* Get the process information */ +#if defined(__NetBSD__) + pinfo = kvm_getproc2 (server->machine.kd, KERN_PROC_PID, pid, + sizeof (*pinfo), &count); +#else pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); +#endif if ((pinfo == NULL) || (count != 1)) { glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid); return; @@@@ -79,6 +88,13 @@@@ glibtop_get_proc_state_p (glibtop *serve #define PROC_RGID ki_rgid #define PROC_STAT ki_stat +#elif defined(__NetBSD__) + +#define PROC_COMM p_comm +#define PROC_SVUID p_svuid +#define PROC_SVGID p_svgid +#define PROC_STAT p_stat + #else #define PROC_COMM kp_proc.p_comm #define PROC_SVUID kp_eproc.e_pcred.p_svuid @ 1.4 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 @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- sysdeps/bsd/procstate.c.orig 2007-04-27 00:27:34.000000000 +0200 d5 9 @ 1.3 log @Rename libgtop2 to libgtop, to match upstream name. @ text @d1 1 a1 1 $NetBSD: patch-an,v 1.1 2006/02/28 23:48:12 joerg Exp $ d3 28 a30 3 --- sysdeps/freebsd/procstate.c.orig 2004-09-24 22:49:06.000000000 +0000 +++ sysdeps/freebsd/procstate.c @@@@ -80,6 +80,14 @@@@ glibtop_get_proc_state_p (glibtop *serve d34 6 a39 7 +#elif defined(__DragonFly__) +#define PROC_COMM kp_thread.td_comm +#define PROC_SVUID kp_eproc.e_ucred.cr_svuid +#define PROC_SVGID kp_eproc.e_ucred.cr_svgid +#define PROC_RUID kp_eproc.e_ucred.cr_ruid +#define PROC_RGID kp_eproc.e_ucred.cr_rgid +#define PROC_STAT kp_proc.p_stat @ 1.2 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-an,v 1.1 2004/04/02 12:10:18 jmmv Exp $ d3 5 a7 12 --- 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 d9 11 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-an,v 1.1 2000/05/02 00:27:36 fredb Exp $ @ 1.1.1.1 log @Move libgtop to the sysutils category, coming from devel. This is version 1.0.13nb4. @ text @@