Catch some NetBSD statvfs() checks phrased alternatively as > 200030000

rather than >= 200040000 and one enterprisingly hidden as > 200050000

10 files changed, 20 insertions, 20 deletions

diff --git a/archivers/arj/distinfo b/archivers/arj/distinfo
index cf7c8fd3a5f..b812d2f8ec7 100644
--- a/archivers/arj/distinfo
+++ b/archivers/arj/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/03/22 16:24:13 minskim Exp $
+$NetBSD: distinfo,v 1.10 2005/09/08 22:37:53 abs Exp $
 
 SHA1 (arj-3.10.21.tar.gz) = 3599001a762655688dcd1663e100f2d6ebec8227
 RMD160 (arj-3.10.21.tar.gz) = e126821cf15abba91bbeeeb771ffd279ffc7d114
 Size (arj-3.10.21.tar.gz) = 430807 bytes
-SHA1 (patch-aa) = 015dbd20e8fbd51c9ef185d8a6070feaba473964
+SHA1 (patch-aa) = 1c710765df0b62a99cba96fe6dba0685723c7928
 SHA1 (patch-ab) = d97fb922d7d0c4656dfd648d72e132bfd6198355
 SHA1 (patch-ac) = bb74d73a4f07ab9d1d915d3383ba2904caa69573
 SHA1 (patch-ad) = 186b05ec694daa25504123690f9b7bba9f22a7f4
diff --git a/archivers/arj/patches/patch-aa b/archivers/arj/patches/patch-aa
index 422f226a73a..117a7443b2e 100644
--- a/archivers/arj/patches/patch-aa
+++ b/archivers/arj/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2005/03/22 16:24:13 minskim Exp $
+$NetBSD: patch-aa,v 1.7 2005/09/08 22:37:53 abs Exp $
 
 --- environ.c.orig	Fri Jun 18 11:19:36 2004
 +++ environ.c
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.6 2005/03/22 16:24:13 minskim Exp $
     return((LONG_MAX/(spclu*bps)<fclu)?LONG_MAX:spclu*bps*fclu);
   #elif TARGET==UNIX
 -  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)
-+  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX)||(defined(__NetBSD__) && (__NetBSD_Version__ > 200030000))
++  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX)||(defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))
     struct statvfs vfs;
  
     if(statvfs(name, &vfs)==-1)
diff --git a/audio/gqmpeg/distinfo b/audio/gqmpeg/distinfo
index ba95a588594..2394902f2de 100644
--- a/audio/gqmpeg/distinfo
+++ b/audio/gqmpeg/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.24 2005/02/23 20:39:46 agc Exp $
+$NetBSD: distinfo,v 1.25 2005/09/08 22:37:53 abs Exp $
 
 SHA1 (gqmpeg-0.20.0.tar.gz) = e1a69f49c3a4063f4e16c6f3242b49eb31718418
 RMD160 (gqmpeg-0.20.0.tar.gz) = ac8f5ebdd3a62e02551860d18c292a5fadef7033
 Size (gqmpeg-0.20.0.tar.gz) = 966991 bytes
 SHA1 (patch-aa) = 00f989d188bd6b578c492505204c68017f9445a1
-SHA1 (patch-ab) = 5bad23e415c2768019f57f0f2d9421057dbcb1b5
+SHA1 (patch-ab) = 67a95f35118daf4588b44bc34dbfa36db93b7f8e
diff --git a/audio/gqmpeg/patches/patch-ab b/audio/gqmpeg/patches/patch-ab
index 370ce9053c0..0571efc0373 100644
--- a/audio/gqmpeg/patches/patch-ab
+++ b/audio/gqmpeg/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.22 2004/05/10 18:29:30 tron Exp $
+$NetBSD: patch-ab,v 1.23 2005/09/08 22:37:53 abs Exp $
 
 --- src/cpu_perc.c.orig	2002-05-02 21:08:34.000000000 +0200
 +++ src/cpu_perc.c	2004-05-10 20:22:09.000000000 +0200
@@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.22 2004/05/10 18:29:30 tron Exp $
  	/* find where the proc fs is mounted, some strange people could mount it
  	   in another place than /proc, it can even be not mounted at all */
  	{
-+#if defined(__NetBSD__) && (__NetBSD_Version__ > 200030000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)
 +	  struct statvfs *mntbufp;
 +#else
  	  struct statfs *mntbufp;
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index 2dbc79a90fe..9301e8072d4 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2005/06/12 14:29:53 hira Exp $
+$NetBSD: distinfo,v 1.23 2005/09/08 22:37:54 abs Exp $
 
 SHA1 (mgetty1.1.31-Jul24.tar.gz) = a6f20da26b49bbfa695791edec7d0a2247b79e2d
 RMD160 (mgetty1.1.31-Jul24.tar.gz) = 255eec0838ce5bfad04c53d478a4505e74111a07
@@ -10,7 +10,7 @@ SHA1 (patch-ad) = 7c4a96eaf7c83e9d907a74317252f752b4c689e6
 SHA1 (patch-ae) = 04f35280e337fb766152b7d9badcd0c417aa1739
 SHA1 (patch-af) = b5a36405c7e3783810f513d890190352fe2008cb
 SHA1 (patch-ag) = f12e39005c78a94f641ccbdbbfa51b5181821148
-SHA1 (patch-ah) = 7ca56968f891eefe361d6c2635771ac6e0a36a5b
+SHA1 (patch-ah) = 2d9de861d3bce7b454eee957d32ffe67996e27c7
 SHA1 (patch-ai) = a69003a5a28196c5a57bf538b20a31e2371683c7
 SHA1 (patch-aj) = 37d88c1a4f8d5826f7113dd120c32e89cc442e5d
 SHA1 (patch-ak) = 18f9570f35909089a4083fa24903dfea14dcc475
diff --git a/comms/mgetty+sendfax/patches/patch-ah b/comms/mgetty+sendfax/patches/patch-ah
index 46ff7f610b2..c657e9eb265 100644
--- a/comms/mgetty+sendfax/patches/patch-ah
+++ b/comms/mgetty+sendfax/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.3 2004/04/26 19:59:15 tron Exp $
+$NetBSD: patch-ah,v 1.4 2005/09/08 22:37:54 abs Exp $
 
 --- getdisk.c.orig	2001-01-28 14:29:43.000000000 +0100
 +++ getdisk.c	2004-04-26 21:56:58.000000000 +0200
@@ -6,7 +6,7 @@ $NetBSD: patch-ah,v 1.3 2004/04/26 19:59:15 tron Exp $
  # define USTAT
  #endif
  
-+#if defined(__NetBSD__) && (__NetBSD_Version__ > 200030000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)
 +#undef	BSDSTATFS
 +#define	SVR4
 +#endif
diff --git a/misc/gnuls/distinfo b/misc/gnuls/distinfo
index 43c0dc6d8f2..23961e75c99 100644
--- a/misc/gnuls/distinfo
+++ b/misc/gnuls/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:02:52 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/09/08 22:37:54 abs Exp $
 
 SHA1 (coreutils-5.2.1.tar.bz2) = 1028755ae0fa9be840576e4837004cf5a9981c45
 RMD160 (coreutils-5.2.1.tar.bz2) = a72bdb360371c026e77281ae0d543bdcce55a4e6
 Size (coreutils-5.2.1.tar.bz2) = 4270776 bytes
 SHA1 (patch-aa) = 0c671db84fbd6807d186d93898a7398a7bb8c338
 SHA1 (patch-ab) = 98623f76654772ac433ae6af12bbeaf8f4518599
-SHA1 (patch-ac) = a38174cf4c85cdddc23f3b59c7c04679c898c232
+SHA1 (patch-ac) = 4c067b00acb5546f4de5cb8bf524e97932cd9e88
diff --git a/misc/gnuls/patches/patch-ac b/misc/gnuls/patches/patch-ac
index d89c97e7f65..913dda4c288 100644
--- a/misc/gnuls/patches/patch-ac
+++ b/misc/gnuls/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2004/05/19 16:55:25 jmmv Exp $
+$NetBSD: patch-ac,v 1.2 2005/09/08 22:37:54 abs Exp $
 
 --- lib/mountlist.c.orig	2004-01-26 09:58:12.000000000 +0100
 +++ lib/mountlist.c	2004-05-18 20:56:57.000000000 +0200
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.1 2004/05/19 16:55:25 jmmv Exp $
  
  #if MOUNTED_GETMNTINFO
  
-+# if defined(__NetBSD__) && (__NetBSD_Version__ > 200030000)
++# if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)
 +# define statfs				statvfs
 +# define HAVE_F_FSTYPENAME_IN_STATFS	1
 +# endif
diff --git a/security/cfs/distinfo b/security/cfs/distinfo
index 13064111ac8..df1ac1e2b54 100644
--- a/security/cfs/distinfo
+++ b/security/cfs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/03/21 18:08:31 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/09/08 22:37:54 abs Exp $
 
 SHA1 (cfs-1.4.1.tar.gz) = be3f73b233149477b739456498c71b120d5f2fb5
 RMD160 (cfs-1.4.1.tar.gz) = 0ced92fe9773c6ce6b6706e26de9e17e710e7e46
@@ -9,5 +9,5 @@ SHA1 (patch-ac) = 354290ff606fab97b73980e6e512f10ef1397f01
 SHA1 (patch-ad) = 2ed5967d59d8f91948b2dd9ed4b18c5073d63615
 SHA1 (patch-ae) = 68b440cda27353d1035bae3002a83d8131087a24
 SHA1 (patch-af) = 19bbedcf0c37356dab747087c64617608ff91838
-SHA1 (patch-ag) = b9563e2bbade9008d044b9b869822013317f118d
+SHA1 (patch-ag) = 3c0236d65fbf01d68c590fcecc264ac269e66a7a
 SHA1 (patch-ah) = 6426888cf462fcd4c0245cb32ae78b7520aaf2d5
diff --git a/security/cfs/patches/patch-ag b/security/cfs/patches/patch-ag
index 231795ed042..ff36d464ba7 100644
--- a/security/cfs/patches/patch-ag
+++ b/security/cfs/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2004/08/02 17:09:06 tv Exp $
+$NetBSD: patch-ag,v 1.3 2005/09/08 22:37:54 abs Exp $
 
 --- cattach.c.orig	2004-07-25 21:55:56.000000000 +1000
 +++ cattach.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ag,v 1.2 2004/08/02 17:09:06 tv Exp $
  	struct fs_data sfb;
  #define f_blocks  fd_req.btot
  #else
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200050000
++#if defined(__NetBSD_Version__) && __NetBSD_Version__ >= 299000900
 +	struct statvfs sfb;
 +#else
  	struct statfs sfb;