summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjoerg <joerg>2008-04-17 08:43:31 +0000
committerjoerg <joerg>2008-04-17 08:43:31 +0000
commitc5ba4ac07a1e67a0848a2874ee984d083e483372 (patch)
tree6313f2b36cd53fca25fe19cf75a2b8f54f676fe5 /misc
parentf13f46467ee63ff75b0e63dd1f35bda7015433b4 (diff)
downloadpkgsrc-c5ba4ac07a1e67a0848a2874ee984d083e483372.tar.gz
Repeat after me: Never use sys/errno.h, just use errno.h. Fix build on
AMD64.
Diffstat (limited to 'misc')
-rw-r--r--misc/openoffice2/distinfo5
-rw-r--r--misc/openoffice2/patches/patch-dc4
-rw-r--r--misc/openoffice2/patches/patch-dd13
3 files changed, 18 insertions, 4 deletions
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 36f99ab2789..c18d084520b 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2008/04/13 20:32:43 hira Exp $
+$NetBSD: distinfo,v 1.39 2008/04/17 08:43:31 joerg Exp $
SHA1 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6196fd2d2b5b37635d9a08a36f5476d57b14e0d8
RMD160 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = fff7a0a61b19881559e4f20ddd36031565f635e1
@@ -64,4 +64,5 @@ SHA1 (patch-cw) = 9c122919fed1b77bfc2edeb5297a7f6bdf4d45ae
SHA1 (patch-cx) = 1c2efe192b0535ff6b2dc59e6a138c9931e6e946
SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
SHA1 (patch-da) = c2c9332dcf22d2d201215813ac9fc7e7ac401c6d
-SHA1 (patch-dc) = 56ba80d91b5b82178dc8d837bc03dbe48b4ec9d8
+SHA1 (patch-dc) = 125ae2e943946cb96c6f7513dccced0c9d8797af
+SHA1 (patch-dd) = 6f791b6be13e37a59b3115ab338587489079b89d
diff --git a/misc/openoffice2/patches/patch-dc b/misc/openoffice2/patches/patch-dc
index 33c30b122bd..60111d335a0 100644
--- a/misc/openoffice2/patches/patch-dc
+++ b/misc/openoffice2/patches/patch-dc
@@ -1,4 +1,4 @@
-$NetBSD: patch-dc,v 1.1 2008/04/07 16:24:51 hira Exp $
+$NetBSD: patch-dc,v 1.2 2008/04/17 08:43:31 joerg 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
@@ -7,7 +7,7 @@ $NetBSD: patch-dc,v 1.1 2008/04/07 16:24:51 hira Exp $
!
! #ifndef WIN32
-! #ifdef sun
-+! #if defined sun || defined __NetBSD__
++! #if 1
! #include <errno.h>
! #else
! #include <sys/errno.h>
diff --git a/misc/openoffice2/patches/patch-dd b/misc/openoffice2/patches/patch-dd
new file mode 100644
index 00000000000..e6ef1b3cb42
--- /dev/null
+++ b/misc/openoffice2/patches/patch-dd
@@ -0,0 +1,13 @@
+$NetBSD: patch-dd,v 1.1 2008/04/17 08:43:31 joerg Exp $
+
+--- icc/SampleICC-1.3.2-bendian.patch.orig 2008-04-16 12:11:16.000000000 +0200
++++ icc/SampleICC-1.3.2-bendian.patch
+@@ -575,7 +575,7 @@
+ ! using namespace std;
+ !
+ ! #ifndef WIN32
+-! #ifdef sun
++! #if 1
+ ! #include <errno.h>
+ ! #else
+ ! #include <sys/errno.h>