Try harder to work around typedef mess in

extensions/source/plugin/inc/plugin/unx/plugcon.hxx
This will hopefully fix the build failure reported here:
http://mail-index.netbsd.org/tech-pkg/2009/09/17/msg003902.html

4 files changed, 39 insertions, 7 deletions

diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
index 283e701e64c..a3455cc51f9 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2009/09/10 00:14:55 tnn Exp $
+$NetBSD: distinfo,v 1.24 2009/09/18 11:38:56 tnn Exp $
 
 SHA1 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 3b4d0d312a1bed9bdb1bbdfb172fa7361533b498
 RMD160 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 8caa064f836e531035fd551cf2d7288ca5188da0
@@ -15,6 +15,8 @@ Size (openoffice-3.1.1/OOo_3.1.1_src_l10n.tar.bz2) = 96600878 bytes
 SHA1 (openoffice-3.1.1/OOo_3.1.1_src_system.tar.bz2) = c8a6348a2259ae8df30a0bc3a72d09280a57988c
 RMD160 (openoffice-3.1.1/OOo_3.1.1_src_system.tar.bz2) = db38175ad14bf5785f3d08631d6d2d66598eb82b
 Size (openoffice-3.1.1/OOo_3.1.1_src_system.tar.bz2) = 53316228 bytes
+SHA1 (patch-aa) = 8561c34e623a4b97d4e6840d8c2af0483f4e21f3
+SHA1 (patch-ab) = 454f3a357a8c16a027858ed5c789d29baa8eafcb
 SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
 SHA1 (patch-ad) = 8f7afec29d927db694bf511ffd615fe903cc46dc
 SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk
index 1ac06d58e34..20d123ed7db 100644
--- a/misc/openoffice3/options.mk
+++ b/misc/openoffice3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2009/09/10 00:22:34 tnn Exp $
+# $NetBSD: options.mk,v 1.19 2009/09/18 11:38:56 tnn Exp $
 #
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice3
@@ -54,12 +54,7 @@ post-wrapper:	copy-mozilla-headers
 copy-mozilla-headers:
 	cp \
 	  ${BUILDLINK_DIR}/include/xulrunner/stable/npapi.h \
-	  ${BUILDLINK_DIR}/include/xulrunner/stable/nptypes.h \
 	  ${WRKSRC}/np_sdk/mozsrc
-	  echo "typedef int16_t int16;" >> ${WRKSRC}/np_sdk/mozsrc/nptypes.h
-	  echo "typedef uint16_t uint16;" >> ${WRKSRC}/np_sdk/mozsrc/nptypes.h
-	  echo "typedef int32_t int32;" >> ${WRKSRC}/np_sdk/mozsrc/nptypes.h
-	  echo "typedef uint32_t uint32;" >> ${WRKSRC}/np_sdk/mozsrc/nptypes.h
 .else
 CONFIGURE_ARGS+=	--disable-mozilla
 .endif
diff --git a/misc/openoffice3/patches/patch-aa b/misc/openoffice3/patches/patch-aa
new file mode 100644
index 00000000000..6e0e4805426
--- /dev/null
+++ b/misc/openoffice3/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2009/09/18 11:38:56 tnn Exp $
+
+--- extensions/source/plugin/inc/plugin/unx/plugcon.hxx.orig	2008-12-15 17:07:14.000000000 +0100
++++ extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+@@ -79,7 +79,7 @@ extern "C" {
+ 
+ //http://qa.openoffice.org/issues/show_bug.cgi?id=82545
+ //https://bugzilla.mozilla.org/show_bug.cgi?id=241262
+-#ifdef UNIX
++#if 0 /* def UNIX */  /* types provided by nptypes.h */
+ #  ifndef _UINT32
+ #    if defined(__alpha) || defined(__LP64__)
+        typedef unsigned int uint32;
+@@ -99,6 +99,7 @@ extern "C" {
+ #endif
+ 
+ #ifndef _NPAPI_H_
++#include <nptypes.h>
+ extern "C" {
+ #include <npsdk/npupp.h>
+ }
diff --git a/misc/openoffice3/patches/patch-ab b/misc/openoffice3/patches/patch-ab
new file mode 100644
index 00000000000..a51490645b4
--- /dev/null
+++ b/misc/openoffice3/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2009/09/18 11:38:56 tnn Exp $
+
+--- np_sdk/mozsrc/nptypes.h.orig	2009-09-18 12:22:10.000000000 +0200
++++ np_sdk/mozsrc/nptypes.h
+@@ -0,0 +1,9 @@
++#ifndef NPTYPES_H
++#define NPTYPES_H
++#include <stdint.h>
++#include <stdbool.h>
++typedef int16_t int16;
++typedef uint16_t uint16;
++typedef int32_t int32;
++typedef uint32_t uint32;
++#endif