head 1.7; access; symbols pkgsrc-2026Q1:1.7.0.152 pkgsrc-2026Q1-base:1.7 pkgsrc-2025Q4:1.7.0.150 pkgsrc-2025Q4-base:1.7 pkgsrc-2025Q3:1.7.0.148 pkgsrc-2025Q3-base:1.7 pkgsrc-2025Q2:1.7.0.146 pkgsrc-2025Q2-base:1.7 pkgsrc-2025Q1:1.7.0.144 pkgsrc-2025Q1-base:1.7 pkgsrc-2024Q4:1.7.0.142 pkgsrc-2024Q4-base:1.7 pkgsrc-2024Q3:1.7.0.140 pkgsrc-2024Q3-base:1.7 pkgsrc-2024Q2:1.7.0.138 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.136 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.134 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.132 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.130 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.128 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.126 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.124 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.122 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.120 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.118 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.116 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.114 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.112 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.110 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.108 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.104 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.84 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.106 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.102 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.100 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.98 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.96 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.94 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.92 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.90 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.88 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.86 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.82 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.80 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.78 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.76 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.74 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.72 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.70 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.68 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.66 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.64 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.62 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.60 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.7.0.58 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.56 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.54 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.52 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.50 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.48 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.46 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.44 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.42 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.40 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.38 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.36 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.34 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.32 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.30 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.28 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.26 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.24 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.22 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.20 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.18 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.16 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.14 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.12 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.10 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.8 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.6 pkgsrc-2008Q1:1.7.0.4 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.2 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.6.0.2 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.5.0.18 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.16 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.14 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.12 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.10 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.8 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.6 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.4 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.2 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.4.0.8 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.6 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.4 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.2 pkgsrc-2004Q2-base:1.4 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 pkgsrc-base:1.1.1.2 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2007.11.05.19.06.03; author drochner; state Exp; branches; next 1.6; 1.6 date 2007.09.20.21.12.06; author wiz; state Exp; branches; next 1.5; 1.5 date 2005.05.18.22.02.21; author wiz; state dead; branches; next 1.4; 1.4 date 2004.04.02.12.13.57; author jmmv; state Exp; branches; next 1.3; 1.3 date 98.11.01.23.24.18; author tron; state dead; branches; next 1.2; 1.2 date 98.11.01.23.07.30; author tron; state Exp; 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.7 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/proctime.c.orig 2007-04-27 00:27:34.000000000 +0200 +++ sysdeps/bsd/proctime.c @@@@ -40,11 +40,25 @@@@ static const unsigned long _glibtop_sysd #define tv2sec(tv) (((guint64) tv.tv_sec * 1000000) + (guint64) tv.tv_usec) +#if defined(__NetBSD__) +static unsigned int clockrate; +static const int mib [] = { CTL_KERN, KERN_CLOCKRATE }; +#endif + /* Init function. */ void _glibtop_init_proc_time_p (glibtop *server) { +#if defined(__NetBSD__) + struct clockinfo ci; + size_t length; + length = sizeof (ci); + if (sysctl (mib, 2, &ci, &length, NULL, 0) == 0) + clockrate = ci.hz; + if (!clockrate) + clockrate = 1; /* XXX avoid div by 0 later */ +#endif server->sysdeps.proc_time = _glibtop_sysdeps_proc_time | _glibtop_sysdeps_proc_time_user; } @@@@ -56,7 +70,7 @@@@ _glibtop_init_proc_time_p (glibtop *serv * system, and interrupt time usage. */ -#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) +#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)) static void calcru(p, up, sp, ip) @@@@ -114,13 +128,17 @@@@ void glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf, pid_t pid) { +#if defined (__NetBSD__) + struct kinfo_proc2 *pinfo; +#else struct kinfo_proc *pinfo; -#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || (defined(OpenBSD) && (OpenBSD >= 199912)) +#if (defined(OpenBSD) && (OpenBSD >= 199912)) register struct rusage *rup; #else struct user *u_addr = (struct user *)USRSTACK; #endif struct pstats pstats; +#endif /* NetBSD */ int count; glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0); @@@@ -136,7 +154,12 @@@@ glibtop_get_proc_time_p (glibtop *server #endif /* 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; @@@@ -146,14 +169,31 @@@@ glibtop_get_proc_time_p (glibtop *server buf->rtime = pinfo [0].ki_runtime; #elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013) buf->rtime = pinfo [0].kp_proc.p_runtime; +#elif defined (__NetBSD__) + buf->rtime = pinfo[0].p_rtime_sec * clockrate + + pinfo[0].p_rtime_usec * clockrate / 1000000; + buf->frequency = clockrate; #else buf->rtime = tv2sec (pinfo [0].kp_proc.p_rtime); + buf->frequency = 1000000; #endif - buf->frequency = 1000000; buf->flags = _glibtop_sysdeps_proc_time; -#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || (defined(OpenBSD) && (OpenBSD >= 199912)) +#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) + + buf->utime = pinfo[0].p_uutime_sec * 1000000 + + pinfo[0].p_uutime_usec; + buf->stime = pinfo[0].p_ustime_sec * 1000000 + + pinfo[0].p_ustime_usec; + buf->cutime = pinfo[0].p_uctime_sec * 1000000 + + pinfo[0].p_uctime_usec; /* XXX is u+s */ + buf->cstime = 0; /* XXX */ + buf->start_time = pinfo[0].p_ustart_sec; + + buf->flags |= _glibtop_sysdeps_proc_time_user; + +#elif (defined(OpenBSD) && (OpenBSD >= 199912)) glibtop_suid_enter (server); if (kvm_read (server->machine.kd, @ 1.6 log @Rename libgtop2 to libgtop, to match upstream name. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.8 2007/06/25 21:18:52 joerg Exp $ d3 9 a11 8 --- sysdeps/freebsd/proctime.c.orig 2006-04-04 20:01:43.000000000 +0000 +++ sysdeps/freebsd/proctime.c @@@@ -32,6 +32,10 @@@@ #include #endif +#ifdef __NetBSD__ +#include d14 1 a14 2 static const unsigned long _glibtop_sysdeps_proc_time = (1L << GLIBTOP_PROC_TIME_RTIME) + (1L << GLIBTOP_PROC_TIME_FREQUENCY); d16 16 a31 1 @@@@ -58,7 +62,7 @@@@ glibtop_init_proc_time_p (glibtop *serve d35 2 a36 2 -#ifndef __FreeBSD__ +#if !defined(__FreeBSD__) && !defined(__DragonFly__) a37 1 #ifndef __FreeBSD__ d39 12 a50 1 @@@@ -125,7 +129,9 @@@@ glibtop_get_proc_time_p (glibtop *server a53 1 +#if !defined(__DragonFly__) d55 1 a55 1 +#endif d59 2 a60 1 @@@@ -142,11 +148,15 @@@@ glibtop_get_proc_time_p (glibtop *server d63 4 d68 5 a72 8 - if ((pinfo == NULL) || (count != 1)) - glibtop_error_io_r (server, "kvm_getprocs (%d)", pid); + if ((pinfo == NULL) || (count != 1)) { + glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid); + return; + } #if defined(__FreeBSD__) && (__FreeBSD_version >= 500013) a73 2 +#elif defined(__DragonFly__) + buf->rtime = pinfo [0].kp_eproc.e_uticks / 100000; d76 4 d81 2 a82 2 @@@@ -189,16 +199,38 @@@@ glibtop_get_proc_time_p (glibtop *server if ((pinfo [0].ki_flag & P_INMEM)) { a83 13 buf->utime = pinfo [0].ki_runtime; - buf->stime = 0; /* XXX */ + buf->stime = tv2sec (pinfo [0].ki_rusage.ru_stime); buf->cutime = tv2sec (pinfo [0].ki_childtime); - buf->cstime = 0; /* XXX */ +#if __FreeBSD_version >= 600000 + buf->cstime = tv2sec (pinfo [0].ki_rusage_ch.ru_stime); +#else + buf->cstime = 0; +#endif buf->start_time = tv2sec (pinfo [0].ki_start); buf->flags = _glibtop_sysdeps_proc_time_user; } d85 2 a86 1 glibtop_suid_enter (server); d88 2 a89 2 -#elif (__FreeBSD_version <= 500013) +#elif defined(__DragonFly__) d91 8 a98 2 + if ((pinfo [0].kp_proc.p_flag & P_SWAPPEDOUT) == 0) + { d100 4 a103 14 + buf->utime = pinfo[0].kp_eproc.e_uticks / 1000000; + buf->stime = pinfo[0].kp_eproc.e_sticks / 1000000; +#if __DragonFly_version >= 180000 + buf->cutime = 0; /* XXX no idea about this */ + buf->cstime = 0; +#else + buf->cutime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_utime); + buf->cstime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_stime); +#endif + buf->start_time = tv2sec (pinfo[0].kp_thread.td_start); + buf->flags = _glibtop_sysdeps_proc_time_user; + glibtop_suid_leave (server); + } +#elif defined(__FreeBSD__) && (__FreeBSD_version <= 500013) d105 1 a105 2 if ((pinfo [0].kp_proc.p_flag & P_INMEM) && kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc, @ 1.5 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-ab,v 1.4 2004/04/02 12:13:57 jmmv Exp $ d3 23 a25 11 --- sysdeps/freebsd/procsignal.c.orig Sun Feb 13 22:31:39 2000 +++ sysdeps/freebsd/procsignal.c Wed Jan 3 00:42:45 2001 @@@@ -70,7 +70,9 @@@@ /* signal: mask of pending signals. * pinfo [0].kp_proc.p_siglist */ -#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) +#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000) + buf->signal [0] = pinfo [0].kp_proc.p_sigctx.ps_siglist.__bits[0]; +#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) buf->signal [0] = pinfo [0].kp_proc.p_siglist.__bits[0]; d27 25 a51 10 buf->signal [0] = pinfo [0].kp_proc.p_siglist; @@@@ -79,7 +81,9 @@@@ /* blocked: mask of blocked signals. * pinfo [0].kp_proc.p_sigmask */ -#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) +#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000) + buf->blocked [0] = pinfo [0].kp_proc.p_sigctx.ps_sigmask.__bits[0]; +#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) buf->blocked [0] = pinfo [0].kp_proc.p_sigmask.__bits[0]; d53 42 a94 23 buf->blocked [0] = pinfo [0].kp_proc.p_sigmask; @@@@ -88,7 +92,9 @@@@ /* sigignore: mask of ignored signals. * pinfo [0].kp_proc.p_sigignore */ -#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) +#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000) + buf->sigignore [0] = pinfo [0].kp_proc.p_sigctx.ps_sigignore.__bits[0]; +#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore.__bits[0]; #else buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore; @@@@ -97,7 +103,9 @@@@ /* sigcatch: mask of caught signals. * pinfo [0].kp_proc.p_sigcatch */ -#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) +#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000) + buf->sigcatch [0] = pinfo [0].kp_proc.p_sigctx.ps_sigcatch.__bits[0]; +#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch.__bits[0]; #else buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch; @ 1.4 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-ab,v 1.8 2001/01/02 23:45:33 tron Exp $ @ 1.3 log @Move "libgtop" package to "devel" category. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 1998/11/01 23:07:30 tron Exp $ d3 46 a48 18 --- sysdeps/bsd/open.c.orig Mon Aug 24 20:14:49 1998 +++ sysdeps/bsd/open.c Sun Nov 1 23:40:07 1998 @@@@ -61,7 +61,15 @@@@ server->machine.gid = getgid (); server->machine.egid = getegid (); +#ifdef __NetBSD__ +#ifdef __NetBSD_Version__ + server->os_version_code = __NetBSD_Version__; +#else + server->os_version_code = 103000000; +#endif +#else server->os_version_code = __FreeBSD_version; +#endif /* Setup machine-specific data */ server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open"); @ 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 @Initial revision @ text @d3 3 a5 5 Make this compile under NetBSD as well. --- sysdeps/bsd/open.c 1998/10/06 16:01:28 1.1 +++ sysdeps/bsd/open.c 1998/10/06 16:02:06 @@@@ -61,7 +61,11 @@@@ d10 1 d12 3 @ 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-ab,v 1.8 2001/01/02 23:45:33 tron Exp $ d3 16 a18 46 --- sysdeps/freebsd/procsignal.c.orig Sun Feb 13 22:31:39 2000 +++ sysdeps/freebsd/procsignal.c Wed Jan 3 00:42:45 2001 @@@@ -70,7 +70,9 @@@@ /* signal: mask of pending signals. * pinfo [0].kp_proc.p_siglist */ -#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) +#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000) + buf->signal [0] = pinfo [0].kp_proc.p_sigctx.ps_siglist.__bits[0]; +#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) buf->signal [0] = pinfo [0].kp_proc.p_siglist.__bits[0]; #else buf->signal [0] = pinfo [0].kp_proc.p_siglist; @@@@ -79,7 +81,9 @@@@ /* blocked: mask of blocked signals. * pinfo [0].kp_proc.p_sigmask */ -#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) +#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000) + buf->blocked [0] = pinfo [0].kp_proc.p_sigctx.ps_sigmask.__bits[0]; +#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) buf->blocked [0] = pinfo [0].kp_proc.p_sigmask.__bits[0]; #else buf->blocked [0] = pinfo [0].kp_proc.p_sigmask; @@@@ -88,7 +92,9 @@@@ /* sigignore: mask of ignored signals. * pinfo [0].kp_proc.p_sigignore */ -#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) +#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000) + buf->sigignore [0] = pinfo [0].kp_proc.p_sigctx.ps_sigignore.__bits[0]; +#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore.__bits[0]; #else buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore; @@@@ -97,7 +103,9 @@@@ /* sigcatch: mask of caught signals. * pinfo [0].kp_proc.p_sigcatch */ -#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) +#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000) + buf->sigcatch [0] = pinfo [0].kp_proc.p_sigctx.ps_sigcatch.__bits[0]; +#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch.__bits[0]; #else buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch; @