From 6e64fee184b9ed667e272c7fcd64ca648a0f0ff2 Mon Sep 17 00:00:00 2001
From: hira <hira@pkgsrc.org>
Date: Mon, 29 Sep 2008 23:17:00 +0000
Subject: On NetBSD 3.x, use strerror_r(3) which is defined by OOo. This should
 fix PR pkg/39614.

---
 misc/openoffice2/distinfo         |  6 +++---
 misc/openoffice2/patches/patch-dc | 28 +++++++++++++++++++++++++---
 misc/openoffice2/patches/patch-dd | 28 +++++++++++++++++++++++++---
 3 files changed, 53 insertions(+), 9 deletions(-)

(limited to 'misc/openoffice2')

diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index b8b1afbdfed..125899c339e 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2008/08/29 08:08:11 hira Exp $
+$NetBSD: distinfo,v 1.42 2008/09/29 23:17:00 hira Exp $
 
 SHA1 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = a50c7f317643b756c2b0e8937fa9d64b99f05ed9
 RMD160 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = 04ffce167f94a250f94f05923a70af0b0744c417
@@ -64,6 +64,6 @@ SHA1 (patch-cw) = 9c122919fed1b77bfc2edeb5297a7f6bdf4d45ae
 SHA1 (patch-cx) = 1c2efe192b0535ff6b2dc59e6a138c9931e6e946
 SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
 SHA1 (patch-da) = c2c9332dcf22d2d201215813ac9fc7e7ac401c6d
-SHA1 (patch-dc) = 125ae2e943946cb96c6f7513dccced0c9d8797af
-SHA1 (patch-dd) = 6f791b6be13e37a59b3115ab338587489079b89d
+SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67
+SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176
 SHA1 (patch-de) = 138fbea73fec80c744c3eede57dfe5f1cddef573
diff --git a/misc/openoffice2/patches/patch-dc b/misc/openoffice2/patches/patch-dc
index 60111d335a0..dafe884e8c3 100644
--- a/misc/openoffice2/patches/patch-dc
+++ b/misc/openoffice2/patches/patch-dc
@@ -1,7 +1,16 @@
-$NetBSD: patch-dc,v 1.2 2008/04/17 08:43:31 joerg Exp $
+$NetBSD: patch-dc,v 1.3 2008/09/29 23:17:00 hira Exp $
 
---- icc/SampleICC-1.3.2.patch.orig	2008-04-07 18:02:17.000000000 +0900
-+++ icc/SampleICC-1.3.2.patch	2008-04-07 18:03:10.000000000 +0900
+--- icc/SampleICC-1.3.2.patch.orig	2008-01-31 17:07:33.000000000 +0900
++++ icc/SampleICC-1.3.2.patch	2008-09-30 01:29:06.000000000 +0900
+@@ -489,7 +489,7 @@
+ !       }
+ !   }
+ ! }
+---- 1,329 ----
++--- 1,332 ----
+ ! /*
+ !  File:       Vetters.cpp
+ !  
 @@ -575,7 +575,7 @@
  ! using namespace std;
  ! 
@@ -11,3 +20,16 @@ $NetBSD: patch-dc,v 1.2 2008/04/17 08:43:31 joerg Exp $
  ! #include <errno.h>
  ! #else
  ! #include <sys/errno.h>
+@@ -584,8 +584,11 @@
+ ! #include <string.h>
+ ! #define stat _stat
+ ! #endif
++! #ifdef NETBSD
++! #include <sys/param.h>
++! #endif
+ ! 
+-! #if defined WIN32 || defined sun
++! #if defined WIN32 || defined sun || (defined(NETBSD) && (__NetBSD_Version__ < 400000000))
+ ! int strerror_r(int errnum, char *str, int strsize)
+ ! {
+ !   const char *errstr = strerror(errnum);
diff --git a/misc/openoffice2/patches/patch-dd b/misc/openoffice2/patches/patch-dd
index e6ef1b3cb42..cd48f1d2569 100644
--- a/misc/openoffice2/patches/patch-dd
+++ b/misc/openoffice2/patches/patch-dd
@@ -1,7 +1,16 @@
-$NetBSD: patch-dd,v 1.1 2008/04/17 08:43:31 joerg Exp $
+$NetBSD: patch-dd,v 1.2 2008/09/29 23:17:00 hira Exp $
 
---- icc/SampleICC-1.3.2-bendian.patch.orig	2008-04-16 12:11:16.000000000 +0200
-+++ icc/SampleICC-1.3.2-bendian.patch
+--- icc/SampleICC-1.3.2-bendian.patch.orig	2008-01-31 17:07:26.000000000 +0900
++++ icc/SampleICC-1.3.2-bendian.patch	2008-09-30 02:57:56.000000000 +0900
+@@ -489,7 +489,7 @@
+ !       }
+ !   }
+ ! }
+---- 1,329 ----
++--- 1,332 ----
+ ! /*
+ !  File:       Vetters.cpp
+ !  
 @@ -575,7 +575,7 @@
  ! using namespace std;
  ! 
@@ -11,3 +20,16 @@ $NetBSD: patch-dd,v 1.1 2008/04/17 08:43:31 joerg Exp $
  ! #include <errno.h>
  ! #else
  ! #include <sys/errno.h>
+@@ -584,8 +584,11 @@
+ ! #include <string.h>
+ ! #define stat _stat
+ ! #endif
++! #ifdef NETBSD
++! #include <sys/param.h>
++! #endif
+ ! 
+-! #if defined WIN32 || defined sun
++! #if defined WIN32 || defined sun || (defined(NETBSD) && (__NetBSD_Version__ < 400000000))
+ ! int strerror_r(int errnum, char *str, int strsize)
+ ! {
+ !   const char *errstr = strerror(errnum);
-- 
cgit v1.2.3