Re: pkg/28381

[Gary Duzan <gary%duzan.org@localhost>]

   Here is a patch for the package.

                                        Gary Duzan


Index: distinfo
===================================================================
RCS file: /usr2/netbsd-cvs/pkgsrc/misc/openoffice/distinfo,v
retrieving revision 1.24
diff -u -r1.24 distinfo
--- distinfo    12 Nov 2004 06:39:20 -0000      1.24
+++ distinfo    28 Nov 2004 17:45:58 -0000
@@ -29,7 +29,7 @@
 SHA1 (patch-aa) = 783e0cf32bc942cc6f8d31a0fb74a9d91205e0e7
 SHA1 (patch-ab) = 873131e69215c063edb9e65af0155ca1725ac552
 SHA1 (patch-ac) = 0c5962741c749299379ddbc96474fd2b567232ce
-SHA1 (patch-ad) = 7727183ad7ecc15f4aa31702c43e1fce26d76cc7
+SHA1 (patch-ad) = 7260a08e03ff3e88f75a59bc3eebfbd4acc3314a
 SHA1 (patch-ae) = 9015ca0800ee0b440a4a0aa4723f2597c3e6718d
 SHA1 (patch-af) = b5252da6127e4c9663679d8dfbfbd1d6e18d751c
 SHA1 (patch-ag) = bec72d41929c2e6c592bdfc56d18e5f90b399a16
@@ -48,3 +48,4 @@
 SHA1 (patch-at) = f38552d47fbbc1013b00a29b5c451607236b2b84
 SHA1 (patch-au) = 662e14be36e28aacf0bb3961c194c69d39cef8a8
 SHA1 (patch-av) = f6f0aa984f7d975c721d616b348a69cff6173ff8
+SHA1 (patch-aw) = 1a64437e035c0d37acc853be6568e60e13d95bc0
Index: patches/patch-ad
===================================================================
RCS file: /usr2/netbsd-cvs/pkgsrc/misc/openoffice/patches/patch-ad,v
retrieving revision 1.2
diff -u -r1.2 patch-ad
--- patches/patch-ad    3 May 2004 20:56:36 -0000       1.2
+++ patches/patch-ad    28 Nov 2004 17:43:48 -0000
@@ -1,8 +1,22 @@
-$NetBSD: patch-ad,v 1.2 2004/05/03 20:56:36 mrauch Exp $
+$NetBSD$
 
---- ../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
+--- ../sal/osl/unx/system.c.orig       2003-07-16 13:21:47.000000000 -0400
++++ ../sal/osl/unx/system.c    2004-11-28 12:37:26.000000000 -0500
+@@ -73,8 +73,12 @@
+ 
+ static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
+ 
++#ifdef NETBSD
++#include <sys/param.h>
++#endif
++
+ /* struct passwd differs on some platforms */
+-#if defined NETBSD || defined MACOSX
++#if (defined(NETBSD) && (__NetBSD_Version__ < 299001000)) || defined MACOSX
+ #include <pwd.h>
+ #include <sys/types.h>
+ 
+@@ -460,7 +464,7 @@ struct hostent *gethostbyname_r(const ch
        return res;
  }
  
@@ -11,7 +25,7 @@
  /*
   * 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 @@ int readdir_r( DIR *dirp, struct dirent 
      return nRet;
  }
  
Index: patches/patch-aw
===================================================================
RCS file: patches/patch-aw
diff -N patches/patch-aw
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-aw    28 Nov 2004 17:21:59 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- ../sal/osl/unx/system.h.orig       2004-11-28 12:12:30.000000000 -0500
++++ ../sal/osl/unx/system.h    2004-11-28 12:21:10.000000000 -0500
+@@ -169,7 +169,9 @@
+ #endif
+ 
+ #ifdef NETBSD
++#   ifndef ETIME
+ #     define  ETIME ETIMEDOUT
++#   endif
+ #     define _POSIX_THREAD_SYSCALL_SOFT 1
+ #     include <pthread.h>
+ #     include <netdb.h>