Add some glue code so that the code which collects statistics for

kdesysguard is not wasted.
(Not that I consider this very useful, but showing just "UNKNOWN COMMAND"
looks bad.)

5 files changed, 105 insertions, 10 deletions

diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 61d4b122608..46ba11d3358 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2003/05/22 02:42:46 markd Exp $
+$NetBSD: distinfo,v 1.30 2003/06/05 21:29:32 drochner Exp $
 
 SHA1 (kdebase-3.1.2.tar.bz2) = 2e75e74f902977c497e8bdc15074909009d8c91a
 Size (kdebase-3.1.2.tar.bz2) = 15229871 bytes
@@ -6,7 +6,7 @@ SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 Size (Daemon.README) = 2191 bytes
-SHA1 (patch-aa) = f0b027549ced62934832c24032bd198572b18c37
+SHA1 (patch-aa) = b9b7d9d7beb65370b7b9429d3741fb7aeee7c976
 SHA1 (patch-ab) = ef34628c73aaf9704bf06d92db6086bac3da5b44
 SHA1 (patch-ac) = 4556a9bcdbf690e21bf67cca0d1dd6bb22a2f28f
 SHA1 (patch-ae) = 2a1717aea4ee6b3a891dc93102af523db3801302
@@ -108,3 +108,6 @@ SHA1 (patch-eu) = 142d526643d21f02b349e4128dec3c44c7aece93
 SHA1 (patch-ev) = 551dc4d79b637e15a580eb1dcd2f0930ff1e3dbc
 SHA1 (patch-ew) = f8f95cf602a9d88f620d5546ad58b87d5e6be2a5
 SHA1 (patch-ex) = 6dad116e38ba30ea1a9a3529e250b1e512c4865f
+SHA1 (patch-fa) = fc8d6f0e22548e86ad4d9f328a657c86ea9f51c4
+SHA1 (patch-fb) = 5f6895322c186813c43a3426dfe4d57a17090346
+SHA1 (patch-fc) = 8bdc76aa9c34e270de2fba14213db0c179c5cd31
diff --git a/x11/kdebase3/patches/patch-aa b/x11/kdebase3/patches/patch-aa
index a8def774661..7e9a39bb5c2 100644
--- a/x11/kdebase3/patches/patch-aa
+++ b/x11/kdebase3/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2003/05/22 02:42:47 markd Exp $
+$NetBSD: patch-aa,v 1.7 2003/06/05 21:29:33 drochner Exp $
 
---- configure.orig	Tue May 13 23:08:06 2003
-+++ configure
-@@ -31619,63 +31619,6 @@ _ACEOF
+--- configure.orig	2003-05-13 13:08:06.000000000 +0200
++++ configure	2003-06-05 20:04:56.000000000 +0200
+@@ -31619,63 +31619,6 @@
  
  
  
@@ -66,11 +66,10 @@ $NetBSD: patch-aa,v 1.6 2003/05/22 02:42:47 markd Exp $
  echo "$as_me:$LINENO: checking if it's safe to enable UTMP" >&5
  echo $ECHO_N "checking if it's safe to enable UTMP... $ECHO_C" >&6
  
-@@ -33795,6 +33738,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   (exit $ac_status); }; }; then
+@@ -33796,6 +33739,23 @@
  
                    ac_cv_have_dpms="-lXdpms"
-+
+ 
 +	lib=Xdpms
 +	shared_lib_found=no
 +	for i in ${LDFLAGS}; do
@@ -87,6 +86,15 @@ $NetBSD: patch-aa,v 1.6 2003/05/22 02:42:47 markd Exp $
 +	if [ "$shared_lib_found" = "no" ]; then
 +		eval "ac_cv_have_dpms=no"
 +	fi
- 
++
  else
    echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -38423,6 +38383,7 @@
+ case "$UNAME" in
+ 	Linux) LIBHOSTS="$LIBSENSORS" ;;
+ 	FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
++	NetBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
+ 	Solaris) LIBHOSTS="$LIBSENSORS -lkstat -lsocket" ;;
+ esac
+ 
diff --git a/x11/kdebase3/patches/patch-fa b/x11/kdebase3/patches/patch-fa
new file mode 100644
index 00000000000..6d4c305e7d5
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fa
@@ -0,0 +1,44 @@
+$NetBSD: patch-fa,v 1.1 2003/06/05 21:29:33 drochner Exp $
+
+--- ksysguard/ksysguardd/modules.h.orig	2003-06-05 19:26:03.000000000 +0200
++++ ksysguard/ksysguardd/modules.h	2003-06-05 19:37:21.000000000 +0200
+@@ -55,6 +55,19 @@
+ #include "netdev.h"
+ #endif /* OSTYPE_FreeBSD */
+ 
++#ifdef OSTYPE_NetBSD
++#include "CPU.h"
++#include "Memory.h"
++#include "ProcessList.h"
++#ifdef __i386__
++#include "apm.h"
++#endif
++#include "diskstat.h"
++#include "loadavg.h"
++#include "logfile.h"
++#include "netdev.h"
++#endif /* OSTYPE_NetBSD */
++
+ #ifdef OSTYPE_Solaris
+ #include "LoadAvg.h"
+ #include "Memory.h"
+@@ -114,6 +127,19 @@
+ 	{ "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev, 0, NULLTIME },
+ #endif /* OSTYPE_FreeBSD */
+ 
++#ifdef OSTYPE_NetBSD
++        { "CpuInfo", initCpuInfo, exitCpuInfo, updateCpuInfo, NULLVVFUNC, 0, NULLTIME },
++        { "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC, 0, NULLTIME },
++        { "ProcessList", initProcessList, exitProcessList, updateProcessList, NULLVVFUNC, 0, NULLTIME },
++#ifdef __i386__
++        { "Apm", initApm, exitApm, updateApm, NULLVVFUNC, 0, NULLTIME },
++#endif
++        { "DiskStat", initDiskStat, exitDiskStat, updateDiskStat, checkDiskStat, 0, NULLTIME },
++        { "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC, 0, NULLTIME },
++        { "LogFile", initLogFile, exitLogFile, NULLIVFUNC, NULLVVFUNC, 0, NULLTIME },
++        { "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev, 0, NULLTIME },
++#endif /* OSTYPE_NetBSD */
++
+ #ifdef OSTYPE_Solaris
+ 	{ "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC, 0, NULLTIME },
+ 	{ "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC, 0, NULLTIME },
diff --git a/x11/kdebase3/patches/patch-fb b/x11/kdebase3/patches/patch-fb
new file mode 100644
index 00000000000..d7e9f3a45b4
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fb
@@ -0,0 +1,13 @@
+$NetBSD: patch-fb,v 1.1 2003/06/05 21:29:33 drochner Exp $
+
+--- ksysguard/ksysguardd/NetBSD/netdev.h.orig	2003-06-05 20:10:03.000000000 +0200
++++ ksysguard/ksysguardd/NetBSD/netdev.h	2003-06-05 20:10:23.000000000 +0200
+@@ -25,7 +25,7 @@
+ void initNetDev(struct SensorModul* sm);
+ void exitNetDev(void);
+ 
+-void updateNetDev(void);
++int updateNetDev(void);
+ void checkNetDev(void);
+ 
+ void printNetDevRecBytes(const char* cmd);
diff --git a/x11/kdebase3/patches/patch-fc b/x11/kdebase3/patches/patch-fc
new file mode 100644
index 00000000000..aca648ea273
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fc
@@ -0,0 +1,27 @@
+$NetBSD: patch-fc,v 1.1 2003/06/05 21:29:33 drochner Exp $
+
+--- ksysguard/ksysguardd/NetBSD/netdev.c.orig	2003-06-05 20:10:31.000000000 +0200
++++ ksysguard/ksysguardd/NetBSD/netdev.c	2003-06-05 20:11:08.000000000 +0200
+@@ -270,12 +270,12 @@
+   NDreg(0);
+ }
+ 
+-void updateNetDev(void) {
++int updateNetDev(void) {
+   NetDevInfo *p, *q;
+   int n;
+ 
+   if (-1==(n = readSys(0)))
+-    return;
++    return (0);
+ 
+   NetDevCnt = n;
+   /*fixme: assumes the interfaces are in the same order each time */
+@@ -290,6 +290,7 @@
+ 
+     }
+   }
++	return (0);
+ }
+ 
+ void checkNetDev(void) {