[pkgsrc/trunk]: pkgsrc/misc/openoffice some more patches needed for compilati...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/44bdba681eb7
branches:  trunk
changeset: 474980:44bdba681eb7
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sat May 08 11:52:52 2004 +0000

description:
some more patches needed for compilation on NetBSD 2.0D+, after replacing
of statfs interface with statvfs interface

diffstat:

 misc/openoffice/distinfo         |   4 +++-
 misc/openoffice/patches/patch-at |  26 ++++++++++++++++++++++++++
 misc/openoffice/patches/patch-au |  26 ++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletions(-)

diffs (75 lines):

diff -r af04e338ba43 -r 44bdba681eb7 misc/openoffice/distinfo
--- a/misc/openoffice/distinfo  Sat May 08 08:53:54 2004 +0000
+++ b/misc/openoffice/distinfo  Sat May 08 11:52:52 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2004/05/07 08:39:03 jdolecek Exp $
+$NetBSD: distinfo,v 1.20 2004/05/08 11:52:52 jdolecek Exp $
 
 SHA1 (OOo_1.1.1p1_source.tar.bz2) = be2c5e799a33b70916528a6454297054db76328e
 Size (OOo_1.1.1p1_source.tar.bz2) = 192388698 bytes
@@ -25,3 +25,5 @@
 SHA1 (patch-aq) = 82285ade1af0a0c5e84d322d5a3a925c095103bb
 SHA1 (patch-ar) = f185c705cda716e1b52e5b6ca6d9c5d2a9b341bc
 SHA1 (patch-as) = 33abd8e0eaec6a51eaa7940c8f686852c0700892
+SHA1 (patch-at) = 2bd5899385e2277a3a4bd8e7f5016a4eb538130f
+SHA1 (patch-au) = f5d4766000c36885f1bb86eccb01865d395d40e8
diff -r af04e338ba43 -r 44bdba681eb7 misc/openoffice/patches/patch-at
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice/patches/patch-at  Sat May 08 11:52:52 2004 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-at,v 1.3 2004/05/08 11:52:52 jdolecek Exp $
+
+--- setup2/mow/source/system/mowos.cxx.orig    2004-05-07 14:54:42.000000000 +0200
++++ setup2/mow/source/system/mowos.cxx
+@@ -84,10 +84,20 @@
+ #ifdef LINUX
+ #include <sys/vfs.h>
+ #define statvfs statfs
+-#elif (defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) )
++#elif defined(FREEBSD) || defined(MACOSX)
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ #define statvfs statfs
++#elif defined(NETBSD)
++#include <sys/param.h>
++#  if __NetBSD_Version__ >= 200040000
++      /* NetBSD 2.0D switched to statvfs() */
++#     include <sys/statvfs.h>
++#  else
++      /* before NetBSD 2.0D */
++#     include <sys/mount.h>
++#     define statvfs statfs
++#  endif
+ #else
+ #include <sys/statvfs.h>
+ #endif
diff -r af04e338ba43 -r 44bdba681eb7 misc/openoffice/patches/patch-au
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice/patches/patch-au  Sat May 08 11:52:52 2004 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-au,v 1.3 2004/05/08 11:52:52 jdolecek Exp $
+
+--- setup2/mow/source/loader/loader.c.orig     2004-05-07 17:13:38.000000000 +0200
++++ setup2/mow/source/loader/loader.c
+@@ -83,10 +83,20 @@
+ #ifdef LINUX
+ # include <sys/vfs.h>
+ # define statvfs statfs
+-#elif defined(NETBSD) || defined(FREEBSD) || defined(MACOSX)
++#elif defined(FREEBSD) || defined(MACOSX)
+ # include <sys/param.h>
+ # include <sys/mount.h>
+ # define statvfs statfs
++#elif defined(NETBSD)
++#include <sys/param.h>
++#  if __NetBSD_Version__ >= 200040000
++      /* NetBSD 2.0D switched to statvfs() */
++#     include <sys/statvfs.h>
++#  else
++      /* before NetBSD 2.0D */
++#     include <sys/mount.h>
++#     define statvfs statfs
++#  endif
+ #else
+ # include <sys/statvfs.h>
+ #endif