head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.44
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.42
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.40
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.38
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.36
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.34
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.32
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.30
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.28
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.26
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.24
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.22
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.20
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.18
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.16
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.14
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.12
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.10
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.8
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.6
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.4
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.2
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.1.0.10
	pkgsrc-2004Q4-base:1.1
	pkgsrc-2004Q3:1.1.0.8
	pkgsrc-2004Q3-base:1.1
	pkgsrc-2004Q2:1.1.0.6
	pkgsrc-2004Q2-base:1.1
	pkgsrc-2004Q1:1.1.0.4
	pkgsrc-2004Q1-base:1.1
	pkgsrc-2003Q4:1.1.0.2
	pkgsrc-2003Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2005.01.03.14.32.33;	author wiz;	state dead;
branches;
next	1.1;

1.1
date	2003.08.14.20.10.19;	author jmc;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove KDE2 packages (and their dependencies) as proposed on tech-pkg.
@
text
@$NetBSD: patch-fe,v 1.1 2003/08/14 20:10:19 jmc Exp $

--- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig	2003-08-14 14:27:23.000000000 +0000
+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c	2003-08-14 14:47:10.000000000 +0000
@@@@ -37,6 +37,10 @@@@
 #include <sys/user.h>
 #include <unistd.h>
 
+#if defined __NetBSD__
+#include <sys/param.h>
+#endif
+
 #include "../../gui/SignalIDs.h"
 #include "Command.h"
 #include "ProcessList.h"
@@@@ -164,9 +168,12 @@@@
 	
 	ProcessInfo* ps;
 	struct passwd* pwent;
-	int mib[4];
+	int mib[6];
 	struct kinfo_proc p;
 	size_t len;
+#if defined(__NetBSD__) && (__NetBSD_Version__ > 106120000)
+	struct kinfo_proc2 p2;
+#endif
 
 	if ((ps = findProcessInList(pid)) == 0)
 	{
@@@@ -187,7 +194,14 @@@@
 	len = sizeof (p);
 	if (sysctl(mib, 4, &p, &len, NULL, 0) == -1 || !len)
 		return -1;
-
+#if defined(__NetBSD__) && (__NetBSD_Version__ > 106120000)
+	mib[1] = KERN_PROC2;
+	mib[5] = sizeof(struct kinfo_proc2);
+	mib[6] = 1;
+	len = sizeof(p2);
+	if (sysctl(mib, 6, &p2, &len, NULL, 0) == -1 || !len)
+		return -1;
+#endif
 #if __FreeBSD_version >= 500015
         ps->pid       = p.ki_pid;
         ps->ppid      = p.ki_ppid;
@@@@ -200,7 +214,11 @@@@
         ps->ppid      = p.kp_eproc.e_ppid;
         ps->uid       = p.kp_eproc.e_ucred.cr_uid;
         ps->gid       = p.kp_eproc.e_pgid;
+#if defined(__NetBSD__) && (__NetBSD_Version__ > 106120000)
+	ps->priority  = p2.p_priority;
+#else
         ps->priority  = p.kp_proc.p_priority;
+#endif
         ps->niceLevel = p.kp_proc.p_nice;
 #endif
 
@


1.1
log
@Patch ksysguardd so it works on post SA merged NetBSD (p_priority isn't in
struct proc anymore so pull it from kinfo_proc2 instead)
@
text
@d1 1
a1 1
$NetBSD$
@