Add missing patches in previous commit.

3 files changed, 222 insertions, 0 deletions

diff --git a/misc/openoffice2/patches/patch-ch b/misc/openoffice2/patches/patch-ch
new file mode 100644
index 00000000000..6eefecbbe86
--- /dev/null
+++ b/misc/openoffice2/patches/patch-ch
@@ -0,0 +1,188 @@
+$NetBSD: patch-ch,v 1.1 2007/04/05 23:26:13 hira Exp $
+
+--- solenv/inc/unxbsdi3.mk.orig	2007-04-05 10:28:46.000000000 +0900
++++ solenv/inc/unxbsdi3.mk	2007-04-05 10:28:43.000000000 +0900
+@@ -0,0 +1,183 @@
++# $NetBSD: patch-ch,v 1.1 2007/04/05 23:26:13 hira Exp $
++#
++# mk file for NetBSD/i386 with gcc 3.4.x and higher.
++#
++
++ASM=
++AFLAGS=
++
++SOLAR_JAVA=
++JAVAFLAGSDEBUG=-g
++
++# filter for supressing verbose messages from linker
++#not needed at the moment
++#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
++
++# _PTHREADS is needed for the stl
++CDEFS+= -DX86 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++
++# enable visibility define in "sal/types.h"
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# this is a platform with JAVA support
++.IF "$(SOLAR_JAVA)"!=""
++JAVADEF=-DSOLAR_JAVA
++.IF "$(debug)"==""
++JAVA_RUNTIME=-ljava
++.ELSE
++JAVA_RUNTIME=-ljava_g
++.ENDIF
++.ENDIF 
++
++# architecture dependent flags for the C and C++ compiler that can be changed by
++# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++ARCH_FLAGS*=
++
++# name of C++ Compiler
++CXX*=g++
++# name of C Compiler
++CC*=gcc
++# flags for C and C++ Compiler
++CFLAGS+=-fmessage-length=0 -c
++
++# flags to enable build with symbols; required for crashdump feature
++.IF "$(ENABLE_SYMBOLS)"=="SMALL"
++CFLAGSENABLESYMBOLS=-g1
++.ELSE
++CFLAGSENABLESYMBOLS=-g
++.ENDIF
++
++# flags for the C++ Compiler
++CFLAGSCC= -pipe $(ARCH_FLAGS)
++# Flags for enabling exception handling
++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++# Flags for disabling exception handling
++CFLAGS_NO_EXCEPTIONS=-fno-exceptions
++
++CFLAGSCXX= -pipe $(ARCH_FLAGS)
++PICSWITCH:=-fpic
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CFLAGSCXX += -fvisibility-inlines-hidden
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# Compiler flags for compiling static object in single threaded environment with graphical user interface
++CFLAGSOBJGUIST=
++# Compiler flags for compiling static object in single threaded environment with character user interface
++CFLAGSOBJCUIST=
++# Compiler flags for compiling static object in multi threaded environment with graphical user interface
++CFLAGSOBJGUIMT=
++# Compiler flags for compiling static object in multi threaded environment with character user interface
++CFLAGSOBJCUIMT=
++# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
++CFLAGSSLOGUIMT=$(PICSWITCH)
++# Compiler flags for compiling shared object in multi threaded environment with character user interface
++CFLAGSSLOCUIMT=$(PICSWITCH)
++# Compiler flags for profiling
++CFLAGSPROF=
++# Compiler flags for debugging
++CFLAGSDEBUG=-g
++CFLAGSDBGUTIL=
++# Compiler flags for enabling optimizations
++# CFLAGSOPT=-O2
++# reduce to -O1 to avoid optimization problems
++CFLAGSOPT=-O1
++# Compiler flags for disabling optimizations
++CFLAGSNOOPT=-O
++# Compiler flags for describing the output path
++CFLAGSOUTOBJ=-o
++
++CFLAGSWARNCC=
++CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
++# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
++CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
++CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
++CFLAGSWERRCC=-Werror
++
++# switches for dynamic and static linking
++STATIC		= -Wl,-Bstatic
++DYNAMIC		= -Wl,-Bdynamic
++
++# name of linker
++LINK*=$(CXX)
++LINKC*=$(CC)
++
++# default linker flags
++LINKFLAGSDEFS*=-z defs
++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
++LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++
++# linker flags for linking applications
++LINKFLAGSAPPGUI= -Wl,-export-dynamic 
++LINKFLAGSAPPCUI= -Wl,-export-dynamic 
++
++# linker flags for linking shared libraries
++LINKFLAGSSHLGUI= -shared
++LINKFLAGSSHLCUI= -shared
++
++LINKFLAGSTACK=
++LINKFLAGSPROF=
++LINKFLAGSDEBUG=-g
++LINKFLAGSOPT=-L$(SOLARVERSION)$/$(INPATH)$/lib
++
++# linker flags for optimization (symbol hashtable)
++# for now, applied to symbol scoped libraries, only
++LINKFLAGSOPTIMIZE*=-Wl,-O1
++LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
++
++SONAME_SWITCH=-Wl,-h
++
++# Sequence of libs does matter !
++
++STDLIBCPP=-lgcc_s -lstdc++
++
++# default objectfilenames to link
++STDOBJGUI=
++STDSLOGUI=
++STDOBJCUI=
++STDSLOCUI=
++STDOBJVCL=$(L)$/salmain.o
++
++X11_LDFLAGS=@X11_LDFLAGS@
++
++# libraries for linking applications
++STDLIBCUIST=-lm -lc -lgcc_s -lstdc++
++STDLIBGUIMT=${X11_LDFLAGS} -lX11 -lpthread -lm -lc -lgcc_s -lstdc++
++STDLIBCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
++STDLIBGUIST=${X11_LDFLAGS} -lX11 -lm -lc -lgcc_s -lstdc++
++# libraries for linking shared libraries
++STDSHLGUIMT=${X11_LDFLAGS} -lX11 -lXext -lpthread -lm -lc -lgcc_s -lstdc++
++STDSHLCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
++STDSHLGUIST=${X11_LDFLAGS} -lX11 -lXext -lm -lc -lgcc_s -lstdc++
++STDSHLCUIST=-lm -lc -lgcc_s -lstdc++
++
++LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
++
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lgcc_s -lstdc++
++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++
++#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
++
++# name of library manager
++LIBMGR=ar
++LIBFLAGS=-r
++
++# tool for generating import libraries
++IMPLIB=
++IMPLIBFLAGS=
++
++MAPSYM=
++MAPSYMFLAGS=
++
++RC=irc
++RCFLAGS=-fo$@ $(RCFILES)
++RCLINK=
++RCLINKFLAGS=
++RCSETVERSION=
++
++# platform specific identifier for shared libs
++DLLPOSTFIX=bi
++DLLPRE=lib
++DLLPOST=.so
++
diff --git a/misc/openoffice2/patches/patch-ci b/misc/openoffice2/patches/patch-ci
new file mode 100644
index 00000000000..dc884d80879
--- /dev/null
+++ b/misc/openoffice2/patches/patch-ci
@@ -0,0 +1,15 @@
+$NetBSD: patch-ci,v 1.1 2007/04/05 23:26:13 hira Exp $
+
+--- solenv/inc/unx.mk.orig	2006-07-19 18:26:37.000000000 +0900
++++ solenv/inc/unx.mk	2007-04-06 08:10:39.000000000 +0900
+@@ -151,6 +151,10 @@
+ .INCLUDE : unxbsdi2.mk
+ .ENDIF
+ 
++.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC341NETBSDI"
++.INCLUDE : unxbsdi3.mk
++.ENDIF
++
+ .IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDS"
+ .INCLUDE : unxbsds.mk
+ .ENDIF
diff --git a/misc/openoffice2/patches/patch-cj b/misc/openoffice2/patches/patch-cj
new file mode 100644
index 00000000000..62c8352d5b8
--- /dev/null
+++ b/misc/openoffice2/patches/patch-cj
@@ -0,0 +1,19 @@
+$NetBSD: patch-cj,v 1.1 2007/04/05 23:26:14 hira Exp $
+
+--- tools/inc/inetdef.hxx.orig	2006-07-19 18:27:54.000000000 +0900
++++ tools/inc/inetdef.hxx	2007-04-06 08:11:38.000000000 +0900
+@@ -51,11 +51,11 @@
+ #elif defined SCO
+ #define TOOLS_INETDEF_OS "SCO"
+ #elif defined NETBSD && defined X86
+-#define TOOLS_INETDEF_OS "NETBSD x86"
++#define TOOLS_INETDEF_OS "NetBSD/i386"
+ #elif defined NETBSD && defined ARM32
+-#define TOOLS_INETDEF_OS "NETBSD ARM32"
++#define TOOLS_INETDEF_OS "NetBSD/arm32"
+ #elif defined NETBSD && defined SPARC
+-#define TOOLS_INETDEF_OS "NETBSD Sparc"
++#define TOOLS_INETDEF_OS "NetBSD/sparc"
+ #elif defined LINUX && defined X86
+ #define TOOLS_INETDEF_OS "Linux"
+ #elif defined FREEBSD && defined X86