head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.152 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.150 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.148 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.146 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.144 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.142 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.140 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.138 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.136 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.134 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.132 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.130 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.128 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.126 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.124 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.122 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.120 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.118 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.116 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.114 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.112 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.110 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.108 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.104 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.84 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.106 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.102 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.100 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.98 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.96 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.94 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.92 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.90 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.88 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.86 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.82 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.80 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.78 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.76 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.74 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.72 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.70 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.68 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.66 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.64 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.62 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.60 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.58 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.56 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.54 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.52 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.50 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.48 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.46 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.44 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.42 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.40 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.38 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.36 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.34 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.32 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.30 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.28 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.26 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.24 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.22 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.20 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.18 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.16 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.14 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.12 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.10 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.8 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.6 pkgsrc-2008Q1:1.5.0.4 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.2 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.4.0.2 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2-base:1.3; locks; strict; comment @# @; 1.5 date 2007.11.05.19.06.05; author drochner; state Exp; branches; next 1.4; 1.4 date 2007.09.20.21.12.11; author wiz; state Exp; branches; next 1.3; 1.3 date 98.11.01.23.24.19; author tron; state dead; branches; next 1.2; 1.2 date 98.11.01.23.07.31; author tron; state Exp; branches; next 1.1; 1.1 date 98.10.18.22.11.41; author tron; state Exp; branches; next ; desc @@ 1.5 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/procsignal.c.orig 2007-04-27 00:27:34.000000000 +0200 +++ sysdeps/bsd/procsignal.c @@@@ -51,7 +51,11 @@@@ glibtop_get_proc_signal_p (glibtop *serv glibtop_proc_signal *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_SIGNAL), 0); @@@@ -62,7 +66,12 @@@@ glibtop_get_proc_signal_p (glibtop *serv 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; @@@@ -75,6 +84,10 @@@@ glibtop_get_proc_signal_p (glibtop *serv #define PROC_SIGIGNORE ki_sigignore #define PROC_SIGCATCH ki_sigcatch +#elif defined(__NetBSD__) + +/* nothing for now */ + #else #define PROC_SIGLIST kp_proc.p_siglist @@@@ -87,6 +100,9 @@@@ glibtop_get_proc_signal_p (glibtop *serv /* signal: mask of pending signals. * pinfo [0].kp_proc.p_siglist */ +#if defined(__NetBSD__) + buf->signal[0] = pinfo[0].p_siglist.__bits[0]; +#else #if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000) buf->signal [0] = pinfo [0].kp_proc.p_sigctx.ps_siglist.__bits[0]; #elif (defined(__NetBSD__) && (NSIG > 32)) || \ @@@@ -95,10 +111,14 @@@@ glibtop_get_proc_signal_p (glibtop *serv #else buf->signal [0] = pinfo [0].kp_proc.p_siglist; #endif +#endif /* NetBSD */ /* blocked: mask of blocked signals. * pinfo [0].kp_proc.p_sigmask */ +#if defined(__NetBSD__) + buf->blocked[0] = pinfo[0].p_sigmask.__bits[0]; +#else #if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000) buf->blocked [0] = pinfo [0].kp_proc.p_sigctx.ps_sigmask.__bits[0]; #elif (defined(__NetBSD__) && (NSIG > 32)) || \ @@@@ -107,10 +127,14 @@@@ glibtop_get_proc_signal_p (glibtop *serv #else buf->blocked [0] = pinfo [0].kp_proc.p_sigmask; #endif +#endif /* NetBSD */ /* sigignore: mask of ignored signals. * pinfo [0].kp_proc.p_sigignore */ +#if defined(__NetBSD__) + buf->sigignore[0] = pinfo[0].p_sigignore.__bits[0]; +#else #if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000) buf->sigignore [0] = pinfo [0].kp_proc.p_sigctx.ps_sigignore.__bits[0]; #elif (defined(__NetBSD__) && (NSIG > 32)) || \ @@@@ -119,10 +143,14 @@@@ glibtop_get_proc_signal_p (glibtop *serv #else buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore; #endif +#endif /* NetBSD */ /* sigcatch: mask of caught signals. * pinfo [0].kp_proc.p_sigcatch */ +#if defined(__NetBSD__) + buf->sigcatch[0] = pinfo[0].p_sigcatch.__bits[0]; +#else #if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000) buf->sigcatch [0] = pinfo [0].kp_proc.p_sigctx.ps_sigcatch.__bits[0]; #elif (defined(__NetBSD__) && (NSIG > 32)) || \ @@@@ -131,6 +159,7 @@@@ glibtop_get_proc_signal_p (glibtop *serv #else buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch; #endif +#endif /* NetBSD */ buf->flags = _glibtop_sysdeps_proc_signal; } @ 1.4 log @Rename libgtop2 to libgtop, to match upstream name. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.2 2007/04/04 18:53:45 gdt Exp $ d3 3 a5 3 --- sysdeps/freebsd/procsignal.c.orig 2005-12-12 10:09:39.000000000 +0000 +++ sysdeps/freebsd/procsignal.c @@@@ -53,7 +53,11 @@@@ glibtop_get_proc_signal_p (glibtop *serv d9 1 a9 1 +#if defined(KERN_PROC2) d17 1 a17 1 @@@@ -64,7 +68,12 @@@@ glibtop_get_proc_signal_p (glibtop *serv d21 1 a21 1 +#if defined(KERN_PROC2) d23 1 a23 1 + sizeof(struct kinfo_proc2), &count); d30 1 a30 1 @@@@ -77,6 +86,13 @@@@ glibtop_get_proc_signal_p (glibtop *serv d34 1 a34 1 +#elif defined(KERN_PROC2) d36 1 a36 4 +#define PROC_SIGLIST p_siglist +#define PROC_SIGMASK p_sigmask +#define PROC_SIGIGNORE p_sigignore +#define PROC_SIGCATCH p_sigcatch d41 1 a41 1 @@@@ -89,11 +105,12 @@@@ glibtop_get_proc_signal_p (glibtop *serv d45 7 a51 10 -#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)) +#if (defined(__NetBSD__) && (NSIG > 32)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 400011)) || \ + defined(__DragonFly__) buf->signal [0] = pinfo [0].PROC_SIGLIST.__bits[0]; +#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000) + buf->signal [0] = pinfo [0].kp_proc.p_sigctx.ps_siglist.__bits[0]; d55 2 a56 1 @@@@ -101,11 +118,12 @@@@ glibtop_get_proc_signal_p (glibtop *serv d60 7 a66 10 -#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)) +#if (defined(__NetBSD__) && (NSIG > 32)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 400011)) || \ + defined(__DragonFly__) buf->blocked [0] = pinfo [0].PROC_SIGMASK.__bits[0]; +#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000) + buf->blocked [0] = pinfo [0].kp_proc.p_sigctx.ps_sigmask.__bits[0]; d70 2 a71 1 @@@@ -113,11 +131,12 @@@@ glibtop_get_proc_signal_p (glibtop *serv d75 7 a81 10 -#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)) +#if (defined(__NetBSD__) && (NSIG > 32)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 400011)) || \ + defined(__DragonFly__) buf->sigignore [0] = pinfo [0].PROC_SIGIGNORE.__bits[0]; +#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000) + buf->sigignore [0] = pinfo [0].kp_proc.p_sigctx.ps_sigignore.__bits[0]; d85 2 a86 1 @@@@ -125,11 +144,12 @@@@ glibtop_get_proc_signal_p (glibtop *serv d90 7 a96 10 -#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)) +#if (defined(__NetBSD__) && (NSIG > 32)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 400011)) || \ + defined(__DragonFly__) buf->sigcatch [0] = pinfo [0].PROC_SIGCATCH.__bits[0]; +#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000) + buf->sigcatch [0] = pinfo [0].kp_proc.p_sigctx.ps_sigcatch.__bits[0]; d100 4 @ 1.3 log @Move "libgtop" package to "devel" category. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.2 1998/11/01 23:07:31 tron Exp $ d3 42 a44 3 --- sysdeps/bsd/procsignal.c.orig Wed Sep 9 01:54:54 1998 +++ sysdeps/bsd/procsignal.c Sun Nov 1 23:20:05 1998 @@@@ -63,22 +63,38 @@@@ d48 14 a61 6 +#if defined(__NetBSD__) && (NSIG > 32) + buf->signal = pinfo [0].kp_proc.p_siglist.__bits[0]; +#else buf->signal = pinfo [0].kp_proc.p_siglist; +#endif d65 14 a78 7 - buf->blocked = pinfo [0].kp_proc.p_sigmask; +#if defined(__NetBSD__) && (NSIG > 32) + buf->signal = pinfo [0].kp_proc.p_sigmask.__bits[0]; +#else + buf->signal = pinfo [0].kp_proc.p_sigmask; +#endif d82 14 a95 7 - buf->sigignore = pinfo [0].kp_proc.p_sigignore; +#if defined(__NetBSD__) && (NSIG > 32) + buf->signal = pinfo [0].kp_proc.p_sigignore.__bits[0]; +#else + buf->signal = pinfo [0].kp_proc.p_sigignore; +#endif d99 13 a111 9 - buf->sigcatch = pinfo [0].kp_proc.p_sigcatch; +#if defined(__NetBSD__) && (NSIG > 32) + buf->signal = pinfo [0].kp_proc.p_sigcatch.__bits[0]; +#else + buf->signal = pinfo [0].kp_proc.p_sigcatch; +#endif buf->flags = _glibtop_sysdeps_proc_signal; } @ 1.2 log @Make this package build under 1.3.2, fixes PR pkg/6388 by Clifford Wright. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Make this package build, at least under -current. @ text @d4 2 a5 2 +++ sysdeps/bsd/procsignal.c Sun Oct 18 23:59:26 1998 @@@@ -63,22 +63,22 @@@@ d9 1 a9 1 - buf->signal = pinfo [0].kp_proc.p_siglist; d11 3 d19 5 a23 1 + buf->blocked = pinfo [0].kp_proc.p_sigmask.__bits[0]; d29 5 a33 1 + buf->sigignore = pinfo [0].kp_proc.p_sigignore.__bits[0]; d39 5 a43 1 + buf->sigcatch = pinfo [0].kp_proc.p_sigcatch.__bits[0]; @