diff options
| author | abs <abs@pkgsrc.org> | 2005-09-06 08:10:57 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2005-09-06 08:10:57 +0000 |
| commit | 7487856bc8e2f45be7fbc43b539e15dafdf7fd27 (patch) | |
| tree | 93bf2742fc4e1bf90527c6e25c8e73ae1da1c960 /misc/openoffice | |
| parent | 193dddddcdfb99536b1854801019f2a12046f27d (diff) | |
| download | pkgsrc-7487856bc8e2f45be7fbc43b539e15dafdf7fd27.tar.gz | |
Fix NetBSD statvfs check to be >= 299000900 not >= 200040000
No pkgrevision bumps needed.
Diffstat (limited to 'misc/openoffice')
| -rw-r--r-- | misc/openoffice/distinfo | 8 | ||||
| -rw-r--r-- | misc/openoffice/patches/patch-as | 6 | ||||
| -rw-r--r-- | misc/openoffice/patches/patch-at | 8 | ||||
| -rw-r--r-- | misc/openoffice/patches/patch-au | 8 |
4 files changed, 15 insertions, 15 deletions
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 |