Sync DragonFly support with reality.

5 files changed, 107 insertions, 1 deletions

diff --git a/devel/libstatgrab/distinfo b/devel/libstatgrab/distinfo
index e2d5515860a..57c3a3c6827 100644
--- a/devel/libstatgrab/distinfo
+++ b/devel/libstatgrab/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.6 2005/11/01 21:48:39 rillig Exp $
+$NetBSD: distinfo,v 1.7 2006/06/12 16:30:33 joerg Exp $
 
 SHA1 (libstatgrab-0.12.tar.gz) = 2a1b7c641f7f088997cc1b07b4967d064b1e4d67
 RMD160 (libstatgrab-0.12.tar.gz) = acb53a4339e85471c6ab87b413998df1bfd7a92f
 Size (libstatgrab-0.12.tar.gz) = 429711 bytes
 SHA1 (patch-aa) = ff0ec4c9386b0ba47c6cc5306433918e64183fc2
+SHA1 (patch-ab) = 38776d375ab92a9d611a86126b8d2983a31d0c9d
+SHA1 (patch-ac) = 5ec9924671d352aa48a446810ff5fd640bda0a8e
+SHA1 (patch-ad) = 150543e9a0573cc52e4862c11b5836d47551b0cc
+SHA1 (patch-ae) = b90c82f7993dcefa42f8fe52a0d66622b7bfefe2
diff --git a/devel/libstatgrab/patches/patch-ab b/devel/libstatgrab/patches/patch-ab
new file mode 100644
index 00000000000..e212f8de2f4
--- /dev/null
+++ b/devel/libstatgrab/patches/patch-ab
@@ -0,0 +1,61 @@
+$NetBSD: patch-ab,v 1.3 2006/06/12 16:30:33 joerg Exp $
+
+--- src/libstatgrab/cpu_stats.c.orig	2006-06-12 16:09:20.000000000 +0000
++++ src/libstatgrab/cpu_stats.c
+@@ -35,7 +35,10 @@
+ #if defined(LINUX) || defined(CYGWIN)
+ #include <stdio.h>
+ #endif
+-#if defined(FREEBSD) || defined(DFBSD)
++#if defined(DFBSD)
++#include <sys/param.h>
++#include <kinfo.h>
++#elif defined(FREEBSD)
+ #include <sys/sysctl.h>
+ #include <sys/dkstat.h>
+ #endif
+@@ -79,6 +82,8 @@ sg_cpu_stats *sg_get_cpu_stats(){
+ #endif
+ #ifdef NETBSD
+ 	u_int64_t cp_time[CPUSTATES];
++#elif defined(DFBSD)
++	struct kinfo_cputime cp_time;
+ #else
+ 	long cp_time[CPUSTATES];
+ #endif
+@@ -152,7 +157,12 @@ sg_cpu_stats *sg_get_cpu_stats(){
+ 	cpu_now.total=cpu_now.user+cpu_now.nice+cpu_now.kernel+cpu_now.idle;
+ #endif
+ #ifdef ALLBSD
+-#if defined(FREEBSD) || defined(DFBSD)
++#if defined(DFBSD)
++	if (kinfo_get_sched_cputime(&cp_time)) {
++		sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME, "kern.cp_time");
++		return NULL;
++  	}
++#elif defined(FREEBSD)
+ 	size = sizeof cp_time;
+ 	if (sysctlbyname("kern.cp_time", &cp_time, &size, NULL, 0) < 0){
+ 		sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME, "kern.cp_time");
+@@ -178,12 +188,21 @@ sg_cpu_stats *sg_get_cpu_stats(){
+ 	}
+ #endif
+ 
++#ifdef DFBSD
++	cpu_now.user=cp_time.cp_user;
++	cpu_now.nice=cp_time.cp_nice;
++	cpu_now.kernel=cp_time.cp_sys + cp_time.cp_intr;
++	cpu_now.idle=cp_time.cp_idle;
++	
++	cpu_now.total=cpu_now.user+cpu_now.nice+cpu_now.kernel+cpu_now.idle;
++#else
+ 	cpu_now.user=cp_time[CP_USER];
+ 	cpu_now.nice=cp_time[CP_NICE];
+ 	cpu_now.kernel=cp_time[CP_SYS];
+ 	cpu_now.idle=cp_time[CP_IDLE];
+ 	
+ 	cpu_now.total=cpu_now.user+cpu_now.nice+cpu_now.kernel+cpu_now.idle;
++#endif
+ 
+ #endif
+ 
diff --git a/devel/libstatgrab/patches/patch-ac b/devel/libstatgrab/patches/patch-ac
new file mode 100644
index 00000000000..bf0a2cd690b
--- /dev/null
+++ b/devel/libstatgrab/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2006/06/12 16:30:33 joerg Exp $
+
+--- src/libstatgrab/disk_stats.c.orig	2006-06-12 16:18:08.000000000 +0000
++++ src/libstatgrab/disk_stats.c
+@@ -64,7 +64,9 @@
+ #include <sys/mount.h>
+ #endif
+ #if defined(FREEBSD) || defined(DFBSD)
++#if !defined(DFBSD)
+ #include <sys/dkstat.h>
++#endif
+ #include <devstat.h>
+ #define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \
+ 			"ufs", "mfs", "nfs"}
diff --git a/devel/libstatgrab/patches/patch-ad b/devel/libstatgrab/patches/patch-ad
new file mode 100644
index 00000000000..23c28b41a06
--- /dev/null
+++ b/devel/libstatgrab/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/06/12 16:30:33 joerg Exp $
+
+--- src/saidar/saidar.c.orig	2006-06-12 16:23:53.000000000 +0000
++++ src/saidar/saidar.c
+@@ -441,8 +441,6 @@ int main(int argc, char **argv){
+ 
+ 	WINDOW *window;
+ 
+-	extern int errno;
+-
+ 	int delay=2;
+ 
+ 	sg_init();
diff --git a/devel/libstatgrab/patches/patch-ae b/devel/libstatgrab/patches/patch-ae
new file mode 100644
index 00000000000..4fe5eace311
--- /dev/null
+++ b/devel/libstatgrab/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2006/06/12 16:30:33 joerg Exp $
+
+--- src/libstatgrab/Makefile.in.orig	2006-06-12 16:24:29.000000000 +0000
++++ src/libstatgrab/Makefile.in
+@@ -62,6 +62,9 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libstatgrab_la_LIBADD =
++.if ${OPSYS} == "DragonFly"
++libstatgrab_la_LIBADD += -lkinfo
++.endif
+ am__libstatgrab_la_SOURCES_DIST = cpu_stats.c disk_stats.c \
+ 	load_stats.c memory_stats.c network_stats.c os_info.c \
+ 	page_stats.c process_stats.c swap_stats.c user_stats.c tools.c \