Patches from Rui-Xiang Guo for building on NetBSD-current

3 files changed, 50 insertions, 7 deletions

diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo
index 45bc9affb8b..2fd3e5b4527 100644
--- a/misc/openoffice/distinfo
+++ b/misc/openoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2004/11/12 06:39:20 jlam Exp $
+$NetBSD: distinfo,v 1.25 2005/01/03 08:07:24 agc Exp $
 
 SHA1 (openoffice-1.1.1/OOo_1.1.1p1_source.tar.bz2) = be2c5e799a33b70916528a6454297054db76328e
 Size (openoffice-1.1.1/OOo_1.1.1p1_source.tar.bz2) = 192388698 bytes
@@ -29,7 +29,7 @@ Size (openoffice-1.1.1/helpcontent_88_unix.tgz) = 12953600 bytes
 SHA1 (patch-aa) = 783e0cf32bc942cc6f8d31a0fb74a9d91205e0e7
 SHA1 (patch-ab) = 873131e69215c063edb9e65af0155ca1725ac552
 SHA1 (patch-ac) = 0c5962741c749299379ddbc96474fd2b567232ce
-SHA1 (patch-ad) = 7727183ad7ecc15f4aa31702c43e1fce26d76cc7
+SHA1 (patch-ad) = 20123705eb8a3ded3ef4f68738c3fb603a84da00
 SHA1 (patch-ae) = 9015ca0800ee0b440a4a0aa4723f2597c3e6718d
 SHA1 (patch-af) = b5252da6127e4c9663679d8dfbfbd1d6e18d751c
 SHA1 (patch-ag) = bec72d41929c2e6c592bdfc56d18e5f90b399a16
@@ -48,3 +48,4 @@ SHA1 (patch-as) = 71d4d5a1517274ed9aff3e6c2bd89265772c93af
 SHA1 (patch-at) = f38552d47fbbc1013b00a29b5c451607236b2b84
 SHA1 (patch-au) = 662e14be36e28aacf0bb3961c194c69d39cef8a8
 SHA1 (patch-av) = f6f0aa984f7d975c721d616b348a69cff6173ff8
+SHA1 (patch-aw) = 4b98ecc01eaeb776611dbba0ef53562f175773c2
diff --git a/misc/openoffice/patches/patch-ad b/misc/openoffice/patches/patch-ad
index 11e5691e818..56988e42715 100644
--- a/misc/openoffice/patches/patch-ad
+++ b/misc/openoffice/patches/patch-ad
@@ -1,8 +1,33 @@
-$NetBSD: patch-ad,v 1.2 2004/05/03 20:56:36 mrauch Exp $
+$NetBSD: patch-ad,v 1.3 2005/01/03 08:07:26 agc Exp $
 
---- ../sal/osl/unx/system.c.orig	2004-04-17 19:24:56.000000000 +0200
-+++ ../sal/osl/unx/system.c
-@@ -460,7 +460,7 @@ struct hostent *gethostbyname_r(const ch
+Patch from Rui-Xiang Guo for building on NetBSD-current
+
+--- ../sal/osl/unx/system.c.orig	2003-07-17 01:21:47.000000000 +0800
++++ ../sal/osl/unx/system.c	2004-11-19 10:46:49.000000000 +0800
+@@ -97,8 +97,11 @@
+ struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
+ #endif /* BUILD_OS_APPLEOSX */
+ #else /* MACOSX */
++#if (__NetBSD_Version__ < 200000000)
+ struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
++#endif
+ #endif /* MACOSX */
++#if (__NetBSD_Version__ < 200000000)
+ {
+   	struct passwd* res;
+ 
+@@ -164,8 +167,9 @@
+         return(res);
+ #endif /* MACOSX */
+ }
++#endif
+ 
+-#if defined(NETBSD) || defined(MACOSX)
++#if defined(NETBSD) && (__NetBSD_Version__ < 200000000) || defined(MACOSX)
+ int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
+            size_t buflen, struct passwd **result)
+ {
+@@ -460,7 +464,7 @@
    	return res;
  }
  
@@ -11,7 +36,7 @@ $NetBSD: patch-ad,v 1.2 2004/05/03 20:56:36 mrauch Exp $
  /*
   * This section works around calls that are missing or broken
   * in MacOS X 10.1.x and earlier.
-@@ -504,6 +504,10 @@ int readdir_r( DIR *dirp, struct dirent 
+@@ -504,6 +508,10 @@
      return nRet;
  }
  
diff --git a/misc/openoffice/patches/patch-aw b/misc/openoffice/patches/patch-aw
new file mode 100644
index 00000000000..e20416f03df
--- /dev/null
+++ b/misc/openoffice/patches/patch-aw
@@ -0,0 +1,17 @@
+$NetBSD: patch-aw,v 1.5 2005/01/03 08:07:26 agc Exp $
+
+Patch from Rui-Xiang Guo for building on NetBSD-current
+
+--- ../sal/osl/unx/system.h.orig	2004-11-19 09:23:53.000000000 +0800
++++ ../sal/osl/unx/system.h	2004-11-19 09:27:55.000000000 +0800
+@@ -169,7 +169,10 @@
+ #endif
+ 
+ #ifdef NETBSD
++#	include <sys/param.h>
++#if (__NetBSD_Version__ < 200000000)
+ #	define  ETIME ETIMEDOUT
++#endif
+ #	define _POSIX_THREAD_SYSCALL_SOFT 1
+ #	include <pthread.h>
+ #	include <netdb.h>