Standardize statvfs test. From Sergey Svishchev.

11 files changed, 34 insertions, 20 deletions

diff --git a/net/sup/distinfo b/net/sup/distinfo
index 6b68297b51c..6233398f4d6 100644
--- a/net/sup/distinfo
+++ b/net/sup/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2006/11/09 09:34:17 rillig Exp $
+$NetBSD: distinfo,v 1.4 2007/12/02 12:55:08 wiz Exp $
 
 SHA1 (sup-0.0.tar.gz) = 7518db485449aef362fc178226249c29bc6de0d7
 RMD160 (sup-0.0.tar.gz) = a7939d2743a3a1de0c502c49db54391c29fd9db0
 Size (sup-0.0.tar.gz) = 92239 bytes
 SHA1 (patch-aa) = 9aa1343a5b3acd8bfc83726113b569471e943e13
+SHA1 (patch-ab) = b725d6bfef4a06612f0bd11cdee36d9584f19ab3
diff --git a/net/sup/patches/patch-ab b/net/sup/patches/patch-ab
new file mode 100644
index 00000000000..d313d01b3bc
--- /dev/null
+++ b/net/sup/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/12/02 12:55:09 wiz Exp $
+
+--- supfilesrv.c.orig	2006-03-14 17:45:03.000000000 +0000
++++ supfilesrv.c
+@@ -1913,7 +1913,7 @@ local_file(int handle, struct stat * sin
+ 	 * determined this empirically -- DLC).  Without a fstatvfs()
+ 	 * system call, this will have to do for now.
+ 	 */
+-#if defined(__SVR4) || __NetBSD_Version__ > 200030000
++#if defined(__SVR4) || __NetBSD_Version__ > 299000900
+ 	{
+ 		struct statvfs sf;
+ 
diff --git a/shells/ast-ksh/distinfo b/shells/ast-ksh/distinfo
index 88aa1807fb1..f620415e5bd 100644
--- a/shells/ast-ksh/distinfo
+++ b/shells/ast-ksh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2006/10/03 14:32:37 obache Exp $
+$NetBSD: distinfo,v 1.11 2007/12/02 12:55:09 wiz Exp $
 
 SHA1 (INIT.2006-02-14.tgz) = 4661c72187bff2cd5fa3558ee7c0c22dd3ba5f39
 RMD160 (INIT.2006-02-14.tgz) = 68649532a15c34dcb20d61a544c1594d030c5f3f
@@ -8,4 +8,4 @@ RMD160 (ast-ksh.2006-02-14.tgz) = e4ac75119e4678af2c90cb3a1a28805ad380e9dd
 Size (ast-ksh.2006-02-14.tgz) = 1575902 bytes
 SHA1 (patch-aa) = dd3e5cc9b80ae6e24faed3f15af354cf34fb16a0
 SHA1 (patch-ab) = adbbdb5deeb15c1eeb38bec5685d9e6331b2b964
-SHA1 (patch-ac) = 1bb9683cb3a652c9e13d7626d4e6558464209a44
+SHA1 (patch-ac) = ee5c19ead4e27b4b2ac8430e1a98d77ea991b4a1
diff --git a/shells/ast-ksh/patches/patch-ac b/shells/ast-ksh/patches/patch-ac
index 9c25b894d98..ad4a1ffa238 100644
--- a/shells/ast-ksh/patches/patch-ac
+++ b/shells/ast-ksh/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2006/01/07 16:15:46 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2007/12/02 12:55:09 wiz Exp $
 
 --- src/lib/libast/port/mnt.c.orig	2002-09-26 16:33:59.000000000 +0000
 +++ src/lib/libast/port/mnt.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.1 2006/01/07 16:15:46 wiz Exp $
  #include <sys/param.h>		/* expect some macro redefinitions here */
  #include <sys/mount.h>
  
-+#if defined(__NetBSD__) && (__NetBSD_Version__ > 299000000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900)
 +#define statfs                                statvfs
 +#define f_flags                               f_flag
 +#endif
diff --git a/sysutils/coreutils/distinfo b/sysutils/coreutils/distinfo
index 11f89079cb3..16668d26e4e 100644
--- a/sysutils/coreutils/distinfo
+++ b/sysutils/coreutils/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2007/07/18 11:25:19 tnn Exp $
+$NetBSD: distinfo,v 1.13 2007/12/02 12:55:10 wiz Exp $
 
 SHA1 (coreutils-6.9.tar.bz2) = 10310a78c4e1d9f742f3815ac28e9bf1086a5885
 RMD160 (coreutils-6.9.tar.bz2) = c6ae65204b2e9c234a1140f39a8be1ee5cdcaab7
 Size (coreutils-6.9.tar.bz2) = 5384378 bytes
-SHA1 (patch-ab) = 676fd4eaeedf8f94ac6d1894fd16491ce8412cb0
-SHA1 (patch-ac) = bed05fb1ba7102e9042357caea32767c88bff332
+SHA1 (patch-ab) = bc1e79814a6ebc177862eae1816a24e3a4a5c577
+SHA1 (patch-ac) = 83e271d8da9d8d70e1f9eb34129d2cbf1cd352fc
 SHA1 (patch-ad) = eb10a960047957b4142e06aff363cf35249df70c
 SHA1 (patch-ag) = 3e24b8e025a151eb7bed4c778a326da5eed09ded
 SHA1 (patch-ah) = 3a101d45bb5fc502dd5402e0df587494d1844597
diff --git a/sysutils/coreutils/patches/patch-ab b/sysutils/coreutils/patches/patch-ab
index 03aaded5822..7e47122945d 100644
--- a/sysutils/coreutils/patches/patch-ab
+++ b/sysutils/coreutils/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2007/07/18 11:25:20 tnn Exp $
+$NetBSD: patch-ab,v 1.9 2007/12/02 12:55:10 wiz Exp $
 
 --- lib/mountlist.c.orig	2007-01-26 23:16:55.000000000 +0100
 +++ lib/mountlist.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.8 2007/07/18 11:25:20 tnn Exp $
  
  #if MOUNTED_GETMNTINFO
  
-+# if defined(__NetBSD__) && (__NetBSD_Version__ > 299000000)
++# if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900)
 +# define statfs				statvfs
 +# define HAVE_F_FSTYPENAME_IN_STATFS  1
 +# endif
diff --git a/sysutils/coreutils/patches/patch-ac b/sysutils/coreutils/patches/patch-ac
index 4696654a7b5..cdacdda8561 100644
--- a/sysutils/coreutils/patches/patch-ac
+++ b/sysutils/coreutils/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2007/07/18 11:25:20 tnn Exp $
+$NetBSD: patch-ac,v 1.8 2007/12/02 12:55:10 wiz Exp $
 
 --- src/stat.c.orig	2007-03-18 22:36:43.000000000 +0100
 +++ src/stat.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.7 2007/07/18 11:25:20 tnn Exp $
  #define hextobin(c) ((c) >= 'a' && (c) <= 'f' ? (c) - 'a' + 10 : \
  		     (c) >= 'A' && (c) <= 'F' ? (c) - 'A' + 10 : (c) - '0')
  
-+#if (defined(__NetBSD__) && (__NetBSD_Version__ > 299000000)) || defined(__INTERIX)
++#if (defined(__NetBSD__) && (__NetBSD_Version__ > 299000900)) || defined(__INTERIX)
 +#include <sys/statvfs.h>
 +#define	statfs					statvfs
 +#define	STATXFS_FILE_SYSTEM_TYPE_MEMBER_NAME	f_fstypename
diff --git a/sysutils/torsmo/distinfo b/sysutils/torsmo/distinfo
index 1d546292f9e..f53d8d557c3 100644
--- a/sysutils/torsmo/distinfo
+++ b/sysutils/torsmo/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2007/02/19 19:50:48 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/12/02 12:55:11 wiz Exp $
 
 SHA1 (torsmo-0.18.tar.gz) = 01e6737b3971daa3a7c9cb6dd1961f61bc39bdae
 RMD160 (torsmo-0.18.tar.gz) = f1d8b3c4679155596569f9116970e7ba8a01eb6e
 Size (torsmo-0.18.tar.gz) = 84020 bytes
-SHA1 (patch-aa) = b1d9e3eb7638e24c3cc595e9cd1e1c6054adf5cf
+SHA1 (patch-aa) = 8c515d3b0925aeaaea928ad8abd89ab5ccbfceab
 SHA1 (patch-ab) = 3bf66bd2b7645c204099a8c7b806098d028cc8bf
 SHA1 (patch-ac) = 5b342d09ff0fcc3982aa855e2cc660823ed53e11
 SHA1 (patch-ad) = 87fa39455dc2d5190c419142d5e4d0768914841e
diff --git a/sysutils/torsmo/patches/patch-aa b/sysutils/torsmo/patches/patch-aa
index 06a9431dc23..b12fc280766 100644
--- a/sysutils/torsmo/patches/patch-aa
+++ b/sysutils/torsmo/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/03/29 21:42:55 ghen Exp $
+$NetBSD: patch-aa,v 1.2 2007/12/02 12:55:11 wiz Exp $
 
 --- fs.c.orig	2004-08-25 18:24:24.000000000 +0200
 +++ fs.c
@@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/03/29 21:42:55 ghen Exp $
  #include <sys/mount.h>
  #endif
  
-+#if defined (__NetBSD__)
++#if defined (__NetBSD__) && (__NetBSD_Version__ >= 299000900)
 +#include <sys/statvfs.h>
 +#define STATVFS 1
 +#endif
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 53a62239dec..2f272bb7c28 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2007/11/22 18:51:24 drochner Exp $
+$NetBSD: distinfo,v 1.16 2007/12/02 12:55:11 wiz Exp $
 
 SHA1 (qt-x11-opensource-src-4.3.2.tar.gz) = 265fb56ded2e7ff101ebd722bd2bc1638f96057d
 RMD160 (qt-x11-opensource-src-4.3.2.tar.gz) = b73a3d7a1edd11987544291cce80b56f5a499969
@@ -12,7 +12,7 @@ SHA1 (patch-af) = 416f8154074b561e57b87e45ef2f67d3b1caf711
 SHA1 (patch-ag) = 7b2186277bbdccf55468c469cc7505574b7f18ad
 SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
 SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
-SHA1 (patch-aj) = ed19733b78d40a98be3c2b11bb3c5ced7b022ff1
+SHA1 (patch-aj) = e9ca9544f929bb4adf3ccb0ca2cad9352124289d
 SHA1 (patch-ak) = bd5d0f766a6ddcd801b94b4387d19b62edc8e4e1
 SHA1 (patch-al) = 606610ee684836d14e5893d295c0b131beeb9605
 SHA1 (patch-an) = 338d0cf6cdf38689c9f3770222802206dd8035a3
diff --git a/x11/qt4-libs/patches/patch-aj b/x11/qt4-libs/patches/patch-aj
index 6bd3c4a0e0b..32b0f742132 100644
--- a/x11/qt4-libs/patches/patch-aj
+++ b/x11/qt4-libs/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.3 2007/10/13 12:02:14 adam Exp $
+$NetBSD: patch-aj,v 1.4 2007/12/02 12:55:11 wiz Exp $
 
 --- mkspecs/netbsd-g++/qplatformdefs.h.orig	2007-10-01 15:05:54.000000000 +0200
 +++ mkspecs/netbsd-g++/qplatformdefs.h
@@ -14,7 +14,7 @@ $NetBSD: patch-aj,v 1.3 2007/10/13 12:02:14 adam Exp $
  #define QT_SNPRINTF		::snprintf
  #define QT_VSNPRINTF		::vsnprintf
  
-+#if (__NetBSD_Version__ >= 200040000)
++#if (__NetBSD_Version__ >= 299000900)
 +#include <sys/statvfs.h>
 +#define QT_STATVFS		1
 +#endif