Use statvfs on NetBSD>=2.0D.

5 files changed, 51 insertions, 7 deletions

diff --git a/net/sharity-light/distinfo b/net/sharity-light/distinfo
index b933e44cb7f..0c111f11375 100644
--- a/net/sharity-light/distinfo
+++ b/net/sharity-light/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:32 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/09/16 17:57:02 minskim Exp $
 
 SHA1 (Sharity-Light.1.2.tar.gz) = 4a8e93695b1772005e401c2aafbd3f5f70a3b30e
 Size (Sharity-Light.1.2.tar.gz) = 76481 bytes
 SHA1 (patch-aa) = 349384306807e8d0e16334a2d9a7e7e0002ef8d1
-SHA1 (patch-ab) = 42c29cb072b38d887231f546a967ebd85b708048
+SHA1 (patch-ab) = c3f4ad2b57b5b93915bfb59e846cdf9175bbf728
 SHA1 (patch-ac) = 2087a294f04ff2cc4fc4edd1814807e6f01cd949
+SHA1 (patch-ad) = 1daa21a239d5922e8c51a85e5340ea5596583d6b
diff --git a/net/sharity-light/patches/patch-ab b/net/sharity-light/patches/patch-ab
index 580d05642ad..22ab908355c 100644
--- a/net/sharity-light/patches/patch-ab
+++ b/net/sharity-light/patches/patch-ab
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/09 16:09:36 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2004/09/16 17:57:02 minskim Exp $
 
---- nfs/syscalls.c.orig	Thu Mar  8 11:29:41 2001
-+++ nfs/syscalls.c	Thu Mar  8 11:29:55 2001
-@@ -19,6 +19,10 @@
+--- nfs/syscalls.c.orig	1998-06-30 07:24:56.000000000 -0500
++++ nfs/syscalls.c
+@@ -19,6 +19,13 @@
  #include <arpa/inet.h>
  #include "my_defines.h"
  
 +#ifdef __NetBSD__
 +#include <nfs/nfsmount.h>
++#if __NetBSD_Version__ >= 200040000
++#define statfs statvfs
++#endif
 +#endif
 +
  /* --------------------------- general constants --------------------------- */
diff --git a/net/sharity-light/patches/patch-ad b/net/sharity-light/patches/patch-ad
new file mode 100644
index 00000000000..5fb200b71d5
--- /dev/null
+++ b/net/sharity-light/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2004/09/16 17:57:02 minskim Exp $
+
+--- ../unshlight/unshlight.c.orig	2001-03-09 10:09:36.000000000 -0600
++++ ../unshlight/unshlight.c
+@@ -8,6 +8,10 @@
+ #include <stdlib.h>
+ #include <signal.h>
+ 
++#if defined(__NetBSD__) && __NetBSD_Version__ >= 200040000
++#define statfs statvfs
++#endif
++
+ static void usage(void);
+ 
+ int
diff --git a/sysutils/cfengine/distinfo b/sysutils/cfengine/distinfo
index 4316c79195d..db2cfdb5386 100644
--- a/sysutils/cfengine/distinfo
+++ b/sysutils/cfengine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/09/10 21:12:21 wiz Exp $
+$NetBSD: distinfo,v 1.7 2004/09/16 18:08:36 minskim Exp $
 
 SHA1 (cfengine-1.6.5.tar.gz) = 0e40c6094cb4fa12b34920d30e789719e04df511
 Size (cfengine-1.6.5.tar.gz) = 879792 bytes
@@ -8,3 +8,4 @@ SHA1 (patch-ac) = 417ca3785c7d7d668a08d4aad298a8d2ec4a6571
 SHA1 (patch-ad) = 047e02555d541c22f07cb3e3a102beb0be32df6d
 SHA1 (patch-ae) = 283e129a515b664f651fd2272e3f9f8d7f99b60f
 SHA1 (patch-af) = 202bd09675ce4e861d2df01f6e52a05dcb4a4a7c
+SHA1 (patch-ag) = 228f0934e2e9409615b868a8c9a0a5829e4f9196
diff --git a/sysutils/cfengine/patches/patch-ag b/sysutils/cfengine/patches/patch-ag
new file mode 100644
index 00000000000..063e4274978
--- /dev/null
+++ b/sysutils/cfengine/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.3 2004/09/16 18:08:36 minskim Exp $
+
+--- src/df.c.orig	2000-09-10 12:16:00.000000000 -0500
++++ src/df.c
+@@ -51,7 +51,8 @@ char *file;
+ enum cfsizes type;
+ 
+ {
+-#if defined SOLARIS || defined OSF || defined UNIXWARE 
++#if defined SOLARIS || defined OSF || defined UNIXWARE || \
++  (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000)
+     struct statvfs buf;
+ #elif defined ULTRIX
+     struct fs_data buf;
+@@ -73,7 +74,8 @@ enum cfsizes type;
+        CfLog(cferror,OUTPUT,"");
+        return cfinfinity;
+        }
+-#elif defined SOLARIS || defined OSF || defined UNIXWARE 
++#elif defined SOLARIS || defined OSF || defined UNIXWARE || \
++  (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000)
+     if (statvfs (file, &buf) != 0)
+        {
+        sprintf(OUTPUT,"Couldn't get filesystem info for %s\n",file);