sb126: merged in DEV300_m84

19 files changed, 479 insertions, 484 deletions

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 5ef6499726e5..f50f4aadc164 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -40,7 +40,8 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch
     # warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
     #  aid=2912630&group_id=11795&atid=311795>
 
-.IF "$(OS)" == "WNT" && "$(COM)" == "MSC"
+.IF "$(OS)" == "WNT"
+.IF "$(COM)" == "MSC"
 
 # On Windows, CppUnit appears to support either the Unix-style configure/make
 # approach with cygwin and gcc (and libtool fails miserably if gcc is replaced
@@ -70,6 +71,48 @@ OUTDIR2INC = include/cppunit
 $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
 
 .ELSE
+.IF "$(COM)" == "GCC"
+EXTRA_CFLAGS += -mthreads
+LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2
+
+.IF "$(USE_SYSTEM_STL)" != "YES"
+
+OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl
+.IF "$(USE_STLP_DEBUG)" == "TRUE"
+OOO_STLPORT_CXXFLAGS += -D_STLP_DEBUG
+.END
+OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
+
+OOO_STLPORT_LDFLAGS = -L$(SOLARLIBDIR)
+OOO_STLPORT_LIBS = $(LIBSTLPORT)
+
+.END
+
+CONFIGURE_ACTION = ./configure
+CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
+    pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
+    --disable-dependency-tracking --disable-static --disable-doxygen \
+    --disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
+    CXXFLAGS='$(EXTRA_CFLAGS) $(OOO_STLPORT_CXXFLAGS)' \
+    LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
+    LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
+
+BUILD_ACTION = $(GNUMAKE)
+BUILD_FLAGS = install
+
+OUTDIR2INC = ooo-install/include/cppunit
+
+OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
+    ooo-install/bin/cygcppunit-1-12-1.dll
+
+.INCLUDE: set_ext.mk
+.INCLUDE: target.mk
+.INCLUDE: tg_ext.mk
+
+.ENDIF # "$(COM)" == "GCC"
+.ENDIF # "$(COM)" == "MSC"
+
+.ELSE
 
 .IF "$(USE_SYSTEM_STL)" != "YES"
 
@@ -134,10 +177,6 @@ BUILD_FLAGS = install
 
 OUTDIR2INC = ooo-install/include/cppunit
 
-.IF "$(OS)" == "WNT"
-OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
-    ooo-install/bin/cygcppunit-1-12-1.dll
-.ELSE
 OUT2BIN = ooo-install/bin/DllPlugInTester
 .IF "$(OS)" == "MACOSX"
 OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib
@@ -145,7 +184,6 @@ EXTRPATH = NONE
 .ELSE
 OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1
 .END
-.END
 
 .INCLUDE: set_ext.mk
 .INCLUDE: target.mk
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index 4ad02335c8ea..23940c30f8d1 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -47,14 +47,14 @@ $(MINGWGXXDLL) :
 
 .EXPORT : CC
 
-all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.1
+all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.$(SHORTSTDC3)
 
 
 $(LB)$/libstdc++.so.$(SHORTSTDCPP3) :
-       $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB)
+    $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB)
 
-$(LB)$/libgcc_s.so.1 :
-       $(GCCINSTLIB) libgcc_s.so.1 $(LB)
+$(LB)$/libgcc_s.so.$(SHORTSTDC3) :
+    $(GCCINSTLIB) libgcc_s.so.$(SHORTSTDC3) $(LB)
 
 .ENDIF
 .ENDIF 
diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch
index 57aae6a9c0fd..dddc22a3e009 100644
--- a/external/glibc-2.1.3.patch
+++ b/external/glibc-2.1.3.patch
@@ -76,7 +76,7 @@
  extern int getopt ();
 --- misc/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:50 2008
 +++ misc/build/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:38 2008
-@@ -1 +1,63 @@
+@@ -1 +1,70 @@
 -dummy
 +#*************************************************************************
 +#
@@ -123,14 +123,16 @@
 +
 +# --- Files --------------------------------------------------------
 +
++.IF "$(HAVE_GETOPT)" != "YES"
 +OBJFILES=	$(OBJ)$/getopt.obj		\
 +			$(OBJ)$/getopt1.obj
 +
 +LIB1TARGET=$(SLB)$/$(TARGET).lib
 +LIB1ARCHIV=$(LB)$/lib$(TARGET).a
 +LIB1OBJFILES=$(OBJFILES)
++.ENDIF
 +
-+.IF "$(OS)"=="NETBSD"
++.IF "$(HAVE_READDIR_R)" != "YES" && "$(OS)" != "WNT"
 +TARGET2=gnu_readdir_r
 +OBJFILES+= $(OBJ)$/readdir_r.obj
 +LIB2TARGET=$(SLB)$/$(TARGET2).lib
@@ -138,6 +140,11 @@
 +LIB2OBJFILES= $(OBJ)$/readdir_r.obj
 +.ENDIF
 +
++.IF "$(HAVE_READDIR_R)" == "YES" && "$(HAVE_GETOPT)" == "YES"
++@all:
++	@echo "Nothing to do here.
++.ENDIF
++
 +# --- Targets ------------------------------------------------------
 +
 +.INCLUDE :  target.mk
diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
index cf4516515a67..04e2ff5b99bd 100644
--- a/external/glibc/makefile.mk
+++ b/external/glibc/makefile.mk
@@ -36,10 +36,14 @@ TARGET=getopt
 
 # --- Files --------------------------------------------------------
 
+.IF "$(HAVE_GETOPT)" != "YES" || "$(HAVE_READDIR_R)" != "YES"
 TARFILE_NAME=glibc-2.1.3-stub
 TARFILE_MD5=4a660ce8466c9df01f19036435425c3a
 TARFILE_ROOTDIR=glibc-2.1.3
-ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h posix$/readdir_r.c
+ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h
+.IF "$(HAVE_READDIR_R)" != "YES"
+ADDITIONAL_FILES += posix$/readdir_r.c
+.ENDIF
 
 PATCH_FILES=$(PRJ)$/glibc-2.1.3.patch
 
@@ -49,6 +53,15 @@ CONFIGURE_ACTION=
 BUILD_DIR=posix
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 
+OUT2INC= \
+    posix/getopt.h \
+    posix/config.h
+
+.ELSE
+@all:
+    @echo "Nothing to do here."
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 2c50c4c6f801..9e0c68129c77 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -12,14 +12,16 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
 ..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
 ..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib%_EXT%\libgnu_getopt_static.a
 
+..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\glibc\*.h
+
 ..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc%_EXT%\external\mingw\include\*
 ..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc%_EXT%\external\mingw\include\atl\*
 ..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc%_EXT%\external\mingw\include\sys\*
 
 ..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.*
 
-..\%__SRC%\lib\libgcc_s.so.1 %_DEST%\lib%_EXT%\libgcc_s.so.1
-..\%__SRC%\lib\libstdc++.so.6 %_DEST%\lib%_EXT%\libstdc++.so.6
+..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib%_EXT%\libgcc_s.so.*
+..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib%_EXT%\libstdc++.so.*
 
 ..\dbghelp\dbghelp.dll %_DEST%\bin%_EXT%\dbghelp.dll
 
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 2c25909320b9..9a0e92acf91f 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -87,17 +87,17 @@ CRYPTOLIB=nss
 
 .IF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
-xmlsec_CC=$(CC)
+xmlsec_CC=$(CC) -mthreads
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
 xmlsec_CC+=-shared-libgcc
 .ENDIF
-xmlsec_LIBS=-lmingwthrd
+xmlsec_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
 xmlsec_LIBS+=-lstdc++_s
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
 
 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
diff --git a/libxmlsec/xmlsec1-customkeymanage.patch b/libxmlsec/xmlsec1-customkeymanage.patch
index d5c771a67ab8..8bc97c474d56 100644
--- a/libxmlsec/xmlsec1-customkeymanage.patch
+++ b/libxmlsec/xmlsec1-customkeymanage.patch
@@ -445,7 +445,7 @@
 +
 --- misc/xmlsec1-1.2.14/src/mscrypto/akmngr.c	2009-09-21 14:07:19.078910929 +0200
 +++ misc/build/xmlsec1-1.2.14/src/mscrypto/akmngr.c	2009-09-21 14:02:48.531281225 +0200
-@@ -1 +1,235 @@
+@@ -1 +1,236 @@
 -dummy
 +/** 
 + * XMLSec library
@@ -459,6 +459,7 @@
 +
 +#include <xmlsec/xmlsec.h>
 +#include <xmlsec/keys.h>
++#include <xmlsec/keysmngr.h>
 +#include <xmlsec/transforms.h>
 +#include <xmlsec/errors.h>
 +
diff --git a/libxmlsec/xmlsec1-mingw32.patch b/libxmlsec/xmlsec1-mingw32.patch
index 3aaf19fe5a5c..fd71ddf87c54 100644
--- a/libxmlsec/xmlsec1-mingw32.patch
+++ b/libxmlsec/xmlsec1-mingw32.patch
@@ -221,332 +221,6 @@
  	*.$libext)
  	  if test "$pass" = conv; then
  	    deplibs="$deplib $deplibs"
---- misc/xmlsec1-1.2.14/src/mscrypto/certkeys.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/certkeys.c	2009-09-29 15:49:39.643186151 +0200
-@@ -947,7 +947,11 @@
- static void	            xmlSecMSCryptoKeyDataRsaDebugDump(xmlSecKeyDataPtr data, FILE* output);
- static void	            xmlSecMSCryptoKeyDataRsaDebugXmlDump(xmlSecKeyDataPtr data, FILE* output);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRsaKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRsaKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecMSCryptoKeyDataSize,
- 
-@@ -1658,7 +1662,11 @@
- static void		xmlSecMSCryptoKeyDataDsaDebugXmlDump(xmlSecKeyDataPtr data,
- 							 FILE* output);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDsaKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDsaKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecMSCryptoKeyDataSize,
- 
---- misc/xmlsec1-1.2.14/src/mscrypto/ciphers.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/ciphers.c	2009-09-29 15:49:39.652528324 +0200
-@@ -802,7 +802,11 @@
-  * AES CBC cipher transforms
-  *
-  ********************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoAes128CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoAes128CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecMSCryptoBlockCipherSize,		/* xmlSecSize objSize */
-@@ -841,7 +845,11 @@
-     return(&xmlSecMSCryptoAes128CbcKlass);
- }
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoAes192CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoAes192CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecMSCryptoBlockCipherSize,		/* xmlSecSize objSize */
-@@ -880,7 +888,11 @@
-     return(&xmlSecMSCryptoAes192CbcKlass);
- }
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoAes256CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoAes256CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecMSCryptoBlockCipherSize,		/* xmlSecSize objSize */
-@@ -923,7 +935,11 @@
- 
- 
- #ifndef XMLSEC_NO_DES
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoDes3CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoDes3CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),	/* size_t klassSize */
-     xmlSecMSCryptoBlockCipherSize,	/* size_t objSize */
---- misc/xmlsec1-1.2.14/src/mscrypto/digests.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/digests.c	2009-09-29 15:49:39.660554904 +0200
-@@ -329,7 +329,11 @@
-  * SHA1
-  *
-  *****************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* size_t klassSize */
-     xmlSecMSCryptoDigestSize,			/* size_t objSize */
---- misc/xmlsec1-1.2.14/src/mscrypto/keysstore.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/keysstore.c	2009-09-29 15:49:39.667289994 +0200
-@@ -66,7 +66,11 @@
- 								     const xmlChar* name, 
- 								     xmlSecKeyInfoCtxPtr keyInfoCtx);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyStoreKlass xmlSecMSCryptoKeysStoreKlass = {
-+#else
- static xmlSecKeyStoreKlass xmlSecMSCryptoKeysStoreKlass = {
-+#endif
-     sizeof(xmlSecKeyStoreKlass),
-     xmlSecMSCryptoKeysStoreSize,
- 
---- misc/xmlsec1-1.2.14/src/mscrypto/kt_rsa.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/kt_rsa.c	2009-09-29 15:49:39.674284044 +0200
-@@ -66,7 +66,11 @@
- static int  	xmlSecMSCryptoRsaPkcs1Process			(xmlSecTransformPtr transform, 
- 								 xmlSecTransformCtxPtr transformCtx);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoRsaPkcs1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoRsaPkcs1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecMSCryptoRsaPkcs1Size,			/* xmlSecSize objSize */
---- misc/xmlsec1-1.2.14/src/mscrypto/signatures.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/signatures.c	2009-09-29 15:49:39.682580497 +0200
-@@ -524,7 +524,11 @@
-  * RSA-SHA1 signature transform
-  *
-  ***************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoRsaSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoRsaSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecMSCryptoSignatureSize,		/* xmlSecSize objSize */
-@@ -572,7 +576,11 @@
-  *
-  ***************************************************************************/
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoDsaSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoDsaSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecMSCryptoSignatureSize,	        /* xmlSecSize objSize */
---- misc/xmlsec1-1.2.14/src/mscrypto/symkeys.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/symkeys.c	2009-09-29 15:49:39.691081347 +0200
-@@ -72,7 +72,11 @@
-  * <xmlsec:AESKeyValue> processing
-  *
-  *************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataAesKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataAesKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecKeyDataBinarySize,
- 
-@@ -153,7 +157,11 @@
-  * <xmlsec:DESKeyValue> processing
-  *
-  *************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDesKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDesKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecKeyDataBinarySize,
- 
---- misc/xmlsec1-1.2.14/src/mscrypto/x509.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/x509.c	2009-09-29 15:49:39.699931741 +0200
-@@ -243,7 +243,11 @@
- 
- 
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataX509Klass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataX509Klass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecMSCryptoX509DataSize,
- 
-@@ -2159,7 +2163,11 @@
- 								 xmlSecSize bufSize,
- 								 xmlSecKeyInfoCtxPtr keyInfoCtx);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRawX509CertKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRawX509CertKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     sizeof(xmlSecKeyData),
- 
---- misc/xmlsec1-1.2.14/src/mscrypto/x509vfy.c	2009-09-29 15:55:33.502779834 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/x509vfy.c	2009-09-29 15:49:39.708831697 +0200
-@@ -67,7 +67,11 @@
- static int         xmlSecMSCryptoX509StoreInitialize    (xmlSecKeyDataStorePtr store);
- static void        xmlSecMSCryptoX509StoreFinalize      (xmlSecKeyDataStorePtr store);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataStoreKlass xmlSecMSCryptoX509StoreKlass = {
-+#else
- static xmlSecKeyDataStoreKlass xmlSecMSCryptoX509StoreKlass = {
-+#endif
-     sizeof(xmlSecKeyDataStoreKlass),
-     xmlSecMSCryptoX509StoreSize,
- 
---- misc/xmlsec1-1.2.14/src/nss/ciphers.c	2009-09-29 15:55:33.488430535 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/ciphers.c	2009-09-29 15:49:39.717511164 +0200
-@@ -777,7 +777,11 @@
-  * AES CBC cipher transforms
-  *
-  ********************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssAes128CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecNssAes128CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssBlockCipherSize,		/* xmlSecSize objSize */
-@@ -816,7 +820,11 @@
-     return(&xmlSecNssAes128CbcKlass);
- }
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssAes192CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecNssAes192CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssBlockCipherSize,		/* xmlSecSize objSize */
-@@ -855,7 +863,11 @@
-     return(&xmlSecNssAes192CbcKlass);
- }
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssAes256CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecNssAes256CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssBlockCipherSize,		/* xmlSecSize objSize */
-@@ -897,7 +909,11 @@
- #endif /* XMLSEC_NO_AES */
- 
- #ifndef XMLSEC_NO_DES
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssDes3CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecNssDes3CbcKlass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssBlockCipherSize,		/* xmlSecSize objSize */
---- misc/xmlsec1-1.2.14/src/nss/digests.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/digests.c	2009-09-29 15:49:39.725650968 +0200
-@@ -285,7 +285,11 @@
-  * SHA1 Digest transforms
-  *
-  *****************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecNssSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssDigestSize,			/* xmlSecSize objSize */
---- misc/xmlsec1-1.2.14/src/nss/hmac.c	2009-09-29 15:55:33.409285968 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/hmac.c	2009-09-29 15:49:39.733673690 +0200
-@@ -504,7 +504,11 @@
- /** 
-  * HMAC SHA1
-  */
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssHmacSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecNssHmacSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssHmacSize,				/* xmlSecSize objSize */
-@@ -546,7 +550,11 @@
- /** 
-  * HMAC Ripemd160
-  */
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssHmacRipemd160Klass = {
-+#else
- static xmlSecTransformKlass xmlSecNssHmacRipemd160Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssHmacSize,				/* xmlSecSize objSize */
-@@ -588,7 +596,11 @@
- /** 
-  * HMAC Md5
-  */
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssHmacMd5Klass = {
-+#else
- static xmlSecTransformKlass xmlSecNssHmacMd5Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssHmacSize,				/* xmlSecSize objSize */
---- misc/xmlsec1-1.2.14/src/nss/keysstore.c	2009-09-29 15:55:33.422265895 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/keysstore.c	2009-09-29 15:49:39.741628057 +0200
-@@ -487,7 +487,11 @@
-     return NULL ;
- }
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyStoreKlass xmlSecNssKeysStoreKlass = {
-+#else
- static xmlSecKeyStoreKlass xmlSecNssKeysStoreKlass = {
-+#endif
-        sizeof( xmlSecKeyStoreKlass ) ,
-        xmlSecNssKeysStoreSize ,
-        BAD_CAST "implicit_nss_keys_store" ,
 --- misc/xmlsec1-1.2.14/src/nss/keywrapers.c	2009-09-29 15:55:33.430875248 +0200
 +++ misc/build/xmlsec1-1.2.14/src/nss/keywrapers.c	2009-09-29 15:49:39.749963247 +0200
 @@ -1126,6 +1126,7 @@
@@ -581,133 +255,3 @@
  
  #endif /* XMLSEC_NO_DES */
  
---- misc/xmlsec1-1.2.14/src/nss/pkikeys.c	2009-09-29 15:55:33.440002568 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/pkikeys.c	2009-09-29 15:49:39.757984523 +0200
-@@ -491,7 +491,11 @@
- static void		xmlSecNssKeyDataDsaDebugXmlDump	(xmlSecKeyDataPtr data,
- 							 FILE* output);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataDsaKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataDsaKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecNssPKIKeyDataSize,
- 
-@@ -1124,7 +1128,11 @@
- static void		xmlSecNssKeyDataRsaDebugXmlDump	(xmlSecKeyDataPtr data,
- 							 FILE* output);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataRsaKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataRsaKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecNssPKIKeyDataSize,
- 
---- misc/xmlsec1-1.2.14/src/nss/signatures.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/signatures.c	2009-09-29 15:49:39.765851110 +0200
-@@ -459,7 +459,11 @@
-  *
-  ***************************************************************************/
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssDsaSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecNssDsaSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssSignatureSize,		/* xmlSecSize objSize */
-@@ -506,7 +510,11 @@
-  * RSA-SHA1 signature transform
-  *
-  ***************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssRsaSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecNssRsaSha1Klass = {
-+#endif
-     /* klass/object sizes */
-     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-     xmlSecNssSignatureSize,		/* xmlSecSize objSize */
---- misc/xmlsec1-1.2.14/src/nss/symkeys.c	2009-09-29 15:55:33.448817761 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/symkeys.c	2009-09-29 15:49:39.773211741 +0200
-@@ -856,7 +856,11 @@
-  * <xmlsec:AESKeyValue> processing
-  *
-  *************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataAesKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataAesKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecNssSymKeyDataSize,
- 
-@@ -937,7 +941,11 @@
-  * <xmlsec:DESKeyValue> processing
-  *
-  *************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataDesKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataDesKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecNssSymKeyDataSize,
- 
-@@ -1019,7 +1027,11 @@
-  * <xmlsec:HMACKeyValue> processing
-  *
-  *************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataHmacKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataHmacKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecNssSymKeyDataSize,
- 
---- misc/xmlsec1-1.2.14/src/nss/x509.c	2009-09-29 15:55:33.465839785 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/x509.c	2009-09-29 15:49:39.784408301 +0200
-@@ -235,7 +235,11 @@
- 
- 
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataX509Klass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataX509Klass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     xmlSecNssX509DataSize,
- 
-@@ -1785,7 +1789,11 @@
- 								 xmlSecSize bufSize,
- 								 xmlSecKeyInfoCtxPtr keyInfoCtx);
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataRawX509CertKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecNssKeyDataRawX509CertKlass = {
-+#endif
-     sizeof(xmlSecKeyDataKlass),
-     sizeof(xmlSecKeyData),
- 
---- misc/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-29 15:55:33.510337681 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-29 15:49:39.791239957 +0200
-@@ -64,7 +64,11 @@
- static void		xmlSecNssX509StoreFinalize	(xmlSecKeyDataStorePtr store);
- static int		xmlSecNssIntegerToItem( const xmlChar* integer , SECItem *it ) ;
- 
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataStoreKlass xmlSecNssX509StoreKlass = {
-+#else
- static xmlSecKeyDataStoreKlass xmlSecNssX509StoreKlass = {
-+#endif
-     sizeof(xmlSecKeyDataStoreKlass),
-     xmlSecNssX509StoreSize,
- 
diff --git a/mdds/makefile.mk b/mdds/makefile.mk
new file mode 100644
index 000000000000..ea896767edcf
--- /dev/null
+++ b/mdds/makefile.mk
@@ -0,0 +1,66 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=mdds
+TARGET=mdds
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=mdds_0.3.0
+TARFILE_MD5=cf8a6967f7de535ae257fa411c98eb88
+PATCH_FILES=
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+
+BUILD_DIR=
+BUILD_ACTION=
+BUILD_FLAGS=
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :	set_ext.mk
+.INCLUDE :	target.mk
+.INCLUDE :	tg_ext.mk
+
+# --- post-build ---------------------------------------------------
+
+NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
+
+$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
+    -@$(MKDIRHIER) $(INCCOM)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/inc$/mdds $(INCCOM)
+    @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+
+$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+
diff --git a/mdds/prj/build.lst b/mdds/prj/build.lst
new file mode 100644
index 000000000000..da7d095cf7b5
--- /dev/null
+++ b/mdds/prj/build.lst
@@ -0,0 +1,3 @@
+mdd     mdds : solenv BOOST:boost NULL
+mdd	mdds		usr1	-	all	mdd_mkout NULL
+mdd	mdds		nmake	-	all	mdd_mdds NULL
diff --git a/mdds/prj/d.lst b/mdds/prj/d.lst
new file mode 100644
index 000000000000..65cafee5cdc0
--- /dev/null
+++ b/mdds/prj/d.lst
@@ -0,0 +1,5 @@
+mkdir: %_DEST%\inc%_EXT%\mdds
+
+..\%__SRC%\inc\mdds\* %_DEST%\inc%_EXT%\mdds
+
+
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
new file mode 100644
index 000000000000..77d88bc4ca5f
--- /dev/null
+++ b/mythes/makefile.mk
@@ -0,0 +1,115 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=mythes
+TARGET=mythes
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=mythes-1.2.0
+TARFILE_MD5=067201ea8b126597670b5eff72e1f66c
+
+ADDITIONAL_FILES += makefile.mk
+
+PATCH_FILES=mythes-1.2.0-vanilla-th-gen-idx.patch \
+    mythes-1.2.0-makefile-mk.diff
+
+.IF "$(GUI)"=="UNX"
+CONFIGURE_DIR=$(BUILD_DIR)
+
+.IF "$(SYSTEM_HUNSPELL)" != "YES"
+HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell
+HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.2
+.ENDIF
+
+#relative to CONFIGURE_DIR
+# still needed also in system-mythes case as it creates the makefile
+CONFIGURE_ACTION=configure
+CONFIGURE_FLAGS= --disable-shared --with-pic
+
+.IF "$(COM)"=="C52" && "$(CPU)"=="U"
+LCL_CONFIGURE_CFLAGS+=-m64
+.ENDIF
+
+.IF "$(SYSBASE)"!=""
+.IF "$(EXTRA_CFLAGS)"!=""
+LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS)
+CONFIGURE_FLAGS+=CXXFLAGS="$(EXTRA_CFLAGS)"
+.ENDIF # "$(EXTRA_CFLAGS)"!=""
+.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
+CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
+.ENDIF
+
+.IF "$(LCL_CONFIGURE_CFLAGS)"!=""
+CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
+.ENDIF
+
+.IF "$(SYSTEM_MYTHES)" == "YES"
+@all:
+    echo "Nothing to do here."
+.ELSE
+BUILD_ACTION=make
+OUT2INC += mythes.hxx
+.ENDIF
+
+.ENDIF # "$(GUI)"=="UNX"
+
+
+.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+CONFIGURE_ACTION=configure
+CONFIGURE_FLAGS= --disable-shared --with-pic
+
+BUILD_ACTION=make
+
+.ELSE
+BUILD_ACTION=dmake
+.ENDIF # "$(COM)"=="GCC"
+OUT2INC += mythes.hxx
+.ENDIF # "$(GUI)"=="WNT"
+
+.IF "$(GUI)"=="OS2"
+BUILD_ACTION=dmake
+OUT2INC += mythes.hxx
+.ENDIF # "$(GUI)"=="OS2"
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
+.IF "$(SYSTEM_HUNSPELL)" != "YES"
+.EXPORT: HUNSPELL_LIBS HUNSPELL_CFLAGS
+.ENDIF
+
diff --git a/mythes/mythes-1.2.0-makefile-mk.diff b/mythes/mythes-1.2.0-makefile-mk.diff
new file mode 100644
index 000000000000..30cdf4694186
--- /dev/null
+++ b/mythes/mythes-1.2.0-makefile-mk.diff
@@ -0,0 +1,94 @@
+--- misc/mythes-1.2.0/makefile.mk	2010-05-14 23:36:09.000000000 +0200
++++ misc/build/mythes-1.2.0/makefile.mk	2010-05-14 23:35:14.000000000 +0200
+@@ -1 +1,90 @@
+-dummy
++#*************************************************************************
++#
++#   $RCSfile: makefile.mk,v $
++#
++#   $Revision: 1.1.1.1 $
++#
++#   last change: $Author: caolan $ $Date: 2010/02/27 15:52:17 $
++#
++#   The Contents of this file are made available subject to the terms of
++#   either of the following licenses
++#
++#          - GNU Lesser General Public License Version 2.1
++#          - Sun Industry Standards Source License Version 1.1
++#
++#   Sun Microsystems Inc., October, 2000
++#
++#   GNU Lesser General Public License Version 2.1
++#   =============================================
++#   Copyright 2000 by Sun Microsystems, Inc.
++#   901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++#   This library is free software; you can redistribute it and/or
++#   modify it under the terms of the GNU Lesser General Public
++#   License version 2.1, as published by the Free Software Foundation.
++#
++#   This library is distributed in the hope that it will be useful,
++#   but WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++#   Lesser General Public License for more details.
++#
++#   You should have received a copy of the GNU Lesser General Public
++#   License along with this library; if not, write to the Free Software
++#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++#   MA  02111-1307  USA
++#
++#
++#   Sun Industry Standards Source License Version 1.1
++#   =================================================
++#   The contents of this file are subject to the Sun Industry Standards
++#   Source License Version 1.1 (the "License"); You may not use this file
++#   except in compliance with the License. You may obtain a copy of the
++#   License at http://www.openoffice.org/license.html.
++#
++#   Software provided under this License is provided on an "AS IS" basis,
++#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
++#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
++#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
++#   See the License for the specific provisions governing your rights and
++#   obligations concerning the Software.
++#
++#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
++#
++#   Copyright: 2000 by Sun Microsystems, Inc.
++#
++#   All Rights Reserved.
++#
++#   Contributor(s): _______________________________________
++#
++#
++#
++#*************************************************************************
++
++PRJ = ../../../..
++
++PRJNAME	= mythes
++TARGET	= mythes
++LIBTARGET=YES
++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++
++#----- Settings ---------------------------------------------------------
++
++.INCLUDE : settings.mk
++
++# --- Files --------------------------------------------------------
++
++all_target: ALLTAR
++
++
++
++SLOFILES=	\
++		$(SLO)$/mythes.obj
++
++LIB1TARGET= $(SLB)$/lib$(TARGET).lib
++LIB1ARCHIV= $(LB)/lib$(TARGET).a
++LIB1OBJFILES= $(SLOFILES)
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE : target.mk
++
diff --git a/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch b/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch
new file mode 100644
index 000000000000..776fac46a08e
--- /dev/null
+++ b/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch
@@ -0,0 +1,97 @@
+--- misc/mythes-1.2.0.orig/th_gen_idx.pl
++++ misc/build/mythes-1.2.0/th_gen_idx.pl
+@@ -1,11 +1,32 @@
+-#!/usr/bin/perl
+-
+-# perl program to take a thesaurus structured text data file 
+-# and create the proper sorted index file (.idx)
++:
++eval 'exec perl -wS $0 ${1+"$@"}'
++    if 0;
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2000, 2010 Oracle and/or its affiliates.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
+ #
+-# typcially invoked as follows:
+-# cat th_en_US_new.dat | ./th_gen_idx.pl > th_en_US_new.idx
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
+ #
++#*************************************************************************
+ 
+ sub by_entry {
+     my ($aent, $aoff) = split('\|',$a);
+@@ -13,6 +34,27 @@ sub by_entry {
+     $aent cmp $bent;
+ }
+ 
++#FIXME: someone may want "infile" or even parameter parsing
++sub get_outfile {
++	my $next_is_file = 0;
++	foreach ( @ARGV ) {
++		if ( $next_is_file ) {
++			return $_
++		}
++		if ( $_ eq "-o" ) {
++			$next_is_file = 1;
++		}
++	}
++	return "";
++}
++
++sub usage {
++	print "usage:\n";
++	print "$0 -o outfile < input\n";
++
++	exit 99;
++}
++
+ # main routine
+ my $ne = 0;       # number of entries in index
+ my @tindex=();    # the index itself
+@@ -24,6 +66,10 @@ my $nm=0;         # number of meaning fo
+ my $meaning="";   # current meaning and synonyms
+ my $p;            # misc uses
+ my $encoding;     # encoding used by text file
++my $outfile = "";
++
++$outfile = get_outfile();
++usage() if ( $outfile eq "" );
+ 
+ # top line of thesaurus provides encoding
+ $encoding=<STDIN>;
+@@ -51,9 +97,13 @@ while ($rec=<STDIN>){
+ # now we have all of the information
+ # so sort it and then output the encoding, count and index data
+ @tindex = sort by_entry @tindex;
+-print STDOUT "$encoding\n";
+-print STDOUT "$ne\n";
++
++print "$outfile\n";
++open OUTFILE, ">$outfile" or die "ERROR: Can't open $outfile for writing!";
++print OUTFILE "$encoding\n";
++print OUTFILE "$ne\n";
+ foreach $one (@tindex) {
+-    print STDOUT "$one\n";
++    print OUTFILE "$one\n";
+ }
++close OUTFILE;
+ 
diff --git a/mythes/prj/build.lst b/mythes/prj/build.lst
new file mode 100644
index 000000000000..6c3cb8022aac
--- /dev/null
+++ b/mythes/prj/build.lst
@@ -0,0 +1,3 @@
+myt     mythes  :       soltools solenv HUNSPELL:hunspell NULL
+myt     mythes              usr1    -       all myt_mkout NULL
+myt     mythes              nmake   -       all myt_mythes NULL
diff --git a/mythes/prj/d.lst b/mythes/prj/d.lst
new file mode 100644
index 000000000000..417855e879d8
--- /dev/null
+++ b/mythes/prj/d.lst
@@ -0,0 +1,7 @@
+..\%__SRC%\slb\libmythes.lib     %_DEST%\lib%_EXT%\libmythes.lib
+
+..\%__SRC%\inc\mythes.hxx %_DEST%\inc%_EXT%\mythes.hxx
+..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib%_EXT%\libmythes-1.2.a
+..\%__SRC%\lib\libmythes-1.2.a %_DEST%\lib%_EXT%\libmythes-1.2.a
+..\%__SRC%\misc\build\mythes-1.2.0\th_gen_idx.pl %_DEST%\bin%_EXT%\th_gen_idx.pl
+
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index fb110e4fff37..b67f6ef314ce 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -68,11 +68,11 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
 OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
-raptor_CC=$(CC)
+raptor_CC=$(CC) -mthreads
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
 raptor_CC+=-shared-libgcc
 .ENDIF
-raptor_LIBS=-lmingwthrd
+raptor_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
 raptor_LIBS+=-lstdc++_s
 .ENDIF
@@ -80,7 +80,7 @@ raptor_LIBS+=-lstdc++_s
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
 # do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols  -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols  -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 4cf766804819..66fca99d1600 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -66,18 +66,18 @@ BUILD_ACTION=dmake
 BUILD_DIR=$(CONFIGURE_DIR)$/src
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
-rasqal_CC=$(CC)
+rasqal_CC=$(CC) -mthreads
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
 rasqal_CC+=-shared-libgcc
 .ENDIF
-rasqal_LIBS=-lmingwthrd
+rasqal_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
 rasqal_LIBS+=-lstdc++_s
 .ENDIF
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 02770cb7fbd1..20b1210dd2f9 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -66,18 +66,18 @@ BUILD_ACTION=dmake
 BUILD_DIR=$(CONFIGURE_DIR)$/librdf
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
-redland_CC=$(CC)
+redland_CC=$(CC) -mthreads
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
 redland_CC+=-shared-libgcc
 .ENDIF
-redland_LIBS=-lmingwthrd
+redland_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
 redland_LIBS+=-lstdc++_s
 .ENDIF
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)