From 9fa2b19bdd7ac78c83831f12b0cc123c2282046b Mon Sep 17 00:00:00 2001
From: okan <okan@openbsd.org>
Date: Tue, 19 Jan 2010 15:25:21 +0000
Subject: [PATCH] adapt for KERN_PROC2; regen plist

ok sthen@
---
 sysutils/skill/Makefile                        |  4 ++--
 sysutils/skill/patches/patch-machdep_bsd-44_c  | 13 +++++++------
 sysutils/skill/patches/patch-machdep_nbsd-44_c | 12 ++++++++++++
 sysutils/skill/pkg/PLIST                       |  6 +++---
 4 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 sysutils/skill/patches/patch-machdep_nbsd-44_c

diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile
index af7fb194351..2a44201dcf3 100644
--- a/sysutils/skill/Makefile
+++ b/sysutils/skill/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2007/09/15 21:14:02 merdely Exp $
+# $OpenBSD: Makefile,v 1.15 2010/01/19 15:25:21 okan Exp $
 
 COMMENT=	signal or reprioritize specified processes
 
 VERSION=		4.1
 DISTNAME=		skill-${VERSION}
-PKGNAME=		skill-${VERSION}p2
+PKGNAME=		skill-${VERSION}p3
 CATEGORIES=     	sysutils
 
 MAINTAINER=		Jakob Schlyter <jakob@openbsd.org>
diff --git a/sysutils/skill/patches/patch-machdep_bsd-44_c b/sysutils/skill/patches/patch-machdep_bsd-44_c
index ab487fa2199..6fc526bc16a 100644
--- a/sysutils/skill/patches/patch-machdep_bsd-44_c
+++ b/sysutils/skill/patches/patch-machdep_bsd-44_c
@@ -1,8 +1,8 @@
-$OpenBSD: patch-machdep_bsd-44_c,v 1.1 2002/09/08 12:46:03 jakob Exp $
+$OpenBSD: patch-machdep_bsd-44_c,v 1.2 2010/01/19 15:25:21 okan Exp $
 
---- machdep/bsd-44.c.orig	Fri Apr  5 11:17:21 2002
-+++ machdep/bsd-44.c	Wed Apr 24 21:31:28 2002
-@@ -38,11 +38,54 @@ static char rcsid[] = "$Id: bsd-44.c,v 1
+--- machdep/bsd-44.c.orig	Thu Apr  4 23:17:21 2002
++++ machdep/bsd-44.c	Mon Jan 18 16:49:30 2010
+@@ -38,12 +38,55 @@ static char rcsid[] = "$Id: bsd-44.c,v 1.17 2002/03/21
  #endif
  #endif
  
@@ -25,7 +25,7 @@ $OpenBSD: patch-machdep_bsd-44_c,v 1.1 2002/09/08 12:46:03 jakob Exp $
  #include <string.h>
 -#include <signal.h>
 +#include <unistd.h>
-+
+ 
 +#ifndef	P_WEXIT		/* backward compatibility */
 +#define	P_WEXIT	SWEXIT
 +#endif
@@ -56,9 +56,10 @@ $OpenBSD: patch-machdep_bsd-44_c,v 1.1 2002/09/08 12:46:03 jakob Exp $
 +#define	PROC_UID(kprocp)	kprocp->kp_eproc.e_ucred.cr_uid
 +#endif
 +
- 
++
  /*
   * Define SigNames, NSig, and TtyDevDir here; they are used by other
+  * routines and must be global.  Everyone seems to have their own
 @@ -150,33 +193,6 @@ MdepAction(pid)
  NULL_REGEX_FUNCS
  
diff --git a/sysutils/skill/patches/patch-machdep_nbsd-44_c b/sysutils/skill/patches/patch-machdep_nbsd-44_c
new file mode 100644
index 00000000000..13e73e0ab33
--- /dev/null
+++ b/sysutils/skill/patches/patch-machdep_nbsd-44_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-machdep_nbsd-44_c,v 1.1 2010/01/19 15:25:21 okan Exp $
+--- machdep/nbsd-44.c.orig	Mon Jan 18 16:52:28 2010
++++ machdep/nbsd-44.c	Mon Jan 18 16:53:28 2010
+@@ -211,7 +211,7 @@ static	int	pidmapsiz = sizeof(pidmap) / sizeof(pidmap[
+ #endif
+ #endif	/* __FreeBSD__ */
+ 
+-#if defined(__NetBSD_Version__) && defined(KERN_PROC2)
++#if defined(KERN_PROC2)
+ #define	_SYSCTL_ARG	KERN_PROC2
+ #define	_SYSCTL_NMIB	6
+ #define	_SYSCTL_PROC	kinfo_proc2
diff --git a/sysutils/skill/pkg/PLIST b/sysutils/skill/pkg/PLIST
index 18c4fb815c7..ef8d2efb23a 100644
--- a/sysutils/skill/pkg/PLIST
+++ b/sysutils/skill/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:39:33 espie Exp $
-bin/skill
-bin/snice
+@comment $OpenBSD: PLIST,v 1.4 2010/01/19 15:25:21 okan Exp $
+@bin bin/skill
+@bin bin/snice
 @man man/man1/skill.1
 @man man/man1/snice.1