statfs->statvfs

3 files changed, 47 insertions, 1 deletions

diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index 5b3eefeedf5..5cf30543095 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.22 2004/04/20 13:19:56 markd Exp $
+$NetBSD: distinfo,v 1.23 2004/05/04 13:52:11 mrg Exp $
 
 SHA1 (kdeutils-3.2.2.tar.bz2) = 8ff615e0d1fa3b17488f28a70564ecfbfa7f6bae
 Size (kdeutils-3.2.2.tar.bz2) = 2549521 bytes
 SHA1 (patch-aa) = 01c0d686ea0f92fb4dbc5ac04591031dff1137de
 SHA1 (patch-ab) = 3ea156545a1e9e3bd601e4152ca4942d18b18353
+SHA1 (patch-ac) = c1d962b36bbc3ee3f63155c3d98aa9f92117ecf0
+SHA1 (patch-ad) = ad4fcdda6f9fc1b91e1f125421800e412e2ee0aa
 SHA1 (patch-an) = e13957a9fa0d23aebbe149ecaca7b9dacde5c9fb
 SHA1 (patch-ao) = 84cbdcbfbd6c81f88695926ed01b678276b1abfa
 SHA1 (patch-ap) = 0bfa5bfeb6551791ea6311bbf1223732d3dfa482
diff --git a/misc/kdeutils3/patches/patch-ac b/misc/kdeutils3/patches/patch-ac
new file mode 100644
index 00000000000..1c4af3e1e56
--- /dev/null
+++ b/misc/kdeutils3/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.5 2004/05/04 13:52:11 mrg Exp $
+
+--- ark/arkutils.cpp.orig	2003-11-30 20:50:36.000000000 +1100
++++ ark/arkutils.cpp	2004-05-04 22:57:13.000000000 +1000
+@@ -44,6 +44,12 @@
+ // for statfs:
+ #ifdef BSD4_4
+ #include <sys/mount.h>
++#ifdef __NetBSD__
++#if __NetBSD_Version__ >= 200040000    /* 2.0D */
++#include <sys/statvfs.h>
++#define STATFS statvfs
++#endif
++#endif
+ #elif defined(__linux__)
+ #include <sys/vfs.h>
+ #elif defined(__sun)
diff --git a/misc/kdeutils3/patches/patch-ad b/misc/kdeutils3/patches/patch-ad
new file mode 100644
index 00000000000..ff059d7361b
--- /dev/null
+++ b/misc/kdeutils3/patches/patch-ad
@@ -0,0 +1,27 @@
+$NetBSD: patch-ad,v 1.3 2004/05/04 13:52:11 mrg Exp $
+
+--- ksim/monitors/filesystem/filesystemstats.cpp.orig	2003-06-27 23:39:05.000000000 +1000
++++ ksim/monitors/filesystem/filesystemstats.cpp	2004-05-04 23:31:40.000000000 +1000
+@@ -58,8 +58,10 @@
+ 
+ #ifdef HAVE_STATVFS
+ typedef struct statvfs ksim_statfs;
++#define ksim_getfsstat getvfsstat
+ #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
+ typedef struct statfs ksim_statfs;
++#define ksim_getfsstat getfsstat
+ #else
+ typedef struct // fall back for (possibly) non-supported systems
+ {
+@@ -159,9 +161,9 @@
+ #endif
+ 
+ #ifdef USE_FSSTAT
+-  struct statfs sfs[32];
++  ksim_statfs sfs[32];
+   int fs_count;
+-  if ( ( fs_count = getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
++  if ( ( fs_count = ksim_getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
+   {
+     for ( int i = 0; i < fs_count; i++ )
+     {