diff options
60 files changed, 141 insertions, 141 deletions
diff --git a/audio/libcdaudio/distinfo b/audio/libcdaudio/distinfo index d9c648a5942..9132a33852b 100644 --- a/audio/libcdaudio/distinfo +++ b/audio/libcdaudio/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.11 2005/04/15 01:50:56 rh Exp $ +$NetBSD: distinfo,v 1.12 2005/09/06 08:10:57 abs Exp $ SHA1 (libcdaudio-0.99.12.tar.gz) = 1862d3f387634a216faa867164d840b6f5552294 RMD160 (libcdaudio-0.99.12.tar.gz) = 57f7446db6c65c968eb58a9404652718d6517b74 Size (libcdaudio-0.99.12.tar.gz) = 357150 bytes -SHA1 (patch-aa) = 1054c1b5854dfb2484e55d2e56bd0b46d5615505 +SHA1 (patch-aa) = f7cf7d430917e6860fb43529cb349d358890f7a4 SHA1 (patch-ab) = 9df8c234de3cb5a6b262fae093e430e471afa1f0 SHA1 (patch-ac) = 073ceed3794fbd889b0efec49cd2dfe63c7fda07 diff --git a/audio/libcdaudio/patches/patch-aa b/audio/libcdaudio/patches/patch-aa index fbcb6b5328d..47a41cb0d57 100644 --- a/audio/libcdaudio/patches/patch-aa +++ b/audio/libcdaudio/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.9 2004/11/26 13:38:30 adam Exp $ +$NetBSD: patch-aa,v 1.10 2005/09/06 08:10:57 abs Exp $ --- src/cdaudio.c.orig 2004-09-09 00:26:20.000000000 +0000 +++ src/cdaudio.c @@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.9 2004/11/26 13:38:30 adam Exp $ #endif #ifdef HAVE_GETMNTINFO int mounts; -+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */ ++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ + struct statvfs *mnt; +#else struct statfs *mnt; diff --git a/audio/snd/distinfo b/audio/snd/distinfo index ccf105335cb..5239d28ec49 100644 --- a/audio/snd/distinfo +++ b/audio/snd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2005/02/23 20:39:51 agc Exp $ +$NetBSD: distinfo,v 1.9 2005/09/06 08:10:57 abs Exp $ SHA1 (snd.tar.gz) = cb48922170602f30553b604bda039974c1706b65 RMD160 (snd.tar.gz) = 69f665f4710fbdd671f6677cec6f91467789f4a1 @@ -10,7 +10,7 @@ SHA1 (patch-ad) = 19a185e3e5a9800e56c904c06613b5d9645e6d17 SHA1 (patch-ae) = f3968df5d034d5b3629aef8708cfff7e7a033fd9 SHA1 (patch-af) = a8cf1931093397bcf88be08d36bd11efd9d4c161 SHA1 (patch-ag) = 7a19ce85c0c45ef2844ca22bca74de9238aa3ad1 -SHA1 (patch-ah) = 5933fcbfca2d09bec3a28fe726994b4345ed3fce +SHA1 (patch-ah) = bade0ce099e74626c1db30c3689220cefa214758 SHA1 (patch-ai) = 8447999b934cb8af70deb2c1ccc2b4b3d9bc61a8 SHA1 (patch-aj) = 94c096717006f564a5d200ee07f4bccd2f2c13cb SHA1 (patch-ak) = 8732fd50e181bf02db4b7e63d2464f71e44e2f1e diff --git a/audio/snd/patches/patch-ah b/audio/snd/patches/patch-ah index 5a9a5169d89..718e15310b9 100644 --- a/audio/snd/patches/patch-ah +++ b/audio/snd/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.3 2004/09/15 15:15:14 minskim Exp $ +$NetBSD: patch-ah,v 1.4 2005/09/06 08:10:57 abs Exp $ --- snd-file.c.orig 1998-02-10 08:42:41.000000000 -0600 +++ snd-file.c @@ -9,7 +9,7 @@ $NetBSD: patch-ah,v 1.3 2004/09/15 15:15:14 minskim Exp $ +#if defined (__NetBSD__) + #include <sys/param.h> + #include <sys/mount.h> -+ #if (__NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */ ++ #if (__NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ + #define statfs statvfs + #endif +#endif diff --git a/audio/tunepimp/distinfo b/audio/tunepimp/distinfo index c141041f309..4f52c6419f8 100644 --- a/audio/tunepimp/distinfo +++ b/audio/tunepimp/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 20:39:53 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/09/06 08:10:57 abs Exp $ SHA1 (libtunepimp-0.3.0.tar.gz) = 54c60232f3b06f2316e2b1130eb981352995dfc8 RMD160 (libtunepimp-0.3.0.tar.gz) = f471f96185aa79eff8a83fd5366904d009791628 Size (libtunepimp-0.3.0.tar.gz) = 524889 bytes SHA1 (patch-aa) = 5dc5f48d01b7b1cdc1462f0bf07d0eb917fdb3c7 -SHA1 (patch-ab) = 1874c3536b1cfa87d5f911a26fb6d9f830189324 +SHA1 (patch-ab) = ede9aa887804bc71f39b067bb538230f81aadcc0 diff --git a/audio/tunepimp/patches/patch-ab b/audio/tunepimp/patches/patch-ab index aa640a55f8c..5ff28e36131 100644 --- a/audio/tunepimp/patches/patch-ab +++ b/audio/tunepimp/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2004/11/01 12:47:22 markd Exp $ +$NetBSD: patch-ab,v 1.3 2005/09/06 08:10:57 abs Exp $ --- lib/write.cpp.orig 2004-03-25 22:12:43.000000000 +1200 +++ lib/write.cpp @@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.2 2004/11/01 12:47:22 markd Exp $ #else //--------------------------------------------------------------------------- -+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */ ++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ +#define HAVE_STATVFS 1 +#endif + diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo index 97c6f7be623..406d320a80b 100644 --- a/audio/xmms/distinfo +++ b/audio/xmms/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.25 2005/04/27 14:57:54 wiz Exp $ +$NetBSD: distinfo,v 1.26 2005/09/06 08:10:57 abs Exp $ SHA1 (xmms-1.2.10.tar.bz2) = a3c3d3756d5263183c27b3c50a7f5404cba8bfaf RMD160 (xmms-1.2.10.tar.bz2) = 0360cbb8c326b3325bd8ebb3343c69a9788d7084 Size (xmms-1.2.10.tar.bz2) = 2418265 bytes -SHA1 (patch-aa) = 23eb5917abc23b56275b6ad96f90762531e52cab +SHA1 (patch-aa) = 91b17156a2d0a48d8610552993357bf522aacbd0 SHA1 (patch-ab) = 806b1e8e974fe1100be90eca1ce582b9d80f3ab2 SHA1 (patch-ac) = 208d0f9ac537a042893db02130c14a8417808f9c SHA1 (patch-ad) = 4b1856f43c4cd92418046afa3f9c91f6d0900328 diff --git a/audio/xmms/patches/patch-aa b/audio/xmms/patches/patch-aa index ff94f047711..84edc31033b 100644 --- a/audio/xmms/patches/patch-aa +++ b/audio/xmms/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.8 2004/05/06 14:48:57 drochner Exp $ +$NetBSD: patch-aa,v 1.9 2005/09/06 08:10:57 abs Exp $ --- Input/cdaudio/cdaudio.c.orig 2004-05-06 17:52:36.000000000 +0200 +++ Input/cdaudio/cdaudio.c 2004-05-06 17:54:45.000000000 +0200 @@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.8 2004/05/06 14:48:57 drochner Exp $ FILE *mounts; struct mntent *mnt; #elif defined(HAVE_GETMNTINFO) -+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */ ++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ + struct statvfs *fsp; +#else struct statfs *fsp; diff --git a/chat/centericq/distinfo b/chat/centericq/distinfo index 455f905d27a..1fbb00a2bd1 100644 --- a/chat/centericq/distinfo +++ b/chat/centericq/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.16 2005/07/16 18:55:23 adrianp Exp $ +$NetBSD: distinfo,v 1.17 2005/09/06 08:10:57 abs Exp $ SHA1 (centericq-4.20.0.tar.bz2) = 14b37c5257039853f0a1b948c7eaa49581a5913c RMD160 (centericq-4.20.0.tar.bz2) = 7f17cd87aa4b98269fa65173b3e6317143c7c8ca Size (centericq-4.20.0.tar.bz2) = 1287040 bytes -SHA1 (patch-aa) = 47dc554bb923e8fe3c5aeb3792166dc3fea1b46a +SHA1 (patch-aa) = ba75c486f52d17cb9a0bf8354bf6b01b065b6716 SHA1 (patch-ab) = 6d9beb28024666bbfef2e95cab648d7058f8136c SHA1 (patch-ac) = 74ae25e19bf5d250a407a937bf78405b38cc86da SHA1 (patch-ad) = be8ba5c952bf560b0758c97ba81c4faef04ffe49 diff --git a/chat/centericq/patches/patch-aa b/chat/centericq/patches/patch-aa index a3c1e73b45f..441e0fe5d0d 100644 --- a/chat/centericq/patches/patch-aa +++ b/chat/centericq/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2005/04/05 12:44:17 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2005/09/06 08:10:57 abs Exp $ --- src/icqconf.cc.orig 2005-01-27 00:52:47.000000000 +0100 +++ src/icqconf.cc @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2005/04/05 12:44:17 wiz Exp $ +/* Find out about __NetBSD_Version__ */ +# include <sys/param.h> +#endif -+#if defined(__sun__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000)) ++#if defined(__sun__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)) #include <sys/statvfs.h> #endif @@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.3 2005/04/05 12:44:17 wiz Exp $ fenoughdiskspace = true; -#ifndef __sun__ -+#if !(defined(__sun__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000))) ++#if !(defined(__sun__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))) struct statfs st; if(!statfs(conf.getdirname().c_str(), &st)) { #else diff --git a/devel/libaura/distinfo b/devel/libaura/distinfo index 2cb01c563f7..5c4ba66593f 100644 --- a/devel/libaura/distinfo +++ b/devel/libaura/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 22:24:17 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/09/06 08:10:57 abs Exp $ SHA1 (libaura-2.0.tar.gz) = 4f91d8efaca9ffb2b9ae244187bd49f7c1969d6a RMD160 (libaura-2.0.tar.gz) = 6901381e42abfbf323fccb735ffbd7fa5171ad8e Size (libaura-2.0.tar.gz) = 10682 bytes -SHA1 (patch-aa) = a3b7e2540c289f6eb4222464efd86c918e8cfa9d +SHA1 (patch-aa) = 6973345c5476700565e230021e5d60350b86fa0d SHA1 (patch-ab) = 74c6510dcde9b579f39e089dae97c7a4cdd6869b diff --git a/devel/libaura/patches/patch-aa b/devel/libaura/patches/patch-aa index f21672ccbd0..7bb18dcdd8d 100644 --- a/devel/libaura/patches/patch-aa +++ b/devel/libaura/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/02/09 05:40:28 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2005/09/06 08:10:57 abs Exp $ --- fspred.c.orig 2005-02-09 04:36:15.000000000 +0100 +++ fspred.c 2005-02-09 04:41:15.000000000 +0100 @@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/02/09 05:40:28 xtraeme Exp $ #include <stdlib.h> #include <string.h> -+#if (__NetBSD_Version__ >= 200040000) ++#if (__NetBSD_Version__ >= 299000900) +#define STATFS statvfs +#else +#define STATFS statfs diff --git a/devel/libinstaller/distinfo b/devel/libinstaller/distinfo index a8727c91b89..ea48319bed0 100644 --- a/devel/libinstaller/distinfo +++ b/devel/libinstaller/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 22:24:18 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/09/06 08:10:57 abs Exp $ SHA1 (libinstaller-4.0.tar.gz) = caeadbd8c6d31266c78b3f2ce0669336cb2dd0ce RMD160 (libinstaller-4.0.tar.gz) = 44a222bc4ca2874e85d9b9785d72a9b09c04be91 Size (libinstaller-4.0.tar.gz) = 20889 bytes -SHA1 (patch-aa) = 7d0117d988b04c6af288858b0130d86a2937a468 +SHA1 (patch-aa) = 50df08fc142ba427f38fe4aae63fa180b6fff872 SHA1 (patch-ab) = 04948d74af934cb95c045868b8fca3538271465c SHA1 (patch-ac) = 9f9a8a71b0ef7283146ffc80fe3ff7f3c289cfd2 SHA1 (patch-ad) = 3dc1320562d5dbca60fce9c404039b8a92420991 diff --git a/devel/libinstaller/patches/patch-aa b/devel/libinstaller/patches/patch-aa index 4517e06636d..ac3113f0b46 100644 --- a/devel/libinstaller/patches/patch-aa +++ b/devel/libinstaller/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/02/09 05:44:18 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2005/09/06 08:10:57 abs Exp $ --- mount.c.orig 2005-02-09 04:51:24.000000000 +0100 +++ mount.c 2005-02-09 04:52:38.000000000 +0100 @@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/02/09 05:44:18 xtraeme Exp $ #include "commands.h" #include "functions.h" -+#if (__NetBSD_Version__ >= 200040000) ++#if (__NetBSD_Version__ >= 299000900) +#define STATFS statvfs +#else +#define STATFS statfs diff --git a/devel/physfs/distinfo b/devel/physfs/distinfo index cbb6719447e..b147a4b5524 100644 --- a/devel/physfs/distinfo +++ b/devel/physfs/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2005/07/25 12:12:53 wiz Exp $ +$NetBSD: distinfo,v 1.8 2005/09/06 08:10:57 abs Exp $ SHA1 (physfs-1.0.1.tar.gz) = 48803ceb60b44a4d3b7511b7a2d66a020d86e95a RMD160 (physfs-1.0.1.tar.gz) = 3a3fc6f66b397fe966e5aa661e3aa415055ef3b1 Size (physfs-1.0.1.tar.gz) = 539978 bytes SHA1 (patch-aa) = 3d24970fa5fbd64e4fe05b763d75a64deec57a16 SHA1 (patch-ab) = 74600b7e2db083df2cff5f0a6cbd31be366157a0 -SHA1 (patch-ac) = 499c7e7780dacee4bf55df608bd90994079e5f12 +SHA1 (patch-ac) = 8d16dc12e505f720b58c6d89b36d8680da30fd6e diff --git a/devel/physfs/patches/patch-ac b/devel/physfs/patches/patch-ac index da50600a434..99ba14019b5 100644 --- a/devel/physfs/patches/patch-ac +++ b/devel/physfs/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2004/09/21 00:30:59 wiz Exp $ +$NetBSD: patch-ac,v 1.3 2005/09/06 08:10:57 abs Exp $ --- platform/unix.c.orig 2003-05-24 05:26:03.000000000 +0200 +++ platform/unix.c @@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.2 2004/09/21 00:30:59 wiz Exp $ #elif (defined PHYSFS_HAVE_SYS_UCRED_H) -+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000) ++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) +#include <sys/statvfs.h> + +#define STATVFS_TYPE statvfs diff --git a/devel/pwlib/distinfo b/devel/pwlib/distinfo index 7867fde27cd..b6ea3761298 100644 --- a/devel/pwlib/distinfo +++ b/devel/pwlib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2005/02/23 22:24:31 agc Exp $ +$NetBSD: distinfo,v 1.15 2005/09/06 08:10:57 abs Exp $ SHA1 (pwlib-v1_8_3-src-tar.gz) = d3a6eff571ebfd37889e75cbaef75983e6119d2e RMD160 (pwlib-v1_8_3-src-tar.gz) = 1ce2544ef631c8344543e62988f97022c998bb05 @@ -6,7 +6,7 @@ Size (pwlib-v1_8_3-src-tar.gz) = 1900922 bytes SHA1 (patch-aa) = f07517555dee8ba1a0b4ecad93aa36a57ae024b2 SHA1 (patch-ab) = 7d7e09d5403a8b98c832e286eb8403d457164d0e SHA1 (patch-ac) = c0284e67ce689d774b715be4dc17214aa88c3d4a -SHA1 (patch-ad) = 6637d2a511a9cb71a3a53c8a5d3b7f6132d04958 +SHA1 (patch-ad) = 2d27b2485611f5e2ae304541d1b74a61d3498ffc SHA1 (patch-af) = c38f646d75d57f17101ce42813f8e66232778447 SHA1 (patch-ai) = 68e6b9ef55695a01193c1e77eb7960232311e695 SHA1 (patch-aj) = 93e039bb60c5cb75abb916e2797c644b67a6b9b0 diff --git a/devel/pwlib/patches/patch-ad b/devel/pwlib/patches/patch-ad index 3f346b32b0d..d34f0fc9d82 100644 --- a/devel/pwlib/patches/patch-ad +++ b/devel/pwlib/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.4 2004/12/28 16:09:47 wiz Exp $ +$NetBSD: patch-ad,v 1.5 2005/09/06 08:10:57 abs Exp $ --- src/ptlib/unix/osutil.cxx.orig 2004-09-23 07:00:10.000000000 +0200 +++ src/ptlib/unix/osutil.cxx @@ -6,7 +6,7 @@ $NetBSD: patch-ad,v 1.4 2004/12/28 16:09:47 wiz Exp $ #elif defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_MACOS) #define P_USE_STRFTIME -+#if defined(__NetBSD__) && __NetBSD_Version__ > 200040000 ++#if defined(__NetBSD__) && __NetBSD_Version__ > 299000900 +#include <sys/statvfs.h> +#define statfs statvfs +#else diff --git a/emulators/pcemu/distinfo b/emulators/pcemu/distinfo index e4f9a5962bf..7848377a45a 100644 --- a/emulators/pcemu/distinfo +++ b/emulators/pcemu/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 18:49:19 agc Exp $ +$NetBSD: distinfo,v 1.7 2005/09/06 08:10:58 abs Exp $ SHA1 (pcemu1.01alpha.tar.gz) = 4c0cf9b3b197e890fbc85dc85ca0d7c75eb145b3 RMD160 (pcemu1.01alpha.tar.gz) = 2eb3ba91138d08946728a6dc1dee6482416c3a01 Size (pcemu1.01alpha.tar.gz) = 316257 bytes SHA1 (patch-aa) = f53e918695b8929688b375c1af6f003b02ffa4ca SHA1 (patch-ab) = 6636736f76b956a2beb6490785b63f4a131c9c25 -SHA1 (patch-ac) = a253d92f7e6dc8838bd8fbb19f5ce235a00b822c +SHA1 (patch-ac) = ba75ebd170b9847f982b045a3a618daaaa94f179 SHA1 (patch-ad) = 5b4c50d591eb5060276015e8b178475de38293fd SHA1 (patch-ae) = c641955b80afabb688739fca411f3c31c2aa16a7 SHA1 (patch-af) = d36be5e25896ebc66bb2cc11135d61053a7e57ff diff --git a/emulators/pcemu/patches/patch-ac b/emulators/pcemu/patches/patch-ac index e079b4f31fe..2127ce91e7b 100644 --- a/emulators/pcemu/patches/patch-ac +++ b/emulators/pcemu/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.4 2004/09/16 17:16:18 minskim Exp $ +$NetBSD: patch-ac,v 1.5 2005/09/06 08:10:58 abs Exp $ --- mfs.c.orig 1994-06-22 09:24:51.000000000 -0500 +++ mfs.c @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2004/09/16 17:16:18 minskim Exp $ +#endif -#ifdef SOLARIS -+#if defined(SOLARIS) || (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) ++#if defined(SOLARIS) || (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) #include <fcntl.h> #include <sys/statvfs.h> #endif @@ -35,7 +35,7 @@ $NetBSD: patch-ac,v 1.4 2004/09/16 17:16:18 minskim Exp $ get_disk_space(char *cwd, int *free, int *total) { -#ifdef SOLARIS -+#if defined(SOLARIS) || (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) ++#if defined(SOLARIS) || (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) struct statvfs fsbuf; if (statvfs(cwd, &fsbuf) >= 0) #else diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo index deaf0c4a086..c852b582291 100644 --- a/graphics/blender/distinfo +++ b/graphics/blender/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.17 2005/08/03 11:58:14 adam Exp $ +$NetBSD: distinfo,v 1.18 2005/09/06 08:10:58 abs Exp $ SHA1 (blender-2.37a.tar.gz) = 8070654abdca449658f8fb7c9ecfc4fb7e445465 RMD160 (blender-2.37a.tar.gz) = 77a78a9f5ead45b7d1f67837c30446afbe937889 Size (blender-2.37a.tar.gz) = 7990789 bytes -SHA1 (patch-ab) = d0579486a3887d8cbfea341edf2f11f41e9a47ae +SHA1 (patch-ab) = 3c8b57b1aac2aba141d8392ce8e9c7759febd68f SHA1 (patch-ac) = dcfa14519404915a69bd626c8a5a6029d2535ca2 SHA1 (patch-ae) = 5bf3ac144f8934c517115a7633b86a47627cc922 diff --git a/graphics/blender/patches/patch-ab b/graphics/blender/patches/patch-ab index dc45fb372ed..0c2d6df08f5 100644 --- a/graphics/blender/patches/patch-ab +++ b/graphics/blender/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2005/08/03 11:58:14 adam Exp $ +$NetBSD: patch-ab,v 1.5 2005/09/06 08:10:58 abs Exp $ --- source/blender/blenlib/intern/storage.c.orig 2005-04-30 09:57:35.000000000 +0000 +++ source/blender/blenlib/intern/storage.c @@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.4 2005/08/03 11:58:14 adam Exp $ return (double) (freec*bytesps*sectorspc); #else -+#if defined (__NetBSD__) && __NetBSD_Version__ >= 200040000 /* 2.0D */ ++#if defined (__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */ + struct statvfs disk; +#else struct statfs disk; @@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.4 2005/08/03 11:58:14 adam Exp $ } else strcpy(name,"/"); -#if defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) || defined (__APPLE__) -+#if defined (__NetBSD__) && __NetBSD_Version__ >= 200040000 /* 2.0D */ ++#if defined (__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */ + if (statvfs(name, &disk)) return(-1); +#elif defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) || \ + defined (__APPLE__) || defined (__NetBSD__) diff --git a/ham/dpbox/distinfo b/ham/dpbox/distinfo index 3e6c4bf54b0..337e967be36 100644 --- a/ham/dpbox/distinfo +++ b/ham/dpbox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2005/02/22 21:06:06 agc Exp $ +$NetBSD: distinfo,v 1.8 2005/09/06 08:10:58 abs Exp $ SHA1 (dpbox-60000.tar.gz) = 73a55785f499324f57736c7fb3cc0bd1001facd3 RMD160 (dpbox-60000.tar.gz) = 05a14f7601b531fcdd0bc0252d171eed3bfafb7f @@ -8,4 +8,4 @@ SHA1 (patch-ab) = abeee7b86844c8937792ef09a938caf232574fb3 SHA1 (patch-ac) = faa4e5b32a31283e0ed7ed9730c026ccd5efffb4 SHA1 (patch-ad) = 589a69328b5959f81b86739a6e3c32f6d1d71ffe SHA1 (patch-ae) = 9c8ac68bb2102f19d2dea85dbe18197c7ad2b864 -SHA1 (patch-af) = 37bb5b682c3358be3b8459962ef97822d9528bb0 +SHA1 (patch-af) = 8c6745b43447aba7373366b9327dd316b1494ddf diff --git a/ham/dpbox/patches/patch-af b/ham/dpbox/patches/patch-af index f6c7bff2abe..26f0612ca66 100644 --- a/ham/dpbox/patches/patch-af +++ b/ham/dpbox/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.2 2004/09/18 15:45:13 wiz Exp $ +$NetBSD: patch-af,v 1.3 2005/09/06 08:10:58 abs Exp $ --- filesys.c 2004/09/15 16:24:57 1.1 +++ filesys.c 2004/09/15 16:24:21 @@ -6,7 +6,7 @@ $NetBSD: patch-af,v 1.2 2004/09/18 15:45:13 wiz Exp $ #if defined(__linux__) || defined(__NetBSD__) -+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000) ++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) +#include <sys/statvfs.h> +#endif + @@ -18,7 +18,7 @@ $NetBSD: patch-af,v 1.2 2004/09/18 15:45:13 wiz Exp $ long DFree(char *mount) { -+#if defined(__NetBSD__) && (__NetBSD_Version__ < 200040000) ++#if defined(__NetBSD__) && (__NetBSD_Version__ < 299000900) struct statfs mystatfs; statfs(mount, &mystatfs); diff --git a/mail/exim3/distinfo b/mail/exim3/distinfo index 2ff4cece6ba..f0370c569e4 100644 --- a/mail/exim3/distinfo +++ b/mail/exim3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2005/05/25 12:44:39 wiz Exp $ +$NetBSD: distinfo,v 1.6 2005/09/06 08:10:58 abs Exp $ SHA1 (exim-3.36.tar.bz2) = 2a06a2858ebf8cdedf2e41fa3f258b5e468e270d RMD160 (exim-3.36.tar.bz2) = 2654601eaf54fc15c1ebeabfee53c828f2fd22dd @@ -10,4 +10,4 @@ SHA1 (patch-ad) = d4962927418489f77a8e0234f7f95628ed506026 SHA1 (patch-ae) = 0a01f3cfd2bfe59577edcb09b0f2f355185e28f0 SHA1 (patch-af) = bb171d4048ab3f802243dfec1aade86c0a7e0d21 SHA1 (patch-ag) = 9248e3fde82fed7a464c28f3335d4c419c038a03 -SHA1 (patch-ah) = 876541c725366a70c573dc338dad2b450005bbfe +SHA1 (patch-ah) = e8b0d19451581548f3ba838a99d2460dacff2613 diff --git a/mail/exim3/patches/patch-ah b/mail/exim3/patches/patch-ah index f300c725876..cd07ee42843 100644 --- a/mail/exim3/patches/patch-ah +++ b/mail/exim3/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1 2004/05/26 09:57:20 grant Exp $ +$NetBSD: patch-ah,v 1.2 2005/09/06 08:10:58 abs Exp $ --- OS/os.h-NetBSD.orig 2002-04-04 22:56:14.000000000 +1000 +++ OS/os.h-NetBSD @@ -8,7 +8,7 @@ $NetBSD: patch-ah,v 1.1 2004/05/26 09:57:20 grant Exp $ +#include <sys/param.h> + -+#if __NetBSD_Version__ >= 200040000 ++#if __NetBSD_Version__ >= 299000900 +/* NetBSD 2.0D switched to statvfs() */ +# include <sys/statvfs.h> +# define statfs statvfs diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index 441923916dc..00a5a44e429 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.12 2005/08/23 02:31:44 reed Exp $ +$NetBSD: distinfo,v 1.13 2005/09/06 08:10:58 abs Exp $ SHA1 (postfix/postfix-2.3-20050726.tar.gz) = 7b5c10f01a003b4764c6e4a672ae866ca53e793c RMD160 (postfix/postfix-2.3-20050726.tar.gz) = 4eecae72057e23c97f05280485ad2ce9d1df7973 Size (postfix/postfix-2.2-20040628.tar.gz) = 2504873 bytes SHA1 (patch-aa) = 279b54f19289b56a423214716386c5aab79a57d5 -SHA1 (patch-ag) = 11af49528b1f1db2f3904dee5130a06ce9711664 +SHA1 (patch-ag) = 806a75127cb596059ca68664ad7ba070e96cc589 SHA1 (patch-ai) = 14fdae53a54422c9714442df2bc7c308393e0dfa diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag index 6e77ec87352..da64dc75032 100644 --- a/mail/postfix-current/patches/patch-ag +++ b/mail/postfix-current/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.7 2005/08/23 02:31:44 reed Exp $ +$NetBSD: patch-ag,v 1.8 2005/09/06 08:10:58 abs Exp $ --- src/util/sys_defs.h.orig 2005-07-14 14:28:33.000000000 -0700 +++ src/util/sys_defs.h 2005-08-22 19:05:24.000000000 -0700 @@ -37,7 +37,7 @@ $NetBSD: patch-ag,v 1.7 2005/08/23 02:31:44 reed Exp $ #define ALIAS_DB_MAP "hash:/etc/aliases" #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0) #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin" -+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */ ++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ +#define USE_STATVFS +#define STATVFS_IN_SYS_STATVFS_H +#else diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index ec7721a637a..fd7e33660d9 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.88 2005/07/22 06:12:44 martti Exp $ +$NetBSD: distinfo,v 1.89 2005/09/06 08:10:58 abs Exp $ SHA1 (postfix/postfix-2.2.5.tar.gz) = 5e86340e6ccff5a9141c259a6b65f72b7396483d RMD160 (postfix/postfix-2.2.5.tar.gz) = 5508f9662319e655daf8ec8b70fb508f0bb15bb0 @@ -6,5 +6,5 @@ Size (postfix/postfix-2.2.5.tar.gz) = 2428594 bytes SHA1 (patch-aa) = 49d2bf6c7e5bbe5aac4d950ac69c7b6b32a98ef3 SHA1 (patch-ab) = c506a08b694f94ef4884fa97eec51e44c92812dd SHA1 (patch-ac) = ffcd4f8b00c1cf01f050a0c943bfe61a1ec2361a -SHA1 (patch-ag) = dd7851aa16b7458e0cb1975742cf8da4118866b3 +SHA1 (patch-ag) = 7e992130da8b450c72d40c20c50d87840261d59d SHA1 (patch-ai) = d24b434fcd8964d1d27e6c0eac93e2d742de98ab diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag index dcc44d46366..ab6b2378019 100644 --- a/mail/postfix/patches/patch-ag +++ b/mail/postfix/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.15 2005/04/04 18:13:32 martti Exp $ +$NetBSD: patch-ag,v 1.16 2005/09/06 08:10:58 abs Exp $ --- src/util/sys_defs.h.orig 2005-02-04 02:07:44.000000000 +0200 +++ src/util/sys_defs.h 2005-04-04 20:55:05.000000000 +0300 @@ -6,7 +6,7 @@ $NetBSD: patch-ag,v 1.15 2005/04/04 18:13:32 martti Exp $ #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0) +#define RESOLVE_H_NEEDS_NAMESER8_COMPAT_H #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin" -+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */ ++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ +#define USE_STATVFS +#define STATVFS_IN_SYS_STATVFS_H +#else diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo index 8b732c4051f..545665e0cd1 100644 --- a/misc/kdeutils3/distinfo +++ b/misc/kdeutils3/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.32 2005/07/30 11:26:12 markd Exp $ +$NetBSD: distinfo,v 1.33 2005/09/06 08:10:58 abs Exp $ SHA1 (kdeutils-3.4.2.tar.bz2) = 685223a74b0401901910242924220bea6debcf8a RMD160 (kdeutils-3.4.2.tar.bz2) = ce40d0b3559627371eade5fe0374622b6f1d25df Size (kdeutils-3.4.2.tar.bz2) = 2290150 bytes -SHA1 (patch-ac) = c1d962b36bbc3ee3f63155c3d98aa9f92117ecf0 +SHA1 (patch-ac) = 9b31039b0e3cc05dc4fb288ee8f66ebf3e440f6e SHA1 (patch-ad) = ad4fcdda6f9fc1b91e1f125421800e412e2ee0aa SHA1 (patch-an) = e13957a9fa0d23aebbe149ecaca7b9dacde5c9fb SHA1 (patch-ao) = e6998991444af6becbe89b674728080a27e7a0f1 diff --git a/misc/kdeutils3/patches/patch-ac b/misc/kdeutils3/patches/patch-ac index 1c4af3e1e56..5fcc7d95ff2 100644 --- a/misc/kdeutils3/patches/patch-ac +++ b/misc/kdeutils3/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.5 2004/05/04 13:52:11 mrg Exp $ +$NetBSD: patch-ac,v 1.6 2005/09/06 08:10:58 abs Exp $ --- ark/arkutils.cpp.orig 2003-11-30 20:50:36.000000000 +1100 +++ ark/arkutils.cpp 2004-05-04 22:57:13.000000000 +1000 @@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.5 2004/05/04 13:52:11 mrg Exp $ #ifdef BSD4_4 #include <sys/mount.h> +#ifdef __NetBSD__ -+#if __NetBSD_Version__ >= 200040000 /* 2.0D */ ++#if __NetBSD_Version__ >= 299000900 /* 2.99.9 */ +#include <sys/statvfs.h> +#define STATFS statvfs +#endif diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo index 2fff524e802..2c838bb3455 100644 --- a/misc/openoffice/distinfo +++ b/misc/openoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.31 2005/04/14 20:48:58 mrauch Exp $ +$NetBSD: distinfo,v 1.32 2005/09/06 08:10:58 abs Exp $ SHA1 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 3161dbe53f6ec0b0d5a65790a2b1dd3d7331b430 RMD160 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 0e218792bb72106cd494532de373d0f40a5a9587 @@ -48,9 +48,9 @@ SHA1 (patch-ao) = 68d21a0daf48d47c7a1ab398bb98c48d7f002c4e SHA1 (patch-ap) = 8f885c569f09ba3d66481e8d3b60238a50fd38bb SHA1 (patch-aq) = 82285ade1af0a0c5e84d322d5a3a925c095103bb SHA1 (patch-ar) = f185c705cda716e1b52e5b6ca6d9c5d2a9b341bc -SHA1 (patch-as) = 71d4d5a1517274ed9aff3e6c2bd89265772c93af -SHA1 (patch-at) = f38552d47fbbc1013b00a29b5c451607236b2b84 -SHA1 (patch-au) = 662e14be36e28aacf0bb3961c194c69d39cef8a8 +SHA1 (patch-as) = 81cd7e2a6ff24729a0276d397b285b07c9694205 +SHA1 (patch-at) = d208593e5fd37687c4be0b2735fdcc57760f7f3a +SHA1 (patch-au) = 3fd383266f24c4a0c5e6f0cd00d419e1fe20cafa SHA1 (patch-av) = f6f0aa984f7d975c721d616b348a69cff6173ff8 SHA1 (patch-aw) = f0decfe7d1bac881ec83b09328a6b863a9bed7b1 SHA1 (patch-ax) = 4a918df6dfd058fd6abecfc4c9b85a21bfc18364 diff --git a/misc/openoffice/patches/patch-as b/misc/openoffice/patches/patch-as index 92ec67857b0..5380f43cecc 100644 --- a/misc/openoffice/patches/patch-as +++ b/misc/openoffice/patches/patch-as @@ -1,4 +1,4 @@ -$NetBSD: patch-as,v 1.4 2004/05/09 00:12:13 jdolecek Exp $ +$NetBSD: patch-as,v 1.5 2005/09/06 08:10:58 abs Exp $ --- ../sal/osl/unx/file.c.orig 2004-05-07 09:57:55.000000000 +0200 +++ ../sal/osl/unx/file.c @@ -19,8 +19,8 @@ $NetBSD: patch-as,v 1.4 2004/05/09 00:12:13 jdolecek Exp $ + +#include <sys/param.h> + -+/* statvfs() replaced statfs() in 2.0D */ -+# if __NetBSD_Version__ >= 200040000 ++/* statvfs() replaced statfs() in 2.99.9 */ ++# if __NetBSD_Version__ >= 299000900 + /* 2.0D or later */ +# define __OSL_STATFS_STRUCT struct statvfs +# define __OSL_STATFS(dir, sfs) statvfs((dir), (sfs)) diff --git a/misc/openoffice/patches/patch-at b/misc/openoffice/patches/patch-at index 7c9a056e497..2b8402c99d0 100644 --- a/misc/openoffice/patches/patch-at +++ b/misc/openoffice/patches/patch-at @@ -1,4 +1,4 @@ -$NetBSD: patch-at,v 1.4 2004/05/09 00:12:13 jdolecek Exp $ +$NetBSD: patch-at,v 1.5 2005/09/06 08:10:58 abs Exp $ --- ../setup2/mow/source/system/mowos.cxx.orig 2004-05-07 14:54:42.000000000 +0200 +++ ../setup2/mow/source/system/mowos.cxx @@ -13,11 +13,11 @@ $NetBSD: patch-at,v 1.4 2004/05/09 00:12:13 jdolecek Exp $ #define statvfs statfs +#elif defined(NETBSD) +#include <sys/param.h> -+# if __NetBSD_Version__ >= 200040000 -+ /* NetBSD 2.0D switched to statvfs() */ ++# if __NetBSD_Version__ >= 299000900 ++ /* NetBSD 2.99.9 switched to statvfs() */ +# include <sys/statvfs.h> +# else -+ /* before NetBSD 2.0D */ ++ /* before NetBSD 2.99.9 */ +# include <sys/mount.h> +# define statvfs statfs +# endif diff --git a/misc/openoffice/patches/patch-au b/misc/openoffice/patches/patch-au index 3c9b50d1a5f..283494b7ce6 100644 --- a/misc/openoffice/patches/patch-au +++ b/misc/openoffice/patches/patch-au @@ -1,4 +1,4 @@ -$NetBSD: patch-au,v 1.4 2004/05/09 00:12:13 jdolecek Exp $ +$NetBSD: patch-au,v 1.5 2005/09/06 08:10:59 abs Exp $ --- ../setup2/mow/source/loader/loader.c.orig 2004-05-07 17:13:38.000000000 +0200 +++ ../setup2/mow/source/loader/loader.c @@ -13,11 +13,11 @@ $NetBSD: patch-au,v 1.4 2004/05/09 00:12:13 jdolecek Exp $ # define statvfs statfs +#elif defined(NETBSD) +#include <sys/param.h> -+# if __NetBSD_Version__ >= 200040000 -+ /* NetBSD 2.0D switched to statvfs() */ ++# if __NetBSD_Version__ >= 299000900 ++ /* NetBSD 2.99.9 switched to statvfs() */ +# include <sys/statvfs.h> +# else -+ /* before NetBSD 2.0D */ ++ /* before NetBSD 2.99.9 */ +# include <sys/mount.h> +# define statvfs statfs +# endif diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index 8fb38bfdcb4..6d02e672cb9 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2005/07/30 11:22:20 markd Exp $ +$NetBSD: distinfo,v 1.21 2005/09/06 08:10:59 abs Exp $ SHA1 (kdemultimedia-3.4.2.tar.bz2) = a866cbb1683364c843005434faa3296efda44af5 RMD160 (kdemultimedia-3.4.2.tar.bz2) = 1b1c3712e23cdcf521c63507ff660a07171a7714 @@ -6,7 +6,7 @@ Size (kdemultimedia-3.4.2.tar.bz2) = 5535960 bytes SHA1 (patch-aa) = ecea21cb53b01cc98a15408becd319c2930b67d0 SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70 SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413 -SHA1 (patch-ad) = 272548cfda5b9d8ea2fd16d7d490ef74a5c349e6 +SHA1 (patch-ad) = faf216d3b26c6dfed1b2fa919de69b14a92d0966 SHA1 (patch-af) = 0336b3def99c649a635e6f5eb0cc962944e890b2 SHA1 (patch-ag) = c9d1d9d3cf8f18ed9bc8c2054dc641af961d8fb1 SHA1 (patch-ah) = e84b9dc302a5c8bb7259cd23343bfbc80c287cf2 diff --git a/multimedia/kdemultimedia3/patches/patch-ad b/multimedia/kdemultimedia3/patches/patch-ad index 8530589f698..c0052bee910 100644 --- a/multimedia/kdemultimedia3/patches/patch-ad +++ b/multimedia/kdemultimedia3/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2004/05/04 11:30:17 mrg Exp $ +$NetBSD: patch-ad,v 1.2 2005/09/06 08:10:59 abs Exp $ --- kscd/libwm/plat_freebsd.c.orig 2003-05-05 22:19:39.000000000 +1000 +++ kscd/libwm/plat_freebsd.c 2004-05-04 19:17:17.000000000 +1000 @@ -9,7 +9,7 @@ $NetBSD: patch-ad,v 1.1 2004/05/04 11:30:17 mrg Exp $ +/* XXX */ +#ifdef __NetBSD__ +# include <sys/param.h> -+# if __NetBSD_Version__ >= 200040000 /* 2.0D */ ++# if __NetBSD_Version__ >= 299000900 /* 2.99.9 */ +# define HAVE_SYS_STATVFS_H 1 +# endif +#endif diff --git a/multimedia/libmpeg3/distinfo b/multimedia/libmpeg3/distinfo index 17f87c1e3a5..fb2280f62ed 100644 --- a/multimedia/libmpeg3/distinfo +++ b/multimedia/libmpeg3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2005/07/13 13:16:36 wiz Exp $ +$NetBSD: distinfo,v 1.5 2005/09/06 08:10:59 abs Exp $ SHA1 (libmpeg3-1.3.tar.gz) = e7e8b03ab45d5593558b0d19e31f0694cfdfa2b5 RMD160 (libmpeg3-1.3.tar.gz) = b1751f681d26758873746aa38368150eb0a4bafd @@ -7,7 +7,7 @@ SHA1 (patch-aa) = 88e1c193bb00056f757830c98f6bbbc58c1b16da SHA1 (patch-ab) = 844cfcbd99269f1f0b4bef76e0a8567522070707 SHA1 (patch-ac) = 68576efb30a0d6f4cfe23fd543a04c4f3ada8936 SHA1 (patch-ad) = 86edf9af264370bf89050b02e956b5bacc86881e -SHA1 (patch-ae) = 05209b31a53a25945907088377772861ff0a38bf +SHA1 (patch-ae) = 919ad3973104d161c0c38d016ce2b35390332454 SHA1 (patch-af) = 7e62a236ee0a7398c1b1a3e994261ebb9be50bae SHA1 (patch-ag) = bf321ac689b82889ca1a2bb8a96cb6e387280f32 SHA1 (patch-ah) = 58ffda3df9be3b089de362451ddf249a74fac5be diff --git a/multimedia/libmpeg3/patches/patch-ae b/multimedia/libmpeg3/patches/patch-ae index 4565152defa..d797d8107ee 100644 --- a/multimedia/libmpeg3/patches/patch-ae +++ b/multimedia/libmpeg3/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.3 2005/07/13 13:16:27 wiz Exp $ +$NetBSD: patch-ae,v 1.4 2005/09/06 08:10:59 abs Exp $ --- mpeg3io.c.orig 2001-05-20 05:05:26.000000000 +0200 +++ mpeg3io.c @@ -14,7 +14,7 @@ $NetBSD: patch-ae,v 1.3 2005/07/13 13:16:27 wiz Exp $ #include <string.h> +#ifdef __NetBSD__ -+# if __NetBSD_Version__ >= 200040000 /* 2.0D */ ++# if __NetBSD_Version__ >= 299000900 /* 2.99.9 */ +# define statfs statvfs +# endif +#endif diff --git a/net/sharity-light/distinfo b/net/sharity-light/distinfo index eddb13d1e75..40b9945bad3 100644 --- a/net/sharity-light/distinfo +++ b/net/sharity-light/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 12:14:04 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/09/06 08:10:59 abs Exp $ SHA1 (Sharity-Light.1.2.tar.gz) = 4a8e93695b1772005e401c2aafbd3f5f70a3b30e RMD160 (Sharity-Light.1.2.tar.gz) = 35fba8ab2ebd98cf32f2b20ac0fc8325a6c69325 Size (Sharity-Light.1.2.tar.gz) = 76481 bytes SHA1 (patch-aa) = 349384306807e8d0e16334a2d9a7e7e0002ef8d1 -SHA1 (patch-ab) = c3f4ad2b57b5b93915bfb59e846cdf9175bbf728 +SHA1 (patch-ab) = b973fde2f268408289774a4dd37521a1671ef12d SHA1 (patch-ac) = 2087a294f04ff2cc4fc4edd1814807e6f01cd949 -SHA1 (patch-ad) = 1daa21a239d5922e8c51a85e5340ea5596583d6b +SHA1 (patch-ad) = a93762c2130349856c02f965743f424335bc7726 diff --git a/net/sharity-light/patches/patch-ab b/net/sharity-light/patches/patch-ab index 22ab908355c..19b5a7634c9 100644 --- a/net/sharity-light/patches/patch-ab +++ b/net/sharity-light/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2004/09/16 17:57:02 minskim Exp $ +$NetBSD: patch-ab,v 1.3 2005/09/06 08:10:59 abs Exp $ --- nfs/syscalls.c.orig 1998-06-30 07:24:56.000000000 -0500 +++ nfs/syscalls.c @@ -8,7 +8,7 @@ $NetBSD: patch-ab,v 1.2 2004/09/16 17:57:02 minskim Exp $ +#ifdef __NetBSD__ +#include <nfs/nfsmount.h> -+#if __NetBSD_Version__ >= 200040000 ++#if __NetBSD_Version__ >= 299000900 +#define statfs statvfs +#endif +#endif diff --git a/net/sharity-light/patches/patch-ad b/net/sharity-light/patches/patch-ad index 5fb200b71d5..13f995a5126 100644 --- a/net/sharity-light/patches/patch-ad +++ b/net/sharity-light/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2004/09/16 17:57:02 minskim Exp $ +$NetBSD: patch-ad,v 1.2 2005/09/06 08:10:59 abs Exp $ --- ../unshlight/unshlight.c.orig 2001-03-09 10:09:36.000000000 -0600 +++ ../unshlight/unshlight.c @@ -6,7 +6,7 @@ $NetBSD: patch-ad,v 1.1 2004/09/16 17:57:02 minskim Exp $ #include <stdlib.h> #include <signal.h> -+#if defined(__NetBSD__) && __NetBSD_Version__ >= 200040000 ++#if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 +#define statfs statvfs +#endif + diff --git a/net/spegla/distinfo b/net/spegla/distinfo index 1b5b3b172b1..81baf480c7b 100644 --- a/net/spegla/distinfo +++ b/net/spegla/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2005/02/24 12:14:04 agc Exp $ +$NetBSD: distinfo,v 1.6 2005/09/06 08:10:59 abs Exp $ SHA1 (spegla-1.1p4.tar.gz) = c85036d0ed4e198c517198628fbc9a842f0d3e85 RMD160 (spegla-1.1p4.tar.gz) = 1e07b1a667a69d25df3b91bf2cb0a8b4bda8b839 Size (spegla-1.1p4.tar.gz) = 101515 bytes SHA1 (patch-aa) = c52aa11ed64f7ed3575aa868a1688c9777363d91 -SHA1 (patch-ab) = 8402ce241ccbac6953378adacdd79ceb54164ba9 +SHA1 (patch-ab) = b237f8bf7f6db1fce07d88ff42ea50b871449563 diff --git a/net/spegla/patches/patch-ab b/net/spegla/patches/patch-ab index 5e774c539ac..212ad51c93c 100644 --- a/net/spegla/patches/patch-ab +++ b/net/spegla/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.5 2004/12/09 16:01:58 wiz Exp $ +$NetBSD: patch-ab,v 1.6 2005/09/06 08:10:59 abs Exp $ --- spegla.c.orig 2000-05-27 15:38:14.000000000 +0200 +++ spegla.c @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.5 2004/12/09 16:01:58 wiz Exp $ struct fs_data f; #else -#ifdef Solaris -+#if defined(Solaris) || (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) ++#if defined(Solaris) || (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) struct statvfs f; #else struct statfs f; @@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.5 2004/12/09 16:01:58 wiz Exp $ return; -#ifdef Solaris -+#if defined(Solaris) || (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) ++#if defined(Solaris) || (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) if (statvfs(path, &f) < 0) e_err(1, "statvfs: %s", path); #else diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo index 204d5a48a26..7ecbae1dc7d 100644 --- a/parallel/mpi-ch/distinfo +++ b/parallel/mpi-ch/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2005/03/03 12:01:30 garbled Exp $ +$NetBSD: distinfo,v 1.10 2005/09/06 08:10:59 abs Exp $ SHA1 (mpich-1.2.6.tar.gz) = d3dba3993bc7b0bd11ec4e4bdb70374283770cea RMD160 (mpich-1.2.6.tar.gz) = dae2e2920a9bc0d3ca050fcb78b32d0f99a36dcf @@ -20,4 +20,4 @@ SHA1 (patch-bb) = 7f399ed3d4bbaf00b75ec3a5ce8f114e4c6bbd23 SHA1 (patch-bc) = e89bbf9e1ef9f2aaa6b8000d170c5a158408988d SHA1 (patch-bd) = 7c96f575263fbe9adc0514ed64452db04cc68212 SHA1 (patch-be) = d21a703dbe17a48fb940ce65fd232284a57ff3cf -SHA1 (patch-ca) = 095f2d5b801299e56b16e17ef1014fd5cf9b3332 +SHA1 (patch-ca) = f5c7c8ed152ed55c5e8275fc7ca4278231203945 diff --git a/parallel/mpi-ch/patches/patch-ca b/parallel/mpi-ch/patches/patch-ca index 24c2c3c7b0f..c8bed7bde39 100644 --- a/parallel/mpi-ch/patches/patch-ca +++ b/parallel/mpi-ch/patches/patch-ca @@ -1,4 +1,4 @@ -$NetBSD: patch-ca,v 1.2 2005/03/03 12:01:30 garbled Exp $ +$NetBSD: patch-ca,v 1.3 2005/09/06 08:10:59 abs Exp $ --- romio/adio/common/ad_fstype.c.orig 2003-09-04 13:24:44.000000000 -0700 +++ romio/adio/common/ad_fstype.c 2004-10-15 09:54:55.000000000 -0700 @@ -11,7 +11,15 @@ @@ -8,7 +8,7 @@ $NetBSD: patch-ca,v 1.2 2005/03/03 12:01:30 garbled Exp $ -#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY)) +#ifdef __NetBSD__ +#include <sys/param.h> -+#if __NetBSD_Version__ >= 200040000 ++#if __NetBSD_Version__ >= 299000900 +#define NETBSD_STATVFS +#define f_basetype f_fstypename +#endif diff --git a/sysutils/dvd+rw-tools/distinfo b/sysutils/dvd+rw-tools/distinfo index 1d30e0874fc..d5259da78b5 100644 --- a/sysutils/dvd+rw-tools/distinfo +++ b/sysutils/dvd+rw-tools/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2005/02/24 13:40:52 agc Exp $ +$NetBSD: distinfo,v 1.9 2005/09/06 08:10:59 abs Exp $ SHA1 (dvd+rw-tools-5.21.4.10.8.tar.gz) = 319a4529db3748f595aa9dc8f2e54564bb32a0e3 RMD160 (dvd+rw-tools-5.21.4.10.8.tar.gz) = 638f67ddfc24f89a4c2bc2abced652e679f4400f Size (dvd+rw-tools-5.21.4.10.8.tar.gz) = 107045 bytes -SHA1 (patch-aa) = 33096512b0bd21f62415885a3a8bac9fdba19eca +SHA1 (patch-aa) = 9fcb1e2e8e0302cd9693dccee1045fa5edf5b347 diff --git a/sysutils/dvd+rw-tools/patches/patch-aa b/sysutils/dvd+rw-tools/patches/patch-aa index 2abbc85b3a0..70dec429b84 100644 --- a/sysutils/dvd+rw-tools/patches/patch-aa +++ b/sysutils/dvd+rw-tools/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2004/06/30 00:11:23 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2005/09/06 08:10:59 abs Exp $ --- transport.hxx.orig 2004-04-19 18:25:06.000000000 +0200 +++ transport.hxx @@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.3 2004/06/30 00:11:23 wiz Exp $ #include <fcntl.h> #include <poll.h> #include <sys/time.h> -+#if __NetBSD_Version__ >= 200040000 ++#if __NetBSD_Version__ >= 299000900 +#include <sys/statvfs.h> +#endif @@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.3 2004/06/30 00:11:23 wiz Exp $ // mounted, so that it could as well just return 0; int umount(int f=-1) { struct stat fsb,msb; -+#if __NetBSD_Version__ >= 200040000 ++#if __NetBSD_Version__ >= 299000900 + struct statvfs *mntbuf; +#else struct statfs *mntbuf; @@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.3 2004/06/30 00:11:23 wiz Exp $ } int umount(int f=-1) { struct stat fsb,msb; -+#if __NetBSD_Version__ >= 200040000 ++#if __NetBSD_Version__ >= 299000900 + struct statvfs *mntbuf; +#else struct statfs *mntbuf; diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo index 76e2f4095a2..57994a28b10 100644 --- a/sysutils/gkrellm/distinfo +++ b/sysutils/gkrellm/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.32 2005/03/30 15:26:43 cube Exp $ +$NetBSD: distinfo,v 1.33 2005/09/06 08:10:59 abs Exp $ SHA1 (gkrellm-2.2.5.tar.bz2) = 4cbdf75828b3d8b216694c2e6978c29a4920595a RMD160 (gkrellm-2.2.5.tar.bz2) = 7755fa7bbf88dfd53185e76604981b2a5c81d74d Size (gkrellm-2.2.5.tar.bz2) = 668581 bytes -SHA1 (patch-aa) = e7d7dc8f3189632a8a0855c3fc39479482407cc4 +SHA1 (patch-aa) = 9dbffbc0bc95ea3fced7162da0ec55333396d256 SHA1 (patch-ab) = de2ef6e1d083a32c274d2ec42fa1b9e9d3d65663 SHA1 (patch-ac) = 8890d5a5e8eaf21508a1bf91de788183fd6f7a75 SHA1 (patch-ad) = c33319783a40ad64f43015200047656efc1bcdb3 diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa index 1bea27ef41b..eb130356750 100644 --- a/sysutils/gkrellm/patches/patch-aa +++ b/sysutils/gkrellm/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.14 2004/06/07 17:01:50 cube Exp $ +$NetBSD: patch-aa,v 1.15 2005/09/06 08:10:59 abs Exp $ --- src/sysdeps/bsd-common.c.orig 2004-05-01 19:46:38.000000000 +0200 +++ src/sysdeps/bsd-common.c @@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.14 2004/06/07 17:01:50 cube Exp $ gkrellm_sys_fs_get_mounts_list(void) { gchar *s, *dev, *dir, *type; -+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */ ++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ + struct statvfs *mntbuf; +#else struct statfs *mntbuf; @@ -18,20 +18,20 @@ $NetBSD: patch-aa,v 1.14 2004/06/07 17:01:50 cube Exp $ void gkrellm_sys_fs_get_fsusage(gpointer fs, gchar *dir) { -+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */ ++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ + struct statvfs st; +#else struct statfs st; +#endif -+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */ ++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ + if (!statvfs(dir, &st)) +#else if (!statfs(dir, &st)) +#endif gkrellm_fs_assign_fsusage_data(fs, (glong) st.f_blocks, (glong) st.f_bavail, -+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */ ++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ + (glong) st.f_bfree, (glong) st.f_frsize); +#else (glong) st.f_bfree, (glong) st.f_bsize); diff --git a/sysutils/gkrellm1/distinfo b/sysutils/gkrellm1/distinfo index 176ddc9a7e7..0b5b051f4b9 100644 --- a/sysutils/gkrellm1/distinfo +++ b/sysutils/gkrellm1/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 13:40:53 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/09/06 08:10:59 abs Exp $ SHA1 (gkrellm-1.2.13.tar.bz2) = ab0282e663b69ecf0d622ad7c02db0c72b793bd3 RMD160 (gkrellm-1.2.13.tar.bz2) = a5d9b7e439788613ebab9718aa05eff0c39d0a9a @@ -6,4 +6,4 @@ Size (gkrellm-1.2.13.tar.bz2) = 438917 bytes SHA1 (patch-aa) = c2656b0d5372ef1e26479ccedcbd05f4e6dbb5e3 SHA1 (patch-ab) = a2f1d4b4a253323b6623200c1fca4e0cee0d46f2 SHA1 (patch-ac) = 0bdbe9b788e62e4732ec87a1d6d8dbcacde7da82 -SHA1 (patch-ad) = 96534caca72b0794589adf5948ea081388cbada9 +SHA1 (patch-ad) = 4de2da50a6bd95c6e9d564f933ec19008771624c diff --git a/sysutils/gkrellm1/patches/patch-ad b/sysutils/gkrellm1/patches/patch-ad index 2f151bd70a5..407ff4eaf2e 100644 --- a/sysutils/gkrellm1/patches/patch-ad +++ b/sysutils/gkrellm1/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2004/08/15 06:03:19 minskim Exp $ +$NetBSD: patch-ad,v 1.2 2005/09/06 08:10:59 abs Exp $ --- src/fs.c.orig 2002-06-30 21:20:15.000000000 -0500 +++ src/fs.c @@ -6,7 +6,7 @@ $NetBSD: patch-ad,v 1.1 2004/08/15 06:03:19 minskim Exp $ #include "gkrellm_private_proto.h" #include "gkrellm_threads.h" -+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */ ++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ +#define statfs statvfs +#endif + diff --git a/sysutils/ntfsprogs/distinfo b/sysutils/ntfsprogs/distinfo index 63bf5b4472a..f2a44c710f9 100644 --- a/sysutils/ntfsprogs/distinfo +++ b/sysutils/ntfsprogs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2005/03/15 20:24:30 rillig Exp $ +$NetBSD: distinfo,v 1.4 2005/09/06 08:10:59 abs Exp $ SHA1 (ntfsprogs-1.9.4.tar.gz) = 1250e161f2ee7182bf6e473d4589b5139e3fda8a RMD160 (ntfsprogs-1.9.4.tar.gz) = cdeeb8629d5c68a8af23d06adaf56bec62a282e6 @@ -8,7 +8,7 @@ SHA1 (patch-ab) = 6d571d962e702d776792c84a81bdaf8e7b8357e4 SHA1 (patch-ac) = 3ebaa59a289c4085cfec2e27b7e94ce95ff9e74d SHA1 (patch-ad) = 576f8505b95965e0c49ec7e63516b49edd5f5679 SHA1 (patch-ae) = a72389126cda4a7c4cfb46760afdf7e14c94ece3 -SHA1 (patch-af) = f892b293fd235aec9ed4340a7ceb21620b2cbe5c +SHA1 (patch-af) = f3df508bab7c3606d314488428c2b1db69ccb946 SHA1 (patch-ag) = 79883013e1ee78c7d8901601badbe9f1857dab65 SHA1 (patch-ah) = b6da89fc9b5bbc83fa503dd887f3f2ec493ad7c7 SHA1 (patch-ai) = aa2784d6c859d7cb1136808cd0750c45c026928a diff --git a/sysutils/ntfsprogs/patches/patch-af b/sysutils/ntfsprogs/patches/patch-af index a03f4a008f1..af5f2213d85 100644 --- a/sysutils/ntfsprogs/patches/patch-af +++ b/sysutils/ntfsprogs/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $ +$NetBSD: patch-af,v 1.2 2005/09/06 08:10:59 abs Exp $ --- ntfsprogs/ntfsclone.c.orig Sat Sep 4 06:16:32 2004 +++ ntfsprogs/ntfsclone.c @@ -8,8 +8,8 @@ $NetBSD: patch-af,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $ +#ifdef __NetBSD__ +# include <sys/param.h> -+ /* NetBSD versions later than 2.0D have statvfs(2) instead of statfs(2) */ -+# if __NetBSD_Version__ >= 200040000 ++ /* NetBSD versions later than 2.99.9 have statvfs(2) instead of statfs(2) */ ++# if __NetBSD_Version__ >= 299000900 +# include <sys/statvfs.h> +# define F_TYPE f_fsid +# else @@ -24,7 +24,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $ int restore_image; char *output; char *volume; -+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000) ++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) + struct statvfs stfs; +#else struct statfs stfs; diff --git a/sysutils/vobcopy/distinfo b/sysutils/vobcopy/distinfo index 26b17bd6c34..999860b410e 100644 --- a/sysutils/vobcopy/distinfo +++ b/sysutils/vobcopy/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 13:40:59 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/09/06 08:10:59 abs Exp $ SHA1 (vobcopy-0.5.13.tar.gz) = dc1f931ed636f8583ddf438c4e195a0f8acec363 RMD160 (vobcopy-0.5.13.tar.gz) = 5512f0f16b02775b06971d04058fd98e69aa422e Size (vobcopy-0.5.13.tar.gz) = 48423 bytes -SHA1 (patch-aa) = e4a137071c662752bcdbfcf4abd34b93dedd0fd6 -SHA1 (patch-ab) = d02f258a134e3ba77fac24d4f197e7f7fdd1e7a0 +SHA1 (patch-aa) = 2ba3b61645cd499175d0e2d9d1063b4b621caadd +SHA1 (patch-ab) = a2c0c73863a235b9d65b8fa96017b2b2eff87ab8 diff --git a/sysutils/vobcopy/patches/patch-aa b/sysutils/vobcopy/patches/patch-aa index 79340ab334f..ca20b8e93df 100644 --- a/sysutils/vobcopy/patches/patch-aa +++ b/sysutils/vobcopy/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2004/04/22 15:28:47 drochner Exp $ +$NetBSD: patch-aa,v 1.3 2005/09/06 08:11:00 abs Exp $ --- dvd.c.orig 2004-03-26 19:53:10.000000000 +0100 +++ dvd.c 2004-04-22 16:27:45.000000000 +0200 @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.2 2004/04/22 15:28:47 drochner Exp $ +#if (defined(__unix__) || defined(unix)) && !defined(USG) || (defined(__APPLE__) && defined(__GNUC__)) || defined(__NetBSD__) #include <sys/param.h> +#define USE_GETMNTINFO -+#if !defined(__NetBSD__) || (__NetBSD_Version__ < 200040000) ++#if !defined(__NetBSD__) || (__NetBSD_Version__ < 299000900) #include <sys/mount.h> +#define USE_STATFS_FOR_DEV +#define GETMNTINFO_USES_STATFS diff --git a/sysutils/vobcopy/patches/patch-ab b/sysutils/vobcopy/patches/patch-ab index 1b5145d11c6..a876bbb8519 100644 --- a/sysutils/vobcopy/patches/patch-ab +++ b/sysutils/vobcopy/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2004/04/22 15:28:47 drochner Exp $ +$NetBSD: patch-ab,v 1.3 2005/09/06 08:11:00 abs Exp $ --- vobcopy.c.orig 2004-03-26 19:53:10.000000000 +0100 +++ vobcopy.c 2004-04-22 15:54:46.000000000 +0200 @@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.2 2004/04/22 15:28:47 drochner Exp $ #include <dvdread/dvd_reader.h> /* for solaris, but is also present in linux */ -#if (defined(BSD) && (BSD >= 199306)) ||(defined(__APPLE__) && defined(__GNUC__)) -+#if (defined(BSD) && (BSD >= 199306) && !defined(__NetBSD__)) ||(defined(__APPLE__) && defined(__GNUC__)) || (defined(__NetBSD__) && (__NetBSD_Version__ < 200040000)) ++#if (defined(BSD) && (BSD >= 199306) && !defined(__NetBSD__)) ||(defined(__APPLE__) && defined(__GNUC__)) || (defined(__NetBSD__) && (__NetBSD_Version__ < 299000900)) /* I don't know if *BSD have getopt-long... please tell me! */ //#define HAVE_GETOPT_LONG #include <sys/mount.h> diff --git a/x11/filerunner/distinfo b/x11/filerunner/distinfo index d7ef6d62038..f8efd33ef1a 100644 --- a/x11/filerunner/distinfo +++ b/x11/filerunner/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 17:36:10 wiz Exp $ +$NetBSD: distinfo,v 1.6 2005/09/06 08:11:00 abs Exp $ SHA1 (FileRunner-2.5.1.tar.gz) = ef607b3229491c1a6608fac67ce584d01a50c69d RMD160 (FileRunner-2.5.1.tar.gz) = 94c0dd841aac617c2b5632975e4c7fa1fe149c11 Size (FileRunner-2.5.1.tar.gz) = 122795 bytes SHA1 (patch-aa) = 3e929372fee6620c23022e5eaecd33830d9151f7 -SHA1 (patch-ab) = 88076263693fc7e379adccd6dac4c17e66519d46 +SHA1 (patch-ab) = 58bc890c640a9b58589e9fcdef7a9201f84f6e53 SHA1 (patch-ac) = fdef8612ff1ea187fbe26cb203f8f3f006032ef3 SHA1 (patch-ad) = cf7999d58ec441b03a3baa5d8097b26781bd00eb diff --git a/x11/filerunner/patches/patch-ab b/x11/filerunner/patches/patch-ab index 9163dc056f1..ef8edc8f2cd 100644 --- a/x11/filerunner/patches/patch-ab +++ b/x11/filerunner/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2004/08/15 03:25:24 minskim Exp $ +$NetBSD: patch-ab,v 1.5 2005/09/06 08:11:00 abs Exp $ --- ext.c.orig 1999-12-30 11:21:49.000000000 -0600 +++ ext.c @@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.4 2004/08/15 03:25:24 minskim Exp $ int argc, char* argv[]) { int i; -+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */ ++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ + struct statvfs stat; +#else struct statfs stat; |