Fix Build on CURRENT.

Submitted by:   Andy Fawcett <tap@hex.athame.co.uk>
Reported by:    many
Tested by:      leafy@leafy.idv.tw (CURRENT),  Andy Fawcett (4.7 5.0R)

6 files changed, 159 insertions, 0 deletions

diff --git a/sysutils/kdf/files/patch-ksimcpu.cpp b/sysutils/kdf/files/patch-ksimcpu.cpp
new file mode 100644
index 000000000000..0dbf177de206
--- /dev/null
+++ b/sysutils/kdf/files/patch-ksimcpu.cpp
@@ -0,0 +1,29 @@
+Index: ksim/monitors/cpu/ksimcpu.cpp
+===================================================================
+RCS file: /home/kde/kdeutils/ksim/monitors/cpu/ksimcpu.cpp,v
+retrieving revision 1.21
+diff -u -5 -p -d -r1.21 ksimcpu.cpp
+--- ksim/monitors/cpu/ksimcpu.cpp	13 May 2002 14:47:51 -0000	1.21
++++ ksim/monitors/cpu/ksimcpu.cpp	3 Mar 2003 07:38:33 -0000
+@@ -40,12 +40,20 @@
+ #include <chart.h>
+ #include <progress.h>
+ #include <themetypes.h>
+ 
+ #ifdef Q_OS_BSD4
+-#include <sys/dkstat.h>
+ #include <sys/param.h>
++#ifdef Q_OS_FREEBSD
++#if __FreeBSD_version < 500101
++#include <sys/dkstat.h>
++#else
++#include <sys/resource.h>
++#endif
++#else
++#include <sys/dkstat.h>
++#endif
+ #include <sys/sysctl.h>
+ #include <string.h>
+ #include <kvm.h>
+ #ifdef Q_OS_NETBSD
+ #include <sys/sched.h>
diff --git a/sysutils/kdf/files/patch-ksimdisk.cpp b/sysutils/kdf/files/patch-ksimdisk.cpp
new file mode 100644
index 000000000000..be1790d8ec21
--- /dev/null
+++ b/sysutils/kdf/files/patch-ksimdisk.cpp
@@ -0,0 +1,24 @@
+Index: ksimdisk.cpp
+===================================================================
+RCS file: /home/kde/kdeutils/ksim/monitors/disk/ksimdisk.cpp,v
+retrieving revision 1.13
+diff -u -5 -p -d -r1.13 ksimdisk.cpp
+--- ksimdisk.cpp	2 Nov 2002 14:34:08 -0000	1.13
++++ ksim/monitors/disk/ksimdisk.cpp	3 Mar 2003 08:48:34 -0000
+@@ -39,11 +39,16 @@
+ #include <chart.h>
+ #include <progress.h>
+ #include <themetypes.h>
+ 
+ #ifdef Q_OS_FREEBSD
++#include <sys/param.h>
++#if __FreeBSD_version < 500101
+ #include <sys/dkstat.h>
++#else
++#include <sys/resource.h>
++#endif
+ #include <devstat.h>
+ #include <stdlib.h>
+ #endif
+ 
+ #ifdef Q_OS_LINUX
diff --git a/sysutils/kfloppy/files/patch-ksimcpu.cpp b/sysutils/kfloppy/files/patch-ksimcpu.cpp
new file mode 100644
index 000000000000..0dbf177de206
--- /dev/null
+++ b/sysutils/kfloppy/files/patch-ksimcpu.cpp
@@ -0,0 +1,29 @@
+Index: ksim/monitors/cpu/ksimcpu.cpp
+===================================================================
+RCS file: /home/kde/kdeutils/ksim/monitors/cpu/ksimcpu.cpp,v
+retrieving revision 1.21
+diff -u -5 -p -d -r1.21 ksimcpu.cpp
+--- ksim/monitors/cpu/ksimcpu.cpp	13 May 2002 14:47:51 -0000	1.21
++++ ksim/monitors/cpu/ksimcpu.cpp	3 Mar 2003 07:38:33 -0000
+@@ -40,12 +40,20 @@
+ #include <chart.h>
+ #include <progress.h>
+ #include <themetypes.h>
+ 
+ #ifdef Q_OS_BSD4
+-#include <sys/dkstat.h>
+ #include <sys/param.h>
++#ifdef Q_OS_FREEBSD
++#if __FreeBSD_version < 500101
++#include <sys/dkstat.h>
++#else
++#include <sys/resource.h>
++#endif
++#else
++#include <sys/dkstat.h>
++#endif
+ #include <sys/sysctl.h>
+ #include <string.h>
+ #include <kvm.h>
+ #ifdef Q_OS_NETBSD
+ #include <sys/sched.h>
diff --git a/sysutils/kfloppy/files/patch-ksimdisk.cpp b/sysutils/kfloppy/files/patch-ksimdisk.cpp
new file mode 100644
index 000000000000..be1790d8ec21
--- /dev/null
+++ b/sysutils/kfloppy/files/patch-ksimdisk.cpp
@@ -0,0 +1,24 @@
+Index: ksimdisk.cpp
+===================================================================
+RCS file: /home/kde/kdeutils/ksim/monitors/disk/ksimdisk.cpp,v
+retrieving revision 1.13
+diff -u -5 -p -d -r1.13 ksimdisk.cpp
+--- ksimdisk.cpp	2 Nov 2002 14:34:08 -0000	1.13
++++ ksim/monitors/disk/ksimdisk.cpp	3 Mar 2003 08:48:34 -0000
+@@ -39,11 +39,16 @@
+ #include <chart.h>
+ #include <progress.h>
+ #include <themetypes.h>
+ 
+ #ifdef Q_OS_FREEBSD
++#include <sys/param.h>
++#if __FreeBSD_version < 500101
+ #include <sys/dkstat.h>
++#else
++#include <sys/resource.h>
++#endif
+ #include <devstat.h>
+ #include <stdlib.h>
+ #endif
+ 
+ #ifdef Q_OS_LINUX
diff --git a/sysutils/sweeper/files/patch-ksimcpu.cpp b/sysutils/sweeper/files/patch-ksimcpu.cpp
new file mode 100644
index 000000000000..0dbf177de206
--- /dev/null
+++ b/sysutils/sweeper/files/patch-ksimcpu.cpp
@@ -0,0 +1,29 @@
+Index: ksim/monitors/cpu/ksimcpu.cpp
+===================================================================
+RCS file: /home/kde/kdeutils/ksim/monitors/cpu/ksimcpu.cpp,v
+retrieving revision 1.21
+diff -u -5 -p -d -r1.21 ksimcpu.cpp
+--- ksim/monitors/cpu/ksimcpu.cpp	13 May 2002 14:47:51 -0000	1.21
++++ ksim/monitors/cpu/ksimcpu.cpp	3 Mar 2003 07:38:33 -0000
+@@ -40,12 +40,20 @@
+ #include <chart.h>
+ #include <progress.h>
+ #include <themetypes.h>
+ 
+ #ifdef Q_OS_BSD4
+-#include <sys/dkstat.h>
+ #include <sys/param.h>
++#ifdef Q_OS_FREEBSD
++#if __FreeBSD_version < 500101
++#include <sys/dkstat.h>
++#else
++#include <sys/resource.h>
++#endif
++#else
++#include <sys/dkstat.h>
++#endif
+ #include <sys/sysctl.h>
+ #include <string.h>
+ #include <kvm.h>
+ #ifdef Q_OS_NETBSD
+ #include <sys/sched.h>
diff --git a/sysutils/sweeper/files/patch-ksimdisk.cpp b/sysutils/sweeper/files/patch-ksimdisk.cpp
new file mode 100644
index 000000000000..be1790d8ec21
--- /dev/null
+++ b/sysutils/sweeper/files/patch-ksimdisk.cpp
@@ -0,0 +1,24 @@
+Index: ksimdisk.cpp
+===================================================================
+RCS file: /home/kde/kdeutils/ksim/monitors/disk/ksimdisk.cpp,v
+retrieving revision 1.13
+diff -u -5 -p -d -r1.13 ksimdisk.cpp
+--- ksimdisk.cpp	2 Nov 2002 14:34:08 -0000	1.13
++++ ksim/monitors/disk/ksimdisk.cpp	3 Mar 2003 08:48:34 -0000
+@@ -39,11 +39,16 @@
+ #include <chart.h>
+ #include <progress.h>
+ #include <themetypes.h>
+ 
+ #ifdef Q_OS_FREEBSD
++#include <sys/param.h>
++#if __FreeBSD_version < 500101
+ #include <sys/dkstat.h>
++#else
++#include <sys/resource.h>
++#endif
+ #include <devstat.h>
+ #include <stdlib.h>
+ #endif
+ 
+ #ifdef Q_OS_LINUX