From 4c6e57fabb4f2d00a84b02495aef95464f61f9d9 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Wed, 6 Jul 2011 12:45:04 +0000
Subject: [PATCH] - move away from kinfo_proc2 - fix a few implicit
 declarations while here

---
 sysutils/libstatgrab/Makefile                 |  4 +--
 .../patch-src_libstatgrab_memory_stats_c      | 15 +++++++++
 .../patch-src_libstatgrab_process_stats_c     | 32 +++++++------------
 3 files changed, 29 insertions(+), 22 deletions(-)
 create mode 100644 sysutils/libstatgrab/patches/patch-src_libstatgrab_memory_stats_c

diff --git a/sysutils/libstatgrab/Makefile b/sysutils/libstatgrab/Makefile
index d691d8a47a5..1cd116bcea0 100644
--- a/sysutils/libstatgrab/Makefile
+++ b/sysutils/libstatgrab/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2010/10/19 07:43:01 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2011/07/06 12:45:04 jasper Exp $
 
 COMMENT=	system statistics gathering library
 
 DISTNAME=	libstatgrab-0.15
-REVISION=	1
+REVISION=	2
 CATEGORIES=	sysutils
 
 HOMEPAGE=	http://www.i-scream.org/libstatgrab/
diff --git a/sysutils/libstatgrab/patches/patch-src_libstatgrab_memory_stats_c b/sysutils/libstatgrab/patches/patch-src_libstatgrab_memory_stats_c
new file mode 100644
index 00000000000..f4d5b66da89
--- /dev/null
+++ b/sysutils/libstatgrab/patches/patch-src_libstatgrab_memory_stats_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_libstatgrab_memory_stats_c,v 1.1 2011/07/06 12:45:04 jasper Exp $
+
+Fix implicit declarations of sysconf() and bzero().
+
+--- src/libstatgrab/memory_stats.c.orig	Wed Jul  6 14:37:07 2011
++++ src/libstatgrab/memory_stats.c	Wed Jul  6 14:38:26 2011
+@@ -50,6 +50,8 @@
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #include <sys/unistd.h>
++#include <unistd.h>
++#include <string.h>
+ #endif
+ #ifdef HPUX
+ #include <sys/param.h>
diff --git a/sysutils/libstatgrab/patches/patch-src_libstatgrab_process_stats_c b/sysutils/libstatgrab/patches/patch-src_libstatgrab_process_stats_c
index daf9954d62e..c8614768aef 100644
--- a/sysutils/libstatgrab/patches/patch-src_libstatgrab_process_stats_c
+++ b/sysutils/libstatgrab/patches/patch-src_libstatgrab_process_stats_c
@@ -1,34 +1,27 @@
-$OpenBSD: patch-src_libstatgrab_process_stats_c,v 1.1 2010/01/18 22:03:46 okan Exp $
---- src/libstatgrab/process_stats.c.orig	Mon Oct  9 10:47:58 2006
-+++ src/libstatgrab/process_stats.c	Mon Jan 18 11:19:50 2010
-@@ -105,9 +105,9 @@ sg_process_stats *sg_get_process_stats(int *entries){
+$OpenBSD: patch-src_libstatgrab_process_stats_c,v 1.2 2011/07/06 12:45:04 jasper Exp $
+--- src/libstatgrab/process_stats.c.orig	Mon Oct  9 16:47:58 2006
++++ src/libstatgrab/process_stats.c	Wed Jul  6 14:39:36 2011
+@@ -105,7 +105,7 @@ sg_process_stats *sg_get_process_stats(int *entries){
  	int num, i;
  #endif
  #ifdef ALLBSD
 -	int mib[4];
 +	int mib[6];
  	size_t size;
--	struct kinfo_proc *kp_stats;
-+	struct kinfo_proc2 *kp_stats;
+ 	struct kinfo_proc *kp_stats;
  	int procs, i;
- 	char *proctitle;
- #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
-@@ -347,29 +347,33 @@ sg_process_stats *sg_get_process_stats(int *entries){
- 
- #ifdef ALLBSD
+@@ -349,27 +349,31 @@ sg_process_stats *sg_get_process_stats(int *entries){
  	mib[0] = CTL_KERN;
--	mib[1] = KERN_PROC;
-+	mib[1] = KERN_PROC2;
+ 	mib[1] = KERN_PROC;
  	mib[2] = KERN_PROC_ALL;
 +	mib[3] = 0;
-+	mib[4] = sizeof(struct kinfo_proc2);
++	mib[4] = sizeof(struct kinfo_proc);
 +	mib[5] = 0;
  
 -	if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
 +	if(sysctl(mib, 6, NULL, &size, NULL, 0) < 0) {
  		sg_set_error_with_errno(SG_ERROR_SYSCTL,
--		                        "CTL_KERN.KERN_PROC.KERN_PROC_ALL");
-+		                        "CTL_KERN.KERN_PROC2.KERN_PROC_ALL");
+ 		                        "CTL_KERN.KERN_PROC.KERN_PROC_ALL");
  		return NULL;
  	}
  
@@ -42,15 +35,14 @@ $OpenBSD: patch-src_libstatgrab_process_stats_c,v 1.1 2010/01/18 22:03:46 okan E
  	memset(kp_stats, 0, size);
  
 -	if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
-+	mib[5] = (int)(size / sizeof(struct kinfo_proc2));
++	mib[5] = (int)(size / sizeof(struct kinfo_proc));
 +	if(sysctl(mib, 6, kp_stats, &size, NULL, 0) < 0) {
  		sg_set_error_with_errno(SG_ERROR_SYSCTL,
--		                        "CTL_KERN.KERN_PROC.KERN_PROC_ALL");
-+		                        "CTL_KERN.KERN_PROC2.KERN_PROC_ALL");
+ 		                        "CTL_KERN.KERN_PROC.KERN_PROC_ALL");
  		free(kp_stats);
  		return NULL;
  	}
-+	procs = (int)(size / sizeof(struct kinfo_proc2));
++	procs = (int)(size / sizeof(struct kinfo_proc));
  
  #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
  	kvmd = sg_get_kvm2();