Update to m107

192 files changed, 48 insertions, 12384 deletions

diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 80d5a832f6a2..94a4282f01d2 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -48,7 +48,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		105
+MILESTONE=		107
 SNAPDATE=		20050521
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
@@ -93,8 +93,8 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
+
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index c308f56de99d..cc4f3b56c811 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810
-SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617
+MD5 (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 9c20222b097d70029dae19f834a83bf1
+SIZE (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 212641982
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
deleted file mode 100644
index 5e5d4b85c49e..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
+++ /dev/null
@@ -1,270 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s	Thu Jan  1 09:00:00 1970
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s	Fri May 20 11:21:13 2005
-@@ -0,0 +1,262 @@
-+    .text
-+
-+.globl privateSnippetExecutorGeneral
-+    .type   privateSnippetExecutorGeneral,@function
-+privateSnippetExecutorGeneral:
-+.LFBg:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIg0:
-+    movl    %esp,%ebp
-+.LCFIg1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEg:
-+    .size   privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral
-+
-+.globl privateSnippetExecutorVoid
-+    .type   privateSnippetExecutorVoid,@function
-+privateSnippetExecutorVoid:
-+.LFBv:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIv0:
-+    movl    %esp,%ebp
-+.LCFIv1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    leave
-+    ret
-+.LFEv:
-+    .size   privateSnippetExecutorVoid,.-privateSnippetExecutorVoid
-+
-+.globl privateSnippetExecutorHyper
-+    .type   privateSnippetExecutorHyper,@function
-+privateSnippetExecutorHyper:
-+.LFBh:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIh0:
-+    movl    %esp,%ebp
-+.LCFIh1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    movl    16(%esp),%edx     # 64 bit nRegReturn, upper half
-+    leave
-+    ret
-+.LFEh:
-+    .size   privateSnippetExecutorHyper,.-privateSnippetExecutorHyper
-+
-+.globl privateSnippetExecutorFloat
-+    .type   privateSnippetExecutorFloat,@function
-+privateSnippetExecutorFloat:
-+.LFBf:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIf0:
-+    movl    %esp,%ebp
-+.LCFIf1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    flds    12(%esp)          # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEf:
-+    .size   privateSnippetExecutorFloat,.-privateSnippetExecutorFloat
-+
-+.globl privateSnippetExecutorDouble
-+    .type   privateSnippetExecutorDouble,@function
-+privateSnippetExecutorDouble:
-+.LFBd:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFId0:
-+    movl    %esp,%ebp
-+.LCFId1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    fldl    12(%esp)          # 64 bit nRegReturn
-+    leave
-+    ret
-+.LFEd:
-+    .size   privateSnippetExecutorDouble,.-privateSnippetExecutorDouble
-+
-+.globl privateSnippetExecutorClass
-+    .type   privateSnippetExecutorClass,@function
-+privateSnippetExecutorClass:
-+.LFBc:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIc0:
-+    movl    %esp,%ebp
-+.LCFIc1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret     $4
-+.LFEc:
-+    .size   privateSnippetExecutorClass,.-privateSnippetExecutorClass
-+
-+    .section .eh_frame,"a",@progbits
-+.Lframe1:
-+    .long   .LECIE1-.LSCIE1   # length
-+.LSCIE1:
-+    .long   0                 # CIE_ID
-+    .byte   1                 # version
-+    .string "zR"              # augmentation
-+    .uleb128 1                # code_alignment_factor
-+    .sleb128 -4               # data_alignment_factor
-+    .byte   8                 # return_address_register
-+    .uleb128 1                # augmentation size 1:
-+    .byte   0x1B              #  FDE Encoding (pcrel sdata4)
-+                              # initial_instructions:
-+    .byte   0x0C              #  DW_CFA_def_cfa %esp, 4
-+    .uleb128 4
-+    .uleb128 4
-+    .byte   0x88              #  DW_CFA_offset ret, 1
-+    .uleb128 1
-+    .align 4
-+.LECIE1:
-+.LSFDEg:
-+    .long   .LEFDEg-.LASFDEg  # length
-+.LASFDEg:
-+    .long   .LASFDEg-.Lframe1 # CIE_pointer
-+    .long   .LFBg-.           # initial_location
-+    .long   .LFEg-.LFBg       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg0-.LFBg
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg1-.LCFIg0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEg:
-+.LSFDEv:
-+    .long   .LEFDEv-.LASFDEv  # length
-+.LASFDEv:
-+    .long   .LASFDEv-.Lframe1 # CIE_pointer
-+    .long   .LFBv-.           # initial_location
-+    .long   .LFEv-.LFBv       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv0-.LFBv
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv1-.LCFIv0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEv:
-+.LSFDEh:
-+    .long   .LEFDEh-.LASFDEh  # length
-+.LASFDEh:
-+    .long   .LASFDEh-.Lframe1 # CIE_pointer
-+    .long   .LFBh-.           # initial_location
-+    .long   .LFEh-.LFBh       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh0-.LFBh
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh1-.LCFIh0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEh:
-+.LSFDEf:
-+    .long   .LEFDEf-.LASFDEf  # length
-+.LASFDEf:
-+    .long   .LASFDEf-.Lframe1 # CIE_pointer
-+    .long   .LFBf-.           # initial_location
-+    .long   .LFEf-.LFBf       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf0-.LFBf
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf1-.LCFIf0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEf:
-+.LSFDEd:
-+    .long   .LEFDEd-.LASFDEd  # length
-+.LASFDEd:
-+    .long   .LASFDEd-.Lframe1 # CIE_pointer
-+    .long   .LFBd-.           # initial_location
-+    .long   .LFEd-.LFBd       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId0-.LFBd
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId1-.LCFId0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEd:
-+.LSFDEc:
-+    .long   .LEFDEc-.LASFDEc  # length
-+.LASFDEc:
-+    .long   .LASFDEc-.Lframe1 # CIE_pointer
-+    .long   .LFBc-.           # initial_location
-+    .long   .LFEc-.LFBc       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc0-.LFBc
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc1-.LCFIc0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEc:
diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
deleted file mode 100644
index a291493b6b29..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Wed Jan 19 00:06:09 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Feb 21 21:13:28 2005
-@@ -77,7 +77,7 @@
- {
- 
- //==================================================================================================
--static typelib_TypeClass cpp2uno_call(
-+void cpp2uno_call(
- 	bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
- 	const typelib_TypeDescription * pMemberTypeDescr,
- 	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-@@ -209,8 +209,6 @@
- 		CPPU_CURRENT_NAMESPACE::raiseException(
-             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-             // has to destruct the any
--		// is here for dummy
--		return typelib_TypeClass_VOID;
- 	}
- 	else // else no exception occured...
- 	{
-@@ -247,22 +245,16 @@
- 		}
- 		if (pReturnTypeDescr)
- 		{
--			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
- 			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
--			return eRet;
- 		}
--		else
--			return typelib_TypeClass_VOID;
- 	}
- }
- 
- 
- //==================================================================================================
--static typelib_TypeClass cpp_mediate(
--	sal_Int32 nFunctionIndex,
--    sal_Int32 nVtableOffset,
--	void ** pCallStack,
--	sal_Int64 * pRegisterReturn /* space for register return */ )
-+extern "C" void cpp_vtable_call(
-+    int nFunctionIndex, int nVtableOffset, void** pCallStack,
-+    sal_Int64 nRegReturn )
- {
- 	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
- 	
-@@ -298,7 +290,6 @@
- 
- 	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-     
--	typelib_TypeClass eRet;
- 	switch (aMemberDescr.get()->eTypeClass)
- 	{
- 	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-@@ -306,11 +297,11 @@
- 		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
- 		{
- 			// is GET method
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
- 				0, 0, // no params
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		else
- 		{
-@@ -321,11 +312,11 @@
- 			aParam.bIn		= sal_True;
- 			aParam.bOut		= sal_False;
- 			
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				0, // indicates void return
- 				1, &aParam,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -336,11 +327,9 @@
- 		{
- 		case 1: // acquire()
- 			pCppI->acquireProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 2: // release()
- 			pCppI->releaseProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 0: // queryInterface() opt
- 		{
-@@ -361,20 +350,19 @@
-                         &pInterface, pTD, cpp_acquire );
-                     pInterface->release();
-                     TYPELIB_DANGER_RELEASE( pTD );
--                    *(void **)pRegisterReturn = pCallStack[1];
--                    eRet = typelib_TypeClass_ANY;
-+                    *(void **)&nRegReturn = pCallStack[1];
-                     break;
-                 }
-                 TYPELIB_DANGER_RELEASE( pTD );
-             }
- 		} // else perform queryInterface()
- 		default:
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -383,72 +371,55 @@
- 		throw RuntimeException(
-             rtl::OUString::createFromAscii("no member description found!"),
-             (XInterface *)pThis );
--		// is here for dummy
--		eRet = typelib_TypeClass_VOID;
- 	}
- 	}
--
--	return eRet;
- }
- 
- //==================================================================================================
--/**
-- * is called on incoming vtable calls
-- * (called by asm snippets)
-- */
--static void cpp_vtable_call(
--    int nFunctionIndex, int nVtableOffset, void** pCallStack )
--    __attribute__((regparm(3)));
--
--void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
--{
--	volatile long nRegReturn[2];
--	typelib_TypeClass aType = cpp_mediate(
--        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
--    
--	switch( aType )
--	{
--		case typelib_TypeClass_HYPER:
--		case typelib_TypeClass_UNSIGNED_HYPER:
--			__asm__( "movl %1, %%edx\n\t"
--					 "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
--			break;
--		case typelib_TypeClass_FLOAT:
--			__asm__( "flds %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "flds %0\n"
--					 : : "m"(*(float *)nRegReturn) );
--			break;
--		case typelib_TypeClass_DOUBLE:
--			__asm__( "fldl %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "fldl %0\n"
--					 : : "m"(*(double *)nRegReturn) );
--			break;
--// 		case typelib_TypeClass_UNSIGNED_SHORT:
--// 		case typelib_TypeClass_SHORT:
--// 			__asm__( "movswl %0, %%eax\n"
--// 					 : : "m"(nRegReturn) );
--// 		break;
--		default:
--			__asm__( "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]) );
--			break;
--	}
--}
--
-+extern "C" void privateSnippetExecutorGeneral();
-+extern "C" void privateSnippetExecutorVoid();
-+extern "C" void privateSnippetExecutorHyper();
-+extern "C" void privateSnippetExecutorFloat();
-+extern "C" void privateSnippetExecutorDouble();
-+extern "C" void privateSnippetExecutorClass();
-+extern "C" typedef void (*PrivateSnippetExecutor)();
- 
--//==================================================================================================
--int const codeSnippetSize = 20;
-+int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
-     unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
--    bool simpleRetType)
-+    typelib_TypeClass returnTypeClass)
- {
--    if (!simpleRetType) {
-+    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-         functionIndex |= 0x80000000;
-     }
-+    PrivateSnippetExecutor exec;
-+    switch (returnTypeClass) {
-+    case typelib_TypeClass_VOID:
-+        exec = privateSnippetExecutorVoid;
-+        break;
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        exec = privateSnippetExecutorHyper;
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+        exec = privateSnippetExecutorFloat;
-+        break;
-+    case typelib_TypeClass_DOUBLE:
-+        exec = privateSnippetExecutorDouble;
-+        break;
-+    case typelib_TypeClass_STRING:
-+    case typelib_TypeClass_TYPE:
-+    case typelib_TypeClass_ANY:
-+    case typelib_TypeClass_SEQUENCE:
-+    case typelib_TypeClass_STRUCT:
-+    case typelib_TypeClass_INTERFACE:
-+        exec = privateSnippetExecutorClass;
-+        break;
-+    default:
-+        exec = privateSnippetExecutorGeneral;
-+        break;
-+    }
-     unsigned char * p = code;
-     OSL_ASSERT(sizeof (sal_Int32) == 4);
-     // mov function_index, %eax:
-@@ -459,13 +430,10 @@
-     *p++ = 0xBA;
-     *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-     p += sizeof (sal_Int32);
--    // mov %esp, %ecx:
--    *p++ = 0x89;
--    *p++ = 0xE1;
--    // jmp cpp_vtable_call:
-+    // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -504,17 +472,17 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceAttributeTypeDescription * >(
--                        member)->pAttributeTypeRef));
-+                reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-+                    member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-             if (!reinterpret_cast<
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
-                 *slots++ = code;
--                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-+                code = codeSnippet(
-+                    code, functionOffset++, vtableOffset,
-+                    typelib_TypeClass_VOID);
-             }
-             break;
- 
-@@ -522,10 +490,8 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceMethodTypeDescription * >(
--                        member)->pReturnTypeRef));
-+                reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-+                    member)->pReturnTypeRef->eTypeClass);
-             break;
- 
-         default:
diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
deleted file mode 100644
index 942e6fccc4c7..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk	Fri May 20 11:14:36 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Fri May 20 11:16:09 2005
-@@ -87,7 +87,8 @@
- SLOFILES= \
- 	$(SLO)$/except.obj		\
- 	$(SLO)$/cpp2uno.obj		\
--	$(SLO)$/uno2cpp.obj
-+    $(SLO)$/uno2cpp.obj \
-+    $(SLO)$/call.obj
- 
- SHL1TARGET= $(TARGET)
- 
-@@ -108,3 +109,6 @@
- 
- .INCLUDE :  target.mk
- 
-+$(SLO)$/%.obj: %.s
-+    $(CC) -c -o $(SLO)$/$(@:b).o $<
-+    touch $@
diff --git a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice-2.0-devel/files/patch-config_office+configure.in
deleted file mode 100644
index 3c65cce44a9c..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49678#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : == -> =
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.116
-diff -u -r1.116 configure.in
---- config_office/configure.in	11 Apr 2005 09:31:15 -0000	1.116
-+++ config_office/configure.in	13 May 2005 07:13:41 -0000
-@@ -1787,7 +1787,7 @@
- dnl Checks for javac
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
--    if test "$JDK" == "gcj"; then 
-+    if test "$JDK" = "gcj"; then 
-         javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-     else
-         javacompiler="javac"
-@@ -1871,7 +1871,7 @@
-     fi
- fi
- 
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-    AC_CHECK_HEADER(jni.h, [],
-@@ -1888,7 +1888,7 @@
- dnl ===================================================================
- dnl Check for optional gcj-dbtool
- dnl ===================================================================
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-     javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
-     if test -z "$with_jdk_home"; then
-         AC_PATH_PROG(JAVACACHE, $javacache)
-@@ -2684,7 +2684,7 @@
-    if test -z "$MOZILLA_VERSION"; then
-       MOZILLA_VERSION=1.7.5
-    fi
--   if test "$MOZILLA_VERSION" == "1.7b" ; then
-+   if test "$MOZILLA_VERSION" = "1.7b" ; then
-       MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source.tar.gz"
-    else
-       MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}.tar.gz"
diff --git a/editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
deleted file mode 100644
index 3c87525ff42a..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49679#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : We don't have -ldl and -lnsl
-
-Index: crashrep/source/unx/makefile.mk
-===================================================================
-RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
-retrieving revision 1.14
-diff -u -r1.14 makefile.mk
---- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
-+++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
-@@ -82,7 +82,10 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
--APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS+=-ldl -lnsl
-+.ENDIF
- .IF "$(OS)" == "SOLARIS"
- APP1STDLIBS+=-lsocket
- .ENDIF
diff --git a/editors/openoffice-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
deleted file mode 100644
index 81b293cdf9f3..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49682#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct version number of resultant shared lib
-
-Index: xmlsec1-1.2.6.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
-retrieving revision 1.5
-diff -u -r1.5 xmlsec1-1.2.6.patch
---- libxmlsec/xmlsec1-1.2.6.patch	18 May 2005 10:11:24 -0000	1.5
-+++ libxmlsec/xmlsec1-1.2.6.patch	22 May 2005 01:43:49 -0000
-@@ -756,6 +756,35 @@
- *** misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
- --- misc/build/xmlsec1-1.2.6/ltmain.sh	2005-05-09 19:55:51.745319024 +0200
- ***************
-+*** 2994,3006 ****
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=".$current"
-+! 	  versuffix=".$current.$revision";
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2994,3006 ----
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+***************
- *** 3564,3570 ****
-   		fi
-   	      else
diff --git a/editors/openoffice-2.0-devel/files/patch-odk+configure.pl b/editors/openoffice-2.0-devel/files/patch-odk+configure.pl
deleted file mode 100644
index a608473de01c..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : canonical name by config.guess for FreeBSD is
-% ./config.guess
-i386-unknown-freebsd5.3
-so, $main::operatingSystem is
-% ./config.guess | cut -d"-" -f3,4
-freebsd5.3
-then, if ( $main::operatingSystem eq "FreeBSD" ) is not correct,
-and if ( $main::operatingSystem =~ /freebsd/ ) is correct
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.11
-diff -u -r1.11 configure.pl
---- odk/configure.pl	29 Mar 2005 12:03:00 -0000	1.11
-+++ odk/configure.pl	15 May 2005 08:46:20 -0000
-@@ -45,7 +45,7 @@
- 
- $main::OO_SDK_MAKE_HOME = "";
- $main::makeName = "make";
--if ( $main::operatingSystem eq "FreeBSD" )
-+if ( $main::operatingSystem =~ /freebsd/ )
- {
-     $main::makeName = "gmake";
- }
diff --git a/editors/openoffice-2.0-devel/files/patch-odk+setsdkenv_unix b/editors/openoffice-2.0-devel/files/patch-odk+setsdkenv_unix
deleted file mode 100644
index 1165826077b0..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-odk+setsdkenv_unix
+++ /dev/null
@@ -1,39 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-
-Index: odk/setsdkenv_unix.sh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.sh.in
---- odk/setsdkenv_unix.sh.in	29 Mar 2005 12:03:27 -0000	1.5
-+++ odk/setsdkenv_unix.sh.in	15 May 2005 09:06:22 -0000
-@@ -130,7 +130,7 @@
-     export LD_LIBRARY_PATH
-     ;;
- 
--  freebsd)
-+  freebsd*)
-     if [ -n "$OO_SDK_CPP_HOME" ]
-     then
- 	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-Index: odk/setsdkenv_unix.csh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.csh.in
---- odk/setsdkenv_unix.csh.in	29 Mar 2005 12:03:14 -0000	1.5
-+++ odk/setsdkenv_unix.csh.in	15 May 2005 09:06:38 -0000
-@@ -114,7 +114,7 @@
-     endif
-   breaksw
- 
--  case "freebsd":
-+  case "freebsd*":
-     if ( $?OO_SDK_CPP_HOME == 0) then
- 	set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- 	setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
diff --git a/editors/openoffice-2.0-devel/files/patch-odk+settings+settings.mk b/editors/openoffice-2.0-devel/files/patch-odk+settings+settings.mk
deleted file mode 100644
index 079bd128062c..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-and adding missing things.
-
-Index: odk/settings/settings.mk
-===================================================================
-RCS file: /cvs/api/odk/settings/settings.mk,v
-retrieving revision 1.14
-diff -u -r1.14 settings.mk
---- odk/settings/settings.mk	29 Mar 2005 12:19:26 -0000	1.14
-+++ odk/settings/settings.mk	15 May 2005 13:54:38 -0000
-@@ -397,7 +397,7 @@
- # FreeBSD specific settings
- #
- ###########################################################################
--ifeq "$(PLATFORM)" "freebsd"
-+ifneq (,$(findstring freebsd,$(PLATFORM)))
- # Settings for FreeBSD using gcc compiler
- 
- PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-@@ -435,6 +435,7 @@
- CSEP=\>
- QUOTE=$(subst S,\,S)
- QM=\"
-+SQM='
- ECHOLINE=@echo
- P2BG=&
- 
-@@ -446,10 +447,10 @@
- # Include UDK version numbers
- include $(PRJ)/include/udkversion.mk
- 
--SALLIB=-lsal
--CPPULIB=-lcppu
--CPPUHELPERLIB=-lcppuhelper$(COMID)
--SALHELPERLIB=-lsalhelper$(COMID)
-+SALLIB=-luno_sal
-+CPPULIB=-luno_cppu
-+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-+SALHELPERLIB=-luno_salhelper$(COMID)
- REGLIB=-lreg
- STORELIB=-lstore
- STLPORTLIB=-lstlport_gcc
diff --git a/editors/openoffice-2.0-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice-2.0-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 09f2f949c81d..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-Issutracker : #i49677#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : contains illigal char
-
-Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
-===================================================================
-RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
-retrieving revision 1.2
-diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
---- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
-+++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
-@@ -109,7 +109,7 @@
- 		linearly between center and endColor via concentric ellipses
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		circular. If it's not 1, the gradient is elliptical, with the
- 		special twist that the aspect ratio is maintained also for the
- 		center color: the gradient will not collapse into a single
-@@ -124,7 +124,7 @@
- 		linearly between center and endColor via rectangular boxes
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		quadratic. If it's not 1, the gradient is rectangular, with
- 		the special twist that the aspect ratio is maintained also for
- 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice-2.0-devel/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice-2.0-devel/files/patch-portaudio+portaudio_v18_1.patch
deleted file mode 100644
index 87c43fb14d7c..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-portaudio+portaudio_v18_1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Issutracker : #i46879#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Need to include <sys/soundcard.h> to use sound and passes
-              correct pthread related flags
-
-Index: portaudio/portaudio_v18_1.patch
-===================================================================
-RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
-retrieving revision 1.1
-diff -u -r1.1 portaudio_v18_1.patch
---- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
-+++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
-@@ -12,7 +12,7 @@
-   	;;
-   
-     mingw* )
----- 1883,1902 ----
-+--- 1883,1921 ----
-   case "${host_os}" in
-     darwin* )
-   
-@@ -30,6 +30,25 @@
- ! 	PADLL="libportaudio.so";
- ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
- ! 	CFLAGS="-O2 -fPIC"
-+! 	;;
-+! 
-+!   freebsd* )
-+! 	if test "$OSVERSION" -lt "500016"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-pthread"
-+!         elif test "$OSVERSION" -lt "502102"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-lc_r"
-+!         else
-+!              PTHREAD_CFLAGS=""
-+!              PTHREAD_LIBS="-pthread"
-+!         fi
-+! 
-+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+! 	LIBS="-lm ${PTHREAD_LIBS}";
-+! 	PADLL="libportaudio.so";
-+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-+! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
-   	;;
-   
-     mingw* )
-@@ -52,3 +71,18 @@
-   LIBINST = /usr/local/lib
-   
-   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-+
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
-+***************
-+*** 43,48 ****
-+--- 43,50 ----
-+  
-+  #ifdef __linux__
-+  #include <linux/soundcard.h>
-++ #elif defined (__FreeBSD__)
-++ #include <sys/soundcard.h>
-+  #else
-+  #include <machine/soundcard.h> /* JH20010905 */
-+  #endif
-+
diff --git a/editors/openoffice-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch
deleted file mode 100644
index 71a8f2292f2a..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Issutracker : #i49684#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct shared lib number
-
-Index: libsndfile-1.0.9.patch
-===================================================================
-RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
-retrieving revision 1.1
-diff -u -r1.1 libsndfile-1.0.9.patch
---- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
-+++ sndfile/libsndfile-1.0.9.patch	22 May 2005 02:01:17 -0000
-@@ -231,3 +231,24 @@
-   
-   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-   
-+*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
-+--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
-+***************
-+*** 2980,2987 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2980,2987 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
diff --git a/editors/openoffice-2.0-devel/files/patch-sndfile+makefile.mk b/editors/openoffice-2.0-devel/files/patch-sndfile+makefile.mk
deleted file mode 100644
index 234100480f33..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sndfile+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i49683#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : -noinhibit-exec allows linking against non-existent libs
-
-Index: sndfile/makefile.mk
-===================================================================
-RCS file: /cvs/external/sndfile/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
-+++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
-@@ -81,7 +81,7 @@
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure --with-pic
--.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
-+.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
- .ENDIF
- 
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 94e3cc8d21bc..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-Issutracker : #i49685#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Update to recent version of unxlngi6.mk
-($Revision: 1.12 and $Author: obo $ $Date: 2005/05/06 09:37:55 $)
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.13
-diff -u -r1.13 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	11 Feb 2005 15:27:55 -0000	1.13
-+++ solenv/inc/unxfbsdi.mk	15 May 2005 04:51:41 -0000
-@@ -99,9 +99,6 @@
- CC+:=$(CFLAGS_SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
- CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
--.IF "$(PRODUCT)"!=""
--CFLAGS+=-Wuninitialized
--.ENDIF
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_SYMBOLS)"=="SMALL"
-@@ -122,6 +119,9 @@
- CFLAGSCXX= -pipe -mtune=pentiumpro
- CFLAGSCXX+= -Wno-ctor-dtor-privacy
- 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=
-@@ -143,6 +143,7 @@
- # Compiler flags for enabling optimazations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized				# not supported without optimization
- .ELSE 	# "$(PRODUCT)"!=""
- CFLAGSOPT=   							# no optimizing for non products
- .ENDIF	# "$(PRODUCT)"!=""
-@@ -161,11 +162,12 @@
- 
- # name of linker
- LINK*=$(CXX)
-+LINKC*=$(CC)
- 
- # default linker flags
- LINKFLAGSDEFS*=#-Wl,-z,defs
- LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-@@ -237,3 +239,4 @@
- DLLPOSTFIX=fi
- DLLPRE=lib
- DLLPOST=.so
-+
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 80d5a832f6a2..94a4282f01d2 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -48,7 +48,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		105
+MILESTONE=		107
 SNAPDATE=		20050521
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
@@ -93,8 +93,8 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
+
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index c308f56de99d..cc4f3b56c811 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810
-SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617
+MD5 (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 9c20222b097d70029dae19f834a83bf1
+SIZE (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 212641982
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
deleted file mode 100644
index 5e5d4b85c49e..000000000000
--- a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
+++ /dev/null
@@ -1,270 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s	Thu Jan  1 09:00:00 1970
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s	Fri May 20 11:21:13 2005
-@@ -0,0 +1,262 @@
-+    .text
-+
-+.globl privateSnippetExecutorGeneral
-+    .type   privateSnippetExecutorGeneral,@function
-+privateSnippetExecutorGeneral:
-+.LFBg:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIg0:
-+    movl    %esp,%ebp
-+.LCFIg1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEg:
-+    .size   privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral
-+
-+.globl privateSnippetExecutorVoid
-+    .type   privateSnippetExecutorVoid,@function
-+privateSnippetExecutorVoid:
-+.LFBv:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIv0:
-+    movl    %esp,%ebp
-+.LCFIv1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    leave
-+    ret
-+.LFEv:
-+    .size   privateSnippetExecutorVoid,.-privateSnippetExecutorVoid
-+
-+.globl privateSnippetExecutorHyper
-+    .type   privateSnippetExecutorHyper,@function
-+privateSnippetExecutorHyper:
-+.LFBh:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIh0:
-+    movl    %esp,%ebp
-+.LCFIh1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    movl    16(%esp),%edx     # 64 bit nRegReturn, upper half
-+    leave
-+    ret
-+.LFEh:
-+    .size   privateSnippetExecutorHyper,.-privateSnippetExecutorHyper
-+
-+.globl privateSnippetExecutorFloat
-+    .type   privateSnippetExecutorFloat,@function
-+privateSnippetExecutorFloat:
-+.LFBf:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIf0:
-+    movl    %esp,%ebp
-+.LCFIf1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    flds    12(%esp)          # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEf:
-+    .size   privateSnippetExecutorFloat,.-privateSnippetExecutorFloat
-+
-+.globl privateSnippetExecutorDouble
-+    .type   privateSnippetExecutorDouble,@function
-+privateSnippetExecutorDouble:
-+.LFBd:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFId0:
-+    movl    %esp,%ebp
-+.LCFId1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    fldl    12(%esp)          # 64 bit nRegReturn
-+    leave
-+    ret
-+.LFEd:
-+    .size   privateSnippetExecutorDouble,.-privateSnippetExecutorDouble
-+
-+.globl privateSnippetExecutorClass
-+    .type   privateSnippetExecutorClass,@function
-+privateSnippetExecutorClass:
-+.LFBc:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIc0:
-+    movl    %esp,%ebp
-+.LCFIc1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret     $4
-+.LFEc:
-+    .size   privateSnippetExecutorClass,.-privateSnippetExecutorClass
-+
-+    .section .eh_frame,"a",@progbits
-+.Lframe1:
-+    .long   .LECIE1-.LSCIE1   # length
-+.LSCIE1:
-+    .long   0                 # CIE_ID
-+    .byte   1                 # version
-+    .string "zR"              # augmentation
-+    .uleb128 1                # code_alignment_factor
-+    .sleb128 -4               # data_alignment_factor
-+    .byte   8                 # return_address_register
-+    .uleb128 1                # augmentation size 1:
-+    .byte   0x1B              #  FDE Encoding (pcrel sdata4)
-+                              # initial_instructions:
-+    .byte   0x0C              #  DW_CFA_def_cfa %esp, 4
-+    .uleb128 4
-+    .uleb128 4
-+    .byte   0x88              #  DW_CFA_offset ret, 1
-+    .uleb128 1
-+    .align 4
-+.LECIE1:
-+.LSFDEg:
-+    .long   .LEFDEg-.LASFDEg  # length
-+.LASFDEg:
-+    .long   .LASFDEg-.Lframe1 # CIE_pointer
-+    .long   .LFBg-.           # initial_location
-+    .long   .LFEg-.LFBg       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg0-.LFBg
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg1-.LCFIg0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEg:
-+.LSFDEv:
-+    .long   .LEFDEv-.LASFDEv  # length
-+.LASFDEv:
-+    .long   .LASFDEv-.Lframe1 # CIE_pointer
-+    .long   .LFBv-.           # initial_location
-+    .long   .LFEv-.LFBv       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv0-.LFBv
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv1-.LCFIv0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEv:
-+.LSFDEh:
-+    .long   .LEFDEh-.LASFDEh  # length
-+.LASFDEh:
-+    .long   .LASFDEh-.Lframe1 # CIE_pointer
-+    .long   .LFBh-.           # initial_location
-+    .long   .LFEh-.LFBh       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh0-.LFBh
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh1-.LCFIh0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEh:
-+.LSFDEf:
-+    .long   .LEFDEf-.LASFDEf  # length
-+.LASFDEf:
-+    .long   .LASFDEf-.Lframe1 # CIE_pointer
-+    .long   .LFBf-.           # initial_location
-+    .long   .LFEf-.LFBf       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf0-.LFBf
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf1-.LCFIf0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEf:
-+.LSFDEd:
-+    .long   .LEFDEd-.LASFDEd  # length
-+.LASFDEd:
-+    .long   .LASFDEd-.Lframe1 # CIE_pointer
-+    .long   .LFBd-.           # initial_location
-+    .long   .LFEd-.LFBd       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId0-.LFBd
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId1-.LCFId0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEd:
-+.LSFDEc:
-+    .long   .LEFDEc-.LASFDEc  # length
-+.LASFDEc:
-+    .long   .LASFDEc-.Lframe1 # CIE_pointer
-+    .long   .LFBc-.           # initial_location
-+    .long   .LFEc-.LFBc       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc0-.LFBc
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc1-.LCFIc0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEc:
diff --git a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
deleted file mode 100644
index a291493b6b29..000000000000
--- a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Wed Jan 19 00:06:09 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Feb 21 21:13:28 2005
-@@ -77,7 +77,7 @@
- {
- 
- //==================================================================================================
--static typelib_TypeClass cpp2uno_call(
-+void cpp2uno_call(
- 	bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
- 	const typelib_TypeDescription * pMemberTypeDescr,
- 	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-@@ -209,8 +209,6 @@
- 		CPPU_CURRENT_NAMESPACE::raiseException(
-             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-             // has to destruct the any
--		// is here for dummy
--		return typelib_TypeClass_VOID;
- 	}
- 	else // else no exception occured...
- 	{
-@@ -247,22 +245,16 @@
- 		}
- 		if (pReturnTypeDescr)
- 		{
--			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
- 			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
--			return eRet;
- 		}
--		else
--			return typelib_TypeClass_VOID;
- 	}
- }
- 
- 
- //==================================================================================================
--static typelib_TypeClass cpp_mediate(
--	sal_Int32 nFunctionIndex,
--    sal_Int32 nVtableOffset,
--	void ** pCallStack,
--	sal_Int64 * pRegisterReturn /* space for register return */ )
-+extern "C" void cpp_vtable_call(
-+    int nFunctionIndex, int nVtableOffset, void** pCallStack,
-+    sal_Int64 nRegReturn )
- {
- 	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
- 	
-@@ -298,7 +290,6 @@
- 
- 	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-     
--	typelib_TypeClass eRet;
- 	switch (aMemberDescr.get()->eTypeClass)
- 	{
- 	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-@@ -306,11 +297,11 @@
- 		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
- 		{
- 			// is GET method
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
- 				0, 0, // no params
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		else
- 		{
-@@ -321,11 +312,11 @@
- 			aParam.bIn		= sal_True;
- 			aParam.bOut		= sal_False;
- 			
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				0, // indicates void return
- 				1, &aParam,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -336,11 +327,9 @@
- 		{
- 		case 1: // acquire()
- 			pCppI->acquireProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 2: // release()
- 			pCppI->releaseProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 0: // queryInterface() opt
- 		{
-@@ -361,20 +350,19 @@
-                         &pInterface, pTD, cpp_acquire );
-                     pInterface->release();
-                     TYPELIB_DANGER_RELEASE( pTD );
--                    *(void **)pRegisterReturn = pCallStack[1];
--                    eRet = typelib_TypeClass_ANY;
-+                    *(void **)&nRegReturn = pCallStack[1];
-                     break;
-                 }
-                 TYPELIB_DANGER_RELEASE( pTD );
-             }
- 		} // else perform queryInterface()
- 		default:
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -383,72 +371,55 @@
- 		throw RuntimeException(
-             rtl::OUString::createFromAscii("no member description found!"),
-             (XInterface *)pThis );
--		// is here for dummy
--		eRet = typelib_TypeClass_VOID;
- 	}
- 	}
--
--	return eRet;
- }
- 
- //==================================================================================================
--/**
-- * is called on incoming vtable calls
-- * (called by asm snippets)
-- */
--static void cpp_vtable_call(
--    int nFunctionIndex, int nVtableOffset, void** pCallStack )
--    __attribute__((regparm(3)));
--
--void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
--{
--	volatile long nRegReturn[2];
--	typelib_TypeClass aType = cpp_mediate(
--        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
--    
--	switch( aType )
--	{
--		case typelib_TypeClass_HYPER:
--		case typelib_TypeClass_UNSIGNED_HYPER:
--			__asm__( "movl %1, %%edx\n\t"
--					 "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
--			break;
--		case typelib_TypeClass_FLOAT:
--			__asm__( "flds %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "flds %0\n"
--					 : : "m"(*(float *)nRegReturn) );
--			break;
--		case typelib_TypeClass_DOUBLE:
--			__asm__( "fldl %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "fldl %0\n"
--					 : : "m"(*(double *)nRegReturn) );
--			break;
--// 		case typelib_TypeClass_UNSIGNED_SHORT:
--// 		case typelib_TypeClass_SHORT:
--// 			__asm__( "movswl %0, %%eax\n"
--// 					 : : "m"(nRegReturn) );
--// 		break;
--		default:
--			__asm__( "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]) );
--			break;
--	}
--}
--
-+extern "C" void privateSnippetExecutorGeneral();
-+extern "C" void privateSnippetExecutorVoid();
-+extern "C" void privateSnippetExecutorHyper();
-+extern "C" void privateSnippetExecutorFloat();
-+extern "C" void privateSnippetExecutorDouble();
-+extern "C" void privateSnippetExecutorClass();
-+extern "C" typedef void (*PrivateSnippetExecutor)();
- 
--//==================================================================================================
--int const codeSnippetSize = 20;
-+int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
-     unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
--    bool simpleRetType)
-+    typelib_TypeClass returnTypeClass)
- {
--    if (!simpleRetType) {
-+    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-         functionIndex |= 0x80000000;
-     }
-+    PrivateSnippetExecutor exec;
-+    switch (returnTypeClass) {
-+    case typelib_TypeClass_VOID:
-+        exec = privateSnippetExecutorVoid;
-+        break;
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        exec = privateSnippetExecutorHyper;
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+        exec = privateSnippetExecutorFloat;
-+        break;
-+    case typelib_TypeClass_DOUBLE:
-+        exec = privateSnippetExecutorDouble;
-+        break;
-+    case typelib_TypeClass_STRING:
-+    case typelib_TypeClass_TYPE:
-+    case typelib_TypeClass_ANY:
-+    case typelib_TypeClass_SEQUENCE:
-+    case typelib_TypeClass_STRUCT:
-+    case typelib_TypeClass_INTERFACE:
-+        exec = privateSnippetExecutorClass;
-+        break;
-+    default:
-+        exec = privateSnippetExecutorGeneral;
-+        break;
-+    }
-     unsigned char * p = code;
-     OSL_ASSERT(sizeof (sal_Int32) == 4);
-     // mov function_index, %eax:
-@@ -459,13 +430,10 @@
-     *p++ = 0xBA;
-     *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-     p += sizeof (sal_Int32);
--    // mov %esp, %ecx:
--    *p++ = 0x89;
--    *p++ = 0xE1;
--    // jmp cpp_vtable_call:
-+    // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -504,17 +472,17 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceAttributeTypeDescription * >(
--                        member)->pAttributeTypeRef));
-+                reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-+                    member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-             if (!reinterpret_cast<
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
-                 *slots++ = code;
--                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-+                code = codeSnippet(
-+                    code, functionOffset++, vtableOffset,
-+                    typelib_TypeClass_VOID);
-             }
-             break;
- 
-@@ -522,10 +490,8 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceMethodTypeDescription * >(
--                        member)->pReturnTypeRef));
-+                reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-+                    member)->pReturnTypeRef->eTypeClass);
-             break;
- 
-         default:
diff --git a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
deleted file mode 100644
index 942e6fccc4c7..000000000000
--- a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk	Fri May 20 11:14:36 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Fri May 20 11:16:09 2005
-@@ -87,7 +87,8 @@
- SLOFILES= \
- 	$(SLO)$/except.obj		\
- 	$(SLO)$/cpp2uno.obj		\
--	$(SLO)$/uno2cpp.obj
-+    $(SLO)$/uno2cpp.obj \
-+    $(SLO)$/call.obj
- 
- SHL1TARGET= $(TARGET)
- 
-@@ -108,3 +109,6 @@
- 
- .INCLUDE :  target.mk
- 
-+$(SLO)$/%.obj: %.s
-+    $(CC) -c -o $(SLO)$/$(@:b).o $<
-+    touch $@
diff --git a/editors/openoffice-3-devel/files/patch-config_office+configure.in b/editors/openoffice-3-devel/files/patch-config_office+configure.in
deleted file mode 100644
index 3c65cce44a9c..000000000000
--- a/editors/openoffice-3-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49678#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : == -> =
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.116
-diff -u -r1.116 configure.in
---- config_office/configure.in	11 Apr 2005 09:31:15 -0000	1.116
-+++ config_office/configure.in	13 May 2005 07:13:41 -0000
-@@ -1787,7 +1787,7 @@
- dnl Checks for javac
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
--    if test "$JDK" == "gcj"; then 
-+    if test "$JDK" = "gcj"; then 
-         javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-     else
-         javacompiler="javac"
-@@ -1871,7 +1871,7 @@
-     fi
- fi
- 
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-    AC_CHECK_HEADER(jni.h, [],
-@@ -1888,7 +1888,7 @@
- dnl ===================================================================
- dnl Check for optional gcj-dbtool
- dnl ===================================================================
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-     javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
-     if test -z "$with_jdk_home"; then
-         AC_PATH_PROG(JAVACACHE, $javacache)
-@@ -2684,7 +2684,7 @@
-    if test -z "$MOZILLA_VERSION"; then
-       MOZILLA_VERSION=1.7.5
-    fi
--   if test "$MOZILLA_VERSION" == "1.7b" ; then
-+   if test "$MOZILLA_VERSION" = "1.7b" ; then
-       MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source.tar.gz"
-    else
-       MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}.tar.gz"
diff --git a/editors/openoffice-3-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice-3-devel/files/patch-crashrep+source+unx+makefile.mk
deleted file mode 100644
index 3c87525ff42a..000000000000
--- a/editors/openoffice-3-devel/files/patch-crashrep+source+unx+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49679#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : We don't have -ldl and -lnsl
-
-Index: crashrep/source/unx/makefile.mk
-===================================================================
-RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
-retrieving revision 1.14
-diff -u -r1.14 makefile.mk
---- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
-+++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
-@@ -82,7 +82,10 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
--APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS+=-ldl -lnsl
-+.ENDIF
- .IF "$(OS)" == "SOLARIS"
- APP1STDLIBS+=-lsocket
- .ENDIF
diff --git a/editors/openoffice-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
deleted file mode 100644
index 81b293cdf9f3..000000000000
--- a/editors/openoffice-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49682#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct version number of resultant shared lib
-
-Index: xmlsec1-1.2.6.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
-retrieving revision 1.5
-diff -u -r1.5 xmlsec1-1.2.6.patch
---- libxmlsec/xmlsec1-1.2.6.patch	18 May 2005 10:11:24 -0000	1.5
-+++ libxmlsec/xmlsec1-1.2.6.patch	22 May 2005 01:43:49 -0000
-@@ -756,6 +756,35 @@
- *** misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
- --- misc/build/xmlsec1-1.2.6/ltmain.sh	2005-05-09 19:55:51.745319024 +0200
- ***************
-+*** 2994,3006 ****
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=".$current"
-+! 	  versuffix=".$current.$revision";
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2994,3006 ----
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+***************
- *** 3564,3570 ****
-   		fi
-   	      else
diff --git a/editors/openoffice-3-devel/files/patch-odk+configure.pl b/editors/openoffice-3-devel/files/patch-odk+configure.pl
deleted file mode 100644
index a608473de01c..000000000000
--- a/editors/openoffice-3-devel/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : canonical name by config.guess for FreeBSD is
-% ./config.guess
-i386-unknown-freebsd5.3
-so, $main::operatingSystem is
-% ./config.guess | cut -d"-" -f3,4
-freebsd5.3
-then, if ( $main::operatingSystem eq "FreeBSD" ) is not correct,
-and if ( $main::operatingSystem =~ /freebsd/ ) is correct
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.11
-diff -u -r1.11 configure.pl
---- odk/configure.pl	29 Mar 2005 12:03:00 -0000	1.11
-+++ odk/configure.pl	15 May 2005 08:46:20 -0000
-@@ -45,7 +45,7 @@
- 
- $main::OO_SDK_MAKE_HOME = "";
- $main::makeName = "make";
--if ( $main::operatingSystem eq "FreeBSD" )
-+if ( $main::operatingSystem =~ /freebsd/ )
- {
-     $main::makeName = "gmake";
- }
diff --git a/editors/openoffice-3-devel/files/patch-odk+setsdkenv_unix b/editors/openoffice-3-devel/files/patch-odk+setsdkenv_unix
deleted file mode 100644
index 1165826077b0..000000000000
--- a/editors/openoffice-3-devel/files/patch-odk+setsdkenv_unix
+++ /dev/null
@@ -1,39 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-
-Index: odk/setsdkenv_unix.sh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.sh.in
---- odk/setsdkenv_unix.sh.in	29 Mar 2005 12:03:27 -0000	1.5
-+++ odk/setsdkenv_unix.sh.in	15 May 2005 09:06:22 -0000
-@@ -130,7 +130,7 @@
-     export LD_LIBRARY_PATH
-     ;;
- 
--  freebsd)
-+  freebsd*)
-     if [ -n "$OO_SDK_CPP_HOME" ]
-     then
- 	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-Index: odk/setsdkenv_unix.csh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.csh.in
---- odk/setsdkenv_unix.csh.in	29 Mar 2005 12:03:14 -0000	1.5
-+++ odk/setsdkenv_unix.csh.in	15 May 2005 09:06:38 -0000
-@@ -114,7 +114,7 @@
-     endif
-   breaksw
- 
--  case "freebsd":
-+  case "freebsd*":
-     if ( $?OO_SDK_CPP_HOME == 0) then
- 	set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- 	setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
diff --git a/editors/openoffice-3-devel/files/patch-odk+settings+settings.mk b/editors/openoffice-3-devel/files/patch-odk+settings+settings.mk
deleted file mode 100644
index 079bd128062c..000000000000
--- a/editors/openoffice-3-devel/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-and adding missing things.
-
-Index: odk/settings/settings.mk
-===================================================================
-RCS file: /cvs/api/odk/settings/settings.mk,v
-retrieving revision 1.14
-diff -u -r1.14 settings.mk
---- odk/settings/settings.mk	29 Mar 2005 12:19:26 -0000	1.14
-+++ odk/settings/settings.mk	15 May 2005 13:54:38 -0000
-@@ -397,7 +397,7 @@
- # FreeBSD specific settings
- #
- ###########################################################################
--ifeq "$(PLATFORM)" "freebsd"
-+ifneq (,$(findstring freebsd,$(PLATFORM)))
- # Settings for FreeBSD using gcc compiler
- 
- PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-@@ -435,6 +435,7 @@
- CSEP=\>
- QUOTE=$(subst S,\,S)
- QM=\"
-+SQM='
- ECHOLINE=@echo
- P2BG=&
- 
-@@ -446,10 +447,10 @@
- # Include UDK version numbers
- include $(PRJ)/include/udkversion.mk
- 
--SALLIB=-lsal
--CPPULIB=-lcppu
--CPPUHELPERLIB=-lcppuhelper$(COMID)
--SALHELPERLIB=-lsalhelper$(COMID)
-+SALLIB=-luno_sal
-+CPPULIB=-luno_cppu
-+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-+SALHELPERLIB=-luno_salhelper$(COMID)
- REGLIB=-lreg
- STORELIB=-lstore
- STLPORTLIB=-lstlport_gcc
diff --git a/editors/openoffice-3-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice-3-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 09f2f949c81d..000000000000
--- a/editors/openoffice-3-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-Issutracker : #i49677#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : contains illigal char
-
-Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
-===================================================================
-RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
-retrieving revision 1.2
-diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
---- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
-+++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
-@@ -109,7 +109,7 @@
- 		linearly between center and endColor via concentric ellipses
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		circular. If it's not 1, the gradient is elliptical, with the
- 		special twist that the aspect ratio is maintained also for the
- 		center color: the gradient will not collapse into a single
-@@ -124,7 +124,7 @@
- 		linearly between center and endColor via rectangular boxes
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		quadratic. If it's not 1, the gradient is rectangular, with
- 		the special twist that the aspect ratio is maintained also for
- 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice-3-devel/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice-3-devel/files/patch-portaudio+portaudio_v18_1.patch
deleted file mode 100644
index 87c43fb14d7c..000000000000
--- a/editors/openoffice-3-devel/files/patch-portaudio+portaudio_v18_1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Issutracker : #i46879#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Need to include <sys/soundcard.h> to use sound and passes
-              correct pthread related flags
-
-Index: portaudio/portaudio_v18_1.patch
-===================================================================
-RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
-retrieving revision 1.1
-diff -u -r1.1 portaudio_v18_1.patch
---- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
-+++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
-@@ -12,7 +12,7 @@
-   	;;
-   
-     mingw* )
----- 1883,1902 ----
-+--- 1883,1921 ----
-   case "${host_os}" in
-     darwin* )
-   
-@@ -30,6 +30,25 @@
- ! 	PADLL="libportaudio.so";
- ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
- ! 	CFLAGS="-O2 -fPIC"
-+! 	;;
-+! 
-+!   freebsd* )
-+! 	if test "$OSVERSION" -lt "500016"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-pthread"
-+!         elif test "$OSVERSION" -lt "502102"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-lc_r"
-+!         else
-+!              PTHREAD_CFLAGS=""
-+!              PTHREAD_LIBS="-pthread"
-+!         fi
-+! 
-+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+! 	LIBS="-lm ${PTHREAD_LIBS}";
-+! 	PADLL="libportaudio.so";
-+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-+! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
-   	;;
-   
-     mingw* )
-@@ -52,3 +71,18 @@
-   LIBINST = /usr/local/lib
-   
-   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-+
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
-+***************
-+*** 43,48 ****
-+--- 43,50 ----
-+  
-+  #ifdef __linux__
-+  #include <linux/soundcard.h>
-++ #elif defined (__FreeBSD__)
-++ #include <sys/soundcard.h>
-+  #else
-+  #include <machine/soundcard.h> /* JH20010905 */
-+  #endif
-+
diff --git a/editors/openoffice-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch
deleted file mode 100644
index 71a8f2292f2a..000000000000
--- a/editors/openoffice-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Issutracker : #i49684#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct shared lib number
-
-Index: libsndfile-1.0.9.patch
-===================================================================
-RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
-retrieving revision 1.1
-diff -u -r1.1 libsndfile-1.0.9.patch
---- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
-+++ sndfile/libsndfile-1.0.9.patch	22 May 2005 02:01:17 -0000
-@@ -231,3 +231,24 @@
-   
-   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-   
-+*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
-+--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
-+***************
-+*** 2980,2987 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2980,2987 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
diff --git a/editors/openoffice-3-devel/files/patch-sndfile+makefile.mk b/editors/openoffice-3-devel/files/patch-sndfile+makefile.mk
deleted file mode 100644
index 234100480f33..000000000000
--- a/editors/openoffice-3-devel/files/patch-sndfile+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i49683#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : -noinhibit-exec allows linking against non-existent libs
-
-Index: sndfile/makefile.mk
-===================================================================
-RCS file: /cvs/external/sndfile/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
-+++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
-@@ -81,7 +81,7 @@
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure --with-pic
--.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
-+.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
- .ENDIF
- 
diff --git a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 94e3cc8d21bc..000000000000
--- a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-Issutracker : #i49685#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Update to recent version of unxlngi6.mk
-($Revision: 1.12 and $Author: obo $ $Date: 2005/05/06 09:37:55 $)
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.13
-diff -u -r1.13 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	11 Feb 2005 15:27:55 -0000	1.13
-+++ solenv/inc/unxfbsdi.mk	15 May 2005 04:51:41 -0000
-@@ -99,9 +99,6 @@
- CC+:=$(CFLAGS_SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
- CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
--.IF "$(PRODUCT)"!=""
--CFLAGS+=-Wuninitialized
--.ENDIF
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_SYMBOLS)"=="SMALL"
-@@ -122,6 +119,9 @@
- CFLAGSCXX= -pipe -mtune=pentiumpro
- CFLAGSCXX+= -Wno-ctor-dtor-privacy
- 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=
-@@ -143,6 +143,7 @@
- # Compiler flags for enabling optimazations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized				# not supported without optimization
- .ELSE 	# "$(PRODUCT)"!=""
- CFLAGSOPT=   							# no optimizing for non products
- .ENDIF	# "$(PRODUCT)"!=""
-@@ -161,11 +162,12 @@
- 
- # name of linker
- LINK*=$(CXX)
-+LINKC*=$(CC)
- 
- # default linker flags
- LINKFLAGSDEFS*=#-Wl,-z,defs
- LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-@@ -237,3 +239,4 @@
- DLLPOSTFIX=fi
- DLLPRE=lib
- DLLPOST=.so
-+
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 80d5a832f6a2..94a4282f01d2 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -48,7 +48,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		105
+MILESTONE=		107
 SNAPDATE=		20050521
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
@@ -93,8 +93,8 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
+
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index c308f56de99d..cc4f3b56c811 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810
-SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617
+MD5 (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 9c20222b097d70029dae19f834a83bf1
+SIZE (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 212641982
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
deleted file mode 100644
index 5e5d4b85c49e..000000000000
--- a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
+++ /dev/null
@@ -1,270 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s	Thu Jan  1 09:00:00 1970
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s	Fri May 20 11:21:13 2005
-@@ -0,0 +1,262 @@
-+    .text
-+
-+.globl privateSnippetExecutorGeneral
-+    .type   privateSnippetExecutorGeneral,@function
-+privateSnippetExecutorGeneral:
-+.LFBg:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIg0:
-+    movl    %esp,%ebp
-+.LCFIg1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEg:
-+    .size   privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral
-+
-+.globl privateSnippetExecutorVoid
-+    .type   privateSnippetExecutorVoid,@function
-+privateSnippetExecutorVoid:
-+.LFBv:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIv0:
-+    movl    %esp,%ebp
-+.LCFIv1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    leave
-+    ret
-+.LFEv:
-+    .size   privateSnippetExecutorVoid,.-privateSnippetExecutorVoid
-+
-+.globl privateSnippetExecutorHyper
-+    .type   privateSnippetExecutorHyper,@function
-+privateSnippetExecutorHyper:
-+.LFBh:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIh0:
-+    movl    %esp,%ebp
-+.LCFIh1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    movl    16(%esp),%edx     # 64 bit nRegReturn, upper half
-+    leave
-+    ret
-+.LFEh:
-+    .size   privateSnippetExecutorHyper,.-privateSnippetExecutorHyper
-+
-+.globl privateSnippetExecutorFloat
-+    .type   privateSnippetExecutorFloat,@function
-+privateSnippetExecutorFloat:
-+.LFBf:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIf0:
-+    movl    %esp,%ebp
-+.LCFIf1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    flds    12(%esp)          # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEf:
-+    .size   privateSnippetExecutorFloat,.-privateSnippetExecutorFloat
-+
-+.globl privateSnippetExecutorDouble
-+    .type   privateSnippetExecutorDouble,@function
-+privateSnippetExecutorDouble:
-+.LFBd:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFId0:
-+    movl    %esp,%ebp
-+.LCFId1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    fldl    12(%esp)          # 64 bit nRegReturn
-+    leave
-+    ret
-+.LFEd:
-+    .size   privateSnippetExecutorDouble,.-privateSnippetExecutorDouble
-+
-+.globl privateSnippetExecutorClass
-+    .type   privateSnippetExecutorClass,@function
-+privateSnippetExecutorClass:
-+.LFBc:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIc0:
-+    movl    %esp,%ebp
-+.LCFIc1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret     $4
-+.LFEc:
-+    .size   privateSnippetExecutorClass,.-privateSnippetExecutorClass
-+
-+    .section .eh_frame,"a",@progbits
-+.Lframe1:
-+    .long   .LECIE1-.LSCIE1   # length
-+.LSCIE1:
-+    .long   0                 # CIE_ID
-+    .byte   1                 # version
-+    .string "zR"              # augmentation
-+    .uleb128 1                # code_alignment_factor
-+    .sleb128 -4               # data_alignment_factor
-+    .byte   8                 # return_address_register
-+    .uleb128 1                # augmentation size 1:
-+    .byte   0x1B              #  FDE Encoding (pcrel sdata4)
-+                              # initial_instructions:
-+    .byte   0x0C              #  DW_CFA_def_cfa %esp, 4
-+    .uleb128 4
-+    .uleb128 4
-+    .byte   0x88              #  DW_CFA_offset ret, 1
-+    .uleb128 1
-+    .align 4
-+.LECIE1:
-+.LSFDEg:
-+    .long   .LEFDEg-.LASFDEg  # length
-+.LASFDEg:
-+    .long   .LASFDEg-.Lframe1 # CIE_pointer
-+    .long   .LFBg-.           # initial_location
-+    .long   .LFEg-.LFBg       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg0-.LFBg
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg1-.LCFIg0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEg:
-+.LSFDEv:
-+    .long   .LEFDEv-.LASFDEv  # length
-+.LASFDEv:
-+    .long   .LASFDEv-.Lframe1 # CIE_pointer
-+    .long   .LFBv-.           # initial_location
-+    .long   .LFEv-.LFBv       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv0-.LFBv
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv1-.LCFIv0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEv:
-+.LSFDEh:
-+    .long   .LEFDEh-.LASFDEh  # length
-+.LASFDEh:
-+    .long   .LASFDEh-.Lframe1 # CIE_pointer
-+    .long   .LFBh-.           # initial_location
-+    .long   .LFEh-.LFBh       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh0-.LFBh
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh1-.LCFIh0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEh:
-+.LSFDEf:
-+    .long   .LEFDEf-.LASFDEf  # length
-+.LASFDEf:
-+    .long   .LASFDEf-.Lframe1 # CIE_pointer
-+    .long   .LFBf-.           # initial_location
-+    .long   .LFEf-.LFBf       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf0-.LFBf
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf1-.LCFIf0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEf:
-+.LSFDEd:
-+    .long   .LEFDEd-.LASFDEd  # length
-+.LASFDEd:
-+    .long   .LASFDEd-.Lframe1 # CIE_pointer
-+    .long   .LFBd-.           # initial_location
-+    .long   .LFEd-.LFBd       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId0-.LFBd
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId1-.LCFId0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEd:
-+.LSFDEc:
-+    .long   .LEFDEc-.LASFDEc  # length
-+.LASFDEc:
-+    .long   .LASFDEc-.Lframe1 # CIE_pointer
-+    .long   .LFBc-.           # initial_location
-+    .long   .LFEc-.LFBc       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc0-.LFBc
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc1-.LCFIc0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEc:
diff --git a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
deleted file mode 100644
index a291493b6b29..000000000000
--- a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Wed Jan 19 00:06:09 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Feb 21 21:13:28 2005
-@@ -77,7 +77,7 @@
- {
- 
- //==================================================================================================
--static typelib_TypeClass cpp2uno_call(
-+void cpp2uno_call(
- 	bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
- 	const typelib_TypeDescription * pMemberTypeDescr,
- 	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-@@ -209,8 +209,6 @@
- 		CPPU_CURRENT_NAMESPACE::raiseException(
-             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-             // has to destruct the any
--		// is here for dummy
--		return typelib_TypeClass_VOID;
- 	}
- 	else // else no exception occured...
- 	{
-@@ -247,22 +245,16 @@
- 		}
- 		if (pReturnTypeDescr)
- 		{
--			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
- 			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
--			return eRet;
- 		}
--		else
--			return typelib_TypeClass_VOID;
- 	}
- }
- 
- 
- //==================================================================================================
--static typelib_TypeClass cpp_mediate(
--	sal_Int32 nFunctionIndex,
--    sal_Int32 nVtableOffset,
--	void ** pCallStack,
--	sal_Int64 * pRegisterReturn /* space for register return */ )
-+extern "C" void cpp_vtable_call(
-+    int nFunctionIndex, int nVtableOffset, void** pCallStack,
-+    sal_Int64 nRegReturn )
- {
- 	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
- 	
-@@ -298,7 +290,6 @@
- 
- 	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-     
--	typelib_TypeClass eRet;
- 	switch (aMemberDescr.get()->eTypeClass)
- 	{
- 	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-@@ -306,11 +297,11 @@
- 		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
- 		{
- 			// is GET method
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
- 				0, 0, // no params
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		else
- 		{
-@@ -321,11 +312,11 @@
- 			aParam.bIn		= sal_True;
- 			aParam.bOut		= sal_False;
- 			
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				0, // indicates void return
- 				1, &aParam,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -336,11 +327,9 @@
- 		{
- 		case 1: // acquire()
- 			pCppI->acquireProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 2: // release()
- 			pCppI->releaseProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 0: // queryInterface() opt
- 		{
-@@ -361,20 +350,19 @@
-                         &pInterface, pTD, cpp_acquire );
-                     pInterface->release();
-                     TYPELIB_DANGER_RELEASE( pTD );
--                    *(void **)pRegisterReturn = pCallStack[1];
--                    eRet = typelib_TypeClass_ANY;
-+                    *(void **)&nRegReturn = pCallStack[1];
-                     break;
-                 }
-                 TYPELIB_DANGER_RELEASE( pTD );
-             }
- 		} // else perform queryInterface()
- 		default:
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -383,72 +371,55 @@
- 		throw RuntimeException(
-             rtl::OUString::createFromAscii("no member description found!"),
-             (XInterface *)pThis );
--		// is here for dummy
--		eRet = typelib_TypeClass_VOID;
- 	}
- 	}
--
--	return eRet;
- }
- 
- //==================================================================================================
--/**
-- * is called on incoming vtable calls
-- * (called by asm snippets)
-- */
--static void cpp_vtable_call(
--    int nFunctionIndex, int nVtableOffset, void** pCallStack )
--    __attribute__((regparm(3)));
--
--void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
--{
--	volatile long nRegReturn[2];
--	typelib_TypeClass aType = cpp_mediate(
--        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
--    
--	switch( aType )
--	{
--		case typelib_TypeClass_HYPER:
--		case typelib_TypeClass_UNSIGNED_HYPER:
--			__asm__( "movl %1, %%edx\n\t"
--					 "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
--			break;
--		case typelib_TypeClass_FLOAT:
--			__asm__( "flds %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "flds %0\n"
--					 : : "m"(*(float *)nRegReturn) );
--			break;
--		case typelib_TypeClass_DOUBLE:
--			__asm__( "fldl %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "fldl %0\n"
--					 : : "m"(*(double *)nRegReturn) );
--			break;
--// 		case typelib_TypeClass_UNSIGNED_SHORT:
--// 		case typelib_TypeClass_SHORT:
--// 			__asm__( "movswl %0, %%eax\n"
--// 					 : : "m"(nRegReturn) );
--// 		break;
--		default:
--			__asm__( "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]) );
--			break;
--	}
--}
--
-+extern "C" void privateSnippetExecutorGeneral();
-+extern "C" void privateSnippetExecutorVoid();
-+extern "C" void privateSnippetExecutorHyper();
-+extern "C" void privateSnippetExecutorFloat();
-+extern "C" void privateSnippetExecutorDouble();
-+extern "C" void privateSnippetExecutorClass();
-+extern "C" typedef void (*PrivateSnippetExecutor)();
- 
--//==================================================================================================
--int const codeSnippetSize = 20;
-+int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
-     unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
--    bool simpleRetType)
-+    typelib_TypeClass returnTypeClass)
- {
--    if (!simpleRetType) {
-+    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-         functionIndex |= 0x80000000;
-     }
-+    PrivateSnippetExecutor exec;
-+    switch (returnTypeClass) {
-+    case typelib_TypeClass_VOID:
-+        exec = privateSnippetExecutorVoid;
-+        break;
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        exec = privateSnippetExecutorHyper;
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+        exec = privateSnippetExecutorFloat;
-+        break;
-+    case typelib_TypeClass_DOUBLE:
-+        exec = privateSnippetExecutorDouble;
-+        break;
-+    case typelib_TypeClass_STRING:
-+    case typelib_TypeClass_TYPE:
-+    case typelib_TypeClass_ANY:
-+    case typelib_TypeClass_SEQUENCE:
-+    case typelib_TypeClass_STRUCT:
-+    case typelib_TypeClass_INTERFACE:
-+        exec = privateSnippetExecutorClass;
-+        break;
-+    default:
-+        exec = privateSnippetExecutorGeneral;
-+        break;
-+    }
-     unsigned char * p = code;
-     OSL_ASSERT(sizeof (sal_Int32) == 4);
-     // mov function_index, %eax:
-@@ -459,13 +430,10 @@
-     *p++ = 0xBA;
-     *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-     p += sizeof (sal_Int32);
--    // mov %esp, %ecx:
--    *p++ = 0x89;
--    *p++ = 0xE1;
--    // jmp cpp_vtable_call:
-+    // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -504,17 +472,17 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceAttributeTypeDescription * >(
--                        member)->pAttributeTypeRef));
-+                reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-+                    member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-             if (!reinterpret_cast<
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
-                 *slots++ = code;
--                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-+                code = codeSnippet(
-+                    code, functionOffset++, vtableOffset,
-+                    typelib_TypeClass_VOID);
-             }
-             break;
- 
-@@ -522,10 +490,8 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceMethodTypeDescription * >(
--                        member)->pReturnTypeRef));
-+                reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-+                    member)->pReturnTypeRef->eTypeClass);
-             break;
- 
-         default:
diff --git a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
deleted file mode 100644
index 942e6fccc4c7..000000000000
--- a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk	Fri May 20 11:14:36 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Fri May 20 11:16:09 2005
-@@ -87,7 +87,8 @@
- SLOFILES= \
- 	$(SLO)$/except.obj		\
- 	$(SLO)$/cpp2uno.obj		\
--	$(SLO)$/uno2cpp.obj
-+    $(SLO)$/uno2cpp.obj \
-+    $(SLO)$/call.obj
- 
- SHL1TARGET= $(TARGET)
- 
-@@ -108,3 +109,6 @@
- 
- .INCLUDE :  target.mk
- 
-+$(SLO)$/%.obj: %.s
-+    $(CC) -c -o $(SLO)$/$(@:b).o $<
-+    touch $@
diff --git a/editors/openoffice-3/files/patch-config_office+configure.in b/editors/openoffice-3/files/patch-config_office+configure.in
deleted file mode 100644
index 3c65cce44a9c..000000000000
--- a/editors/openoffice-3/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49678#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : == -> =
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.116
-diff -u -r1.116 configure.in
---- config_office/configure.in	11 Apr 2005 09:31:15 -0000	1.116
-+++ config_office/configure.in	13 May 2005 07:13:41 -0000
-@@ -1787,7 +1787,7 @@
- dnl Checks for javac
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
--    if test "$JDK" == "gcj"; then 
-+    if test "$JDK" = "gcj"; then 
-         javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-     else
-         javacompiler="javac"
-@@ -1871,7 +1871,7 @@
-     fi
- fi
- 
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-    AC_CHECK_HEADER(jni.h, [],
-@@ -1888,7 +1888,7 @@
- dnl ===================================================================
- dnl Check for optional gcj-dbtool
- dnl ===================================================================
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-     javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
-     if test -z "$with_jdk_home"; then
-         AC_PATH_PROG(JAVACACHE, $javacache)
-@@ -2684,7 +2684,7 @@
-    if test -z "$MOZILLA_VERSION"; then
-       MOZILLA_VERSION=1.7.5
-    fi
--   if test "$MOZILLA_VERSION" == "1.7b" ; then
-+   if test "$MOZILLA_VERSION" = "1.7b" ; then
-       MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source.tar.gz"
-    else
-       MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}.tar.gz"
diff --git a/editors/openoffice-3/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice-3/files/patch-crashrep+source+unx+makefile.mk
deleted file mode 100644
index 3c87525ff42a..000000000000
--- a/editors/openoffice-3/files/patch-crashrep+source+unx+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49679#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : We don't have -ldl and -lnsl
-
-Index: crashrep/source/unx/makefile.mk
-===================================================================
-RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
-retrieving revision 1.14
-diff -u -r1.14 makefile.mk
---- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
-+++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
-@@ -82,7 +82,10 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
--APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS+=-ldl -lnsl
-+.ENDIF
- .IF "$(OS)" == "SOLARIS"
- APP1STDLIBS+=-lsocket
- .ENDIF
diff --git a/editors/openoffice-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch
deleted file mode 100644
index 81b293cdf9f3..000000000000
--- a/editors/openoffice-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49682#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct version number of resultant shared lib
-
-Index: xmlsec1-1.2.6.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
-retrieving revision 1.5
-diff -u -r1.5 xmlsec1-1.2.6.patch
---- libxmlsec/xmlsec1-1.2.6.patch	18 May 2005 10:11:24 -0000	1.5
-+++ libxmlsec/xmlsec1-1.2.6.patch	22 May 2005 01:43:49 -0000
-@@ -756,6 +756,35 @@
- *** misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
- --- misc/build/xmlsec1-1.2.6/ltmain.sh	2005-05-09 19:55:51.745319024 +0200
- ***************
-+*** 2994,3006 ****
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=".$current"
-+! 	  versuffix=".$current.$revision";
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2994,3006 ----
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+***************
- *** 3564,3570 ****
-   		fi
-   	      else
diff --git a/editors/openoffice-3/files/patch-odk+configure.pl b/editors/openoffice-3/files/patch-odk+configure.pl
deleted file mode 100644
index a608473de01c..000000000000
--- a/editors/openoffice-3/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : canonical name by config.guess for FreeBSD is
-% ./config.guess
-i386-unknown-freebsd5.3
-so, $main::operatingSystem is
-% ./config.guess | cut -d"-" -f3,4
-freebsd5.3
-then, if ( $main::operatingSystem eq "FreeBSD" ) is not correct,
-and if ( $main::operatingSystem =~ /freebsd/ ) is correct
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.11
-diff -u -r1.11 configure.pl
---- odk/configure.pl	29 Mar 2005 12:03:00 -0000	1.11
-+++ odk/configure.pl	15 May 2005 08:46:20 -0000
-@@ -45,7 +45,7 @@
- 
- $main::OO_SDK_MAKE_HOME = "";
- $main::makeName = "make";
--if ( $main::operatingSystem eq "FreeBSD" )
-+if ( $main::operatingSystem =~ /freebsd/ )
- {
-     $main::makeName = "gmake";
- }
diff --git a/editors/openoffice-3/files/patch-odk+setsdkenv_unix b/editors/openoffice-3/files/patch-odk+setsdkenv_unix
deleted file mode 100644
index 1165826077b0..000000000000
--- a/editors/openoffice-3/files/patch-odk+setsdkenv_unix
+++ /dev/null
@@ -1,39 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-
-Index: odk/setsdkenv_unix.sh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.sh.in
---- odk/setsdkenv_unix.sh.in	29 Mar 2005 12:03:27 -0000	1.5
-+++ odk/setsdkenv_unix.sh.in	15 May 2005 09:06:22 -0000
-@@ -130,7 +130,7 @@
-     export LD_LIBRARY_PATH
-     ;;
- 
--  freebsd)
-+  freebsd*)
-     if [ -n "$OO_SDK_CPP_HOME" ]
-     then
- 	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-Index: odk/setsdkenv_unix.csh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.csh.in
---- odk/setsdkenv_unix.csh.in	29 Mar 2005 12:03:14 -0000	1.5
-+++ odk/setsdkenv_unix.csh.in	15 May 2005 09:06:38 -0000
-@@ -114,7 +114,7 @@
-     endif
-   breaksw
- 
--  case "freebsd":
-+  case "freebsd*":
-     if ( $?OO_SDK_CPP_HOME == 0) then
- 	set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- 	setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
diff --git a/editors/openoffice-3/files/patch-odk+settings+settings.mk b/editors/openoffice-3/files/patch-odk+settings+settings.mk
deleted file mode 100644
index 079bd128062c..000000000000
--- a/editors/openoffice-3/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-and adding missing things.
-
-Index: odk/settings/settings.mk
-===================================================================
-RCS file: /cvs/api/odk/settings/settings.mk,v
-retrieving revision 1.14
-diff -u -r1.14 settings.mk
---- odk/settings/settings.mk	29 Mar 2005 12:19:26 -0000	1.14
-+++ odk/settings/settings.mk	15 May 2005 13:54:38 -0000
-@@ -397,7 +397,7 @@
- # FreeBSD specific settings
- #
- ###########################################################################
--ifeq "$(PLATFORM)" "freebsd"
-+ifneq (,$(findstring freebsd,$(PLATFORM)))
- # Settings for FreeBSD using gcc compiler
- 
- PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-@@ -435,6 +435,7 @@
- CSEP=\>
- QUOTE=$(subst S,\,S)
- QM=\"
-+SQM='
- ECHOLINE=@echo
- P2BG=&
- 
-@@ -446,10 +447,10 @@
- # Include UDK version numbers
- include $(PRJ)/include/udkversion.mk
- 
--SALLIB=-lsal
--CPPULIB=-lcppu
--CPPUHELPERLIB=-lcppuhelper$(COMID)
--SALHELPERLIB=-lsalhelper$(COMID)
-+SALLIB=-luno_sal
-+CPPULIB=-luno_cppu
-+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-+SALHELPERLIB=-luno_salhelper$(COMID)
- REGLIB=-lreg
- STORELIB=-lstore
- STLPORTLIB=-lstlport_gcc
diff --git a/editors/openoffice-3/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice-3/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 09f2f949c81d..000000000000
--- a/editors/openoffice-3/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-Issutracker : #i49677#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : contains illigal char
-
-Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
-===================================================================
-RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
-retrieving revision 1.2
-diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
---- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
-+++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
-@@ -109,7 +109,7 @@
- 		linearly between center and endColor via concentric ellipses
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		circular. If it's not 1, the gradient is elliptical, with the
- 		special twist that the aspect ratio is maintained also for the
- 		center color: the gradient will not collapse into a single
-@@ -124,7 +124,7 @@
- 		linearly between center and endColor via rectangular boxes
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		quadratic. If it's not 1, the gradient is rectangular, with
- 		the special twist that the aspect ratio is maintained also for
- 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice-3/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice-3/files/patch-portaudio+portaudio_v18_1.patch
deleted file mode 100644
index 87c43fb14d7c..000000000000
--- a/editors/openoffice-3/files/patch-portaudio+portaudio_v18_1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Issutracker : #i46879#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Need to include <sys/soundcard.h> to use sound and passes
-              correct pthread related flags
-
-Index: portaudio/portaudio_v18_1.patch
-===================================================================
-RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
-retrieving revision 1.1
-diff -u -r1.1 portaudio_v18_1.patch
---- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
-+++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
-@@ -12,7 +12,7 @@
-   	;;
-   
-     mingw* )
----- 1883,1902 ----
-+--- 1883,1921 ----
-   case "${host_os}" in
-     darwin* )
-   
-@@ -30,6 +30,25 @@
- ! 	PADLL="libportaudio.so";
- ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
- ! 	CFLAGS="-O2 -fPIC"
-+! 	;;
-+! 
-+!   freebsd* )
-+! 	if test "$OSVERSION" -lt "500016"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-pthread"
-+!         elif test "$OSVERSION" -lt "502102"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-lc_r"
-+!         else
-+!              PTHREAD_CFLAGS=""
-+!              PTHREAD_LIBS="-pthread"
-+!         fi
-+! 
-+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+! 	LIBS="-lm ${PTHREAD_LIBS}";
-+! 	PADLL="libportaudio.so";
-+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-+! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
-   	;;
-   
-     mingw* )
-@@ -52,3 +71,18 @@
-   LIBINST = /usr/local/lib
-   
-   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-+
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
-+***************
-+*** 43,48 ****
-+--- 43,50 ----
-+  
-+  #ifdef __linux__
-+  #include <linux/soundcard.h>
-++ #elif defined (__FreeBSD__)
-++ #include <sys/soundcard.h>
-+  #else
-+  #include <machine/soundcard.h> /* JH20010905 */
-+  #endif
-+
diff --git a/editors/openoffice-3/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice-3/files/patch-sndfile+libsndfile-1.0.9.patch
deleted file mode 100644
index 71a8f2292f2a..000000000000
--- a/editors/openoffice-3/files/patch-sndfile+libsndfile-1.0.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Issutracker : #i49684#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct shared lib number
-
-Index: libsndfile-1.0.9.patch
-===================================================================
-RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
-retrieving revision 1.1
-diff -u -r1.1 libsndfile-1.0.9.patch
---- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
-+++ sndfile/libsndfile-1.0.9.patch	22 May 2005 02:01:17 -0000
-@@ -231,3 +231,24 @@
-   
-   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-   
-+*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
-+--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
-+***************
-+*** 2980,2987 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2980,2987 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
diff --git a/editors/openoffice-3/files/patch-sndfile+makefile.mk b/editors/openoffice-3/files/patch-sndfile+makefile.mk
deleted file mode 100644
index 234100480f33..000000000000
--- a/editors/openoffice-3/files/patch-sndfile+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i49683#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : -noinhibit-exec allows linking against non-existent libs
-
-Index: sndfile/makefile.mk
-===================================================================
-RCS file: /cvs/external/sndfile/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
-+++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
-@@ -81,7 +81,7 @@
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure --with-pic
--.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
-+.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
- .ENDIF
- 
diff --git a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 94e3cc8d21bc..000000000000
--- a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-Issutracker : #i49685#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Update to recent version of unxlngi6.mk
-($Revision: 1.12 and $Author: obo $ $Date: 2005/05/06 09:37:55 $)
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.13
-diff -u -r1.13 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	11 Feb 2005 15:27:55 -0000	1.13
-+++ solenv/inc/unxfbsdi.mk	15 May 2005 04:51:41 -0000
-@@ -99,9 +99,6 @@
- CC+:=$(CFLAGS_SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
- CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
--.IF "$(PRODUCT)"!=""
--CFLAGS+=-Wuninitialized
--.ENDIF
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_SYMBOLS)"=="SMALL"
-@@ -122,6 +119,9 @@
- CFLAGSCXX= -pipe -mtune=pentiumpro
- CFLAGSCXX+= -Wno-ctor-dtor-privacy
- 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=
-@@ -143,6 +143,7 @@
- # Compiler flags for enabling optimazations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized				# not supported without optimization
- .ELSE 	# "$(PRODUCT)"!=""
- CFLAGSOPT=   							# no optimizing for non products
- .ENDIF	# "$(PRODUCT)"!=""
-@@ -161,11 +162,12 @@
- 
- # name of linker
- LINK*=$(CXX)
-+LINKC*=$(CC)
- 
- # default linker flags
- LINKFLAGSDEFS*=#-Wl,-z,defs
- LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-@@ -237,3 +239,4 @@
- DLLPOSTFIX=fi
- DLLPRE=lib
- DLLPOST=.so
-+
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 80d5a832f6a2..94a4282f01d2 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -48,7 +48,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		105
+MILESTONE=		107
 SNAPDATE=		20050521
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
@@ -93,8 +93,8 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
+
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index c308f56de99d..cc4f3b56c811 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810
-SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617
+MD5 (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 9c20222b097d70029dae19f834a83bf1
+SIZE (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 212641982
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
deleted file mode 100644
index 5e5d4b85c49e..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
+++ /dev/null
@@ -1,270 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s	Thu Jan  1 09:00:00 1970
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s	Fri May 20 11:21:13 2005
-@@ -0,0 +1,262 @@
-+    .text
-+
-+.globl privateSnippetExecutorGeneral
-+    .type   privateSnippetExecutorGeneral,@function
-+privateSnippetExecutorGeneral:
-+.LFBg:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIg0:
-+    movl    %esp,%ebp
-+.LCFIg1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEg:
-+    .size   privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral
-+
-+.globl privateSnippetExecutorVoid
-+    .type   privateSnippetExecutorVoid,@function
-+privateSnippetExecutorVoid:
-+.LFBv:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIv0:
-+    movl    %esp,%ebp
-+.LCFIv1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    leave
-+    ret
-+.LFEv:
-+    .size   privateSnippetExecutorVoid,.-privateSnippetExecutorVoid
-+
-+.globl privateSnippetExecutorHyper
-+    .type   privateSnippetExecutorHyper,@function
-+privateSnippetExecutorHyper:
-+.LFBh:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIh0:
-+    movl    %esp,%ebp
-+.LCFIh1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    movl    16(%esp),%edx     # 64 bit nRegReturn, upper half
-+    leave
-+    ret
-+.LFEh:
-+    .size   privateSnippetExecutorHyper,.-privateSnippetExecutorHyper
-+
-+.globl privateSnippetExecutorFloat
-+    .type   privateSnippetExecutorFloat,@function
-+privateSnippetExecutorFloat:
-+.LFBf:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIf0:
-+    movl    %esp,%ebp
-+.LCFIf1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    flds    12(%esp)          # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEf:
-+    .size   privateSnippetExecutorFloat,.-privateSnippetExecutorFloat
-+
-+.globl privateSnippetExecutorDouble
-+    .type   privateSnippetExecutorDouble,@function
-+privateSnippetExecutorDouble:
-+.LFBd:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFId0:
-+    movl    %esp,%ebp
-+.LCFId1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    fldl    12(%esp)          # 64 bit nRegReturn
-+    leave
-+    ret
-+.LFEd:
-+    .size   privateSnippetExecutorDouble,.-privateSnippetExecutorDouble
-+
-+.globl privateSnippetExecutorClass
-+    .type   privateSnippetExecutorClass,@function
-+privateSnippetExecutorClass:
-+.LFBc:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIc0:
-+    movl    %esp,%ebp
-+.LCFIc1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret     $4
-+.LFEc:
-+    .size   privateSnippetExecutorClass,.-privateSnippetExecutorClass
-+
-+    .section .eh_frame,"a",@progbits
-+.Lframe1:
-+    .long   .LECIE1-.LSCIE1   # length
-+.LSCIE1:
-+    .long   0                 # CIE_ID
-+    .byte   1                 # version
-+    .string "zR"              # augmentation
-+    .uleb128 1                # code_alignment_factor
-+    .sleb128 -4               # data_alignment_factor
-+    .byte   8                 # return_address_register
-+    .uleb128 1                # augmentation size 1:
-+    .byte   0x1B              #  FDE Encoding (pcrel sdata4)
-+                              # initial_instructions:
-+    .byte   0x0C              #  DW_CFA_def_cfa %esp, 4
-+    .uleb128 4
-+    .uleb128 4
-+    .byte   0x88              #  DW_CFA_offset ret, 1
-+    .uleb128 1
-+    .align 4
-+.LECIE1:
-+.LSFDEg:
-+    .long   .LEFDEg-.LASFDEg  # length
-+.LASFDEg:
-+    .long   .LASFDEg-.Lframe1 # CIE_pointer
-+    .long   .LFBg-.           # initial_location
-+    .long   .LFEg-.LFBg       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg0-.LFBg
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg1-.LCFIg0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEg:
-+.LSFDEv:
-+    .long   .LEFDEv-.LASFDEv  # length
-+.LASFDEv:
-+    .long   .LASFDEv-.Lframe1 # CIE_pointer
-+    .long   .LFBv-.           # initial_location
-+    .long   .LFEv-.LFBv       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv0-.LFBv
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv1-.LCFIv0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEv:
-+.LSFDEh:
-+    .long   .LEFDEh-.LASFDEh  # length
-+.LASFDEh:
-+    .long   .LASFDEh-.Lframe1 # CIE_pointer
-+    .long   .LFBh-.           # initial_location
-+    .long   .LFEh-.LFBh       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh0-.LFBh
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh1-.LCFIh0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEh:
-+.LSFDEf:
-+    .long   .LEFDEf-.LASFDEf  # length
-+.LASFDEf:
-+    .long   .LASFDEf-.Lframe1 # CIE_pointer
-+    .long   .LFBf-.           # initial_location
-+    .long   .LFEf-.LFBf       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf0-.LFBf
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf1-.LCFIf0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEf:
-+.LSFDEd:
-+    .long   .LEFDEd-.LASFDEd  # length
-+.LASFDEd:
-+    .long   .LASFDEd-.Lframe1 # CIE_pointer
-+    .long   .LFBd-.           # initial_location
-+    .long   .LFEd-.LFBd       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId0-.LFBd
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId1-.LCFId0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEd:
-+.LSFDEc:
-+    .long   .LEFDEc-.LASFDEc  # length
-+.LASFDEc:
-+    .long   .LASFDEc-.Lframe1 # CIE_pointer
-+    .long   .LFBc-.           # initial_location
-+    .long   .LFEc-.LFBc       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc0-.LFBc
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc1-.LCFIc0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEc:
diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
deleted file mode 100644
index a291493b6b29..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Wed Jan 19 00:06:09 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Feb 21 21:13:28 2005
-@@ -77,7 +77,7 @@
- {
- 
- //==================================================================================================
--static typelib_TypeClass cpp2uno_call(
-+void cpp2uno_call(
- 	bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
- 	const typelib_TypeDescription * pMemberTypeDescr,
- 	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-@@ -209,8 +209,6 @@
- 		CPPU_CURRENT_NAMESPACE::raiseException(
-             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-             // has to destruct the any
--		// is here for dummy
--		return typelib_TypeClass_VOID;
- 	}
- 	else // else no exception occured...
- 	{
-@@ -247,22 +245,16 @@
- 		}
- 		if (pReturnTypeDescr)
- 		{
--			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
- 			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
--			return eRet;
- 		}
--		else
--			return typelib_TypeClass_VOID;
- 	}
- }
- 
- 
- //==================================================================================================
--static typelib_TypeClass cpp_mediate(
--	sal_Int32 nFunctionIndex,
--    sal_Int32 nVtableOffset,
--	void ** pCallStack,
--	sal_Int64 * pRegisterReturn /* space for register return */ )
-+extern "C" void cpp_vtable_call(
-+    int nFunctionIndex, int nVtableOffset, void** pCallStack,
-+    sal_Int64 nRegReturn )
- {
- 	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
- 	
-@@ -298,7 +290,6 @@
- 
- 	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-     
--	typelib_TypeClass eRet;
- 	switch (aMemberDescr.get()->eTypeClass)
- 	{
- 	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-@@ -306,11 +297,11 @@
- 		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
- 		{
- 			// is GET method
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
- 				0, 0, // no params
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		else
- 		{
-@@ -321,11 +312,11 @@
- 			aParam.bIn		= sal_True;
- 			aParam.bOut		= sal_False;
- 			
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				0, // indicates void return
- 				1, &aParam,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -336,11 +327,9 @@
- 		{
- 		case 1: // acquire()
- 			pCppI->acquireProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 2: // release()
- 			pCppI->releaseProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 0: // queryInterface() opt
- 		{
-@@ -361,20 +350,19 @@
-                         &pInterface, pTD, cpp_acquire );
-                     pInterface->release();
-                     TYPELIB_DANGER_RELEASE( pTD );
--                    *(void **)pRegisterReturn = pCallStack[1];
--                    eRet = typelib_TypeClass_ANY;
-+                    *(void **)&nRegReturn = pCallStack[1];
-                     break;
-                 }
-                 TYPELIB_DANGER_RELEASE( pTD );
-             }
- 		} // else perform queryInterface()
- 		default:
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -383,72 +371,55 @@
- 		throw RuntimeException(
-             rtl::OUString::createFromAscii("no member description found!"),
-             (XInterface *)pThis );
--		// is here for dummy
--		eRet = typelib_TypeClass_VOID;
- 	}
- 	}
--
--	return eRet;
- }
- 
- //==================================================================================================
--/**
-- * is called on incoming vtable calls
-- * (called by asm snippets)
-- */
--static void cpp_vtable_call(
--    int nFunctionIndex, int nVtableOffset, void** pCallStack )
--    __attribute__((regparm(3)));
--
--void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
--{
--	volatile long nRegReturn[2];
--	typelib_TypeClass aType = cpp_mediate(
--        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
--    
--	switch( aType )
--	{
--		case typelib_TypeClass_HYPER:
--		case typelib_TypeClass_UNSIGNED_HYPER:
--			__asm__( "movl %1, %%edx\n\t"
--					 "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
--			break;
--		case typelib_TypeClass_FLOAT:
--			__asm__( "flds %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "flds %0\n"
--					 : : "m"(*(float *)nRegReturn) );
--			break;
--		case typelib_TypeClass_DOUBLE:
--			__asm__( "fldl %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "fldl %0\n"
--					 : : "m"(*(double *)nRegReturn) );
--			break;
--// 		case typelib_TypeClass_UNSIGNED_SHORT:
--// 		case typelib_TypeClass_SHORT:
--// 			__asm__( "movswl %0, %%eax\n"
--// 					 : : "m"(nRegReturn) );
--// 		break;
--		default:
--			__asm__( "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]) );
--			break;
--	}
--}
--
-+extern "C" void privateSnippetExecutorGeneral();
-+extern "C" void privateSnippetExecutorVoid();
-+extern "C" void privateSnippetExecutorHyper();
-+extern "C" void privateSnippetExecutorFloat();
-+extern "C" void privateSnippetExecutorDouble();
-+extern "C" void privateSnippetExecutorClass();
-+extern "C" typedef void (*PrivateSnippetExecutor)();
- 
--//==================================================================================================
--int const codeSnippetSize = 20;
-+int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
-     unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
--    bool simpleRetType)
-+    typelib_TypeClass returnTypeClass)
- {
--    if (!simpleRetType) {
-+    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-         functionIndex |= 0x80000000;
-     }
-+    PrivateSnippetExecutor exec;
-+    switch (returnTypeClass) {
-+    case typelib_TypeClass_VOID:
-+        exec = privateSnippetExecutorVoid;
-+        break;
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        exec = privateSnippetExecutorHyper;
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+        exec = privateSnippetExecutorFloat;
-+        break;
-+    case typelib_TypeClass_DOUBLE:
-+        exec = privateSnippetExecutorDouble;
-+        break;
-+    case typelib_TypeClass_STRING:
-+    case typelib_TypeClass_TYPE:
-+    case typelib_TypeClass_ANY:
-+    case typelib_TypeClass_SEQUENCE:
-+    case typelib_TypeClass_STRUCT:
-+    case typelib_TypeClass_INTERFACE:
-+        exec = privateSnippetExecutorClass;
-+        break;
-+    default:
-+        exec = privateSnippetExecutorGeneral;
-+        break;
-+    }
-     unsigned char * p = code;
-     OSL_ASSERT(sizeof (sal_Int32) == 4);
-     // mov function_index, %eax:
-@@ -459,13 +430,10 @@
-     *p++ = 0xBA;
-     *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-     p += sizeof (sal_Int32);
--    // mov %esp, %ecx:
--    *p++ = 0x89;
--    *p++ = 0xE1;
--    // jmp cpp_vtable_call:
-+    // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -504,17 +472,17 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceAttributeTypeDescription * >(
--                        member)->pAttributeTypeRef));
-+                reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-+                    member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-             if (!reinterpret_cast<
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
-                 *slots++ = code;
--                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-+                code = codeSnippet(
-+                    code, functionOffset++, vtableOffset,
-+                    typelib_TypeClass_VOID);
-             }
-             break;
- 
-@@ -522,10 +490,8 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceMethodTypeDescription * >(
--                        member)->pReturnTypeRef));
-+                reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-+                    member)->pReturnTypeRef->eTypeClass);
-             break;
- 
-         default:
diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
deleted file mode 100644
index 942e6fccc4c7..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk	Fri May 20 11:14:36 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Fri May 20 11:16:09 2005
-@@ -87,7 +87,8 @@
- SLOFILES= \
- 	$(SLO)$/except.obj		\
- 	$(SLO)$/cpp2uno.obj		\
--	$(SLO)$/uno2cpp.obj
-+    $(SLO)$/uno2cpp.obj \
-+    $(SLO)$/call.obj
- 
- SHL1TARGET= $(TARGET)
- 
-@@ -108,3 +109,6 @@
- 
- .INCLUDE :  target.mk
- 
-+$(SLO)$/%.obj: %.s
-+    $(CC) -c -o $(SLO)$/$(@:b).o $<
-+    touch $@
diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
deleted file mode 100644
index 3c65cce44a9c..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49678#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : == -> =
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.116
-diff -u -r1.116 configure.in
---- config_office/configure.in	11 Apr 2005 09:31:15 -0000	1.116
-+++ config_office/configure.in	13 May 2005 07:13:41 -0000
-@@ -1787,7 +1787,7 @@
- dnl Checks for javac
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
--    if test "$JDK" == "gcj"; then 
-+    if test "$JDK" = "gcj"; then 
-         javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-     else
-         javacompiler="javac"
-@@ -1871,7 +1871,7 @@
-     fi
- fi
- 
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-    AC_CHECK_HEADER(jni.h, [],
-@@ -1888,7 +1888,7 @@
- dnl ===================================================================
- dnl Check for optional gcj-dbtool
- dnl ===================================================================
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-     javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
-     if test -z "$with_jdk_home"; then
-         AC_PATH_PROG(JAVACACHE, $javacache)
-@@ -2684,7 +2684,7 @@
-    if test -z "$MOZILLA_VERSION"; then
-       MOZILLA_VERSION=1.7.5
-    fi
--   if test "$MOZILLA_VERSION" == "1.7b" ; then
-+   if test "$MOZILLA_VERSION" = "1.7b" ; then
-       MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source.tar.gz"
-    else
-       MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}.tar.gz"
diff --git a/editors/openoffice.org-2-RC/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2-RC/files/patch-crashrep+source+unx+makefile.mk
deleted file mode 100644
index 3c87525ff42a..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-crashrep+source+unx+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49679#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : We don't have -ldl and -lnsl
-
-Index: crashrep/source/unx/makefile.mk
-===================================================================
-RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
-retrieving revision 1.14
-diff -u -r1.14 makefile.mk
---- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
-+++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
-@@ -82,7 +82,10 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
--APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS+=-ldl -lnsl
-+.ENDIF
- .IF "$(OS)" == "SOLARIS"
- APP1STDLIBS+=-lsocket
- .ENDIF
diff --git a/editors/openoffice.org-2-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch
deleted file mode 100644
index 81b293cdf9f3..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49682#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct version number of resultant shared lib
-
-Index: xmlsec1-1.2.6.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
-retrieving revision 1.5
-diff -u -r1.5 xmlsec1-1.2.6.patch
---- libxmlsec/xmlsec1-1.2.6.patch	18 May 2005 10:11:24 -0000	1.5
-+++ libxmlsec/xmlsec1-1.2.6.patch	22 May 2005 01:43:49 -0000
-@@ -756,6 +756,35 @@
- *** misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
- --- misc/build/xmlsec1-1.2.6/ltmain.sh	2005-05-09 19:55:51.745319024 +0200
- ***************
-+*** 2994,3006 ****
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=".$current"
-+! 	  versuffix=".$current.$revision";
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2994,3006 ----
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+***************
- *** 3564,3570 ****
-   		fi
-   	      else
diff --git a/editors/openoffice.org-2-RC/files/patch-odk+configure.pl b/editors/openoffice.org-2-RC/files/patch-odk+configure.pl
deleted file mode 100644
index a608473de01c..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : canonical name by config.guess for FreeBSD is
-% ./config.guess
-i386-unknown-freebsd5.3
-so, $main::operatingSystem is
-% ./config.guess | cut -d"-" -f3,4
-freebsd5.3
-then, if ( $main::operatingSystem eq "FreeBSD" ) is not correct,
-and if ( $main::operatingSystem =~ /freebsd/ ) is correct
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.11
-diff -u -r1.11 configure.pl
---- odk/configure.pl	29 Mar 2005 12:03:00 -0000	1.11
-+++ odk/configure.pl	15 May 2005 08:46:20 -0000
-@@ -45,7 +45,7 @@
- 
- $main::OO_SDK_MAKE_HOME = "";
- $main::makeName = "make";
--if ( $main::operatingSystem eq "FreeBSD" )
-+if ( $main::operatingSystem =~ /freebsd/ )
- {
-     $main::makeName = "gmake";
- }
diff --git a/editors/openoffice.org-2-RC/files/patch-odk+setsdkenv_unix b/editors/openoffice.org-2-RC/files/patch-odk+setsdkenv_unix
deleted file mode 100644
index 1165826077b0..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-odk+setsdkenv_unix
+++ /dev/null
@@ -1,39 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-
-Index: odk/setsdkenv_unix.sh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.sh.in
---- odk/setsdkenv_unix.sh.in	29 Mar 2005 12:03:27 -0000	1.5
-+++ odk/setsdkenv_unix.sh.in	15 May 2005 09:06:22 -0000
-@@ -130,7 +130,7 @@
-     export LD_LIBRARY_PATH
-     ;;
- 
--  freebsd)
-+  freebsd*)
-     if [ -n "$OO_SDK_CPP_HOME" ]
-     then
- 	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-Index: odk/setsdkenv_unix.csh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.csh.in
---- odk/setsdkenv_unix.csh.in	29 Mar 2005 12:03:14 -0000	1.5
-+++ odk/setsdkenv_unix.csh.in	15 May 2005 09:06:38 -0000
-@@ -114,7 +114,7 @@
-     endif
-   breaksw
- 
--  case "freebsd":
-+  case "freebsd*":
-     if ( $?OO_SDK_CPP_HOME == 0) then
- 	set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- 	setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
diff --git a/editors/openoffice.org-2-RC/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2-RC/files/patch-odk+settings+settings.mk
deleted file mode 100644
index 079bd128062c..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-and adding missing things.
-
-Index: odk/settings/settings.mk
-===================================================================
-RCS file: /cvs/api/odk/settings/settings.mk,v
-retrieving revision 1.14
-diff -u -r1.14 settings.mk
---- odk/settings/settings.mk	29 Mar 2005 12:19:26 -0000	1.14
-+++ odk/settings/settings.mk	15 May 2005 13:54:38 -0000
-@@ -397,7 +397,7 @@
- # FreeBSD specific settings
- #
- ###########################################################################
--ifeq "$(PLATFORM)" "freebsd"
-+ifneq (,$(findstring freebsd,$(PLATFORM)))
- # Settings for FreeBSD using gcc compiler
- 
- PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-@@ -435,6 +435,7 @@
- CSEP=\>
- QUOTE=$(subst S,\,S)
- QM=\"
-+SQM='
- ECHOLINE=@echo
- P2BG=&
- 
-@@ -446,10 +447,10 @@
- # Include UDK version numbers
- include $(PRJ)/include/udkversion.mk
- 
--SALLIB=-lsal
--CPPULIB=-lcppu
--CPPUHELPERLIB=-lcppuhelper$(COMID)
--SALHELPERLIB=-lsalhelper$(COMID)
-+SALLIB=-luno_sal
-+CPPULIB=-luno_cppu
-+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-+SALHELPERLIB=-luno_salhelper$(COMID)
- REGLIB=-lreg
- STORELIB=-lstore
- STLPORTLIB=-lstlport_gcc
diff --git a/editors/openoffice.org-2-RC/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-2-RC/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 09f2f949c81d..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-Issutracker : #i49677#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : contains illigal char
-
-Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
-===================================================================
-RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
-retrieving revision 1.2
-diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
---- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
-+++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
-@@ -109,7 +109,7 @@
- 		linearly between center and endColor via concentric ellipses
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		circular. If it's not 1, the gradient is elliptical, with the
- 		special twist that the aspect ratio is maintained also for the
- 		center color: the gradient will not collapse into a single
-@@ -124,7 +124,7 @@
- 		linearly between center and endColor via rectangular boxes
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		quadratic. If it's not 1, the gradient is rectangular, with
- 		the special twist that the aspect ratio is maintained also for
- 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2-RC/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-2-RC/files/patch-portaudio+portaudio_v18_1.patch
deleted file mode 100644
index 87c43fb14d7c..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-portaudio+portaudio_v18_1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Issutracker : #i46879#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Need to include <sys/soundcard.h> to use sound and passes
-              correct pthread related flags
-
-Index: portaudio/portaudio_v18_1.patch
-===================================================================
-RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
-retrieving revision 1.1
-diff -u -r1.1 portaudio_v18_1.patch
---- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
-+++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
-@@ -12,7 +12,7 @@
-   	;;
-   
-     mingw* )
----- 1883,1902 ----
-+--- 1883,1921 ----
-   case "${host_os}" in
-     darwin* )
-   
-@@ -30,6 +30,25 @@
- ! 	PADLL="libportaudio.so";
- ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
- ! 	CFLAGS="-O2 -fPIC"
-+! 	;;
-+! 
-+!   freebsd* )
-+! 	if test "$OSVERSION" -lt "500016"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-pthread"
-+!         elif test "$OSVERSION" -lt "502102"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-lc_r"
-+!         else
-+!              PTHREAD_CFLAGS=""
-+!              PTHREAD_LIBS="-pthread"
-+!         fi
-+! 
-+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+! 	LIBS="-lm ${PTHREAD_LIBS}";
-+! 	PADLL="libportaudio.so";
-+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-+! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
-   	;;
-   
-     mingw* )
-@@ -52,3 +71,18 @@
-   LIBINST = /usr/local/lib
-   
-   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-+
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
-+***************
-+*** 43,48 ****
-+--- 43,50 ----
-+  
-+  #ifdef __linux__
-+  #include <linux/soundcard.h>
-++ #elif defined (__FreeBSD__)
-++ #include <sys/soundcard.h>
-+  #else
-+  #include <machine/soundcard.h> /* JH20010905 */
-+  #endif
-+
diff --git a/editors/openoffice.org-2-RC/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2-RC/files/patch-sndfile+libsndfile-1.0.9.patch
deleted file mode 100644
index 71a8f2292f2a..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-sndfile+libsndfile-1.0.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Issutracker : #i49684#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct shared lib number
-
-Index: libsndfile-1.0.9.patch
-===================================================================
-RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
-retrieving revision 1.1
-diff -u -r1.1 libsndfile-1.0.9.patch
---- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
-+++ sndfile/libsndfile-1.0.9.patch	22 May 2005 02:01:17 -0000
-@@ -231,3 +231,24 @@
-   
-   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-   
-+*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
-+--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
-+***************
-+*** 2980,2987 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2980,2987 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
diff --git a/editors/openoffice.org-2-RC/files/patch-sndfile+makefile.mk b/editors/openoffice.org-2-RC/files/patch-sndfile+makefile.mk
deleted file mode 100644
index 234100480f33..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-sndfile+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i49683#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : -noinhibit-exec allows linking against non-existent libs
-
-Index: sndfile/makefile.mk
-===================================================================
-RCS file: /cvs/external/sndfile/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
-+++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
-@@ -81,7 +81,7 @@
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure --with-pic
--.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
-+.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
- .ENDIF
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 94e3cc8d21bc..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-Issutracker : #i49685#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Update to recent version of unxlngi6.mk
-($Revision: 1.12 and $Author: obo $ $Date: 2005/05/06 09:37:55 $)
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.13
-diff -u -r1.13 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	11 Feb 2005 15:27:55 -0000	1.13
-+++ solenv/inc/unxfbsdi.mk	15 May 2005 04:51:41 -0000
-@@ -99,9 +99,6 @@
- CC+:=$(CFLAGS_SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
- CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
--.IF "$(PRODUCT)"!=""
--CFLAGS+=-Wuninitialized
--.ENDIF
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_SYMBOLS)"=="SMALL"
-@@ -122,6 +119,9 @@
- CFLAGSCXX= -pipe -mtune=pentiumpro
- CFLAGSCXX+= -Wno-ctor-dtor-privacy
- 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=
-@@ -143,6 +143,7 @@
- # Compiler flags for enabling optimazations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized				# not supported without optimization
- .ELSE 	# "$(PRODUCT)"!=""
- CFLAGSOPT=   							# no optimizing for non products
- .ENDIF	# "$(PRODUCT)"!=""
-@@ -161,11 +162,12 @@
- 
- # name of linker
- LINK*=$(CXX)
-+LINKC*=$(CC)
- 
- # default linker flags
- LINKFLAGSDEFS*=#-Wl,-z,defs
- LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-@@ -237,3 +239,4 @@
- DLLPOSTFIX=fi
- DLLPRE=lib
- DLLPOST=.so
-+
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 80d5a832f6a2..94a4282f01d2 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -48,7 +48,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		105
+MILESTONE=		107
 SNAPDATE=		20050521
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
@@ -93,8 +93,8 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
+
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index c308f56de99d..cc4f3b56c811 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810
-SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617
+MD5 (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 9c20222b097d70029dae19f834a83bf1
+SIZE (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 212641982
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
deleted file mode 100644
index 5e5d4b85c49e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
+++ /dev/null
@@ -1,270 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s	Thu Jan  1 09:00:00 1970
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s	Fri May 20 11:21:13 2005
-@@ -0,0 +1,262 @@
-+    .text
-+
-+.globl privateSnippetExecutorGeneral
-+    .type   privateSnippetExecutorGeneral,@function
-+privateSnippetExecutorGeneral:
-+.LFBg:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIg0:
-+    movl    %esp,%ebp
-+.LCFIg1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEg:
-+    .size   privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral
-+
-+.globl privateSnippetExecutorVoid
-+    .type   privateSnippetExecutorVoid,@function
-+privateSnippetExecutorVoid:
-+.LFBv:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIv0:
-+    movl    %esp,%ebp
-+.LCFIv1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    leave
-+    ret
-+.LFEv:
-+    .size   privateSnippetExecutorVoid,.-privateSnippetExecutorVoid
-+
-+.globl privateSnippetExecutorHyper
-+    .type   privateSnippetExecutorHyper,@function
-+privateSnippetExecutorHyper:
-+.LFBh:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIh0:
-+    movl    %esp,%ebp
-+.LCFIh1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    movl    16(%esp),%edx     # 64 bit nRegReturn, upper half
-+    leave
-+    ret
-+.LFEh:
-+    .size   privateSnippetExecutorHyper,.-privateSnippetExecutorHyper
-+
-+.globl privateSnippetExecutorFloat
-+    .type   privateSnippetExecutorFloat,@function
-+privateSnippetExecutorFloat:
-+.LFBf:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIf0:
-+    movl    %esp,%ebp
-+.LCFIf1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    flds    12(%esp)          # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEf:
-+    .size   privateSnippetExecutorFloat,.-privateSnippetExecutorFloat
-+
-+.globl privateSnippetExecutorDouble
-+    .type   privateSnippetExecutorDouble,@function
-+privateSnippetExecutorDouble:
-+.LFBd:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFId0:
-+    movl    %esp,%ebp
-+.LCFId1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    fldl    12(%esp)          # 64 bit nRegReturn
-+    leave
-+    ret
-+.LFEd:
-+    .size   privateSnippetExecutorDouble,.-privateSnippetExecutorDouble
-+
-+.globl privateSnippetExecutorClass
-+    .type   privateSnippetExecutorClass,@function
-+privateSnippetExecutorClass:
-+.LFBc:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIc0:
-+    movl    %esp,%ebp
-+.LCFIc1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret     $4
-+.LFEc:
-+    .size   privateSnippetExecutorClass,.-privateSnippetExecutorClass
-+
-+    .section .eh_frame,"a",@progbits
-+.Lframe1:
-+    .long   .LECIE1-.LSCIE1   # length
-+.LSCIE1:
-+    .long   0                 # CIE_ID
-+    .byte   1                 # version
-+    .string "zR"              # augmentation
-+    .uleb128 1                # code_alignment_factor
-+    .sleb128 -4               # data_alignment_factor
-+    .byte   8                 # return_address_register
-+    .uleb128 1                # augmentation size 1:
-+    .byte   0x1B              #  FDE Encoding (pcrel sdata4)
-+                              # initial_instructions:
-+    .byte   0x0C              #  DW_CFA_def_cfa %esp, 4
-+    .uleb128 4
-+    .uleb128 4
-+    .byte   0x88              #  DW_CFA_offset ret, 1
-+    .uleb128 1
-+    .align 4
-+.LECIE1:
-+.LSFDEg:
-+    .long   .LEFDEg-.LASFDEg  # length
-+.LASFDEg:
-+    .long   .LASFDEg-.Lframe1 # CIE_pointer
-+    .long   .LFBg-.           # initial_location
-+    .long   .LFEg-.LFBg       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg0-.LFBg
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg1-.LCFIg0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEg:
-+.LSFDEv:
-+    .long   .LEFDEv-.LASFDEv  # length
-+.LASFDEv:
-+    .long   .LASFDEv-.Lframe1 # CIE_pointer
-+    .long   .LFBv-.           # initial_location
-+    .long   .LFEv-.LFBv       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv0-.LFBv
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv1-.LCFIv0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEv:
-+.LSFDEh:
-+    .long   .LEFDEh-.LASFDEh  # length
-+.LASFDEh:
-+    .long   .LASFDEh-.Lframe1 # CIE_pointer
-+    .long   .LFBh-.           # initial_location
-+    .long   .LFEh-.LFBh       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh0-.LFBh
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh1-.LCFIh0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEh:
-+.LSFDEf:
-+    .long   .LEFDEf-.LASFDEf  # length
-+.LASFDEf:
-+    .long   .LASFDEf-.Lframe1 # CIE_pointer
-+    .long   .LFBf-.           # initial_location
-+    .long   .LFEf-.LFBf       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf0-.LFBf
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf1-.LCFIf0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEf:
-+.LSFDEd:
-+    .long   .LEFDEd-.LASFDEd  # length
-+.LASFDEd:
-+    .long   .LASFDEd-.Lframe1 # CIE_pointer
-+    .long   .LFBd-.           # initial_location
-+    .long   .LFEd-.LFBd       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId0-.LFBd
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId1-.LCFId0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEd:
-+.LSFDEc:
-+    .long   .LEFDEc-.LASFDEc  # length
-+.LASFDEc:
-+    .long   .LASFDEc-.Lframe1 # CIE_pointer
-+    .long   .LFBc-.           # initial_location
-+    .long   .LFEc-.LFBc       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc0-.LFBc
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc1-.LCFIc0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEc:
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
deleted file mode 100644
index a291493b6b29..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Wed Jan 19 00:06:09 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Feb 21 21:13:28 2005
-@@ -77,7 +77,7 @@
- {
- 
- //==================================================================================================
--static typelib_TypeClass cpp2uno_call(
-+void cpp2uno_call(
- 	bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
- 	const typelib_TypeDescription * pMemberTypeDescr,
- 	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-@@ -209,8 +209,6 @@
- 		CPPU_CURRENT_NAMESPACE::raiseException(
-             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-             // has to destruct the any
--		// is here for dummy
--		return typelib_TypeClass_VOID;
- 	}
- 	else // else no exception occured...
- 	{
-@@ -247,22 +245,16 @@
- 		}
- 		if (pReturnTypeDescr)
- 		{
--			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
- 			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
--			return eRet;
- 		}
--		else
--			return typelib_TypeClass_VOID;
- 	}
- }
- 
- 
- //==================================================================================================
--static typelib_TypeClass cpp_mediate(
--	sal_Int32 nFunctionIndex,
--    sal_Int32 nVtableOffset,
--	void ** pCallStack,
--	sal_Int64 * pRegisterReturn /* space for register return */ )
-+extern "C" void cpp_vtable_call(
-+    int nFunctionIndex, int nVtableOffset, void** pCallStack,
-+    sal_Int64 nRegReturn )
- {
- 	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
- 	
-@@ -298,7 +290,6 @@
- 
- 	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-     
--	typelib_TypeClass eRet;
- 	switch (aMemberDescr.get()->eTypeClass)
- 	{
- 	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-@@ -306,11 +297,11 @@
- 		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
- 		{
- 			// is GET method
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
- 				0, 0, // no params
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		else
- 		{
-@@ -321,11 +312,11 @@
- 			aParam.bIn		= sal_True;
- 			aParam.bOut		= sal_False;
- 			
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				0, // indicates void return
- 				1, &aParam,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -336,11 +327,9 @@
- 		{
- 		case 1: // acquire()
- 			pCppI->acquireProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 2: // release()
- 			pCppI->releaseProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 0: // queryInterface() opt
- 		{
-@@ -361,20 +350,19 @@
-                         &pInterface, pTD, cpp_acquire );
-                     pInterface->release();
-                     TYPELIB_DANGER_RELEASE( pTD );
--                    *(void **)pRegisterReturn = pCallStack[1];
--                    eRet = typelib_TypeClass_ANY;
-+                    *(void **)&nRegReturn = pCallStack[1];
-                     break;
-                 }
-                 TYPELIB_DANGER_RELEASE( pTD );
-             }
- 		} // else perform queryInterface()
- 		default:
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -383,72 +371,55 @@
- 		throw RuntimeException(
-             rtl::OUString::createFromAscii("no member description found!"),
-             (XInterface *)pThis );
--		// is here for dummy
--		eRet = typelib_TypeClass_VOID;
- 	}
- 	}
--
--	return eRet;
- }
- 
- //==================================================================================================
--/**
-- * is called on incoming vtable calls
-- * (called by asm snippets)
-- */
--static void cpp_vtable_call(
--    int nFunctionIndex, int nVtableOffset, void** pCallStack )
--    __attribute__((regparm(3)));
--
--void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
--{
--	volatile long nRegReturn[2];
--	typelib_TypeClass aType = cpp_mediate(
--        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
--    
--	switch( aType )
--	{
--		case typelib_TypeClass_HYPER:
--		case typelib_TypeClass_UNSIGNED_HYPER:
--			__asm__( "movl %1, %%edx\n\t"
--					 "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
--			break;
--		case typelib_TypeClass_FLOAT:
--			__asm__( "flds %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "flds %0\n"
--					 : : "m"(*(float *)nRegReturn) );
--			break;
--		case typelib_TypeClass_DOUBLE:
--			__asm__( "fldl %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "fldl %0\n"
--					 : : "m"(*(double *)nRegReturn) );
--			break;
--// 		case typelib_TypeClass_UNSIGNED_SHORT:
--// 		case typelib_TypeClass_SHORT:
--// 			__asm__( "movswl %0, %%eax\n"
--// 					 : : "m"(nRegReturn) );
--// 		break;
--		default:
--			__asm__( "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]) );
--			break;
--	}
--}
--
-+extern "C" void privateSnippetExecutorGeneral();
-+extern "C" void privateSnippetExecutorVoid();
-+extern "C" void privateSnippetExecutorHyper();
-+extern "C" void privateSnippetExecutorFloat();
-+extern "C" void privateSnippetExecutorDouble();
-+extern "C" void privateSnippetExecutorClass();
-+extern "C" typedef void (*PrivateSnippetExecutor)();
- 
--//==================================================================================================
--int const codeSnippetSize = 20;
-+int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
-     unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
--    bool simpleRetType)
-+    typelib_TypeClass returnTypeClass)
- {
--    if (!simpleRetType) {
-+    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-         functionIndex |= 0x80000000;
-     }
-+    PrivateSnippetExecutor exec;
-+    switch (returnTypeClass) {
-+    case typelib_TypeClass_VOID:
-+        exec = privateSnippetExecutorVoid;
-+        break;
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        exec = privateSnippetExecutorHyper;
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+        exec = privateSnippetExecutorFloat;
-+        break;
-+    case typelib_TypeClass_DOUBLE:
-+        exec = privateSnippetExecutorDouble;
-+        break;
-+    case typelib_TypeClass_STRING:
-+    case typelib_TypeClass_TYPE:
-+    case typelib_TypeClass_ANY:
-+    case typelib_TypeClass_SEQUENCE:
-+    case typelib_TypeClass_STRUCT:
-+    case typelib_TypeClass_INTERFACE:
-+        exec = privateSnippetExecutorClass;
-+        break;
-+    default:
-+        exec = privateSnippetExecutorGeneral;
-+        break;
-+    }
-     unsigned char * p = code;
-     OSL_ASSERT(sizeof (sal_Int32) == 4);
-     // mov function_index, %eax:
-@@ -459,13 +430,10 @@
-     *p++ = 0xBA;
-     *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-     p += sizeof (sal_Int32);
--    // mov %esp, %ecx:
--    *p++ = 0x89;
--    *p++ = 0xE1;
--    // jmp cpp_vtable_call:
-+    // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -504,17 +472,17 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceAttributeTypeDescription * >(
--                        member)->pAttributeTypeRef));
-+                reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-+                    member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-             if (!reinterpret_cast<
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
-                 *slots++ = code;
--                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-+                code = codeSnippet(
-+                    code, functionOffset++, vtableOffset,
-+                    typelib_TypeClass_VOID);
-             }
-             break;
- 
-@@ -522,10 +490,8 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceMethodTypeDescription * >(
--                        member)->pReturnTypeRef));
-+                reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-+                    member)->pReturnTypeRef->eTypeClass);
-             break;
- 
-         default:
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
deleted file mode 100644
index 942e6fccc4c7..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk	Fri May 20 11:14:36 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Fri May 20 11:16:09 2005
-@@ -87,7 +87,8 @@
- SLOFILES= \
- 	$(SLO)$/except.obj		\
- 	$(SLO)$/cpp2uno.obj		\
--	$(SLO)$/uno2cpp.obj
-+    $(SLO)$/uno2cpp.obj \
-+    $(SLO)$/call.obj
- 
- SHL1TARGET= $(TARGET)
- 
-@@ -108,3 +109,6 @@
- 
- .INCLUDE :  target.mk
- 
-+$(SLO)$/%.obj: %.s
-+    $(CC) -c -o $(SLO)$/$(@:b).o $<
-+    touch $@
diff --git a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
deleted file mode 100644
index 3c65cce44a9c..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49678#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : == -> =
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.116
-diff -u -r1.116 configure.in
---- config_office/configure.in	11 Apr 2005 09:31:15 -0000	1.116
-+++ config_office/configure.in	13 May 2005 07:13:41 -0000
-@@ -1787,7 +1787,7 @@
- dnl Checks for javac
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
--    if test "$JDK" == "gcj"; then 
-+    if test "$JDK" = "gcj"; then 
-         javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-     else
-         javacompiler="javac"
-@@ -1871,7 +1871,7 @@
-     fi
- fi
- 
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-    AC_CHECK_HEADER(jni.h, [],
-@@ -1888,7 +1888,7 @@
- dnl ===================================================================
- dnl Check for optional gcj-dbtool
- dnl ===================================================================
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-     javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
-     if test -z "$with_jdk_home"; then
-         AC_PATH_PROG(JAVACACHE, $javacache)
-@@ -2684,7 +2684,7 @@
-    if test -z "$MOZILLA_VERSION"; then
-       MOZILLA_VERSION=1.7.5
-    fi
--   if test "$MOZILLA_VERSION" == "1.7b" ; then
-+   if test "$MOZILLA_VERSION" = "1.7b" ; then
-       MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source.tar.gz"
-    else
-       MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}.tar.gz"
diff --git a/editors/openoffice.org-2-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2-devel/files/patch-crashrep+source+unx+makefile.mk
deleted file mode 100644
index 3c87525ff42a..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-crashrep+source+unx+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49679#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : We don't have -ldl and -lnsl
-
-Index: crashrep/source/unx/makefile.mk
-===================================================================
-RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
-retrieving revision 1.14
-diff -u -r1.14 makefile.mk
---- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
-+++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
-@@ -82,7 +82,10 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
--APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS+=-ldl -lnsl
-+.ENDIF
- .IF "$(OS)" == "SOLARIS"
- APP1STDLIBS+=-lsocket
- .ENDIF
diff --git a/editors/openoffice.org-2-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
deleted file mode 100644
index 81b293cdf9f3..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49682#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct version number of resultant shared lib
-
-Index: xmlsec1-1.2.6.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
-retrieving revision 1.5
-diff -u -r1.5 xmlsec1-1.2.6.patch
---- libxmlsec/xmlsec1-1.2.6.patch	18 May 2005 10:11:24 -0000	1.5
-+++ libxmlsec/xmlsec1-1.2.6.patch	22 May 2005 01:43:49 -0000
-@@ -756,6 +756,35 @@
- *** misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
- --- misc/build/xmlsec1-1.2.6/ltmain.sh	2005-05-09 19:55:51.745319024 +0200
- ***************
-+*** 2994,3006 ****
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=".$current"
-+! 	  versuffix=".$current.$revision";
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2994,3006 ----
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+***************
- *** 3564,3570 ****
-   		fi
-   	      else
diff --git a/editors/openoffice.org-2-devel/files/patch-odk+configure.pl b/editors/openoffice.org-2-devel/files/patch-odk+configure.pl
deleted file mode 100644
index a608473de01c..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : canonical name by config.guess for FreeBSD is
-% ./config.guess
-i386-unknown-freebsd5.3
-so, $main::operatingSystem is
-% ./config.guess | cut -d"-" -f3,4
-freebsd5.3
-then, if ( $main::operatingSystem eq "FreeBSD" ) is not correct,
-and if ( $main::operatingSystem =~ /freebsd/ ) is correct
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.11
-diff -u -r1.11 configure.pl
---- odk/configure.pl	29 Mar 2005 12:03:00 -0000	1.11
-+++ odk/configure.pl	15 May 2005 08:46:20 -0000
-@@ -45,7 +45,7 @@
- 
- $main::OO_SDK_MAKE_HOME = "";
- $main::makeName = "make";
--if ( $main::operatingSystem eq "FreeBSD" )
-+if ( $main::operatingSystem =~ /freebsd/ )
- {
-     $main::makeName = "gmake";
- }
diff --git a/editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix b/editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix
deleted file mode 100644
index 1165826077b0..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix
+++ /dev/null
@@ -1,39 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-
-Index: odk/setsdkenv_unix.sh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.sh.in
---- odk/setsdkenv_unix.sh.in	29 Mar 2005 12:03:27 -0000	1.5
-+++ odk/setsdkenv_unix.sh.in	15 May 2005 09:06:22 -0000
-@@ -130,7 +130,7 @@
-     export LD_LIBRARY_PATH
-     ;;
- 
--  freebsd)
-+  freebsd*)
-     if [ -n "$OO_SDK_CPP_HOME" ]
-     then
- 	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-Index: odk/setsdkenv_unix.csh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.csh.in
---- odk/setsdkenv_unix.csh.in	29 Mar 2005 12:03:14 -0000	1.5
-+++ odk/setsdkenv_unix.csh.in	15 May 2005 09:06:38 -0000
-@@ -114,7 +114,7 @@
-     endif
-   breaksw
- 
--  case "freebsd":
-+  case "freebsd*":
-     if ( $?OO_SDK_CPP_HOME == 0) then
- 	set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- 	setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
diff --git a/editors/openoffice.org-2-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2-devel/files/patch-odk+settings+settings.mk
deleted file mode 100644
index 079bd128062c..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-and adding missing things.
-
-Index: odk/settings/settings.mk
-===================================================================
-RCS file: /cvs/api/odk/settings/settings.mk,v
-retrieving revision 1.14
-diff -u -r1.14 settings.mk
---- odk/settings/settings.mk	29 Mar 2005 12:19:26 -0000	1.14
-+++ odk/settings/settings.mk	15 May 2005 13:54:38 -0000
-@@ -397,7 +397,7 @@
- # FreeBSD specific settings
- #
- ###########################################################################
--ifeq "$(PLATFORM)" "freebsd"
-+ifneq (,$(findstring freebsd,$(PLATFORM)))
- # Settings for FreeBSD using gcc compiler
- 
- PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-@@ -435,6 +435,7 @@
- CSEP=\>
- QUOTE=$(subst S,\,S)
- QM=\"
-+SQM='
- ECHOLINE=@echo
- P2BG=&
- 
-@@ -446,10 +447,10 @@
- # Include UDK version numbers
- include $(PRJ)/include/udkversion.mk
- 
--SALLIB=-lsal
--CPPULIB=-lcppu
--CPPUHELPERLIB=-lcppuhelper$(COMID)
--SALHELPERLIB=-lsalhelper$(COMID)
-+SALLIB=-luno_sal
-+CPPULIB=-luno_cppu
-+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-+SALHELPERLIB=-luno_salhelper$(COMID)
- REGLIB=-lreg
- STORELIB=-lstore
- STLPORTLIB=-lstlport_gcc
diff --git a/editors/openoffice.org-2-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-2-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 09f2f949c81d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-Issutracker : #i49677#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : contains illigal char
-
-Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
-===================================================================
-RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
-retrieving revision 1.2
-diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
---- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
-+++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
-@@ -109,7 +109,7 @@
- 		linearly between center and endColor via concentric ellipses
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		circular. If it's not 1, the gradient is elliptical, with the
- 		special twist that the aspect ratio is maintained also for the
- 		center color: the gradient will not collapse into a single
-@@ -124,7 +124,7 @@
- 		linearly between center and endColor via rectangular boxes
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		quadratic. If it's not 1, the gradient is rectangular, with
- 		the special twist that the aspect ratio is maintained also for
- 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2-devel/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-2-devel/files/patch-portaudio+portaudio_v18_1.patch
deleted file mode 100644
index 87c43fb14d7c..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-portaudio+portaudio_v18_1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Issutracker : #i46879#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Need to include <sys/soundcard.h> to use sound and passes
-              correct pthread related flags
-
-Index: portaudio/portaudio_v18_1.patch
-===================================================================
-RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
-retrieving revision 1.1
-diff -u -r1.1 portaudio_v18_1.patch
---- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
-+++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
-@@ -12,7 +12,7 @@
-   	;;
-   
-     mingw* )
----- 1883,1902 ----
-+--- 1883,1921 ----
-   case "${host_os}" in
-     darwin* )
-   
-@@ -30,6 +30,25 @@
- ! 	PADLL="libportaudio.so";
- ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
- ! 	CFLAGS="-O2 -fPIC"
-+! 	;;
-+! 
-+!   freebsd* )
-+! 	if test "$OSVERSION" -lt "500016"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-pthread"
-+!         elif test "$OSVERSION" -lt "502102"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-lc_r"
-+!         else
-+!              PTHREAD_CFLAGS=""
-+!              PTHREAD_LIBS="-pthread"
-+!         fi
-+! 
-+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+! 	LIBS="-lm ${PTHREAD_LIBS}";
-+! 	PADLL="libportaudio.so";
-+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-+! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
-   	;;
-   
-     mingw* )
-@@ -52,3 +71,18 @@
-   LIBINST = /usr/local/lib
-   
-   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-+
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
-+***************
-+*** 43,48 ****
-+--- 43,50 ----
-+  
-+  #ifdef __linux__
-+  #include <linux/soundcard.h>
-++ #elif defined (__FreeBSD__)
-++ #include <sys/soundcard.h>
-+  #else
-+  #include <machine/soundcard.h> /* JH20010905 */
-+  #endif
-+
diff --git a/editors/openoffice.org-2-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2-devel/files/patch-sndfile+libsndfile-1.0.9.patch
deleted file mode 100644
index 71a8f2292f2a..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sndfile+libsndfile-1.0.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Issutracker : #i49684#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct shared lib number
-
-Index: libsndfile-1.0.9.patch
-===================================================================
-RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
-retrieving revision 1.1
-diff -u -r1.1 libsndfile-1.0.9.patch
---- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
-+++ sndfile/libsndfile-1.0.9.patch	22 May 2005 02:01:17 -0000
-@@ -231,3 +231,24 @@
-   
-   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-   
-+*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
-+--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
-+***************
-+*** 2980,2987 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2980,2987 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
diff --git a/editors/openoffice.org-2-devel/files/patch-sndfile+makefile.mk b/editors/openoffice.org-2-devel/files/patch-sndfile+makefile.mk
deleted file mode 100644
index 234100480f33..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sndfile+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i49683#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : -noinhibit-exec allows linking against non-existent libs
-
-Index: sndfile/makefile.mk
-===================================================================
-RCS file: /cvs/external/sndfile/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
-+++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
-@@ -81,7 +81,7 @@
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure --with-pic
--.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
-+.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
- .ENDIF
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 94e3cc8d21bc..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-Issutracker : #i49685#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Update to recent version of unxlngi6.mk
-($Revision: 1.12 and $Author: obo $ $Date: 2005/05/06 09:37:55 $)
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.13
-diff -u -r1.13 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	11 Feb 2005 15:27:55 -0000	1.13
-+++ solenv/inc/unxfbsdi.mk	15 May 2005 04:51:41 -0000
-@@ -99,9 +99,6 @@
- CC+:=$(CFLAGS_SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
- CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
--.IF "$(PRODUCT)"!=""
--CFLAGS+=-Wuninitialized
--.ENDIF
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_SYMBOLS)"=="SMALL"
-@@ -122,6 +119,9 @@
- CFLAGSCXX= -pipe -mtune=pentiumpro
- CFLAGSCXX+= -Wno-ctor-dtor-privacy
- 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=
-@@ -143,6 +143,7 @@
- # Compiler flags for enabling optimazations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized				# not supported without optimization
- .ELSE 	# "$(PRODUCT)"!=""
- CFLAGSOPT=   							# no optimizing for non products
- .ENDIF	# "$(PRODUCT)"!=""
-@@ -161,11 +162,12 @@
- 
- # name of linker
- LINK*=$(CXX)
-+LINKC*=$(CC)
- 
- # default linker flags
- LINKFLAGSDEFS*=#-Wl,-z,defs
- LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-@@ -237,3 +239,4 @@
- DLLPOSTFIX=fi
- DLLPRE=lib
- DLLPOST=.so
-+
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 80d5a832f6a2..94a4282f01d2 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -48,7 +48,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		105
+MILESTONE=		107
 SNAPDATE=		20050521
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
@@ -93,8 +93,8 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
+
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index c308f56de99d..cc4f3b56c811 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810
-SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617
+MD5 (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 9c20222b097d70029dae19f834a83bf1
+SIZE (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 212641982
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
deleted file mode 100644
index 5e5d4b85c49e..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
+++ /dev/null
@@ -1,270 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s	Thu Jan  1 09:00:00 1970
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s	Fri May 20 11:21:13 2005
-@@ -0,0 +1,262 @@
-+    .text
-+
-+.globl privateSnippetExecutorGeneral
-+    .type   privateSnippetExecutorGeneral,@function
-+privateSnippetExecutorGeneral:
-+.LFBg:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIg0:
-+    movl    %esp,%ebp
-+.LCFIg1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEg:
-+    .size   privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral
-+
-+.globl privateSnippetExecutorVoid
-+    .type   privateSnippetExecutorVoid,@function
-+privateSnippetExecutorVoid:
-+.LFBv:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIv0:
-+    movl    %esp,%ebp
-+.LCFIv1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    leave
-+    ret
-+.LFEv:
-+    .size   privateSnippetExecutorVoid,.-privateSnippetExecutorVoid
-+
-+.globl privateSnippetExecutorHyper
-+    .type   privateSnippetExecutorHyper,@function
-+privateSnippetExecutorHyper:
-+.LFBh:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIh0:
-+    movl    %esp,%ebp
-+.LCFIh1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    movl    16(%esp),%edx     # 64 bit nRegReturn, upper half
-+    leave
-+    ret
-+.LFEh:
-+    .size   privateSnippetExecutorHyper,.-privateSnippetExecutorHyper
-+
-+.globl privateSnippetExecutorFloat
-+    .type   privateSnippetExecutorFloat,@function
-+privateSnippetExecutorFloat:
-+.LFBf:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIf0:
-+    movl    %esp,%ebp
-+.LCFIf1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    flds    12(%esp)          # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEf:
-+    .size   privateSnippetExecutorFloat,.-privateSnippetExecutorFloat
-+
-+.globl privateSnippetExecutorDouble
-+    .type   privateSnippetExecutorDouble,@function
-+privateSnippetExecutorDouble:
-+.LFBd:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFId0:
-+    movl    %esp,%ebp
-+.LCFId1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    fldl    12(%esp)          # 64 bit nRegReturn
-+    leave
-+    ret
-+.LFEd:
-+    .size   privateSnippetExecutorDouble,.-privateSnippetExecutorDouble
-+
-+.globl privateSnippetExecutorClass
-+    .type   privateSnippetExecutorClass,@function
-+privateSnippetExecutorClass:
-+.LFBc:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIc0:
-+    movl    %esp,%ebp
-+.LCFIc1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret     $4
-+.LFEc:
-+    .size   privateSnippetExecutorClass,.-privateSnippetExecutorClass
-+
-+    .section .eh_frame,"a",@progbits
-+.Lframe1:
-+    .long   .LECIE1-.LSCIE1   # length
-+.LSCIE1:
-+    .long   0                 # CIE_ID
-+    .byte   1                 # version
-+    .string "zR"              # augmentation
-+    .uleb128 1                # code_alignment_factor
-+    .sleb128 -4               # data_alignment_factor
-+    .byte   8                 # return_address_register
-+    .uleb128 1                # augmentation size 1:
-+    .byte   0x1B              #  FDE Encoding (pcrel sdata4)
-+                              # initial_instructions:
-+    .byte   0x0C              #  DW_CFA_def_cfa %esp, 4
-+    .uleb128 4
-+    .uleb128 4
-+    .byte   0x88              #  DW_CFA_offset ret, 1
-+    .uleb128 1
-+    .align 4
-+.LECIE1:
-+.LSFDEg:
-+    .long   .LEFDEg-.LASFDEg  # length
-+.LASFDEg:
-+    .long   .LASFDEg-.Lframe1 # CIE_pointer
-+    .long   .LFBg-.           # initial_location
-+    .long   .LFEg-.LFBg       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg0-.LFBg
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg1-.LCFIg0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEg:
-+.LSFDEv:
-+    .long   .LEFDEv-.LASFDEv  # length
-+.LASFDEv:
-+    .long   .LASFDEv-.Lframe1 # CIE_pointer
-+    .long   .LFBv-.           # initial_location
-+    .long   .LFEv-.LFBv       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv0-.LFBv
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv1-.LCFIv0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEv:
-+.LSFDEh:
-+    .long   .LEFDEh-.LASFDEh  # length
-+.LASFDEh:
-+    .long   .LASFDEh-.Lframe1 # CIE_pointer
-+    .long   .LFBh-.           # initial_location
-+    .long   .LFEh-.LFBh       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh0-.LFBh
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh1-.LCFIh0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEh:
-+.LSFDEf:
-+    .long   .LEFDEf-.LASFDEf  # length
-+.LASFDEf:
-+    .long   .LASFDEf-.Lframe1 # CIE_pointer
-+    .long   .LFBf-.           # initial_location
-+    .long   .LFEf-.LFBf       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf0-.LFBf
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf1-.LCFIf0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEf:
-+.LSFDEd:
-+    .long   .LEFDEd-.LASFDEd  # length
-+.LASFDEd:
-+    .long   .LASFDEd-.Lframe1 # CIE_pointer
-+    .long   .LFBd-.           # initial_location
-+    .long   .LFEd-.LFBd       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId0-.LFBd
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId1-.LCFId0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEd:
-+.LSFDEc:
-+    .long   .LEFDEc-.LASFDEc  # length
-+.LASFDEc:
-+    .long   .LASFDEc-.Lframe1 # CIE_pointer
-+    .long   .LFBc-.           # initial_location
-+    .long   .LFEc-.LFBc       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc0-.LFBc
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc1-.LCFIc0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEc:
diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
deleted file mode 100644
index a291493b6b29..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Wed Jan 19 00:06:09 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Feb 21 21:13:28 2005
-@@ -77,7 +77,7 @@
- {
- 
- //==================================================================================================
--static typelib_TypeClass cpp2uno_call(
-+void cpp2uno_call(
- 	bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
- 	const typelib_TypeDescription * pMemberTypeDescr,
- 	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-@@ -209,8 +209,6 @@
- 		CPPU_CURRENT_NAMESPACE::raiseException(
-             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-             // has to destruct the any
--		// is here for dummy
--		return typelib_TypeClass_VOID;
- 	}
- 	else // else no exception occured...
- 	{
-@@ -247,22 +245,16 @@
- 		}
- 		if (pReturnTypeDescr)
- 		{
--			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
- 			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
--			return eRet;
- 		}
--		else
--			return typelib_TypeClass_VOID;
- 	}
- }
- 
- 
- //==================================================================================================
--static typelib_TypeClass cpp_mediate(
--	sal_Int32 nFunctionIndex,
--    sal_Int32 nVtableOffset,
--	void ** pCallStack,
--	sal_Int64 * pRegisterReturn /* space for register return */ )
-+extern "C" void cpp_vtable_call(
-+    int nFunctionIndex, int nVtableOffset, void** pCallStack,
-+    sal_Int64 nRegReturn )
- {
- 	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
- 	
-@@ -298,7 +290,6 @@
- 
- 	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-     
--	typelib_TypeClass eRet;
- 	switch (aMemberDescr.get()->eTypeClass)
- 	{
- 	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-@@ -306,11 +297,11 @@
- 		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
- 		{
- 			// is GET method
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
- 				0, 0, // no params
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		else
- 		{
-@@ -321,11 +312,11 @@
- 			aParam.bIn		= sal_True;
- 			aParam.bOut		= sal_False;
- 			
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				0, // indicates void return
- 				1, &aParam,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -336,11 +327,9 @@
- 		{
- 		case 1: // acquire()
- 			pCppI->acquireProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 2: // release()
- 			pCppI->releaseProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 0: // queryInterface() opt
- 		{
-@@ -361,20 +350,19 @@
-                         &pInterface, pTD, cpp_acquire );
-                     pInterface->release();
-                     TYPELIB_DANGER_RELEASE( pTD );
--                    *(void **)pRegisterReturn = pCallStack[1];
--                    eRet = typelib_TypeClass_ANY;
-+                    *(void **)&nRegReturn = pCallStack[1];
-                     break;
-                 }
-                 TYPELIB_DANGER_RELEASE( pTD );
-             }
- 		} // else perform queryInterface()
- 		default:
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -383,72 +371,55 @@
- 		throw RuntimeException(
-             rtl::OUString::createFromAscii("no member description found!"),
-             (XInterface *)pThis );
--		// is here for dummy
--		eRet = typelib_TypeClass_VOID;
- 	}
- 	}
--
--	return eRet;
- }
- 
- //==================================================================================================
--/**
-- * is called on incoming vtable calls
-- * (called by asm snippets)
-- */
--static void cpp_vtable_call(
--    int nFunctionIndex, int nVtableOffset, void** pCallStack )
--    __attribute__((regparm(3)));
--
--void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
--{
--	volatile long nRegReturn[2];
--	typelib_TypeClass aType = cpp_mediate(
--        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
--    
--	switch( aType )
--	{
--		case typelib_TypeClass_HYPER:
--		case typelib_TypeClass_UNSIGNED_HYPER:
--			__asm__( "movl %1, %%edx\n\t"
--					 "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
--			break;
--		case typelib_TypeClass_FLOAT:
--			__asm__( "flds %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "flds %0\n"
--					 : : "m"(*(float *)nRegReturn) );
--			break;
--		case typelib_TypeClass_DOUBLE:
--			__asm__( "fldl %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "fldl %0\n"
--					 : : "m"(*(double *)nRegReturn) );
--			break;
--// 		case typelib_TypeClass_UNSIGNED_SHORT:
--// 		case typelib_TypeClass_SHORT:
--// 			__asm__( "movswl %0, %%eax\n"
--// 					 : : "m"(nRegReturn) );
--// 		break;
--		default:
--			__asm__( "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]) );
--			break;
--	}
--}
--
-+extern "C" void privateSnippetExecutorGeneral();
-+extern "C" void privateSnippetExecutorVoid();
-+extern "C" void privateSnippetExecutorHyper();
-+extern "C" void privateSnippetExecutorFloat();
-+extern "C" void privateSnippetExecutorDouble();
-+extern "C" void privateSnippetExecutorClass();
-+extern "C" typedef void (*PrivateSnippetExecutor)();
- 
--//==================================================================================================
--int const codeSnippetSize = 20;
-+int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
-     unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
--    bool simpleRetType)
-+    typelib_TypeClass returnTypeClass)
- {
--    if (!simpleRetType) {
-+    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-         functionIndex |= 0x80000000;
-     }
-+    PrivateSnippetExecutor exec;
-+    switch (returnTypeClass) {
-+    case typelib_TypeClass_VOID:
-+        exec = privateSnippetExecutorVoid;
-+        break;
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        exec = privateSnippetExecutorHyper;
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+        exec = privateSnippetExecutorFloat;
-+        break;
-+    case typelib_TypeClass_DOUBLE:
-+        exec = privateSnippetExecutorDouble;
-+        break;
-+    case typelib_TypeClass_STRING:
-+    case typelib_TypeClass_TYPE:
-+    case typelib_TypeClass_ANY:
-+    case typelib_TypeClass_SEQUENCE:
-+    case typelib_TypeClass_STRUCT:
-+    case typelib_TypeClass_INTERFACE:
-+        exec = privateSnippetExecutorClass;
-+        break;
-+    default:
-+        exec = privateSnippetExecutorGeneral;
-+        break;
-+    }
-     unsigned char * p = code;
-     OSL_ASSERT(sizeof (sal_Int32) == 4);
-     // mov function_index, %eax:
-@@ -459,13 +430,10 @@
-     *p++ = 0xBA;
-     *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-     p += sizeof (sal_Int32);
--    // mov %esp, %ecx:
--    *p++ = 0x89;
--    *p++ = 0xE1;
--    // jmp cpp_vtable_call:
-+    // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -504,17 +472,17 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceAttributeTypeDescription * >(
--                        member)->pAttributeTypeRef));
-+                reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-+                    member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-             if (!reinterpret_cast<
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
-                 *slots++ = code;
--                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-+                code = codeSnippet(
-+                    code, functionOffset++, vtableOffset,
-+                    typelib_TypeClass_VOID);
-             }
-             break;
- 
-@@ -522,10 +490,8 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceMethodTypeDescription * >(
--                        member)->pReturnTypeRef));
-+                reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-+                    member)->pReturnTypeRef->eTypeClass);
-             break;
- 
-         default:
diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
deleted file mode 100644
index 942e6fccc4c7..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk	Fri May 20 11:14:36 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Fri May 20 11:16:09 2005
-@@ -87,7 +87,8 @@
- SLOFILES= \
- 	$(SLO)$/except.obj		\
- 	$(SLO)$/cpp2uno.obj		\
--	$(SLO)$/uno2cpp.obj
-+    $(SLO)$/uno2cpp.obj \
-+    $(SLO)$/call.obj
- 
- SHL1TARGET= $(TARGET)
- 
-@@ -108,3 +109,6 @@
- 
- .INCLUDE :  target.mk
- 
-+$(SLO)$/%.obj: %.s
-+    $(CC) -c -o $(SLO)$/$(@:b).o $<
-+    touch $@
diff --git a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in
deleted file mode 100644
index 3c65cce44a9c..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49678#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : == -> =
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.116
-diff -u -r1.116 configure.in
---- config_office/configure.in	11 Apr 2005 09:31:15 -0000	1.116
-+++ config_office/configure.in	13 May 2005 07:13:41 -0000
-@@ -1787,7 +1787,7 @@
- dnl Checks for javac
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
--    if test "$JDK" == "gcj"; then 
-+    if test "$JDK" = "gcj"; then 
-         javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-     else
-         javacompiler="javac"
-@@ -1871,7 +1871,7 @@
-     fi
- fi
- 
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-    AC_CHECK_HEADER(jni.h, [],
-@@ -1888,7 +1888,7 @@
- dnl ===================================================================
- dnl Check for optional gcj-dbtool
- dnl ===================================================================
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-     javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
-     if test -z "$with_jdk_home"; then
-         AC_PATH_PROG(JAVACACHE, $javacache)
-@@ -2684,7 +2684,7 @@
-    if test -z "$MOZILLA_VERSION"; then
-       MOZILLA_VERSION=1.7.5
-    fi
--   if test "$MOZILLA_VERSION" == "1.7b" ; then
-+   if test "$MOZILLA_VERSION" = "1.7b" ; then
-       MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source.tar.gz"
-    else
-       MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}.tar.gz"
diff --git a/editors/openoffice.org-2.0-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
deleted file mode 100644
index 3c87525ff42a..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49679#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : We don't have -ldl and -lnsl
-
-Index: crashrep/source/unx/makefile.mk
-===================================================================
-RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
-retrieving revision 1.14
-diff -u -r1.14 makefile.mk
---- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
-+++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
-@@ -82,7 +82,10 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
--APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS+=-ldl -lnsl
-+.ENDIF
- .IF "$(OS)" == "SOLARIS"
- APP1STDLIBS+=-lsocket
- .ENDIF
diff --git a/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
deleted file mode 100644
index 81b293cdf9f3..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49682#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct version number of resultant shared lib
-
-Index: xmlsec1-1.2.6.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
-retrieving revision 1.5
-diff -u -r1.5 xmlsec1-1.2.6.patch
---- libxmlsec/xmlsec1-1.2.6.patch	18 May 2005 10:11:24 -0000	1.5
-+++ libxmlsec/xmlsec1-1.2.6.patch	22 May 2005 01:43:49 -0000
-@@ -756,6 +756,35 @@
- *** misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
- --- misc/build/xmlsec1-1.2.6/ltmain.sh	2005-05-09 19:55:51.745319024 +0200
- ***************
-+*** 2994,3006 ****
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=".$current"
-+! 	  versuffix=".$current.$revision";
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2994,3006 ----
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+***************
- *** 3564,3570 ****
-   		fi
-   	      else
diff --git a/editors/openoffice.org-2.0-devel/files/patch-odk+configure.pl b/editors/openoffice.org-2.0-devel/files/patch-odk+configure.pl
deleted file mode 100644
index a608473de01c..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : canonical name by config.guess for FreeBSD is
-% ./config.guess
-i386-unknown-freebsd5.3
-so, $main::operatingSystem is
-% ./config.guess | cut -d"-" -f3,4
-freebsd5.3
-then, if ( $main::operatingSystem eq "FreeBSD" ) is not correct,
-and if ( $main::operatingSystem =~ /freebsd/ ) is correct
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.11
-diff -u -r1.11 configure.pl
---- odk/configure.pl	29 Mar 2005 12:03:00 -0000	1.11
-+++ odk/configure.pl	15 May 2005 08:46:20 -0000
-@@ -45,7 +45,7 @@
- 
- $main::OO_SDK_MAKE_HOME = "";
- $main::makeName = "make";
--if ( $main::operatingSystem eq "FreeBSD" )
-+if ( $main::operatingSystem =~ /freebsd/ )
- {
-     $main::makeName = "gmake";
- }
diff --git a/editors/openoffice.org-2.0-devel/files/patch-odk+setsdkenv_unix b/editors/openoffice.org-2.0-devel/files/patch-odk+setsdkenv_unix
deleted file mode 100644
index 1165826077b0..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-odk+setsdkenv_unix
+++ /dev/null
@@ -1,39 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-
-Index: odk/setsdkenv_unix.sh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.sh.in
---- odk/setsdkenv_unix.sh.in	29 Mar 2005 12:03:27 -0000	1.5
-+++ odk/setsdkenv_unix.sh.in	15 May 2005 09:06:22 -0000
-@@ -130,7 +130,7 @@
-     export LD_LIBRARY_PATH
-     ;;
- 
--  freebsd)
-+  freebsd*)
-     if [ -n "$OO_SDK_CPP_HOME" ]
-     then
- 	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-Index: odk/setsdkenv_unix.csh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.csh.in
---- odk/setsdkenv_unix.csh.in	29 Mar 2005 12:03:14 -0000	1.5
-+++ odk/setsdkenv_unix.csh.in	15 May 2005 09:06:38 -0000
-@@ -114,7 +114,7 @@
-     endif
-   breaksw
- 
--  case "freebsd":
-+  case "freebsd*":
-     if ( $?OO_SDK_CPP_HOME == 0) then
- 	set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- 	setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
diff --git a/editors/openoffice.org-2.0-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2.0-devel/files/patch-odk+settings+settings.mk
deleted file mode 100644
index 079bd128062c..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-and adding missing things.
-
-Index: odk/settings/settings.mk
-===================================================================
-RCS file: /cvs/api/odk/settings/settings.mk,v
-retrieving revision 1.14
-diff -u -r1.14 settings.mk
---- odk/settings/settings.mk	29 Mar 2005 12:19:26 -0000	1.14
-+++ odk/settings/settings.mk	15 May 2005 13:54:38 -0000
-@@ -397,7 +397,7 @@
- # FreeBSD specific settings
- #
- ###########################################################################
--ifeq "$(PLATFORM)" "freebsd"
-+ifneq (,$(findstring freebsd,$(PLATFORM)))
- # Settings for FreeBSD using gcc compiler
- 
- PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-@@ -435,6 +435,7 @@
- CSEP=\>
- QUOTE=$(subst S,\,S)
- QM=\"
-+SQM='
- ECHOLINE=@echo
- P2BG=&
- 
-@@ -446,10 +447,10 @@
- # Include UDK version numbers
- include $(PRJ)/include/udkversion.mk
- 
--SALLIB=-lsal
--CPPULIB=-lcppu
--CPPUHELPERLIB=-lcppuhelper$(COMID)
--SALHELPERLIB=-lsalhelper$(COMID)
-+SALLIB=-luno_sal
-+CPPULIB=-luno_cppu
-+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-+SALHELPERLIB=-luno_salhelper$(COMID)
- REGLIB=-lreg
- STORELIB=-lstore
- STLPORTLIB=-lstlport_gcc
diff --git a/editors/openoffice.org-2.0-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-2.0-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 09f2f949c81d..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-Issutracker : #i49677#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : contains illigal char
-
-Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
-===================================================================
-RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
-retrieving revision 1.2
-diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
---- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
-+++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
-@@ -109,7 +109,7 @@
- 		linearly between center and endColor via concentric ellipses
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		circular. If it's not 1, the gradient is elliptical, with the
- 		special twist that the aspect ratio is maintained also for the
- 		center color: the gradient will not collapse into a single
-@@ -124,7 +124,7 @@
- 		linearly between center and endColor via rectangular boxes
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		quadratic. If it's not 1, the gradient is rectangular, with
- 		the special twist that the aspect ratio is maintained also for
- 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2.0-devel/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-2.0-devel/files/patch-portaudio+portaudio_v18_1.patch
deleted file mode 100644
index 87c43fb14d7c..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-portaudio+portaudio_v18_1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Issutracker : #i46879#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Need to include <sys/soundcard.h> to use sound and passes
-              correct pthread related flags
-
-Index: portaudio/portaudio_v18_1.patch
-===================================================================
-RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
-retrieving revision 1.1
-diff -u -r1.1 portaudio_v18_1.patch
---- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
-+++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
-@@ -12,7 +12,7 @@
-   	;;
-   
-     mingw* )
----- 1883,1902 ----
-+--- 1883,1921 ----
-   case "${host_os}" in
-     darwin* )
-   
-@@ -30,6 +30,25 @@
- ! 	PADLL="libportaudio.so";
- ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
- ! 	CFLAGS="-O2 -fPIC"
-+! 	;;
-+! 
-+!   freebsd* )
-+! 	if test "$OSVERSION" -lt "500016"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-pthread"
-+!         elif test "$OSVERSION" -lt "502102"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-lc_r"
-+!         else
-+!              PTHREAD_CFLAGS=""
-+!              PTHREAD_LIBS="-pthread"
-+!         fi
-+! 
-+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+! 	LIBS="-lm ${PTHREAD_LIBS}";
-+! 	PADLL="libportaudio.so";
-+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-+! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
-   	;;
-   
-     mingw* )
-@@ -52,3 +71,18 @@
-   LIBINST = /usr/local/lib
-   
-   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-+
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
-+***************
-+*** 43,48 ****
-+--- 43,50 ----
-+  
-+  #ifdef __linux__
-+  #include <linux/soundcard.h>
-++ #elif defined (__FreeBSD__)
-++ #include <sys/soundcard.h>
-+  #else
-+  #include <machine/soundcard.h> /* JH20010905 */
-+  #endif
-+
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch
deleted file mode 100644
index 71a8f2292f2a..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Issutracker : #i49684#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct shared lib number
-
-Index: libsndfile-1.0.9.patch
-===================================================================
-RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
-retrieving revision 1.1
-diff -u -r1.1 libsndfile-1.0.9.patch
---- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
-+++ sndfile/libsndfile-1.0.9.patch	22 May 2005 02:01:17 -0000
-@@ -231,3 +231,24 @@
-   
-   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-   
-+*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
-+--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
-+***************
-+*** 2980,2987 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2980,2987 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sndfile+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-sndfile+makefile.mk
deleted file mode 100644
index 234100480f33..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-sndfile+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i49683#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : -noinhibit-exec allows linking against non-existent libs
-
-Index: sndfile/makefile.mk
-===================================================================
-RCS file: /cvs/external/sndfile/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
-+++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
-@@ -81,7 +81,7 @@
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure --with-pic
--.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
-+.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
- .ENDIF
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 94e3cc8d21bc..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-Issutracker : #i49685#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Update to recent version of unxlngi6.mk
-($Revision: 1.12 and $Author: obo $ $Date: 2005/05/06 09:37:55 $)
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.13
-diff -u -r1.13 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	11 Feb 2005 15:27:55 -0000	1.13
-+++ solenv/inc/unxfbsdi.mk	15 May 2005 04:51:41 -0000
-@@ -99,9 +99,6 @@
- CC+:=$(CFLAGS_SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
- CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
--.IF "$(PRODUCT)"!=""
--CFLAGS+=-Wuninitialized
--.ENDIF
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_SYMBOLS)"=="SMALL"
-@@ -122,6 +119,9 @@
- CFLAGSCXX= -pipe -mtune=pentiumpro
- CFLAGSCXX+= -Wno-ctor-dtor-privacy
- 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=
-@@ -143,6 +143,7 @@
- # Compiler flags for enabling optimazations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized				# not supported without optimization
- .ELSE 	# "$(PRODUCT)"!=""
- CFLAGSOPT=   							# no optimizing for non products
- .ENDIF	# "$(PRODUCT)"!=""
-@@ -161,11 +162,12 @@
- 
- # name of linker
- LINK*=$(CXX)
-+LINKC*=$(CC)
- 
- # default linker flags
- LINKFLAGSDEFS*=#-Wl,-z,defs
- LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-@@ -237,3 +239,4 @@
- DLLPOSTFIX=fi
- DLLPRE=lib
- DLLPOST=.so
-+
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 80d5a832f6a2..94a4282f01d2 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -48,7 +48,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		105
+MILESTONE=		107
 SNAPDATE=		20050521
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
@@ -93,8 +93,8 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
+
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index c308f56de99d..cc4f3b56c811 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810
-SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617
+MD5 (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 9c20222b097d70029dae19f834a83bf1
+SIZE (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 212641982
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
deleted file mode 100644
index 5e5d4b85c49e..000000000000
--- a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
+++ /dev/null
@@ -1,270 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s	Thu Jan  1 09:00:00 1970
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s	Fri May 20 11:21:13 2005
-@@ -0,0 +1,262 @@
-+    .text
-+
-+.globl privateSnippetExecutorGeneral
-+    .type   privateSnippetExecutorGeneral,@function
-+privateSnippetExecutorGeneral:
-+.LFBg:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIg0:
-+    movl    %esp,%ebp
-+.LCFIg1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEg:
-+    .size   privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral
-+
-+.globl privateSnippetExecutorVoid
-+    .type   privateSnippetExecutorVoid,@function
-+privateSnippetExecutorVoid:
-+.LFBv:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIv0:
-+    movl    %esp,%ebp
-+.LCFIv1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    leave
-+    ret
-+.LFEv:
-+    .size   privateSnippetExecutorVoid,.-privateSnippetExecutorVoid
-+
-+.globl privateSnippetExecutorHyper
-+    .type   privateSnippetExecutorHyper,@function
-+privateSnippetExecutorHyper:
-+.LFBh:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIh0:
-+    movl    %esp,%ebp
-+.LCFIh1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    movl    16(%esp),%edx     # 64 bit nRegReturn, upper half
-+    leave
-+    ret
-+.LFEh:
-+    .size   privateSnippetExecutorHyper,.-privateSnippetExecutorHyper
-+
-+.globl privateSnippetExecutorFloat
-+    .type   privateSnippetExecutorFloat,@function
-+privateSnippetExecutorFloat:
-+.LFBf:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIf0:
-+    movl    %esp,%ebp
-+.LCFIf1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    flds    12(%esp)          # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEf:
-+    .size   privateSnippetExecutorFloat,.-privateSnippetExecutorFloat
-+
-+.globl privateSnippetExecutorDouble
-+    .type   privateSnippetExecutorDouble,@function
-+privateSnippetExecutorDouble:
-+.LFBd:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFId0:
-+    movl    %esp,%ebp
-+.LCFId1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    fldl    12(%esp)          # 64 bit nRegReturn
-+    leave
-+    ret
-+.LFEd:
-+    .size   privateSnippetExecutorDouble,.-privateSnippetExecutorDouble
-+
-+.globl privateSnippetExecutorClass
-+    .type   privateSnippetExecutorClass,@function
-+privateSnippetExecutorClass:
-+.LFBc:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIc0:
-+    movl    %esp,%ebp
-+.LCFIc1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret     $4
-+.LFEc:
-+    .size   privateSnippetExecutorClass,.-privateSnippetExecutorClass
-+
-+    .section .eh_frame,"a",@progbits
-+.Lframe1:
-+    .long   .LECIE1-.LSCIE1   # length
-+.LSCIE1:
-+    .long   0                 # CIE_ID
-+    .byte   1                 # version
-+    .string "zR"              # augmentation
-+    .uleb128 1                # code_alignment_factor
-+    .sleb128 -4               # data_alignment_factor
-+    .byte   8                 # return_address_register
-+    .uleb128 1                # augmentation size 1:
-+    .byte   0x1B              #  FDE Encoding (pcrel sdata4)
-+                              # initial_instructions:
-+    .byte   0x0C              #  DW_CFA_def_cfa %esp, 4
-+    .uleb128 4
-+    .uleb128 4
-+    .byte   0x88              #  DW_CFA_offset ret, 1
-+    .uleb128 1
-+    .align 4
-+.LECIE1:
-+.LSFDEg:
-+    .long   .LEFDEg-.LASFDEg  # length
-+.LASFDEg:
-+    .long   .LASFDEg-.Lframe1 # CIE_pointer
-+    .long   .LFBg-.           # initial_location
-+    .long   .LFEg-.LFBg       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg0-.LFBg
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg1-.LCFIg0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEg:
-+.LSFDEv:
-+    .long   .LEFDEv-.LASFDEv  # length
-+.LASFDEv:
-+    .long   .LASFDEv-.Lframe1 # CIE_pointer
-+    .long   .LFBv-.           # initial_location
-+    .long   .LFEv-.LFBv       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv0-.LFBv
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv1-.LCFIv0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEv:
-+.LSFDEh:
-+    .long   .LEFDEh-.LASFDEh  # length
-+.LASFDEh:
-+    .long   .LASFDEh-.Lframe1 # CIE_pointer
-+    .long   .LFBh-.           # initial_location
-+    .long   .LFEh-.LFBh       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh0-.LFBh
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh1-.LCFIh0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEh:
-+.LSFDEf:
-+    .long   .LEFDEf-.LASFDEf  # length
-+.LASFDEf:
-+    .long   .LASFDEf-.Lframe1 # CIE_pointer
-+    .long   .LFBf-.           # initial_location
-+    .long   .LFEf-.LFBf       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf0-.LFBf
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf1-.LCFIf0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEf:
-+.LSFDEd:
-+    .long   .LEFDEd-.LASFDEd  # length
-+.LASFDEd:
-+    .long   .LASFDEd-.Lframe1 # CIE_pointer
-+    .long   .LFBd-.           # initial_location
-+    .long   .LFEd-.LFBd       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId0-.LFBd
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId1-.LCFId0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEd:
-+.LSFDEc:
-+    .long   .LEFDEc-.LASFDEc  # length
-+.LASFDEc:
-+    .long   .LASFDEc-.Lframe1 # CIE_pointer
-+    .long   .LFBc-.           # initial_location
-+    .long   .LFEc-.LFBc       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc0-.LFBc
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc1-.LCFIc0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEc:
diff --git a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
deleted file mode 100644
index a291493b6b29..000000000000
--- a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Wed Jan 19 00:06:09 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Feb 21 21:13:28 2005
-@@ -77,7 +77,7 @@
- {
- 
- //==================================================================================================
--static typelib_TypeClass cpp2uno_call(
-+void cpp2uno_call(
- 	bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
- 	const typelib_TypeDescription * pMemberTypeDescr,
- 	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-@@ -209,8 +209,6 @@
- 		CPPU_CURRENT_NAMESPACE::raiseException(
-             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-             // has to destruct the any
--		// is here for dummy
--		return typelib_TypeClass_VOID;
- 	}
- 	else // else no exception occured...
- 	{
-@@ -247,22 +245,16 @@
- 		}
- 		if (pReturnTypeDescr)
- 		{
--			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
- 			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
--			return eRet;
- 		}
--		else
--			return typelib_TypeClass_VOID;
- 	}
- }
- 
- 
- //==================================================================================================
--static typelib_TypeClass cpp_mediate(
--	sal_Int32 nFunctionIndex,
--    sal_Int32 nVtableOffset,
--	void ** pCallStack,
--	sal_Int64 * pRegisterReturn /* space for register return */ )
-+extern "C" void cpp_vtable_call(
-+    int nFunctionIndex, int nVtableOffset, void** pCallStack,
-+    sal_Int64 nRegReturn )
- {
- 	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
- 	
-@@ -298,7 +290,6 @@
- 
- 	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-     
--	typelib_TypeClass eRet;
- 	switch (aMemberDescr.get()->eTypeClass)
- 	{
- 	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-@@ -306,11 +297,11 @@
- 		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
- 		{
- 			// is GET method
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
- 				0, 0, // no params
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		else
- 		{
-@@ -321,11 +312,11 @@
- 			aParam.bIn		= sal_True;
- 			aParam.bOut		= sal_False;
- 			
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				0, // indicates void return
- 				1, &aParam,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -336,11 +327,9 @@
- 		{
- 		case 1: // acquire()
- 			pCppI->acquireProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 2: // release()
- 			pCppI->releaseProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 0: // queryInterface() opt
- 		{
-@@ -361,20 +350,19 @@
-                         &pInterface, pTD, cpp_acquire );
-                     pInterface->release();
-                     TYPELIB_DANGER_RELEASE( pTD );
--                    *(void **)pRegisterReturn = pCallStack[1];
--                    eRet = typelib_TypeClass_ANY;
-+                    *(void **)&nRegReturn = pCallStack[1];
-                     break;
-                 }
-                 TYPELIB_DANGER_RELEASE( pTD );
-             }
- 		} // else perform queryInterface()
- 		default:
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -383,72 +371,55 @@
- 		throw RuntimeException(
-             rtl::OUString::createFromAscii("no member description found!"),
-             (XInterface *)pThis );
--		// is here for dummy
--		eRet = typelib_TypeClass_VOID;
- 	}
- 	}
--
--	return eRet;
- }
- 
- //==================================================================================================
--/**
-- * is called on incoming vtable calls
-- * (called by asm snippets)
-- */
--static void cpp_vtable_call(
--    int nFunctionIndex, int nVtableOffset, void** pCallStack )
--    __attribute__((regparm(3)));
--
--void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
--{
--	volatile long nRegReturn[2];
--	typelib_TypeClass aType = cpp_mediate(
--        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
--    
--	switch( aType )
--	{
--		case typelib_TypeClass_HYPER:
--		case typelib_TypeClass_UNSIGNED_HYPER:
--			__asm__( "movl %1, %%edx\n\t"
--					 "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
--			break;
--		case typelib_TypeClass_FLOAT:
--			__asm__( "flds %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "flds %0\n"
--					 : : "m"(*(float *)nRegReturn) );
--			break;
--		case typelib_TypeClass_DOUBLE:
--			__asm__( "fldl %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "fldl %0\n"
--					 : : "m"(*(double *)nRegReturn) );
--			break;
--// 		case typelib_TypeClass_UNSIGNED_SHORT:
--// 		case typelib_TypeClass_SHORT:
--// 			__asm__( "movswl %0, %%eax\n"
--// 					 : : "m"(nRegReturn) );
--// 		break;
--		default:
--			__asm__( "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]) );
--			break;
--	}
--}
--
-+extern "C" void privateSnippetExecutorGeneral();
-+extern "C" void privateSnippetExecutorVoid();
-+extern "C" void privateSnippetExecutorHyper();
-+extern "C" void privateSnippetExecutorFloat();
-+extern "C" void privateSnippetExecutorDouble();
-+extern "C" void privateSnippetExecutorClass();
-+extern "C" typedef void (*PrivateSnippetExecutor)();
- 
--//==================================================================================================
--int const codeSnippetSize = 20;
-+int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
-     unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
--    bool simpleRetType)
-+    typelib_TypeClass returnTypeClass)
- {
--    if (!simpleRetType) {
-+    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-         functionIndex |= 0x80000000;
-     }
-+    PrivateSnippetExecutor exec;
-+    switch (returnTypeClass) {
-+    case typelib_TypeClass_VOID:
-+        exec = privateSnippetExecutorVoid;
-+        break;
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        exec = privateSnippetExecutorHyper;
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+        exec = privateSnippetExecutorFloat;
-+        break;
-+    case typelib_TypeClass_DOUBLE:
-+        exec = privateSnippetExecutorDouble;
-+        break;
-+    case typelib_TypeClass_STRING:
-+    case typelib_TypeClass_TYPE:
-+    case typelib_TypeClass_ANY:
-+    case typelib_TypeClass_SEQUENCE:
-+    case typelib_TypeClass_STRUCT:
-+    case typelib_TypeClass_INTERFACE:
-+        exec = privateSnippetExecutorClass;
-+        break;
-+    default:
-+        exec = privateSnippetExecutorGeneral;
-+        break;
-+    }
-     unsigned char * p = code;
-     OSL_ASSERT(sizeof (sal_Int32) == 4);
-     // mov function_index, %eax:
-@@ -459,13 +430,10 @@
-     *p++ = 0xBA;
-     *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-     p += sizeof (sal_Int32);
--    // mov %esp, %ecx:
--    *p++ = 0x89;
--    *p++ = 0xE1;
--    // jmp cpp_vtable_call:
-+    // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -504,17 +472,17 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceAttributeTypeDescription * >(
--                        member)->pAttributeTypeRef));
-+                reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-+                    member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-             if (!reinterpret_cast<
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
-                 *slots++ = code;
--                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-+                code = codeSnippet(
-+                    code, functionOffset++, vtableOffset,
-+                    typelib_TypeClass_VOID);
-             }
-             break;
- 
-@@ -522,10 +490,8 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceMethodTypeDescription * >(
--                        member)->pReturnTypeRef));
-+                reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-+                    member)->pReturnTypeRef->eTypeClass);
-             break;
- 
-         default:
diff --git a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
deleted file mode 100644
index 942e6fccc4c7..000000000000
--- a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk	Fri May 20 11:14:36 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Fri May 20 11:16:09 2005
-@@ -87,7 +87,8 @@
- SLOFILES= \
- 	$(SLO)$/except.obj		\
- 	$(SLO)$/cpp2uno.obj		\
--	$(SLO)$/uno2cpp.obj
-+    $(SLO)$/uno2cpp.obj \
-+    $(SLO)$/call.obj
- 
- SHL1TARGET= $(TARGET)
- 
-@@ -108,3 +109,6 @@
- 
- .INCLUDE :  target.mk
- 
-+$(SLO)$/%.obj: %.s
-+    $(CC) -c -o $(SLO)$/$(@:b).o $<
-+    touch $@
diff --git a/editors/openoffice.org-2.0/files/patch-config_office+configure.in b/editors/openoffice.org-2.0/files/patch-config_office+configure.in
deleted file mode 100644
index 3c65cce44a9c..000000000000
--- a/editors/openoffice.org-2.0/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49678#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : == -> =
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.116
-diff -u -r1.116 configure.in
---- config_office/configure.in	11 Apr 2005 09:31:15 -0000	1.116
-+++ config_office/configure.in	13 May 2005 07:13:41 -0000
-@@ -1787,7 +1787,7 @@
- dnl Checks for javac
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
--    if test "$JDK" == "gcj"; then 
-+    if test "$JDK" = "gcj"; then 
-         javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-     else
-         javacompiler="javac"
-@@ -1871,7 +1871,7 @@
-     fi
- fi
- 
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-    AC_CHECK_HEADER(jni.h, [],
-@@ -1888,7 +1888,7 @@
- dnl ===================================================================
- dnl Check for optional gcj-dbtool
- dnl ===================================================================
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-     javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
-     if test -z "$with_jdk_home"; then
-         AC_PATH_PROG(JAVACACHE, $javacache)
-@@ -2684,7 +2684,7 @@
-    if test -z "$MOZILLA_VERSION"; then
-       MOZILLA_VERSION=1.7.5
-    fi
--   if test "$MOZILLA_VERSION" == "1.7b" ; then
-+   if test "$MOZILLA_VERSION" = "1.7b" ; then
-       MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source.tar.gz"
-    else
-       MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}.tar.gz"
diff --git a/editors/openoffice.org-2.0/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2.0/files/patch-crashrep+source+unx+makefile.mk
deleted file mode 100644
index 3c87525ff42a..000000000000
--- a/editors/openoffice.org-2.0/files/patch-crashrep+source+unx+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49679#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : We don't have -ldl and -lnsl
-
-Index: crashrep/source/unx/makefile.mk
-===================================================================
-RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
-retrieving revision 1.14
-diff -u -r1.14 makefile.mk
---- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
-+++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
-@@ -82,7 +82,10 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
--APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS+=-ldl -lnsl
-+.ENDIF
- .IF "$(OS)" == "SOLARIS"
- APP1STDLIBS+=-lsocket
- .ENDIF
diff --git a/editors/openoffice.org-2.0/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2.0/files/patch-libxmlsec+xmlsec1-1.2.6.patch
deleted file mode 100644
index 81b293cdf9f3..000000000000
--- a/editors/openoffice.org-2.0/files/patch-libxmlsec+xmlsec1-1.2.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49682#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct version number of resultant shared lib
-
-Index: xmlsec1-1.2.6.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
-retrieving revision 1.5
-diff -u -r1.5 xmlsec1-1.2.6.patch
---- libxmlsec/xmlsec1-1.2.6.patch	18 May 2005 10:11:24 -0000	1.5
-+++ libxmlsec/xmlsec1-1.2.6.patch	22 May 2005 01:43:49 -0000
-@@ -756,6 +756,35 @@
- *** misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
- --- misc/build/xmlsec1-1.2.6/ltmain.sh	2005-05-09 19:55:51.745319024 +0200
- ***************
-+*** 2994,3006 ****
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=".$current"
-+! 	  versuffix=".$current.$revision";
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2994,3006 ----
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+***************
- *** 3564,3570 ****
-   		fi
-   	      else
diff --git a/editors/openoffice.org-2.0/files/patch-odk+configure.pl b/editors/openoffice.org-2.0/files/patch-odk+configure.pl
deleted file mode 100644
index a608473de01c..000000000000
--- a/editors/openoffice.org-2.0/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : canonical name by config.guess for FreeBSD is
-% ./config.guess
-i386-unknown-freebsd5.3
-so, $main::operatingSystem is
-% ./config.guess | cut -d"-" -f3,4
-freebsd5.3
-then, if ( $main::operatingSystem eq "FreeBSD" ) is not correct,
-and if ( $main::operatingSystem =~ /freebsd/ ) is correct
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.11
-diff -u -r1.11 configure.pl
---- odk/configure.pl	29 Mar 2005 12:03:00 -0000	1.11
-+++ odk/configure.pl	15 May 2005 08:46:20 -0000
-@@ -45,7 +45,7 @@
- 
- $main::OO_SDK_MAKE_HOME = "";
- $main::makeName = "make";
--if ( $main::operatingSystem eq "FreeBSD" )
-+if ( $main::operatingSystem =~ /freebsd/ )
- {
-     $main::makeName = "gmake";
- }
diff --git a/editors/openoffice.org-2.0/files/patch-odk+setsdkenv_unix b/editors/openoffice.org-2.0/files/patch-odk+setsdkenv_unix
deleted file mode 100644
index 1165826077b0..000000000000
--- a/editors/openoffice.org-2.0/files/patch-odk+setsdkenv_unix
+++ /dev/null
@@ -1,39 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-
-Index: odk/setsdkenv_unix.sh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.sh.in
---- odk/setsdkenv_unix.sh.in	29 Mar 2005 12:03:27 -0000	1.5
-+++ odk/setsdkenv_unix.sh.in	15 May 2005 09:06:22 -0000
-@@ -130,7 +130,7 @@
-     export LD_LIBRARY_PATH
-     ;;
- 
--  freebsd)
-+  freebsd*)
-     if [ -n "$OO_SDK_CPP_HOME" ]
-     then
- 	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-Index: odk/setsdkenv_unix.csh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.csh.in
---- odk/setsdkenv_unix.csh.in	29 Mar 2005 12:03:14 -0000	1.5
-+++ odk/setsdkenv_unix.csh.in	15 May 2005 09:06:38 -0000
-@@ -114,7 +114,7 @@
-     endif
-   breaksw
- 
--  case "freebsd":
-+  case "freebsd*":
-     if ( $?OO_SDK_CPP_HOME == 0) then
- 	set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- 	setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
diff --git a/editors/openoffice.org-2.0/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2.0/files/patch-odk+settings+settings.mk
deleted file mode 100644
index 079bd128062c..000000000000
--- a/editors/openoffice.org-2.0/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-and adding missing things.
-
-Index: odk/settings/settings.mk
-===================================================================
-RCS file: /cvs/api/odk/settings/settings.mk,v
-retrieving revision 1.14
-diff -u -r1.14 settings.mk
---- odk/settings/settings.mk	29 Mar 2005 12:19:26 -0000	1.14
-+++ odk/settings/settings.mk	15 May 2005 13:54:38 -0000
-@@ -397,7 +397,7 @@
- # FreeBSD specific settings
- #
- ###########################################################################
--ifeq "$(PLATFORM)" "freebsd"
-+ifneq (,$(findstring freebsd,$(PLATFORM)))
- # Settings for FreeBSD using gcc compiler
- 
- PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-@@ -435,6 +435,7 @@
- CSEP=\>
- QUOTE=$(subst S,\,S)
- QM=\"
-+SQM='
- ECHOLINE=@echo
- P2BG=&
- 
-@@ -446,10 +447,10 @@
- # Include UDK version numbers
- include $(PRJ)/include/udkversion.mk
- 
--SALLIB=-lsal
--CPPULIB=-lcppu
--CPPUHELPERLIB=-lcppuhelper$(COMID)
--SALHELPERLIB=-lsalhelper$(COMID)
-+SALLIB=-luno_sal
-+CPPULIB=-luno_cppu
-+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-+SALHELPERLIB=-luno_salhelper$(COMID)
- REGLIB=-lreg
- STORELIB=-lstore
- STLPORTLIB=-lstlport_gcc
diff --git a/editors/openoffice.org-2.0/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-2.0/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 09f2f949c81d..000000000000
--- a/editors/openoffice.org-2.0/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-Issutracker : #i49677#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : contains illigal char
-
-Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
-===================================================================
-RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
-retrieving revision 1.2
-diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
---- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
-+++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
-@@ -109,7 +109,7 @@
- 		linearly between center and endColor via concentric ellipses
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		circular. If it's not 1, the gradient is elliptical, with the
- 		special twist that the aspect ratio is maintained also for the
- 		center color: the gradient will not collapse into a single
-@@ -124,7 +124,7 @@
- 		linearly between center and endColor via rectangular boxes
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		quadratic. If it's not 1, the gradient is rectangular, with
- 		the special twist that the aspect ratio is maintained also for
- 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2.0/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-2.0/files/patch-portaudio+portaudio_v18_1.patch
deleted file mode 100644
index 87c43fb14d7c..000000000000
--- a/editors/openoffice.org-2.0/files/patch-portaudio+portaudio_v18_1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Issutracker : #i46879#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Need to include <sys/soundcard.h> to use sound and passes
-              correct pthread related flags
-
-Index: portaudio/portaudio_v18_1.patch
-===================================================================
-RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
-retrieving revision 1.1
-diff -u -r1.1 portaudio_v18_1.patch
---- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
-+++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
-@@ -12,7 +12,7 @@
-   	;;
-   
-     mingw* )
----- 1883,1902 ----
-+--- 1883,1921 ----
-   case "${host_os}" in
-     darwin* )
-   
-@@ -30,6 +30,25 @@
- ! 	PADLL="libportaudio.so";
- ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
- ! 	CFLAGS="-O2 -fPIC"
-+! 	;;
-+! 
-+!   freebsd* )
-+! 	if test "$OSVERSION" -lt "500016"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-pthread"
-+!         elif test "$OSVERSION" -lt "502102"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-lc_r"
-+!         else
-+!              PTHREAD_CFLAGS=""
-+!              PTHREAD_LIBS="-pthread"
-+!         fi
-+! 
-+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+! 	LIBS="-lm ${PTHREAD_LIBS}";
-+! 	PADLL="libportaudio.so";
-+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-+! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
-   	;;
-   
-     mingw* )
-@@ -52,3 +71,18 @@
-   LIBINST = /usr/local/lib
-   
-   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-+
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
-+***************
-+*** 43,48 ****
-+--- 43,50 ----
-+  
-+  #ifdef __linux__
-+  #include <linux/soundcard.h>
-++ #elif defined (__FreeBSD__)
-++ #include <sys/soundcard.h>
-+  #else
-+  #include <machine/soundcard.h> /* JH20010905 */
-+  #endif
-+
diff --git a/editors/openoffice.org-2.0/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2.0/files/patch-sndfile+libsndfile-1.0.9.patch
deleted file mode 100644
index 71a8f2292f2a..000000000000
--- a/editors/openoffice.org-2.0/files/patch-sndfile+libsndfile-1.0.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Issutracker : #i49684#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct shared lib number
-
-Index: libsndfile-1.0.9.patch
-===================================================================
-RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
-retrieving revision 1.1
-diff -u -r1.1 libsndfile-1.0.9.patch
---- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
-+++ sndfile/libsndfile-1.0.9.patch	22 May 2005 02:01:17 -0000
-@@ -231,3 +231,24 @@
-   
-   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-   
-+*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
-+--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
-+***************
-+*** 2980,2987 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2980,2987 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
diff --git a/editors/openoffice.org-2.0/files/patch-sndfile+makefile.mk b/editors/openoffice.org-2.0/files/patch-sndfile+makefile.mk
deleted file mode 100644
index 234100480f33..000000000000
--- a/editors/openoffice.org-2.0/files/patch-sndfile+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i49683#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : -noinhibit-exec allows linking against non-existent libs
-
-Index: sndfile/makefile.mk
-===================================================================
-RCS file: /cvs/external/sndfile/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
-+++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
-@@ -81,7 +81,7 @@
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure --with-pic
--.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
-+.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
- .ENDIF
- 
diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 94e3cc8d21bc..000000000000
--- a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-Issutracker : #i49685#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Update to recent version of unxlngi6.mk
-($Revision: 1.12 and $Author: obo $ $Date: 2005/05/06 09:37:55 $)
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.13
-diff -u -r1.13 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	11 Feb 2005 15:27:55 -0000	1.13
-+++ solenv/inc/unxfbsdi.mk	15 May 2005 04:51:41 -0000
-@@ -99,9 +99,6 @@
- CC+:=$(CFLAGS_SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
- CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
--.IF "$(PRODUCT)"!=""
--CFLAGS+=-Wuninitialized
--.ENDIF
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_SYMBOLS)"=="SMALL"
-@@ -122,6 +119,9 @@
- CFLAGSCXX= -pipe -mtune=pentiumpro
- CFLAGSCXX+= -Wno-ctor-dtor-privacy
- 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=
-@@ -143,6 +143,7 @@
- # Compiler flags for enabling optimazations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized				# not supported without optimization
- .ELSE 	# "$(PRODUCT)"!=""
- CFLAGSOPT=   							# no optimizing for non products
- .ENDIF	# "$(PRODUCT)"!=""
-@@ -161,11 +162,12 @@
- 
- # name of linker
- LINK*=$(CXX)
-+LINKC*=$(CC)
- 
- # default linker flags
- LINKFLAGSDEFS*=#-Wl,-z,defs
- LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-@@ -237,3 +239,4 @@
- DLLPOSTFIX=fi
- DLLPRE=lib
- DLLPOST=.so
-+
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 80d5a832f6a2..94a4282f01d2 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -48,7 +48,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		105
+MILESTONE=		107
 SNAPDATE=		20050521
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
@@ -93,8 +93,8 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
+
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index c308f56de99d..cc4f3b56c811 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810
-SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617
+MD5 (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 9c20222b097d70029dae19f834a83bf1
+SIZE (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 212641982
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
deleted file mode 100644
index 5e5d4b85c49e..000000000000
--- a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
+++ /dev/null
@@ -1,270 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s	Thu Jan  1 09:00:00 1970
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s	Fri May 20 11:21:13 2005
-@@ -0,0 +1,262 @@
-+    .text
-+
-+.globl privateSnippetExecutorGeneral
-+    .type   privateSnippetExecutorGeneral,@function
-+privateSnippetExecutorGeneral:
-+.LFBg:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIg0:
-+    movl    %esp,%ebp
-+.LCFIg1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEg:
-+    .size   privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral
-+
-+.globl privateSnippetExecutorVoid
-+    .type   privateSnippetExecutorVoid,@function
-+privateSnippetExecutorVoid:
-+.LFBv:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIv0:
-+    movl    %esp,%ebp
-+.LCFIv1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    leave
-+    ret
-+.LFEv:
-+    .size   privateSnippetExecutorVoid,.-privateSnippetExecutorVoid
-+
-+.globl privateSnippetExecutorHyper
-+    .type   privateSnippetExecutorHyper,@function
-+privateSnippetExecutorHyper:
-+.LFBh:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIh0:
-+    movl    %esp,%ebp
-+.LCFIh1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    movl    16(%esp),%edx     # 64 bit nRegReturn, upper half
-+    leave
-+    ret
-+.LFEh:
-+    .size   privateSnippetExecutorHyper,.-privateSnippetExecutorHyper
-+
-+.globl privateSnippetExecutorFloat
-+    .type   privateSnippetExecutorFloat,@function
-+privateSnippetExecutorFloat:
-+.LFBf:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIf0:
-+    movl    %esp,%ebp
-+.LCFIf1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    flds    12(%esp)          # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEf:
-+    .size   privateSnippetExecutorFloat,.-privateSnippetExecutorFloat
-+
-+.globl privateSnippetExecutorDouble
-+    .type   privateSnippetExecutorDouble,@function
-+privateSnippetExecutorDouble:
-+.LFBd:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFId0:
-+    movl    %esp,%ebp
-+.LCFId1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    fldl    12(%esp)          # 64 bit nRegReturn
-+    leave
-+    ret
-+.LFEd:
-+    .size   privateSnippetExecutorDouble,.-privateSnippetExecutorDouble
-+
-+.globl privateSnippetExecutorClass
-+    .type   privateSnippetExecutorClass,@function
-+privateSnippetExecutorClass:
-+.LFBc:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIc0:
-+    movl    %esp,%ebp
-+.LCFIc1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret     $4
-+.LFEc:
-+    .size   privateSnippetExecutorClass,.-privateSnippetExecutorClass
-+
-+    .section .eh_frame,"a",@progbits
-+.Lframe1:
-+    .long   .LECIE1-.LSCIE1   # length
-+.LSCIE1:
-+    .long   0                 # CIE_ID
-+    .byte   1                 # version
-+    .string "zR"              # augmentation
-+    .uleb128 1                # code_alignment_factor
-+    .sleb128 -4               # data_alignment_factor
-+    .byte   8                 # return_address_register
-+    .uleb128 1                # augmentation size 1:
-+    .byte   0x1B              #  FDE Encoding (pcrel sdata4)
-+                              # initial_instructions:
-+    .byte   0x0C              #  DW_CFA_def_cfa %esp, 4
-+    .uleb128 4
-+    .uleb128 4
-+    .byte   0x88              #  DW_CFA_offset ret, 1
-+    .uleb128 1
-+    .align 4
-+.LECIE1:
-+.LSFDEg:
-+    .long   .LEFDEg-.LASFDEg  # length
-+.LASFDEg:
-+    .long   .LASFDEg-.Lframe1 # CIE_pointer
-+    .long   .LFBg-.           # initial_location
-+    .long   .LFEg-.LFBg       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg0-.LFBg
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg1-.LCFIg0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEg:
-+.LSFDEv:
-+    .long   .LEFDEv-.LASFDEv  # length
-+.LASFDEv:
-+    .long   .LASFDEv-.Lframe1 # CIE_pointer
-+    .long   .LFBv-.           # initial_location
-+    .long   .LFEv-.LFBv       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv0-.LFBv
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv1-.LCFIv0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEv:
-+.LSFDEh:
-+    .long   .LEFDEh-.LASFDEh  # length
-+.LASFDEh:
-+    .long   .LASFDEh-.Lframe1 # CIE_pointer
-+    .long   .LFBh-.           # initial_location
-+    .long   .LFEh-.LFBh       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh0-.LFBh
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh1-.LCFIh0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEh:
-+.LSFDEf:
-+    .long   .LEFDEf-.LASFDEf  # length
-+.LASFDEf:
-+    .long   .LASFDEf-.Lframe1 # CIE_pointer
-+    .long   .LFBf-.           # initial_location
-+    .long   .LFEf-.LFBf       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf0-.LFBf
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf1-.LCFIf0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEf:
-+.LSFDEd:
-+    .long   .LEFDEd-.LASFDEd  # length
-+.LASFDEd:
-+    .long   .LASFDEd-.Lframe1 # CIE_pointer
-+    .long   .LFBd-.           # initial_location
-+    .long   .LFEd-.LFBd       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId0-.LFBd
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId1-.LCFId0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEd:
-+.LSFDEc:
-+    .long   .LEFDEc-.LASFDEc  # length
-+.LASFDEc:
-+    .long   .LASFDEc-.Lframe1 # CIE_pointer
-+    .long   .LFBc-.           # initial_location
-+    .long   .LFEc-.LFBc       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc0-.LFBc
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc1-.LCFIc0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEc:
diff --git a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
deleted file mode 100644
index a291493b6b29..000000000000
--- a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Wed Jan 19 00:06:09 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Feb 21 21:13:28 2005
-@@ -77,7 +77,7 @@
- {
- 
- //==================================================================================================
--static typelib_TypeClass cpp2uno_call(
-+void cpp2uno_call(
- 	bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
- 	const typelib_TypeDescription * pMemberTypeDescr,
- 	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-@@ -209,8 +209,6 @@
- 		CPPU_CURRENT_NAMESPACE::raiseException(
-             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-             // has to destruct the any
--		// is here for dummy
--		return typelib_TypeClass_VOID;
- 	}
- 	else // else no exception occured...
- 	{
-@@ -247,22 +245,16 @@
- 		}
- 		if (pReturnTypeDescr)
- 		{
--			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
- 			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
--			return eRet;
- 		}
--		else
--			return typelib_TypeClass_VOID;
- 	}
- }
- 
- 
- //==================================================================================================
--static typelib_TypeClass cpp_mediate(
--	sal_Int32 nFunctionIndex,
--    sal_Int32 nVtableOffset,
--	void ** pCallStack,
--	sal_Int64 * pRegisterReturn /* space for register return */ )
-+extern "C" void cpp_vtable_call(
-+    int nFunctionIndex, int nVtableOffset, void** pCallStack,
-+    sal_Int64 nRegReturn )
- {
- 	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
- 	
-@@ -298,7 +290,6 @@
- 
- 	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-     
--	typelib_TypeClass eRet;
- 	switch (aMemberDescr.get()->eTypeClass)
- 	{
- 	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-@@ -306,11 +297,11 @@
- 		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
- 		{
- 			// is GET method
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
- 				0, 0, // no params
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		else
- 		{
-@@ -321,11 +312,11 @@
- 			aParam.bIn		= sal_True;
- 			aParam.bOut		= sal_False;
- 			
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				0, // indicates void return
- 				1, &aParam,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -336,11 +327,9 @@
- 		{
- 		case 1: // acquire()
- 			pCppI->acquireProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 2: // release()
- 			pCppI->releaseProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 0: // queryInterface() opt
- 		{
-@@ -361,20 +350,19 @@
-                         &pInterface, pTD, cpp_acquire );
-                     pInterface->release();
-                     TYPELIB_DANGER_RELEASE( pTD );
--                    *(void **)pRegisterReturn = pCallStack[1];
--                    eRet = typelib_TypeClass_ANY;
-+                    *(void **)&nRegReturn = pCallStack[1];
-                     break;
-                 }
-                 TYPELIB_DANGER_RELEASE( pTD );
-             }
- 		} // else perform queryInterface()
- 		default:
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -383,72 +371,55 @@
- 		throw RuntimeException(
-             rtl::OUString::createFromAscii("no member description found!"),
-             (XInterface *)pThis );
--		// is here for dummy
--		eRet = typelib_TypeClass_VOID;
- 	}
- 	}
--
--	return eRet;
- }
- 
- //==================================================================================================
--/**
-- * is called on incoming vtable calls
-- * (called by asm snippets)
-- */
--static void cpp_vtable_call(
--    int nFunctionIndex, int nVtableOffset, void** pCallStack )
--    __attribute__((regparm(3)));
--
--void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
--{
--	volatile long nRegReturn[2];
--	typelib_TypeClass aType = cpp_mediate(
--        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
--    
--	switch( aType )
--	{
--		case typelib_TypeClass_HYPER:
--		case typelib_TypeClass_UNSIGNED_HYPER:
--			__asm__( "movl %1, %%edx\n\t"
--					 "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
--			break;
--		case typelib_TypeClass_FLOAT:
--			__asm__( "flds %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "flds %0\n"
--					 : : "m"(*(float *)nRegReturn) );
--			break;
--		case typelib_TypeClass_DOUBLE:
--			__asm__( "fldl %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "fldl %0\n"
--					 : : "m"(*(double *)nRegReturn) );
--			break;
--// 		case typelib_TypeClass_UNSIGNED_SHORT:
--// 		case typelib_TypeClass_SHORT:
--// 			__asm__( "movswl %0, %%eax\n"
--// 					 : : "m"(nRegReturn) );
--// 		break;
--		default:
--			__asm__( "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]) );
--			break;
--	}
--}
--
-+extern "C" void privateSnippetExecutorGeneral();
-+extern "C" void privateSnippetExecutorVoid();
-+extern "C" void privateSnippetExecutorHyper();
-+extern "C" void privateSnippetExecutorFloat();
-+extern "C" void privateSnippetExecutorDouble();
-+extern "C" void privateSnippetExecutorClass();
-+extern "C" typedef void (*PrivateSnippetExecutor)();
- 
--//==================================================================================================
--int const codeSnippetSize = 20;
-+int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
-     unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
--    bool simpleRetType)
-+    typelib_TypeClass returnTypeClass)
- {
--    if (!simpleRetType) {
-+    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-         functionIndex |= 0x80000000;
-     }
-+    PrivateSnippetExecutor exec;
-+    switch (returnTypeClass) {
-+    case typelib_TypeClass_VOID:
-+        exec = privateSnippetExecutorVoid;
-+        break;
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        exec = privateSnippetExecutorHyper;
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+        exec = privateSnippetExecutorFloat;
-+        break;
-+    case typelib_TypeClass_DOUBLE:
-+        exec = privateSnippetExecutorDouble;
-+        break;
-+    case typelib_TypeClass_STRING:
-+    case typelib_TypeClass_TYPE:
-+    case typelib_TypeClass_ANY:
-+    case typelib_TypeClass_SEQUENCE:
-+    case typelib_TypeClass_STRUCT:
-+    case typelib_TypeClass_INTERFACE:
-+        exec = privateSnippetExecutorClass;
-+        break;
-+    default:
-+        exec = privateSnippetExecutorGeneral;
-+        break;
-+    }
-     unsigned char * p = code;
-     OSL_ASSERT(sizeof (sal_Int32) == 4);
-     // mov function_index, %eax:
-@@ -459,13 +430,10 @@
-     *p++ = 0xBA;
-     *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-     p += sizeof (sal_Int32);
--    // mov %esp, %ecx:
--    *p++ = 0x89;
--    *p++ = 0xE1;
--    // jmp cpp_vtable_call:
-+    // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -504,17 +472,17 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceAttributeTypeDescription * >(
--                        member)->pAttributeTypeRef));
-+                reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-+                    member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-             if (!reinterpret_cast<
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
-                 *slots++ = code;
--                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-+                code = codeSnippet(
-+                    code, functionOffset++, vtableOffset,
-+                    typelib_TypeClass_VOID);
-             }
-             break;
- 
-@@ -522,10 +490,8 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceMethodTypeDescription * >(
--                        member)->pReturnTypeRef));
-+                reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-+                    member)->pReturnTypeRef->eTypeClass);
-             break;
- 
-         default:
diff --git a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
deleted file mode 100644
index 942e6fccc4c7..000000000000
--- a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk	Fri May 20 11:14:36 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Fri May 20 11:16:09 2005
-@@ -87,7 +87,8 @@
- SLOFILES= \
- 	$(SLO)$/except.obj		\
- 	$(SLO)$/cpp2uno.obj		\
--	$(SLO)$/uno2cpp.obj
-+    $(SLO)$/uno2cpp.obj \
-+    $(SLO)$/call.obj
- 
- SHL1TARGET= $(TARGET)
- 
-@@ -108,3 +109,6 @@
- 
- .INCLUDE :  target.mk
- 
-+$(SLO)$/%.obj: %.s
-+    $(CC) -c -o $(SLO)$/$(@:b).o $<
-+    touch $@
diff --git a/editors/openoffice.org-2/files/patch-config_office+configure.in b/editors/openoffice.org-2/files/patch-config_office+configure.in
deleted file mode 100644
index 3c65cce44a9c..000000000000
--- a/editors/openoffice.org-2/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49678#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : == -> =
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.116
-diff -u -r1.116 configure.in
---- config_office/configure.in	11 Apr 2005 09:31:15 -0000	1.116
-+++ config_office/configure.in	13 May 2005 07:13:41 -0000
-@@ -1787,7 +1787,7 @@
- dnl Checks for javac
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
--    if test "$JDK" == "gcj"; then 
-+    if test "$JDK" = "gcj"; then 
-         javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-     else
-         javacompiler="javac"
-@@ -1871,7 +1871,7 @@
-     fi
- fi
- 
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-    AC_CHECK_HEADER(jni.h, [],
-@@ -1888,7 +1888,7 @@
- dnl ===================================================================
- dnl Check for optional gcj-dbtool
- dnl ===================================================================
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-     javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
-     if test -z "$with_jdk_home"; then
-         AC_PATH_PROG(JAVACACHE, $javacache)
-@@ -2684,7 +2684,7 @@
-    if test -z "$MOZILLA_VERSION"; then
-       MOZILLA_VERSION=1.7.5
-    fi
--   if test "$MOZILLA_VERSION" == "1.7b" ; then
-+   if test "$MOZILLA_VERSION" = "1.7b" ; then
-       MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source.tar.gz"
-    else
-       MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}.tar.gz"
diff --git a/editors/openoffice.org-2/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2/files/patch-crashrep+source+unx+makefile.mk
deleted file mode 100644
index 3c87525ff42a..000000000000
--- a/editors/openoffice.org-2/files/patch-crashrep+source+unx+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49679#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : We don't have -ldl and -lnsl
-
-Index: crashrep/source/unx/makefile.mk
-===================================================================
-RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
-retrieving revision 1.14
-diff -u -r1.14 makefile.mk
---- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
-+++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
-@@ -82,7 +82,10 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
--APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS+=-ldl -lnsl
-+.ENDIF
- .IF "$(OS)" == "SOLARIS"
- APP1STDLIBS+=-lsocket
- .ENDIF
diff --git a/editors/openoffice.org-2/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2/files/patch-libxmlsec+xmlsec1-1.2.6.patch
deleted file mode 100644
index 81b293cdf9f3..000000000000
--- a/editors/openoffice.org-2/files/patch-libxmlsec+xmlsec1-1.2.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49682#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct version number of resultant shared lib
-
-Index: xmlsec1-1.2.6.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
-retrieving revision 1.5
-diff -u -r1.5 xmlsec1-1.2.6.patch
---- libxmlsec/xmlsec1-1.2.6.patch	18 May 2005 10:11:24 -0000	1.5
-+++ libxmlsec/xmlsec1-1.2.6.patch	22 May 2005 01:43:49 -0000
-@@ -756,6 +756,35 @@
- *** misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
- --- misc/build/xmlsec1-1.2.6/ltmain.sh	2005-05-09 19:55:51.745319024 +0200
- ***************
-+*** 2994,3006 ****
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=".$current"
-+! 	  versuffix=".$current.$revision";
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2994,3006 ----
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+***************
- *** 3564,3570 ****
-   		fi
-   	      else
diff --git a/editors/openoffice.org-2/files/patch-odk+configure.pl b/editors/openoffice.org-2/files/patch-odk+configure.pl
deleted file mode 100644
index a608473de01c..000000000000
--- a/editors/openoffice.org-2/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : canonical name by config.guess for FreeBSD is
-% ./config.guess
-i386-unknown-freebsd5.3
-so, $main::operatingSystem is
-% ./config.guess | cut -d"-" -f3,4
-freebsd5.3
-then, if ( $main::operatingSystem eq "FreeBSD" ) is not correct,
-and if ( $main::operatingSystem =~ /freebsd/ ) is correct
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.11
-diff -u -r1.11 configure.pl
---- odk/configure.pl	29 Mar 2005 12:03:00 -0000	1.11
-+++ odk/configure.pl	15 May 2005 08:46:20 -0000
-@@ -45,7 +45,7 @@
- 
- $main::OO_SDK_MAKE_HOME = "";
- $main::makeName = "make";
--if ( $main::operatingSystem eq "FreeBSD" )
-+if ( $main::operatingSystem =~ /freebsd/ )
- {
-     $main::makeName = "gmake";
- }
diff --git a/editors/openoffice.org-2/files/patch-odk+setsdkenv_unix b/editors/openoffice.org-2/files/patch-odk+setsdkenv_unix
deleted file mode 100644
index 1165826077b0..000000000000
--- a/editors/openoffice.org-2/files/patch-odk+setsdkenv_unix
+++ /dev/null
@@ -1,39 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-
-Index: odk/setsdkenv_unix.sh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.sh.in
---- odk/setsdkenv_unix.sh.in	29 Mar 2005 12:03:27 -0000	1.5
-+++ odk/setsdkenv_unix.sh.in	15 May 2005 09:06:22 -0000
-@@ -130,7 +130,7 @@
-     export LD_LIBRARY_PATH
-     ;;
- 
--  freebsd)
-+  freebsd*)
-     if [ -n "$OO_SDK_CPP_HOME" ]
-     then
- 	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-Index: odk/setsdkenv_unix.csh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.csh.in
---- odk/setsdkenv_unix.csh.in	29 Mar 2005 12:03:14 -0000	1.5
-+++ odk/setsdkenv_unix.csh.in	15 May 2005 09:06:38 -0000
-@@ -114,7 +114,7 @@
-     endif
-   breaksw
- 
--  case "freebsd":
-+  case "freebsd*":
-     if ( $?OO_SDK_CPP_HOME == 0) then
- 	set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- 	setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
diff --git a/editors/openoffice.org-2/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2/files/patch-odk+settings+settings.mk
deleted file mode 100644
index 079bd128062c..000000000000
--- a/editors/openoffice.org-2/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-and adding missing things.
-
-Index: odk/settings/settings.mk
-===================================================================
-RCS file: /cvs/api/odk/settings/settings.mk,v
-retrieving revision 1.14
-diff -u -r1.14 settings.mk
---- odk/settings/settings.mk	29 Mar 2005 12:19:26 -0000	1.14
-+++ odk/settings/settings.mk	15 May 2005 13:54:38 -0000
-@@ -397,7 +397,7 @@
- # FreeBSD specific settings
- #
- ###########################################################################
--ifeq "$(PLATFORM)" "freebsd"
-+ifneq (,$(findstring freebsd,$(PLATFORM)))
- # Settings for FreeBSD using gcc compiler
- 
- PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-@@ -435,6 +435,7 @@
- CSEP=\>
- QUOTE=$(subst S,\,S)
- QM=\"
-+SQM='
- ECHOLINE=@echo
- P2BG=&
- 
-@@ -446,10 +447,10 @@
- # Include UDK version numbers
- include $(PRJ)/include/udkversion.mk
- 
--SALLIB=-lsal
--CPPULIB=-lcppu
--CPPUHELPERLIB=-lcppuhelper$(COMID)
--SALHELPERLIB=-lsalhelper$(COMID)
-+SALLIB=-luno_sal
-+CPPULIB=-luno_cppu
-+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-+SALHELPERLIB=-luno_salhelper$(COMID)
- REGLIB=-lreg
- STORELIB=-lstore
- STLPORTLIB=-lstlport_gcc
diff --git a/editors/openoffice.org-2/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-2/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 09f2f949c81d..000000000000
--- a/editors/openoffice.org-2/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-Issutracker : #i49677#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : contains illigal char
-
-Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
-===================================================================
-RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
-retrieving revision 1.2
-diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
---- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
-+++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
-@@ -109,7 +109,7 @@
- 		linearly between center and endColor via concentric ellipses
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		circular. If it's not 1, the gradient is elliptical, with the
- 		special twist that the aspect ratio is maintained also for the
- 		center color: the gradient will not collapse into a single
-@@ -124,7 +124,7 @@
- 		linearly between center and endColor via rectangular boxes
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		quadratic. If it's not 1, the gradient is rectangular, with
- 		the special twist that the aspect ratio is maintained also for
- 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-2/files/patch-portaudio+portaudio_v18_1.patch
deleted file mode 100644
index 87c43fb14d7c..000000000000
--- a/editors/openoffice.org-2/files/patch-portaudio+portaudio_v18_1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Issutracker : #i46879#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Need to include <sys/soundcard.h> to use sound and passes
-              correct pthread related flags
-
-Index: portaudio/portaudio_v18_1.patch
-===================================================================
-RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
-retrieving revision 1.1
-diff -u -r1.1 portaudio_v18_1.patch
---- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
-+++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
-@@ -12,7 +12,7 @@
-   	;;
-   
-     mingw* )
----- 1883,1902 ----
-+--- 1883,1921 ----
-   case "${host_os}" in
-     darwin* )
-   
-@@ -30,6 +30,25 @@
- ! 	PADLL="libportaudio.so";
- ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
- ! 	CFLAGS="-O2 -fPIC"
-+! 	;;
-+! 
-+!   freebsd* )
-+! 	if test "$OSVERSION" -lt "500016"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-pthread"
-+!         elif test "$OSVERSION" -lt "502102"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-lc_r"
-+!         else
-+!              PTHREAD_CFLAGS=""
-+!              PTHREAD_LIBS="-pthread"
-+!         fi
-+! 
-+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+! 	LIBS="-lm ${PTHREAD_LIBS}";
-+! 	PADLL="libportaudio.so";
-+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-+! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
-   	;;
-   
-     mingw* )
-@@ -52,3 +71,18 @@
-   LIBINST = /usr/local/lib
-   
-   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-+
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
-+***************
-+*** 43,48 ****
-+--- 43,50 ----
-+  
-+  #ifdef __linux__
-+  #include <linux/soundcard.h>
-++ #elif defined (__FreeBSD__)
-++ #include <sys/soundcard.h>
-+  #else
-+  #include <machine/soundcard.h> /* JH20010905 */
-+  #endif
-+
diff --git a/editors/openoffice.org-2/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2/files/patch-sndfile+libsndfile-1.0.9.patch
deleted file mode 100644
index 71a8f2292f2a..000000000000
--- a/editors/openoffice.org-2/files/patch-sndfile+libsndfile-1.0.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Issutracker : #i49684#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct shared lib number
-
-Index: libsndfile-1.0.9.patch
-===================================================================
-RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
-retrieving revision 1.1
-diff -u -r1.1 libsndfile-1.0.9.patch
---- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
-+++ sndfile/libsndfile-1.0.9.patch	22 May 2005 02:01:17 -0000
-@@ -231,3 +231,24 @@
-   
-   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-   
-+*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
-+--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
-+***************
-+*** 2980,2987 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2980,2987 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
diff --git a/editors/openoffice.org-2/files/patch-sndfile+makefile.mk b/editors/openoffice.org-2/files/patch-sndfile+makefile.mk
deleted file mode 100644
index 234100480f33..000000000000
--- a/editors/openoffice.org-2/files/patch-sndfile+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i49683#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : -noinhibit-exec allows linking against non-existent libs
-
-Index: sndfile/makefile.mk
-===================================================================
-RCS file: /cvs/external/sndfile/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
-+++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
-@@ -81,7 +81,7 @@
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure --with-pic
--.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
-+.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
- .ENDIF
- 
diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 94e3cc8d21bc..000000000000
--- a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-Issutracker : #i49685#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Update to recent version of unxlngi6.mk
-($Revision: 1.12 and $Author: obo $ $Date: 2005/05/06 09:37:55 $)
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.13
-diff -u -r1.13 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	11 Feb 2005 15:27:55 -0000	1.13
-+++ solenv/inc/unxfbsdi.mk	15 May 2005 04:51:41 -0000
-@@ -99,9 +99,6 @@
- CC+:=$(CFLAGS_SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
- CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
--.IF "$(PRODUCT)"!=""
--CFLAGS+=-Wuninitialized
--.ENDIF
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_SYMBOLS)"=="SMALL"
-@@ -122,6 +119,9 @@
- CFLAGSCXX= -pipe -mtune=pentiumpro
- CFLAGSCXX+= -Wno-ctor-dtor-privacy
- 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=
-@@ -143,6 +143,7 @@
- # Compiler flags for enabling optimazations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized				# not supported without optimization
- .ELSE 	# "$(PRODUCT)"!=""
- CFLAGSOPT=   							# no optimizing for non products
- .ENDIF	# "$(PRODUCT)"!=""
-@@ -161,11 +162,12 @@
- 
- # name of linker
- LINK*=$(CXX)
-+LINKC*=$(CC)
- 
- # default linker flags
- LINKFLAGSDEFS*=#-Wl,-z,defs
- LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-@@ -237,3 +239,4 @@
- DLLPOSTFIX=fi
- DLLPRE=lib
- DLLPOST=.so
-+
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 80d5a832f6a2..94a4282f01d2 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -48,7 +48,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		105
+MILESTONE=		107
 SNAPDATE=		20050521
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
@@ -93,8 +93,8 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
+
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index c308f56de99d..cc4f3b56c811 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810
-SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617
+MD5 (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 9c20222b097d70029dae19f834a83bf1
+SIZE (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 212641982
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
deleted file mode 100644
index 5e5d4b85c49e..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
+++ /dev/null
@@ -1,270 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s	Thu Jan  1 09:00:00 1970
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s	Fri May 20 11:21:13 2005
-@@ -0,0 +1,262 @@
-+    .text
-+
-+.globl privateSnippetExecutorGeneral
-+    .type   privateSnippetExecutorGeneral,@function
-+privateSnippetExecutorGeneral:
-+.LFBg:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIg0:
-+    movl    %esp,%ebp
-+.LCFIg1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEg:
-+    .size   privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral
-+
-+.globl privateSnippetExecutorVoid
-+    .type   privateSnippetExecutorVoid,@function
-+privateSnippetExecutorVoid:
-+.LFBv:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIv0:
-+    movl    %esp,%ebp
-+.LCFIv1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    leave
-+    ret
-+.LFEv:
-+    .size   privateSnippetExecutorVoid,.-privateSnippetExecutorVoid
-+
-+.globl privateSnippetExecutorHyper
-+    .type   privateSnippetExecutorHyper,@function
-+privateSnippetExecutorHyper:
-+.LFBh:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIh0:
-+    movl    %esp,%ebp
-+.LCFIh1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    movl    16(%esp),%edx     # 64 bit nRegReturn, upper half
-+    leave
-+    ret
-+.LFEh:
-+    .size   privateSnippetExecutorHyper,.-privateSnippetExecutorHyper
-+
-+.globl privateSnippetExecutorFloat
-+    .type   privateSnippetExecutorFloat,@function
-+privateSnippetExecutorFloat:
-+.LFBf:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIf0:
-+    movl    %esp,%ebp
-+.LCFIf1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    flds    12(%esp)          # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEf:
-+    .size   privateSnippetExecutorFloat,.-privateSnippetExecutorFloat
-+
-+.globl privateSnippetExecutorDouble
-+    .type   privateSnippetExecutorDouble,@function
-+privateSnippetExecutorDouble:
-+.LFBd:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFId0:
-+    movl    %esp,%ebp
-+.LCFId1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    fldl    12(%esp)          # 64 bit nRegReturn
-+    leave
-+    ret
-+.LFEd:
-+    .size   privateSnippetExecutorDouble,.-privateSnippetExecutorDouble
-+
-+.globl privateSnippetExecutorClass
-+    .type   privateSnippetExecutorClass,@function
-+privateSnippetExecutorClass:
-+.LFBc:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIc0:
-+    movl    %esp,%ebp
-+.LCFIc1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret     $4
-+.LFEc:
-+    .size   privateSnippetExecutorClass,.-privateSnippetExecutorClass
-+
-+    .section .eh_frame,"a",@progbits
-+.Lframe1:
-+    .long   .LECIE1-.LSCIE1   # length
-+.LSCIE1:
-+    .long   0                 # CIE_ID
-+    .byte   1                 # version
-+    .string "zR"              # augmentation
-+    .uleb128 1                # code_alignment_factor
-+    .sleb128 -4               # data_alignment_factor
-+    .byte   8                 # return_address_register
-+    .uleb128 1                # augmentation size 1:
-+    .byte   0x1B              #  FDE Encoding (pcrel sdata4)
-+                              # initial_instructions:
-+    .byte   0x0C              #  DW_CFA_def_cfa %esp, 4
-+    .uleb128 4
-+    .uleb128 4
-+    .byte   0x88              #  DW_CFA_offset ret, 1
-+    .uleb128 1
-+    .align 4
-+.LECIE1:
-+.LSFDEg:
-+    .long   .LEFDEg-.LASFDEg  # length
-+.LASFDEg:
-+    .long   .LASFDEg-.Lframe1 # CIE_pointer
-+    .long   .LFBg-.           # initial_location
-+    .long   .LFEg-.LFBg       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg0-.LFBg
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg1-.LCFIg0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEg:
-+.LSFDEv:
-+    .long   .LEFDEv-.LASFDEv  # length
-+.LASFDEv:
-+    .long   .LASFDEv-.Lframe1 # CIE_pointer
-+    .long   .LFBv-.           # initial_location
-+    .long   .LFEv-.LFBv       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv0-.LFBv
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv1-.LCFIv0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEv:
-+.LSFDEh:
-+    .long   .LEFDEh-.LASFDEh  # length
-+.LASFDEh:
-+    .long   .LASFDEh-.Lframe1 # CIE_pointer
-+    .long   .LFBh-.           # initial_location
-+    .long   .LFEh-.LFBh       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh0-.LFBh
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh1-.LCFIh0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEh:
-+.LSFDEf:
-+    .long   .LEFDEf-.LASFDEf  # length
-+.LASFDEf:
-+    .long   .LASFDEf-.Lframe1 # CIE_pointer
-+    .long   .LFBf-.           # initial_location
-+    .long   .LFEf-.LFBf       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf0-.LFBf
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf1-.LCFIf0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEf:
-+.LSFDEd:
-+    .long   .LEFDEd-.LASFDEd  # length
-+.LASFDEd:
-+    .long   .LASFDEd-.Lframe1 # CIE_pointer
-+    .long   .LFBd-.           # initial_location
-+    .long   .LFEd-.LFBd       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId0-.LFBd
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId1-.LCFId0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEd:
-+.LSFDEc:
-+    .long   .LEFDEc-.LASFDEc  # length
-+.LASFDEc:
-+    .long   .LASFDEc-.Lframe1 # CIE_pointer
-+    .long   .LFBc-.           # initial_location
-+    .long   .LFEc-.LFBc       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc0-.LFBc
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc1-.LCFIc0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEc:
diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
deleted file mode 100644
index a291493b6b29..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Wed Jan 19 00:06:09 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Feb 21 21:13:28 2005
-@@ -77,7 +77,7 @@
- {
- 
- //==================================================================================================
--static typelib_TypeClass cpp2uno_call(
-+void cpp2uno_call(
- 	bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
- 	const typelib_TypeDescription * pMemberTypeDescr,
- 	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-@@ -209,8 +209,6 @@
- 		CPPU_CURRENT_NAMESPACE::raiseException(
-             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-             // has to destruct the any
--		// is here for dummy
--		return typelib_TypeClass_VOID;
- 	}
- 	else // else no exception occured...
- 	{
-@@ -247,22 +245,16 @@
- 		}
- 		if (pReturnTypeDescr)
- 		{
--			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
- 			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
--			return eRet;
- 		}
--		else
--			return typelib_TypeClass_VOID;
- 	}
- }
- 
- 
- //==================================================================================================
--static typelib_TypeClass cpp_mediate(
--	sal_Int32 nFunctionIndex,
--    sal_Int32 nVtableOffset,
--	void ** pCallStack,
--	sal_Int64 * pRegisterReturn /* space for register return */ )
-+extern "C" void cpp_vtable_call(
-+    int nFunctionIndex, int nVtableOffset, void** pCallStack,
-+    sal_Int64 nRegReturn )
- {
- 	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
- 	
-@@ -298,7 +290,6 @@
- 
- 	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-     
--	typelib_TypeClass eRet;
- 	switch (aMemberDescr.get()->eTypeClass)
- 	{
- 	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-@@ -306,11 +297,11 @@
- 		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
- 		{
- 			// is GET method
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
- 				0, 0, // no params
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		else
- 		{
-@@ -321,11 +312,11 @@
- 			aParam.bIn		= sal_True;
- 			aParam.bOut		= sal_False;
- 			
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				0, // indicates void return
- 				1, &aParam,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -336,11 +327,9 @@
- 		{
- 		case 1: // acquire()
- 			pCppI->acquireProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 2: // release()
- 			pCppI->releaseProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 0: // queryInterface() opt
- 		{
-@@ -361,20 +350,19 @@
-                         &pInterface, pTD, cpp_acquire );
-                     pInterface->release();
-                     TYPELIB_DANGER_RELEASE( pTD );
--                    *(void **)pRegisterReturn = pCallStack[1];
--                    eRet = typelib_TypeClass_ANY;
-+                    *(void **)&nRegReturn = pCallStack[1];
-                     break;
-                 }
-                 TYPELIB_DANGER_RELEASE( pTD );
-             }
- 		} // else perform queryInterface()
- 		default:
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -383,72 +371,55 @@
- 		throw RuntimeException(
-             rtl::OUString::createFromAscii("no member description found!"),
-             (XInterface *)pThis );
--		// is here for dummy
--		eRet = typelib_TypeClass_VOID;
- 	}
- 	}
--
--	return eRet;
- }
- 
- //==================================================================================================
--/**
-- * is called on incoming vtable calls
-- * (called by asm snippets)
-- */
--static void cpp_vtable_call(
--    int nFunctionIndex, int nVtableOffset, void** pCallStack )
--    __attribute__((regparm(3)));
--
--void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
--{
--	volatile long nRegReturn[2];
--	typelib_TypeClass aType = cpp_mediate(
--        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
--    
--	switch( aType )
--	{
--		case typelib_TypeClass_HYPER:
--		case typelib_TypeClass_UNSIGNED_HYPER:
--			__asm__( "movl %1, %%edx\n\t"
--					 "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
--			break;
--		case typelib_TypeClass_FLOAT:
--			__asm__( "flds %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "flds %0\n"
--					 : : "m"(*(float *)nRegReturn) );
--			break;
--		case typelib_TypeClass_DOUBLE:
--			__asm__( "fldl %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "fldl %0\n"
--					 : : "m"(*(double *)nRegReturn) );
--			break;
--// 		case typelib_TypeClass_UNSIGNED_SHORT:
--// 		case typelib_TypeClass_SHORT:
--// 			__asm__( "movswl %0, %%eax\n"
--// 					 : : "m"(nRegReturn) );
--// 		break;
--		default:
--			__asm__( "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]) );
--			break;
--	}
--}
--
-+extern "C" void privateSnippetExecutorGeneral();
-+extern "C" void privateSnippetExecutorVoid();
-+extern "C" void privateSnippetExecutorHyper();
-+extern "C" void privateSnippetExecutorFloat();
-+extern "C" void privateSnippetExecutorDouble();
-+extern "C" void privateSnippetExecutorClass();
-+extern "C" typedef void (*PrivateSnippetExecutor)();
- 
--//==================================================================================================
--int const codeSnippetSize = 20;
-+int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
-     unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
--    bool simpleRetType)
-+    typelib_TypeClass returnTypeClass)
- {
--    if (!simpleRetType) {
-+    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-         functionIndex |= 0x80000000;
-     }
-+    PrivateSnippetExecutor exec;
-+    switch (returnTypeClass) {
-+    case typelib_TypeClass_VOID:
-+        exec = privateSnippetExecutorVoid;
-+        break;
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        exec = privateSnippetExecutorHyper;
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+        exec = privateSnippetExecutorFloat;
-+        break;
-+    case typelib_TypeClass_DOUBLE:
-+        exec = privateSnippetExecutorDouble;
-+        break;
-+    case typelib_TypeClass_STRING:
-+    case typelib_TypeClass_TYPE:
-+    case typelib_TypeClass_ANY:
-+    case typelib_TypeClass_SEQUENCE:
-+    case typelib_TypeClass_STRUCT:
-+    case typelib_TypeClass_INTERFACE:
-+        exec = privateSnippetExecutorClass;
-+        break;
-+    default:
-+        exec = privateSnippetExecutorGeneral;
-+        break;
-+    }
-     unsigned char * p = code;
-     OSL_ASSERT(sizeof (sal_Int32) == 4);
-     // mov function_index, %eax:
-@@ -459,13 +430,10 @@
-     *p++ = 0xBA;
-     *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-     p += sizeof (sal_Int32);
--    // mov %esp, %ecx:
--    *p++ = 0x89;
--    *p++ = 0xE1;
--    // jmp cpp_vtable_call:
-+    // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -504,17 +472,17 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceAttributeTypeDescription * >(
--                        member)->pAttributeTypeRef));
-+                reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-+                    member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-             if (!reinterpret_cast<
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
-                 *slots++ = code;
--                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-+                code = codeSnippet(
-+                    code, functionOffset++, vtableOffset,
-+                    typelib_TypeClass_VOID);
-             }
-             break;
- 
-@@ -522,10 +490,8 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceMethodTypeDescription * >(
--                        member)->pReturnTypeRef));
-+                reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-+                    member)->pReturnTypeRef->eTypeClass);
-             break;
- 
-         default:
diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
deleted file mode 100644
index 942e6fccc4c7..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk	Fri May 20 11:14:36 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Fri May 20 11:16:09 2005
-@@ -87,7 +87,8 @@
- SLOFILES= \
- 	$(SLO)$/except.obj		\
- 	$(SLO)$/cpp2uno.obj		\
--	$(SLO)$/uno2cpp.obj
-+    $(SLO)$/uno2cpp.obj \
-+    $(SLO)$/call.obj
- 
- SHL1TARGET= $(TARGET)
- 
-@@ -108,3 +109,6 @@
- 
- .INCLUDE :  target.mk
- 
-+$(SLO)$/%.obj: %.s
-+    $(CC) -c -o $(SLO)$/$(@:b).o $<
-+    touch $@
diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
deleted file mode 100644
index 3c65cce44a9c..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49678#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : == -> =
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.116
-diff -u -r1.116 configure.in
---- config_office/configure.in	11 Apr 2005 09:31:15 -0000	1.116
-+++ config_office/configure.in	13 May 2005 07:13:41 -0000
-@@ -1787,7 +1787,7 @@
- dnl Checks for javac
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
--    if test "$JDK" == "gcj"; then 
-+    if test "$JDK" = "gcj"; then 
-         javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-     else
-         javacompiler="javac"
-@@ -1871,7 +1871,7 @@
-     fi
- fi
- 
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-    AC_CHECK_HEADER(jni.h, [],
-@@ -1888,7 +1888,7 @@
- dnl ===================================================================
- dnl Check for optional gcj-dbtool
- dnl ===================================================================
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-     javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
-     if test -z "$with_jdk_home"; then
-         AC_PATH_PROG(JAVACACHE, $javacache)
-@@ -2684,7 +2684,7 @@
-    if test -z "$MOZILLA_VERSION"; then
-       MOZILLA_VERSION=1.7.5
-    fi
--   if test "$MOZILLA_VERSION" == "1.7b" ; then
-+   if test "$MOZILLA_VERSION" = "1.7b" ; then
-       MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source.tar.gz"
-    else
-       MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}.tar.gz"
diff --git a/editors/openoffice.org-3-RC/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-3-RC/files/patch-crashrep+source+unx+makefile.mk
deleted file mode 100644
index 3c87525ff42a..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-crashrep+source+unx+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49679#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : We don't have -ldl and -lnsl
-
-Index: crashrep/source/unx/makefile.mk
-===================================================================
-RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
-retrieving revision 1.14
-diff -u -r1.14 makefile.mk
---- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
-+++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
-@@ -82,7 +82,10 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
--APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS+=-ldl -lnsl
-+.ENDIF
- .IF "$(OS)" == "SOLARIS"
- APP1STDLIBS+=-lsocket
- .ENDIF
diff --git a/editors/openoffice.org-3-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-3-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch
deleted file mode 100644
index 81b293cdf9f3..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49682#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct version number of resultant shared lib
-
-Index: xmlsec1-1.2.6.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
-retrieving revision 1.5
-diff -u -r1.5 xmlsec1-1.2.6.patch
---- libxmlsec/xmlsec1-1.2.6.patch	18 May 2005 10:11:24 -0000	1.5
-+++ libxmlsec/xmlsec1-1.2.6.patch	22 May 2005 01:43:49 -0000
-@@ -756,6 +756,35 @@
- *** misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
- --- misc/build/xmlsec1-1.2.6/ltmain.sh	2005-05-09 19:55:51.745319024 +0200
- ***************
-+*** 2994,3006 ****
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=".$current"
-+! 	  versuffix=".$current.$revision";
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2994,3006 ----
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+***************
- *** 3564,3570 ****
-   		fi
-   	      else
diff --git a/editors/openoffice.org-3-RC/files/patch-odk+configure.pl b/editors/openoffice.org-3-RC/files/patch-odk+configure.pl
deleted file mode 100644
index a608473de01c..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : canonical name by config.guess for FreeBSD is
-% ./config.guess
-i386-unknown-freebsd5.3
-so, $main::operatingSystem is
-% ./config.guess | cut -d"-" -f3,4
-freebsd5.3
-then, if ( $main::operatingSystem eq "FreeBSD" ) is not correct,
-and if ( $main::operatingSystem =~ /freebsd/ ) is correct
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.11
-diff -u -r1.11 configure.pl
---- odk/configure.pl	29 Mar 2005 12:03:00 -0000	1.11
-+++ odk/configure.pl	15 May 2005 08:46:20 -0000
-@@ -45,7 +45,7 @@
- 
- $main::OO_SDK_MAKE_HOME = "";
- $main::makeName = "make";
--if ( $main::operatingSystem eq "FreeBSD" )
-+if ( $main::operatingSystem =~ /freebsd/ )
- {
-     $main::makeName = "gmake";
- }
diff --git a/editors/openoffice.org-3-RC/files/patch-odk+setsdkenv_unix b/editors/openoffice.org-3-RC/files/patch-odk+setsdkenv_unix
deleted file mode 100644
index 1165826077b0..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-odk+setsdkenv_unix
+++ /dev/null
@@ -1,39 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-
-Index: odk/setsdkenv_unix.sh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.sh.in
---- odk/setsdkenv_unix.sh.in	29 Mar 2005 12:03:27 -0000	1.5
-+++ odk/setsdkenv_unix.sh.in	15 May 2005 09:06:22 -0000
-@@ -130,7 +130,7 @@
-     export LD_LIBRARY_PATH
-     ;;
- 
--  freebsd)
-+  freebsd*)
-     if [ -n "$OO_SDK_CPP_HOME" ]
-     then
- 	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-Index: odk/setsdkenv_unix.csh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.csh.in
---- odk/setsdkenv_unix.csh.in	29 Mar 2005 12:03:14 -0000	1.5
-+++ odk/setsdkenv_unix.csh.in	15 May 2005 09:06:38 -0000
-@@ -114,7 +114,7 @@
-     endif
-   breaksw
- 
--  case "freebsd":
-+  case "freebsd*":
-     if ( $?OO_SDK_CPP_HOME == 0) then
- 	set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- 	setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
diff --git a/editors/openoffice.org-3-RC/files/patch-odk+settings+settings.mk b/editors/openoffice.org-3-RC/files/patch-odk+settings+settings.mk
deleted file mode 100644
index 079bd128062c..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-and adding missing things.
-
-Index: odk/settings/settings.mk
-===================================================================
-RCS file: /cvs/api/odk/settings/settings.mk,v
-retrieving revision 1.14
-diff -u -r1.14 settings.mk
---- odk/settings/settings.mk	29 Mar 2005 12:19:26 -0000	1.14
-+++ odk/settings/settings.mk	15 May 2005 13:54:38 -0000
-@@ -397,7 +397,7 @@
- # FreeBSD specific settings
- #
- ###########################################################################
--ifeq "$(PLATFORM)" "freebsd"
-+ifneq (,$(findstring freebsd,$(PLATFORM)))
- # Settings for FreeBSD using gcc compiler
- 
- PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-@@ -435,6 +435,7 @@
- CSEP=\>
- QUOTE=$(subst S,\,S)
- QM=\"
-+SQM='
- ECHOLINE=@echo
- P2BG=&
- 
-@@ -446,10 +447,10 @@
- # Include UDK version numbers
- include $(PRJ)/include/udkversion.mk
- 
--SALLIB=-lsal
--CPPULIB=-lcppu
--CPPUHELPERLIB=-lcppuhelper$(COMID)
--SALHELPERLIB=-lsalhelper$(COMID)
-+SALLIB=-luno_sal
-+CPPULIB=-luno_cppu
-+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-+SALHELPERLIB=-luno_salhelper$(COMID)
- REGLIB=-lreg
- STORELIB=-lstore
- STLPORTLIB=-lstlport_gcc
diff --git a/editors/openoffice.org-3-RC/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-3-RC/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 09f2f949c81d..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-Issutracker : #i49677#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : contains illigal char
-
-Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
-===================================================================
-RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
-retrieving revision 1.2
-diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
---- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
-+++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
-@@ -109,7 +109,7 @@
- 		linearly between center and endColor via concentric ellipses
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		circular. If it's not 1, the gradient is elliptical, with the
- 		special twist that the aspect ratio is maintained also for the
- 		center color: the gradient will not collapse into a single
-@@ -124,7 +124,7 @@
- 		linearly between center and endColor via rectangular boxes
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		quadratic. If it's not 1, the gradient is rectangular, with
- 		the special twist that the aspect ratio is maintained also for
- 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-3-RC/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-3-RC/files/patch-portaudio+portaudio_v18_1.patch
deleted file mode 100644
index 87c43fb14d7c..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-portaudio+portaudio_v18_1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Issutracker : #i46879#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Need to include <sys/soundcard.h> to use sound and passes
-              correct pthread related flags
-
-Index: portaudio/portaudio_v18_1.patch
-===================================================================
-RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
-retrieving revision 1.1
-diff -u -r1.1 portaudio_v18_1.patch
---- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
-+++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
-@@ -12,7 +12,7 @@
-   	;;
-   
-     mingw* )
----- 1883,1902 ----
-+--- 1883,1921 ----
-   case "${host_os}" in
-     darwin* )
-   
-@@ -30,6 +30,25 @@
- ! 	PADLL="libportaudio.so";
- ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
- ! 	CFLAGS="-O2 -fPIC"
-+! 	;;
-+! 
-+!   freebsd* )
-+! 	if test "$OSVERSION" -lt "500016"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-pthread"
-+!         elif test "$OSVERSION" -lt "502102"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-lc_r"
-+!         else
-+!              PTHREAD_CFLAGS=""
-+!              PTHREAD_LIBS="-pthread"
-+!         fi
-+! 
-+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+! 	LIBS="-lm ${PTHREAD_LIBS}";
-+! 	PADLL="libportaudio.so";
-+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-+! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
-   	;;
-   
-     mingw* )
-@@ -52,3 +71,18 @@
-   LIBINST = /usr/local/lib
-   
-   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-+
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
-+***************
-+*** 43,48 ****
-+--- 43,50 ----
-+  
-+  #ifdef __linux__
-+  #include <linux/soundcard.h>
-++ #elif defined (__FreeBSD__)
-++ #include <sys/soundcard.h>
-+  #else
-+  #include <machine/soundcard.h> /* JH20010905 */
-+  #endif
-+
diff --git a/editors/openoffice.org-3-RC/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-3-RC/files/patch-sndfile+libsndfile-1.0.9.patch
deleted file mode 100644
index 71a8f2292f2a..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-sndfile+libsndfile-1.0.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Issutracker : #i49684#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct shared lib number
-
-Index: libsndfile-1.0.9.patch
-===================================================================
-RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
-retrieving revision 1.1
-diff -u -r1.1 libsndfile-1.0.9.patch
---- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
-+++ sndfile/libsndfile-1.0.9.patch	22 May 2005 02:01:17 -0000
-@@ -231,3 +231,24 @@
-   
-   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-   
-+*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
-+--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
-+***************
-+*** 2980,2987 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2980,2987 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
diff --git a/editors/openoffice.org-3-RC/files/patch-sndfile+makefile.mk b/editors/openoffice.org-3-RC/files/patch-sndfile+makefile.mk
deleted file mode 100644
index 234100480f33..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-sndfile+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i49683#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : -noinhibit-exec allows linking against non-existent libs
-
-Index: sndfile/makefile.mk
-===================================================================
-RCS file: /cvs/external/sndfile/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
-+++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
-@@ -81,7 +81,7 @@
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure --with-pic
--.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
-+.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
- .ENDIF
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 94e3cc8d21bc..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-Issutracker : #i49685#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Update to recent version of unxlngi6.mk
-($Revision: 1.12 and $Author: obo $ $Date: 2005/05/06 09:37:55 $)
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.13
-diff -u -r1.13 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	11 Feb 2005 15:27:55 -0000	1.13
-+++ solenv/inc/unxfbsdi.mk	15 May 2005 04:51:41 -0000
-@@ -99,9 +99,6 @@
- CC+:=$(CFLAGS_SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
- CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
--.IF "$(PRODUCT)"!=""
--CFLAGS+=-Wuninitialized
--.ENDIF
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_SYMBOLS)"=="SMALL"
-@@ -122,6 +119,9 @@
- CFLAGSCXX= -pipe -mtune=pentiumpro
- CFLAGSCXX+= -Wno-ctor-dtor-privacy
- 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=
-@@ -143,6 +143,7 @@
- # Compiler flags for enabling optimazations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized				# not supported without optimization
- .ELSE 	# "$(PRODUCT)"!=""
- CFLAGSOPT=   							# no optimizing for non products
- .ENDIF	# "$(PRODUCT)"!=""
-@@ -161,11 +162,12 @@
- 
- # name of linker
- LINK*=$(CXX)
-+LINKC*=$(CC)
- 
- # default linker flags
- LINKFLAGSDEFS*=#-Wl,-z,defs
- LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-@@ -237,3 +239,4 @@
- DLLPOSTFIX=fi
- DLLPRE=lib
- DLLPOST=.so
-+
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 80d5a832f6a2..94a4282f01d2 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -48,7 +48,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		105
+MILESTONE=		107
 SNAPDATE=		20050521
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
@@ -93,8 +93,8 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
+
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index c308f56de99d..cc4f3b56c811 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810
-SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617
+MD5 (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 9c20222b097d70029dae19f834a83bf1
+SIZE (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 212641982
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
deleted file mode 100644
index 5e5d4b85c49e..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
+++ /dev/null
@@ -1,270 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s	Thu Jan  1 09:00:00 1970
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s	Fri May 20 11:21:13 2005
-@@ -0,0 +1,262 @@
-+    .text
-+
-+.globl privateSnippetExecutorGeneral
-+    .type   privateSnippetExecutorGeneral,@function
-+privateSnippetExecutorGeneral:
-+.LFBg:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIg0:
-+    movl    %esp,%ebp
-+.LCFIg1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEg:
-+    .size   privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral
-+
-+.globl privateSnippetExecutorVoid
-+    .type   privateSnippetExecutorVoid,@function
-+privateSnippetExecutorVoid:
-+.LFBv:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIv0:
-+    movl    %esp,%ebp
-+.LCFIv1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    leave
-+    ret
-+.LFEv:
-+    .size   privateSnippetExecutorVoid,.-privateSnippetExecutorVoid
-+
-+.globl privateSnippetExecutorHyper
-+    .type   privateSnippetExecutorHyper,@function
-+privateSnippetExecutorHyper:
-+.LFBh:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIh0:
-+    movl    %esp,%ebp
-+.LCFIh1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    movl    16(%esp),%edx     # 64 bit nRegReturn, upper half
-+    leave
-+    ret
-+.LFEh:
-+    .size   privateSnippetExecutorHyper,.-privateSnippetExecutorHyper
-+
-+.globl privateSnippetExecutorFloat
-+    .type   privateSnippetExecutorFloat,@function
-+privateSnippetExecutorFloat:
-+.LFBf:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIf0:
-+    movl    %esp,%ebp
-+.LCFIf1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    flds    12(%esp)          # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEf:
-+    .size   privateSnippetExecutorFloat,.-privateSnippetExecutorFloat
-+
-+.globl privateSnippetExecutorDouble
-+    .type   privateSnippetExecutorDouble,@function
-+privateSnippetExecutorDouble:
-+.LFBd:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFId0:
-+    movl    %esp,%ebp
-+.LCFId1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    fldl    12(%esp)          # 64 bit nRegReturn
-+    leave
-+    ret
-+.LFEd:
-+    .size   privateSnippetExecutorDouble,.-privateSnippetExecutorDouble
-+
-+.globl privateSnippetExecutorClass
-+    .type   privateSnippetExecutorClass,@function
-+privateSnippetExecutorClass:
-+.LFBc:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIc0:
-+    movl    %esp,%ebp
-+.LCFIc1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret     $4
-+.LFEc:
-+    .size   privateSnippetExecutorClass,.-privateSnippetExecutorClass
-+
-+    .section .eh_frame,"a",@progbits
-+.Lframe1:
-+    .long   .LECIE1-.LSCIE1   # length
-+.LSCIE1:
-+    .long   0                 # CIE_ID
-+    .byte   1                 # version
-+    .string "zR"              # augmentation
-+    .uleb128 1                # code_alignment_factor
-+    .sleb128 -4               # data_alignment_factor
-+    .byte   8                 # return_address_register
-+    .uleb128 1                # augmentation size 1:
-+    .byte   0x1B              #  FDE Encoding (pcrel sdata4)
-+                              # initial_instructions:
-+    .byte   0x0C              #  DW_CFA_def_cfa %esp, 4
-+    .uleb128 4
-+    .uleb128 4
-+    .byte   0x88              #  DW_CFA_offset ret, 1
-+    .uleb128 1
-+    .align 4
-+.LECIE1:
-+.LSFDEg:
-+    .long   .LEFDEg-.LASFDEg  # length
-+.LASFDEg:
-+    .long   .LASFDEg-.Lframe1 # CIE_pointer
-+    .long   .LFBg-.           # initial_location
-+    .long   .LFEg-.LFBg       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg0-.LFBg
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg1-.LCFIg0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEg:
-+.LSFDEv:
-+    .long   .LEFDEv-.LASFDEv  # length
-+.LASFDEv:
-+    .long   .LASFDEv-.Lframe1 # CIE_pointer
-+    .long   .LFBv-.           # initial_location
-+    .long   .LFEv-.LFBv       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv0-.LFBv
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv1-.LCFIv0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEv:
-+.LSFDEh:
-+    .long   .LEFDEh-.LASFDEh  # length
-+.LASFDEh:
-+    .long   .LASFDEh-.Lframe1 # CIE_pointer
-+    .long   .LFBh-.           # initial_location
-+    .long   .LFEh-.LFBh       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh0-.LFBh
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh1-.LCFIh0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEh:
-+.LSFDEf:
-+    .long   .LEFDEf-.LASFDEf  # length
-+.LASFDEf:
-+    .long   .LASFDEf-.Lframe1 # CIE_pointer
-+    .long   .LFBf-.           # initial_location
-+    .long   .LFEf-.LFBf       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf0-.LFBf
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf1-.LCFIf0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEf:
-+.LSFDEd:
-+    .long   .LEFDEd-.LASFDEd  # length
-+.LASFDEd:
-+    .long   .LASFDEd-.Lframe1 # CIE_pointer
-+    .long   .LFBd-.           # initial_location
-+    .long   .LFEd-.LFBd       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId0-.LFBd
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId1-.LCFId0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEd:
-+.LSFDEc:
-+    .long   .LEFDEc-.LASFDEc  # length
-+.LASFDEc:
-+    .long   .LASFDEc-.Lframe1 # CIE_pointer
-+    .long   .LFBc-.           # initial_location
-+    .long   .LFEc-.LFBc       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc0-.LFBc
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc1-.LCFIc0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEc:
diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
deleted file mode 100644
index a291493b6b29..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Wed Jan 19 00:06:09 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Feb 21 21:13:28 2005
-@@ -77,7 +77,7 @@
- {
- 
- //==================================================================================================
--static typelib_TypeClass cpp2uno_call(
-+void cpp2uno_call(
- 	bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
- 	const typelib_TypeDescription * pMemberTypeDescr,
- 	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-@@ -209,8 +209,6 @@
- 		CPPU_CURRENT_NAMESPACE::raiseException(
-             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-             // has to destruct the any
--		// is here for dummy
--		return typelib_TypeClass_VOID;
- 	}
- 	else // else no exception occured...
- 	{
-@@ -247,22 +245,16 @@
- 		}
- 		if (pReturnTypeDescr)
- 		{
--			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
- 			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
--			return eRet;
- 		}
--		else
--			return typelib_TypeClass_VOID;
- 	}
- }
- 
- 
- //==================================================================================================
--static typelib_TypeClass cpp_mediate(
--	sal_Int32 nFunctionIndex,
--    sal_Int32 nVtableOffset,
--	void ** pCallStack,
--	sal_Int64 * pRegisterReturn /* space for register return */ )
-+extern "C" void cpp_vtable_call(
-+    int nFunctionIndex, int nVtableOffset, void** pCallStack,
-+    sal_Int64 nRegReturn )
- {
- 	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
- 	
-@@ -298,7 +290,6 @@
- 
- 	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-     
--	typelib_TypeClass eRet;
- 	switch (aMemberDescr.get()->eTypeClass)
- 	{
- 	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-@@ -306,11 +297,11 @@
- 		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
- 		{
- 			// is GET method
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
- 				0, 0, // no params
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		else
- 		{
-@@ -321,11 +312,11 @@
- 			aParam.bIn		= sal_True;
- 			aParam.bOut		= sal_False;
- 			
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				0, // indicates void return
- 				1, &aParam,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -336,11 +327,9 @@
- 		{
- 		case 1: // acquire()
- 			pCppI->acquireProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 2: // release()
- 			pCppI->releaseProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 0: // queryInterface() opt
- 		{
-@@ -361,20 +350,19 @@
-                         &pInterface, pTD, cpp_acquire );
-                     pInterface->release();
-                     TYPELIB_DANGER_RELEASE( pTD );
--                    *(void **)pRegisterReturn = pCallStack[1];
--                    eRet = typelib_TypeClass_ANY;
-+                    *(void **)&nRegReturn = pCallStack[1];
-                     break;
-                 }
-                 TYPELIB_DANGER_RELEASE( pTD );
-             }
- 		} // else perform queryInterface()
- 		default:
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -383,72 +371,55 @@
- 		throw RuntimeException(
-             rtl::OUString::createFromAscii("no member description found!"),
-             (XInterface *)pThis );
--		// is here for dummy
--		eRet = typelib_TypeClass_VOID;
- 	}
- 	}
--
--	return eRet;
- }
- 
- //==================================================================================================
--/**
-- * is called on incoming vtable calls
-- * (called by asm snippets)
-- */
--static void cpp_vtable_call(
--    int nFunctionIndex, int nVtableOffset, void** pCallStack )
--    __attribute__((regparm(3)));
--
--void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
--{
--	volatile long nRegReturn[2];
--	typelib_TypeClass aType = cpp_mediate(
--        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
--    
--	switch( aType )
--	{
--		case typelib_TypeClass_HYPER:
--		case typelib_TypeClass_UNSIGNED_HYPER:
--			__asm__( "movl %1, %%edx\n\t"
--					 "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
--			break;
--		case typelib_TypeClass_FLOAT:
--			__asm__( "flds %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "flds %0\n"
--					 : : "m"(*(float *)nRegReturn) );
--			break;
--		case typelib_TypeClass_DOUBLE:
--			__asm__( "fldl %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "fldl %0\n"
--					 : : "m"(*(double *)nRegReturn) );
--			break;
--// 		case typelib_TypeClass_UNSIGNED_SHORT:
--// 		case typelib_TypeClass_SHORT:
--// 			__asm__( "movswl %0, %%eax\n"
--// 					 : : "m"(nRegReturn) );
--// 		break;
--		default:
--			__asm__( "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]) );
--			break;
--	}
--}
--
-+extern "C" void privateSnippetExecutorGeneral();
-+extern "C" void privateSnippetExecutorVoid();
-+extern "C" void privateSnippetExecutorHyper();
-+extern "C" void privateSnippetExecutorFloat();
-+extern "C" void privateSnippetExecutorDouble();
-+extern "C" void privateSnippetExecutorClass();
-+extern "C" typedef void (*PrivateSnippetExecutor)();
- 
--//==================================================================================================
--int const codeSnippetSize = 20;
-+int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
-     unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
--    bool simpleRetType)
-+    typelib_TypeClass returnTypeClass)
- {
--    if (!simpleRetType) {
-+    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-         functionIndex |= 0x80000000;
-     }
-+    PrivateSnippetExecutor exec;
-+    switch (returnTypeClass) {
-+    case typelib_TypeClass_VOID:
-+        exec = privateSnippetExecutorVoid;
-+        break;
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        exec = privateSnippetExecutorHyper;
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+        exec = privateSnippetExecutorFloat;
-+        break;
-+    case typelib_TypeClass_DOUBLE:
-+        exec = privateSnippetExecutorDouble;
-+        break;
-+    case typelib_TypeClass_STRING:
-+    case typelib_TypeClass_TYPE:
-+    case typelib_TypeClass_ANY:
-+    case typelib_TypeClass_SEQUENCE:
-+    case typelib_TypeClass_STRUCT:
-+    case typelib_TypeClass_INTERFACE:
-+        exec = privateSnippetExecutorClass;
-+        break;
-+    default:
-+        exec = privateSnippetExecutorGeneral;
-+        break;
-+    }
-     unsigned char * p = code;
-     OSL_ASSERT(sizeof (sal_Int32) == 4);
-     // mov function_index, %eax:
-@@ -459,13 +430,10 @@
-     *p++ = 0xBA;
-     *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-     p += sizeof (sal_Int32);
--    // mov %esp, %ecx:
--    *p++ = 0x89;
--    *p++ = 0xE1;
--    // jmp cpp_vtable_call:
-+    // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -504,17 +472,17 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceAttributeTypeDescription * >(
--                        member)->pAttributeTypeRef));
-+                reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-+                    member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-             if (!reinterpret_cast<
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
-                 *slots++ = code;
--                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-+                code = codeSnippet(
-+                    code, functionOffset++, vtableOffset,
-+                    typelib_TypeClass_VOID);
-             }
-             break;
- 
-@@ -522,10 +490,8 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceMethodTypeDescription * >(
--                        member)->pReturnTypeRef));
-+                reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-+                    member)->pReturnTypeRef->eTypeClass);
-             break;
- 
-         default:
diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
deleted file mode 100644
index 942e6fccc4c7..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk	Fri May 20 11:14:36 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Fri May 20 11:16:09 2005
-@@ -87,7 +87,8 @@
- SLOFILES= \
- 	$(SLO)$/except.obj		\
- 	$(SLO)$/cpp2uno.obj		\
--	$(SLO)$/uno2cpp.obj
-+    $(SLO)$/uno2cpp.obj \
-+    $(SLO)$/call.obj
- 
- SHL1TARGET= $(TARGET)
- 
-@@ -108,3 +109,6 @@
- 
- .INCLUDE :  target.mk
- 
-+$(SLO)$/%.obj: %.s
-+    $(CC) -c -o $(SLO)$/$(@:b).o $<
-+    touch $@
diff --git a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in
deleted file mode 100644
index 3c65cce44a9c..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49678#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : == -> =
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.116
-diff -u -r1.116 configure.in
---- config_office/configure.in	11 Apr 2005 09:31:15 -0000	1.116
-+++ config_office/configure.in	13 May 2005 07:13:41 -0000
-@@ -1787,7 +1787,7 @@
- dnl Checks for javac
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
--    if test "$JDK" == "gcj"; then 
-+    if test "$JDK" = "gcj"; then 
-         javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-     else
-         javacompiler="javac"
-@@ -1871,7 +1871,7 @@
-     fi
- fi
- 
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-    AC_CHECK_HEADER(jni.h, [],
-@@ -1888,7 +1888,7 @@
- dnl ===================================================================
- dnl Check for optional gcj-dbtool
- dnl ===================================================================
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-     javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
-     if test -z "$with_jdk_home"; then
-         AC_PATH_PROG(JAVACACHE, $javacache)
-@@ -2684,7 +2684,7 @@
-    if test -z "$MOZILLA_VERSION"; then
-       MOZILLA_VERSION=1.7.5
-    fi
--   if test "$MOZILLA_VERSION" == "1.7b" ; then
-+   if test "$MOZILLA_VERSION" = "1.7b" ; then
-       MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source.tar.gz"
-    else
-       MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}.tar.gz"
diff --git a/editors/openoffice.org-3-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-3-devel/files/patch-crashrep+source+unx+makefile.mk
deleted file mode 100644
index 3c87525ff42a..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-crashrep+source+unx+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49679#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : We don't have -ldl and -lnsl
-
-Index: crashrep/source/unx/makefile.mk
-===================================================================
-RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
-retrieving revision 1.14
-diff -u -r1.14 makefile.mk
---- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
-+++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
-@@ -82,7 +82,10 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
--APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS+=-ldl -lnsl
-+.ENDIF
- .IF "$(OS)" == "SOLARIS"
- APP1STDLIBS+=-lsocket
- .ENDIF
diff --git a/editors/openoffice.org-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
deleted file mode 100644
index 81b293cdf9f3..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49682#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct version number of resultant shared lib
-
-Index: xmlsec1-1.2.6.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
-retrieving revision 1.5
-diff -u -r1.5 xmlsec1-1.2.6.patch
---- libxmlsec/xmlsec1-1.2.6.patch	18 May 2005 10:11:24 -0000	1.5
-+++ libxmlsec/xmlsec1-1.2.6.patch	22 May 2005 01:43:49 -0000
-@@ -756,6 +756,35 @@
- *** misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
- --- misc/build/xmlsec1-1.2.6/ltmain.sh	2005-05-09 19:55:51.745319024 +0200
- ***************
-+*** 2994,3006 ****
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=".$current"
-+! 	  versuffix=".$current.$revision";
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2994,3006 ----
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+***************
- *** 3564,3570 ****
-   		fi
-   	      else
diff --git a/editors/openoffice.org-3-devel/files/patch-odk+configure.pl b/editors/openoffice.org-3-devel/files/patch-odk+configure.pl
deleted file mode 100644
index a608473de01c..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : canonical name by config.guess for FreeBSD is
-% ./config.guess
-i386-unknown-freebsd5.3
-so, $main::operatingSystem is
-% ./config.guess | cut -d"-" -f3,4
-freebsd5.3
-then, if ( $main::operatingSystem eq "FreeBSD" ) is not correct,
-and if ( $main::operatingSystem =~ /freebsd/ ) is correct
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.11
-diff -u -r1.11 configure.pl
---- odk/configure.pl	29 Mar 2005 12:03:00 -0000	1.11
-+++ odk/configure.pl	15 May 2005 08:46:20 -0000
-@@ -45,7 +45,7 @@
- 
- $main::OO_SDK_MAKE_HOME = "";
- $main::makeName = "make";
--if ( $main::operatingSystem eq "FreeBSD" )
-+if ( $main::operatingSystem =~ /freebsd/ )
- {
-     $main::makeName = "gmake";
- }
diff --git a/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix b/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix
deleted file mode 100644
index 1165826077b0..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix
+++ /dev/null
@@ -1,39 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-
-Index: odk/setsdkenv_unix.sh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.sh.in
---- odk/setsdkenv_unix.sh.in	29 Mar 2005 12:03:27 -0000	1.5
-+++ odk/setsdkenv_unix.sh.in	15 May 2005 09:06:22 -0000
-@@ -130,7 +130,7 @@
-     export LD_LIBRARY_PATH
-     ;;
- 
--  freebsd)
-+  freebsd*)
-     if [ -n "$OO_SDK_CPP_HOME" ]
-     then
- 	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-Index: odk/setsdkenv_unix.csh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.csh.in
---- odk/setsdkenv_unix.csh.in	29 Mar 2005 12:03:14 -0000	1.5
-+++ odk/setsdkenv_unix.csh.in	15 May 2005 09:06:38 -0000
-@@ -114,7 +114,7 @@
-     endif
-   breaksw
- 
--  case "freebsd":
-+  case "freebsd*":
-     if ( $?OO_SDK_CPP_HOME == 0) then
- 	set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- 	setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
diff --git a/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk
deleted file mode 100644
index 079bd128062c..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-and adding missing things.
-
-Index: odk/settings/settings.mk
-===================================================================
-RCS file: /cvs/api/odk/settings/settings.mk,v
-retrieving revision 1.14
-diff -u -r1.14 settings.mk
---- odk/settings/settings.mk	29 Mar 2005 12:19:26 -0000	1.14
-+++ odk/settings/settings.mk	15 May 2005 13:54:38 -0000
-@@ -397,7 +397,7 @@
- # FreeBSD specific settings
- #
- ###########################################################################
--ifeq "$(PLATFORM)" "freebsd"
-+ifneq (,$(findstring freebsd,$(PLATFORM)))
- # Settings for FreeBSD using gcc compiler
- 
- PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-@@ -435,6 +435,7 @@
- CSEP=\>
- QUOTE=$(subst S,\,S)
- QM=\"
-+SQM='
- ECHOLINE=@echo
- P2BG=&
- 
-@@ -446,10 +447,10 @@
- # Include UDK version numbers
- include $(PRJ)/include/udkversion.mk
- 
--SALLIB=-lsal
--CPPULIB=-lcppu
--CPPUHELPERLIB=-lcppuhelper$(COMID)
--SALHELPERLIB=-lsalhelper$(COMID)
-+SALLIB=-luno_sal
-+CPPULIB=-luno_cppu
-+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-+SALHELPERLIB=-luno_salhelper$(COMID)
- REGLIB=-lreg
- STORELIB=-lstore
- STLPORTLIB=-lstlport_gcc
diff --git a/editors/openoffice.org-3-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-3-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 09f2f949c81d..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-Issutracker : #i49677#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : contains illigal char
-
-Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
-===================================================================
-RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
-retrieving revision 1.2
-diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
---- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
-+++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
-@@ -109,7 +109,7 @@
- 		linearly between center and endColor via concentric ellipses
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		circular. If it's not 1, the gradient is elliptical, with the
- 		special twist that the aspect ratio is maintained also for the
- 		center color: the gradient will not collapse into a single
-@@ -124,7 +124,7 @@
- 		linearly between center and endColor via rectangular boxes
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		quadratic. If it's not 1, the gradient is rectangular, with
- 		the special twist that the aspect ratio is maintained also for
- 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-3-devel/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-3-devel/files/patch-portaudio+portaudio_v18_1.patch
deleted file mode 100644
index 87c43fb14d7c..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-portaudio+portaudio_v18_1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Issutracker : #i46879#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Need to include <sys/soundcard.h> to use sound and passes
-              correct pthread related flags
-
-Index: portaudio/portaudio_v18_1.patch
-===================================================================
-RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
-retrieving revision 1.1
-diff -u -r1.1 portaudio_v18_1.patch
---- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
-+++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
-@@ -12,7 +12,7 @@
-   	;;
-   
-     mingw* )
----- 1883,1902 ----
-+--- 1883,1921 ----
-   case "${host_os}" in
-     darwin* )
-   
-@@ -30,6 +30,25 @@
- ! 	PADLL="libportaudio.so";
- ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
- ! 	CFLAGS="-O2 -fPIC"
-+! 	;;
-+! 
-+!   freebsd* )
-+! 	if test "$OSVERSION" -lt "500016"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-pthread"
-+!         elif test "$OSVERSION" -lt "502102"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-lc_r"
-+!         else
-+!              PTHREAD_CFLAGS=""
-+!              PTHREAD_LIBS="-pthread"
-+!         fi
-+! 
-+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+! 	LIBS="-lm ${PTHREAD_LIBS}";
-+! 	PADLL="libportaudio.so";
-+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-+! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
-   	;;
-   
-     mingw* )
-@@ -52,3 +71,18 @@
-   LIBINST = /usr/local/lib
-   
-   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-+
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
-+***************
-+*** 43,48 ****
-+--- 43,50 ----
-+  
-+  #ifdef __linux__
-+  #include <linux/soundcard.h>
-++ #elif defined (__FreeBSD__)
-++ #include <sys/soundcard.h>
-+  #else
-+  #include <machine/soundcard.h> /* JH20010905 */
-+  #endif
-+
diff --git a/editors/openoffice.org-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch
deleted file mode 100644
index 71a8f2292f2a..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Issutracker : #i49684#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct shared lib number
-
-Index: libsndfile-1.0.9.patch
-===================================================================
-RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
-retrieving revision 1.1
-diff -u -r1.1 libsndfile-1.0.9.patch
---- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
-+++ sndfile/libsndfile-1.0.9.patch	22 May 2005 02:01:17 -0000
-@@ -231,3 +231,24 @@
-   
-   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-   
-+*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
-+--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
-+***************
-+*** 2980,2987 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2980,2987 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
diff --git a/editors/openoffice.org-3-devel/files/patch-sndfile+makefile.mk b/editors/openoffice.org-3-devel/files/patch-sndfile+makefile.mk
deleted file mode 100644
index 234100480f33..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-sndfile+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i49683#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : -noinhibit-exec allows linking against non-existent libs
-
-Index: sndfile/makefile.mk
-===================================================================
-RCS file: /cvs/external/sndfile/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
-+++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
-@@ -81,7 +81,7 @@
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure --with-pic
--.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
-+.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
- .ENDIF
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 94e3cc8d21bc..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-Issutracker : #i49685#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Update to recent version of unxlngi6.mk
-($Revision: 1.12 and $Author: obo $ $Date: 2005/05/06 09:37:55 $)
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.13
-diff -u -r1.13 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	11 Feb 2005 15:27:55 -0000	1.13
-+++ solenv/inc/unxfbsdi.mk	15 May 2005 04:51:41 -0000
-@@ -99,9 +99,6 @@
- CC+:=$(CFLAGS_SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
- CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
--.IF "$(PRODUCT)"!=""
--CFLAGS+=-Wuninitialized
--.ENDIF
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_SYMBOLS)"=="SMALL"
-@@ -122,6 +119,9 @@
- CFLAGSCXX= -pipe -mtune=pentiumpro
- CFLAGSCXX+= -Wno-ctor-dtor-privacy
- 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=
-@@ -143,6 +143,7 @@
- # Compiler flags for enabling optimazations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized				# not supported without optimization
- .ELSE 	# "$(PRODUCT)"!=""
- CFLAGSOPT=   							# no optimizing for non products
- .ENDIF	# "$(PRODUCT)"!=""
-@@ -161,11 +162,12 @@
- 
- # name of linker
- LINK*=$(CXX)
-+LINKC*=$(CC)
- 
- # default linker flags
- LINKFLAGSDEFS*=#-Wl,-z,defs
- LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-@@ -237,3 +239,4 @@
- DLLPOSTFIX=fi
- DLLPRE=lib
- DLLPOST=.so
-+
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 80d5a832f6a2..94a4282f01d2 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -48,7 +48,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		105
+MILESTONE=		107
 SNAPDATE=		20050521
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
@@ -93,8 +93,8 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
+
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index c308f56de99d..cc4f3b56c811 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810
-SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617
+MD5 (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 9c20222b097d70029dae19f834a83bf1
+SIZE (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 212641982
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
deleted file mode 100644
index 5e5d4b85c49e..000000000000
--- a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
+++ /dev/null
@@ -1,270 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s	Thu Jan  1 09:00:00 1970
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s	Fri May 20 11:21:13 2005
-@@ -0,0 +1,262 @@
-+    .text
-+
-+.globl privateSnippetExecutorGeneral
-+    .type   privateSnippetExecutorGeneral,@function
-+privateSnippetExecutorGeneral:
-+.LFBg:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIg0:
-+    movl    %esp,%ebp
-+.LCFIg1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEg:
-+    .size   privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral
-+
-+.globl privateSnippetExecutorVoid
-+    .type   privateSnippetExecutorVoid,@function
-+privateSnippetExecutorVoid:
-+.LFBv:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIv0:
-+    movl    %esp,%ebp
-+.LCFIv1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    leave
-+    ret
-+.LFEv:
-+    .size   privateSnippetExecutorVoid,.-privateSnippetExecutorVoid
-+
-+.globl privateSnippetExecutorHyper
-+    .type   privateSnippetExecutorHyper,@function
-+privateSnippetExecutorHyper:
-+.LFBh:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIh0:
-+    movl    %esp,%ebp
-+.LCFIh1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    movl    16(%esp),%edx     # 64 bit nRegReturn, upper half
-+    leave
-+    ret
-+.LFEh:
-+    .size   privateSnippetExecutorHyper,.-privateSnippetExecutorHyper
-+
-+.globl privateSnippetExecutorFloat
-+    .type   privateSnippetExecutorFloat,@function
-+privateSnippetExecutorFloat:
-+.LFBf:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIf0:
-+    movl    %esp,%ebp
-+.LCFIf1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    flds    12(%esp)          # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEf:
-+    .size   privateSnippetExecutorFloat,.-privateSnippetExecutorFloat
-+
-+.globl privateSnippetExecutorDouble
-+    .type   privateSnippetExecutorDouble,@function
-+privateSnippetExecutorDouble:
-+.LFBd:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFId0:
-+    movl    %esp,%ebp
-+.LCFId1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    fldl    12(%esp)          # 64 bit nRegReturn
-+    leave
-+    ret
-+.LFEd:
-+    .size   privateSnippetExecutorDouble,.-privateSnippetExecutorDouble
-+
-+.globl privateSnippetExecutorClass
-+    .type   privateSnippetExecutorClass,@function
-+privateSnippetExecutorClass:
-+.LFBc:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIc0:
-+    movl    %esp,%ebp
-+.LCFIc1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret     $4
-+.LFEc:
-+    .size   privateSnippetExecutorClass,.-privateSnippetExecutorClass
-+
-+    .section .eh_frame,"a",@progbits
-+.Lframe1:
-+    .long   .LECIE1-.LSCIE1   # length
-+.LSCIE1:
-+    .long   0                 # CIE_ID
-+    .byte   1                 # version
-+    .string "zR"              # augmentation
-+    .uleb128 1                # code_alignment_factor
-+    .sleb128 -4               # data_alignment_factor
-+    .byte   8                 # return_address_register
-+    .uleb128 1                # augmentation size 1:
-+    .byte   0x1B              #  FDE Encoding (pcrel sdata4)
-+                              # initial_instructions:
-+    .byte   0x0C              #  DW_CFA_def_cfa %esp, 4
-+    .uleb128 4
-+    .uleb128 4
-+    .byte   0x88              #  DW_CFA_offset ret, 1
-+    .uleb128 1
-+    .align 4
-+.LECIE1:
-+.LSFDEg:
-+    .long   .LEFDEg-.LASFDEg  # length
-+.LASFDEg:
-+    .long   .LASFDEg-.Lframe1 # CIE_pointer
-+    .long   .LFBg-.           # initial_location
-+    .long   .LFEg-.LFBg       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg0-.LFBg
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg1-.LCFIg0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEg:
-+.LSFDEv:
-+    .long   .LEFDEv-.LASFDEv  # length
-+.LASFDEv:
-+    .long   .LASFDEv-.Lframe1 # CIE_pointer
-+    .long   .LFBv-.           # initial_location
-+    .long   .LFEv-.LFBv       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv0-.LFBv
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv1-.LCFIv0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEv:
-+.LSFDEh:
-+    .long   .LEFDEh-.LASFDEh  # length
-+.LASFDEh:
-+    .long   .LASFDEh-.Lframe1 # CIE_pointer
-+    .long   .LFBh-.           # initial_location
-+    .long   .LFEh-.LFBh       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh0-.LFBh
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh1-.LCFIh0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEh:
-+.LSFDEf:
-+    .long   .LEFDEf-.LASFDEf  # length
-+.LASFDEf:
-+    .long   .LASFDEf-.Lframe1 # CIE_pointer
-+    .long   .LFBf-.           # initial_location
-+    .long   .LFEf-.LFBf       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf0-.LFBf
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf1-.LCFIf0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEf:
-+.LSFDEd:
-+    .long   .LEFDEd-.LASFDEd  # length
-+.LASFDEd:
-+    .long   .LASFDEd-.Lframe1 # CIE_pointer
-+    .long   .LFBd-.           # initial_location
-+    .long   .LFEd-.LFBd       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId0-.LFBd
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId1-.LCFId0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEd:
-+.LSFDEc:
-+    .long   .LEFDEc-.LASFDEc  # length
-+.LASFDEc:
-+    .long   .LASFDEc-.Lframe1 # CIE_pointer
-+    .long   .LFBc-.           # initial_location
-+    .long   .LFEc-.LFBc       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc0-.LFBc
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc1-.LCFIc0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEc:
diff --git a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
deleted file mode 100644
index a291493b6b29..000000000000
--- a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Wed Jan 19 00:06:09 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Feb 21 21:13:28 2005
-@@ -77,7 +77,7 @@
- {
- 
- //==================================================================================================
--static typelib_TypeClass cpp2uno_call(
-+void cpp2uno_call(
- 	bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
- 	const typelib_TypeDescription * pMemberTypeDescr,
- 	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-@@ -209,8 +209,6 @@
- 		CPPU_CURRENT_NAMESPACE::raiseException(
-             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-             // has to destruct the any
--		// is here for dummy
--		return typelib_TypeClass_VOID;
- 	}
- 	else // else no exception occured...
- 	{
-@@ -247,22 +245,16 @@
- 		}
- 		if (pReturnTypeDescr)
- 		{
--			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
- 			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
--			return eRet;
- 		}
--		else
--			return typelib_TypeClass_VOID;
- 	}
- }
- 
- 
- //==================================================================================================
--static typelib_TypeClass cpp_mediate(
--	sal_Int32 nFunctionIndex,
--    sal_Int32 nVtableOffset,
--	void ** pCallStack,
--	sal_Int64 * pRegisterReturn /* space for register return */ )
-+extern "C" void cpp_vtable_call(
-+    int nFunctionIndex, int nVtableOffset, void** pCallStack,
-+    sal_Int64 nRegReturn )
- {
- 	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
- 	
-@@ -298,7 +290,6 @@
- 
- 	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-     
--	typelib_TypeClass eRet;
- 	switch (aMemberDescr.get()->eTypeClass)
- 	{
- 	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-@@ -306,11 +297,11 @@
- 		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
- 		{
- 			// is GET method
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
- 				0, 0, // no params
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		else
- 		{
-@@ -321,11 +312,11 @@
- 			aParam.bIn		= sal_True;
- 			aParam.bOut		= sal_False;
- 			
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				0, // indicates void return
- 				1, &aParam,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -336,11 +327,9 @@
- 		{
- 		case 1: // acquire()
- 			pCppI->acquireProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 2: // release()
- 			pCppI->releaseProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 0: // queryInterface() opt
- 		{
-@@ -361,20 +350,19 @@
-                         &pInterface, pTD, cpp_acquire );
-                     pInterface->release();
-                     TYPELIB_DANGER_RELEASE( pTD );
--                    *(void **)pRegisterReturn = pCallStack[1];
--                    eRet = typelib_TypeClass_ANY;
-+                    *(void **)&nRegReturn = pCallStack[1];
-                     break;
-                 }
-                 TYPELIB_DANGER_RELEASE( pTD );
-             }
- 		} // else perform queryInterface()
- 		default:
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -383,72 +371,55 @@
- 		throw RuntimeException(
-             rtl::OUString::createFromAscii("no member description found!"),
-             (XInterface *)pThis );
--		// is here for dummy
--		eRet = typelib_TypeClass_VOID;
- 	}
- 	}
--
--	return eRet;
- }
- 
- //==================================================================================================
--/**
-- * is called on incoming vtable calls
-- * (called by asm snippets)
-- */
--static void cpp_vtable_call(
--    int nFunctionIndex, int nVtableOffset, void** pCallStack )
--    __attribute__((regparm(3)));
--
--void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
--{
--	volatile long nRegReturn[2];
--	typelib_TypeClass aType = cpp_mediate(
--        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
--    
--	switch( aType )
--	{
--		case typelib_TypeClass_HYPER:
--		case typelib_TypeClass_UNSIGNED_HYPER:
--			__asm__( "movl %1, %%edx\n\t"
--					 "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
--			break;
--		case typelib_TypeClass_FLOAT:
--			__asm__( "flds %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "flds %0\n"
--					 : : "m"(*(float *)nRegReturn) );
--			break;
--		case typelib_TypeClass_DOUBLE:
--			__asm__( "fldl %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "fldl %0\n"
--					 : : "m"(*(double *)nRegReturn) );
--			break;
--// 		case typelib_TypeClass_UNSIGNED_SHORT:
--// 		case typelib_TypeClass_SHORT:
--// 			__asm__( "movswl %0, %%eax\n"
--// 					 : : "m"(nRegReturn) );
--// 		break;
--		default:
--			__asm__( "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]) );
--			break;
--	}
--}
--
-+extern "C" void privateSnippetExecutorGeneral();
-+extern "C" void privateSnippetExecutorVoid();
-+extern "C" void privateSnippetExecutorHyper();
-+extern "C" void privateSnippetExecutorFloat();
-+extern "C" void privateSnippetExecutorDouble();
-+extern "C" void privateSnippetExecutorClass();
-+extern "C" typedef void (*PrivateSnippetExecutor)();
- 
--//==================================================================================================
--int const codeSnippetSize = 20;
-+int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
-     unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
--    bool simpleRetType)
-+    typelib_TypeClass returnTypeClass)
- {
--    if (!simpleRetType) {
-+    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-         functionIndex |= 0x80000000;
-     }
-+    PrivateSnippetExecutor exec;
-+    switch (returnTypeClass) {
-+    case typelib_TypeClass_VOID:
-+        exec = privateSnippetExecutorVoid;
-+        break;
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        exec = privateSnippetExecutorHyper;
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+        exec = privateSnippetExecutorFloat;
-+        break;
-+    case typelib_TypeClass_DOUBLE:
-+        exec = privateSnippetExecutorDouble;
-+        break;
-+    case typelib_TypeClass_STRING:
-+    case typelib_TypeClass_TYPE:
-+    case typelib_TypeClass_ANY:
-+    case typelib_TypeClass_SEQUENCE:
-+    case typelib_TypeClass_STRUCT:
-+    case typelib_TypeClass_INTERFACE:
-+        exec = privateSnippetExecutorClass;
-+        break;
-+    default:
-+        exec = privateSnippetExecutorGeneral;
-+        break;
-+    }
-     unsigned char * p = code;
-     OSL_ASSERT(sizeof (sal_Int32) == 4);
-     // mov function_index, %eax:
-@@ -459,13 +430,10 @@
-     *p++ = 0xBA;
-     *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-     p += sizeof (sal_Int32);
--    // mov %esp, %ecx:
--    *p++ = 0x89;
--    *p++ = 0xE1;
--    // jmp cpp_vtable_call:
-+    // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -504,17 +472,17 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceAttributeTypeDescription * >(
--                        member)->pAttributeTypeRef));
-+                reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-+                    member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-             if (!reinterpret_cast<
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
-                 *slots++ = code;
--                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-+                code = codeSnippet(
-+                    code, functionOffset++, vtableOffset,
-+                    typelib_TypeClass_VOID);
-             }
-             break;
- 
-@@ -522,10 +490,8 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceMethodTypeDescription * >(
--                        member)->pReturnTypeRef));
-+                reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-+                    member)->pReturnTypeRef->eTypeClass);
-             break;
- 
-         default:
diff --git a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
deleted file mode 100644
index 942e6fccc4c7..000000000000
--- a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk	Fri May 20 11:14:36 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Fri May 20 11:16:09 2005
-@@ -87,7 +87,8 @@
- SLOFILES= \
- 	$(SLO)$/except.obj		\
- 	$(SLO)$/cpp2uno.obj		\
--	$(SLO)$/uno2cpp.obj
-+    $(SLO)$/uno2cpp.obj \
-+    $(SLO)$/call.obj
- 
- SHL1TARGET= $(TARGET)
- 
-@@ -108,3 +109,6 @@
- 
- .INCLUDE :  target.mk
- 
-+$(SLO)$/%.obj: %.s
-+    $(CC) -c -o $(SLO)$/$(@:b).o $<
-+    touch $@
diff --git a/editors/openoffice.org-3/files/patch-config_office+configure.in b/editors/openoffice.org-3/files/patch-config_office+configure.in
deleted file mode 100644
index 3c65cce44a9c..000000000000
--- a/editors/openoffice.org-3/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49678#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : == -> =
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.116
-diff -u -r1.116 configure.in
---- config_office/configure.in	11 Apr 2005 09:31:15 -0000	1.116
-+++ config_office/configure.in	13 May 2005 07:13:41 -0000
-@@ -1787,7 +1787,7 @@
- dnl Checks for javac
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
--    if test "$JDK" == "gcj"; then 
-+    if test "$JDK" = "gcj"; then 
-         javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-     else
-         javacompiler="javac"
-@@ -1871,7 +1871,7 @@
-     fi
- fi
- 
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-    AC_CHECK_HEADER(jni.h, [],
-@@ -1888,7 +1888,7 @@
- dnl ===================================================================
- dnl Check for optional gcj-dbtool
- dnl ===================================================================
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-     javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
-     if test -z "$with_jdk_home"; then
-         AC_PATH_PROG(JAVACACHE, $javacache)
-@@ -2684,7 +2684,7 @@
-    if test -z "$MOZILLA_VERSION"; then
-       MOZILLA_VERSION=1.7.5
-    fi
--   if test "$MOZILLA_VERSION" == "1.7b" ; then
-+   if test "$MOZILLA_VERSION" = "1.7b" ; then
-       MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source.tar.gz"
-    else
-       MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}.tar.gz"
diff --git a/editors/openoffice.org-3/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-3/files/patch-crashrep+source+unx+makefile.mk
deleted file mode 100644
index 3c87525ff42a..000000000000
--- a/editors/openoffice.org-3/files/patch-crashrep+source+unx+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49679#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : We don't have -ldl and -lnsl
-
-Index: crashrep/source/unx/makefile.mk
-===================================================================
-RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
-retrieving revision 1.14
-diff -u -r1.14 makefile.mk
---- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
-+++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
-@@ -82,7 +82,10 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
--APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS+=-ldl -lnsl
-+.ENDIF
- .IF "$(OS)" == "SOLARIS"
- APP1STDLIBS+=-lsocket
- .ENDIF
diff --git a/editors/openoffice.org-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch
deleted file mode 100644
index 81b293cdf9f3..000000000000
--- a/editors/openoffice.org-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49682#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct version number of resultant shared lib
-
-Index: xmlsec1-1.2.6.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
-retrieving revision 1.5
-diff -u -r1.5 xmlsec1-1.2.6.patch
---- libxmlsec/xmlsec1-1.2.6.patch	18 May 2005 10:11:24 -0000	1.5
-+++ libxmlsec/xmlsec1-1.2.6.patch	22 May 2005 01:43:49 -0000
-@@ -756,6 +756,35 @@
- *** misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
- --- misc/build/xmlsec1-1.2.6/ltmain.sh	2005-05-09 19:55:51.745319024 +0200
- ***************
-+*** 2994,3006 ****
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=".$current"
-+! 	  versuffix=".$current.$revision";
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2994,3006 ----
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+***************
- *** 3564,3570 ****
-   		fi
-   	      else
diff --git a/editors/openoffice.org-3/files/patch-odk+configure.pl b/editors/openoffice.org-3/files/patch-odk+configure.pl
deleted file mode 100644
index a608473de01c..000000000000
--- a/editors/openoffice.org-3/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : canonical name by config.guess for FreeBSD is
-% ./config.guess
-i386-unknown-freebsd5.3
-so, $main::operatingSystem is
-% ./config.guess | cut -d"-" -f3,4
-freebsd5.3
-then, if ( $main::operatingSystem eq "FreeBSD" ) is not correct,
-and if ( $main::operatingSystem =~ /freebsd/ ) is correct
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.11
-diff -u -r1.11 configure.pl
---- odk/configure.pl	29 Mar 2005 12:03:00 -0000	1.11
-+++ odk/configure.pl	15 May 2005 08:46:20 -0000
-@@ -45,7 +45,7 @@
- 
- $main::OO_SDK_MAKE_HOME = "";
- $main::makeName = "make";
--if ( $main::operatingSystem eq "FreeBSD" )
-+if ( $main::operatingSystem =~ /freebsd/ )
- {
-     $main::makeName = "gmake";
- }
diff --git a/editors/openoffice.org-3/files/patch-odk+setsdkenv_unix b/editors/openoffice.org-3/files/patch-odk+setsdkenv_unix
deleted file mode 100644
index 1165826077b0..000000000000
--- a/editors/openoffice.org-3/files/patch-odk+setsdkenv_unix
+++ /dev/null
@@ -1,39 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-
-Index: odk/setsdkenv_unix.sh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.sh.in
---- odk/setsdkenv_unix.sh.in	29 Mar 2005 12:03:27 -0000	1.5
-+++ odk/setsdkenv_unix.sh.in	15 May 2005 09:06:22 -0000
-@@ -130,7 +130,7 @@
-     export LD_LIBRARY_PATH
-     ;;
- 
--  freebsd)
-+  freebsd*)
-     if [ -n "$OO_SDK_CPP_HOME" ]
-     then
- 	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-Index: odk/setsdkenv_unix.csh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.csh.in
---- odk/setsdkenv_unix.csh.in	29 Mar 2005 12:03:14 -0000	1.5
-+++ odk/setsdkenv_unix.csh.in	15 May 2005 09:06:38 -0000
-@@ -114,7 +114,7 @@
-     endif
-   breaksw
- 
--  case "freebsd":
-+  case "freebsd*":
-     if ( $?OO_SDK_CPP_HOME == 0) then
- 	set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- 	setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
diff --git a/editors/openoffice.org-3/files/patch-odk+settings+settings.mk b/editors/openoffice.org-3/files/patch-odk+settings+settings.mk
deleted file mode 100644
index 079bd128062c..000000000000
--- a/editors/openoffice.org-3/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-and adding missing things.
-
-Index: odk/settings/settings.mk
-===================================================================
-RCS file: /cvs/api/odk/settings/settings.mk,v
-retrieving revision 1.14
-diff -u -r1.14 settings.mk
---- odk/settings/settings.mk	29 Mar 2005 12:19:26 -0000	1.14
-+++ odk/settings/settings.mk	15 May 2005 13:54:38 -0000
-@@ -397,7 +397,7 @@
- # FreeBSD specific settings
- #
- ###########################################################################
--ifeq "$(PLATFORM)" "freebsd"
-+ifneq (,$(findstring freebsd,$(PLATFORM)))
- # Settings for FreeBSD using gcc compiler
- 
- PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-@@ -435,6 +435,7 @@
- CSEP=\>
- QUOTE=$(subst S,\,S)
- QM=\"
-+SQM='
- ECHOLINE=@echo
- P2BG=&
- 
-@@ -446,10 +447,10 @@
- # Include UDK version numbers
- include $(PRJ)/include/udkversion.mk
- 
--SALLIB=-lsal
--CPPULIB=-lcppu
--CPPUHELPERLIB=-lcppuhelper$(COMID)
--SALHELPERLIB=-lsalhelper$(COMID)
-+SALLIB=-luno_sal
-+CPPULIB=-luno_cppu
-+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-+SALHELPERLIB=-luno_salhelper$(COMID)
- REGLIB=-lreg
- STORELIB=-lstore
- STLPORTLIB=-lstlport_gcc
diff --git a/editors/openoffice.org-3/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-3/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 09f2f949c81d..000000000000
--- a/editors/openoffice.org-3/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-Issutracker : #i49677#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : contains illigal char
-
-Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
-===================================================================
-RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
-retrieving revision 1.2
-diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
---- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
-+++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
-@@ -109,7 +109,7 @@
- 		linearly between center and endColor via concentric ellipses
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		circular. If it's not 1, the gradient is elliptical, with the
- 		special twist that the aspect ratio is maintained also for the
- 		center color: the gradient will not collapse into a single
-@@ -124,7 +124,7 @@
- 		linearly between center and endColor via rectangular boxes
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		quadratic. If it's not 1, the gradient is rectangular, with
- 		the special twist that the aspect ratio is maintained also for
- 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-3/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-3/files/patch-portaudio+portaudio_v18_1.patch
deleted file mode 100644
index 87c43fb14d7c..000000000000
--- a/editors/openoffice.org-3/files/patch-portaudio+portaudio_v18_1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Issutracker : #i46879#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Need to include <sys/soundcard.h> to use sound and passes
-              correct pthread related flags
-
-Index: portaudio/portaudio_v18_1.patch
-===================================================================
-RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
-retrieving revision 1.1
-diff -u -r1.1 portaudio_v18_1.patch
---- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
-+++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
-@@ -12,7 +12,7 @@
-   	;;
-   
-     mingw* )
----- 1883,1902 ----
-+--- 1883,1921 ----
-   case "${host_os}" in
-     darwin* )
-   
-@@ -30,6 +30,25 @@
- ! 	PADLL="libportaudio.so";
- ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
- ! 	CFLAGS="-O2 -fPIC"
-+! 	;;
-+! 
-+!   freebsd* )
-+! 	if test "$OSVERSION" -lt "500016"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-pthread"
-+!         elif test "$OSVERSION" -lt "502102"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-lc_r"
-+!         else
-+!              PTHREAD_CFLAGS=""
-+!              PTHREAD_LIBS="-pthread"
-+!         fi
-+! 
-+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+! 	LIBS="-lm ${PTHREAD_LIBS}";
-+! 	PADLL="libportaudio.so";
-+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-+! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
-   	;;
-   
-     mingw* )
-@@ -52,3 +71,18 @@
-   LIBINST = /usr/local/lib
-   
-   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-+
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
-+***************
-+*** 43,48 ****
-+--- 43,50 ----
-+  
-+  #ifdef __linux__
-+  #include <linux/soundcard.h>
-++ #elif defined (__FreeBSD__)
-++ #include <sys/soundcard.h>
-+  #else
-+  #include <machine/soundcard.h> /* JH20010905 */
-+  #endif
-+
diff --git a/editors/openoffice.org-3/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-3/files/patch-sndfile+libsndfile-1.0.9.patch
deleted file mode 100644
index 71a8f2292f2a..000000000000
--- a/editors/openoffice.org-3/files/patch-sndfile+libsndfile-1.0.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Issutracker : #i49684#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct shared lib number
-
-Index: libsndfile-1.0.9.patch
-===================================================================
-RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
-retrieving revision 1.1
-diff -u -r1.1 libsndfile-1.0.9.patch
---- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
-+++ sndfile/libsndfile-1.0.9.patch	22 May 2005 02:01:17 -0000
-@@ -231,3 +231,24 @@
-   
-   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-   
-+*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
-+--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
-+***************
-+*** 2980,2987 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2980,2987 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
diff --git a/editors/openoffice.org-3/files/patch-sndfile+makefile.mk b/editors/openoffice.org-3/files/patch-sndfile+makefile.mk
deleted file mode 100644
index 234100480f33..000000000000
--- a/editors/openoffice.org-3/files/patch-sndfile+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i49683#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : -noinhibit-exec allows linking against non-existent libs
-
-Index: sndfile/makefile.mk
-===================================================================
-RCS file: /cvs/external/sndfile/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
-+++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
-@@ -81,7 +81,7 @@
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure --with-pic
--.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
-+.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
- .ENDIF
- 
diff --git a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 94e3cc8d21bc..000000000000
--- a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-Issutracker : #i49685#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Update to recent version of unxlngi6.mk
-($Revision: 1.12 and $Author: obo $ $Date: 2005/05/06 09:37:55 $)
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.13
-diff -u -r1.13 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	11 Feb 2005 15:27:55 -0000	1.13
-+++ solenv/inc/unxfbsdi.mk	15 May 2005 04:51:41 -0000
-@@ -99,9 +99,6 @@
- CC+:=$(CFLAGS_SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
- CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
--.IF "$(PRODUCT)"!=""
--CFLAGS+=-Wuninitialized
--.ENDIF
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_SYMBOLS)"=="SMALL"
-@@ -122,6 +119,9 @@
- CFLAGSCXX= -pipe -mtune=pentiumpro
- CFLAGSCXX+= -Wno-ctor-dtor-privacy
- 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=
-@@ -143,6 +143,7 @@
- # Compiler flags for enabling optimazations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized				# not supported without optimization
- .ELSE 	# "$(PRODUCT)"!=""
- CFLAGSOPT=   							# no optimizing for non products
- .ENDIF	# "$(PRODUCT)"!=""
-@@ -161,11 +162,12 @@
- 
- # name of linker
- LINK*=$(CXX)
-+LINKC*=$(CC)
- 
- # default linker flags
- LINKFLAGSDEFS*=#-Wl,-z,defs
- LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-@@ -237,3 +239,4 @@
- DLLPOSTFIX=fi
- DLLPRE=lib
- DLLPOST=.so
-+
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 80d5a832f6a2..94a4282f01d2 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -48,7 +48,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		105
+MILESTONE=		107
 SNAPDATE=		20050521
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
@@ -93,8 +93,8 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
+
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index c308f56de99d..cc4f3b56c811 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810
-SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617
+MD5 (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 9c20222b097d70029dae19f834a83bf1
+SIZE (openoffice.org2.0/OOo_1.9m107_source.tar.bz2) = 212641982
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
deleted file mode 100644
index 5e5d4b85c49e..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s
+++ /dev/null
@@ -1,270 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s	Thu Jan  1 09:00:00 1970
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s	Fri May 20 11:21:13 2005
-@@ -0,0 +1,262 @@
-+    .text
-+
-+.globl privateSnippetExecutorGeneral
-+    .type   privateSnippetExecutorGeneral,@function
-+privateSnippetExecutorGeneral:
-+.LFBg:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIg0:
-+    movl    %esp,%ebp
-+.LCFIg1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEg:
-+    .size   privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral
-+
-+.globl privateSnippetExecutorVoid
-+    .type   privateSnippetExecutorVoid,@function
-+privateSnippetExecutorVoid:
-+.LFBv:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIv0:
-+    movl    %esp,%ebp
-+.LCFIv1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    leave
-+    ret
-+.LFEv:
-+    .size   privateSnippetExecutorVoid,.-privateSnippetExecutorVoid
-+
-+.globl privateSnippetExecutorHyper
-+    .type   privateSnippetExecutorHyper,@function
-+privateSnippetExecutorHyper:
-+.LFBh:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIh0:
-+    movl    %esp,%ebp
-+.LCFIh1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    movl    16(%esp),%edx     # 64 bit nRegReturn, upper half
-+    leave
-+    ret
-+.LFEh:
-+    .size   privateSnippetExecutorHyper,.-privateSnippetExecutorHyper
-+
-+.globl privateSnippetExecutorFloat
-+    .type   privateSnippetExecutorFloat,@function
-+privateSnippetExecutorFloat:
-+.LFBf:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIf0:
-+    movl    %esp,%ebp
-+.LCFIf1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    flds    12(%esp)          # 64 bit nRegReturn, lower half
-+    leave
-+    ret
-+.LFEf:
-+    .size   privateSnippetExecutorFloat,.-privateSnippetExecutorFloat
-+
-+.globl privateSnippetExecutorDouble
-+    .type   privateSnippetExecutorDouble,@function
-+privateSnippetExecutorDouble:
-+.LFBd:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFId0:
-+    movl    %esp,%ebp
-+.LCFId1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    fldl    12(%esp)          # 64 bit nRegReturn
-+    leave
-+    ret
-+.LFEd:
-+    .size   privateSnippetExecutorDouble,.-privateSnippetExecutorDouble
-+
-+.globl privateSnippetExecutorClass
-+    .type   privateSnippetExecutorClass,@function
-+privateSnippetExecutorClass:
-+.LFBc:
-+    movl    %esp,%ecx
-+    pushl   %ebp              # proper stack frame needed for exception handling
-+.LCFIc0:
-+    movl    %esp,%ebp
-+.LCFIc1:
-+    subl    $0x8,%esp         # 64bit nRegReturn
-+    pushl   %ecx              # 32bit pCallStack
-+    pushl   %edx              # 32bit nVtableOffset
-+    pushl   %eax              # 32bit nFunctionIndex
-+    call    cpp_vtable_call
-+    movl    12(%esp),%eax     # 64 bit nRegReturn, lower half
-+    leave
-+    ret     $4
-+.LFEc:
-+    .size   privateSnippetExecutorClass,.-privateSnippetExecutorClass
-+
-+    .section .eh_frame,"a",@progbits
-+.Lframe1:
-+    .long   .LECIE1-.LSCIE1   # length
-+.LSCIE1:
-+    .long   0                 # CIE_ID
-+    .byte   1                 # version
-+    .string "zR"              # augmentation
-+    .uleb128 1                # code_alignment_factor
-+    .sleb128 -4               # data_alignment_factor
-+    .byte   8                 # return_address_register
-+    .uleb128 1                # augmentation size 1:
-+    .byte   0x1B              #  FDE Encoding (pcrel sdata4)
-+                              # initial_instructions:
-+    .byte   0x0C              #  DW_CFA_def_cfa %esp, 4
-+    .uleb128 4
-+    .uleb128 4
-+    .byte   0x88              #  DW_CFA_offset ret, 1
-+    .uleb128 1
-+    .align 4
-+.LECIE1:
-+.LSFDEg:
-+    .long   .LEFDEg-.LASFDEg  # length
-+.LASFDEg:
-+    .long   .LASFDEg-.Lframe1 # CIE_pointer
-+    .long   .LFBg-.           # initial_location
-+    .long   .LFEg-.LFBg       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg0-.LFBg
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIg1-.LCFIg0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEg:
-+.LSFDEv:
-+    .long   .LEFDEv-.LASFDEv  # length
-+.LASFDEv:
-+    .long   .LASFDEv-.Lframe1 # CIE_pointer
-+    .long   .LFBv-.           # initial_location
-+    .long   .LFEv-.LFBv       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv0-.LFBv
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIv1-.LCFIv0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEv:
-+.LSFDEh:
-+    .long   .LEFDEh-.LASFDEh  # length
-+.LASFDEh:
-+    .long   .LASFDEh-.Lframe1 # CIE_pointer
-+    .long   .LFBh-.           # initial_location
-+    .long   .LFEh-.LFBh       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh0-.LFBh
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIh1-.LCFIh0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEh:
-+.LSFDEf:
-+    .long   .LEFDEf-.LASFDEf  # length
-+.LASFDEf:
-+    .long   .LASFDEf-.Lframe1 # CIE_pointer
-+    .long   .LFBf-.           # initial_location
-+    .long   .LFEf-.LFBf       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf0-.LFBf
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIf1-.LCFIf0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEf:
-+.LSFDEd:
-+    .long   .LEFDEd-.LASFDEd  # length
-+.LASFDEd:
-+    .long   .LASFDEd-.Lframe1 # CIE_pointer
-+    .long   .LFBd-.           # initial_location
-+    .long   .LFEd-.LFBd       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId0-.LFBd
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFId1-.LCFId0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEd:
-+.LSFDEc:
-+    .long   .LEFDEc-.LASFDEc  # length
-+.LASFDEc:
-+    .long   .LASFDEc-.Lframe1 # CIE_pointer
-+    .long   .LFBc-.           # initial_location
-+    .long   .LFEc-.LFBc       # address_range
-+    .uleb128 0                # augmentation size 0
-+                              # instructions:
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc0-.LFBc
-+    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-+    .uleb128 8
-+    .byte   0x85              #  DW_CFA_offset %ebp, 2
-+    .uleb128 2
-+    .byte   0x04              #  DW_CFA_advance_loc4
-+    .long   .LCFIc1-.LCFIc0
-+    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-+    .uleb128 5
-+    .align 4
-+.LEFDEc:
diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
deleted file mode 100644
index a291493b6b29..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Wed Jan 19 00:06:09 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Feb 21 21:13:28 2005
-@@ -77,7 +77,7 @@
- {
- 
- //==================================================================================================
--static typelib_TypeClass cpp2uno_call(
-+void cpp2uno_call(
- 	bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
- 	const typelib_TypeDescription * pMemberTypeDescr,
- 	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-@@ -209,8 +209,6 @@
- 		CPPU_CURRENT_NAMESPACE::raiseException(
-             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-             // has to destruct the any
--		// is here for dummy
--		return typelib_TypeClass_VOID;
- 	}
- 	else // else no exception occured...
- 	{
-@@ -247,22 +245,16 @@
- 		}
- 		if (pReturnTypeDescr)
- 		{
--			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
- 			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
--			return eRet;
- 		}
--		else
--			return typelib_TypeClass_VOID;
- 	}
- }
- 
- 
- //==================================================================================================
--static typelib_TypeClass cpp_mediate(
--	sal_Int32 nFunctionIndex,
--    sal_Int32 nVtableOffset,
--	void ** pCallStack,
--	sal_Int64 * pRegisterReturn /* space for register return */ )
-+extern "C" void cpp_vtable_call(
-+    int nFunctionIndex, int nVtableOffset, void** pCallStack,
-+    sal_Int64 nRegReturn )
- {
- 	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
- 	
-@@ -298,7 +290,6 @@
- 
- 	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-     
--	typelib_TypeClass eRet;
- 	switch (aMemberDescr.get()->eTypeClass)
- 	{
- 	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-@@ -306,11 +297,11 @@
- 		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
- 		{
- 			// is GET method
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
- 				0, 0, // no params
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		else
- 		{
-@@ -321,11 +312,11 @@
- 			aParam.bIn		= sal_True;
- 			aParam.bOut		= sal_False;
- 			
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				0, // indicates void return
- 				1, &aParam,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -336,11 +327,9 @@
- 		{
- 		case 1: // acquire()
- 			pCppI->acquireProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 2: // release()
- 			pCppI->releaseProxy(); // non virtual call!
--			eRet = typelib_TypeClass_VOID;
- 			break;
- 		case 0: // queryInterface() opt
- 		{
-@@ -361,20 +350,19 @@
-                         &pInterface, pTD, cpp_acquire );
-                     pInterface->release();
-                     TYPELIB_DANGER_RELEASE( pTD );
--                    *(void **)pRegisterReturn = pCallStack[1];
--                    eRet = typelib_TypeClass_ANY;
-+                    *(void **)&nRegReturn = pCallStack[1];
-                     break;
-                 }
-                 TYPELIB_DANGER_RELEASE( pTD );
-             }
- 		} // else perform queryInterface()
- 		default:
--			eRet = cpp2uno_call(
-+			cpp2uno_call(
- 				pCppI, aMemberDescr.get(),
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
- 				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
--				pCallStack, pRegisterReturn );
-+				pCallStack, &nRegReturn );
- 		}
- 		break;
- 	}
-@@ -383,72 +371,55 @@
- 		throw RuntimeException(
-             rtl::OUString::createFromAscii("no member description found!"),
-             (XInterface *)pThis );
--		// is here for dummy
--		eRet = typelib_TypeClass_VOID;
- 	}
- 	}
--
--	return eRet;
- }
- 
- //==================================================================================================
--/**
-- * is called on incoming vtable calls
-- * (called by asm snippets)
-- */
--static void cpp_vtable_call(
--    int nFunctionIndex, int nVtableOffset, void** pCallStack )
--    __attribute__((regparm(3)));
--
--void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
--{
--	volatile long nRegReturn[2];
--	typelib_TypeClass aType = cpp_mediate(
--        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
--    
--	switch( aType )
--	{
--		case typelib_TypeClass_HYPER:
--		case typelib_TypeClass_UNSIGNED_HYPER:
--			__asm__( "movl %1, %%edx\n\t"
--					 "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
--			break;
--		case typelib_TypeClass_FLOAT:
--			__asm__( "flds %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "flds %0\n"
--					 : : "m"(*(float *)nRegReturn) );
--			break;
--		case typelib_TypeClass_DOUBLE:
--			__asm__( "fldl %0\n\t"
--					 "fstp %%st(0)\n\t"
--					 "fldl %0\n"
--					 : : "m"(*(double *)nRegReturn) );
--			break;
--// 		case typelib_TypeClass_UNSIGNED_SHORT:
--// 		case typelib_TypeClass_SHORT:
--// 			__asm__( "movswl %0, %%eax\n"
--// 					 : : "m"(nRegReturn) );
--// 		break;
--		default:
--			__asm__( "movl %0, %%eax\n"
--					 : : "m"(nRegReturn[0]) );
--			break;
--	}
--}
--
-+extern "C" void privateSnippetExecutorGeneral();
-+extern "C" void privateSnippetExecutorVoid();
-+extern "C" void privateSnippetExecutorHyper();
-+extern "C" void privateSnippetExecutorFloat();
-+extern "C" void privateSnippetExecutorDouble();
-+extern "C" void privateSnippetExecutorClass();
-+extern "C" typedef void (*PrivateSnippetExecutor)();
- 
--//==================================================================================================
--int const codeSnippetSize = 20;
-+int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
-     unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
--    bool simpleRetType)
-+    typelib_TypeClass returnTypeClass)
- {
--    if (!simpleRetType) {
-+    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-         functionIndex |= 0x80000000;
-     }
-+    PrivateSnippetExecutor exec;
-+    switch (returnTypeClass) {
-+    case typelib_TypeClass_VOID:
-+        exec = privateSnippetExecutorVoid;
-+        break;
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        exec = privateSnippetExecutorHyper;
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+        exec = privateSnippetExecutorFloat;
-+        break;
-+    case typelib_TypeClass_DOUBLE:
-+        exec = privateSnippetExecutorDouble;
-+        break;
-+    case typelib_TypeClass_STRING:
-+    case typelib_TypeClass_TYPE:
-+    case typelib_TypeClass_ANY:
-+    case typelib_TypeClass_SEQUENCE:
-+    case typelib_TypeClass_STRUCT:
-+    case typelib_TypeClass_INTERFACE:
-+        exec = privateSnippetExecutorClass;
-+        break;
-+    default:
-+        exec = privateSnippetExecutorGeneral;
-+        break;
-+    }
-     unsigned char * p = code;
-     OSL_ASSERT(sizeof (sal_Int32) == 4);
-     // mov function_index, %eax:
-@@ -459,13 +430,10 @@
-     *p++ = 0xBA;
-     *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-     p += sizeof (sal_Int32);
--    // mov %esp, %ecx:
--    *p++ = 0x89;
--    *p++ = 0xE1;
--    // jmp cpp_vtable_call:
-+    // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -504,17 +472,17 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceAttributeTypeDescription * >(
--                        member)->pAttributeTypeRef));
-+                reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-+                    member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-             if (!reinterpret_cast<
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
-                 *slots++ = code;
--                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-+                code = codeSnippet(
-+                    code, functionOffset++, vtableOffset,
-+                    typelib_TypeClass_VOID);
-             }
-             break;
- 
-@@ -522,10 +490,8 @@
-             *slots++ = code;
-             code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
--                bridges::cpp_uno::shared::isSimpleType(
--                    reinterpret_cast<
--                    typelib_InterfaceMethodTypeDescription * >(
--                        member)->pReturnTypeRef));
-+                reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-+                    member)->pReturnTypeRef->eTypeClass);
-             break;
- 
-         default:
diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
deleted file mode 100644
index 942e6fccc4c7..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49680#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : catch up recent version of cpp_uno
-
---- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk	Fri May 20 11:14:36 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Fri May 20 11:16:09 2005
-@@ -87,7 +87,8 @@
- SLOFILES= \
- 	$(SLO)$/except.obj		\
- 	$(SLO)$/cpp2uno.obj		\
--	$(SLO)$/uno2cpp.obj
-+    $(SLO)$/uno2cpp.obj \
-+    $(SLO)$/call.obj
- 
- SHL1TARGET= $(TARGET)
- 
-@@ -108,3 +109,6 @@
- 
- .INCLUDE :  target.mk
- 
-+$(SLO)$/%.obj: %.s
-+    $(CC) -c -o $(SLO)$/$(@:b).o $<
-+    touch $@
diff --git a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
deleted file mode 100644
index 3c65cce44a9c..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49678#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : == -> =
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.116
-diff -u -r1.116 configure.in
---- config_office/configure.in	11 Apr 2005 09:31:15 -0000	1.116
-+++ config_office/configure.in	13 May 2005 07:13:41 -0000
-@@ -1787,7 +1787,7 @@
- dnl Checks for javac
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
--    if test "$JDK" == "gcj"; then 
-+    if test "$JDK" = "gcj"; then 
-         javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-     else
-         javacompiler="javac"
-@@ -1871,7 +1871,7 @@
-     fi
- fi
- 
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-    AC_CHECK_HEADER(jni.h, [],
-@@ -1888,7 +1888,7 @@
- dnl ===================================================================
- dnl Check for optional gcj-dbtool
- dnl ===================================================================
--if test "$JDK" == "gcj"; then 
-+if test "$JDK" = "gcj"; then 
-     javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
-     if test -z "$with_jdk_home"; then
-         AC_PATH_PROG(JAVACACHE, $javacache)
-@@ -2684,7 +2684,7 @@
-    if test -z "$MOZILLA_VERSION"; then
-       MOZILLA_VERSION=1.7.5
-    fi
--   if test "$MOZILLA_VERSION" == "1.7b" ; then
-+   if test "$MOZILLA_VERSION" = "1.7b" ; then
-       MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source.tar.gz"
-    else
-       MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}.tar.gz"
diff --git a/editors/openoffice.org-vcltesttool/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-crashrep+source+unx+makefile.mk
deleted file mode 100644
index 3c87525ff42a..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-crashrep+source+unx+makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-Issutracker : #i49679#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : We don't have -ldl and -lnsl
-
-Index: crashrep/source/unx/makefile.mk
-===================================================================
-RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
-retrieving revision 1.14
-diff -u -r1.14 makefile.mk
---- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
-+++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
-@@ -82,7 +82,10 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
--APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS+=-ldl -lnsl
-+.ENDIF
- .IF "$(OS)" == "SOLARIS"
- APP1STDLIBS+=-lsocket
- .ENDIF
diff --git a/editors/openoffice.org-vcltesttool/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-vcltesttool/files/patch-libxmlsec+xmlsec1-1.2.6.patch
deleted file mode 100644
index 81b293cdf9f3..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-libxmlsec+xmlsec1-1.2.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Issutracker : #i49682#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct version number of resultant shared lib
-
-Index: xmlsec1-1.2.6.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
-retrieving revision 1.5
-diff -u -r1.5 xmlsec1-1.2.6.patch
---- libxmlsec/xmlsec1-1.2.6.patch	18 May 2005 10:11:24 -0000	1.5
-+++ libxmlsec/xmlsec1-1.2.6.patch	22 May 2005 01:43:49 -0000
-@@ -756,6 +756,35 @@
- *** misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
- --- misc/build/xmlsec1-1.2.6/ltmain.sh	2005-05-09 19:55:51.745319024 +0200
- ***************
-+*** 2994,3006 ****
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=".$current"
-+! 	  versuffix=".$current.$revision";
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2994,3006 ----
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+***************
- *** 3564,3570 ****
-   		fi
-   	      else
diff --git a/editors/openoffice.org-vcltesttool/files/patch-odk+configure.pl b/editors/openoffice.org-vcltesttool/files/patch-odk+configure.pl
deleted file mode 100644
index a608473de01c..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : canonical name by config.guess for FreeBSD is
-% ./config.guess
-i386-unknown-freebsd5.3
-so, $main::operatingSystem is
-% ./config.guess | cut -d"-" -f3,4
-freebsd5.3
-then, if ( $main::operatingSystem eq "FreeBSD" ) is not correct,
-and if ( $main::operatingSystem =~ /freebsd/ ) is correct
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.11
-diff -u -r1.11 configure.pl
---- odk/configure.pl	29 Mar 2005 12:03:00 -0000	1.11
-+++ odk/configure.pl	15 May 2005 08:46:20 -0000
-@@ -45,7 +45,7 @@
- 
- $main::OO_SDK_MAKE_HOME = "";
- $main::makeName = "make";
--if ( $main::operatingSystem eq "FreeBSD" )
-+if ( $main::operatingSystem =~ /freebsd/ )
- {
-     $main::makeName = "gmake";
- }
diff --git a/editors/openoffice.org-vcltesttool/files/patch-odk+setsdkenv_unix b/editors/openoffice.org-vcltesttool/files/patch-odk+setsdkenv_unix
deleted file mode 100644
index 1165826077b0..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-odk+setsdkenv_unix
+++ /dev/null
@@ -1,39 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-
-Index: odk/setsdkenv_unix.sh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.sh.in
---- odk/setsdkenv_unix.sh.in	29 Mar 2005 12:03:27 -0000	1.5
-+++ odk/setsdkenv_unix.sh.in	15 May 2005 09:06:22 -0000
-@@ -130,7 +130,7 @@
-     export LD_LIBRARY_PATH
-     ;;
- 
--  freebsd)
-+  freebsd*)
-     if [ -n "$OO_SDK_CPP_HOME" ]
-     then
- 	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-Index: odk/setsdkenv_unix.csh.in
-===================================================================
-RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
-retrieving revision 1.5
-diff -u -r1.5 setsdkenv_unix.csh.in
---- odk/setsdkenv_unix.csh.in	29 Mar 2005 12:03:14 -0000	1.5
-+++ odk/setsdkenv_unix.csh.in	15 May 2005 09:06:38 -0000
-@@ -114,7 +114,7 @@
-     endif
-   breaksw
- 
--  case "freebsd":
-+  case "freebsd*":
-     if ( $?OO_SDK_CPP_HOME == 0) then
- 	set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- 	setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
diff --git a/editors/openoffice.org-vcltesttool/files/patch-odk+settings+settings.mk b/editors/openoffice.org-vcltesttool/files/patch-odk+settings+settings.mk
deleted file mode 100644
index 079bd128062c..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-Issutracker : #i41144#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description :
-in odk project, machine type is determined by config.guess,
-for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
-and adding missing things.
-
-Index: odk/settings/settings.mk
-===================================================================
-RCS file: /cvs/api/odk/settings/settings.mk,v
-retrieving revision 1.14
-diff -u -r1.14 settings.mk
---- odk/settings/settings.mk	29 Mar 2005 12:19:26 -0000	1.14
-+++ odk/settings/settings.mk	15 May 2005 13:54:38 -0000
-@@ -397,7 +397,7 @@
- # FreeBSD specific settings
- #
- ###########################################################################
--ifeq "$(PLATFORM)" "freebsd"
-+ifneq (,$(findstring freebsd,$(PLATFORM)))
- # Settings for FreeBSD using gcc compiler
- 
- PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
-@@ -435,6 +435,7 @@
- CSEP=\>
- QUOTE=$(subst S,\,S)
- QM=\"
-+SQM='
- ECHOLINE=@echo
- P2BG=&
- 
-@@ -446,10 +447,10 @@
- # Include UDK version numbers
- include $(PRJ)/include/udkversion.mk
- 
--SALLIB=-lsal
--CPPULIB=-lcppu
--CPPUHELPERLIB=-lcppuhelper$(COMID)
--SALHELPERLIB=-lsalhelper$(COMID)
-+SALLIB=-luno_sal
-+CPPULIB=-luno_cppu
-+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-+SALHELPERLIB=-luno_salhelper$(COMID)
- REGLIB=-lreg
- STORELIB=-lstore
- STLPORTLIB=-lstlport_gcc
diff --git a/editors/openoffice.org-vcltesttool/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-vcltesttool/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 09f2f949c81d..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-Issutracker : #i49677#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : contains illigal char
-
-Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
-===================================================================
-RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
-retrieving revision 1.2
-diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
---- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
-+++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
-@@ -109,7 +109,7 @@
- 		linearly between center and endColor via concentric ellipses
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		circular. If it's not 1, the gradient is elliptical, with the
- 		special twist that the aspect ratio is maintained also for the
- 		center color: the gradient will not collapse into a single
-@@ -124,7 +124,7 @@
- 		linearly between center and endColor via rectangular boxes
- 		around the center point. Note that the absolute size of the
- 		rectangle given at this method does not matter, only it's
--		aspect ratio: if this aspect ratio ís 1, the gradient is
-+		aspect ratio: if this aspect ratio is 1, the gradient is
- 		quadratic. If it's not 1, the gradient is rectangular, with
- 		the special twist that the aspect ratio is maintained also for
- 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-vcltesttool/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-vcltesttool/files/patch-portaudio+portaudio_v18_1.patch
deleted file mode 100644
index 87c43fb14d7c..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-portaudio+portaudio_v18_1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Issutracker : #i46879#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Need to include <sys/soundcard.h> to use sound and passes
-              correct pthread related flags
-
-Index: portaudio/portaudio_v18_1.patch
-===================================================================
-RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
-retrieving revision 1.1
-diff -u -r1.1 portaudio_v18_1.patch
---- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
-+++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
-@@ -12,7 +12,7 @@
-   	;;
-   
-     mingw* )
----- 1883,1902 ----
-+--- 1883,1921 ----
-   case "${host_os}" in
-     darwin* )
-   
-@@ -30,6 +30,25 @@
- ! 	PADLL="libportaudio.so";
- ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
- ! 	CFLAGS="-O2 -fPIC"
-+! 	;;
-+! 
-+!   freebsd* )
-+! 	if test "$OSVERSION" -lt "500016"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-pthread"
-+!         elif test "$OSVERSION" -lt "502102"; then
-+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+!              PTHREAD_LIBS="-lc_r"
-+!         else
-+!              PTHREAD_CFLAGS=""
-+!              PTHREAD_LIBS="-pthread"
-+!         fi
-+! 
-+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+! 	LIBS="-lm ${PTHREAD_LIBS}";
-+! 	PADLL="libportaudio.so";
-+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-+! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
-   	;;
-   
-     mingw* )
-@@ -52,3 +71,18 @@
-   LIBINST = /usr/local/lib
-   
-   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-+
-+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
-+***************
-+*** 43,48 ****
-+--- 43,50 ----
-+  
-+  #ifdef __linux__
-+  #include <linux/soundcard.h>
-++ #elif defined (__FreeBSD__)
-++ #include <sys/soundcard.h>
-+  #else
-+  #include <machine/soundcard.h> /* JH20010905 */
-+  #endif
-+
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-vcltesttool/files/patch-sndfile+libsndfile-1.0.9.patch
deleted file mode 100644
index 71a8f2292f2a..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-sndfile+libsndfile-1.0.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Issutracker : #i49684#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct shared lib number
-
-Index: libsndfile-1.0.9.patch
-===================================================================
-RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
-retrieving revision 1.1
-diff -u -r1.1 libsndfile-1.0.9.patch
---- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
-+++ sndfile/libsndfile-1.0.9.patch	22 May 2005 02:01:17 -0000
-@@ -231,3 +231,24 @@
-   
-   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-   
-+*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
-+--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
-+***************
-+*** 2980,2987 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2980,2987 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sndfile+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-sndfile+makefile.mk
deleted file mode 100644
index 234100480f33..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-sndfile+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i49683#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : -noinhibit-exec allows linking against non-existent libs
-
-Index: sndfile/makefile.mk
-===================================================================
-RCS file: /cvs/external/sndfile/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
-+++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
-@@ -81,7 +81,7 @@
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure --with-pic
--.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
-+.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
- .ENDIF
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 94e3cc8d21bc..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-Issutracker : #i49685#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Update to recent version of unxlngi6.mk
-($Revision: 1.12 and $Author: obo $ $Date: 2005/05/06 09:37:55 $)
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.13
-diff -u -r1.13 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	11 Feb 2005 15:27:55 -0000	1.13
-+++ solenv/inc/unxfbsdi.mk	15 May 2005 04:51:41 -0000
-@@ -99,9 +99,6 @@
- CC+:=$(CFLAGS_SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
- CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
--.IF "$(PRODUCT)"!=""
--CFLAGS+=-Wuninitialized
--.ENDIF
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_SYMBOLS)"=="SMALL"
-@@ -122,6 +119,9 @@
- CFLAGSCXX= -pipe -mtune=pentiumpro
- CFLAGSCXX+= -Wno-ctor-dtor-privacy
- 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=
-@@ -143,6 +143,7 @@
- # Compiler flags for enabling optimazations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+CFLAGSOPT+=-Wuninitialized				# not supported without optimization
- .ELSE 	# "$(PRODUCT)"!=""
- CFLAGSOPT=   							# no optimizing for non products
- .ENDIF	# "$(PRODUCT)"!=""
-@@ -161,11 +162,12 @@
- 
- # name of linker
- LINK*=$(CXX)
-+LINKC*=$(CC)
- 
- # default linker flags
- LINKFLAGSDEFS*=#-Wl,-z,defs
- LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-@@ -237,3 +239,4 @@
- DLLPOSTFIX=fi
- DLLPRE=lib
- DLLPOST=.so
-+