Update to SRC680_m220.

Cws freebsd08 has been merged into the master!

64 files changed, 144 insertions, 10936 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 380f953dd999..579c69c27c59 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -66,10 +66,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		219
+MILESTONE?=		220
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070706
+SNAPDATE=		20070710
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 89e62cfc9151..f9cad8753c8f 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m219_source.tar.bz2) = 16c16611835a060b13a06109d03de55d
-SHA256 (openoffice.org2/OOo_SRC680_m219_source.tar.bz2) = ddaa5ca22d8dcb47d9ea5a678cda4b2e4af94f7358d72d816f92f7e1583552c5
-SIZE (openoffice.org2/OOo_SRC680_m219_source.tar.bz2) = 274602807
+MD5 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 245e58891d2d091ae3a4d484a0488be0
+SHA256 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = f83619ac1a3055a4be7a95d3fead1109d76ab244015da76e208da21af40e2ab7
+SIZE (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 292163303
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-i66667 b/editors/openoffice-3-devel/files/patch-i66667
deleted file mode 100644
index c1d8cd362e9b..000000000000
--- a/editors/openoffice-3-devel/files/patch-i66667
+++ /dev/null
@@ -1,139 +0,0 @@
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Tue May  2 08:01:08 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Fri Sep  8 17:25:05 2006
-@@ -120,6 +120,9 @@
- 			case typelib_TypeClass_UNSIGNED_HYPER:
- 			case typelib_TypeClass_DOUBLE:
- 				pCppStack += sizeof(sal_Int32); // extra long
-+                break;
-+            default:
-+                break;
- 			}
- 			// no longer needed
- 			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-@@ -436,7 +439,7 @@
- unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-     void ** slots, unsigned char * code,
-     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
--    sal_Int32 functionCount, sal_Int32 vtableOffset)
-+    sal_Int32 /*functionCount*/, sal_Int32 vtableOffset)
- {
-     for (sal_Int32 i = 0; i < type->nMembers; ++i) {
-         typelib_TypeDescription * member = 0;
---- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx.orig	Wed Sep  7 18:20:22 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Sep 11 12:21:03 2006
-@@ -37,6 +37,7 @@
- #include <dlfcn.h>
- #include <cxxabi.h>
- #include <hash_map>
-+#include <sys/param.h>
- 
- #include <rtl/strbuf.hxx>
- #include <rtl/ustrbuf.hxx>
-@@ -122,7 +123,11 @@
- };
- //__________________________________________________________________________________________________
- RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 602103
-     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-+#else
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+#endif
- {
- }
- //__________________________________________________________________________________________________
-@@ -139,8 +144,8 @@
-     OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
- 
-     MutexGuard guard( m_mutex );
--    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
--    if (iFind == m_rttis.end())
-+    t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) );
-+    if (iRttiFind == m_rttis.end())
-     {
-         // RTTI symbol
-         OStringBuffer buf( 64 );
-@@ -157,8 +162,11 @@
-         buf.append( 'E' );
- 
-         OString symName( buf.makeStringAndClear() );
--//#iZ 22253 
-+#if __FreeBSD_version < 602103 /* #i22253# */
-         rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-+#else
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+#endif
- 
-         if (rtti)
-         {
-@@ -205,7 +213,7 @@
-     }
-     else
-     {
--        rtti = iFind->second;
-+        rtti = iRttiFind->second;
-     }
- 
-     return rtti;
---- bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Jun 19 19:43:09 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Fri Sep  8 17:25:05 2006
-@@ -142,6 +142,8 @@
- 		case typelib_TypeClass_DOUBLE:
- 			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
- 			break;
-+        default:
-+            break;
- 	}
- }
- 
-@@ -217,6 +219,9 @@
- 			case typelib_TypeClass_UNSIGNED_HYPER:
- 			case typelib_TypeClass_DOUBLE:
- 				pCppStack += sizeof(sal_Int32); // extra long
-+                break;
-+            default:
-+                break;
- 			}
- 			// no longer needed
- 			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-@@ -329,7 +334,6 @@
- 	// is my surrogate
- 	bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
-         = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
--	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
- 	
- 	switch (pMemberDescr->eTypeClass)
- 	{
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx.orig	Wed Jul 19 05:30:01 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	Mon Sep 11 12:21:25 2006
-@@ -37,6 +37,7 @@
- #include <dlfcn.h>
- #include <cxxabi.h>
- #include <hash_map>
-+#include <sys/param.h>
- 
- #include <rtl/strbuf.hxx>
- #include <rtl/ustrbuf.hxx>
-@@ -122,7 +123,11 @@
- };
- //__________________________________________________________________________________________________
- RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 602103
-     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-+#else
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+#endif
- {
- }
- //__________________________________________________________________________________________________
-@@ -157,7 +162,11 @@
-         buf.append( 'E' );
-         
-         OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 602103  /* #i22253# */
-         rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-+#else
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+#endif
- 
-         if (rtti)
-         {
diff --git a/editors/openoffice-3-devel/files/patch-i67904 b/editors/openoffice-3-devel/files/patch-i67904
deleted file mode 100644
index 520242bb45a0..000000000000
--- a/editors/openoffice-3-devel/files/patch-i67904
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: sal/osl/unx/socket.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/socket.c,v
-retrieving revision 1.26
-diff -u -r1.26 socket.c
---- sal/osl/unx/socket.c	19 Jul 2006 09:39:22 -0000	1.26
-+++ sal/osl/unx/socket.c	29 Jul 2006 09:53:04 -0000
-@@ -813,7 +813,7 @@
- 	const char *name, struct hostent *result,
- 	char *buffer, int buflen, int *h_errnop)
- {
--#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015))
-+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
- 	struct hostent *__result; /* will be the same as result */
- 	int __error;
- 	__error = gethostbyname_r (name, result, buffer, buflen,
-Index: sal/osl/unx/system.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/system.c,v
-retrieving revision 1.13
-diff -u -r1.13 system.c
---- sal/osl/unx/system.c	19 Jul 2006 09:39:37 -0000	1.13
-+++ sal/osl/unx/system.c	9 Sep 2006 09:57:26 -0000
-@@ -343,7 +343,7 @@
- }
- #endif /* defined SCO */
- 
--#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
- 
- extern int h_errno;
- 
-@@ -435,7 +435,7 @@
- 
-   	return res;
- }
--#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- 
- #if defined(MACOSX)
- /*
-
-Index: sal/osl/unx/system.h
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/system.h,v
-retrieving revision 1.33
-diff -u -r1.33 system.h
---- sal/osl/unx/system.h	19 Jul 2006 09:39:50 -0000	1.33
-+++ sal/osl/unx/system.h	9 Sep 2006 09:55:55 -0000
-@@ -537,10 +537,10 @@
- struct tm *localtime_r(const time_t *timep, struct tm *buffer);
- struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
- #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
--#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
- struct hostent *gethostbyname_r(const char *name, struct hostent *result,
- 								char *buffer, int buflen, int *h_errnop);
--#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- #endif
- 
- #endif /* __OSL_SYSTEM_H__ */
-
-Index: moz/mozilla-source-1.7.5.patch
-===================================================================
-RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v
-retrieving revision 1.14
-diff -u -r1.14 mozilla-source-1.7.5.patch
---- moz/mozilla-source-1.7.5.patch	17 Apr 2007 08:54:47 -0000	1.14
-+++ moz/mozilla-source-1.7.5.patch	27 Apr 2007 05:57:10 -0000
-@@ -7821,7 +7821,7 @@
-   #endif
-   
- ! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
--! 	(defined(__FreeBSD__) && __FreeBSD_version > 700016)
-+! 	(defined(__FreeBSD__) && __FreeBSD_version > 601103)
-   #define _PR_HAVE_GETPROTO_R
-   #define _PR_HAVE_5_ARG_GETPROTO_R
-   #endif
diff --git a/editors/openoffice-3-devel/files/patch-i69418 b/editors/openoffice-3-devel/files/patch-i69418
deleted file mode 100644
index dd23c55e4c9b..000000000000
--- a/editors/openoffice-3-devel/files/patch-i69418
+++ /dev/null
@@ -1,38 +0,0 @@
---- moz/mozilla-source-1.7.5.patch.org	Sat Sep  9 18:43:45 2006
-+++ moz/mozilla-source-1.7.5.patch	Sat Sep  9 18:42:00 2006
-@@ -151,6 +151,17 @@
-          AR_EXTRACT="$AR x"
-          AR_DELETE="$AR d"
- ***************
-+*** 7504,7509 ****
-+--- 7504,7511 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
-+  echo "configure:7510: checking for gethostbyname_r in -lc_r" >&5
-+***************
- *** 16606,16613 ****
-   
-   case "$host_os" in
-@@ -191,6 +202,17 @@
-          AR_EXTRACT="$AR x"
-          AR_DELETE="$AR d"
- ***************
-+*** 1981,1986 ****
-+--- 1981,1988 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	AC_CHECK_LIB(c_r, gethostbyname_r)
-+  	;;
-+***************
- *** 5692,5699 ****
-   dnl ========================================================
-   case "$host_os" in
diff --git a/editors/openoffice-3-devel/files/patch-i69994 b/editors/openoffice-3-devel/files/patch-i69994
deleted file mode 100644
index 9d2718b4763c..000000000000
--- a/editors/openoffice-3-devel/files/patch-i69994
+++ /dev/null
@@ -1,747 +0,0 @@
-Index: python/Python-2.3.4.patch
-===================================================================
-RCS file: /cvs/external/python/Python-2.3.4.patch,v
-retrieving revision 1.12
-diff -u -r1.12 Python-2.3.4.patch
---- python/Python-2.3.4.patch	25 Sep 2006 13:22:02 -0000	1.12
-+++ python/Python-2.3.4.patch	29 Sep 2006 22:06:08 -0000
-@@ -13463,3 +13463,739 @@
-   	handler = signal(sig, SIG_IGN);
-   	signal(sig, handler);
-   	return handler;
-+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:26:23 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:20:25 2005
-+***************
-+*** 0 ****
-+--- 1,355 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ IPPROTO_IP = 0
-++ IPPROTO_HOPOPTS = 0
-++ IPPROTO_ICMP = 1
-++ IPPROTO_IGMP = 2
-++ IPPROTO_GGP = 3
-++ IPPROTO_IPV4 = 4
-++ IPPROTO_IPIP = IPPROTO_IPV4
-++ IPPROTO_TCP = 6
-++ IPPROTO_ST = 7
-++ IPPROTO_EGP = 8
-++ IPPROTO_PIGP = 9
-++ IPPROTO_RCCMON = 10
-++ IPPROTO_NVPII = 11
-++ IPPROTO_PUP = 12
-++ IPPROTO_ARGUS = 13
-++ IPPROTO_EMCON = 14
-++ IPPROTO_XNET = 15
-++ IPPROTO_CHAOS = 16
-++ IPPROTO_UDP = 17
-++ IPPROTO_MUX = 18
-++ IPPROTO_MEAS = 19
-++ IPPROTO_HMP = 20
-++ IPPROTO_PRM = 21
-++ IPPROTO_IDP = 22
-++ IPPROTO_TRUNK1 = 23
-++ IPPROTO_TRUNK2 = 24
-++ IPPROTO_LEAF1 = 25
-++ IPPROTO_LEAF2 = 26
-++ IPPROTO_RDP = 27
-++ IPPROTO_IRTP = 28
-++ IPPROTO_TP = 29
-++ IPPROTO_BLT = 30
-++ IPPROTO_NSP = 31
-++ IPPROTO_INP = 32
-++ IPPROTO_SEP = 33
-++ IPPROTO_3PC = 34
-++ IPPROTO_IDPR = 35
-++ IPPROTO_XTP = 36
-++ IPPROTO_DDP = 37
-++ IPPROTO_CMTP = 38
-++ IPPROTO_TPXX = 39
-++ IPPROTO_IL = 40
-++ IPPROTO_IPV6 = 41
-++ IPPROTO_SDRP = 42
-++ IPPROTO_ROUTING = 43
-++ IPPROTO_FRAGMENT = 44
-++ IPPROTO_IDRP = 45
-++ IPPROTO_RSVP = 46
-++ IPPROTO_GRE = 47
-++ IPPROTO_MHRP = 48
-++ IPPROTO_BHA = 49
-++ IPPROTO_ESP = 50
-++ IPPROTO_AH = 51
-++ IPPROTO_INLSP = 52
-++ IPPROTO_SWIPE = 53
-++ IPPROTO_NHRP = 54
-++ IPPROTO_ICMPV6 = 58
-++ IPPROTO_NONE = 59
-++ IPPROTO_DSTOPTS = 60
-++ IPPROTO_AHIP = 61
-++ IPPROTO_CFTP = 62
-++ IPPROTO_HELLO = 63
-++ IPPROTO_SATEXPAK = 64
-++ IPPROTO_KRYPTOLAN = 65
-++ IPPROTO_RVD = 66
-++ IPPROTO_IPPC = 67
-++ IPPROTO_ADFS = 68
-++ IPPROTO_SATMON = 69
-++ IPPROTO_VISA = 70
-++ IPPROTO_IPCV = 71
-++ IPPROTO_CPNX = 72
-++ IPPROTO_CPHB = 73
-++ IPPROTO_WSN = 74
-++ IPPROTO_PVP = 75
-++ IPPROTO_BRSATMON = 76
-++ IPPROTO_ND = 77
-++ IPPROTO_WBMON = 78
-++ IPPROTO_WBEXPAK = 79
-++ IPPROTO_EON = 80
-++ IPPROTO_VMTP = 81
-++ IPPROTO_SVMTP = 82
-++ IPPROTO_VINES = 83
-++ IPPROTO_TTP = 84
-++ IPPROTO_IGP = 85
-++ IPPROTO_DGP = 86
-++ IPPROTO_TCF = 87
-++ IPPROTO_IGRP = 88
-++ IPPROTO_OSPFIGP = 89
-++ IPPROTO_SRPC = 90
-++ IPPROTO_LARP = 91
-++ IPPROTO_MTP = 92
-++ IPPROTO_AX25 = 93
-++ IPPROTO_IPEIP = 94
-++ IPPROTO_MICP = 95
-++ IPPROTO_SCCSP = 96
-++ IPPROTO_ETHERIP = 97
-++ IPPROTO_ENCAP = 98
-++ IPPROTO_APES = 99
-++ IPPROTO_GMTP = 100
-++ IPPROTO_IPCOMP = 108
-++ IPPROTO_PIM = 103
-++ IPPROTO_PGM = 113
-++ IPPROTO_DIVERT = 254
-++ IPPROTO_RAW = 255
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPORT_RESERVED = 1024
-++ IPPORT_USERRESERVED = 5000
-++ IPPORT_HIFIRSTAUTO = 49152
-++ IPPORT_HILASTAUTO = 65535
-++ IPPORT_RESERVEDSTART = 600
-++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
-++ 
-++ IN_CLASSA_NET = 0xff000000
-++ IN_CLASSA_NSHIFT = 24
-++ IN_CLASSA_HOST = 0x00ffffff
-++ IN_CLASSA_MAX = 128
-++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
-++ 
-++ IN_CLASSB_NET = 0xffff0000
-++ IN_CLASSB_NSHIFT = 16
-++ IN_CLASSB_HOST = 0x0000ffff
-++ IN_CLASSB_MAX = 65536
-++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
-++ 
-++ IN_CLASSC_NET = 0xffffff00
-++ IN_CLASSC_NSHIFT = 8
-++ IN_CLASSC_HOST = 0x000000ff
-++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
-++ 
-++ IN_CLASSD_NET = 0xf0000000
-++ IN_CLASSD_NSHIFT = 28
-++ IN_CLASSD_HOST = 0x0fffffff
-++ def IN_MULTICAST(i): return IN_CLASSD(i)
-++ 
-++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ INADDR_NONE = 0xffffffff
-++ IN_LOOPBACKNET = 127
-++ INET_ADDRSTRLEN = 16
-++ IP_OPTIONS = 1
-++ IP_HDRINCL = 2
-++ IP_TOS = 3
-++ IP_TTL = 4
-++ IP_RECVOPTS = 5
-++ IP_RECVRETOPTS = 6
-++ IP_RECVDSTADDR = 7
-++ IP_RETOPTS = 8
-++ IP_MULTICAST_IF = 9
-++ IP_MULTICAST_TTL = 10
-++ IP_MULTICAST_LOOP = 11
-++ IP_ADD_MEMBERSHIP = 12
-++ IP_DROP_MEMBERSHIP = 13
-++ IP_MULTICAST_VIF = 14
-++ IP_RSVP_ON = 15
-++ IP_RSVP_OFF = 16
-++ IP_RSVP_VIF_ON = 17
-++ IP_RSVP_VIF_OFF = 18
-++ IP_PORTRANGE = 19
-++ IP_RECVIF = 20
-++ IP_IPSEC_POLICY = 21
-++ IP_FAITH = 22
-++ IP_FW_ADD = 50
-++ IP_FW_DEL = 51
-++ IP_FW_FLUSH = 52
-++ IP_FW_ZERO = 53
-++ IP_FW_GET = 54
-++ IP_FW_RESETLOG = 55
-++ IP_DUMMYNET_CONFIGURE = 60
-++ IP_DUMMYNET_DEL = 61
-++ IP_DUMMYNET_FLUSH = 62
-++ IP_DUMMYNET_GET = 64
-++ IP_DEFAULT_MULTICAST_TTL = 1
-++ IP_DEFAULT_MULTICAST_LOOP = 1
-++ IP_MAX_MEMBERSHIPS = 20
-++ IP_PORTRANGE_DEFAULT = 0
-++ IP_PORTRANGE_HIGH = 1
-++ IP_PORTRANGE_LOW = 2
-++ IPPROTO_MAXID = (IPPROTO_AH + 1)
-++ IPCTL_FORWARDING = 1
-++ IPCTL_SENDREDIRECTS = 2
-++ IPCTL_DEFTTL = 3
-++ IPCTL_DEFMTU = 4
-++ IPCTL_RTEXPIRE = 5
-++ IPCTL_RTMINEXPIRE = 6
-++ IPCTL_RTMAXCACHE = 7
-++ IPCTL_SOURCEROUTE = 8
-++ IPCTL_DIRECTEDBROADCAST = 9
-++ IPCTL_INTRQMAXLEN = 10
-++ IPCTL_INTRQDROPS = 11
-++ IPCTL_STATS = 12
-++ IPCTL_ACCEPTSOURCEROUTE = 13
-++ IPCTL_FASTFORWARDING = 14
-++ IPCTL_KEEPFAITH = 15
-++ IPCTL_GIF_TTL = 16
-++ IPCTL_MAXID = 17
-++ 
-++ # Included from netinet6/in6.h
-++ 
-++ # Included from sys/queue.h
-++ def SLIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def SLIST_ENTRY(type): return \
-++ 
-++ def STAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def STAILQ_ENTRY(type): return \
-++ 
-++ def LIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def LIST_ENTRY(type): return \
-++ 
-++ def TAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def TAILQ_ENTRY(type): return \
-++ 
-++ def CIRCLEQ_ENTRY(type): return \
-++ 
-++ __KAME_VERSION = "20000701/FreeBSD-current"
-++ IPV6PORT_RESERVED = 1024
-++ IPV6PORT_ANONMIN = 49152
-++ IPV6PORT_ANONMAX = 65535
-++ IPV6PORT_RESERVEDMIN = 600
-++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-++ INET6_ADDRSTRLEN = 46
-++ IPV6_ADDR_INT32_ONE = 1
-++ IPV6_ADDR_INT32_TWO = 2
-++ IPV6_ADDR_INT32_MNL = 0xff010000
-++ IPV6_ADDR_INT32_MLL = 0xff020000
-++ IPV6_ADDR_INT32_SMP = 0x0000ffff
-++ IPV6_ADDR_INT16_ULL = 0xfe80
-++ IPV6_ADDR_INT16_USL = 0xfec0
-++ IPV6_ADDR_INT16_MLL = 0xff02
-++ IPV6_ADDR_INT32_ONE = 0x01000000
-++ IPV6_ADDR_INT32_TWO = 0x02000000
-++ IPV6_ADDR_INT32_MNL = 0x000001ff
-++ IPV6_ADDR_INT32_MLL = 0x000002ff
-++ IPV6_ADDR_INT32_SMP = 0xffff0000
-++ IPV6_ADDR_INT16_ULL = 0x80fe
-++ IPV6_ADDR_INT16_USL = 0xc0fe
-++ IPV6_ADDR_INT16_MLL = 0x02ff
-++ def IN6_IS_ADDR_UNSPECIFIED(a): return \
-++ 
-++ def IN6_IS_ADDR_LOOPBACK(a): return \
-++ 
-++ def IN6_IS_ADDR_V4COMPAT(a): return \
-++ 
-++ def IN6_IS_ADDR_V4MAPPED(a): return \
-++ 
-++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ def IN6_IS_ADDR_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_SCOPE_LINKLOCAL(a): return \
-++ 
-++ IPV6_OPTIONS = 1
-++ IPV6_RECVOPTS = 5
-++ IPV6_RECVRETOPTS = 6
-++ IPV6_RECVDSTADDR = 7
-++ IPV6_RETOPTS = 8
-++ IPV6_SOCKOPT_RESERVED1 = 3
-++ IPV6_UNICAST_HOPS = 4
-++ IPV6_MULTICAST_IF = 9
-++ IPV6_MULTICAST_HOPS = 10
-++ IPV6_MULTICAST_LOOP = 11
-++ IPV6_JOIN_GROUP = 12
-++ IPV6_LEAVE_GROUP = 13
-++ IPV6_PORTRANGE = 14
-++ ICMP6_FILTER = 18
-++ IPV6_PKTINFO = 19
-++ IPV6_HOPLIMIT = 20
-++ IPV6_NEXTHOP = 21
-++ IPV6_HOPOPTS = 22
-++ IPV6_DSTOPTS = 23
-++ IPV6_RTHDR = 24
-++ IPV6_PKTOPTIONS = 25
-++ IPV6_CHECKSUM = 26
-++ IPV6_BINDV6ONLY = 27
-++ IPV6_IPSEC_POLICY = 28
-++ IPV6_FAITH = 29
-++ IPV6_FW_ADD = 30
-++ IPV6_FW_DEL = 31
-++ IPV6_FW_FLUSH = 32
-++ IPV6_FW_ZERO = 33
-++ IPV6_FW_GET = 34
-++ IPV6_RTHDR_LOOSE = 0
-++ IPV6_RTHDR_STRICT = 1
-++ IPV6_RTHDR_TYPE_0 = 0
-++ IPV6_DEFAULT_MULTICAST_HOPS = 1
-++ IPV6_DEFAULT_MULTICAST_LOOP = 1
-++ IPV6_PORTRANGE_DEFAULT = 0
-++ IPV6_PORTRANGE_HIGH = 1
-++ IPV6_PORTRANGE_LOW = 2
-++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-++ IPV6CTL_FORWARDING = 1
-++ IPV6CTL_SENDREDIRECTS = 2
-++ IPV6CTL_DEFHLIM = 3
-++ IPV6CTL_DEFMTU = 4
-++ IPV6CTL_FORWSRCRT = 5
-++ IPV6CTL_STATS = 6
-++ IPV6CTL_MRTSTATS = 7
-++ IPV6CTL_MRTPROTO = 8
-++ IPV6CTL_MAXFRAGPACKETS = 9
-++ IPV6CTL_SOURCECHECK = 10
-++ IPV6CTL_SOURCECHECK_LOGINT = 11
-++ IPV6CTL_ACCEPT_RTADV = 12
-++ IPV6CTL_KEEPFAITH = 13
-++ IPV6CTL_LOG_INTERVAL = 14
-++ IPV6CTL_HDRNESTLIMIT = 15
-++ IPV6CTL_DAD_COUNT = 16
-++ IPV6CTL_AUTO_FLOWLABEL = 17
-++ IPV6CTL_DEFMCASTHLIM = 18
-++ IPV6CTL_GIF_HLIM = 19
-++ IPV6CTL_KAME_VERSION = 20
-++ IPV6CTL_USE_DEPRECATED = 21
-++ IPV6CTL_RR_PRUNE = 22
-++ IPV6CTL_MAPPED_ADDR = 23
-++ IPV6CTL_BINDV6ONLY = 24
-++ IPV6CTL_RTEXPIRE = 25
-++ IPV6CTL_RTMINEXPIRE = 26
-++ IPV6CTL_RTMAXCACHE = 27
-++ IPV6CTL_MAXID = 28
-+*** misc/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:26:27 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:19:02 2005
-+***************
-+*** 0 ****
-+--- 1,3 ----
-++ #! /bin/sh
-++ set -v
-++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
-+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:26:23 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:20:25 2005
-+***************
-+*** 0 ****
-+--- 1,355 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ IPPROTO_IP = 0
-++ IPPROTO_HOPOPTS = 0
-++ IPPROTO_ICMP = 1
-++ IPPROTO_IGMP = 2
-++ IPPROTO_GGP = 3
-++ IPPROTO_IPV4 = 4
-++ IPPROTO_IPIP = IPPROTO_IPV4
-++ IPPROTO_TCP = 6
-++ IPPROTO_ST = 7
-++ IPPROTO_EGP = 8
-++ IPPROTO_PIGP = 9
-++ IPPROTO_RCCMON = 10
-++ IPPROTO_NVPII = 11
-++ IPPROTO_PUP = 12
-++ IPPROTO_ARGUS = 13
-++ IPPROTO_EMCON = 14
-++ IPPROTO_XNET = 15
-++ IPPROTO_CHAOS = 16
-++ IPPROTO_UDP = 17
-++ IPPROTO_MUX = 18
-++ IPPROTO_MEAS = 19
-++ IPPROTO_HMP = 20
-++ IPPROTO_PRM = 21
-++ IPPROTO_IDP = 22
-++ IPPROTO_TRUNK1 = 23
-++ IPPROTO_TRUNK2 = 24
-++ IPPROTO_LEAF1 = 25
-++ IPPROTO_LEAF2 = 26
-++ IPPROTO_RDP = 27
-++ IPPROTO_IRTP = 28
-++ IPPROTO_TP = 29
-++ IPPROTO_BLT = 30
-++ IPPROTO_NSP = 31
-++ IPPROTO_INP = 32
-++ IPPROTO_SEP = 33
-++ IPPROTO_3PC = 34
-++ IPPROTO_IDPR = 35
-++ IPPROTO_XTP = 36
-++ IPPROTO_DDP = 37
-++ IPPROTO_CMTP = 38
-++ IPPROTO_TPXX = 39
-++ IPPROTO_IL = 40
-++ IPPROTO_IPV6 = 41
-++ IPPROTO_SDRP = 42
-++ IPPROTO_ROUTING = 43
-++ IPPROTO_FRAGMENT = 44
-++ IPPROTO_IDRP = 45
-++ IPPROTO_RSVP = 46
-++ IPPROTO_GRE = 47
-++ IPPROTO_MHRP = 48
-++ IPPROTO_BHA = 49
-++ IPPROTO_ESP = 50
-++ IPPROTO_AH = 51
-++ IPPROTO_INLSP = 52
-++ IPPROTO_SWIPE = 53
-++ IPPROTO_NHRP = 54
-++ IPPROTO_ICMPV6 = 58
-++ IPPROTO_NONE = 59
-++ IPPROTO_DSTOPTS = 60
-++ IPPROTO_AHIP = 61
-++ IPPROTO_CFTP = 62
-++ IPPROTO_HELLO = 63
-++ IPPROTO_SATEXPAK = 64
-++ IPPROTO_KRYPTOLAN = 65
-++ IPPROTO_RVD = 66
-++ IPPROTO_IPPC = 67
-++ IPPROTO_ADFS = 68
-++ IPPROTO_SATMON = 69
-++ IPPROTO_VISA = 70
-++ IPPROTO_IPCV = 71
-++ IPPROTO_CPNX = 72
-++ IPPROTO_CPHB = 73
-++ IPPROTO_WSN = 74
-++ IPPROTO_PVP = 75
-++ IPPROTO_BRSATMON = 76
-++ IPPROTO_ND = 77
-++ IPPROTO_WBMON = 78
-++ IPPROTO_WBEXPAK = 79
-++ IPPROTO_EON = 80
-++ IPPROTO_VMTP = 81
-++ IPPROTO_SVMTP = 82
-++ IPPROTO_VINES = 83
-++ IPPROTO_TTP = 84
-++ IPPROTO_IGP = 85
-++ IPPROTO_DGP = 86
-++ IPPROTO_TCF = 87
-++ IPPROTO_IGRP = 88
-++ IPPROTO_OSPFIGP = 89
-++ IPPROTO_SRPC = 90
-++ IPPROTO_LARP = 91
-++ IPPROTO_MTP = 92
-++ IPPROTO_AX25 = 93
-++ IPPROTO_IPEIP = 94
-++ IPPROTO_MICP = 95
-++ IPPROTO_SCCSP = 96
-++ IPPROTO_ETHERIP = 97
-++ IPPROTO_ENCAP = 98
-++ IPPROTO_APES = 99
-++ IPPROTO_GMTP = 100
-++ IPPROTO_IPCOMP = 108
-++ IPPROTO_PIM = 103
-++ IPPROTO_PGM = 113
-++ IPPROTO_DIVERT = 254
-++ IPPROTO_RAW = 255
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPORT_RESERVED = 1024
-++ IPPORT_USERRESERVED = 5000
-++ IPPORT_HIFIRSTAUTO = 49152
-++ IPPORT_HILASTAUTO = 65535
-++ IPPORT_RESERVEDSTART = 600
-++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
-++ 
-++ IN_CLASSA_NET = 0xff000000
-++ IN_CLASSA_NSHIFT = 24
-++ IN_CLASSA_HOST = 0x00ffffff
-++ IN_CLASSA_MAX = 128
-++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
-++ 
-++ IN_CLASSB_NET = 0xffff0000
-++ IN_CLASSB_NSHIFT = 16
-++ IN_CLASSB_HOST = 0x0000ffff
-++ IN_CLASSB_MAX = 65536
-++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
-++ 
-++ IN_CLASSC_NET = 0xffffff00
-++ IN_CLASSC_NSHIFT = 8
-++ IN_CLASSC_HOST = 0x000000ff
-++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
-++ 
-++ IN_CLASSD_NET = 0xf0000000
-++ IN_CLASSD_NSHIFT = 28
-++ IN_CLASSD_HOST = 0x0fffffff
-++ def IN_MULTICAST(i): return IN_CLASSD(i)
-++ 
-++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ INADDR_NONE = 0xffffffff
-++ IN_LOOPBACKNET = 127
-++ INET_ADDRSTRLEN = 16
-++ IP_OPTIONS = 1
-++ IP_HDRINCL = 2
-++ IP_TOS = 3
-++ IP_TTL = 4
-++ IP_RECVOPTS = 5
-++ IP_RECVRETOPTS = 6
-++ IP_RECVDSTADDR = 7
-++ IP_RETOPTS = 8
-++ IP_MULTICAST_IF = 9
-++ IP_MULTICAST_TTL = 10
-++ IP_MULTICAST_LOOP = 11
-++ IP_ADD_MEMBERSHIP = 12
-++ IP_DROP_MEMBERSHIP = 13
-++ IP_MULTICAST_VIF = 14
-++ IP_RSVP_ON = 15
-++ IP_RSVP_OFF = 16
-++ IP_RSVP_VIF_ON = 17
-++ IP_RSVP_VIF_OFF = 18
-++ IP_PORTRANGE = 19
-++ IP_RECVIF = 20
-++ IP_IPSEC_POLICY = 21
-++ IP_FAITH = 22
-++ IP_FW_ADD = 50
-++ IP_FW_DEL = 51
-++ IP_FW_FLUSH = 52
-++ IP_FW_ZERO = 53
-++ IP_FW_GET = 54
-++ IP_FW_RESETLOG = 55
-++ IP_DUMMYNET_CONFIGURE = 60
-++ IP_DUMMYNET_DEL = 61
-++ IP_DUMMYNET_FLUSH = 62
-++ IP_DUMMYNET_GET = 64
-++ IP_DEFAULT_MULTICAST_TTL = 1
-++ IP_DEFAULT_MULTICAST_LOOP = 1
-++ IP_MAX_MEMBERSHIPS = 20
-++ IP_PORTRANGE_DEFAULT = 0
-++ IP_PORTRANGE_HIGH = 1
-++ IP_PORTRANGE_LOW = 2
-++ IPPROTO_MAXID = (IPPROTO_AH + 1)
-++ IPCTL_FORWARDING = 1
-++ IPCTL_SENDREDIRECTS = 2
-++ IPCTL_DEFTTL = 3
-++ IPCTL_DEFMTU = 4
-++ IPCTL_RTEXPIRE = 5
-++ IPCTL_RTMINEXPIRE = 6
-++ IPCTL_RTMAXCACHE = 7
-++ IPCTL_SOURCEROUTE = 8
-++ IPCTL_DIRECTEDBROADCAST = 9
-++ IPCTL_INTRQMAXLEN = 10
-++ IPCTL_INTRQDROPS = 11
-++ IPCTL_STATS = 12
-++ IPCTL_ACCEPTSOURCEROUTE = 13
-++ IPCTL_FASTFORWARDING = 14
-++ IPCTL_KEEPFAITH = 15
-++ IPCTL_GIF_TTL = 16
-++ IPCTL_MAXID = 17
-++ 
-++ # Included from netinet6/in6.h
-++ 
-++ # Included from sys/queue.h
-++ def SLIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def SLIST_ENTRY(type): return \
-++ 
-++ def STAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def STAILQ_ENTRY(type): return \
-++ 
-++ def LIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def LIST_ENTRY(type): return \
-++ 
-++ def TAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def TAILQ_ENTRY(type): return \
-++ 
-++ def CIRCLEQ_ENTRY(type): return \
-++ 
-++ __KAME_VERSION = "20000701/FreeBSD-current"
-++ IPV6PORT_RESERVED = 1024
-++ IPV6PORT_ANONMIN = 49152
-++ IPV6PORT_ANONMAX = 65535
-++ IPV6PORT_RESERVEDMIN = 600
-++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-++ INET6_ADDRSTRLEN = 46
-++ IPV6_ADDR_INT32_ONE = 1
-++ IPV6_ADDR_INT32_TWO = 2
-++ IPV6_ADDR_INT32_MNL = 0xff010000
-++ IPV6_ADDR_INT32_MLL = 0xff020000
-++ IPV6_ADDR_INT32_SMP = 0x0000ffff
-++ IPV6_ADDR_INT16_ULL = 0xfe80
-++ IPV6_ADDR_INT16_USL = 0xfec0
-++ IPV6_ADDR_INT16_MLL = 0xff02
-++ IPV6_ADDR_INT32_ONE = 0x01000000
-++ IPV6_ADDR_INT32_TWO = 0x02000000
-++ IPV6_ADDR_INT32_MNL = 0x000001ff
-++ IPV6_ADDR_INT32_MLL = 0x000002ff
-++ IPV6_ADDR_INT32_SMP = 0xffff0000
-++ IPV6_ADDR_INT16_ULL = 0x80fe
-++ IPV6_ADDR_INT16_USL = 0xc0fe
-++ IPV6_ADDR_INT16_MLL = 0x02ff
-++ def IN6_IS_ADDR_UNSPECIFIED(a): return \
-++ 
-++ def IN6_IS_ADDR_LOOPBACK(a): return \
-++ 
-++ def IN6_IS_ADDR_V4COMPAT(a): return \
-++ 
-++ def IN6_IS_ADDR_V4MAPPED(a): return \
-++ 
-++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ def IN6_IS_ADDR_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_SCOPE_LINKLOCAL(a): return \
-++ 
-++ IPV6_OPTIONS = 1
-++ IPV6_RECVOPTS = 5
-++ IPV6_RECVRETOPTS = 6
-++ IPV6_RECVDSTADDR = 7
-++ IPV6_RETOPTS = 8
-++ IPV6_SOCKOPT_RESERVED1 = 3
-++ IPV6_UNICAST_HOPS = 4
-++ IPV6_MULTICAST_IF = 9
-++ IPV6_MULTICAST_HOPS = 10
-++ IPV6_MULTICAST_LOOP = 11
-++ IPV6_JOIN_GROUP = 12
-++ IPV6_LEAVE_GROUP = 13
-++ IPV6_PORTRANGE = 14
-++ ICMP6_FILTER = 18
-++ IPV6_PKTINFO = 19
-++ IPV6_HOPLIMIT = 20
-++ IPV6_NEXTHOP = 21
-++ IPV6_HOPOPTS = 22
-++ IPV6_DSTOPTS = 23
-++ IPV6_RTHDR = 24
-++ IPV6_PKTOPTIONS = 25
-++ IPV6_CHECKSUM = 26
-++ IPV6_BINDV6ONLY = 27
-++ IPV6_IPSEC_POLICY = 28
-++ IPV6_FAITH = 29
-++ IPV6_FW_ADD = 30
-++ IPV6_FW_DEL = 31
-++ IPV6_FW_FLUSH = 32
-++ IPV6_FW_ZERO = 33
-++ IPV6_FW_GET = 34
-++ IPV6_RTHDR_LOOSE = 0
-++ IPV6_RTHDR_STRICT = 1
-++ IPV6_RTHDR_TYPE_0 = 0
-++ IPV6_DEFAULT_MULTICAST_HOPS = 1
-++ IPV6_DEFAULT_MULTICAST_LOOP = 1
-++ IPV6_PORTRANGE_DEFAULT = 0
-++ IPV6_PORTRANGE_HIGH = 1
-++ IPV6_PORTRANGE_LOW = 2
-++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-++ IPV6CTL_FORWARDING = 1
-++ IPV6CTL_SENDREDIRECTS = 2
-++ IPV6CTL_DEFHLIM = 3
-++ IPV6CTL_DEFMTU = 4
-++ IPV6CTL_FORWSRCRT = 5
-++ IPV6CTL_STATS = 6
-++ IPV6CTL_MRTSTATS = 7
-++ IPV6CTL_MRTPROTO = 8
-++ IPV6CTL_MAXFRAGPACKETS = 9
-++ IPV6CTL_SOURCECHECK = 10
-++ IPV6CTL_SOURCECHECK_LOGINT = 11
-++ IPV6CTL_ACCEPT_RTADV = 12
-++ IPV6CTL_KEEPFAITH = 13
-++ IPV6CTL_LOG_INTERVAL = 14
-++ IPV6CTL_HDRNESTLIMIT = 15
-++ IPV6CTL_DAD_COUNT = 16
-++ IPV6CTL_AUTO_FLOWLABEL = 17
-++ IPV6CTL_DEFMCASTHLIM = 18
-++ IPV6CTL_GIF_HLIM = 19
-++ IPV6CTL_KAME_VERSION = 20
-++ IPV6CTL_USE_DEPRECATED = 21
-++ IPV6CTL_RR_PRUNE = 22
-++ IPV6CTL_MAPPED_ADDR = 23
-++ IPV6CTL_BINDV6ONLY = 24
-++ IPV6CTL_RTEXPIRE = 25
-++ IPV6CTL_RTMINEXPIRE = 26
-++ IPV6CTL_RTMAXCACHE = 27
-++ IPV6CTL_MAXID = 28
-+*** misc/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:26:27 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:19:02 2005
-+***************
-+*** 0 ****
-+--- 1,3 ----
-++ #! /bin/sh
-++ set -v
-++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
diff --git a/editors/openoffice-3-devel/files/patch-i73157 b/editors/openoffice-3-devel/files/patch-i73157
deleted file mode 100644
index 17d987622060..000000000000
--- a/editors/openoffice-3-devel/files/patch-i73157
+++ /dev/null
@@ -1,30 +0,0 @@
---- epm/epm-3.7.patch.orig	Tue Aug  1 22:20:23 2006
-+++ epm/epm-3.7.patch	Sat Dec 23 07:00:30 2006
-@@ -68,7 +68,11 @@
-         fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-       }
- ***************
--*** 330,337 ****
-+*** 326,337 ****
-+    if (Verbosity)
-+      puts("Building FreeBSD pkg binary distribution...");
-+  
-+!   if (run_command(NULL, "pkg_create -p / -s %s -c %s -d %s -f %s %s",
-                     current, commentname, descrname, plistname, name))
-       return (1);
-   
-@@ -77,7 +81,11 @@
-   
-    /*
-     * Remove temporary files...
----- 348,356 ----
-+--- 344,356 ----
-+    if (Verbosity)
-+      puts("Building FreeBSD pkg binary distribution...");
-+  
-+!   if (run_command(NULL, "/usr/sbin/pkg_create -p / -s %s -c %s -d %s -f %s %s",
-                     current, commentname, descrname, plistname, name))
-       return (1);
-   
-
-
diff --git a/editors/openoffice-3-devel/files/patch-i73217 b/editors/openoffice-3-devel/files/patch-i73217
index 3dc7b4e28912..712631a136f1 100644
--- a/editors/openoffice-3-devel/files/patch-i73217
+++ b/editors/openoffice-3-devel/files/patch-i73217
@@ -1,3 +1,5 @@
+It won't fix in the master as it breaks the POSIX.
+
 Index: epm/epm-3.7.patch
 ===================================================================
 RCS file: /cvs/external/epm/epm-3.7.patch,v
diff --git a/editors/openoffice-3-devel/files/patch-i76115 b/editors/openoffice-3-devel/files/patch-i76115
deleted file mode 100644
index f090b4337b09..000000000000
--- a/editors/openoffice-3-devel/files/patch-i76115
+++ /dev/null
@@ -1,102 +0,0 @@
-Sync amd64 bridge with sixtyfour10 CWS.
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx.orig	Sat Sep 16 11:47:13 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Tue Apr  3 20:36:13 2007
-@@ -49,6 +49,7 @@
- #include "bridges/cpp_uno/shared/unointerfaceproxy.hxx"
- #include "bridges/cpp_uno/shared/vtables.hxx"
- 
-+#include "abi.hxx"
- #include "share.hxx"
- 
- using namespace ::rtl;
-@@ -122,7 +123,7 @@
-                 // value verbatim, as a double without conversion.
- 				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
- 			else
--				*pDS++ = *reinterpret_cast<double *>( pSV++ );
-+				*pDS++ = *pSV++;
- 			break;
- 
- 		case 'H': // 64-bit Word
-@@ -165,7 +166,7 @@
- 
- //==================================================================================================
- static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
--							  void * pRegisterReturn, typelib_TypeClass eReturnType,
-+							  void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
- 							  char * pPT, sal_uInt64 * pStackLongs, sal_uInt32 nStackLongs)
- {
- 	sal_uInt32 nr_gpr, nr_fpr, nr_stack;
-@@ -175,8 +176,6 @@
- 	if (nr_stack)
- 		nr_stack = (nr_stack + 1) & ~1;
- 	
--	bool bReturnsSimpleType = bridges::cpp_uno::shared::isSimpleType( eReturnType );
--
- #if OSL_DEBUG_LEVEL > 1
- 	// Let's figure out what is really going on here
- 	fprintf(stderr,"callVirtualMethod() parameters string is %s\n", pPT);
-@@ -244,7 +243,7 @@
- #undef ARG_GPR
-     }
- 
--	if ( bReturnsSimpleType )
-+	if ( bSimpleReturn )
- 		a0 = (sal_uInt64) pThis;
- 	else
- 		a1 = (sal_uInt64) pThis;
-@@ -275,7 +274,7 @@
- 	// Perform the call
- 	ReturnValue aRet = ( ( FunctionCall ) pMethod )( a0, a1, a2, a3, a4, a5 );
- 
--	switch (eReturnType)
-+	switch (pReturnTypeDescr->eTypeClass)
- 	{
- 	case typelib_TypeClass_HYPER:
- 	case typelib_TypeClass_UNSIGNED_HYPER:
-@@ -301,6 +300,15 @@
- 	case typelib_TypeClass_DOUBLE:
- 		*reinterpret_cast<double *>( pRegisterReturn ) = *reinterpret_cast<double*>( &aRet.f.xmm0 );
- 		break;
-+    default: {
-+        sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
-+        if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0) {
-+            if (nRetSize > 8)
-+                static_cast<sal_uInt64 *>(pRegisterReturn)[1] = aRet.i.rdx;
-+            static_cast<sal_uInt64 *>(pRegisterReturn)[0] = aRet.i.rax;
-+        }
-+        break;
-+    }
- 	}
- }
- 
-@@ -327,13 +335,15 @@
- 	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
- 	
- 	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
--	
-+
-+	bool bSimpleReturn = true;	
- 	if (pReturnTypeDescr)
- 	{
--		if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
--		{
-+		if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
-+			bSimpleReturn = false;
-+
-+		if (bSimpleReturn)
- 			pCppReturn = pUnoReturn; // direct way for simple types
--		}
- 		else
- 		{
- 			// complex return via ptr
-@@ -458,7 +468,7 @@
- 		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 7), "UNALIGNED STACK !!! (Please DO panic)" );
- 		callVirtualMethod(
- 			pAdjustedThisPtr, aVtableSlot.index,
--			pCppReturn, pReturnTypeDescr->eTypeClass, pParamType,
-+			pCppReturn, pReturnTypeDescr, bSimpleReturn, pParamType,
- 			(sal_uInt64 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_uInt64) );
- 		// NO exception occured...
- 		*ppUnoExc = 0;
diff --git a/editors/openoffice-3-devel/files/patch-i76141 b/editors/openoffice-3-devel/files/patch-i76141
deleted file mode 100644
index c1d964b3b5c2..000000000000
--- a/editors/openoffice-3-devel/files/patch-i76141
+++ /dev/null
@@ -1,839 +0,0 @@
---- berkeleydb/db-4.2.52.patch	26 Mar 2007 12:24:38 -0000	1.19
-+++ berkeleydb/db-4.2.52.patch	3 Jul 2007 01:03:31 -0000
-@@ -222,7 +222,7 @@
- ! 
- ! .INCLUDE :  target.mk
- *** misc/db-4.2.52.NC/dist/configure	2003-12-03 22:10:02.000000000 +0100
----- misc/build/db-4.2.52.NC/dist/configure	2007-02-19 16:12:12.000000000 +0100
-+--- misc/build/db-4.2.52.NC/dist/configure	2007-07-02 21:00:00.000000000 -0400
- ***************
- *** 3518,3525 ****
-   # Set CFLAGS/CXXFLAGS.  We MUST set the flags before we call autoconf
-@@ -262,6 +262,23 @@
-   	test "$with_gnu_ld" != no && break
-   	;;
- ***************
-+*** 9328,9334 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 9330,9336 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 10398,10404 ****
-       #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-       #	       `"' quotes if we put them in here... so don't!
-@@ -327,6 +344,57 @@
-   	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-   	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-   	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+***************
-+*** 12872,12878 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 12885,12891 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 15849,15855 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 15862,15868 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 18114,18120 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 18127,18133 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/db-4.2.52.NC/dist/ltmain.sh	2003-04-26 19:45:37.000000000 +0200
- --- misc/build/db-4.2.52.NC/dist/ltmain.sh	2007-02-19 16:12:12.000000000 +0100
- ***************
---- curl/curl-7.12.2.patch	25 Sep 2006 13:33:49 -0000	1.9
-+++ curl/curl-7.12.2.patch	5 Apr 2007 00:01:20 -0000
-@@ -1,3 +1,73 @@
-+*** misc/curl-7.12.2/configure	Sun Oct 17 18:22:10 2004
-+--- misc/build/curl-7.12.2/configure	Wed Apr  4 19:56:30 2007
-+***************
-+*** 9456,9462 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 9456,9462 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 13154,13160 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 13154,13160 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 16303,16309 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 16303,16309 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 18650,18656 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 18650,18656 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 13:12:17 2004
- --- misc/build/curl-7.12.2/ltmain.sh	Thu Jun 22 13:07:14 2006
- ***************
---- freetype/freetype-2.2.1.patch	3 Aug 2006 14:58:26 -0000	1.2
-+++ freetype/freetype-2.2.1.patch	5 Apr 2007 00:07:40 -0000
-@@ -1,5 +1,75 @@
--*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h	Mon Jan 30 17:49:42 2006
----- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h	Thu Jul 13 16:04:27 2006
-+*** misc/freetype-2.2.1/builds/unix/configure	Fri May 12 11:12:27 2006
-+--- misc/build/freetype-2.2.1/builds/unix/configure	Wed Apr  4 20:05:15 2007
-+***************
-+*** 10644,10650 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 10644,10650 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 14420,14426 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14420,14426 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17684,17690 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17684,17690 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 20153,20159 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 20153,20159 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h	Mon Jan 30 11:49:42 2006
-+--- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h	Wed Apr  4 20:04:02 2007
- ***************
- *** 17,24 ****
- --- 17,26 ----
---- libwpd/libwpd-0.8.8.diff	19 Jan 2007 15:57:46 -0000	1.1.4.1
-+++ libwpd/libwpd-0.8.8.diff	5 Apr 2007 00:13:31 -0000
-@@ -1,3 +1,73 @@
-+*** misc/libwpd-0.8.8/configure	Tue Jan  9 05:35:10 2007
-+--- misc/build/libwpd-0.8.8/configure	Wed Apr  4 20:10:49 2007
-+***************
-+*** 8089,8095 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 8089,8095 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 11808,11814 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11808,11814 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 14978,14984 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14978,14984 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17346,17352 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17346,17352 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/libwpd-0.8.8/src/lib/WP1Part.cpp	2007-01-03 14:07:55.000000000 +0100
- --- misc/build/libwpd-0.8.8/src/lib/WP1Part.cpp	2007-01-13 00:18:52.000000000 +0100
- ***************
-
---- libxml2/libxml2-2.6.17.patch	26 Mar 2007 12:25:19 -0000	1.5
-+++ libxml2/libxml2-2.6.17.patch	3 May 2007 17:31:33 -0000
-@@ -34,6 +34,74 @@
-   fi
-   echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
- ***************
-+*** 8547,8553 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 8547,8553 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 12266,12272 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 12266,12272 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 15436,15442 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 15436,15442 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17804,17810 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17804,17810 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 26339,26347 ****
-   
-   echo "$as_me:$LINENO: checking for setsockopt" >&5
---- libxmlsec/xmlsec1-1.2.6.patch	27 Mar 2007 09:36:38 -0000	1.19
-+++ libxmlsec/xmlsec1-1.2.6.patch	3 May 2007 18:12:52 -0000
-@@ -158,6 +158,23 @@
-   	# is EXPORTS), use it as is; otherwise, prepend...
-   	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 7778,7784 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 7779,7785 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 9046,9052 ****
-         ;;
-       esac
-@@ -215,6 +232,23 @@
-         # built for inclusion in a dll (and should export symbols for example).
-         lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
- ***************
-+*** 11497,11503 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11498,11504 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 13259,13269 ****
-         lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-         ;;
-@@ -257,6 +291,23 @@
-   	# is EXPORTS), use it as is; otherwise, prepend...
-   	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 14667,14673 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14668,14674 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 15607,15617 ****
-         lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-         ;;
-@@ -316,6 +367,23 @@
-   	# is EXPORTS), use it as is; otherwise, prepend...
-   	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 17035,17041 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17036,17042 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 24598,24604 ****
-   fi
-   
---- moz/mozilla-source-1.7.5.patch.orig	Fri Apr 27 15:23:29 2007
-+++ moz/mozilla-source-1.7.5.patch	Fri Apr 27 15:32:07 2007
-@@ -266,6 +266,23 @@
- *** misc/mozilla/configure	Tue Oct 12 00:13:29 2004
- --- misc/build/mozilla/configure	Thu Mar 29 14:27:08 2007
- ***************
-+*** 5228,5234 ****
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+--- 5228,5234 ----
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+***************
- *** 5895,5901 ****
-          MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
-          MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
-@@ -311,6 +328,23 @@
- *** misc/mozilla/configure.in	Tue Oct 12 00:13:29 2004
- --- misc/build/mozilla/configure.in	Thu Mar 29 14:27:08 2007
- ***************
-+*** 1006,1012 ****
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+--- 1006,1012 ----
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+***************
- *** 1536,1542 ****
-          MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
-          MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
-@@ -449,6 +483,25 @@
-   ASM_SUFFIX	= @ASM_SUFFIX@
-   PROG_SUFFIX	= @PROG_SUFFIX@
-   MOD_NAME	= @NSPR_MODNAME@
-+*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk	Tue Mar 26 16:51:46 2002
-+--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk	Wed Apr  4 20:56:05 2007
-+***************
-+*** 66,72 ****
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+--- 66,72 ----
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
- *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper	Wed Apr  2 19:22:39 2003
- --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper	Thu Mar 29 14:27:08 2007
- ***************
-@@ -524,6 +577,23 @@
-   MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-   PR_MD_ASFILES=
- ***************
-+*** 3465,3471 ****
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 3465,3471 ----
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+***************
- *** 3832,3837 ****
- --- 3833,3839 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -604,6 +674,23 @@
-   MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-   PR_MD_ASFILES=
- ***************
-+*** 896,902 ****
-+      AC_DEFINE(FREEBSD)
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 896,902 ----
-+      AC_DEFINE(FREEBSD)
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+***************
- *** 1144,1149 ****
- --- 1145,1151 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -7562,6 +7649,44 @@
-   
-       switch (name) {
-       case MAX_CONNECTIONS:
-+*** misc/mozilla/nsprpub/configure	Tue Sep 14 17:14:38 2004
-+--- misc/build/mozilla/nsprpub/configure	Wed Apr  4 20:56:33 2007
-+***************
-+*** 3407,3413 ****
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 3407,3413 ----
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+*** misc/mozilla/nsprpub/configure.in	Tue Sep 14 17:14:38 2004
-+--- misc/build/mozilla/nsprpub/configure.in	Wed Apr  4 20:56:40 2007
-+***************
-+*** 922,928 ****
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      AC_DEFINE(HAVE_SOCKLEN_T)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 922,928 ----
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      AC_DEFINE(HAVE_SOCKLEN_T)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
- *** misc/mozilla/nsprpub/build/cygwin-wrapper	Wed Apr  2 19:22:38 2003
- --- misc/build/mozilla/nsprpub/build/cygwin-wrapper	Thu Mar 29 14:27:08 2007
- ***************
-@@ -8090,6 +8215,25 @@
- + ifdef NS_USE_GCC
- + NSPR31_LIB_PREFIX = lib
- + endif
-+*** misc/mozilla/security/coreconf/FreeBSD.mk	Wed Mar 26 20:17:25 2003
-+--- misc/build/mozilla/security/coreconf/FreeBSD.mk	Wed Apr  4 20:56:48 2007
-+***************
-+*** 63,69 ****
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+--- 63,69 ----
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
- *** misc/mozilla/security/coreconf/command.mk	Fri Feb 15 17:53:12 2002
- --- misc/build/mozilla/security/coreconf/command.mk	Thu Mar 29 14:27:09 2007
- ***************
---- sndfile/libsndfile-1.0.9.patch	3 Feb 2006 17:31:46 -0000	1.3
-+++ sndfile/libsndfile-1.0.9.patch	5 Apr 2007 00:31:26 -0000
-@@ -83,6 +83,23 @@
-     shlibpath_var=DYLD_LIBRARY_PATH
-     shrext='$(test .$module = .yes && echo .so || echo .dylib)'
- ***************
-+*** 7871,7877 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 7878,7884 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 9111,9120 ****
-         ;;
-       esac
-@@ -143,6 +160,23 @@
-       module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct_CXX=no
- ***************
-+*** 11560,11566 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11567,11573 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 14069,14084 ****
-       	  lt_int_apple_cc_single_mod=yes
-       	fi
-@@ -178,6 +212,23 @@
-             module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         hardcode_direct_F77=no
- ***************
-+*** 14700,14706 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14707,14713 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 16414,16429 ****
-       	  lt_int_apple_cc_single_mod=yes
-       	fi
-@@ -212,6 +263,23 @@
-           fi
-             module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         hardcode_direct_GCJ=no
-+***************
-+*** 17045,17051 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17052,17058 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 05:02:07 2004
- --- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Jan 23 20:13:31 2006
- ***************
---- vigra/vigra1.4.0.patch	12 Oct 2006 10:35:19 -0000	1.3
-+++ vigra/vigra1.4.0.patch	5 Apr 2007 00:40:20 -0000
-@@ -1,3 +1,42 @@
-+diff -uprN misc/vigra1.4.0/configure misc/build/vigra1.4.0/configure
-+--- misc/vigra1.4.0/configure	Tue Dec 20 23:53:28 2005
-++++ misc/build/vigra1.4.0/configure	Wed Apr  4 20:35:48 2007
-+@@ -7259,7 +7259,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
-+@@ -10961,7 +10961,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
-+@@ -14110,7 +14110,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
-+@@ -16461,7 +16461,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
- diff -uprN misc/vigra1.4.0/include/vigra/array_vector.hxx misc/build/vigra1.4.0/include/vigra/array_vector.hxx
- --- misc/vigra1.4.0/include/vigra/array_vector.hxx	2005-12-21 05:53:30.000000000 +0100
- +++ misc/build/vigra1.4.0/include/vigra/array_vector.hxx	2006-08-31 12:08:15.172679000 +0200
diff --git a/editors/openoffice-3-devel/files/patch-i76968 b/editors/openoffice-3-devel/files/patch-i76968
deleted file mode 100644
index 8bf3e43d703d..000000000000
--- a/editors/openoffice-3-devel/files/patch-i76968
+++ /dev/null
@@ -1,642 +0,0 @@
-Sync FreeBSD-specific files with CWS sixtyfour11.
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk	Thu Jan 25 08:27:35 2007
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk	Wed Apr 25 10:57:20 2007
-@@ -52,11 +52,6 @@
- CFLAGS += -DLEAK_STATIC_DATA
- .ENDIF
- 
--NOOPTFILES= \
--	$(SLO)$/uno2cpp.obj
--
--
--CFLAGSNOOPT=-O0
- 
- SLOFILES= \
- 	$(SLO)$/abi.obj			\
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Thu May  3 21:45:19 2007
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Wed Apr 25 10:57:33 2007
-@@ -38,6 +38,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <rtl/alloc.h>
- 
- #include <com/sun/star/uno/genfunc.hxx>
-@@ -55,265 +56,188 @@
- using namespace ::rtl;
- using namespace ::com::sun::star::uno;
- 
--void dummy_can_throw_anything( char const * );
--
--// 6 integral parameters are passed in registers
--const sal_uInt32 GPR_COUNT = 6;
--
--// 8 floating point parameters are passed in SSE registers
--const sal_uInt32 FPR_COUNT = 8;
--
--static inline void
--invoke_count_words(char *		pPT,      // Parameter Types
--				   sal_uInt32 &	nr_gpr,   // Number of arguments in GPRs
--				   sal_uInt32 &	nr_fpr,   // Number of arguments in FPRs
--				   sal_uInt32 &	nr_stack) // Number of arguments in stack
--{
--	nr_gpr = 0;
--	nr_fpr = 0;
--	nr_stack = 0;
--	char c;
--	
--	while ((c = *pPT++) != 'X')
--	{
--		if (c == 'F' || c == 'D')
--		{
--            if (nr_fpr < FPR_COUNT)
--                nr_fpr++;
--            else
--                nr_stack++;
--		}
--		else
--		{
--            if (nr_gpr < GPR_COUNT)
--                nr_gpr++;
--            else
--                nr_stack++;
--		}
--	}
--}
--
--static void
--invoke_copy_to_stack(sal_uInt64 * pDS,  // Stack Storage
--					 char *       pPT,  // Parameter Types
--					 sal_uInt64 * pSV,  // Source Values
--					 sal_uInt64 * pGPR, // General Purpose Registers
--					 double *     pFPR) // Floating-Point Registers
--{
--	sal_uInt32 nr_gpr = 0;
--	sal_uInt32 nr_fpr = 0;
--	sal_uInt64 value;
--	char c;
--	
--	while ((c = *pPT++) != 'X')
--	{
--		switch (c)
--		{
--		case 'D': // Double
--			if (nr_fpr < FPR_COUNT)
--				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
--			else
--				*pDS++ = *pSV++;
--			break;
--
--		case 'F': // Float
--			if (nr_fpr < FPR_COUNT)
--                // The value in %xmm register is already prepared to
--                // be retrieved as a float. Therefore, we pass the
--                // value verbatim, as a double without conversion.
--				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
--			else
--				*pDS++ = *pSV++;
--			break;
--
--		case 'H': // 64-bit Word
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *pSV++;
--			else
--				*pDS++ = *pSV++;
--			break;
--
--		case 'I': // 32-bit Word
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt32 *>( pSV++ );
--			else
--				*pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV++ );
--			break;
--
--		case 'S': // 16-bit Word
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt16 *>( pSV++ );
--			else
--				*pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV++ );
--			break;
--
--		case 'B': // Byte
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt8 *>( pSV++ );
--			else
--				*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV++ );
--			break;
--
--		default: // Default, assume 64-bit values
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *pSV++;
--			else
--				*pDS++ = *pSV++;
--			break;
--		}
--	}
--}
--
- //==================================================================================================
- static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
--							  void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
--							  char * pPT, sal_uInt64 * pStackLongs, sal_uInt32 nStackLongs)
--{
--	sal_uInt32 nr_gpr, nr_fpr, nr_stack;
--	invoke_count_words(pPT, nr_gpr, nr_fpr, nr_stack);
-+                              void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
-+                              sal_uInt64 *pStack, sal_uInt32 nStack,
-+                              sal_uInt64 *pGPR, sal_uInt32 nGPR,
-+                              double *pFPR, sal_uInt32 nFPR) __attribute__((noinline));
- 
--	// Stack, if used, must be 16-bytes aligned
--	if (nr_stack)
--		nr_stack = (nr_stack + 1) & ~1;
--	
-+static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
-+                              void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
-+                              sal_uInt64 *pStack, sal_uInt32 nStack,
-+                              sal_uInt64 *pGPR, sal_uInt32 nGPR,
-+                              double *pFPR, sal_uInt32 nFPR)
-+{
- #if OSL_DEBUG_LEVEL > 1
--	// Let's figure out what is really going on here
--	fprintf(stderr,"callVirtualMethod() parameters string is %s\n", pPT);
--	{
--		sal_uInt32  k = nStackLongs;
--		sal_uInt64 *q = pStackLongs;
--		while (k > 0)
--		{
--			fprintf(stderr, "uno stack is: %lx\n", *q);
--			k--;
--			q++;
--		}
--	}
--#endif
--
--	// Load parameters to stack, if necessary
--    sal_uInt64 *stack = (sal_uInt64 *) __builtin_alloca(nr_stack * 8);
--    sal_uInt64 gpregs[GPR_COUNT];
--    double fpregs[FPR_COUNT];
--    invoke_copy_to_stack(stack, pPT, pStackLongs, gpregs, fpregs);
--
--    // Load FPR registers from fpregs[]
--    register double d0 asm("xmm0");
--    register double d1 asm("xmm1");
--    register double d2 asm("xmm2");
--    register double d3 asm("xmm3");
--    register double d4 asm("xmm4");
--    register double d5 asm("xmm5");
--    register double d6 asm("xmm6");
--    register double d7 asm("xmm7");
--
--    switch (nr_fpr) {
--#define ARG_FPR(N) \
--    case N+1: d##N = fpregs[N];
--        ARG_FPR(7);
--        ARG_FPR(6);
--        ARG_FPR(5);
--        ARG_FPR(4);
--        ARG_FPR(3);
--        ARG_FPR(2);
--        ARG_FPR(1);
--        ARG_FPR(0);
--    case 0:;
--#undef ARG_FPR
--    }
--    
--    // Load GPR registers from gpregs[]
--    register sal_uInt64 a0 asm("rdi");
--    register sal_uInt64 a1 asm("rsi");
--    register sal_uInt64 a2 asm("rdx");
--    register sal_uInt64 a3 asm("rcx");
--    register sal_uInt64 a4 asm("r8");
--    register sal_uInt64 a5 asm("r9");
--    
--    switch (nr_gpr) {
--#define ARG_GPR(N) \
--    case N+1: a##N = gpregs[N];
--        ARG_GPR(5);
--        ARG_GPR(4);
--        ARG_GPR(3);
--        ARG_GPR(2);
--        ARG_GPR(1);
--        ARG_GPR(0);
--    case 0:;
--#undef ARG_GPR
-+    // Let's figure out what is really going on here
-+    {
-+        fprintf( stderr, "= callVirtualMethod() =\nGPR's (%d): ", nGPR );
-+        for ( int i = 0; i < nGPR; ++i )
-+            fprintf( stderr, "0x%lx, ", pGPR[i] );
-+        fprintf( stderr, "\nFPR's (%d): ", nFPR );
-+        for ( int i = 0; i < nFPR; ++i )
-+            fprintf( stderr, "%f, ", pFPR[i] );
-+        fprintf( stderr, "\nStack (%d): ", nStack );
-+        for ( int i = 0; i < nStack; ++i )
-+            fprintf( stderr, "0x%lx, ", pStack[i] );
-+        fprintf( stderr, "\n" );
-     }
-+#endif
- 
--	if ( bSimpleReturn )
--		a0 = (sal_uInt64) pThis;
--	else
--		a1 = (sal_uInt64) pThis;
--
--    // Ensure that assignments to SSE registers won't be optimized away
--    asm("" ::
--        "x" (d0), "x" (d1), "x" (d2), "x" (d3),
--        "x" (d4), "x" (d5), "x" (d6), "x" (d7));
-+    // The call instruction within the asm section of callVirtualMethod may throw
-+    // exceptions.  So that the compiler handles this correctly, it is important
-+    // that (a) callVirtualMethod might call dummy_can_throw_anything (although this
-+    // never happens at runtime), which in turn can throw exceptions, and (b)
-+    // callVirtualMethod is not inlined at its call site (so that any exceptions are
-+    // caught which are thrown from the instruction calling callVirtualMethod):
-+    if ( !pThis )
-+        CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything( "xxx" ); // address something
-+
-+    // Should not happen, but...
-+    if ( nFPR > x86_64::MAX_SSE_REGS )
-+        nFPR = x86_64::MAX_SSE_REGS;
-+    if ( nGPR > x86_64::MAX_GPR_REGS )
-+        nGPR = x86_64::MAX_GPR_REGS;
- 
-     // Get pointer to method
-     sal_uInt64 pMethod = *((sal_uInt64 *)pThis);
-     pMethod += 8 * nVtableIndex;
-     pMethod = *((sal_uInt64 *)pMethod);
- 
--	union ReturnValue {
--		struct {
--			sal_uInt64 rax;
--			sal_uInt64 rdx;
--		} i;
--		struct {
--			double xmm0;
--			double xmm1;
--		} f;
--	};
-+    // Load parameters to stack, if necessary
-+    if ( nStack )
-+    {
-+        // 16-bytes aligned
-+        sal_uInt32 nStackBytes = ( ( nStack + 1 ) >> 1 ) * 16;
-+        sal_uInt64 *pCallStack = (sal_uInt64 *) __builtin_alloca( nStackBytes );
-+        memcpy( pCallStack, pStack, nStackBytes );
-+    }
- 
--	typedef ReturnValue (* FunctionCall )( sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64 );
-+    // Return values
-+    sal_uInt64 rax;
-+    sal_uInt64 rdx;
-+    double xmm0;
- 
--	// Perform the call
--	ReturnValue aRet = ( ( FunctionCall ) pMethod )( a0, a1, a2, a3, a4, a5 );
-+    asm volatile (
-+        
-+        // Fill the xmm registers
-+        "movq %2, %%rax\n\t"
- 
--	switch (pReturnTypeDescr->eTypeClass)
--	{
--	case typelib_TypeClass_HYPER:
--	case typelib_TypeClass_UNSIGNED_HYPER:
--		*reinterpret_cast<sal_uInt64 *>( pRegisterReturn ) = aRet.i.rax;
--		break;
--	case typelib_TypeClass_LONG:
--	case typelib_TypeClass_UNSIGNED_LONG:
--	case typelib_TypeClass_ENUM:
--		*reinterpret_cast<sal_uInt32 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt32*>( &aRet.i.rax );
--		break;
--	case typelib_TypeClass_CHAR:
--	case typelib_TypeClass_SHORT:
--	case typelib_TypeClass_UNSIGNED_SHORT:
--		*reinterpret_cast<sal_uInt16 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt16*>( &aRet.i.rax );
--		break;
--	case typelib_TypeClass_BOOLEAN:
--	case typelib_TypeClass_BYTE:
--		*reinterpret_cast<sal_uInt8 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt8*>( &aRet.i.rax );
--		break;
--	case typelib_TypeClass_FLOAT:
--		*reinterpret_cast<float *>( pRegisterReturn ) = *reinterpret_cast<float*>( &aRet.f.xmm0 );
--		break;
--	case typelib_TypeClass_DOUBLE:
--		*reinterpret_cast<double *>( pRegisterReturn ) = *reinterpret_cast<double*>( &aRet.f.xmm0 );
--		break;
--    default: {
--        sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
--        if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0) {
--            if (nRetSize > 8)
--                static_cast<sal_uInt64 *>(pRegisterReturn)[1] = aRet.i.rdx;
--            static_cast<sal_uInt64 *>(pRegisterReturn)[0] = aRet.i.rax;
--        }
-+        "movsd   (%%rax), %%xmm0\n\t"
-+        "movsd  8(%%rax), %%xmm1\n\t"
-+        "movsd 16(%%rax), %%xmm2\n\t"
-+        "movsd 24(%%rax), %%xmm3\n\t"
-+        "movsd 32(%%rax), %%xmm4\n\t"
-+        "movsd 40(%%rax), %%xmm5\n\t"
-+        "movsd 48(%%rax), %%xmm6\n\t"
-+        "movsd 56(%%rax), %%xmm7\n\t"
-+
-+        // Fill the general purpose registers
-+        "movq %1, %%rax\n\t"
-+
-+        "movq    (%%rax), %%rdi\n\t"
-+        "movq   8(%%rax), %%rsi\n\t"
-+        "movq  16(%%rax), %%rdx\n\t"
-+        "movq  24(%%rax), %%rcx\n\t"
-+        "movq  32(%%rax), %%r8\n\t"
-+        "movq  40(%%rax), %%r9\n\t"
-+
-+        // Perform the call
-+        "movq %0, %%r11\n\t"
-+        "movq %3, %%rax\n\t"
-+        "call *%%r11\n\t"
-+
-+        // Fill the return values
-+        "movq   %%rax, %4\n\t"
-+        "movq   %%rdx, %5\n\t"
-+        "movsd %%xmm0, %6\n\t"
-+        :
-+        : "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR ),
-+          "m" ( rax ), "m" ( rdx ), "m" ( xmm0 )
-+        : "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r11"
-+    );
-+
-+    switch (pReturnTypeDescr->eTypeClass)
-+    {
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        *reinterpret_cast<sal_uInt64 *>( pRegisterReturn ) = rax;
-         break;
-+    case typelib_TypeClass_LONG:
-+    case typelib_TypeClass_UNSIGNED_LONG:
-+    case typelib_TypeClass_ENUM:
-+        *reinterpret_cast<sal_uInt32 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt32*>( &rax );
-+        break;
-+    case typelib_TypeClass_CHAR:
-+    case typelib_TypeClass_SHORT:
-+    case typelib_TypeClass_UNSIGNED_SHORT:
-+        *reinterpret_cast<sal_uInt16 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt16*>( &rax );
-+        break;
-+    case typelib_TypeClass_BOOLEAN:
-+    case typelib_TypeClass_BYTE:
-+        *reinterpret_cast<sal_uInt8 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt8*>( &rax );
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+    case typelib_TypeClass_DOUBLE:
-+        *reinterpret_cast<double *>( pRegisterReturn ) = xmm0;
-+        break;
-+    default:
-+        {
-+            sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
-+            if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0)
-+            {
-+                if (nRetSize > 8)
-+                    static_cast<sal_uInt64 *>(pRegisterReturn)[1] = rdx;
-+                static_cast<sal_uInt64 *>(pRegisterReturn)[0] = rax;
-+            }
-+            break;
-+        }
-     }
--	}
- }
- 
-+//================================================================================================== 
-+
-+// Macros for easier insertion of values to registers or stack
-+// pSV - pointer to the source
-+// nr - order of the value [will be increased if stored to register]
-+// pFPR, pGPR - pointer to the registers
-+// pDS - pointer to the stack [will be increased if stored here]
-+
-+// The value in %xmm register is already prepared to be retrieved as a float,
-+// thus we treat float and double the same
-+#define INSERT_FLOAT_DOUBLE( pSV, nr, pFPR, pDS ) \
-+	if ( nr < x86_64::MAX_SSE_REGS ) \
-+		pFPR[nr++] = *reinterpret_cast<double *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV ); // verbatim!
-+
-+#define INSERT_INT64( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt64 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV );
-+
-+#define INSERT_INT32( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt32 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV );
-+
-+#define INSERT_INT16( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt16 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV );
-+
-+#define INSERT_INT8( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt8 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
- 
- //================================================================================================== 
-+
- static void cpp_call(
- 	bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
- 	bridges::cpp_uno::shared::VtableSlot aVtableSlot,
-@@ -322,54 +246,52 @@
- 	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
- {
- 	// Maxium space for [complex ret ptr], values | ptr ...
--  	char * pCppStack		= (char *)__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) );
--  	char * pCppStackStart	= pCppStack;
-+	// (but will be used less - some of the values will be in pGPR and pFPR)
-+  	sal_uInt64 *pStack = (sal_uInt64 *)__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) );
-+  	sal_uInt64 *pStackStart = pStack;
- 
--	// We need to know parameter types for callVirtualMethod() so generate a signature string
--	char * pParamType		= (char *)__builtin_alloca( nParams + 3 );
--	char * pPT				= pParamType;
-+	sal_uInt64 pGPR[x86_64::MAX_GPR_REGS];
-+	sal_uInt32 nGPR = 0;
-+
-+	double pFPR[x86_64::MAX_SSE_REGS];
-+	sal_uInt32 nFPR = 0;
- 
- 	// Return
- 	typelib_TypeDescription * pReturnTypeDescr = 0;
- 	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
- 	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
- 	
--	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion (see below)
- 
- 	bool bSimpleReturn = true;	
--	if (pReturnTypeDescr)
-+	if ( pReturnTypeDescr )
- 	{
- 		if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
- 			bSimpleReturn = false;
- 
--		if (bSimpleReturn)
-+		if ( bSimpleReturn )
- 			pCppReturn = pUnoReturn; // direct way for simple types
- 		else
- 		{
- 			// complex return via ptr
--			pCppReturn = *(void **)pCppStack = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
--												? __builtin_alloca( pReturnTypeDescr->nSize )
--												: pUnoReturn); // direct way
--			*pPT++ = 'H';
--			pCppStack += sizeof(void *);
-+			pCppReturn = bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )?
-+						 __builtin_alloca( pReturnTypeDescr->nSize ) : pUnoReturn;
-+			INSERT_INT64( &pCppReturn, nGPR, pGPR, pStack );
- 		}
- 	}
- 
- 	// Push "this" pointer
- 	void * pAdjustedThisPtr = reinterpret_cast< void ** >( pThis->getCppI() ) + aVtableSlot.offset;
--	*(void **)pCppStack = pAdjustedThisPtr;
--	*pPT++ = 'H';
--	pCppStack += sizeof(void *);
-+	INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack );
- 
--	// stack space
- 	// Args
--	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams );
- 	// Indizes of values this have to be converted (interface conversion cpp<=>uno)
- 	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
- 	// Type descriptions for reconversions
- 	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
- 	
--	sal_Int32 nTempIndizes   = 0;
-+	sal_Int32 nTempIndizes = 0;
- 	
- 	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
- 	{
-@@ -379,45 +301,32 @@
- 		
- 		if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
- 		{
--			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+			uno_copyAndConvertData( pCppArgs[nPos] = alloca( 8 ), pUnoArgs[nPos], pParamTypeDescr,
- 									pThis->getBridge()->getUno2Cpp() );
- 			
- 			switch (pParamTypeDescr->eTypeClass)
- 			{
--				
--				// we need to know type of each param so that we know whether to use
--				// gpr or fpr to pass in parameters:
--				// Key: I - 32-bit value passed in gpr
--				//      B - byte value passed in gpr
--				//      S - short value passed in gpr
--				//      F - float value pass in fpr
--				//      D - double value pass in fpr
--				//      H - long value passed in gpr
--				//      X - indicates end of parameter description string
--				
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+				INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack );
-+				break;
- 			case typelib_TypeClass_LONG:
- 			case typelib_TypeClass_UNSIGNED_LONG:
- 			case typelib_TypeClass_ENUM:
--				*pPT++ = 'I';
-+				INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack );
- 				break;
- 			case typelib_TypeClass_SHORT:
- 			case typelib_TypeClass_CHAR:
- 			case typelib_TypeClass_UNSIGNED_SHORT:
--				*pPT++ = 'S';
-+				INSERT_INT16( pCppArgs[nPos], nGPR, pGPR, pStack );
- 				break;
- 			case typelib_TypeClass_BOOLEAN:
- 			case typelib_TypeClass_BYTE:
--				*pPT++ = 'B';
-+				INSERT_INT8( pCppArgs[nPos], nGPR, pGPR, pStack );
- 				break;
- 			case typelib_TypeClass_FLOAT:
--				*pPT++ = 'F';
--				break;
- 			case typelib_TypeClass_DOUBLE:
--				*pPT++ = 'D';
--				break;
--			case typelib_TypeClass_HYPER:
--			case typelib_TypeClass_UNSIGNED_HYPER:
--				*pPT++ = 'H';
-+				INSERT_FLOAT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, pStack );
- 				break;
- 			}
- 
-@@ -430,7 +339,7 @@
- 			{
- 				// cpp out is constructed mem, uno out is not!
- 				uno_constructData(
--					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
- 					pParamTypeDescr );
- 				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
- 				// will be released at reconversion
-@@ -440,7 +349,7 @@
- 			else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr ))
- 			{
- 				uno_copyAndConvertData(
--					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
- 					pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
- 				
- 				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-@@ -449,27 +358,22 @@
- 			}
- 			else // direct way
- 			{
--				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				pCppArgs[nPos] = pUnoArgs[nPos];
- 				// no longer needed
- 				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
- 			}
--			// FIXME: is this the right way to pass these?
--			*pPT++='H';
-+			INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack );
- 		}
--		pCppStack += sizeof(sal_uInt64); // standard parameter length
- 	}
- 	
--	// terminate the signature string
--	*pPT++ = 'X';
--	*pPT = 0;
--
- 	try
- 	{
--		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 7), "UNALIGNED STACK !!! (Please DO panic)" );
- 		callVirtualMethod(
- 			pAdjustedThisPtr, aVtableSlot.index,
--			pCppReturn, pReturnTypeDescr, bSimpleReturn, pParamType,
--			(sal_uInt64 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_uInt64) );
-+			pCppReturn, pReturnTypeDescr, bSimpleReturn,
-+			pStackStart, ( pStack - pStackStart ),
-+			pGPR, nGPR,
-+			pFPR, nFPR );
- 		// NO exception occured...
- 		*ppUnoExc = 0;
- 		
-@@ -525,8 +429,8 @@
- 	}
- }
- 
--
- //==================================================================================================
-+
- namespace bridges { namespace cpp_uno { namespace shared {
- 
- void unoInterfaceProxyDispatch(
diff --git a/editors/openoffice-3-devel/files/patch-i76969 b/editors/openoffice-3-devel/files/patch-i76969
deleted file mode 100644
index 123402727290..000000000000
--- a/editors/openoffice-3-devel/files/patch-i76969
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: solenv/inc/unxfbsd.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsd.mk,v
-retrieving revision 1.3
-diff -u -r1.3 unxfbsd.mk
---- solenv/inc/unxfbsd.mk	9 Mar 2007 09:07:55 -0000	1.3
-+++ solenv/inc/unxfbsd.mk	4 May 2007 16:22:53 -0000
-@@ -121,12 +121,6 @@
- # Compiler flags for debugging
- CFLAGSDEBUG=-g
- CFLAGSDBGUTIL=
--# Compiler flags for enabling optimizations
--.IF "$(PRODUCT)"!=""
--CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
--.ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT=   							# no optimizing for non products
--.ENDIF	# "$(PRODUCT)"!=""
- # Compiler flags for disabling optimizations
- CFLAGSNOOPT=-O0
- # Compiler flags for describing the output path
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.24
-diff -u -r1.24 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	19 Jul 2006 09:27:04 -0000	1.24
-+++ solenv/inc/unxfbsdi.mk	4 May 2007 16:22:53 -0000
-@@ -43,5 +43,12 @@
- # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
- ARCH_FLAGS*=-mtune=pentiumpro
- 
-+# Compiler flags for enabling optimizations
-+.IF "$(PRODUCT)"!=""
-+CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+.ELSE 	# "$(PRODUCT)"!=""
-+CFLAGSOPT= 					# no optimizing for non products
-+.ENDIF	# "$(PRODUCT)"!=""
-+
- # platform specific identifier for shared libs
- DLLPOSTFIX=fi
diff --git a/editors/openoffice-3-devel/files/patch-i77615 b/editors/openoffice-3-devel/files/patch-i77615
deleted file mode 100644
index 89fe1aaee7c8..000000000000
--- a/editors/openoffice-3-devel/files/patch-i77615
+++ /dev/null
@@ -1,57 +0,0 @@
-For FreeBSD, libxslt builds libraries as libxslt.so.2 or something
-like that. Following patch fixes this.
-
-Index: libxslt/libxslt-1.1.16.patch
-===================================================================
-RCS file: /cvs/external/libxslt/libxslt-1.1.16.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxslt-1.1.16.patch
---- libxslt/libxslt-1.1.16.patch	10 May 2007 13:10:07 -0000	1.2
-+++ libxslt/libxslt-1.1.16.patch	20 May 2007 02:35:31 -0000
-@@ -108,3 +108,46 @@
- ! 
- ! exit 0
- 
-+*** misc/libxslt-1.1.16/ltmain.sh	Sun Feb 12 09:50:49 2006
-+--- misc/build/libxslt-1.1.16/ltmain.sh	Sun May 20 11:34:29 2007
-+***************
-+*** 3192,3200 ****
-+  	    revision="$number_revision"
-+  	    ;;
-+  	  freebsd-aout|freebsd-elf|sunos)
-+! 	    current="$number_major"
-+! 	    revision="$number_minor"
-+! 	    age="0"
-+  	    ;;
-+  	  irix|nonstopux)
-+  	    current=`expr $number_major + $number_minor - 1`
-+--- 3192,3200 ----
-+  	    revision="$number_revision"
-+  	    ;;
-+  	  freebsd-aout|freebsd-elf|sunos)
-+! 	    current=`expr $number_major + $number_minor`
-+! 	    age="$number_minor"
-+! 	    revision="$number_revision"
-+  	    ;;
-+  	  irix|nonstopux)
-+  	    current=`expr $number_major + $number_minor - 1`
-+***************
-+*** 3267,3274 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 3267,3274 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+
diff --git a/editors/openoffice-3-devel/files/patch-i78032 b/editors/openoffice-3-devel/files/patch-i78032
deleted file mode 100644
index e2b523c56e85..000000000000
--- a/editors/openoffice-3-devel/files/patch-i78032
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: store/util/makefile.mk
-===================================================================
-RCS file: /cvs/ucb/store/util/makefile.mk,v
-retrieving revision 1.19
-diff -u -r1.19 makefile.mk
---- store/util/makefile.mk	26 Mar 2007 13:45:45 -0000	1.19
-+++ store/util/makefile.mk	2 Jun 2007 01:40:18 -0000
-@@ -79,7 +79,7 @@
- .IF "$(GUI)"=="WNT"
- SHL1STDLIBS+= 	-lsupc++
- .ELSE
--.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="NETBSD"
- SHL1STDLIBS+= 	-lsupc++
- .ELIF "$(OS)"=="MACOSX"
- .IF "$(CCNUMVER)"<="000399999999"
diff --git a/editors/openoffice-3-devel/files/patch-i79520 b/editors/openoffice-3-devel/files/patch-i79520
new file mode 100644
index 000000000000..ccc05e9cbc3c
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i79520
@@ -0,0 +1,10 @@
+--- svx/inc/svx/svdobj.hxx	6 Jul 2007 07:30:43 -0000	1.3
++++ svx/inc/svx/svdobj.hxx	12 Jul 2007 13:56:39 -0000	1.4
+@@ -531,6 +531,7 @@
+ //
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+ 
++class SvxShape;
+ class SVX_DLLPUBLIC SdrObject: public SfxListener, public tools::WeakBase< SdrObject >
+ {
+ private:
diff --git a/editors/openoffice-3-devel/files/patch-i79527 b/editors/openoffice-3-devel/files/patch-i79527
new file mode 100644
index 000000000000..20c646f43f1e
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i79527
@@ -0,0 +1,19 @@
+Index: reportdesign/source/ui/dlg/GroupsSorting.cxx
+===================================================================
+RCS file: /cvs/dba/reportdesign/source/ui/dlg/GroupsSorting.cxx,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- reportdesign/source/ui/dlg/GroupsSorting.cxx	9 Jul 2007 11:56:29 -0000	1.2
++++ reportdesign/source/ui/dlg/GroupsSorting.cxx	12 Jul 2007 13:51:08 -0000	1.3
+@@ -1143,8 +1143,8 @@
+ 	    xGroup->setKeepTogether( m_aKeepTogetherLst.GetSelectEntryPos() );
+     if ( m_aGroupOnLst.GetSavedValue() != m_aGroupOnLst.GetSelectEntryPos() )
+     {
+-	    sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_Int32>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
+-	    xGroup->setGroupOn( nGroupOn );
++	    sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
++        xGroup->setGroupOn( nGroupOn );
+     }
+     if ( m_aGroupIntervalEd.GetSavedValue().ToInt32() != m_aGroupIntervalEd.GetValue() )
+     {
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 380f953dd999..579c69c27c59 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -66,10 +66,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		219
+MILESTONE?=		220
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070706
+SNAPDATE=		20070710
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 89e62cfc9151..f9cad8753c8f 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m219_source.tar.bz2) = 16c16611835a060b13a06109d03de55d
-SHA256 (openoffice.org2/OOo_SRC680_m219_source.tar.bz2) = ddaa5ca22d8dcb47d9ea5a678cda4b2e4af94f7358d72d816f92f7e1583552c5
-SIZE (openoffice.org2/OOo_SRC680_m219_source.tar.bz2) = 274602807
+MD5 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 245e58891d2d091ae3a4d484a0488be0
+SHA256 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = f83619ac1a3055a4be7a95d3fead1109d76ab244015da76e208da21af40e2ab7
+SIZE (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 292163303
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-2-devel/files/patch-i66667 b/editors/openoffice.org-2-devel/files/patch-i66667
deleted file mode 100644
index c1d8cd362e9b..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i66667
+++ /dev/null
@@ -1,139 +0,0 @@
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Tue May  2 08:01:08 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Fri Sep  8 17:25:05 2006
-@@ -120,6 +120,9 @@
- 			case typelib_TypeClass_UNSIGNED_HYPER:
- 			case typelib_TypeClass_DOUBLE:
- 				pCppStack += sizeof(sal_Int32); // extra long
-+                break;
-+            default:
-+                break;
- 			}
- 			// no longer needed
- 			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-@@ -436,7 +439,7 @@
- unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-     void ** slots, unsigned char * code,
-     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
--    sal_Int32 functionCount, sal_Int32 vtableOffset)
-+    sal_Int32 /*functionCount*/, sal_Int32 vtableOffset)
- {
-     for (sal_Int32 i = 0; i < type->nMembers; ++i) {
-         typelib_TypeDescription * member = 0;
---- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx.orig	Wed Sep  7 18:20:22 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Sep 11 12:21:03 2006
-@@ -37,6 +37,7 @@
- #include <dlfcn.h>
- #include <cxxabi.h>
- #include <hash_map>
-+#include <sys/param.h>
- 
- #include <rtl/strbuf.hxx>
- #include <rtl/ustrbuf.hxx>
-@@ -122,7 +123,11 @@
- };
- //__________________________________________________________________________________________________
- RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 602103
-     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-+#else
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+#endif
- {
- }
- //__________________________________________________________________________________________________
-@@ -139,8 +144,8 @@
-     OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
- 
-     MutexGuard guard( m_mutex );
--    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
--    if (iFind == m_rttis.end())
-+    t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) );
-+    if (iRttiFind == m_rttis.end())
-     {
-         // RTTI symbol
-         OStringBuffer buf( 64 );
-@@ -157,8 +162,11 @@
-         buf.append( 'E' );
- 
-         OString symName( buf.makeStringAndClear() );
--//#iZ 22253 
-+#if __FreeBSD_version < 602103 /* #i22253# */
-         rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-+#else
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+#endif
- 
-         if (rtti)
-         {
-@@ -205,7 +213,7 @@
-     }
-     else
-     {
--        rtti = iFind->second;
-+        rtti = iRttiFind->second;
-     }
- 
-     return rtti;
---- bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Jun 19 19:43:09 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Fri Sep  8 17:25:05 2006
-@@ -142,6 +142,8 @@
- 		case typelib_TypeClass_DOUBLE:
- 			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
- 			break;
-+        default:
-+            break;
- 	}
- }
- 
-@@ -217,6 +219,9 @@
- 			case typelib_TypeClass_UNSIGNED_HYPER:
- 			case typelib_TypeClass_DOUBLE:
- 				pCppStack += sizeof(sal_Int32); // extra long
-+                break;
-+            default:
-+                break;
- 			}
- 			// no longer needed
- 			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-@@ -329,7 +334,6 @@
- 	// is my surrogate
- 	bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
-         = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
--	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
- 	
- 	switch (pMemberDescr->eTypeClass)
- 	{
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx.orig	Wed Jul 19 05:30:01 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	Mon Sep 11 12:21:25 2006
-@@ -37,6 +37,7 @@
- #include <dlfcn.h>
- #include <cxxabi.h>
- #include <hash_map>
-+#include <sys/param.h>
- 
- #include <rtl/strbuf.hxx>
- #include <rtl/ustrbuf.hxx>
-@@ -122,7 +123,11 @@
- };
- //__________________________________________________________________________________________________
- RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 602103
-     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-+#else
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+#endif
- {
- }
- //__________________________________________________________________________________________________
-@@ -157,7 +162,11 @@
-         buf.append( 'E' );
-         
-         OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 602103  /* #i22253# */
-         rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-+#else
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+#endif
- 
-         if (rtti)
-         {
diff --git a/editors/openoffice.org-2-devel/files/patch-i67904 b/editors/openoffice.org-2-devel/files/patch-i67904
deleted file mode 100644
index 520242bb45a0..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i67904
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: sal/osl/unx/socket.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/socket.c,v
-retrieving revision 1.26
-diff -u -r1.26 socket.c
---- sal/osl/unx/socket.c	19 Jul 2006 09:39:22 -0000	1.26
-+++ sal/osl/unx/socket.c	29 Jul 2006 09:53:04 -0000
-@@ -813,7 +813,7 @@
- 	const char *name, struct hostent *result,
- 	char *buffer, int buflen, int *h_errnop)
- {
--#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015))
-+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
- 	struct hostent *__result; /* will be the same as result */
- 	int __error;
- 	__error = gethostbyname_r (name, result, buffer, buflen,
-Index: sal/osl/unx/system.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/system.c,v
-retrieving revision 1.13
-diff -u -r1.13 system.c
---- sal/osl/unx/system.c	19 Jul 2006 09:39:37 -0000	1.13
-+++ sal/osl/unx/system.c	9 Sep 2006 09:57:26 -0000
-@@ -343,7 +343,7 @@
- }
- #endif /* defined SCO */
- 
--#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
- 
- extern int h_errno;
- 
-@@ -435,7 +435,7 @@
- 
-   	return res;
- }
--#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- 
- #if defined(MACOSX)
- /*
-
-Index: sal/osl/unx/system.h
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/system.h,v
-retrieving revision 1.33
-diff -u -r1.33 system.h
---- sal/osl/unx/system.h	19 Jul 2006 09:39:50 -0000	1.33
-+++ sal/osl/unx/system.h	9 Sep 2006 09:55:55 -0000
-@@ -537,10 +537,10 @@
- struct tm *localtime_r(const time_t *timep, struct tm *buffer);
- struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
- #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
--#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
- struct hostent *gethostbyname_r(const char *name, struct hostent *result,
- 								char *buffer, int buflen, int *h_errnop);
--#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- #endif
- 
- #endif /* __OSL_SYSTEM_H__ */
-
-Index: moz/mozilla-source-1.7.5.patch
-===================================================================
-RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v
-retrieving revision 1.14
-diff -u -r1.14 mozilla-source-1.7.5.patch
---- moz/mozilla-source-1.7.5.patch	17 Apr 2007 08:54:47 -0000	1.14
-+++ moz/mozilla-source-1.7.5.patch	27 Apr 2007 05:57:10 -0000
-@@ -7821,7 +7821,7 @@
-   #endif
-   
- ! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
--! 	(defined(__FreeBSD__) && __FreeBSD_version > 700016)
-+! 	(defined(__FreeBSD__) && __FreeBSD_version > 601103)
-   #define _PR_HAVE_GETPROTO_R
-   #define _PR_HAVE_5_ARG_GETPROTO_R
-   #endif
diff --git a/editors/openoffice.org-2-devel/files/patch-i69418 b/editors/openoffice.org-2-devel/files/patch-i69418
deleted file mode 100644
index dd23c55e4c9b..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i69418
+++ /dev/null
@@ -1,38 +0,0 @@
---- moz/mozilla-source-1.7.5.patch.org	Sat Sep  9 18:43:45 2006
-+++ moz/mozilla-source-1.7.5.patch	Sat Sep  9 18:42:00 2006
-@@ -151,6 +151,17 @@
-          AR_EXTRACT="$AR x"
-          AR_DELETE="$AR d"
- ***************
-+*** 7504,7509 ****
-+--- 7504,7511 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
-+  echo "configure:7510: checking for gethostbyname_r in -lc_r" >&5
-+***************
- *** 16606,16613 ****
-   
-   case "$host_os" in
-@@ -191,6 +202,17 @@
-          AR_EXTRACT="$AR x"
-          AR_DELETE="$AR d"
- ***************
-+*** 1981,1986 ****
-+--- 1981,1988 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	AC_CHECK_LIB(c_r, gethostbyname_r)
-+  	;;
-+***************
- *** 5692,5699 ****
-   dnl ========================================================
-   case "$host_os" in
diff --git a/editors/openoffice.org-2-devel/files/patch-i69994 b/editors/openoffice.org-2-devel/files/patch-i69994
deleted file mode 100644
index 9d2718b4763c..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i69994
+++ /dev/null
@@ -1,747 +0,0 @@
-Index: python/Python-2.3.4.patch
-===================================================================
-RCS file: /cvs/external/python/Python-2.3.4.patch,v
-retrieving revision 1.12
-diff -u -r1.12 Python-2.3.4.patch
---- python/Python-2.3.4.patch	25 Sep 2006 13:22:02 -0000	1.12
-+++ python/Python-2.3.4.patch	29 Sep 2006 22:06:08 -0000
-@@ -13463,3 +13463,739 @@
-   	handler = signal(sig, SIG_IGN);
-   	signal(sig, handler);
-   	return handler;
-+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:26:23 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:20:25 2005
-+***************
-+*** 0 ****
-+--- 1,355 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ IPPROTO_IP = 0
-++ IPPROTO_HOPOPTS = 0
-++ IPPROTO_ICMP = 1
-++ IPPROTO_IGMP = 2
-++ IPPROTO_GGP = 3
-++ IPPROTO_IPV4 = 4
-++ IPPROTO_IPIP = IPPROTO_IPV4
-++ IPPROTO_TCP = 6
-++ IPPROTO_ST = 7
-++ IPPROTO_EGP = 8
-++ IPPROTO_PIGP = 9
-++ IPPROTO_RCCMON = 10
-++ IPPROTO_NVPII = 11
-++ IPPROTO_PUP = 12
-++ IPPROTO_ARGUS = 13
-++ IPPROTO_EMCON = 14
-++ IPPROTO_XNET = 15
-++ IPPROTO_CHAOS = 16
-++ IPPROTO_UDP = 17
-++ IPPROTO_MUX = 18
-++ IPPROTO_MEAS = 19
-++ IPPROTO_HMP = 20
-++ IPPROTO_PRM = 21
-++ IPPROTO_IDP = 22
-++ IPPROTO_TRUNK1 = 23
-++ IPPROTO_TRUNK2 = 24
-++ IPPROTO_LEAF1 = 25
-++ IPPROTO_LEAF2 = 26
-++ IPPROTO_RDP = 27
-++ IPPROTO_IRTP = 28
-++ IPPROTO_TP = 29
-++ IPPROTO_BLT = 30
-++ IPPROTO_NSP = 31
-++ IPPROTO_INP = 32
-++ IPPROTO_SEP = 33
-++ IPPROTO_3PC = 34
-++ IPPROTO_IDPR = 35
-++ IPPROTO_XTP = 36
-++ IPPROTO_DDP = 37
-++ IPPROTO_CMTP = 38
-++ IPPROTO_TPXX = 39
-++ IPPROTO_IL = 40
-++ IPPROTO_IPV6 = 41
-++ IPPROTO_SDRP = 42
-++ IPPROTO_ROUTING = 43
-++ IPPROTO_FRAGMENT = 44
-++ IPPROTO_IDRP = 45
-++ IPPROTO_RSVP = 46
-++ IPPROTO_GRE = 47
-++ IPPROTO_MHRP = 48
-++ IPPROTO_BHA = 49
-++ IPPROTO_ESP = 50
-++ IPPROTO_AH = 51
-++ IPPROTO_INLSP = 52
-++ IPPROTO_SWIPE = 53
-++ IPPROTO_NHRP = 54
-++ IPPROTO_ICMPV6 = 58
-++ IPPROTO_NONE = 59
-++ IPPROTO_DSTOPTS = 60
-++ IPPROTO_AHIP = 61
-++ IPPROTO_CFTP = 62
-++ IPPROTO_HELLO = 63
-++ IPPROTO_SATEXPAK = 64
-++ IPPROTO_KRYPTOLAN = 65
-++ IPPROTO_RVD = 66
-++ IPPROTO_IPPC = 67
-++ IPPROTO_ADFS = 68
-++ IPPROTO_SATMON = 69
-++ IPPROTO_VISA = 70
-++ IPPROTO_IPCV = 71
-++ IPPROTO_CPNX = 72
-++ IPPROTO_CPHB = 73
-++ IPPROTO_WSN = 74
-++ IPPROTO_PVP = 75
-++ IPPROTO_BRSATMON = 76
-++ IPPROTO_ND = 77
-++ IPPROTO_WBMON = 78
-++ IPPROTO_WBEXPAK = 79
-++ IPPROTO_EON = 80
-++ IPPROTO_VMTP = 81
-++ IPPROTO_SVMTP = 82
-++ IPPROTO_VINES = 83
-++ IPPROTO_TTP = 84
-++ IPPROTO_IGP = 85
-++ IPPROTO_DGP = 86
-++ IPPROTO_TCF = 87
-++ IPPROTO_IGRP = 88
-++ IPPROTO_OSPFIGP = 89
-++ IPPROTO_SRPC = 90
-++ IPPROTO_LARP = 91
-++ IPPROTO_MTP = 92
-++ IPPROTO_AX25 = 93
-++ IPPROTO_IPEIP = 94
-++ IPPROTO_MICP = 95
-++ IPPROTO_SCCSP = 96
-++ IPPROTO_ETHERIP = 97
-++ IPPROTO_ENCAP = 98
-++ IPPROTO_APES = 99
-++ IPPROTO_GMTP = 100
-++ IPPROTO_IPCOMP = 108
-++ IPPROTO_PIM = 103
-++ IPPROTO_PGM = 113
-++ IPPROTO_DIVERT = 254
-++ IPPROTO_RAW = 255
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPORT_RESERVED = 1024
-++ IPPORT_USERRESERVED = 5000
-++ IPPORT_HIFIRSTAUTO = 49152
-++ IPPORT_HILASTAUTO = 65535
-++ IPPORT_RESERVEDSTART = 600
-++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
-++ 
-++ IN_CLASSA_NET = 0xff000000
-++ IN_CLASSA_NSHIFT = 24
-++ IN_CLASSA_HOST = 0x00ffffff
-++ IN_CLASSA_MAX = 128
-++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
-++ 
-++ IN_CLASSB_NET = 0xffff0000
-++ IN_CLASSB_NSHIFT = 16
-++ IN_CLASSB_HOST = 0x0000ffff
-++ IN_CLASSB_MAX = 65536
-++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
-++ 
-++ IN_CLASSC_NET = 0xffffff00
-++ IN_CLASSC_NSHIFT = 8
-++ IN_CLASSC_HOST = 0x000000ff
-++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
-++ 
-++ IN_CLASSD_NET = 0xf0000000
-++ IN_CLASSD_NSHIFT = 28
-++ IN_CLASSD_HOST = 0x0fffffff
-++ def IN_MULTICAST(i): return IN_CLASSD(i)
-++ 
-++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ INADDR_NONE = 0xffffffff
-++ IN_LOOPBACKNET = 127
-++ INET_ADDRSTRLEN = 16
-++ IP_OPTIONS = 1
-++ IP_HDRINCL = 2
-++ IP_TOS = 3
-++ IP_TTL = 4
-++ IP_RECVOPTS = 5
-++ IP_RECVRETOPTS = 6
-++ IP_RECVDSTADDR = 7
-++ IP_RETOPTS = 8
-++ IP_MULTICAST_IF = 9
-++ IP_MULTICAST_TTL = 10
-++ IP_MULTICAST_LOOP = 11
-++ IP_ADD_MEMBERSHIP = 12
-++ IP_DROP_MEMBERSHIP = 13
-++ IP_MULTICAST_VIF = 14
-++ IP_RSVP_ON = 15
-++ IP_RSVP_OFF = 16
-++ IP_RSVP_VIF_ON = 17
-++ IP_RSVP_VIF_OFF = 18
-++ IP_PORTRANGE = 19
-++ IP_RECVIF = 20
-++ IP_IPSEC_POLICY = 21
-++ IP_FAITH = 22
-++ IP_FW_ADD = 50
-++ IP_FW_DEL = 51
-++ IP_FW_FLUSH = 52
-++ IP_FW_ZERO = 53
-++ IP_FW_GET = 54
-++ IP_FW_RESETLOG = 55
-++ IP_DUMMYNET_CONFIGURE = 60
-++ IP_DUMMYNET_DEL = 61
-++ IP_DUMMYNET_FLUSH = 62
-++ IP_DUMMYNET_GET = 64
-++ IP_DEFAULT_MULTICAST_TTL = 1
-++ IP_DEFAULT_MULTICAST_LOOP = 1
-++ IP_MAX_MEMBERSHIPS = 20
-++ IP_PORTRANGE_DEFAULT = 0
-++ IP_PORTRANGE_HIGH = 1
-++ IP_PORTRANGE_LOW = 2
-++ IPPROTO_MAXID = (IPPROTO_AH + 1)
-++ IPCTL_FORWARDING = 1
-++ IPCTL_SENDREDIRECTS = 2
-++ IPCTL_DEFTTL = 3
-++ IPCTL_DEFMTU = 4
-++ IPCTL_RTEXPIRE = 5
-++ IPCTL_RTMINEXPIRE = 6
-++ IPCTL_RTMAXCACHE = 7
-++ IPCTL_SOURCEROUTE = 8
-++ IPCTL_DIRECTEDBROADCAST = 9
-++ IPCTL_INTRQMAXLEN = 10
-++ IPCTL_INTRQDROPS = 11
-++ IPCTL_STATS = 12
-++ IPCTL_ACCEPTSOURCEROUTE = 13
-++ IPCTL_FASTFORWARDING = 14
-++ IPCTL_KEEPFAITH = 15
-++ IPCTL_GIF_TTL = 16
-++ IPCTL_MAXID = 17
-++ 
-++ # Included from netinet6/in6.h
-++ 
-++ # Included from sys/queue.h
-++ def SLIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def SLIST_ENTRY(type): return \
-++ 
-++ def STAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def STAILQ_ENTRY(type): return \
-++ 
-++ def LIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def LIST_ENTRY(type): return \
-++ 
-++ def TAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def TAILQ_ENTRY(type): return \
-++ 
-++ def CIRCLEQ_ENTRY(type): return \
-++ 
-++ __KAME_VERSION = "20000701/FreeBSD-current"
-++ IPV6PORT_RESERVED = 1024
-++ IPV6PORT_ANONMIN = 49152
-++ IPV6PORT_ANONMAX = 65535
-++ IPV6PORT_RESERVEDMIN = 600
-++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-++ INET6_ADDRSTRLEN = 46
-++ IPV6_ADDR_INT32_ONE = 1
-++ IPV6_ADDR_INT32_TWO = 2
-++ IPV6_ADDR_INT32_MNL = 0xff010000
-++ IPV6_ADDR_INT32_MLL = 0xff020000
-++ IPV6_ADDR_INT32_SMP = 0x0000ffff
-++ IPV6_ADDR_INT16_ULL = 0xfe80
-++ IPV6_ADDR_INT16_USL = 0xfec0
-++ IPV6_ADDR_INT16_MLL = 0xff02
-++ IPV6_ADDR_INT32_ONE = 0x01000000
-++ IPV6_ADDR_INT32_TWO = 0x02000000
-++ IPV6_ADDR_INT32_MNL = 0x000001ff
-++ IPV6_ADDR_INT32_MLL = 0x000002ff
-++ IPV6_ADDR_INT32_SMP = 0xffff0000
-++ IPV6_ADDR_INT16_ULL = 0x80fe
-++ IPV6_ADDR_INT16_USL = 0xc0fe
-++ IPV6_ADDR_INT16_MLL = 0x02ff
-++ def IN6_IS_ADDR_UNSPECIFIED(a): return \
-++ 
-++ def IN6_IS_ADDR_LOOPBACK(a): return \
-++ 
-++ def IN6_IS_ADDR_V4COMPAT(a): return \
-++ 
-++ def IN6_IS_ADDR_V4MAPPED(a): return \
-++ 
-++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ def IN6_IS_ADDR_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_SCOPE_LINKLOCAL(a): return \
-++ 
-++ IPV6_OPTIONS = 1
-++ IPV6_RECVOPTS = 5
-++ IPV6_RECVRETOPTS = 6
-++ IPV6_RECVDSTADDR = 7
-++ IPV6_RETOPTS = 8
-++ IPV6_SOCKOPT_RESERVED1 = 3
-++ IPV6_UNICAST_HOPS = 4
-++ IPV6_MULTICAST_IF = 9
-++ IPV6_MULTICAST_HOPS = 10
-++ IPV6_MULTICAST_LOOP = 11
-++ IPV6_JOIN_GROUP = 12
-++ IPV6_LEAVE_GROUP = 13
-++ IPV6_PORTRANGE = 14
-++ ICMP6_FILTER = 18
-++ IPV6_PKTINFO = 19
-++ IPV6_HOPLIMIT = 20
-++ IPV6_NEXTHOP = 21
-++ IPV6_HOPOPTS = 22
-++ IPV6_DSTOPTS = 23
-++ IPV6_RTHDR = 24
-++ IPV6_PKTOPTIONS = 25
-++ IPV6_CHECKSUM = 26
-++ IPV6_BINDV6ONLY = 27
-++ IPV6_IPSEC_POLICY = 28
-++ IPV6_FAITH = 29
-++ IPV6_FW_ADD = 30
-++ IPV6_FW_DEL = 31
-++ IPV6_FW_FLUSH = 32
-++ IPV6_FW_ZERO = 33
-++ IPV6_FW_GET = 34
-++ IPV6_RTHDR_LOOSE = 0
-++ IPV6_RTHDR_STRICT = 1
-++ IPV6_RTHDR_TYPE_0 = 0
-++ IPV6_DEFAULT_MULTICAST_HOPS = 1
-++ IPV6_DEFAULT_MULTICAST_LOOP = 1
-++ IPV6_PORTRANGE_DEFAULT = 0
-++ IPV6_PORTRANGE_HIGH = 1
-++ IPV6_PORTRANGE_LOW = 2
-++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-++ IPV6CTL_FORWARDING = 1
-++ IPV6CTL_SENDREDIRECTS = 2
-++ IPV6CTL_DEFHLIM = 3
-++ IPV6CTL_DEFMTU = 4
-++ IPV6CTL_FORWSRCRT = 5
-++ IPV6CTL_STATS = 6
-++ IPV6CTL_MRTSTATS = 7
-++ IPV6CTL_MRTPROTO = 8
-++ IPV6CTL_MAXFRAGPACKETS = 9
-++ IPV6CTL_SOURCECHECK = 10
-++ IPV6CTL_SOURCECHECK_LOGINT = 11
-++ IPV6CTL_ACCEPT_RTADV = 12
-++ IPV6CTL_KEEPFAITH = 13
-++ IPV6CTL_LOG_INTERVAL = 14
-++ IPV6CTL_HDRNESTLIMIT = 15
-++ IPV6CTL_DAD_COUNT = 16
-++ IPV6CTL_AUTO_FLOWLABEL = 17
-++ IPV6CTL_DEFMCASTHLIM = 18
-++ IPV6CTL_GIF_HLIM = 19
-++ IPV6CTL_KAME_VERSION = 20
-++ IPV6CTL_USE_DEPRECATED = 21
-++ IPV6CTL_RR_PRUNE = 22
-++ IPV6CTL_MAPPED_ADDR = 23
-++ IPV6CTL_BINDV6ONLY = 24
-++ IPV6CTL_RTEXPIRE = 25
-++ IPV6CTL_RTMINEXPIRE = 26
-++ IPV6CTL_RTMAXCACHE = 27
-++ IPV6CTL_MAXID = 28
-+*** misc/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:26:27 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:19:02 2005
-+***************
-+*** 0 ****
-+--- 1,3 ----
-++ #! /bin/sh
-++ set -v
-++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
-+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:26:23 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:20:25 2005
-+***************
-+*** 0 ****
-+--- 1,355 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ IPPROTO_IP = 0
-++ IPPROTO_HOPOPTS = 0
-++ IPPROTO_ICMP = 1
-++ IPPROTO_IGMP = 2
-++ IPPROTO_GGP = 3
-++ IPPROTO_IPV4 = 4
-++ IPPROTO_IPIP = IPPROTO_IPV4
-++ IPPROTO_TCP = 6
-++ IPPROTO_ST = 7
-++ IPPROTO_EGP = 8
-++ IPPROTO_PIGP = 9
-++ IPPROTO_RCCMON = 10
-++ IPPROTO_NVPII = 11
-++ IPPROTO_PUP = 12
-++ IPPROTO_ARGUS = 13
-++ IPPROTO_EMCON = 14
-++ IPPROTO_XNET = 15
-++ IPPROTO_CHAOS = 16
-++ IPPROTO_UDP = 17
-++ IPPROTO_MUX = 18
-++ IPPROTO_MEAS = 19
-++ IPPROTO_HMP = 20
-++ IPPROTO_PRM = 21
-++ IPPROTO_IDP = 22
-++ IPPROTO_TRUNK1 = 23
-++ IPPROTO_TRUNK2 = 24
-++ IPPROTO_LEAF1 = 25
-++ IPPROTO_LEAF2 = 26
-++ IPPROTO_RDP = 27
-++ IPPROTO_IRTP = 28
-++ IPPROTO_TP = 29
-++ IPPROTO_BLT = 30
-++ IPPROTO_NSP = 31
-++ IPPROTO_INP = 32
-++ IPPROTO_SEP = 33
-++ IPPROTO_3PC = 34
-++ IPPROTO_IDPR = 35
-++ IPPROTO_XTP = 36
-++ IPPROTO_DDP = 37
-++ IPPROTO_CMTP = 38
-++ IPPROTO_TPXX = 39
-++ IPPROTO_IL = 40
-++ IPPROTO_IPV6 = 41
-++ IPPROTO_SDRP = 42
-++ IPPROTO_ROUTING = 43
-++ IPPROTO_FRAGMENT = 44
-++ IPPROTO_IDRP = 45
-++ IPPROTO_RSVP = 46
-++ IPPROTO_GRE = 47
-++ IPPROTO_MHRP = 48
-++ IPPROTO_BHA = 49
-++ IPPROTO_ESP = 50
-++ IPPROTO_AH = 51
-++ IPPROTO_INLSP = 52
-++ IPPROTO_SWIPE = 53
-++ IPPROTO_NHRP = 54
-++ IPPROTO_ICMPV6 = 58
-++ IPPROTO_NONE = 59
-++ IPPROTO_DSTOPTS = 60
-++ IPPROTO_AHIP = 61
-++ IPPROTO_CFTP = 62
-++ IPPROTO_HELLO = 63
-++ IPPROTO_SATEXPAK = 64
-++ IPPROTO_KRYPTOLAN = 65
-++ IPPROTO_RVD = 66
-++ IPPROTO_IPPC = 67
-++ IPPROTO_ADFS = 68
-++ IPPROTO_SATMON = 69
-++ IPPROTO_VISA = 70
-++ IPPROTO_IPCV = 71
-++ IPPROTO_CPNX = 72
-++ IPPROTO_CPHB = 73
-++ IPPROTO_WSN = 74
-++ IPPROTO_PVP = 75
-++ IPPROTO_BRSATMON = 76
-++ IPPROTO_ND = 77
-++ IPPROTO_WBMON = 78
-++ IPPROTO_WBEXPAK = 79
-++ IPPROTO_EON = 80
-++ IPPROTO_VMTP = 81
-++ IPPROTO_SVMTP = 82
-++ IPPROTO_VINES = 83
-++ IPPROTO_TTP = 84
-++ IPPROTO_IGP = 85
-++ IPPROTO_DGP = 86
-++ IPPROTO_TCF = 87
-++ IPPROTO_IGRP = 88
-++ IPPROTO_OSPFIGP = 89
-++ IPPROTO_SRPC = 90
-++ IPPROTO_LARP = 91
-++ IPPROTO_MTP = 92
-++ IPPROTO_AX25 = 93
-++ IPPROTO_IPEIP = 94
-++ IPPROTO_MICP = 95
-++ IPPROTO_SCCSP = 96
-++ IPPROTO_ETHERIP = 97
-++ IPPROTO_ENCAP = 98
-++ IPPROTO_APES = 99
-++ IPPROTO_GMTP = 100
-++ IPPROTO_IPCOMP = 108
-++ IPPROTO_PIM = 103
-++ IPPROTO_PGM = 113
-++ IPPROTO_DIVERT = 254
-++ IPPROTO_RAW = 255
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPORT_RESERVED = 1024
-++ IPPORT_USERRESERVED = 5000
-++ IPPORT_HIFIRSTAUTO = 49152
-++ IPPORT_HILASTAUTO = 65535
-++ IPPORT_RESERVEDSTART = 600
-++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
-++ 
-++ IN_CLASSA_NET = 0xff000000
-++ IN_CLASSA_NSHIFT = 24
-++ IN_CLASSA_HOST = 0x00ffffff
-++ IN_CLASSA_MAX = 128
-++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
-++ 
-++ IN_CLASSB_NET = 0xffff0000
-++ IN_CLASSB_NSHIFT = 16
-++ IN_CLASSB_HOST = 0x0000ffff
-++ IN_CLASSB_MAX = 65536
-++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
-++ 
-++ IN_CLASSC_NET = 0xffffff00
-++ IN_CLASSC_NSHIFT = 8
-++ IN_CLASSC_HOST = 0x000000ff
-++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
-++ 
-++ IN_CLASSD_NET = 0xf0000000
-++ IN_CLASSD_NSHIFT = 28
-++ IN_CLASSD_HOST = 0x0fffffff
-++ def IN_MULTICAST(i): return IN_CLASSD(i)
-++ 
-++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ INADDR_NONE = 0xffffffff
-++ IN_LOOPBACKNET = 127
-++ INET_ADDRSTRLEN = 16
-++ IP_OPTIONS = 1
-++ IP_HDRINCL = 2
-++ IP_TOS = 3
-++ IP_TTL = 4
-++ IP_RECVOPTS = 5
-++ IP_RECVRETOPTS = 6
-++ IP_RECVDSTADDR = 7
-++ IP_RETOPTS = 8
-++ IP_MULTICAST_IF = 9
-++ IP_MULTICAST_TTL = 10
-++ IP_MULTICAST_LOOP = 11
-++ IP_ADD_MEMBERSHIP = 12
-++ IP_DROP_MEMBERSHIP = 13
-++ IP_MULTICAST_VIF = 14
-++ IP_RSVP_ON = 15
-++ IP_RSVP_OFF = 16
-++ IP_RSVP_VIF_ON = 17
-++ IP_RSVP_VIF_OFF = 18
-++ IP_PORTRANGE = 19
-++ IP_RECVIF = 20
-++ IP_IPSEC_POLICY = 21
-++ IP_FAITH = 22
-++ IP_FW_ADD = 50
-++ IP_FW_DEL = 51
-++ IP_FW_FLUSH = 52
-++ IP_FW_ZERO = 53
-++ IP_FW_GET = 54
-++ IP_FW_RESETLOG = 55
-++ IP_DUMMYNET_CONFIGURE = 60
-++ IP_DUMMYNET_DEL = 61
-++ IP_DUMMYNET_FLUSH = 62
-++ IP_DUMMYNET_GET = 64
-++ IP_DEFAULT_MULTICAST_TTL = 1
-++ IP_DEFAULT_MULTICAST_LOOP = 1
-++ IP_MAX_MEMBERSHIPS = 20
-++ IP_PORTRANGE_DEFAULT = 0
-++ IP_PORTRANGE_HIGH = 1
-++ IP_PORTRANGE_LOW = 2
-++ IPPROTO_MAXID = (IPPROTO_AH + 1)
-++ IPCTL_FORWARDING = 1
-++ IPCTL_SENDREDIRECTS = 2
-++ IPCTL_DEFTTL = 3
-++ IPCTL_DEFMTU = 4
-++ IPCTL_RTEXPIRE = 5
-++ IPCTL_RTMINEXPIRE = 6
-++ IPCTL_RTMAXCACHE = 7
-++ IPCTL_SOURCEROUTE = 8
-++ IPCTL_DIRECTEDBROADCAST = 9
-++ IPCTL_INTRQMAXLEN = 10
-++ IPCTL_INTRQDROPS = 11
-++ IPCTL_STATS = 12
-++ IPCTL_ACCEPTSOURCEROUTE = 13
-++ IPCTL_FASTFORWARDING = 14
-++ IPCTL_KEEPFAITH = 15
-++ IPCTL_GIF_TTL = 16
-++ IPCTL_MAXID = 17
-++ 
-++ # Included from netinet6/in6.h
-++ 
-++ # Included from sys/queue.h
-++ def SLIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def SLIST_ENTRY(type): return \
-++ 
-++ def STAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def STAILQ_ENTRY(type): return \
-++ 
-++ def LIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def LIST_ENTRY(type): return \
-++ 
-++ def TAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def TAILQ_ENTRY(type): return \
-++ 
-++ def CIRCLEQ_ENTRY(type): return \
-++ 
-++ __KAME_VERSION = "20000701/FreeBSD-current"
-++ IPV6PORT_RESERVED = 1024
-++ IPV6PORT_ANONMIN = 49152
-++ IPV6PORT_ANONMAX = 65535
-++ IPV6PORT_RESERVEDMIN = 600
-++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-++ INET6_ADDRSTRLEN = 46
-++ IPV6_ADDR_INT32_ONE = 1
-++ IPV6_ADDR_INT32_TWO = 2
-++ IPV6_ADDR_INT32_MNL = 0xff010000
-++ IPV6_ADDR_INT32_MLL = 0xff020000
-++ IPV6_ADDR_INT32_SMP = 0x0000ffff
-++ IPV6_ADDR_INT16_ULL = 0xfe80
-++ IPV6_ADDR_INT16_USL = 0xfec0
-++ IPV6_ADDR_INT16_MLL = 0xff02
-++ IPV6_ADDR_INT32_ONE = 0x01000000
-++ IPV6_ADDR_INT32_TWO = 0x02000000
-++ IPV6_ADDR_INT32_MNL = 0x000001ff
-++ IPV6_ADDR_INT32_MLL = 0x000002ff
-++ IPV6_ADDR_INT32_SMP = 0xffff0000
-++ IPV6_ADDR_INT16_ULL = 0x80fe
-++ IPV6_ADDR_INT16_USL = 0xc0fe
-++ IPV6_ADDR_INT16_MLL = 0x02ff
-++ def IN6_IS_ADDR_UNSPECIFIED(a): return \
-++ 
-++ def IN6_IS_ADDR_LOOPBACK(a): return \
-++ 
-++ def IN6_IS_ADDR_V4COMPAT(a): return \
-++ 
-++ def IN6_IS_ADDR_V4MAPPED(a): return \
-++ 
-++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ def IN6_IS_ADDR_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_SCOPE_LINKLOCAL(a): return \
-++ 
-++ IPV6_OPTIONS = 1
-++ IPV6_RECVOPTS = 5
-++ IPV6_RECVRETOPTS = 6
-++ IPV6_RECVDSTADDR = 7
-++ IPV6_RETOPTS = 8
-++ IPV6_SOCKOPT_RESERVED1 = 3
-++ IPV6_UNICAST_HOPS = 4
-++ IPV6_MULTICAST_IF = 9
-++ IPV6_MULTICAST_HOPS = 10
-++ IPV6_MULTICAST_LOOP = 11
-++ IPV6_JOIN_GROUP = 12
-++ IPV6_LEAVE_GROUP = 13
-++ IPV6_PORTRANGE = 14
-++ ICMP6_FILTER = 18
-++ IPV6_PKTINFO = 19
-++ IPV6_HOPLIMIT = 20
-++ IPV6_NEXTHOP = 21
-++ IPV6_HOPOPTS = 22
-++ IPV6_DSTOPTS = 23
-++ IPV6_RTHDR = 24
-++ IPV6_PKTOPTIONS = 25
-++ IPV6_CHECKSUM = 26
-++ IPV6_BINDV6ONLY = 27
-++ IPV6_IPSEC_POLICY = 28
-++ IPV6_FAITH = 29
-++ IPV6_FW_ADD = 30
-++ IPV6_FW_DEL = 31
-++ IPV6_FW_FLUSH = 32
-++ IPV6_FW_ZERO = 33
-++ IPV6_FW_GET = 34
-++ IPV6_RTHDR_LOOSE = 0
-++ IPV6_RTHDR_STRICT = 1
-++ IPV6_RTHDR_TYPE_0 = 0
-++ IPV6_DEFAULT_MULTICAST_HOPS = 1
-++ IPV6_DEFAULT_MULTICAST_LOOP = 1
-++ IPV6_PORTRANGE_DEFAULT = 0
-++ IPV6_PORTRANGE_HIGH = 1
-++ IPV6_PORTRANGE_LOW = 2
-++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-++ IPV6CTL_FORWARDING = 1
-++ IPV6CTL_SENDREDIRECTS = 2
-++ IPV6CTL_DEFHLIM = 3
-++ IPV6CTL_DEFMTU = 4
-++ IPV6CTL_FORWSRCRT = 5
-++ IPV6CTL_STATS = 6
-++ IPV6CTL_MRTSTATS = 7
-++ IPV6CTL_MRTPROTO = 8
-++ IPV6CTL_MAXFRAGPACKETS = 9
-++ IPV6CTL_SOURCECHECK = 10
-++ IPV6CTL_SOURCECHECK_LOGINT = 11
-++ IPV6CTL_ACCEPT_RTADV = 12
-++ IPV6CTL_KEEPFAITH = 13
-++ IPV6CTL_LOG_INTERVAL = 14
-++ IPV6CTL_HDRNESTLIMIT = 15
-++ IPV6CTL_DAD_COUNT = 16
-++ IPV6CTL_AUTO_FLOWLABEL = 17
-++ IPV6CTL_DEFMCASTHLIM = 18
-++ IPV6CTL_GIF_HLIM = 19
-++ IPV6CTL_KAME_VERSION = 20
-++ IPV6CTL_USE_DEPRECATED = 21
-++ IPV6CTL_RR_PRUNE = 22
-++ IPV6CTL_MAPPED_ADDR = 23
-++ IPV6CTL_BINDV6ONLY = 24
-++ IPV6CTL_RTEXPIRE = 25
-++ IPV6CTL_RTMINEXPIRE = 26
-++ IPV6CTL_RTMAXCACHE = 27
-++ IPV6CTL_MAXID = 28
-+*** misc/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:26:27 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:19:02 2005
-+***************
-+*** 0 ****
-+--- 1,3 ----
-++ #! /bin/sh
-++ set -v
-++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
diff --git a/editors/openoffice.org-2-devel/files/patch-i73157 b/editors/openoffice.org-2-devel/files/patch-i73157
deleted file mode 100644
index 17d987622060..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i73157
+++ /dev/null
@@ -1,30 +0,0 @@
---- epm/epm-3.7.patch.orig	Tue Aug  1 22:20:23 2006
-+++ epm/epm-3.7.patch	Sat Dec 23 07:00:30 2006
-@@ -68,7 +68,11 @@
-         fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-       }
- ***************
--*** 330,337 ****
-+*** 326,337 ****
-+    if (Verbosity)
-+      puts("Building FreeBSD pkg binary distribution...");
-+  
-+!   if (run_command(NULL, "pkg_create -p / -s %s -c %s -d %s -f %s %s",
-                     current, commentname, descrname, plistname, name))
-       return (1);
-   
-@@ -77,7 +81,11 @@
-   
-    /*
-     * Remove temporary files...
----- 348,356 ----
-+--- 344,356 ----
-+    if (Verbosity)
-+      puts("Building FreeBSD pkg binary distribution...");
-+  
-+!   if (run_command(NULL, "/usr/sbin/pkg_create -p / -s %s -c %s -d %s -f %s %s",
-                     current, commentname, descrname, plistname, name))
-       return (1);
-   
-
-
diff --git a/editors/openoffice.org-2-devel/files/patch-i73217 b/editors/openoffice.org-2-devel/files/patch-i73217
index 3dc7b4e28912..712631a136f1 100644
--- a/editors/openoffice.org-2-devel/files/patch-i73217
+++ b/editors/openoffice.org-2-devel/files/patch-i73217
@@ -1,3 +1,5 @@
+It won't fix in the master as it breaks the POSIX.
+
 Index: epm/epm-3.7.patch
 ===================================================================
 RCS file: /cvs/external/epm/epm-3.7.patch,v
diff --git a/editors/openoffice.org-2-devel/files/patch-i76115 b/editors/openoffice.org-2-devel/files/patch-i76115
deleted file mode 100644
index f090b4337b09..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i76115
+++ /dev/null
@@ -1,102 +0,0 @@
-Sync amd64 bridge with sixtyfour10 CWS.
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx.orig	Sat Sep 16 11:47:13 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Tue Apr  3 20:36:13 2007
-@@ -49,6 +49,7 @@
- #include "bridges/cpp_uno/shared/unointerfaceproxy.hxx"
- #include "bridges/cpp_uno/shared/vtables.hxx"
- 
-+#include "abi.hxx"
- #include "share.hxx"
- 
- using namespace ::rtl;
-@@ -122,7 +123,7 @@
-                 // value verbatim, as a double without conversion.
- 				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
- 			else
--				*pDS++ = *reinterpret_cast<double *>( pSV++ );
-+				*pDS++ = *pSV++;
- 			break;
- 
- 		case 'H': // 64-bit Word
-@@ -165,7 +166,7 @@
- 
- //==================================================================================================
- static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
--							  void * pRegisterReturn, typelib_TypeClass eReturnType,
-+							  void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
- 							  char * pPT, sal_uInt64 * pStackLongs, sal_uInt32 nStackLongs)
- {
- 	sal_uInt32 nr_gpr, nr_fpr, nr_stack;
-@@ -175,8 +176,6 @@
- 	if (nr_stack)
- 		nr_stack = (nr_stack + 1) & ~1;
- 	
--	bool bReturnsSimpleType = bridges::cpp_uno::shared::isSimpleType( eReturnType );
--
- #if OSL_DEBUG_LEVEL > 1
- 	// Let's figure out what is really going on here
- 	fprintf(stderr,"callVirtualMethod() parameters string is %s\n", pPT);
-@@ -244,7 +243,7 @@
- #undef ARG_GPR
-     }
- 
--	if ( bReturnsSimpleType )
-+	if ( bSimpleReturn )
- 		a0 = (sal_uInt64) pThis;
- 	else
- 		a1 = (sal_uInt64) pThis;
-@@ -275,7 +274,7 @@
- 	// Perform the call
- 	ReturnValue aRet = ( ( FunctionCall ) pMethod )( a0, a1, a2, a3, a4, a5 );
- 
--	switch (eReturnType)
-+	switch (pReturnTypeDescr->eTypeClass)
- 	{
- 	case typelib_TypeClass_HYPER:
- 	case typelib_TypeClass_UNSIGNED_HYPER:
-@@ -301,6 +300,15 @@
- 	case typelib_TypeClass_DOUBLE:
- 		*reinterpret_cast<double *>( pRegisterReturn ) = *reinterpret_cast<double*>( &aRet.f.xmm0 );
- 		break;
-+    default: {
-+        sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
-+        if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0) {
-+            if (nRetSize > 8)
-+                static_cast<sal_uInt64 *>(pRegisterReturn)[1] = aRet.i.rdx;
-+            static_cast<sal_uInt64 *>(pRegisterReturn)[0] = aRet.i.rax;
-+        }
-+        break;
-+    }
- 	}
- }
- 
-@@ -327,13 +335,15 @@
- 	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
- 	
- 	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
--	
-+
-+	bool bSimpleReturn = true;	
- 	if (pReturnTypeDescr)
- 	{
--		if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
--		{
-+		if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
-+			bSimpleReturn = false;
-+
-+		if (bSimpleReturn)
- 			pCppReturn = pUnoReturn; // direct way for simple types
--		}
- 		else
- 		{
- 			// complex return via ptr
-@@ -458,7 +468,7 @@
- 		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 7), "UNALIGNED STACK !!! (Please DO panic)" );
- 		callVirtualMethod(
- 			pAdjustedThisPtr, aVtableSlot.index,
--			pCppReturn, pReturnTypeDescr->eTypeClass, pParamType,
-+			pCppReturn, pReturnTypeDescr, bSimpleReturn, pParamType,
- 			(sal_uInt64 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_uInt64) );
- 		// NO exception occured...
- 		*ppUnoExc = 0;
diff --git a/editors/openoffice.org-2-devel/files/patch-i76141 b/editors/openoffice.org-2-devel/files/patch-i76141
deleted file mode 100644
index c1d964b3b5c2..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i76141
+++ /dev/null
@@ -1,839 +0,0 @@
---- berkeleydb/db-4.2.52.patch	26 Mar 2007 12:24:38 -0000	1.19
-+++ berkeleydb/db-4.2.52.patch	3 Jul 2007 01:03:31 -0000
-@@ -222,7 +222,7 @@
- ! 
- ! .INCLUDE :  target.mk
- *** misc/db-4.2.52.NC/dist/configure	2003-12-03 22:10:02.000000000 +0100
----- misc/build/db-4.2.52.NC/dist/configure	2007-02-19 16:12:12.000000000 +0100
-+--- misc/build/db-4.2.52.NC/dist/configure	2007-07-02 21:00:00.000000000 -0400
- ***************
- *** 3518,3525 ****
-   # Set CFLAGS/CXXFLAGS.  We MUST set the flags before we call autoconf
-@@ -262,6 +262,23 @@
-   	test "$with_gnu_ld" != no && break
-   	;;
- ***************
-+*** 9328,9334 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 9330,9336 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 10398,10404 ****
-       #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-       #	       `"' quotes if we put them in here... so don't!
-@@ -327,6 +344,57 @@
-   	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-   	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-   	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+***************
-+*** 12872,12878 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 12885,12891 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 15849,15855 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 15862,15868 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 18114,18120 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 18127,18133 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/db-4.2.52.NC/dist/ltmain.sh	2003-04-26 19:45:37.000000000 +0200
- --- misc/build/db-4.2.52.NC/dist/ltmain.sh	2007-02-19 16:12:12.000000000 +0100
- ***************
---- curl/curl-7.12.2.patch	25 Sep 2006 13:33:49 -0000	1.9
-+++ curl/curl-7.12.2.patch	5 Apr 2007 00:01:20 -0000
-@@ -1,3 +1,73 @@
-+*** misc/curl-7.12.2/configure	Sun Oct 17 18:22:10 2004
-+--- misc/build/curl-7.12.2/configure	Wed Apr  4 19:56:30 2007
-+***************
-+*** 9456,9462 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 9456,9462 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 13154,13160 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 13154,13160 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 16303,16309 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 16303,16309 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 18650,18656 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 18650,18656 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 13:12:17 2004
- --- misc/build/curl-7.12.2/ltmain.sh	Thu Jun 22 13:07:14 2006
- ***************
---- freetype/freetype-2.2.1.patch	3 Aug 2006 14:58:26 -0000	1.2
-+++ freetype/freetype-2.2.1.patch	5 Apr 2007 00:07:40 -0000
-@@ -1,5 +1,75 @@
--*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h	Mon Jan 30 17:49:42 2006
----- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h	Thu Jul 13 16:04:27 2006
-+*** misc/freetype-2.2.1/builds/unix/configure	Fri May 12 11:12:27 2006
-+--- misc/build/freetype-2.2.1/builds/unix/configure	Wed Apr  4 20:05:15 2007
-+***************
-+*** 10644,10650 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 10644,10650 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 14420,14426 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14420,14426 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17684,17690 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17684,17690 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 20153,20159 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 20153,20159 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h	Mon Jan 30 11:49:42 2006
-+--- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h	Wed Apr  4 20:04:02 2007
- ***************
- *** 17,24 ****
- --- 17,26 ----
---- libwpd/libwpd-0.8.8.diff	19 Jan 2007 15:57:46 -0000	1.1.4.1
-+++ libwpd/libwpd-0.8.8.diff	5 Apr 2007 00:13:31 -0000
-@@ -1,3 +1,73 @@
-+*** misc/libwpd-0.8.8/configure	Tue Jan  9 05:35:10 2007
-+--- misc/build/libwpd-0.8.8/configure	Wed Apr  4 20:10:49 2007
-+***************
-+*** 8089,8095 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 8089,8095 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 11808,11814 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11808,11814 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 14978,14984 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14978,14984 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17346,17352 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17346,17352 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/libwpd-0.8.8/src/lib/WP1Part.cpp	2007-01-03 14:07:55.000000000 +0100
- --- misc/build/libwpd-0.8.8/src/lib/WP1Part.cpp	2007-01-13 00:18:52.000000000 +0100
- ***************
-
---- libxml2/libxml2-2.6.17.patch	26 Mar 2007 12:25:19 -0000	1.5
-+++ libxml2/libxml2-2.6.17.patch	3 May 2007 17:31:33 -0000
-@@ -34,6 +34,74 @@
-   fi
-   echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
- ***************
-+*** 8547,8553 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 8547,8553 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 12266,12272 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 12266,12272 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 15436,15442 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 15436,15442 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17804,17810 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17804,17810 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 26339,26347 ****
-   
-   echo "$as_me:$LINENO: checking for setsockopt" >&5
---- libxmlsec/xmlsec1-1.2.6.patch	27 Mar 2007 09:36:38 -0000	1.19
-+++ libxmlsec/xmlsec1-1.2.6.patch	3 May 2007 18:12:52 -0000
-@@ -158,6 +158,23 @@
-   	# is EXPORTS), use it as is; otherwise, prepend...
-   	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 7778,7784 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 7779,7785 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 9046,9052 ****
-         ;;
-       esac
-@@ -215,6 +232,23 @@
-         # built for inclusion in a dll (and should export symbols for example).
-         lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
- ***************
-+*** 11497,11503 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11498,11504 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 13259,13269 ****
-         lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-         ;;
-@@ -257,6 +291,23 @@
-   	# is EXPORTS), use it as is; otherwise, prepend...
-   	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 14667,14673 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14668,14674 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 15607,15617 ****
-         lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-         ;;
-@@ -316,6 +367,23 @@
-   	# is EXPORTS), use it as is; otherwise, prepend...
-   	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 17035,17041 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17036,17042 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 24598,24604 ****
-   fi
-   
---- moz/mozilla-source-1.7.5.patch.orig	Fri Apr 27 15:23:29 2007
-+++ moz/mozilla-source-1.7.5.patch	Fri Apr 27 15:32:07 2007
-@@ -266,6 +266,23 @@
- *** misc/mozilla/configure	Tue Oct 12 00:13:29 2004
- --- misc/build/mozilla/configure	Thu Mar 29 14:27:08 2007
- ***************
-+*** 5228,5234 ****
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+--- 5228,5234 ----
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+***************
- *** 5895,5901 ****
-          MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
-          MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
-@@ -311,6 +328,23 @@
- *** misc/mozilla/configure.in	Tue Oct 12 00:13:29 2004
- --- misc/build/mozilla/configure.in	Thu Mar 29 14:27:08 2007
- ***************
-+*** 1006,1012 ****
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+--- 1006,1012 ----
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+***************
- *** 1536,1542 ****
-          MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
-          MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
-@@ -449,6 +483,25 @@
-   ASM_SUFFIX	= @ASM_SUFFIX@
-   PROG_SUFFIX	= @PROG_SUFFIX@
-   MOD_NAME	= @NSPR_MODNAME@
-+*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk	Tue Mar 26 16:51:46 2002
-+--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk	Wed Apr  4 20:56:05 2007
-+***************
-+*** 66,72 ****
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+--- 66,72 ----
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
- *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper	Wed Apr  2 19:22:39 2003
- --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper	Thu Mar 29 14:27:08 2007
- ***************
-@@ -524,6 +577,23 @@
-   MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-   PR_MD_ASFILES=
- ***************
-+*** 3465,3471 ****
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 3465,3471 ----
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+***************
- *** 3832,3837 ****
- --- 3833,3839 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -604,6 +674,23 @@
-   MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-   PR_MD_ASFILES=
- ***************
-+*** 896,902 ****
-+      AC_DEFINE(FREEBSD)
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 896,902 ----
-+      AC_DEFINE(FREEBSD)
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+***************
- *** 1144,1149 ****
- --- 1145,1151 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -7562,6 +7649,44 @@
-   
-       switch (name) {
-       case MAX_CONNECTIONS:
-+*** misc/mozilla/nsprpub/configure	Tue Sep 14 17:14:38 2004
-+--- misc/build/mozilla/nsprpub/configure	Wed Apr  4 20:56:33 2007
-+***************
-+*** 3407,3413 ****
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 3407,3413 ----
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+*** misc/mozilla/nsprpub/configure.in	Tue Sep 14 17:14:38 2004
-+--- misc/build/mozilla/nsprpub/configure.in	Wed Apr  4 20:56:40 2007
-+***************
-+*** 922,928 ****
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      AC_DEFINE(HAVE_SOCKLEN_T)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 922,928 ----
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      AC_DEFINE(HAVE_SOCKLEN_T)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
- *** misc/mozilla/nsprpub/build/cygwin-wrapper	Wed Apr  2 19:22:38 2003
- --- misc/build/mozilla/nsprpub/build/cygwin-wrapper	Thu Mar 29 14:27:08 2007
- ***************
-@@ -8090,6 +8215,25 @@
- + ifdef NS_USE_GCC
- + NSPR31_LIB_PREFIX = lib
- + endif
-+*** misc/mozilla/security/coreconf/FreeBSD.mk	Wed Mar 26 20:17:25 2003
-+--- misc/build/mozilla/security/coreconf/FreeBSD.mk	Wed Apr  4 20:56:48 2007
-+***************
-+*** 63,69 ****
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+--- 63,69 ----
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
- *** misc/mozilla/security/coreconf/command.mk	Fri Feb 15 17:53:12 2002
- --- misc/build/mozilla/security/coreconf/command.mk	Thu Mar 29 14:27:09 2007
- ***************
---- sndfile/libsndfile-1.0.9.patch	3 Feb 2006 17:31:46 -0000	1.3
-+++ sndfile/libsndfile-1.0.9.patch	5 Apr 2007 00:31:26 -0000
-@@ -83,6 +83,23 @@
-     shlibpath_var=DYLD_LIBRARY_PATH
-     shrext='$(test .$module = .yes && echo .so || echo .dylib)'
- ***************
-+*** 7871,7877 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 7878,7884 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 9111,9120 ****
-         ;;
-       esac
-@@ -143,6 +160,23 @@
-       module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct_CXX=no
- ***************
-+*** 11560,11566 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11567,11573 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 14069,14084 ****
-       	  lt_int_apple_cc_single_mod=yes
-       	fi
-@@ -178,6 +212,23 @@
-             module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         hardcode_direct_F77=no
- ***************
-+*** 14700,14706 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14707,14713 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 16414,16429 ****
-       	  lt_int_apple_cc_single_mod=yes
-       	fi
-@@ -212,6 +263,23 @@
-           fi
-             module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         hardcode_direct_GCJ=no
-+***************
-+*** 17045,17051 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17052,17058 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 05:02:07 2004
- --- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Jan 23 20:13:31 2006
- ***************
---- vigra/vigra1.4.0.patch	12 Oct 2006 10:35:19 -0000	1.3
-+++ vigra/vigra1.4.0.patch	5 Apr 2007 00:40:20 -0000
-@@ -1,3 +1,42 @@
-+diff -uprN misc/vigra1.4.0/configure misc/build/vigra1.4.0/configure
-+--- misc/vigra1.4.0/configure	Tue Dec 20 23:53:28 2005
-++++ misc/build/vigra1.4.0/configure	Wed Apr  4 20:35:48 2007
-+@@ -7259,7 +7259,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
-+@@ -10961,7 +10961,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
-+@@ -14110,7 +14110,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
-+@@ -16461,7 +16461,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
- diff -uprN misc/vigra1.4.0/include/vigra/array_vector.hxx misc/build/vigra1.4.0/include/vigra/array_vector.hxx
- --- misc/vigra1.4.0/include/vigra/array_vector.hxx	2005-12-21 05:53:30.000000000 +0100
- +++ misc/build/vigra1.4.0/include/vigra/array_vector.hxx	2006-08-31 12:08:15.172679000 +0200
diff --git a/editors/openoffice.org-2-devel/files/patch-i76968 b/editors/openoffice.org-2-devel/files/patch-i76968
deleted file mode 100644
index 8bf3e43d703d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i76968
+++ /dev/null
@@ -1,642 +0,0 @@
-Sync FreeBSD-specific files with CWS sixtyfour11.
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk	Thu Jan 25 08:27:35 2007
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk	Wed Apr 25 10:57:20 2007
-@@ -52,11 +52,6 @@
- CFLAGS += -DLEAK_STATIC_DATA
- .ENDIF
- 
--NOOPTFILES= \
--	$(SLO)$/uno2cpp.obj
--
--
--CFLAGSNOOPT=-O0
- 
- SLOFILES= \
- 	$(SLO)$/abi.obj			\
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Thu May  3 21:45:19 2007
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Wed Apr 25 10:57:33 2007
-@@ -38,6 +38,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <rtl/alloc.h>
- 
- #include <com/sun/star/uno/genfunc.hxx>
-@@ -55,265 +56,188 @@
- using namespace ::rtl;
- using namespace ::com::sun::star::uno;
- 
--void dummy_can_throw_anything( char const * );
--
--// 6 integral parameters are passed in registers
--const sal_uInt32 GPR_COUNT = 6;
--
--// 8 floating point parameters are passed in SSE registers
--const sal_uInt32 FPR_COUNT = 8;
--
--static inline void
--invoke_count_words(char *		pPT,      // Parameter Types
--				   sal_uInt32 &	nr_gpr,   // Number of arguments in GPRs
--				   sal_uInt32 &	nr_fpr,   // Number of arguments in FPRs
--				   sal_uInt32 &	nr_stack) // Number of arguments in stack
--{
--	nr_gpr = 0;
--	nr_fpr = 0;
--	nr_stack = 0;
--	char c;
--	
--	while ((c = *pPT++) != 'X')
--	{
--		if (c == 'F' || c == 'D')
--		{
--            if (nr_fpr < FPR_COUNT)
--                nr_fpr++;
--            else
--                nr_stack++;
--		}
--		else
--		{
--            if (nr_gpr < GPR_COUNT)
--                nr_gpr++;
--            else
--                nr_stack++;
--		}
--	}
--}
--
--static void
--invoke_copy_to_stack(sal_uInt64 * pDS,  // Stack Storage
--					 char *       pPT,  // Parameter Types
--					 sal_uInt64 * pSV,  // Source Values
--					 sal_uInt64 * pGPR, // General Purpose Registers
--					 double *     pFPR) // Floating-Point Registers
--{
--	sal_uInt32 nr_gpr = 0;
--	sal_uInt32 nr_fpr = 0;
--	sal_uInt64 value;
--	char c;
--	
--	while ((c = *pPT++) != 'X')
--	{
--		switch (c)
--		{
--		case 'D': // Double
--			if (nr_fpr < FPR_COUNT)
--				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
--			else
--				*pDS++ = *pSV++;
--			break;
--
--		case 'F': // Float
--			if (nr_fpr < FPR_COUNT)
--                // The value in %xmm register is already prepared to
--                // be retrieved as a float. Therefore, we pass the
--                // value verbatim, as a double without conversion.
--				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
--			else
--				*pDS++ = *pSV++;
--			break;
--
--		case 'H': // 64-bit Word
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *pSV++;
--			else
--				*pDS++ = *pSV++;
--			break;
--
--		case 'I': // 32-bit Word
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt32 *>( pSV++ );
--			else
--				*pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV++ );
--			break;
--
--		case 'S': // 16-bit Word
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt16 *>( pSV++ );
--			else
--				*pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV++ );
--			break;
--
--		case 'B': // Byte
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt8 *>( pSV++ );
--			else
--				*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV++ );
--			break;
--
--		default: // Default, assume 64-bit values
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *pSV++;
--			else
--				*pDS++ = *pSV++;
--			break;
--		}
--	}
--}
--
- //==================================================================================================
- static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
--							  void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
--							  char * pPT, sal_uInt64 * pStackLongs, sal_uInt32 nStackLongs)
--{
--	sal_uInt32 nr_gpr, nr_fpr, nr_stack;
--	invoke_count_words(pPT, nr_gpr, nr_fpr, nr_stack);
-+                              void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
-+                              sal_uInt64 *pStack, sal_uInt32 nStack,
-+                              sal_uInt64 *pGPR, sal_uInt32 nGPR,
-+                              double *pFPR, sal_uInt32 nFPR) __attribute__((noinline));
- 
--	// Stack, if used, must be 16-bytes aligned
--	if (nr_stack)
--		nr_stack = (nr_stack + 1) & ~1;
--	
-+static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
-+                              void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
-+                              sal_uInt64 *pStack, sal_uInt32 nStack,
-+                              sal_uInt64 *pGPR, sal_uInt32 nGPR,
-+                              double *pFPR, sal_uInt32 nFPR)
-+{
- #if OSL_DEBUG_LEVEL > 1
--	// Let's figure out what is really going on here
--	fprintf(stderr,"callVirtualMethod() parameters string is %s\n", pPT);
--	{
--		sal_uInt32  k = nStackLongs;
--		sal_uInt64 *q = pStackLongs;
--		while (k > 0)
--		{
--			fprintf(stderr, "uno stack is: %lx\n", *q);
--			k--;
--			q++;
--		}
--	}
--#endif
--
--	// Load parameters to stack, if necessary
--    sal_uInt64 *stack = (sal_uInt64 *) __builtin_alloca(nr_stack * 8);
--    sal_uInt64 gpregs[GPR_COUNT];
--    double fpregs[FPR_COUNT];
--    invoke_copy_to_stack(stack, pPT, pStackLongs, gpregs, fpregs);
--
--    // Load FPR registers from fpregs[]
--    register double d0 asm("xmm0");
--    register double d1 asm("xmm1");
--    register double d2 asm("xmm2");
--    register double d3 asm("xmm3");
--    register double d4 asm("xmm4");
--    register double d5 asm("xmm5");
--    register double d6 asm("xmm6");
--    register double d7 asm("xmm7");
--
--    switch (nr_fpr) {
--#define ARG_FPR(N) \
--    case N+1: d##N = fpregs[N];
--        ARG_FPR(7);
--        ARG_FPR(6);
--        ARG_FPR(5);
--        ARG_FPR(4);
--        ARG_FPR(3);
--        ARG_FPR(2);
--        ARG_FPR(1);
--        ARG_FPR(0);
--    case 0:;
--#undef ARG_FPR
--    }
--    
--    // Load GPR registers from gpregs[]
--    register sal_uInt64 a0 asm("rdi");
--    register sal_uInt64 a1 asm("rsi");
--    register sal_uInt64 a2 asm("rdx");
--    register sal_uInt64 a3 asm("rcx");
--    register sal_uInt64 a4 asm("r8");
--    register sal_uInt64 a5 asm("r9");
--    
--    switch (nr_gpr) {
--#define ARG_GPR(N) \
--    case N+1: a##N = gpregs[N];
--        ARG_GPR(5);
--        ARG_GPR(4);
--        ARG_GPR(3);
--        ARG_GPR(2);
--        ARG_GPR(1);
--        ARG_GPR(0);
--    case 0:;
--#undef ARG_GPR
-+    // Let's figure out what is really going on here
-+    {
-+        fprintf( stderr, "= callVirtualMethod() =\nGPR's (%d): ", nGPR );
-+        for ( int i = 0; i < nGPR; ++i )
-+            fprintf( stderr, "0x%lx, ", pGPR[i] );
-+        fprintf( stderr, "\nFPR's (%d): ", nFPR );
-+        for ( int i = 0; i < nFPR; ++i )
-+            fprintf( stderr, "%f, ", pFPR[i] );
-+        fprintf( stderr, "\nStack (%d): ", nStack );
-+        for ( int i = 0; i < nStack; ++i )
-+            fprintf( stderr, "0x%lx, ", pStack[i] );
-+        fprintf( stderr, "\n" );
-     }
-+#endif
- 
--	if ( bSimpleReturn )
--		a0 = (sal_uInt64) pThis;
--	else
--		a1 = (sal_uInt64) pThis;
--
--    // Ensure that assignments to SSE registers won't be optimized away
--    asm("" ::
--        "x" (d0), "x" (d1), "x" (d2), "x" (d3),
--        "x" (d4), "x" (d5), "x" (d6), "x" (d7));
-+    // The call instruction within the asm section of callVirtualMethod may throw
-+    // exceptions.  So that the compiler handles this correctly, it is important
-+    // that (a) callVirtualMethod might call dummy_can_throw_anything (although this
-+    // never happens at runtime), which in turn can throw exceptions, and (b)
-+    // callVirtualMethod is not inlined at its call site (so that any exceptions are
-+    // caught which are thrown from the instruction calling callVirtualMethod):
-+    if ( !pThis )
-+        CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything( "xxx" ); // address something
-+
-+    // Should not happen, but...
-+    if ( nFPR > x86_64::MAX_SSE_REGS )
-+        nFPR = x86_64::MAX_SSE_REGS;
-+    if ( nGPR > x86_64::MAX_GPR_REGS )
-+        nGPR = x86_64::MAX_GPR_REGS;
- 
-     // Get pointer to method
-     sal_uInt64 pMethod = *((sal_uInt64 *)pThis);
-     pMethod += 8 * nVtableIndex;
-     pMethod = *((sal_uInt64 *)pMethod);
- 
--	union ReturnValue {
--		struct {
--			sal_uInt64 rax;
--			sal_uInt64 rdx;
--		} i;
--		struct {
--			double xmm0;
--			double xmm1;
--		} f;
--	};
-+    // Load parameters to stack, if necessary
-+    if ( nStack )
-+    {
-+        // 16-bytes aligned
-+        sal_uInt32 nStackBytes = ( ( nStack + 1 ) >> 1 ) * 16;
-+        sal_uInt64 *pCallStack = (sal_uInt64 *) __builtin_alloca( nStackBytes );
-+        memcpy( pCallStack, pStack, nStackBytes );
-+    }
- 
--	typedef ReturnValue (* FunctionCall )( sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64 );
-+    // Return values
-+    sal_uInt64 rax;
-+    sal_uInt64 rdx;
-+    double xmm0;
- 
--	// Perform the call
--	ReturnValue aRet = ( ( FunctionCall ) pMethod )( a0, a1, a2, a3, a4, a5 );
-+    asm volatile (
-+        
-+        // Fill the xmm registers
-+        "movq %2, %%rax\n\t"
- 
--	switch (pReturnTypeDescr->eTypeClass)
--	{
--	case typelib_TypeClass_HYPER:
--	case typelib_TypeClass_UNSIGNED_HYPER:
--		*reinterpret_cast<sal_uInt64 *>( pRegisterReturn ) = aRet.i.rax;
--		break;
--	case typelib_TypeClass_LONG:
--	case typelib_TypeClass_UNSIGNED_LONG:
--	case typelib_TypeClass_ENUM:
--		*reinterpret_cast<sal_uInt32 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt32*>( &aRet.i.rax );
--		break;
--	case typelib_TypeClass_CHAR:
--	case typelib_TypeClass_SHORT:
--	case typelib_TypeClass_UNSIGNED_SHORT:
--		*reinterpret_cast<sal_uInt16 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt16*>( &aRet.i.rax );
--		break;
--	case typelib_TypeClass_BOOLEAN:
--	case typelib_TypeClass_BYTE:
--		*reinterpret_cast<sal_uInt8 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt8*>( &aRet.i.rax );
--		break;
--	case typelib_TypeClass_FLOAT:
--		*reinterpret_cast<float *>( pRegisterReturn ) = *reinterpret_cast<float*>( &aRet.f.xmm0 );
--		break;
--	case typelib_TypeClass_DOUBLE:
--		*reinterpret_cast<double *>( pRegisterReturn ) = *reinterpret_cast<double*>( &aRet.f.xmm0 );
--		break;
--    default: {
--        sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
--        if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0) {
--            if (nRetSize > 8)
--                static_cast<sal_uInt64 *>(pRegisterReturn)[1] = aRet.i.rdx;
--            static_cast<sal_uInt64 *>(pRegisterReturn)[0] = aRet.i.rax;
--        }
-+        "movsd   (%%rax), %%xmm0\n\t"
-+        "movsd  8(%%rax), %%xmm1\n\t"
-+        "movsd 16(%%rax), %%xmm2\n\t"
-+        "movsd 24(%%rax), %%xmm3\n\t"
-+        "movsd 32(%%rax), %%xmm4\n\t"
-+        "movsd 40(%%rax), %%xmm5\n\t"
-+        "movsd 48(%%rax), %%xmm6\n\t"
-+        "movsd 56(%%rax), %%xmm7\n\t"
-+
-+        // Fill the general purpose registers
-+        "movq %1, %%rax\n\t"
-+
-+        "movq    (%%rax), %%rdi\n\t"
-+        "movq   8(%%rax), %%rsi\n\t"
-+        "movq  16(%%rax), %%rdx\n\t"
-+        "movq  24(%%rax), %%rcx\n\t"
-+        "movq  32(%%rax), %%r8\n\t"
-+        "movq  40(%%rax), %%r9\n\t"
-+
-+        // Perform the call
-+        "movq %0, %%r11\n\t"
-+        "movq %3, %%rax\n\t"
-+        "call *%%r11\n\t"
-+
-+        // Fill the return values
-+        "movq   %%rax, %4\n\t"
-+        "movq   %%rdx, %5\n\t"
-+        "movsd %%xmm0, %6\n\t"
-+        :
-+        : "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR ),
-+          "m" ( rax ), "m" ( rdx ), "m" ( xmm0 )
-+        : "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r11"
-+    );
-+
-+    switch (pReturnTypeDescr->eTypeClass)
-+    {
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        *reinterpret_cast<sal_uInt64 *>( pRegisterReturn ) = rax;
-         break;
-+    case typelib_TypeClass_LONG:
-+    case typelib_TypeClass_UNSIGNED_LONG:
-+    case typelib_TypeClass_ENUM:
-+        *reinterpret_cast<sal_uInt32 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt32*>( &rax );
-+        break;
-+    case typelib_TypeClass_CHAR:
-+    case typelib_TypeClass_SHORT:
-+    case typelib_TypeClass_UNSIGNED_SHORT:
-+        *reinterpret_cast<sal_uInt16 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt16*>( &rax );
-+        break;
-+    case typelib_TypeClass_BOOLEAN:
-+    case typelib_TypeClass_BYTE:
-+        *reinterpret_cast<sal_uInt8 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt8*>( &rax );
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+    case typelib_TypeClass_DOUBLE:
-+        *reinterpret_cast<double *>( pRegisterReturn ) = xmm0;
-+        break;
-+    default:
-+        {
-+            sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
-+            if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0)
-+            {
-+                if (nRetSize > 8)
-+                    static_cast<sal_uInt64 *>(pRegisterReturn)[1] = rdx;
-+                static_cast<sal_uInt64 *>(pRegisterReturn)[0] = rax;
-+            }
-+            break;
-+        }
-     }
--	}
- }
- 
-+//================================================================================================== 
-+
-+// Macros for easier insertion of values to registers or stack
-+// pSV - pointer to the source
-+// nr - order of the value [will be increased if stored to register]
-+// pFPR, pGPR - pointer to the registers
-+// pDS - pointer to the stack [will be increased if stored here]
-+
-+// The value in %xmm register is already prepared to be retrieved as a float,
-+// thus we treat float and double the same
-+#define INSERT_FLOAT_DOUBLE( pSV, nr, pFPR, pDS ) \
-+	if ( nr < x86_64::MAX_SSE_REGS ) \
-+		pFPR[nr++] = *reinterpret_cast<double *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV ); // verbatim!
-+
-+#define INSERT_INT64( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt64 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV );
-+
-+#define INSERT_INT32( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt32 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV );
-+
-+#define INSERT_INT16( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt16 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV );
-+
-+#define INSERT_INT8( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt8 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
- 
- //================================================================================================== 
-+
- static void cpp_call(
- 	bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
- 	bridges::cpp_uno::shared::VtableSlot aVtableSlot,
-@@ -322,54 +246,52 @@
- 	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
- {
- 	// Maxium space for [complex ret ptr], values | ptr ...
--  	char * pCppStack		= (char *)__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) );
--  	char * pCppStackStart	= pCppStack;
-+	// (but will be used less - some of the values will be in pGPR and pFPR)
-+  	sal_uInt64 *pStack = (sal_uInt64 *)__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) );
-+  	sal_uInt64 *pStackStart = pStack;
- 
--	// We need to know parameter types for callVirtualMethod() so generate a signature string
--	char * pParamType		= (char *)__builtin_alloca( nParams + 3 );
--	char * pPT				= pParamType;
-+	sal_uInt64 pGPR[x86_64::MAX_GPR_REGS];
-+	sal_uInt32 nGPR = 0;
-+
-+	double pFPR[x86_64::MAX_SSE_REGS];
-+	sal_uInt32 nFPR = 0;
- 
- 	// Return
- 	typelib_TypeDescription * pReturnTypeDescr = 0;
- 	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
- 	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
- 	
--	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion (see below)
- 
- 	bool bSimpleReturn = true;	
--	if (pReturnTypeDescr)
-+	if ( pReturnTypeDescr )
- 	{
- 		if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
- 			bSimpleReturn = false;
- 
--		if (bSimpleReturn)
-+		if ( bSimpleReturn )
- 			pCppReturn = pUnoReturn; // direct way for simple types
- 		else
- 		{
- 			// complex return via ptr
--			pCppReturn = *(void **)pCppStack = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
--												? __builtin_alloca( pReturnTypeDescr->nSize )
--												: pUnoReturn); // direct way
--			*pPT++ = 'H';
--			pCppStack += sizeof(void *);
-+			pCppReturn = bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )?
-+						 __builtin_alloca( pReturnTypeDescr->nSize ) : pUnoReturn;
-+			INSERT_INT64( &pCppReturn, nGPR, pGPR, pStack );
- 		}
- 	}
- 
- 	// Push "this" pointer
- 	void * pAdjustedThisPtr = reinterpret_cast< void ** >( pThis->getCppI() ) + aVtableSlot.offset;
--	*(void **)pCppStack = pAdjustedThisPtr;
--	*pPT++ = 'H';
--	pCppStack += sizeof(void *);
-+	INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack );
- 
--	// stack space
- 	// Args
--	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams );
- 	// Indizes of values this have to be converted (interface conversion cpp<=>uno)
- 	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
- 	// Type descriptions for reconversions
- 	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
- 	
--	sal_Int32 nTempIndizes   = 0;
-+	sal_Int32 nTempIndizes = 0;
- 	
- 	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
- 	{
-@@ -379,45 +301,32 @@
- 		
- 		if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
- 		{
--			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+			uno_copyAndConvertData( pCppArgs[nPos] = alloca( 8 ), pUnoArgs[nPos], pParamTypeDescr,
- 									pThis->getBridge()->getUno2Cpp() );
- 			
- 			switch (pParamTypeDescr->eTypeClass)
- 			{
--				
--				// we need to know type of each param so that we know whether to use
--				// gpr or fpr to pass in parameters:
--				// Key: I - 32-bit value passed in gpr
--				//      B - byte value passed in gpr
--				//      S - short value passed in gpr
--				//      F - float value pass in fpr
--				//      D - double value pass in fpr
--				//      H - long value passed in gpr
--				//      X - indicates end of parameter description string
--				
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+				INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack );
-+				break;
- 			case typelib_TypeClass_LONG:
- 			case typelib_TypeClass_UNSIGNED_LONG:
- 			case typelib_TypeClass_ENUM:
--				*pPT++ = 'I';
-+				INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack );
- 				break;
- 			case typelib_TypeClass_SHORT:
- 			case typelib_TypeClass_CHAR:
- 			case typelib_TypeClass_UNSIGNED_SHORT:
--				*pPT++ = 'S';
-+				INSERT_INT16( pCppArgs[nPos], nGPR, pGPR, pStack );
- 				break;
- 			case typelib_TypeClass_BOOLEAN:
- 			case typelib_TypeClass_BYTE:
--				*pPT++ = 'B';
-+				INSERT_INT8( pCppArgs[nPos], nGPR, pGPR, pStack );
- 				break;
- 			case typelib_TypeClass_FLOAT:
--				*pPT++ = 'F';
--				break;
- 			case typelib_TypeClass_DOUBLE:
--				*pPT++ = 'D';
--				break;
--			case typelib_TypeClass_HYPER:
--			case typelib_TypeClass_UNSIGNED_HYPER:
--				*pPT++ = 'H';
-+				INSERT_FLOAT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, pStack );
- 				break;
- 			}
- 
-@@ -430,7 +339,7 @@
- 			{
- 				// cpp out is constructed mem, uno out is not!
- 				uno_constructData(
--					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
- 					pParamTypeDescr );
- 				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
- 				// will be released at reconversion
-@@ -440,7 +349,7 @@
- 			else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr ))
- 			{
- 				uno_copyAndConvertData(
--					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
- 					pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
- 				
- 				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-@@ -449,27 +358,22 @@
- 			}
- 			else // direct way
- 			{
--				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				pCppArgs[nPos] = pUnoArgs[nPos];
- 				// no longer needed
- 				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
- 			}
--			// FIXME: is this the right way to pass these?
--			*pPT++='H';
-+			INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack );
- 		}
--		pCppStack += sizeof(sal_uInt64); // standard parameter length
- 	}
- 	
--	// terminate the signature string
--	*pPT++ = 'X';
--	*pPT = 0;
--
- 	try
- 	{
--		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 7), "UNALIGNED STACK !!! (Please DO panic)" );
- 		callVirtualMethod(
- 			pAdjustedThisPtr, aVtableSlot.index,
--			pCppReturn, pReturnTypeDescr, bSimpleReturn, pParamType,
--			(sal_uInt64 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_uInt64) );
-+			pCppReturn, pReturnTypeDescr, bSimpleReturn,
-+			pStackStart, ( pStack - pStackStart ),
-+			pGPR, nGPR,
-+			pFPR, nFPR );
- 		// NO exception occured...
- 		*ppUnoExc = 0;
- 		
-@@ -525,8 +429,8 @@
- 	}
- }
- 
--
- //==================================================================================================
-+
- namespace bridges { namespace cpp_uno { namespace shared {
- 
- void unoInterfaceProxyDispatch(
diff --git a/editors/openoffice.org-2-devel/files/patch-i76969 b/editors/openoffice.org-2-devel/files/patch-i76969
deleted file mode 100644
index 123402727290..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i76969
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: solenv/inc/unxfbsd.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsd.mk,v
-retrieving revision 1.3
-diff -u -r1.3 unxfbsd.mk
---- solenv/inc/unxfbsd.mk	9 Mar 2007 09:07:55 -0000	1.3
-+++ solenv/inc/unxfbsd.mk	4 May 2007 16:22:53 -0000
-@@ -121,12 +121,6 @@
- # Compiler flags for debugging
- CFLAGSDEBUG=-g
- CFLAGSDBGUTIL=
--# Compiler flags for enabling optimizations
--.IF "$(PRODUCT)"!=""
--CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
--.ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT=   							# no optimizing for non products
--.ENDIF	# "$(PRODUCT)"!=""
- # Compiler flags for disabling optimizations
- CFLAGSNOOPT=-O0
- # Compiler flags for describing the output path
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.24
-diff -u -r1.24 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	19 Jul 2006 09:27:04 -0000	1.24
-+++ solenv/inc/unxfbsdi.mk	4 May 2007 16:22:53 -0000
-@@ -43,5 +43,12 @@
- # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
- ARCH_FLAGS*=-mtune=pentiumpro
- 
-+# Compiler flags for enabling optimizations
-+.IF "$(PRODUCT)"!=""
-+CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+.ELSE 	# "$(PRODUCT)"!=""
-+CFLAGSOPT= 					# no optimizing for non products
-+.ENDIF	# "$(PRODUCT)"!=""
-+
- # platform specific identifier for shared libs
- DLLPOSTFIX=fi
diff --git a/editors/openoffice.org-2-devel/files/patch-i77615 b/editors/openoffice.org-2-devel/files/patch-i77615
deleted file mode 100644
index 89fe1aaee7c8..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i77615
+++ /dev/null
@@ -1,57 +0,0 @@
-For FreeBSD, libxslt builds libraries as libxslt.so.2 or something
-like that. Following patch fixes this.
-
-Index: libxslt/libxslt-1.1.16.patch
-===================================================================
-RCS file: /cvs/external/libxslt/libxslt-1.1.16.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxslt-1.1.16.patch
---- libxslt/libxslt-1.1.16.patch	10 May 2007 13:10:07 -0000	1.2
-+++ libxslt/libxslt-1.1.16.patch	20 May 2007 02:35:31 -0000
-@@ -108,3 +108,46 @@
- ! 
- ! exit 0
- 
-+*** misc/libxslt-1.1.16/ltmain.sh	Sun Feb 12 09:50:49 2006
-+--- misc/build/libxslt-1.1.16/ltmain.sh	Sun May 20 11:34:29 2007
-+***************
-+*** 3192,3200 ****
-+  	    revision="$number_revision"
-+  	    ;;
-+  	  freebsd-aout|freebsd-elf|sunos)
-+! 	    current="$number_major"
-+! 	    revision="$number_minor"
-+! 	    age="0"
-+  	    ;;
-+  	  irix|nonstopux)
-+  	    current=`expr $number_major + $number_minor - 1`
-+--- 3192,3200 ----
-+  	    revision="$number_revision"
-+  	    ;;
-+  	  freebsd-aout|freebsd-elf|sunos)
-+! 	    current=`expr $number_major + $number_minor`
-+! 	    age="$number_minor"
-+! 	    revision="$number_revision"
-+  	    ;;
-+  	  irix|nonstopux)
-+  	    current=`expr $number_major + $number_minor - 1`
-+***************
-+*** 3267,3274 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 3267,3274 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+
diff --git a/editors/openoffice.org-2-devel/files/patch-i78032 b/editors/openoffice.org-2-devel/files/patch-i78032
deleted file mode 100644
index e2b523c56e85..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i78032
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: store/util/makefile.mk
-===================================================================
-RCS file: /cvs/ucb/store/util/makefile.mk,v
-retrieving revision 1.19
-diff -u -r1.19 makefile.mk
---- store/util/makefile.mk	26 Mar 2007 13:45:45 -0000	1.19
-+++ store/util/makefile.mk	2 Jun 2007 01:40:18 -0000
-@@ -79,7 +79,7 @@
- .IF "$(GUI)"=="WNT"
- SHL1STDLIBS+= 	-lsupc++
- .ELSE
--.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="NETBSD"
- SHL1STDLIBS+= 	-lsupc++
- .ELIF "$(OS)"=="MACOSX"
- .IF "$(CCNUMVER)"<="000399999999"
diff --git a/editors/openoffice.org-2-devel/files/patch-i79520 b/editors/openoffice.org-2-devel/files/patch-i79520
new file mode 100644
index 000000000000..ccc05e9cbc3c
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i79520
@@ -0,0 +1,10 @@
+--- svx/inc/svx/svdobj.hxx	6 Jul 2007 07:30:43 -0000	1.3
++++ svx/inc/svx/svdobj.hxx	12 Jul 2007 13:56:39 -0000	1.4
+@@ -531,6 +531,7 @@
+ //
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+ 
++class SvxShape;
+ class SVX_DLLPUBLIC SdrObject: public SfxListener, public tools::WeakBase< SdrObject >
+ {
+ private:
diff --git a/editors/openoffice.org-2-devel/files/patch-i79527 b/editors/openoffice.org-2-devel/files/patch-i79527
new file mode 100644
index 000000000000..20c646f43f1e
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i79527
@@ -0,0 +1,19 @@
+Index: reportdesign/source/ui/dlg/GroupsSorting.cxx
+===================================================================
+RCS file: /cvs/dba/reportdesign/source/ui/dlg/GroupsSorting.cxx,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- reportdesign/source/ui/dlg/GroupsSorting.cxx	9 Jul 2007 11:56:29 -0000	1.2
++++ reportdesign/source/ui/dlg/GroupsSorting.cxx	12 Jul 2007 13:51:08 -0000	1.3
+@@ -1143,8 +1143,8 @@
+ 	    xGroup->setKeepTogether( m_aKeepTogetherLst.GetSelectEntryPos() );
+     if ( m_aGroupOnLst.GetSavedValue() != m_aGroupOnLst.GetSelectEntryPos() )
+     {
+-	    sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_Int32>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
+-	    xGroup->setGroupOn( nGroupOn );
++	    sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
++        xGroup->setGroupOn( nGroupOn );
+     }
+     if ( m_aGroupIntervalEd.GetSavedValue().ToInt32() != m_aGroupIntervalEd.GetValue() )
+     {
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 380f953dd999..579c69c27c59 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -66,10 +66,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		219
+MILESTONE?=		220
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070706
+SNAPDATE=		20070710
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 89e62cfc9151..f9cad8753c8f 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m219_source.tar.bz2) = 16c16611835a060b13a06109d03de55d
-SHA256 (openoffice.org2/OOo_SRC680_m219_source.tar.bz2) = ddaa5ca22d8dcb47d9ea5a678cda4b2e4af94f7358d72d816f92f7e1583552c5
-SIZE (openoffice.org2/OOo_SRC680_m219_source.tar.bz2) = 274602807
+MD5 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 245e58891d2d091ae3a4d484a0488be0
+SHA256 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = f83619ac1a3055a4be7a95d3fead1109d76ab244015da76e208da21af40e2ab7
+SIZE (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 292163303
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-devel/files/patch-i66667 b/editors/openoffice.org-3-devel/files/patch-i66667
deleted file mode 100644
index c1d8cd362e9b..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i66667
+++ /dev/null
@@ -1,139 +0,0 @@
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Tue May  2 08:01:08 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Fri Sep  8 17:25:05 2006
-@@ -120,6 +120,9 @@
- 			case typelib_TypeClass_UNSIGNED_HYPER:
- 			case typelib_TypeClass_DOUBLE:
- 				pCppStack += sizeof(sal_Int32); // extra long
-+                break;
-+            default:
-+                break;
- 			}
- 			// no longer needed
- 			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-@@ -436,7 +439,7 @@
- unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-     void ** slots, unsigned char * code,
-     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
--    sal_Int32 functionCount, sal_Int32 vtableOffset)
-+    sal_Int32 /*functionCount*/, sal_Int32 vtableOffset)
- {
-     for (sal_Int32 i = 0; i < type->nMembers; ++i) {
-         typelib_TypeDescription * member = 0;
---- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx.orig	Wed Sep  7 18:20:22 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Sep 11 12:21:03 2006
-@@ -37,6 +37,7 @@
- #include <dlfcn.h>
- #include <cxxabi.h>
- #include <hash_map>
-+#include <sys/param.h>
- 
- #include <rtl/strbuf.hxx>
- #include <rtl/ustrbuf.hxx>
-@@ -122,7 +123,11 @@
- };
- //__________________________________________________________________________________________________
- RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 602103
-     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-+#else
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+#endif
- {
- }
- //__________________________________________________________________________________________________
-@@ -139,8 +144,8 @@
-     OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
- 
-     MutexGuard guard( m_mutex );
--    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
--    if (iFind == m_rttis.end())
-+    t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) );
-+    if (iRttiFind == m_rttis.end())
-     {
-         // RTTI symbol
-         OStringBuffer buf( 64 );
-@@ -157,8 +162,11 @@
-         buf.append( 'E' );
- 
-         OString symName( buf.makeStringAndClear() );
--//#iZ 22253 
-+#if __FreeBSD_version < 602103 /* #i22253# */
-         rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-+#else
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+#endif
- 
-         if (rtti)
-         {
-@@ -205,7 +213,7 @@
-     }
-     else
-     {
--        rtti = iFind->second;
-+        rtti = iRttiFind->second;
-     }
- 
-     return rtti;
---- bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Jun 19 19:43:09 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Fri Sep  8 17:25:05 2006
-@@ -142,6 +142,8 @@
- 		case typelib_TypeClass_DOUBLE:
- 			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
- 			break;
-+        default:
-+            break;
- 	}
- }
- 
-@@ -217,6 +219,9 @@
- 			case typelib_TypeClass_UNSIGNED_HYPER:
- 			case typelib_TypeClass_DOUBLE:
- 				pCppStack += sizeof(sal_Int32); // extra long
-+                break;
-+            default:
-+                break;
- 			}
- 			// no longer needed
- 			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-@@ -329,7 +334,6 @@
- 	// is my surrogate
- 	bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
-         = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
--	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
- 	
- 	switch (pMemberDescr->eTypeClass)
- 	{
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx.orig	Wed Jul 19 05:30:01 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	Mon Sep 11 12:21:25 2006
-@@ -37,6 +37,7 @@
- #include <dlfcn.h>
- #include <cxxabi.h>
- #include <hash_map>
-+#include <sys/param.h>
- 
- #include <rtl/strbuf.hxx>
- #include <rtl/ustrbuf.hxx>
-@@ -122,7 +123,11 @@
- };
- //__________________________________________________________________________________________________
- RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 602103
-     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-+#else
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+#endif
- {
- }
- //__________________________________________________________________________________________________
-@@ -157,7 +162,11 @@
-         buf.append( 'E' );
-         
-         OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 602103  /* #i22253# */
-         rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-+#else
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+#endif
- 
-         if (rtti)
-         {
diff --git a/editors/openoffice.org-3-devel/files/patch-i67904 b/editors/openoffice.org-3-devel/files/patch-i67904
deleted file mode 100644
index 520242bb45a0..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i67904
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: sal/osl/unx/socket.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/socket.c,v
-retrieving revision 1.26
-diff -u -r1.26 socket.c
---- sal/osl/unx/socket.c	19 Jul 2006 09:39:22 -0000	1.26
-+++ sal/osl/unx/socket.c	29 Jul 2006 09:53:04 -0000
-@@ -813,7 +813,7 @@
- 	const char *name, struct hostent *result,
- 	char *buffer, int buflen, int *h_errnop)
- {
--#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015))
-+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
- 	struct hostent *__result; /* will be the same as result */
- 	int __error;
- 	__error = gethostbyname_r (name, result, buffer, buflen,
-Index: sal/osl/unx/system.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/system.c,v
-retrieving revision 1.13
-diff -u -r1.13 system.c
---- sal/osl/unx/system.c	19 Jul 2006 09:39:37 -0000	1.13
-+++ sal/osl/unx/system.c	9 Sep 2006 09:57:26 -0000
-@@ -343,7 +343,7 @@
- }
- #endif /* defined SCO */
- 
--#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
- 
- extern int h_errno;
- 
-@@ -435,7 +435,7 @@
- 
-   	return res;
- }
--#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- 
- #if defined(MACOSX)
- /*
-
-Index: sal/osl/unx/system.h
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/system.h,v
-retrieving revision 1.33
-diff -u -r1.33 system.h
---- sal/osl/unx/system.h	19 Jul 2006 09:39:50 -0000	1.33
-+++ sal/osl/unx/system.h	9 Sep 2006 09:55:55 -0000
-@@ -537,10 +537,10 @@
- struct tm *localtime_r(const time_t *timep, struct tm *buffer);
- struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
- #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
--#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
- struct hostent *gethostbyname_r(const char *name, struct hostent *result,
- 								char *buffer, int buflen, int *h_errnop);
--#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- #endif
- 
- #endif /* __OSL_SYSTEM_H__ */
-
-Index: moz/mozilla-source-1.7.5.patch
-===================================================================
-RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v
-retrieving revision 1.14
-diff -u -r1.14 mozilla-source-1.7.5.patch
---- moz/mozilla-source-1.7.5.patch	17 Apr 2007 08:54:47 -0000	1.14
-+++ moz/mozilla-source-1.7.5.patch	27 Apr 2007 05:57:10 -0000
-@@ -7821,7 +7821,7 @@
-   #endif
-   
- ! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
--! 	(defined(__FreeBSD__) && __FreeBSD_version > 700016)
-+! 	(defined(__FreeBSD__) && __FreeBSD_version > 601103)
-   #define _PR_HAVE_GETPROTO_R
-   #define _PR_HAVE_5_ARG_GETPROTO_R
-   #endif
diff --git a/editors/openoffice.org-3-devel/files/patch-i69418 b/editors/openoffice.org-3-devel/files/patch-i69418
deleted file mode 100644
index dd23c55e4c9b..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i69418
+++ /dev/null
@@ -1,38 +0,0 @@
---- moz/mozilla-source-1.7.5.patch.org	Sat Sep  9 18:43:45 2006
-+++ moz/mozilla-source-1.7.5.patch	Sat Sep  9 18:42:00 2006
-@@ -151,6 +151,17 @@
-          AR_EXTRACT="$AR x"
-          AR_DELETE="$AR d"
- ***************
-+*** 7504,7509 ****
-+--- 7504,7511 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
-+  echo "configure:7510: checking for gethostbyname_r in -lc_r" >&5
-+***************
- *** 16606,16613 ****
-   
-   case "$host_os" in
-@@ -191,6 +202,17 @@
-          AR_EXTRACT="$AR x"
-          AR_DELETE="$AR d"
- ***************
-+*** 1981,1986 ****
-+--- 1981,1988 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	AC_CHECK_LIB(c_r, gethostbyname_r)
-+  	;;
-+***************
- *** 5692,5699 ****
-   dnl ========================================================
-   case "$host_os" in
diff --git a/editors/openoffice.org-3-devel/files/patch-i69994 b/editors/openoffice.org-3-devel/files/patch-i69994
deleted file mode 100644
index 9d2718b4763c..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i69994
+++ /dev/null
@@ -1,747 +0,0 @@
-Index: python/Python-2.3.4.patch
-===================================================================
-RCS file: /cvs/external/python/Python-2.3.4.patch,v
-retrieving revision 1.12
-diff -u -r1.12 Python-2.3.4.patch
---- python/Python-2.3.4.patch	25 Sep 2006 13:22:02 -0000	1.12
-+++ python/Python-2.3.4.patch	29 Sep 2006 22:06:08 -0000
-@@ -13463,3 +13463,739 @@
-   	handler = signal(sig, SIG_IGN);
-   	signal(sig, handler);
-   	return handler;
-+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:26:23 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:20:25 2005
-+***************
-+*** 0 ****
-+--- 1,355 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ IPPROTO_IP = 0
-++ IPPROTO_HOPOPTS = 0
-++ IPPROTO_ICMP = 1
-++ IPPROTO_IGMP = 2
-++ IPPROTO_GGP = 3
-++ IPPROTO_IPV4 = 4
-++ IPPROTO_IPIP = IPPROTO_IPV4
-++ IPPROTO_TCP = 6
-++ IPPROTO_ST = 7
-++ IPPROTO_EGP = 8
-++ IPPROTO_PIGP = 9
-++ IPPROTO_RCCMON = 10
-++ IPPROTO_NVPII = 11
-++ IPPROTO_PUP = 12
-++ IPPROTO_ARGUS = 13
-++ IPPROTO_EMCON = 14
-++ IPPROTO_XNET = 15
-++ IPPROTO_CHAOS = 16
-++ IPPROTO_UDP = 17
-++ IPPROTO_MUX = 18
-++ IPPROTO_MEAS = 19
-++ IPPROTO_HMP = 20
-++ IPPROTO_PRM = 21
-++ IPPROTO_IDP = 22
-++ IPPROTO_TRUNK1 = 23
-++ IPPROTO_TRUNK2 = 24
-++ IPPROTO_LEAF1 = 25
-++ IPPROTO_LEAF2 = 26
-++ IPPROTO_RDP = 27
-++ IPPROTO_IRTP = 28
-++ IPPROTO_TP = 29
-++ IPPROTO_BLT = 30
-++ IPPROTO_NSP = 31
-++ IPPROTO_INP = 32
-++ IPPROTO_SEP = 33
-++ IPPROTO_3PC = 34
-++ IPPROTO_IDPR = 35
-++ IPPROTO_XTP = 36
-++ IPPROTO_DDP = 37
-++ IPPROTO_CMTP = 38
-++ IPPROTO_TPXX = 39
-++ IPPROTO_IL = 40
-++ IPPROTO_IPV6 = 41
-++ IPPROTO_SDRP = 42
-++ IPPROTO_ROUTING = 43
-++ IPPROTO_FRAGMENT = 44
-++ IPPROTO_IDRP = 45
-++ IPPROTO_RSVP = 46
-++ IPPROTO_GRE = 47
-++ IPPROTO_MHRP = 48
-++ IPPROTO_BHA = 49
-++ IPPROTO_ESP = 50
-++ IPPROTO_AH = 51
-++ IPPROTO_INLSP = 52
-++ IPPROTO_SWIPE = 53
-++ IPPROTO_NHRP = 54
-++ IPPROTO_ICMPV6 = 58
-++ IPPROTO_NONE = 59
-++ IPPROTO_DSTOPTS = 60
-++ IPPROTO_AHIP = 61
-++ IPPROTO_CFTP = 62
-++ IPPROTO_HELLO = 63
-++ IPPROTO_SATEXPAK = 64
-++ IPPROTO_KRYPTOLAN = 65
-++ IPPROTO_RVD = 66
-++ IPPROTO_IPPC = 67
-++ IPPROTO_ADFS = 68
-++ IPPROTO_SATMON = 69
-++ IPPROTO_VISA = 70
-++ IPPROTO_IPCV = 71
-++ IPPROTO_CPNX = 72
-++ IPPROTO_CPHB = 73
-++ IPPROTO_WSN = 74
-++ IPPROTO_PVP = 75
-++ IPPROTO_BRSATMON = 76
-++ IPPROTO_ND = 77
-++ IPPROTO_WBMON = 78
-++ IPPROTO_WBEXPAK = 79
-++ IPPROTO_EON = 80
-++ IPPROTO_VMTP = 81
-++ IPPROTO_SVMTP = 82
-++ IPPROTO_VINES = 83
-++ IPPROTO_TTP = 84
-++ IPPROTO_IGP = 85
-++ IPPROTO_DGP = 86
-++ IPPROTO_TCF = 87
-++ IPPROTO_IGRP = 88
-++ IPPROTO_OSPFIGP = 89
-++ IPPROTO_SRPC = 90
-++ IPPROTO_LARP = 91
-++ IPPROTO_MTP = 92
-++ IPPROTO_AX25 = 93
-++ IPPROTO_IPEIP = 94
-++ IPPROTO_MICP = 95
-++ IPPROTO_SCCSP = 96
-++ IPPROTO_ETHERIP = 97
-++ IPPROTO_ENCAP = 98
-++ IPPROTO_APES = 99
-++ IPPROTO_GMTP = 100
-++ IPPROTO_IPCOMP = 108
-++ IPPROTO_PIM = 103
-++ IPPROTO_PGM = 113
-++ IPPROTO_DIVERT = 254
-++ IPPROTO_RAW = 255
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPORT_RESERVED = 1024
-++ IPPORT_USERRESERVED = 5000
-++ IPPORT_HIFIRSTAUTO = 49152
-++ IPPORT_HILASTAUTO = 65535
-++ IPPORT_RESERVEDSTART = 600
-++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
-++ 
-++ IN_CLASSA_NET = 0xff000000
-++ IN_CLASSA_NSHIFT = 24
-++ IN_CLASSA_HOST = 0x00ffffff
-++ IN_CLASSA_MAX = 128
-++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
-++ 
-++ IN_CLASSB_NET = 0xffff0000
-++ IN_CLASSB_NSHIFT = 16
-++ IN_CLASSB_HOST = 0x0000ffff
-++ IN_CLASSB_MAX = 65536
-++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
-++ 
-++ IN_CLASSC_NET = 0xffffff00
-++ IN_CLASSC_NSHIFT = 8
-++ IN_CLASSC_HOST = 0x000000ff
-++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
-++ 
-++ IN_CLASSD_NET = 0xf0000000
-++ IN_CLASSD_NSHIFT = 28
-++ IN_CLASSD_HOST = 0x0fffffff
-++ def IN_MULTICAST(i): return IN_CLASSD(i)
-++ 
-++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ INADDR_NONE = 0xffffffff
-++ IN_LOOPBACKNET = 127
-++ INET_ADDRSTRLEN = 16
-++ IP_OPTIONS = 1
-++ IP_HDRINCL = 2
-++ IP_TOS = 3
-++ IP_TTL = 4
-++ IP_RECVOPTS = 5
-++ IP_RECVRETOPTS = 6
-++ IP_RECVDSTADDR = 7
-++ IP_RETOPTS = 8
-++ IP_MULTICAST_IF = 9
-++ IP_MULTICAST_TTL = 10
-++ IP_MULTICAST_LOOP = 11
-++ IP_ADD_MEMBERSHIP = 12
-++ IP_DROP_MEMBERSHIP = 13
-++ IP_MULTICAST_VIF = 14
-++ IP_RSVP_ON = 15
-++ IP_RSVP_OFF = 16
-++ IP_RSVP_VIF_ON = 17
-++ IP_RSVP_VIF_OFF = 18
-++ IP_PORTRANGE = 19
-++ IP_RECVIF = 20
-++ IP_IPSEC_POLICY = 21
-++ IP_FAITH = 22
-++ IP_FW_ADD = 50
-++ IP_FW_DEL = 51
-++ IP_FW_FLUSH = 52
-++ IP_FW_ZERO = 53
-++ IP_FW_GET = 54
-++ IP_FW_RESETLOG = 55
-++ IP_DUMMYNET_CONFIGURE = 60
-++ IP_DUMMYNET_DEL = 61
-++ IP_DUMMYNET_FLUSH = 62
-++ IP_DUMMYNET_GET = 64
-++ IP_DEFAULT_MULTICAST_TTL = 1
-++ IP_DEFAULT_MULTICAST_LOOP = 1
-++ IP_MAX_MEMBERSHIPS = 20
-++ IP_PORTRANGE_DEFAULT = 0
-++ IP_PORTRANGE_HIGH = 1
-++ IP_PORTRANGE_LOW = 2
-++ IPPROTO_MAXID = (IPPROTO_AH + 1)
-++ IPCTL_FORWARDING = 1
-++ IPCTL_SENDREDIRECTS = 2
-++ IPCTL_DEFTTL = 3
-++ IPCTL_DEFMTU = 4
-++ IPCTL_RTEXPIRE = 5
-++ IPCTL_RTMINEXPIRE = 6
-++ IPCTL_RTMAXCACHE = 7
-++ IPCTL_SOURCEROUTE = 8
-++ IPCTL_DIRECTEDBROADCAST = 9
-++ IPCTL_INTRQMAXLEN = 10
-++ IPCTL_INTRQDROPS = 11
-++ IPCTL_STATS = 12
-++ IPCTL_ACCEPTSOURCEROUTE = 13
-++ IPCTL_FASTFORWARDING = 14
-++ IPCTL_KEEPFAITH = 15
-++ IPCTL_GIF_TTL = 16
-++ IPCTL_MAXID = 17
-++ 
-++ # Included from netinet6/in6.h
-++ 
-++ # Included from sys/queue.h
-++ def SLIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def SLIST_ENTRY(type): return \
-++ 
-++ def STAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def STAILQ_ENTRY(type): return \
-++ 
-++ def LIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def LIST_ENTRY(type): return \
-++ 
-++ def TAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def TAILQ_ENTRY(type): return \
-++ 
-++ def CIRCLEQ_ENTRY(type): return \
-++ 
-++ __KAME_VERSION = "20000701/FreeBSD-current"
-++ IPV6PORT_RESERVED = 1024
-++ IPV6PORT_ANONMIN = 49152
-++ IPV6PORT_ANONMAX = 65535
-++ IPV6PORT_RESERVEDMIN = 600
-++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-++ INET6_ADDRSTRLEN = 46
-++ IPV6_ADDR_INT32_ONE = 1
-++ IPV6_ADDR_INT32_TWO = 2
-++ IPV6_ADDR_INT32_MNL = 0xff010000
-++ IPV6_ADDR_INT32_MLL = 0xff020000
-++ IPV6_ADDR_INT32_SMP = 0x0000ffff
-++ IPV6_ADDR_INT16_ULL = 0xfe80
-++ IPV6_ADDR_INT16_USL = 0xfec0
-++ IPV6_ADDR_INT16_MLL = 0xff02
-++ IPV6_ADDR_INT32_ONE = 0x01000000
-++ IPV6_ADDR_INT32_TWO = 0x02000000
-++ IPV6_ADDR_INT32_MNL = 0x000001ff
-++ IPV6_ADDR_INT32_MLL = 0x000002ff
-++ IPV6_ADDR_INT32_SMP = 0xffff0000
-++ IPV6_ADDR_INT16_ULL = 0x80fe
-++ IPV6_ADDR_INT16_USL = 0xc0fe
-++ IPV6_ADDR_INT16_MLL = 0x02ff
-++ def IN6_IS_ADDR_UNSPECIFIED(a): return \
-++ 
-++ def IN6_IS_ADDR_LOOPBACK(a): return \
-++ 
-++ def IN6_IS_ADDR_V4COMPAT(a): return \
-++ 
-++ def IN6_IS_ADDR_V4MAPPED(a): return \
-++ 
-++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ def IN6_IS_ADDR_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_SCOPE_LINKLOCAL(a): return \
-++ 
-++ IPV6_OPTIONS = 1
-++ IPV6_RECVOPTS = 5
-++ IPV6_RECVRETOPTS = 6
-++ IPV6_RECVDSTADDR = 7
-++ IPV6_RETOPTS = 8
-++ IPV6_SOCKOPT_RESERVED1 = 3
-++ IPV6_UNICAST_HOPS = 4
-++ IPV6_MULTICAST_IF = 9
-++ IPV6_MULTICAST_HOPS = 10
-++ IPV6_MULTICAST_LOOP = 11
-++ IPV6_JOIN_GROUP = 12
-++ IPV6_LEAVE_GROUP = 13
-++ IPV6_PORTRANGE = 14
-++ ICMP6_FILTER = 18
-++ IPV6_PKTINFO = 19
-++ IPV6_HOPLIMIT = 20
-++ IPV6_NEXTHOP = 21
-++ IPV6_HOPOPTS = 22
-++ IPV6_DSTOPTS = 23
-++ IPV6_RTHDR = 24
-++ IPV6_PKTOPTIONS = 25
-++ IPV6_CHECKSUM = 26
-++ IPV6_BINDV6ONLY = 27
-++ IPV6_IPSEC_POLICY = 28
-++ IPV6_FAITH = 29
-++ IPV6_FW_ADD = 30
-++ IPV6_FW_DEL = 31
-++ IPV6_FW_FLUSH = 32
-++ IPV6_FW_ZERO = 33
-++ IPV6_FW_GET = 34
-++ IPV6_RTHDR_LOOSE = 0
-++ IPV6_RTHDR_STRICT = 1
-++ IPV6_RTHDR_TYPE_0 = 0
-++ IPV6_DEFAULT_MULTICAST_HOPS = 1
-++ IPV6_DEFAULT_MULTICAST_LOOP = 1
-++ IPV6_PORTRANGE_DEFAULT = 0
-++ IPV6_PORTRANGE_HIGH = 1
-++ IPV6_PORTRANGE_LOW = 2
-++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-++ IPV6CTL_FORWARDING = 1
-++ IPV6CTL_SENDREDIRECTS = 2
-++ IPV6CTL_DEFHLIM = 3
-++ IPV6CTL_DEFMTU = 4
-++ IPV6CTL_FORWSRCRT = 5
-++ IPV6CTL_STATS = 6
-++ IPV6CTL_MRTSTATS = 7
-++ IPV6CTL_MRTPROTO = 8
-++ IPV6CTL_MAXFRAGPACKETS = 9
-++ IPV6CTL_SOURCECHECK = 10
-++ IPV6CTL_SOURCECHECK_LOGINT = 11
-++ IPV6CTL_ACCEPT_RTADV = 12
-++ IPV6CTL_KEEPFAITH = 13
-++ IPV6CTL_LOG_INTERVAL = 14
-++ IPV6CTL_HDRNESTLIMIT = 15
-++ IPV6CTL_DAD_COUNT = 16
-++ IPV6CTL_AUTO_FLOWLABEL = 17
-++ IPV6CTL_DEFMCASTHLIM = 18
-++ IPV6CTL_GIF_HLIM = 19
-++ IPV6CTL_KAME_VERSION = 20
-++ IPV6CTL_USE_DEPRECATED = 21
-++ IPV6CTL_RR_PRUNE = 22
-++ IPV6CTL_MAPPED_ADDR = 23
-++ IPV6CTL_BINDV6ONLY = 24
-++ IPV6CTL_RTEXPIRE = 25
-++ IPV6CTL_RTMINEXPIRE = 26
-++ IPV6CTL_RTMAXCACHE = 27
-++ IPV6CTL_MAXID = 28
-+*** misc/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:26:27 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:19:02 2005
-+***************
-+*** 0 ****
-+--- 1,3 ----
-++ #! /bin/sh
-++ set -v
-++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
-+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:26:23 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:20:25 2005
-+***************
-+*** 0 ****
-+--- 1,355 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ IPPROTO_IP = 0
-++ IPPROTO_HOPOPTS = 0
-++ IPPROTO_ICMP = 1
-++ IPPROTO_IGMP = 2
-++ IPPROTO_GGP = 3
-++ IPPROTO_IPV4 = 4
-++ IPPROTO_IPIP = IPPROTO_IPV4
-++ IPPROTO_TCP = 6
-++ IPPROTO_ST = 7
-++ IPPROTO_EGP = 8
-++ IPPROTO_PIGP = 9
-++ IPPROTO_RCCMON = 10
-++ IPPROTO_NVPII = 11
-++ IPPROTO_PUP = 12
-++ IPPROTO_ARGUS = 13
-++ IPPROTO_EMCON = 14
-++ IPPROTO_XNET = 15
-++ IPPROTO_CHAOS = 16
-++ IPPROTO_UDP = 17
-++ IPPROTO_MUX = 18
-++ IPPROTO_MEAS = 19
-++ IPPROTO_HMP = 20
-++ IPPROTO_PRM = 21
-++ IPPROTO_IDP = 22
-++ IPPROTO_TRUNK1 = 23
-++ IPPROTO_TRUNK2 = 24
-++ IPPROTO_LEAF1 = 25
-++ IPPROTO_LEAF2 = 26
-++ IPPROTO_RDP = 27
-++ IPPROTO_IRTP = 28
-++ IPPROTO_TP = 29
-++ IPPROTO_BLT = 30
-++ IPPROTO_NSP = 31
-++ IPPROTO_INP = 32
-++ IPPROTO_SEP = 33
-++ IPPROTO_3PC = 34
-++ IPPROTO_IDPR = 35
-++ IPPROTO_XTP = 36
-++ IPPROTO_DDP = 37
-++ IPPROTO_CMTP = 38
-++ IPPROTO_TPXX = 39
-++ IPPROTO_IL = 40
-++ IPPROTO_IPV6 = 41
-++ IPPROTO_SDRP = 42
-++ IPPROTO_ROUTING = 43
-++ IPPROTO_FRAGMENT = 44
-++ IPPROTO_IDRP = 45
-++ IPPROTO_RSVP = 46
-++ IPPROTO_GRE = 47
-++ IPPROTO_MHRP = 48
-++ IPPROTO_BHA = 49
-++ IPPROTO_ESP = 50
-++ IPPROTO_AH = 51
-++ IPPROTO_INLSP = 52
-++ IPPROTO_SWIPE = 53
-++ IPPROTO_NHRP = 54
-++ IPPROTO_ICMPV6 = 58
-++ IPPROTO_NONE = 59
-++ IPPROTO_DSTOPTS = 60
-++ IPPROTO_AHIP = 61
-++ IPPROTO_CFTP = 62
-++ IPPROTO_HELLO = 63
-++ IPPROTO_SATEXPAK = 64
-++ IPPROTO_KRYPTOLAN = 65
-++ IPPROTO_RVD = 66
-++ IPPROTO_IPPC = 67
-++ IPPROTO_ADFS = 68
-++ IPPROTO_SATMON = 69
-++ IPPROTO_VISA = 70
-++ IPPROTO_IPCV = 71
-++ IPPROTO_CPNX = 72
-++ IPPROTO_CPHB = 73
-++ IPPROTO_WSN = 74
-++ IPPROTO_PVP = 75
-++ IPPROTO_BRSATMON = 76
-++ IPPROTO_ND = 77
-++ IPPROTO_WBMON = 78
-++ IPPROTO_WBEXPAK = 79
-++ IPPROTO_EON = 80
-++ IPPROTO_VMTP = 81
-++ IPPROTO_SVMTP = 82
-++ IPPROTO_VINES = 83
-++ IPPROTO_TTP = 84
-++ IPPROTO_IGP = 85
-++ IPPROTO_DGP = 86
-++ IPPROTO_TCF = 87
-++ IPPROTO_IGRP = 88
-++ IPPROTO_OSPFIGP = 89
-++ IPPROTO_SRPC = 90
-++ IPPROTO_LARP = 91
-++ IPPROTO_MTP = 92
-++ IPPROTO_AX25 = 93
-++ IPPROTO_IPEIP = 94
-++ IPPROTO_MICP = 95
-++ IPPROTO_SCCSP = 96
-++ IPPROTO_ETHERIP = 97
-++ IPPROTO_ENCAP = 98
-++ IPPROTO_APES = 99
-++ IPPROTO_GMTP = 100
-++ IPPROTO_IPCOMP = 108
-++ IPPROTO_PIM = 103
-++ IPPROTO_PGM = 113
-++ IPPROTO_DIVERT = 254
-++ IPPROTO_RAW = 255
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPORT_RESERVED = 1024
-++ IPPORT_USERRESERVED = 5000
-++ IPPORT_HIFIRSTAUTO = 49152
-++ IPPORT_HILASTAUTO = 65535
-++ IPPORT_RESERVEDSTART = 600
-++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
-++ 
-++ IN_CLASSA_NET = 0xff000000
-++ IN_CLASSA_NSHIFT = 24
-++ IN_CLASSA_HOST = 0x00ffffff
-++ IN_CLASSA_MAX = 128
-++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
-++ 
-++ IN_CLASSB_NET = 0xffff0000
-++ IN_CLASSB_NSHIFT = 16
-++ IN_CLASSB_HOST = 0x0000ffff
-++ IN_CLASSB_MAX = 65536
-++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
-++ 
-++ IN_CLASSC_NET = 0xffffff00
-++ IN_CLASSC_NSHIFT = 8
-++ IN_CLASSC_HOST = 0x000000ff
-++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
-++ 
-++ IN_CLASSD_NET = 0xf0000000
-++ IN_CLASSD_NSHIFT = 28
-++ IN_CLASSD_HOST = 0x0fffffff
-++ def IN_MULTICAST(i): return IN_CLASSD(i)
-++ 
-++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ INADDR_NONE = 0xffffffff
-++ IN_LOOPBACKNET = 127
-++ INET_ADDRSTRLEN = 16
-++ IP_OPTIONS = 1
-++ IP_HDRINCL = 2
-++ IP_TOS = 3
-++ IP_TTL = 4
-++ IP_RECVOPTS = 5
-++ IP_RECVRETOPTS = 6
-++ IP_RECVDSTADDR = 7
-++ IP_RETOPTS = 8
-++ IP_MULTICAST_IF = 9
-++ IP_MULTICAST_TTL = 10
-++ IP_MULTICAST_LOOP = 11
-++ IP_ADD_MEMBERSHIP = 12
-++ IP_DROP_MEMBERSHIP = 13
-++ IP_MULTICAST_VIF = 14
-++ IP_RSVP_ON = 15
-++ IP_RSVP_OFF = 16
-++ IP_RSVP_VIF_ON = 17
-++ IP_RSVP_VIF_OFF = 18
-++ IP_PORTRANGE = 19
-++ IP_RECVIF = 20
-++ IP_IPSEC_POLICY = 21
-++ IP_FAITH = 22
-++ IP_FW_ADD = 50
-++ IP_FW_DEL = 51
-++ IP_FW_FLUSH = 52
-++ IP_FW_ZERO = 53
-++ IP_FW_GET = 54
-++ IP_FW_RESETLOG = 55
-++ IP_DUMMYNET_CONFIGURE = 60
-++ IP_DUMMYNET_DEL = 61
-++ IP_DUMMYNET_FLUSH = 62
-++ IP_DUMMYNET_GET = 64
-++ IP_DEFAULT_MULTICAST_TTL = 1
-++ IP_DEFAULT_MULTICAST_LOOP = 1
-++ IP_MAX_MEMBERSHIPS = 20
-++ IP_PORTRANGE_DEFAULT = 0
-++ IP_PORTRANGE_HIGH = 1
-++ IP_PORTRANGE_LOW = 2
-++ IPPROTO_MAXID = (IPPROTO_AH + 1)
-++ IPCTL_FORWARDING = 1
-++ IPCTL_SENDREDIRECTS = 2
-++ IPCTL_DEFTTL = 3
-++ IPCTL_DEFMTU = 4
-++ IPCTL_RTEXPIRE = 5
-++ IPCTL_RTMINEXPIRE = 6
-++ IPCTL_RTMAXCACHE = 7
-++ IPCTL_SOURCEROUTE = 8
-++ IPCTL_DIRECTEDBROADCAST = 9
-++ IPCTL_INTRQMAXLEN = 10
-++ IPCTL_INTRQDROPS = 11
-++ IPCTL_STATS = 12
-++ IPCTL_ACCEPTSOURCEROUTE = 13
-++ IPCTL_FASTFORWARDING = 14
-++ IPCTL_KEEPFAITH = 15
-++ IPCTL_GIF_TTL = 16
-++ IPCTL_MAXID = 17
-++ 
-++ # Included from netinet6/in6.h
-++ 
-++ # Included from sys/queue.h
-++ def SLIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def SLIST_ENTRY(type): return \
-++ 
-++ def STAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def STAILQ_ENTRY(type): return \
-++ 
-++ def LIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def LIST_ENTRY(type): return \
-++ 
-++ def TAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def TAILQ_ENTRY(type): return \
-++ 
-++ def CIRCLEQ_ENTRY(type): return \
-++ 
-++ __KAME_VERSION = "20000701/FreeBSD-current"
-++ IPV6PORT_RESERVED = 1024
-++ IPV6PORT_ANONMIN = 49152
-++ IPV6PORT_ANONMAX = 65535
-++ IPV6PORT_RESERVEDMIN = 600
-++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-++ INET6_ADDRSTRLEN = 46
-++ IPV6_ADDR_INT32_ONE = 1
-++ IPV6_ADDR_INT32_TWO = 2
-++ IPV6_ADDR_INT32_MNL = 0xff010000
-++ IPV6_ADDR_INT32_MLL = 0xff020000
-++ IPV6_ADDR_INT32_SMP = 0x0000ffff
-++ IPV6_ADDR_INT16_ULL = 0xfe80
-++ IPV6_ADDR_INT16_USL = 0xfec0
-++ IPV6_ADDR_INT16_MLL = 0xff02
-++ IPV6_ADDR_INT32_ONE = 0x01000000
-++ IPV6_ADDR_INT32_TWO = 0x02000000
-++ IPV6_ADDR_INT32_MNL = 0x000001ff
-++ IPV6_ADDR_INT32_MLL = 0x000002ff
-++ IPV6_ADDR_INT32_SMP = 0xffff0000
-++ IPV6_ADDR_INT16_ULL = 0x80fe
-++ IPV6_ADDR_INT16_USL = 0xc0fe
-++ IPV6_ADDR_INT16_MLL = 0x02ff
-++ def IN6_IS_ADDR_UNSPECIFIED(a): return \
-++ 
-++ def IN6_IS_ADDR_LOOPBACK(a): return \
-++ 
-++ def IN6_IS_ADDR_V4COMPAT(a): return \
-++ 
-++ def IN6_IS_ADDR_V4MAPPED(a): return \
-++ 
-++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ def IN6_IS_ADDR_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_SCOPE_LINKLOCAL(a): return \
-++ 
-++ IPV6_OPTIONS = 1
-++ IPV6_RECVOPTS = 5
-++ IPV6_RECVRETOPTS = 6
-++ IPV6_RECVDSTADDR = 7
-++ IPV6_RETOPTS = 8
-++ IPV6_SOCKOPT_RESERVED1 = 3
-++ IPV6_UNICAST_HOPS = 4
-++ IPV6_MULTICAST_IF = 9
-++ IPV6_MULTICAST_HOPS = 10
-++ IPV6_MULTICAST_LOOP = 11
-++ IPV6_JOIN_GROUP = 12
-++ IPV6_LEAVE_GROUP = 13
-++ IPV6_PORTRANGE = 14
-++ ICMP6_FILTER = 18
-++ IPV6_PKTINFO = 19
-++ IPV6_HOPLIMIT = 20
-++ IPV6_NEXTHOP = 21
-++ IPV6_HOPOPTS = 22
-++ IPV6_DSTOPTS = 23
-++ IPV6_RTHDR = 24
-++ IPV6_PKTOPTIONS = 25
-++ IPV6_CHECKSUM = 26
-++ IPV6_BINDV6ONLY = 27
-++ IPV6_IPSEC_POLICY = 28
-++ IPV6_FAITH = 29
-++ IPV6_FW_ADD = 30
-++ IPV6_FW_DEL = 31
-++ IPV6_FW_FLUSH = 32
-++ IPV6_FW_ZERO = 33
-++ IPV6_FW_GET = 34
-++ IPV6_RTHDR_LOOSE = 0
-++ IPV6_RTHDR_STRICT = 1
-++ IPV6_RTHDR_TYPE_0 = 0
-++ IPV6_DEFAULT_MULTICAST_HOPS = 1
-++ IPV6_DEFAULT_MULTICAST_LOOP = 1
-++ IPV6_PORTRANGE_DEFAULT = 0
-++ IPV6_PORTRANGE_HIGH = 1
-++ IPV6_PORTRANGE_LOW = 2
-++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-++ IPV6CTL_FORWARDING = 1
-++ IPV6CTL_SENDREDIRECTS = 2
-++ IPV6CTL_DEFHLIM = 3
-++ IPV6CTL_DEFMTU = 4
-++ IPV6CTL_FORWSRCRT = 5
-++ IPV6CTL_STATS = 6
-++ IPV6CTL_MRTSTATS = 7
-++ IPV6CTL_MRTPROTO = 8
-++ IPV6CTL_MAXFRAGPACKETS = 9
-++ IPV6CTL_SOURCECHECK = 10
-++ IPV6CTL_SOURCECHECK_LOGINT = 11
-++ IPV6CTL_ACCEPT_RTADV = 12
-++ IPV6CTL_KEEPFAITH = 13
-++ IPV6CTL_LOG_INTERVAL = 14
-++ IPV6CTL_HDRNESTLIMIT = 15
-++ IPV6CTL_DAD_COUNT = 16
-++ IPV6CTL_AUTO_FLOWLABEL = 17
-++ IPV6CTL_DEFMCASTHLIM = 18
-++ IPV6CTL_GIF_HLIM = 19
-++ IPV6CTL_KAME_VERSION = 20
-++ IPV6CTL_USE_DEPRECATED = 21
-++ IPV6CTL_RR_PRUNE = 22
-++ IPV6CTL_MAPPED_ADDR = 23
-++ IPV6CTL_BINDV6ONLY = 24
-++ IPV6CTL_RTEXPIRE = 25
-++ IPV6CTL_RTMINEXPIRE = 26
-++ IPV6CTL_RTMAXCACHE = 27
-++ IPV6CTL_MAXID = 28
-+*** misc/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:26:27 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:19:02 2005
-+***************
-+*** 0 ****
-+--- 1,3 ----
-++ #! /bin/sh
-++ set -v
-++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
diff --git a/editors/openoffice.org-3-devel/files/patch-i73157 b/editors/openoffice.org-3-devel/files/patch-i73157
deleted file mode 100644
index 17d987622060..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i73157
+++ /dev/null
@@ -1,30 +0,0 @@
---- epm/epm-3.7.patch.orig	Tue Aug  1 22:20:23 2006
-+++ epm/epm-3.7.patch	Sat Dec 23 07:00:30 2006
-@@ -68,7 +68,11 @@
-         fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-       }
- ***************
--*** 330,337 ****
-+*** 326,337 ****
-+    if (Verbosity)
-+      puts("Building FreeBSD pkg binary distribution...");
-+  
-+!   if (run_command(NULL, "pkg_create -p / -s %s -c %s -d %s -f %s %s",
-                     current, commentname, descrname, plistname, name))
-       return (1);
-   
-@@ -77,7 +81,11 @@
-   
-    /*
-     * Remove temporary files...
----- 348,356 ----
-+--- 344,356 ----
-+    if (Verbosity)
-+      puts("Building FreeBSD pkg binary distribution...");
-+  
-+!   if (run_command(NULL, "/usr/sbin/pkg_create -p / -s %s -c %s -d %s -f %s %s",
-                     current, commentname, descrname, plistname, name))
-       return (1);
-   
-
-
diff --git a/editors/openoffice.org-3-devel/files/patch-i73217 b/editors/openoffice.org-3-devel/files/patch-i73217
index 3dc7b4e28912..712631a136f1 100644
--- a/editors/openoffice.org-3-devel/files/patch-i73217
+++ b/editors/openoffice.org-3-devel/files/patch-i73217
@@ -1,3 +1,5 @@
+It won't fix in the master as it breaks the POSIX.
+
 Index: epm/epm-3.7.patch
 ===================================================================
 RCS file: /cvs/external/epm/epm-3.7.patch,v
diff --git a/editors/openoffice.org-3-devel/files/patch-i76115 b/editors/openoffice.org-3-devel/files/patch-i76115
deleted file mode 100644
index f090b4337b09..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i76115
+++ /dev/null
@@ -1,102 +0,0 @@
-Sync amd64 bridge with sixtyfour10 CWS.
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx.orig	Sat Sep 16 11:47:13 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Tue Apr  3 20:36:13 2007
-@@ -49,6 +49,7 @@
- #include "bridges/cpp_uno/shared/unointerfaceproxy.hxx"
- #include "bridges/cpp_uno/shared/vtables.hxx"
- 
-+#include "abi.hxx"
- #include "share.hxx"
- 
- using namespace ::rtl;
-@@ -122,7 +123,7 @@
-                 // value verbatim, as a double without conversion.
- 				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
- 			else
--				*pDS++ = *reinterpret_cast<double *>( pSV++ );
-+				*pDS++ = *pSV++;
- 			break;
- 
- 		case 'H': // 64-bit Word
-@@ -165,7 +166,7 @@
- 
- //==================================================================================================
- static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
--							  void * pRegisterReturn, typelib_TypeClass eReturnType,
-+							  void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
- 							  char * pPT, sal_uInt64 * pStackLongs, sal_uInt32 nStackLongs)
- {
- 	sal_uInt32 nr_gpr, nr_fpr, nr_stack;
-@@ -175,8 +176,6 @@
- 	if (nr_stack)
- 		nr_stack = (nr_stack + 1) & ~1;
- 	
--	bool bReturnsSimpleType = bridges::cpp_uno::shared::isSimpleType( eReturnType );
--
- #if OSL_DEBUG_LEVEL > 1
- 	// Let's figure out what is really going on here
- 	fprintf(stderr,"callVirtualMethod() parameters string is %s\n", pPT);
-@@ -244,7 +243,7 @@
- #undef ARG_GPR
-     }
- 
--	if ( bReturnsSimpleType )
-+	if ( bSimpleReturn )
- 		a0 = (sal_uInt64) pThis;
- 	else
- 		a1 = (sal_uInt64) pThis;
-@@ -275,7 +274,7 @@
- 	// Perform the call
- 	ReturnValue aRet = ( ( FunctionCall ) pMethod )( a0, a1, a2, a3, a4, a5 );
- 
--	switch (eReturnType)
-+	switch (pReturnTypeDescr->eTypeClass)
- 	{
- 	case typelib_TypeClass_HYPER:
- 	case typelib_TypeClass_UNSIGNED_HYPER:
-@@ -301,6 +300,15 @@
- 	case typelib_TypeClass_DOUBLE:
- 		*reinterpret_cast<double *>( pRegisterReturn ) = *reinterpret_cast<double*>( &aRet.f.xmm0 );
- 		break;
-+    default: {
-+        sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
-+        if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0) {
-+            if (nRetSize > 8)
-+                static_cast<sal_uInt64 *>(pRegisterReturn)[1] = aRet.i.rdx;
-+            static_cast<sal_uInt64 *>(pRegisterReturn)[0] = aRet.i.rax;
-+        }
-+        break;
-+    }
- 	}
- }
- 
-@@ -327,13 +335,15 @@
- 	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
- 	
- 	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
--	
-+
-+	bool bSimpleReturn = true;	
- 	if (pReturnTypeDescr)
- 	{
--		if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
--		{
-+		if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
-+			bSimpleReturn = false;
-+
-+		if (bSimpleReturn)
- 			pCppReturn = pUnoReturn; // direct way for simple types
--		}
- 		else
- 		{
- 			// complex return via ptr
-@@ -458,7 +468,7 @@
- 		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 7), "UNALIGNED STACK !!! (Please DO panic)" );
- 		callVirtualMethod(
- 			pAdjustedThisPtr, aVtableSlot.index,
--			pCppReturn, pReturnTypeDescr->eTypeClass, pParamType,
-+			pCppReturn, pReturnTypeDescr, bSimpleReturn, pParamType,
- 			(sal_uInt64 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_uInt64) );
- 		// NO exception occured...
- 		*ppUnoExc = 0;
diff --git a/editors/openoffice.org-3-devel/files/patch-i76141 b/editors/openoffice.org-3-devel/files/patch-i76141
deleted file mode 100644
index c1d964b3b5c2..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i76141
+++ /dev/null
@@ -1,839 +0,0 @@
---- berkeleydb/db-4.2.52.patch	26 Mar 2007 12:24:38 -0000	1.19
-+++ berkeleydb/db-4.2.52.patch	3 Jul 2007 01:03:31 -0000
-@@ -222,7 +222,7 @@
- ! 
- ! .INCLUDE :  target.mk
- *** misc/db-4.2.52.NC/dist/configure	2003-12-03 22:10:02.000000000 +0100
----- misc/build/db-4.2.52.NC/dist/configure	2007-02-19 16:12:12.000000000 +0100
-+--- misc/build/db-4.2.52.NC/dist/configure	2007-07-02 21:00:00.000000000 -0400
- ***************
- *** 3518,3525 ****
-   # Set CFLAGS/CXXFLAGS.  We MUST set the flags before we call autoconf
-@@ -262,6 +262,23 @@
-   	test "$with_gnu_ld" != no && break
-   	;;
- ***************
-+*** 9328,9334 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 9330,9336 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 10398,10404 ****
-       #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-       #	       `"' quotes if we put them in here... so don't!
-@@ -327,6 +344,57 @@
-   	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-   	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-   	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+***************
-+*** 12872,12878 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 12885,12891 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 15849,15855 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 15862,15868 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 18114,18120 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 18127,18133 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/db-4.2.52.NC/dist/ltmain.sh	2003-04-26 19:45:37.000000000 +0200
- --- misc/build/db-4.2.52.NC/dist/ltmain.sh	2007-02-19 16:12:12.000000000 +0100
- ***************
---- curl/curl-7.12.2.patch	25 Sep 2006 13:33:49 -0000	1.9
-+++ curl/curl-7.12.2.patch	5 Apr 2007 00:01:20 -0000
-@@ -1,3 +1,73 @@
-+*** misc/curl-7.12.2/configure	Sun Oct 17 18:22:10 2004
-+--- misc/build/curl-7.12.2/configure	Wed Apr  4 19:56:30 2007
-+***************
-+*** 9456,9462 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 9456,9462 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 13154,13160 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 13154,13160 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 16303,16309 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 16303,16309 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 18650,18656 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 18650,18656 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 13:12:17 2004
- --- misc/build/curl-7.12.2/ltmain.sh	Thu Jun 22 13:07:14 2006
- ***************
---- freetype/freetype-2.2.1.patch	3 Aug 2006 14:58:26 -0000	1.2
-+++ freetype/freetype-2.2.1.patch	5 Apr 2007 00:07:40 -0000
-@@ -1,5 +1,75 @@
--*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h	Mon Jan 30 17:49:42 2006
----- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h	Thu Jul 13 16:04:27 2006
-+*** misc/freetype-2.2.1/builds/unix/configure	Fri May 12 11:12:27 2006
-+--- misc/build/freetype-2.2.1/builds/unix/configure	Wed Apr  4 20:05:15 2007
-+***************
-+*** 10644,10650 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 10644,10650 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 14420,14426 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14420,14426 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17684,17690 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17684,17690 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 20153,20159 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 20153,20159 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h	Mon Jan 30 11:49:42 2006
-+--- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h	Wed Apr  4 20:04:02 2007
- ***************
- *** 17,24 ****
- --- 17,26 ----
---- libwpd/libwpd-0.8.8.diff	19 Jan 2007 15:57:46 -0000	1.1.4.1
-+++ libwpd/libwpd-0.8.8.diff	5 Apr 2007 00:13:31 -0000
-@@ -1,3 +1,73 @@
-+*** misc/libwpd-0.8.8/configure	Tue Jan  9 05:35:10 2007
-+--- misc/build/libwpd-0.8.8/configure	Wed Apr  4 20:10:49 2007
-+***************
-+*** 8089,8095 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 8089,8095 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 11808,11814 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11808,11814 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 14978,14984 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14978,14984 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17346,17352 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17346,17352 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/libwpd-0.8.8/src/lib/WP1Part.cpp	2007-01-03 14:07:55.000000000 +0100
- --- misc/build/libwpd-0.8.8/src/lib/WP1Part.cpp	2007-01-13 00:18:52.000000000 +0100
- ***************
-
---- libxml2/libxml2-2.6.17.patch	26 Mar 2007 12:25:19 -0000	1.5
-+++ libxml2/libxml2-2.6.17.patch	3 May 2007 17:31:33 -0000
-@@ -34,6 +34,74 @@
-   fi
-   echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
- ***************
-+*** 8547,8553 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 8547,8553 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 12266,12272 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 12266,12272 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 15436,15442 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 15436,15442 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17804,17810 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17804,17810 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 26339,26347 ****
-   
-   echo "$as_me:$LINENO: checking for setsockopt" >&5
---- libxmlsec/xmlsec1-1.2.6.patch	27 Mar 2007 09:36:38 -0000	1.19
-+++ libxmlsec/xmlsec1-1.2.6.patch	3 May 2007 18:12:52 -0000
-@@ -158,6 +158,23 @@
-   	# is EXPORTS), use it as is; otherwise, prepend...
-   	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 7778,7784 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 7779,7785 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 9046,9052 ****
-         ;;
-       esac
-@@ -215,6 +232,23 @@
-         # built for inclusion in a dll (and should export symbols for example).
-         lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
- ***************
-+*** 11497,11503 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11498,11504 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 13259,13269 ****
-         lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-         ;;
-@@ -257,6 +291,23 @@
-   	# is EXPORTS), use it as is; otherwise, prepend...
-   	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 14667,14673 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14668,14674 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 15607,15617 ****
-         lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-         ;;
-@@ -316,6 +367,23 @@
-   	# is EXPORTS), use it as is; otherwise, prepend...
-   	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 17035,17041 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17036,17042 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 24598,24604 ****
-   fi
-   
---- moz/mozilla-source-1.7.5.patch.orig	Fri Apr 27 15:23:29 2007
-+++ moz/mozilla-source-1.7.5.patch	Fri Apr 27 15:32:07 2007
-@@ -266,6 +266,23 @@
- *** misc/mozilla/configure	Tue Oct 12 00:13:29 2004
- --- misc/build/mozilla/configure	Thu Mar 29 14:27:08 2007
- ***************
-+*** 5228,5234 ****
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+--- 5228,5234 ----
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+***************
- *** 5895,5901 ****
-          MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
-          MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
-@@ -311,6 +328,23 @@
- *** misc/mozilla/configure.in	Tue Oct 12 00:13:29 2004
- --- misc/build/mozilla/configure.in	Thu Mar 29 14:27:08 2007
- ***************
-+*** 1006,1012 ****
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+--- 1006,1012 ----
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+***************
- *** 1536,1542 ****
-          MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
-          MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
-@@ -449,6 +483,25 @@
-   ASM_SUFFIX	= @ASM_SUFFIX@
-   PROG_SUFFIX	= @PROG_SUFFIX@
-   MOD_NAME	= @NSPR_MODNAME@
-+*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk	Tue Mar 26 16:51:46 2002
-+--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk	Wed Apr  4 20:56:05 2007
-+***************
-+*** 66,72 ****
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+--- 66,72 ----
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
- *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper	Wed Apr  2 19:22:39 2003
- --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper	Thu Mar 29 14:27:08 2007
- ***************
-@@ -524,6 +577,23 @@
-   MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-   PR_MD_ASFILES=
- ***************
-+*** 3465,3471 ****
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 3465,3471 ----
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+***************
- *** 3832,3837 ****
- --- 3833,3839 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -604,6 +674,23 @@
-   MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-   PR_MD_ASFILES=
- ***************
-+*** 896,902 ****
-+      AC_DEFINE(FREEBSD)
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 896,902 ----
-+      AC_DEFINE(FREEBSD)
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+***************
- *** 1144,1149 ****
- --- 1145,1151 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -7562,6 +7649,44 @@
-   
-       switch (name) {
-       case MAX_CONNECTIONS:
-+*** misc/mozilla/nsprpub/configure	Tue Sep 14 17:14:38 2004
-+--- misc/build/mozilla/nsprpub/configure	Wed Apr  4 20:56:33 2007
-+***************
-+*** 3407,3413 ****
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 3407,3413 ----
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+*** misc/mozilla/nsprpub/configure.in	Tue Sep 14 17:14:38 2004
-+--- misc/build/mozilla/nsprpub/configure.in	Wed Apr  4 20:56:40 2007
-+***************
-+*** 922,928 ****
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      AC_DEFINE(HAVE_SOCKLEN_T)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 922,928 ----
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      AC_DEFINE(HAVE_SOCKLEN_T)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
- *** misc/mozilla/nsprpub/build/cygwin-wrapper	Wed Apr  2 19:22:38 2003
- --- misc/build/mozilla/nsprpub/build/cygwin-wrapper	Thu Mar 29 14:27:08 2007
- ***************
-@@ -8090,6 +8215,25 @@
- + ifdef NS_USE_GCC
- + NSPR31_LIB_PREFIX = lib
- + endif
-+*** misc/mozilla/security/coreconf/FreeBSD.mk	Wed Mar 26 20:17:25 2003
-+--- misc/build/mozilla/security/coreconf/FreeBSD.mk	Wed Apr  4 20:56:48 2007
-+***************
-+*** 63,69 ****
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+--- 63,69 ----
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
- *** misc/mozilla/security/coreconf/command.mk	Fri Feb 15 17:53:12 2002
- --- misc/build/mozilla/security/coreconf/command.mk	Thu Mar 29 14:27:09 2007
- ***************
---- sndfile/libsndfile-1.0.9.patch	3 Feb 2006 17:31:46 -0000	1.3
-+++ sndfile/libsndfile-1.0.9.patch	5 Apr 2007 00:31:26 -0000
-@@ -83,6 +83,23 @@
-     shlibpath_var=DYLD_LIBRARY_PATH
-     shrext='$(test .$module = .yes && echo .so || echo .dylib)'
- ***************
-+*** 7871,7877 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 7878,7884 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 9111,9120 ****
-         ;;
-       esac
-@@ -143,6 +160,23 @@
-       module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct_CXX=no
- ***************
-+*** 11560,11566 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11567,11573 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 14069,14084 ****
-       	  lt_int_apple_cc_single_mod=yes
-       	fi
-@@ -178,6 +212,23 @@
-             module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         hardcode_direct_F77=no
- ***************
-+*** 14700,14706 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14707,14713 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 16414,16429 ****
-       	  lt_int_apple_cc_single_mod=yes
-       	fi
-@@ -212,6 +263,23 @@
-           fi
-             module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         hardcode_direct_GCJ=no
-+***************
-+*** 17045,17051 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17052,17058 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 05:02:07 2004
- --- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Jan 23 20:13:31 2006
- ***************
---- vigra/vigra1.4.0.patch	12 Oct 2006 10:35:19 -0000	1.3
-+++ vigra/vigra1.4.0.patch	5 Apr 2007 00:40:20 -0000
-@@ -1,3 +1,42 @@
-+diff -uprN misc/vigra1.4.0/configure misc/build/vigra1.4.0/configure
-+--- misc/vigra1.4.0/configure	Tue Dec 20 23:53:28 2005
-++++ misc/build/vigra1.4.0/configure	Wed Apr  4 20:35:48 2007
-+@@ -7259,7 +7259,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
-+@@ -10961,7 +10961,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
-+@@ -14110,7 +14110,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
-+@@ -16461,7 +16461,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
- diff -uprN misc/vigra1.4.0/include/vigra/array_vector.hxx misc/build/vigra1.4.0/include/vigra/array_vector.hxx
- --- misc/vigra1.4.0/include/vigra/array_vector.hxx	2005-12-21 05:53:30.000000000 +0100
- +++ misc/build/vigra1.4.0/include/vigra/array_vector.hxx	2006-08-31 12:08:15.172679000 +0200
diff --git a/editors/openoffice.org-3-devel/files/patch-i76968 b/editors/openoffice.org-3-devel/files/patch-i76968
deleted file mode 100644
index 8bf3e43d703d..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i76968
+++ /dev/null
@@ -1,642 +0,0 @@
-Sync FreeBSD-specific files with CWS sixtyfour11.
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk	Thu Jan 25 08:27:35 2007
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk	Wed Apr 25 10:57:20 2007
-@@ -52,11 +52,6 @@
- CFLAGS += -DLEAK_STATIC_DATA
- .ENDIF
- 
--NOOPTFILES= \
--	$(SLO)$/uno2cpp.obj
--
--
--CFLAGSNOOPT=-O0
- 
- SLOFILES= \
- 	$(SLO)$/abi.obj			\
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Thu May  3 21:45:19 2007
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Wed Apr 25 10:57:33 2007
-@@ -38,6 +38,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <rtl/alloc.h>
- 
- #include <com/sun/star/uno/genfunc.hxx>
-@@ -55,265 +56,188 @@
- using namespace ::rtl;
- using namespace ::com::sun::star::uno;
- 
--void dummy_can_throw_anything( char const * );
--
--// 6 integral parameters are passed in registers
--const sal_uInt32 GPR_COUNT = 6;
--
--// 8 floating point parameters are passed in SSE registers
--const sal_uInt32 FPR_COUNT = 8;
--
--static inline void
--invoke_count_words(char *		pPT,      // Parameter Types
--				   sal_uInt32 &	nr_gpr,   // Number of arguments in GPRs
--				   sal_uInt32 &	nr_fpr,   // Number of arguments in FPRs
--				   sal_uInt32 &	nr_stack) // Number of arguments in stack
--{
--	nr_gpr = 0;
--	nr_fpr = 0;
--	nr_stack = 0;
--	char c;
--	
--	while ((c = *pPT++) != 'X')
--	{
--		if (c == 'F' || c == 'D')
--		{
--            if (nr_fpr < FPR_COUNT)
--                nr_fpr++;
--            else
--                nr_stack++;
--		}
--		else
--		{
--            if (nr_gpr < GPR_COUNT)
--                nr_gpr++;
--            else
--                nr_stack++;
--		}
--	}
--}
--
--static void
--invoke_copy_to_stack(sal_uInt64 * pDS,  // Stack Storage
--					 char *       pPT,  // Parameter Types
--					 sal_uInt64 * pSV,  // Source Values
--					 sal_uInt64 * pGPR, // General Purpose Registers
--					 double *     pFPR) // Floating-Point Registers
--{
--	sal_uInt32 nr_gpr = 0;
--	sal_uInt32 nr_fpr = 0;
--	sal_uInt64 value;
--	char c;
--	
--	while ((c = *pPT++) != 'X')
--	{
--		switch (c)
--		{
--		case 'D': // Double
--			if (nr_fpr < FPR_COUNT)
--				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
--			else
--				*pDS++ = *pSV++;
--			break;
--
--		case 'F': // Float
--			if (nr_fpr < FPR_COUNT)
--                // The value in %xmm register is already prepared to
--                // be retrieved as a float. Therefore, we pass the
--                // value verbatim, as a double without conversion.
--				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
--			else
--				*pDS++ = *pSV++;
--			break;
--
--		case 'H': // 64-bit Word
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *pSV++;
--			else
--				*pDS++ = *pSV++;
--			break;
--
--		case 'I': // 32-bit Word
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt32 *>( pSV++ );
--			else
--				*pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV++ );
--			break;
--
--		case 'S': // 16-bit Word
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt16 *>( pSV++ );
--			else
--				*pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV++ );
--			break;
--
--		case 'B': // Byte
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt8 *>( pSV++ );
--			else
--				*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV++ );
--			break;
--
--		default: // Default, assume 64-bit values
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *pSV++;
--			else
--				*pDS++ = *pSV++;
--			break;
--		}
--	}
--}
--
- //==================================================================================================
- static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
--							  void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
--							  char * pPT, sal_uInt64 * pStackLongs, sal_uInt32 nStackLongs)
--{
--	sal_uInt32 nr_gpr, nr_fpr, nr_stack;
--	invoke_count_words(pPT, nr_gpr, nr_fpr, nr_stack);
-+                              void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
-+                              sal_uInt64 *pStack, sal_uInt32 nStack,
-+                              sal_uInt64 *pGPR, sal_uInt32 nGPR,
-+                              double *pFPR, sal_uInt32 nFPR) __attribute__((noinline));
- 
--	// Stack, if used, must be 16-bytes aligned
--	if (nr_stack)
--		nr_stack = (nr_stack + 1) & ~1;
--	
-+static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
-+                              void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
-+                              sal_uInt64 *pStack, sal_uInt32 nStack,
-+                              sal_uInt64 *pGPR, sal_uInt32 nGPR,
-+                              double *pFPR, sal_uInt32 nFPR)
-+{
- #if OSL_DEBUG_LEVEL > 1
--	// Let's figure out what is really going on here
--	fprintf(stderr,"callVirtualMethod() parameters string is %s\n", pPT);
--	{
--		sal_uInt32  k = nStackLongs;
--		sal_uInt64 *q = pStackLongs;
--		while (k > 0)
--		{
--			fprintf(stderr, "uno stack is: %lx\n", *q);
--			k--;
--			q++;
--		}
--	}
--#endif
--
--	// Load parameters to stack, if necessary
--    sal_uInt64 *stack = (sal_uInt64 *) __builtin_alloca(nr_stack * 8);
--    sal_uInt64 gpregs[GPR_COUNT];
--    double fpregs[FPR_COUNT];
--    invoke_copy_to_stack(stack, pPT, pStackLongs, gpregs, fpregs);
--
--    // Load FPR registers from fpregs[]
--    register double d0 asm("xmm0");
--    register double d1 asm("xmm1");
--    register double d2 asm("xmm2");
--    register double d3 asm("xmm3");
--    register double d4 asm("xmm4");
--    register double d5 asm("xmm5");
--    register double d6 asm("xmm6");
--    register double d7 asm("xmm7");
--
--    switch (nr_fpr) {
--#define ARG_FPR(N) \
--    case N+1: d##N = fpregs[N];
--        ARG_FPR(7);
--        ARG_FPR(6);
--        ARG_FPR(5);
--        ARG_FPR(4);
--        ARG_FPR(3);
--        ARG_FPR(2);
--        ARG_FPR(1);
--        ARG_FPR(0);
--    case 0:;
--#undef ARG_FPR
--    }
--    
--    // Load GPR registers from gpregs[]
--    register sal_uInt64 a0 asm("rdi");
--    register sal_uInt64 a1 asm("rsi");
--    register sal_uInt64 a2 asm("rdx");
--    register sal_uInt64 a3 asm("rcx");
--    register sal_uInt64 a4 asm("r8");
--    register sal_uInt64 a5 asm("r9");
--    
--    switch (nr_gpr) {
--#define ARG_GPR(N) \
--    case N+1: a##N = gpregs[N];
--        ARG_GPR(5);
--        ARG_GPR(4);
--        ARG_GPR(3);
--        ARG_GPR(2);
--        ARG_GPR(1);
--        ARG_GPR(0);
--    case 0:;
--#undef ARG_GPR
-+    // Let's figure out what is really going on here
-+    {
-+        fprintf( stderr, "= callVirtualMethod() =\nGPR's (%d): ", nGPR );
-+        for ( int i = 0; i < nGPR; ++i )
-+            fprintf( stderr, "0x%lx, ", pGPR[i] );
-+        fprintf( stderr, "\nFPR's (%d): ", nFPR );
-+        for ( int i = 0; i < nFPR; ++i )
-+            fprintf( stderr, "%f, ", pFPR[i] );
-+        fprintf( stderr, "\nStack (%d): ", nStack );
-+        for ( int i = 0; i < nStack; ++i )
-+            fprintf( stderr, "0x%lx, ", pStack[i] );
-+        fprintf( stderr, "\n" );
-     }
-+#endif
- 
--	if ( bSimpleReturn )
--		a0 = (sal_uInt64) pThis;
--	else
--		a1 = (sal_uInt64) pThis;
--
--    // Ensure that assignments to SSE registers won't be optimized away
--    asm("" ::
--        "x" (d0), "x" (d1), "x" (d2), "x" (d3),
--        "x" (d4), "x" (d5), "x" (d6), "x" (d7));
-+    // The call instruction within the asm section of callVirtualMethod may throw
-+    // exceptions.  So that the compiler handles this correctly, it is important
-+    // that (a) callVirtualMethod might call dummy_can_throw_anything (although this
-+    // never happens at runtime), which in turn can throw exceptions, and (b)
-+    // callVirtualMethod is not inlined at its call site (so that any exceptions are
-+    // caught which are thrown from the instruction calling callVirtualMethod):
-+    if ( !pThis )
-+        CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything( "xxx" ); // address something
-+
-+    // Should not happen, but...
-+    if ( nFPR > x86_64::MAX_SSE_REGS )
-+        nFPR = x86_64::MAX_SSE_REGS;
-+    if ( nGPR > x86_64::MAX_GPR_REGS )
-+        nGPR = x86_64::MAX_GPR_REGS;
- 
-     // Get pointer to method
-     sal_uInt64 pMethod = *((sal_uInt64 *)pThis);
-     pMethod += 8 * nVtableIndex;
-     pMethod = *((sal_uInt64 *)pMethod);
- 
--	union ReturnValue {
--		struct {
--			sal_uInt64 rax;
--			sal_uInt64 rdx;
--		} i;
--		struct {
--			double xmm0;
--			double xmm1;
--		} f;
--	};
-+    // Load parameters to stack, if necessary
-+    if ( nStack )
-+    {
-+        // 16-bytes aligned
-+        sal_uInt32 nStackBytes = ( ( nStack + 1 ) >> 1 ) * 16;
-+        sal_uInt64 *pCallStack = (sal_uInt64 *) __builtin_alloca( nStackBytes );
-+        memcpy( pCallStack, pStack, nStackBytes );
-+    }
- 
--	typedef ReturnValue (* FunctionCall )( sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64 );
-+    // Return values
-+    sal_uInt64 rax;
-+    sal_uInt64 rdx;
-+    double xmm0;
- 
--	// Perform the call
--	ReturnValue aRet = ( ( FunctionCall ) pMethod )( a0, a1, a2, a3, a4, a5 );
-+    asm volatile (
-+        
-+        // Fill the xmm registers
-+        "movq %2, %%rax\n\t"
- 
--	switch (pReturnTypeDescr->eTypeClass)
--	{
--	case typelib_TypeClass_HYPER:
--	case typelib_TypeClass_UNSIGNED_HYPER:
--		*reinterpret_cast<sal_uInt64 *>( pRegisterReturn ) = aRet.i.rax;
--		break;
--	case typelib_TypeClass_LONG:
--	case typelib_TypeClass_UNSIGNED_LONG:
--	case typelib_TypeClass_ENUM:
--		*reinterpret_cast<sal_uInt32 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt32*>( &aRet.i.rax );
--		break;
--	case typelib_TypeClass_CHAR:
--	case typelib_TypeClass_SHORT:
--	case typelib_TypeClass_UNSIGNED_SHORT:
--		*reinterpret_cast<sal_uInt16 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt16*>( &aRet.i.rax );
--		break;
--	case typelib_TypeClass_BOOLEAN:
--	case typelib_TypeClass_BYTE:
--		*reinterpret_cast<sal_uInt8 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt8*>( &aRet.i.rax );
--		break;
--	case typelib_TypeClass_FLOAT:
--		*reinterpret_cast<float *>( pRegisterReturn ) = *reinterpret_cast<float*>( &aRet.f.xmm0 );
--		break;
--	case typelib_TypeClass_DOUBLE:
--		*reinterpret_cast<double *>( pRegisterReturn ) = *reinterpret_cast<double*>( &aRet.f.xmm0 );
--		break;
--    default: {
--        sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
--        if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0) {
--            if (nRetSize > 8)
--                static_cast<sal_uInt64 *>(pRegisterReturn)[1] = aRet.i.rdx;
--            static_cast<sal_uInt64 *>(pRegisterReturn)[0] = aRet.i.rax;
--        }
-+        "movsd   (%%rax), %%xmm0\n\t"
-+        "movsd  8(%%rax), %%xmm1\n\t"
-+        "movsd 16(%%rax), %%xmm2\n\t"
-+        "movsd 24(%%rax), %%xmm3\n\t"
-+        "movsd 32(%%rax), %%xmm4\n\t"
-+        "movsd 40(%%rax), %%xmm5\n\t"
-+        "movsd 48(%%rax), %%xmm6\n\t"
-+        "movsd 56(%%rax), %%xmm7\n\t"
-+
-+        // Fill the general purpose registers
-+        "movq %1, %%rax\n\t"
-+
-+        "movq    (%%rax), %%rdi\n\t"
-+        "movq   8(%%rax), %%rsi\n\t"
-+        "movq  16(%%rax), %%rdx\n\t"
-+        "movq  24(%%rax), %%rcx\n\t"
-+        "movq  32(%%rax), %%r8\n\t"
-+        "movq  40(%%rax), %%r9\n\t"
-+
-+        // Perform the call
-+        "movq %0, %%r11\n\t"
-+        "movq %3, %%rax\n\t"
-+        "call *%%r11\n\t"
-+
-+        // Fill the return values
-+        "movq   %%rax, %4\n\t"
-+        "movq   %%rdx, %5\n\t"
-+        "movsd %%xmm0, %6\n\t"
-+        :
-+        : "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR ),
-+          "m" ( rax ), "m" ( rdx ), "m" ( xmm0 )
-+        : "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r11"
-+    );
-+
-+    switch (pReturnTypeDescr->eTypeClass)
-+    {
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        *reinterpret_cast<sal_uInt64 *>( pRegisterReturn ) = rax;
-         break;
-+    case typelib_TypeClass_LONG:
-+    case typelib_TypeClass_UNSIGNED_LONG:
-+    case typelib_TypeClass_ENUM:
-+        *reinterpret_cast<sal_uInt32 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt32*>( &rax );
-+        break;
-+    case typelib_TypeClass_CHAR:
-+    case typelib_TypeClass_SHORT:
-+    case typelib_TypeClass_UNSIGNED_SHORT:
-+        *reinterpret_cast<sal_uInt16 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt16*>( &rax );
-+        break;
-+    case typelib_TypeClass_BOOLEAN:
-+    case typelib_TypeClass_BYTE:
-+        *reinterpret_cast<sal_uInt8 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt8*>( &rax );
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+    case typelib_TypeClass_DOUBLE:
-+        *reinterpret_cast<double *>( pRegisterReturn ) = xmm0;
-+        break;
-+    default:
-+        {
-+            sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
-+            if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0)
-+            {
-+                if (nRetSize > 8)
-+                    static_cast<sal_uInt64 *>(pRegisterReturn)[1] = rdx;
-+                static_cast<sal_uInt64 *>(pRegisterReturn)[0] = rax;
-+            }
-+            break;
-+        }
-     }
--	}
- }
- 
-+//================================================================================================== 
-+
-+// Macros for easier insertion of values to registers or stack
-+// pSV - pointer to the source
-+// nr - order of the value [will be increased if stored to register]
-+// pFPR, pGPR - pointer to the registers
-+// pDS - pointer to the stack [will be increased if stored here]
-+
-+// The value in %xmm register is already prepared to be retrieved as a float,
-+// thus we treat float and double the same
-+#define INSERT_FLOAT_DOUBLE( pSV, nr, pFPR, pDS ) \
-+	if ( nr < x86_64::MAX_SSE_REGS ) \
-+		pFPR[nr++] = *reinterpret_cast<double *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV ); // verbatim!
-+
-+#define INSERT_INT64( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt64 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV );
-+
-+#define INSERT_INT32( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt32 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV );
-+
-+#define INSERT_INT16( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt16 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV );
-+
-+#define INSERT_INT8( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt8 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
- 
- //================================================================================================== 
-+
- static void cpp_call(
- 	bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
- 	bridges::cpp_uno::shared::VtableSlot aVtableSlot,
-@@ -322,54 +246,52 @@
- 	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
- {
- 	// Maxium space for [complex ret ptr], values | ptr ...
--  	char * pCppStack		= (char *)__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) );
--  	char * pCppStackStart	= pCppStack;
-+	// (but will be used less - some of the values will be in pGPR and pFPR)
-+  	sal_uInt64 *pStack = (sal_uInt64 *)__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) );
-+  	sal_uInt64 *pStackStart = pStack;
- 
--	// We need to know parameter types for callVirtualMethod() so generate a signature string
--	char * pParamType		= (char *)__builtin_alloca( nParams + 3 );
--	char * pPT				= pParamType;
-+	sal_uInt64 pGPR[x86_64::MAX_GPR_REGS];
-+	sal_uInt32 nGPR = 0;
-+
-+	double pFPR[x86_64::MAX_SSE_REGS];
-+	sal_uInt32 nFPR = 0;
- 
- 	// Return
- 	typelib_TypeDescription * pReturnTypeDescr = 0;
- 	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
- 	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
- 	
--	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion (see below)
- 
- 	bool bSimpleReturn = true;	
--	if (pReturnTypeDescr)
-+	if ( pReturnTypeDescr )
- 	{
- 		if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
- 			bSimpleReturn = false;
- 
--		if (bSimpleReturn)
-+		if ( bSimpleReturn )
- 			pCppReturn = pUnoReturn; // direct way for simple types
- 		else
- 		{
- 			// complex return via ptr
--			pCppReturn = *(void **)pCppStack = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
--												? __builtin_alloca( pReturnTypeDescr->nSize )
--												: pUnoReturn); // direct way
--			*pPT++ = 'H';
--			pCppStack += sizeof(void *);
-+			pCppReturn = bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )?
-+						 __builtin_alloca( pReturnTypeDescr->nSize ) : pUnoReturn;
-+			INSERT_INT64( &pCppReturn, nGPR, pGPR, pStack );
- 		}
- 	}
- 
- 	// Push "this" pointer
- 	void * pAdjustedThisPtr = reinterpret_cast< void ** >( pThis->getCppI() ) + aVtableSlot.offset;
--	*(void **)pCppStack = pAdjustedThisPtr;
--	*pPT++ = 'H';
--	pCppStack += sizeof(void *);
-+	INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack );
- 
--	// stack space
- 	// Args
--	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams );
- 	// Indizes of values this have to be converted (interface conversion cpp<=>uno)
- 	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
- 	// Type descriptions for reconversions
- 	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
- 	
--	sal_Int32 nTempIndizes   = 0;
-+	sal_Int32 nTempIndizes = 0;
- 	
- 	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
- 	{
-@@ -379,45 +301,32 @@
- 		
- 		if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
- 		{
--			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+			uno_copyAndConvertData( pCppArgs[nPos] = alloca( 8 ), pUnoArgs[nPos], pParamTypeDescr,
- 									pThis->getBridge()->getUno2Cpp() );
- 			
- 			switch (pParamTypeDescr->eTypeClass)
- 			{
--				
--				// we need to know type of each param so that we know whether to use
--				// gpr or fpr to pass in parameters:
--				// Key: I - 32-bit value passed in gpr
--				//      B - byte value passed in gpr
--				//      S - short value passed in gpr
--				//      F - float value pass in fpr
--				//      D - double value pass in fpr
--				//      H - long value passed in gpr
--				//      X - indicates end of parameter description string
--				
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+				INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack );
-+				break;
- 			case typelib_TypeClass_LONG:
- 			case typelib_TypeClass_UNSIGNED_LONG:
- 			case typelib_TypeClass_ENUM:
--				*pPT++ = 'I';
-+				INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack );
- 				break;
- 			case typelib_TypeClass_SHORT:
- 			case typelib_TypeClass_CHAR:
- 			case typelib_TypeClass_UNSIGNED_SHORT:
--				*pPT++ = 'S';
-+				INSERT_INT16( pCppArgs[nPos], nGPR, pGPR, pStack );
- 				break;
- 			case typelib_TypeClass_BOOLEAN:
- 			case typelib_TypeClass_BYTE:
--				*pPT++ = 'B';
-+				INSERT_INT8( pCppArgs[nPos], nGPR, pGPR, pStack );
- 				break;
- 			case typelib_TypeClass_FLOAT:
--				*pPT++ = 'F';
--				break;
- 			case typelib_TypeClass_DOUBLE:
--				*pPT++ = 'D';
--				break;
--			case typelib_TypeClass_HYPER:
--			case typelib_TypeClass_UNSIGNED_HYPER:
--				*pPT++ = 'H';
-+				INSERT_FLOAT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, pStack );
- 				break;
- 			}
- 
-@@ -430,7 +339,7 @@
- 			{
- 				// cpp out is constructed mem, uno out is not!
- 				uno_constructData(
--					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
- 					pParamTypeDescr );
- 				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
- 				// will be released at reconversion
-@@ -440,7 +349,7 @@
- 			else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr ))
- 			{
- 				uno_copyAndConvertData(
--					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
- 					pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
- 				
- 				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-@@ -449,27 +358,22 @@
- 			}
- 			else // direct way
- 			{
--				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				pCppArgs[nPos] = pUnoArgs[nPos];
- 				// no longer needed
- 				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
- 			}
--			// FIXME: is this the right way to pass these?
--			*pPT++='H';
-+			INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack );
- 		}
--		pCppStack += sizeof(sal_uInt64); // standard parameter length
- 	}
- 	
--	// terminate the signature string
--	*pPT++ = 'X';
--	*pPT = 0;
--
- 	try
- 	{
--		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 7), "UNALIGNED STACK !!! (Please DO panic)" );
- 		callVirtualMethod(
- 			pAdjustedThisPtr, aVtableSlot.index,
--			pCppReturn, pReturnTypeDescr, bSimpleReturn, pParamType,
--			(sal_uInt64 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_uInt64) );
-+			pCppReturn, pReturnTypeDescr, bSimpleReturn,
-+			pStackStart, ( pStack - pStackStart ),
-+			pGPR, nGPR,
-+			pFPR, nFPR );
- 		// NO exception occured...
- 		*ppUnoExc = 0;
- 		
-@@ -525,8 +429,8 @@
- 	}
- }
- 
--
- //==================================================================================================
-+
- namespace bridges { namespace cpp_uno { namespace shared {
- 
- void unoInterfaceProxyDispatch(
diff --git a/editors/openoffice.org-3-devel/files/patch-i76969 b/editors/openoffice.org-3-devel/files/patch-i76969
deleted file mode 100644
index 123402727290..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i76969
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: solenv/inc/unxfbsd.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsd.mk,v
-retrieving revision 1.3
-diff -u -r1.3 unxfbsd.mk
---- solenv/inc/unxfbsd.mk	9 Mar 2007 09:07:55 -0000	1.3
-+++ solenv/inc/unxfbsd.mk	4 May 2007 16:22:53 -0000
-@@ -121,12 +121,6 @@
- # Compiler flags for debugging
- CFLAGSDEBUG=-g
- CFLAGSDBGUTIL=
--# Compiler flags for enabling optimizations
--.IF "$(PRODUCT)"!=""
--CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
--.ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT=   							# no optimizing for non products
--.ENDIF	# "$(PRODUCT)"!=""
- # Compiler flags for disabling optimizations
- CFLAGSNOOPT=-O0
- # Compiler flags for describing the output path
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.24
-diff -u -r1.24 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	19 Jul 2006 09:27:04 -0000	1.24
-+++ solenv/inc/unxfbsdi.mk	4 May 2007 16:22:53 -0000
-@@ -43,5 +43,12 @@
- # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
- ARCH_FLAGS*=-mtune=pentiumpro
- 
-+# Compiler flags for enabling optimizations
-+.IF "$(PRODUCT)"!=""
-+CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+.ELSE 	# "$(PRODUCT)"!=""
-+CFLAGSOPT= 					# no optimizing for non products
-+.ENDIF	# "$(PRODUCT)"!=""
-+
- # platform specific identifier for shared libs
- DLLPOSTFIX=fi
diff --git a/editors/openoffice.org-3-devel/files/patch-i77615 b/editors/openoffice.org-3-devel/files/patch-i77615
deleted file mode 100644
index 89fe1aaee7c8..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i77615
+++ /dev/null
@@ -1,57 +0,0 @@
-For FreeBSD, libxslt builds libraries as libxslt.so.2 or something
-like that. Following patch fixes this.
-
-Index: libxslt/libxslt-1.1.16.patch
-===================================================================
-RCS file: /cvs/external/libxslt/libxslt-1.1.16.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxslt-1.1.16.patch
---- libxslt/libxslt-1.1.16.patch	10 May 2007 13:10:07 -0000	1.2
-+++ libxslt/libxslt-1.1.16.patch	20 May 2007 02:35:31 -0000
-@@ -108,3 +108,46 @@
- ! 
- ! exit 0
- 
-+*** misc/libxslt-1.1.16/ltmain.sh	Sun Feb 12 09:50:49 2006
-+--- misc/build/libxslt-1.1.16/ltmain.sh	Sun May 20 11:34:29 2007
-+***************
-+*** 3192,3200 ****
-+  	    revision="$number_revision"
-+  	    ;;
-+  	  freebsd-aout|freebsd-elf|sunos)
-+! 	    current="$number_major"
-+! 	    revision="$number_minor"
-+! 	    age="0"
-+  	    ;;
-+  	  irix|nonstopux)
-+  	    current=`expr $number_major + $number_minor - 1`
-+--- 3192,3200 ----
-+  	    revision="$number_revision"
-+  	    ;;
-+  	  freebsd-aout|freebsd-elf|sunos)
-+! 	    current=`expr $number_major + $number_minor`
-+! 	    age="$number_minor"
-+! 	    revision="$number_revision"
-+  	    ;;
-+  	  irix|nonstopux)
-+  	    current=`expr $number_major + $number_minor - 1`
-+***************
-+*** 3267,3274 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 3267,3274 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+
diff --git a/editors/openoffice.org-3-devel/files/patch-i78032 b/editors/openoffice.org-3-devel/files/patch-i78032
deleted file mode 100644
index e2b523c56e85..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i78032
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: store/util/makefile.mk
-===================================================================
-RCS file: /cvs/ucb/store/util/makefile.mk,v
-retrieving revision 1.19
-diff -u -r1.19 makefile.mk
---- store/util/makefile.mk	26 Mar 2007 13:45:45 -0000	1.19
-+++ store/util/makefile.mk	2 Jun 2007 01:40:18 -0000
-@@ -79,7 +79,7 @@
- .IF "$(GUI)"=="WNT"
- SHL1STDLIBS+= 	-lsupc++
- .ELSE
--.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="NETBSD"
- SHL1STDLIBS+= 	-lsupc++
- .ELIF "$(OS)"=="MACOSX"
- .IF "$(CCNUMVER)"<="000399999999"
diff --git a/editors/openoffice.org-3-devel/files/patch-i79520 b/editors/openoffice.org-3-devel/files/patch-i79520
new file mode 100644
index 000000000000..ccc05e9cbc3c
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i79520
@@ -0,0 +1,10 @@
+--- svx/inc/svx/svdobj.hxx	6 Jul 2007 07:30:43 -0000	1.3
++++ svx/inc/svx/svdobj.hxx	12 Jul 2007 13:56:39 -0000	1.4
+@@ -531,6 +531,7 @@
+ //
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+ 
++class SvxShape;
+ class SVX_DLLPUBLIC SdrObject: public SfxListener, public tools::WeakBase< SdrObject >
+ {
+ private:
diff --git a/editors/openoffice.org-3-devel/files/patch-i79527 b/editors/openoffice.org-3-devel/files/patch-i79527
new file mode 100644
index 000000000000..20c646f43f1e
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i79527
@@ -0,0 +1,19 @@
+Index: reportdesign/source/ui/dlg/GroupsSorting.cxx
+===================================================================
+RCS file: /cvs/dba/reportdesign/source/ui/dlg/GroupsSorting.cxx,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- reportdesign/source/ui/dlg/GroupsSorting.cxx	9 Jul 2007 11:56:29 -0000	1.2
++++ reportdesign/source/ui/dlg/GroupsSorting.cxx	12 Jul 2007 13:51:08 -0000	1.3
+@@ -1143,8 +1143,8 @@
+ 	    xGroup->setKeepTogether( m_aKeepTogetherLst.GetSelectEntryPos() );
+     if ( m_aGroupOnLst.GetSavedValue() != m_aGroupOnLst.GetSelectEntryPos() )
+     {
+-	    sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_Int32>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
+-	    xGroup->setGroupOn( nGroupOn );
++	    sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
++        xGroup->setGroupOn( nGroupOn );
+     }
+     if ( m_aGroupIntervalEd.GetSavedValue().ToInt32() != m_aGroupIntervalEd.GetValue() )
+     {
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 380f953dd999..579c69c27c59 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -66,10 +66,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		219
+MILESTONE?=		220
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070706
+SNAPDATE=		20070710
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 89e62cfc9151..f9cad8753c8f 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m219_source.tar.bz2) = 16c16611835a060b13a06109d03de55d
-SHA256 (openoffice.org2/OOo_SRC680_m219_source.tar.bz2) = ddaa5ca22d8dcb47d9ea5a678cda4b2e4af94f7358d72d816f92f7e1583552c5
-SIZE (openoffice.org2/OOo_SRC680_m219_source.tar.bz2) = 274602807
+MD5 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 245e58891d2d091ae3a4d484a0488be0
+SHA256 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = f83619ac1a3055a4be7a95d3fead1109d76ab244015da76e208da21af40e2ab7
+SIZE (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 292163303
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i66667 b/editors/openoffice.org-vcltesttool/files/patch-i66667
deleted file mode 100644
index c1d8cd362e9b..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i66667
+++ /dev/null
@@ -1,139 +0,0 @@
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Tue May  2 08:01:08 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Fri Sep  8 17:25:05 2006
-@@ -120,6 +120,9 @@
- 			case typelib_TypeClass_UNSIGNED_HYPER:
- 			case typelib_TypeClass_DOUBLE:
- 				pCppStack += sizeof(sal_Int32); // extra long
-+                break;
-+            default:
-+                break;
- 			}
- 			// no longer needed
- 			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-@@ -436,7 +439,7 @@
- unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-     void ** slots, unsigned char * code,
-     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
--    sal_Int32 functionCount, sal_Int32 vtableOffset)
-+    sal_Int32 /*functionCount*/, sal_Int32 vtableOffset)
- {
-     for (sal_Int32 i = 0; i < type->nMembers; ++i) {
-         typelib_TypeDescription * member = 0;
---- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx.orig	Wed Sep  7 18:20:22 2005
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Sep 11 12:21:03 2006
-@@ -37,6 +37,7 @@
- #include <dlfcn.h>
- #include <cxxabi.h>
- #include <hash_map>
-+#include <sys/param.h>
- 
- #include <rtl/strbuf.hxx>
- #include <rtl/ustrbuf.hxx>
-@@ -122,7 +123,11 @@
- };
- //__________________________________________________________________________________________________
- RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 602103
-     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-+#else
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+#endif
- {
- }
- //__________________________________________________________________________________________________
-@@ -139,8 +144,8 @@
-     OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
- 
-     MutexGuard guard( m_mutex );
--    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
--    if (iFind == m_rttis.end())
-+    t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) );
-+    if (iRttiFind == m_rttis.end())
-     {
-         // RTTI symbol
-         OStringBuffer buf( 64 );
-@@ -157,8 +162,11 @@
-         buf.append( 'E' );
- 
-         OString symName( buf.makeStringAndClear() );
--//#iZ 22253 
-+#if __FreeBSD_version < 602103 /* #i22253# */
-         rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-+#else
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+#endif
- 
-         if (rtti)
-         {
-@@ -205,7 +213,7 @@
-     }
-     else
-     {
--        rtti = iFind->second;
-+        rtti = iRttiFind->second;
-     }
- 
-     return rtti;
---- bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Jun 19 19:43:09 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Fri Sep  8 17:25:05 2006
-@@ -142,6 +142,8 @@
- 		case typelib_TypeClass_DOUBLE:
- 			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
- 			break;
-+        default:
-+            break;
- 	}
- }
- 
-@@ -217,6 +219,9 @@
- 			case typelib_TypeClass_UNSIGNED_HYPER:
- 			case typelib_TypeClass_DOUBLE:
- 				pCppStack += sizeof(sal_Int32); // extra long
-+                break;
-+            default:
-+                break;
- 			}
- 			// no longer needed
- 			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-@@ -329,7 +334,6 @@
- 	// is my surrogate
- 	bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
-         = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
--	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
- 	
- 	switch (pMemberDescr->eTypeClass)
- 	{
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx.orig	Wed Jul 19 05:30:01 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	Mon Sep 11 12:21:25 2006
-@@ -37,6 +37,7 @@
- #include <dlfcn.h>
- #include <cxxabi.h>
- #include <hash_map>
-+#include <sys/param.h>
- 
- #include <rtl/strbuf.hxx>
- #include <rtl/ustrbuf.hxx>
-@@ -122,7 +123,11 @@
- };
- //__________________________________________________________________________________________________
- RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 602103
-     : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-+#else
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+#endif
- {
- }
- //__________________________________________________________________________________________________
-@@ -157,7 +162,11 @@
-         buf.append( 'E' );
-         
-         OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 602103  /* #i22253# */
-         rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-+#else
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+#endif
- 
-         if (rtti)
-         {
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i67904 b/editors/openoffice.org-vcltesttool/files/patch-i67904
deleted file mode 100644
index 520242bb45a0..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i67904
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: sal/osl/unx/socket.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/socket.c,v
-retrieving revision 1.26
-diff -u -r1.26 socket.c
---- sal/osl/unx/socket.c	19 Jul 2006 09:39:22 -0000	1.26
-+++ sal/osl/unx/socket.c	29 Jul 2006 09:53:04 -0000
-@@ -813,7 +813,7 @@
- 	const char *name, struct hostent *result,
- 	char *buffer, int buflen, int *h_errnop)
- {
--#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015))
-+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
- 	struct hostent *__result; /* will be the same as result */
- 	int __error;
- 	__error = gethostbyname_r (name, result, buffer, buflen,
-Index: sal/osl/unx/system.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/system.c,v
-retrieving revision 1.13
-diff -u -r1.13 system.c
---- sal/osl/unx/system.c	19 Jul 2006 09:39:37 -0000	1.13
-+++ sal/osl/unx/system.c	9 Sep 2006 09:57:26 -0000
-@@ -343,7 +343,7 @@
- }
- #endif /* defined SCO */
- 
--#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
- 
- extern int h_errno;
- 
-@@ -435,7 +435,7 @@
- 
-   	return res;
- }
--#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- 
- #if defined(MACOSX)
- /*
-
-Index: sal/osl/unx/system.h
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/system.h,v
-retrieving revision 1.33
-diff -u -r1.33 system.h
---- sal/osl/unx/system.h	19 Jul 2006 09:39:50 -0000	1.33
-+++ sal/osl/unx/system.h	9 Sep 2006 09:55:55 -0000
-@@ -537,10 +537,10 @@
- struct tm *localtime_r(const time_t *timep, struct tm *buffer);
- struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
- #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
--#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
- struct hostent *gethostbyname_r(const char *name, struct hostent *result,
- 								char *buffer, int buflen, int *h_errnop);
--#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- #endif
- 
- #endif /* __OSL_SYSTEM_H__ */
-
-Index: moz/mozilla-source-1.7.5.patch
-===================================================================
-RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v
-retrieving revision 1.14
-diff -u -r1.14 mozilla-source-1.7.5.patch
---- moz/mozilla-source-1.7.5.patch	17 Apr 2007 08:54:47 -0000	1.14
-+++ moz/mozilla-source-1.7.5.patch	27 Apr 2007 05:57:10 -0000
-@@ -7821,7 +7821,7 @@
-   #endif
-   
- ! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
--! 	(defined(__FreeBSD__) && __FreeBSD_version > 700016)
-+! 	(defined(__FreeBSD__) && __FreeBSD_version > 601103)
-   #define _PR_HAVE_GETPROTO_R
-   #define _PR_HAVE_5_ARG_GETPROTO_R
-   #endif
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i69418 b/editors/openoffice.org-vcltesttool/files/patch-i69418
deleted file mode 100644
index dd23c55e4c9b..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i69418
+++ /dev/null
@@ -1,38 +0,0 @@
---- moz/mozilla-source-1.7.5.patch.org	Sat Sep  9 18:43:45 2006
-+++ moz/mozilla-source-1.7.5.patch	Sat Sep  9 18:42:00 2006
-@@ -151,6 +151,17 @@
-          AR_EXTRACT="$AR x"
-          AR_DELETE="$AR d"
- ***************
-+*** 7504,7509 ****
-+--- 7504,7511 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
-+  echo "configure:7510: checking for gethostbyname_r in -lc_r" >&5
-+***************
- *** 16606,16613 ****
-   
-   case "$host_os" in
-@@ -191,6 +202,17 @@
-          AR_EXTRACT="$AR x"
-          AR_DELETE="$AR d"
- ***************
-+*** 1981,1986 ****
-+--- 1981,1988 ----
-+  case $target in
-+  *-hpux11.*)
-+  	;;
-++ *-freebsd*)
-++ 	;;
-+  *)
-+  	AC_CHECK_LIB(c_r, gethostbyname_r)
-+  	;;
-+***************
- *** 5692,5699 ****
-   dnl ========================================================
-   case "$host_os" in
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i69994 b/editors/openoffice.org-vcltesttool/files/patch-i69994
deleted file mode 100644
index 9d2718b4763c..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i69994
+++ /dev/null
@@ -1,747 +0,0 @@
-Index: python/Python-2.3.4.patch
-===================================================================
-RCS file: /cvs/external/python/Python-2.3.4.patch,v
-retrieving revision 1.12
-diff -u -r1.12 Python-2.3.4.patch
---- python/Python-2.3.4.patch	25 Sep 2006 13:22:02 -0000	1.12
-+++ python/Python-2.3.4.patch	29 Sep 2006 22:06:08 -0000
-@@ -13463,3 +13463,739 @@
-   	handler = signal(sig, SIG_IGN);
-   	signal(sig, handler);
-   	return handler;
-+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:26:23 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:20:25 2005
-+***************
-+*** 0 ****
-+--- 1,355 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ IPPROTO_IP = 0
-++ IPPROTO_HOPOPTS = 0
-++ IPPROTO_ICMP = 1
-++ IPPROTO_IGMP = 2
-++ IPPROTO_GGP = 3
-++ IPPROTO_IPV4 = 4
-++ IPPROTO_IPIP = IPPROTO_IPV4
-++ IPPROTO_TCP = 6
-++ IPPROTO_ST = 7
-++ IPPROTO_EGP = 8
-++ IPPROTO_PIGP = 9
-++ IPPROTO_RCCMON = 10
-++ IPPROTO_NVPII = 11
-++ IPPROTO_PUP = 12
-++ IPPROTO_ARGUS = 13
-++ IPPROTO_EMCON = 14
-++ IPPROTO_XNET = 15
-++ IPPROTO_CHAOS = 16
-++ IPPROTO_UDP = 17
-++ IPPROTO_MUX = 18
-++ IPPROTO_MEAS = 19
-++ IPPROTO_HMP = 20
-++ IPPROTO_PRM = 21
-++ IPPROTO_IDP = 22
-++ IPPROTO_TRUNK1 = 23
-++ IPPROTO_TRUNK2 = 24
-++ IPPROTO_LEAF1 = 25
-++ IPPROTO_LEAF2 = 26
-++ IPPROTO_RDP = 27
-++ IPPROTO_IRTP = 28
-++ IPPROTO_TP = 29
-++ IPPROTO_BLT = 30
-++ IPPROTO_NSP = 31
-++ IPPROTO_INP = 32
-++ IPPROTO_SEP = 33
-++ IPPROTO_3PC = 34
-++ IPPROTO_IDPR = 35
-++ IPPROTO_XTP = 36
-++ IPPROTO_DDP = 37
-++ IPPROTO_CMTP = 38
-++ IPPROTO_TPXX = 39
-++ IPPROTO_IL = 40
-++ IPPROTO_IPV6 = 41
-++ IPPROTO_SDRP = 42
-++ IPPROTO_ROUTING = 43
-++ IPPROTO_FRAGMENT = 44
-++ IPPROTO_IDRP = 45
-++ IPPROTO_RSVP = 46
-++ IPPROTO_GRE = 47
-++ IPPROTO_MHRP = 48
-++ IPPROTO_BHA = 49
-++ IPPROTO_ESP = 50
-++ IPPROTO_AH = 51
-++ IPPROTO_INLSP = 52
-++ IPPROTO_SWIPE = 53
-++ IPPROTO_NHRP = 54
-++ IPPROTO_ICMPV6 = 58
-++ IPPROTO_NONE = 59
-++ IPPROTO_DSTOPTS = 60
-++ IPPROTO_AHIP = 61
-++ IPPROTO_CFTP = 62
-++ IPPROTO_HELLO = 63
-++ IPPROTO_SATEXPAK = 64
-++ IPPROTO_KRYPTOLAN = 65
-++ IPPROTO_RVD = 66
-++ IPPROTO_IPPC = 67
-++ IPPROTO_ADFS = 68
-++ IPPROTO_SATMON = 69
-++ IPPROTO_VISA = 70
-++ IPPROTO_IPCV = 71
-++ IPPROTO_CPNX = 72
-++ IPPROTO_CPHB = 73
-++ IPPROTO_WSN = 74
-++ IPPROTO_PVP = 75
-++ IPPROTO_BRSATMON = 76
-++ IPPROTO_ND = 77
-++ IPPROTO_WBMON = 78
-++ IPPROTO_WBEXPAK = 79
-++ IPPROTO_EON = 80
-++ IPPROTO_VMTP = 81
-++ IPPROTO_SVMTP = 82
-++ IPPROTO_VINES = 83
-++ IPPROTO_TTP = 84
-++ IPPROTO_IGP = 85
-++ IPPROTO_DGP = 86
-++ IPPROTO_TCF = 87
-++ IPPROTO_IGRP = 88
-++ IPPROTO_OSPFIGP = 89
-++ IPPROTO_SRPC = 90
-++ IPPROTO_LARP = 91
-++ IPPROTO_MTP = 92
-++ IPPROTO_AX25 = 93
-++ IPPROTO_IPEIP = 94
-++ IPPROTO_MICP = 95
-++ IPPROTO_SCCSP = 96
-++ IPPROTO_ETHERIP = 97
-++ IPPROTO_ENCAP = 98
-++ IPPROTO_APES = 99
-++ IPPROTO_GMTP = 100
-++ IPPROTO_IPCOMP = 108
-++ IPPROTO_PIM = 103
-++ IPPROTO_PGM = 113
-++ IPPROTO_DIVERT = 254
-++ IPPROTO_RAW = 255
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPORT_RESERVED = 1024
-++ IPPORT_USERRESERVED = 5000
-++ IPPORT_HIFIRSTAUTO = 49152
-++ IPPORT_HILASTAUTO = 65535
-++ IPPORT_RESERVEDSTART = 600
-++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
-++ 
-++ IN_CLASSA_NET = 0xff000000
-++ IN_CLASSA_NSHIFT = 24
-++ IN_CLASSA_HOST = 0x00ffffff
-++ IN_CLASSA_MAX = 128
-++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
-++ 
-++ IN_CLASSB_NET = 0xffff0000
-++ IN_CLASSB_NSHIFT = 16
-++ IN_CLASSB_HOST = 0x0000ffff
-++ IN_CLASSB_MAX = 65536
-++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
-++ 
-++ IN_CLASSC_NET = 0xffffff00
-++ IN_CLASSC_NSHIFT = 8
-++ IN_CLASSC_HOST = 0x000000ff
-++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
-++ 
-++ IN_CLASSD_NET = 0xf0000000
-++ IN_CLASSD_NSHIFT = 28
-++ IN_CLASSD_HOST = 0x0fffffff
-++ def IN_MULTICAST(i): return IN_CLASSD(i)
-++ 
-++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ INADDR_NONE = 0xffffffff
-++ IN_LOOPBACKNET = 127
-++ INET_ADDRSTRLEN = 16
-++ IP_OPTIONS = 1
-++ IP_HDRINCL = 2
-++ IP_TOS = 3
-++ IP_TTL = 4
-++ IP_RECVOPTS = 5
-++ IP_RECVRETOPTS = 6
-++ IP_RECVDSTADDR = 7
-++ IP_RETOPTS = 8
-++ IP_MULTICAST_IF = 9
-++ IP_MULTICAST_TTL = 10
-++ IP_MULTICAST_LOOP = 11
-++ IP_ADD_MEMBERSHIP = 12
-++ IP_DROP_MEMBERSHIP = 13
-++ IP_MULTICAST_VIF = 14
-++ IP_RSVP_ON = 15
-++ IP_RSVP_OFF = 16
-++ IP_RSVP_VIF_ON = 17
-++ IP_RSVP_VIF_OFF = 18
-++ IP_PORTRANGE = 19
-++ IP_RECVIF = 20
-++ IP_IPSEC_POLICY = 21
-++ IP_FAITH = 22
-++ IP_FW_ADD = 50
-++ IP_FW_DEL = 51
-++ IP_FW_FLUSH = 52
-++ IP_FW_ZERO = 53
-++ IP_FW_GET = 54
-++ IP_FW_RESETLOG = 55
-++ IP_DUMMYNET_CONFIGURE = 60
-++ IP_DUMMYNET_DEL = 61
-++ IP_DUMMYNET_FLUSH = 62
-++ IP_DUMMYNET_GET = 64
-++ IP_DEFAULT_MULTICAST_TTL = 1
-++ IP_DEFAULT_MULTICAST_LOOP = 1
-++ IP_MAX_MEMBERSHIPS = 20
-++ IP_PORTRANGE_DEFAULT = 0
-++ IP_PORTRANGE_HIGH = 1
-++ IP_PORTRANGE_LOW = 2
-++ IPPROTO_MAXID = (IPPROTO_AH + 1)
-++ IPCTL_FORWARDING = 1
-++ IPCTL_SENDREDIRECTS = 2
-++ IPCTL_DEFTTL = 3
-++ IPCTL_DEFMTU = 4
-++ IPCTL_RTEXPIRE = 5
-++ IPCTL_RTMINEXPIRE = 6
-++ IPCTL_RTMAXCACHE = 7
-++ IPCTL_SOURCEROUTE = 8
-++ IPCTL_DIRECTEDBROADCAST = 9
-++ IPCTL_INTRQMAXLEN = 10
-++ IPCTL_INTRQDROPS = 11
-++ IPCTL_STATS = 12
-++ IPCTL_ACCEPTSOURCEROUTE = 13
-++ IPCTL_FASTFORWARDING = 14
-++ IPCTL_KEEPFAITH = 15
-++ IPCTL_GIF_TTL = 16
-++ IPCTL_MAXID = 17
-++ 
-++ # Included from netinet6/in6.h
-++ 
-++ # Included from sys/queue.h
-++ def SLIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def SLIST_ENTRY(type): return \
-++ 
-++ def STAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def STAILQ_ENTRY(type): return \
-++ 
-++ def LIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def LIST_ENTRY(type): return \
-++ 
-++ def TAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def TAILQ_ENTRY(type): return \
-++ 
-++ def CIRCLEQ_ENTRY(type): return \
-++ 
-++ __KAME_VERSION = "20000701/FreeBSD-current"
-++ IPV6PORT_RESERVED = 1024
-++ IPV6PORT_ANONMIN = 49152
-++ IPV6PORT_ANONMAX = 65535
-++ IPV6PORT_RESERVEDMIN = 600
-++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-++ INET6_ADDRSTRLEN = 46
-++ IPV6_ADDR_INT32_ONE = 1
-++ IPV6_ADDR_INT32_TWO = 2
-++ IPV6_ADDR_INT32_MNL = 0xff010000
-++ IPV6_ADDR_INT32_MLL = 0xff020000
-++ IPV6_ADDR_INT32_SMP = 0x0000ffff
-++ IPV6_ADDR_INT16_ULL = 0xfe80
-++ IPV6_ADDR_INT16_USL = 0xfec0
-++ IPV6_ADDR_INT16_MLL = 0xff02
-++ IPV6_ADDR_INT32_ONE = 0x01000000
-++ IPV6_ADDR_INT32_TWO = 0x02000000
-++ IPV6_ADDR_INT32_MNL = 0x000001ff
-++ IPV6_ADDR_INT32_MLL = 0x000002ff
-++ IPV6_ADDR_INT32_SMP = 0xffff0000
-++ IPV6_ADDR_INT16_ULL = 0x80fe
-++ IPV6_ADDR_INT16_USL = 0xc0fe
-++ IPV6_ADDR_INT16_MLL = 0x02ff
-++ def IN6_IS_ADDR_UNSPECIFIED(a): return \
-++ 
-++ def IN6_IS_ADDR_LOOPBACK(a): return \
-++ 
-++ def IN6_IS_ADDR_V4COMPAT(a): return \
-++ 
-++ def IN6_IS_ADDR_V4MAPPED(a): return \
-++ 
-++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ def IN6_IS_ADDR_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_SCOPE_LINKLOCAL(a): return \
-++ 
-++ IPV6_OPTIONS = 1
-++ IPV6_RECVOPTS = 5
-++ IPV6_RECVRETOPTS = 6
-++ IPV6_RECVDSTADDR = 7
-++ IPV6_RETOPTS = 8
-++ IPV6_SOCKOPT_RESERVED1 = 3
-++ IPV6_UNICAST_HOPS = 4
-++ IPV6_MULTICAST_IF = 9
-++ IPV6_MULTICAST_HOPS = 10
-++ IPV6_MULTICAST_LOOP = 11
-++ IPV6_JOIN_GROUP = 12
-++ IPV6_LEAVE_GROUP = 13
-++ IPV6_PORTRANGE = 14
-++ ICMP6_FILTER = 18
-++ IPV6_PKTINFO = 19
-++ IPV6_HOPLIMIT = 20
-++ IPV6_NEXTHOP = 21
-++ IPV6_HOPOPTS = 22
-++ IPV6_DSTOPTS = 23
-++ IPV6_RTHDR = 24
-++ IPV6_PKTOPTIONS = 25
-++ IPV6_CHECKSUM = 26
-++ IPV6_BINDV6ONLY = 27
-++ IPV6_IPSEC_POLICY = 28
-++ IPV6_FAITH = 29
-++ IPV6_FW_ADD = 30
-++ IPV6_FW_DEL = 31
-++ IPV6_FW_FLUSH = 32
-++ IPV6_FW_ZERO = 33
-++ IPV6_FW_GET = 34
-++ IPV6_RTHDR_LOOSE = 0
-++ IPV6_RTHDR_STRICT = 1
-++ IPV6_RTHDR_TYPE_0 = 0
-++ IPV6_DEFAULT_MULTICAST_HOPS = 1
-++ IPV6_DEFAULT_MULTICAST_LOOP = 1
-++ IPV6_PORTRANGE_DEFAULT = 0
-++ IPV6_PORTRANGE_HIGH = 1
-++ IPV6_PORTRANGE_LOW = 2
-++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-++ IPV6CTL_FORWARDING = 1
-++ IPV6CTL_SENDREDIRECTS = 2
-++ IPV6CTL_DEFHLIM = 3
-++ IPV6CTL_DEFMTU = 4
-++ IPV6CTL_FORWSRCRT = 5
-++ IPV6CTL_STATS = 6
-++ IPV6CTL_MRTSTATS = 7
-++ IPV6CTL_MRTPROTO = 8
-++ IPV6CTL_MAXFRAGPACKETS = 9
-++ IPV6CTL_SOURCECHECK = 10
-++ IPV6CTL_SOURCECHECK_LOGINT = 11
-++ IPV6CTL_ACCEPT_RTADV = 12
-++ IPV6CTL_KEEPFAITH = 13
-++ IPV6CTL_LOG_INTERVAL = 14
-++ IPV6CTL_HDRNESTLIMIT = 15
-++ IPV6CTL_DAD_COUNT = 16
-++ IPV6CTL_AUTO_FLOWLABEL = 17
-++ IPV6CTL_DEFMCASTHLIM = 18
-++ IPV6CTL_GIF_HLIM = 19
-++ IPV6CTL_KAME_VERSION = 20
-++ IPV6CTL_USE_DEPRECATED = 21
-++ IPV6CTL_RR_PRUNE = 22
-++ IPV6CTL_MAPPED_ADDR = 23
-++ IPV6CTL_BINDV6ONLY = 24
-++ IPV6CTL_RTEXPIRE = 25
-++ IPV6CTL_RTMINEXPIRE = 26
-++ IPV6CTL_RTMAXCACHE = 27
-++ IPV6CTL_MAXID = 28
-+*** misc/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:26:27 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:19:02 2005
-+***************
-+*** 0 ****
-+--- 1,3 ----
-++ #! /bin/sh
-++ set -v
-++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
-+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:26:23 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:20:25 2005
-+***************
-+*** 0 ****
-+--- 1,355 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ IPPROTO_IP = 0
-++ IPPROTO_HOPOPTS = 0
-++ IPPROTO_ICMP = 1
-++ IPPROTO_IGMP = 2
-++ IPPROTO_GGP = 3
-++ IPPROTO_IPV4 = 4
-++ IPPROTO_IPIP = IPPROTO_IPV4
-++ IPPROTO_TCP = 6
-++ IPPROTO_ST = 7
-++ IPPROTO_EGP = 8
-++ IPPROTO_PIGP = 9
-++ IPPROTO_RCCMON = 10
-++ IPPROTO_NVPII = 11
-++ IPPROTO_PUP = 12
-++ IPPROTO_ARGUS = 13
-++ IPPROTO_EMCON = 14
-++ IPPROTO_XNET = 15
-++ IPPROTO_CHAOS = 16
-++ IPPROTO_UDP = 17
-++ IPPROTO_MUX = 18
-++ IPPROTO_MEAS = 19
-++ IPPROTO_HMP = 20
-++ IPPROTO_PRM = 21
-++ IPPROTO_IDP = 22
-++ IPPROTO_TRUNK1 = 23
-++ IPPROTO_TRUNK2 = 24
-++ IPPROTO_LEAF1 = 25
-++ IPPROTO_LEAF2 = 26
-++ IPPROTO_RDP = 27
-++ IPPROTO_IRTP = 28
-++ IPPROTO_TP = 29
-++ IPPROTO_BLT = 30
-++ IPPROTO_NSP = 31
-++ IPPROTO_INP = 32
-++ IPPROTO_SEP = 33
-++ IPPROTO_3PC = 34
-++ IPPROTO_IDPR = 35
-++ IPPROTO_XTP = 36
-++ IPPROTO_DDP = 37
-++ IPPROTO_CMTP = 38
-++ IPPROTO_TPXX = 39
-++ IPPROTO_IL = 40
-++ IPPROTO_IPV6 = 41
-++ IPPROTO_SDRP = 42
-++ IPPROTO_ROUTING = 43
-++ IPPROTO_FRAGMENT = 44
-++ IPPROTO_IDRP = 45
-++ IPPROTO_RSVP = 46
-++ IPPROTO_GRE = 47
-++ IPPROTO_MHRP = 48
-++ IPPROTO_BHA = 49
-++ IPPROTO_ESP = 50
-++ IPPROTO_AH = 51
-++ IPPROTO_INLSP = 52
-++ IPPROTO_SWIPE = 53
-++ IPPROTO_NHRP = 54
-++ IPPROTO_ICMPV6 = 58
-++ IPPROTO_NONE = 59
-++ IPPROTO_DSTOPTS = 60
-++ IPPROTO_AHIP = 61
-++ IPPROTO_CFTP = 62
-++ IPPROTO_HELLO = 63
-++ IPPROTO_SATEXPAK = 64
-++ IPPROTO_KRYPTOLAN = 65
-++ IPPROTO_RVD = 66
-++ IPPROTO_IPPC = 67
-++ IPPROTO_ADFS = 68
-++ IPPROTO_SATMON = 69
-++ IPPROTO_VISA = 70
-++ IPPROTO_IPCV = 71
-++ IPPROTO_CPNX = 72
-++ IPPROTO_CPHB = 73
-++ IPPROTO_WSN = 74
-++ IPPROTO_PVP = 75
-++ IPPROTO_BRSATMON = 76
-++ IPPROTO_ND = 77
-++ IPPROTO_WBMON = 78
-++ IPPROTO_WBEXPAK = 79
-++ IPPROTO_EON = 80
-++ IPPROTO_VMTP = 81
-++ IPPROTO_SVMTP = 82
-++ IPPROTO_VINES = 83
-++ IPPROTO_TTP = 84
-++ IPPROTO_IGP = 85
-++ IPPROTO_DGP = 86
-++ IPPROTO_TCF = 87
-++ IPPROTO_IGRP = 88
-++ IPPROTO_OSPFIGP = 89
-++ IPPROTO_SRPC = 90
-++ IPPROTO_LARP = 91
-++ IPPROTO_MTP = 92
-++ IPPROTO_AX25 = 93
-++ IPPROTO_IPEIP = 94
-++ IPPROTO_MICP = 95
-++ IPPROTO_SCCSP = 96
-++ IPPROTO_ETHERIP = 97
-++ IPPROTO_ENCAP = 98
-++ IPPROTO_APES = 99
-++ IPPROTO_GMTP = 100
-++ IPPROTO_IPCOMP = 108
-++ IPPROTO_PIM = 103
-++ IPPROTO_PGM = 113
-++ IPPROTO_DIVERT = 254
-++ IPPROTO_RAW = 255
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPORT_RESERVED = 1024
-++ IPPORT_USERRESERVED = 5000
-++ IPPORT_HIFIRSTAUTO = 49152
-++ IPPORT_HILASTAUTO = 65535
-++ IPPORT_RESERVEDSTART = 600
-++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
-++ 
-++ IN_CLASSA_NET = 0xff000000
-++ IN_CLASSA_NSHIFT = 24
-++ IN_CLASSA_HOST = 0x00ffffff
-++ IN_CLASSA_MAX = 128
-++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
-++ 
-++ IN_CLASSB_NET = 0xffff0000
-++ IN_CLASSB_NSHIFT = 16
-++ IN_CLASSB_HOST = 0x0000ffff
-++ IN_CLASSB_MAX = 65536
-++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
-++ 
-++ IN_CLASSC_NET = 0xffffff00
-++ IN_CLASSC_NSHIFT = 8
-++ IN_CLASSC_HOST = 0x000000ff
-++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
-++ 
-++ IN_CLASSD_NET = 0xf0000000
-++ IN_CLASSD_NSHIFT = 28
-++ IN_CLASSD_HOST = 0x0fffffff
-++ def IN_MULTICAST(i): return IN_CLASSD(i)
-++ 
-++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-++ 
-++ INADDR_NONE = 0xffffffff
-++ IN_LOOPBACKNET = 127
-++ INET_ADDRSTRLEN = 16
-++ IP_OPTIONS = 1
-++ IP_HDRINCL = 2
-++ IP_TOS = 3
-++ IP_TTL = 4
-++ IP_RECVOPTS = 5
-++ IP_RECVRETOPTS = 6
-++ IP_RECVDSTADDR = 7
-++ IP_RETOPTS = 8
-++ IP_MULTICAST_IF = 9
-++ IP_MULTICAST_TTL = 10
-++ IP_MULTICAST_LOOP = 11
-++ IP_ADD_MEMBERSHIP = 12
-++ IP_DROP_MEMBERSHIP = 13
-++ IP_MULTICAST_VIF = 14
-++ IP_RSVP_ON = 15
-++ IP_RSVP_OFF = 16
-++ IP_RSVP_VIF_ON = 17
-++ IP_RSVP_VIF_OFF = 18
-++ IP_PORTRANGE = 19
-++ IP_RECVIF = 20
-++ IP_IPSEC_POLICY = 21
-++ IP_FAITH = 22
-++ IP_FW_ADD = 50
-++ IP_FW_DEL = 51
-++ IP_FW_FLUSH = 52
-++ IP_FW_ZERO = 53
-++ IP_FW_GET = 54
-++ IP_FW_RESETLOG = 55
-++ IP_DUMMYNET_CONFIGURE = 60
-++ IP_DUMMYNET_DEL = 61
-++ IP_DUMMYNET_FLUSH = 62
-++ IP_DUMMYNET_GET = 64
-++ IP_DEFAULT_MULTICAST_TTL = 1
-++ IP_DEFAULT_MULTICAST_LOOP = 1
-++ IP_MAX_MEMBERSHIPS = 20
-++ IP_PORTRANGE_DEFAULT = 0
-++ IP_PORTRANGE_HIGH = 1
-++ IP_PORTRANGE_LOW = 2
-++ IPPROTO_MAXID = (IPPROTO_AH + 1)
-++ IPCTL_FORWARDING = 1
-++ IPCTL_SENDREDIRECTS = 2
-++ IPCTL_DEFTTL = 3
-++ IPCTL_DEFMTU = 4
-++ IPCTL_RTEXPIRE = 5
-++ IPCTL_RTMINEXPIRE = 6
-++ IPCTL_RTMAXCACHE = 7
-++ IPCTL_SOURCEROUTE = 8
-++ IPCTL_DIRECTEDBROADCAST = 9
-++ IPCTL_INTRQMAXLEN = 10
-++ IPCTL_INTRQDROPS = 11
-++ IPCTL_STATS = 12
-++ IPCTL_ACCEPTSOURCEROUTE = 13
-++ IPCTL_FASTFORWARDING = 14
-++ IPCTL_KEEPFAITH = 15
-++ IPCTL_GIF_TTL = 16
-++ IPCTL_MAXID = 17
-++ 
-++ # Included from netinet6/in6.h
-++ 
-++ # Included from sys/queue.h
-++ def SLIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def SLIST_ENTRY(type): return \
-++ 
-++ def STAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def STAILQ_ENTRY(type): return \
-++ 
-++ def LIST_HEAD_INITIALIZER(head): return \
-++ 
-++ def LIST_ENTRY(type): return \
-++ 
-++ def TAILQ_HEAD_INITIALIZER(head): return \
-++ 
-++ def TAILQ_ENTRY(type): return \
-++ 
-++ def CIRCLEQ_ENTRY(type): return \
-++ 
-++ __KAME_VERSION = "20000701/FreeBSD-current"
-++ IPV6PORT_RESERVED = 1024
-++ IPV6PORT_ANONMIN = 49152
-++ IPV6PORT_ANONMAX = 65535
-++ IPV6PORT_RESERVEDMIN = 600
-++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-++ INET6_ADDRSTRLEN = 46
-++ IPV6_ADDR_INT32_ONE = 1
-++ IPV6_ADDR_INT32_TWO = 2
-++ IPV6_ADDR_INT32_MNL = 0xff010000
-++ IPV6_ADDR_INT32_MLL = 0xff020000
-++ IPV6_ADDR_INT32_SMP = 0x0000ffff
-++ IPV6_ADDR_INT16_ULL = 0xfe80
-++ IPV6_ADDR_INT16_USL = 0xfec0
-++ IPV6_ADDR_INT16_MLL = 0xff02
-++ IPV6_ADDR_INT32_ONE = 0x01000000
-++ IPV6_ADDR_INT32_TWO = 0x02000000
-++ IPV6_ADDR_INT32_MNL = 0x000001ff
-++ IPV6_ADDR_INT32_MLL = 0x000002ff
-++ IPV6_ADDR_INT32_SMP = 0xffff0000
-++ IPV6_ADDR_INT16_ULL = 0x80fe
-++ IPV6_ADDR_INT16_USL = 0xc0fe
-++ IPV6_ADDR_INT16_MLL = 0x02ff
-++ def IN6_IS_ADDR_UNSPECIFIED(a): return \
-++ 
-++ def IN6_IS_ADDR_LOOPBACK(a): return \
-++ 
-++ def IN6_IS_ADDR_V4COMPAT(a): return \
-++ 
-++ def IN6_IS_ADDR_V4MAPPED(a): return \
-++ 
-++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-++ def IN6_IS_ADDR_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-++ 
-++ def IN6_IS_ADDR_MC_GLOBAL(a): return \
-++ 
-++ def IN6_IS_SCOPE_LINKLOCAL(a): return \
-++ 
-++ IPV6_OPTIONS = 1
-++ IPV6_RECVOPTS = 5
-++ IPV6_RECVRETOPTS = 6
-++ IPV6_RECVDSTADDR = 7
-++ IPV6_RETOPTS = 8
-++ IPV6_SOCKOPT_RESERVED1 = 3
-++ IPV6_UNICAST_HOPS = 4
-++ IPV6_MULTICAST_IF = 9
-++ IPV6_MULTICAST_HOPS = 10
-++ IPV6_MULTICAST_LOOP = 11
-++ IPV6_JOIN_GROUP = 12
-++ IPV6_LEAVE_GROUP = 13
-++ IPV6_PORTRANGE = 14
-++ ICMP6_FILTER = 18
-++ IPV6_PKTINFO = 19
-++ IPV6_HOPLIMIT = 20
-++ IPV6_NEXTHOP = 21
-++ IPV6_HOPOPTS = 22
-++ IPV6_DSTOPTS = 23
-++ IPV6_RTHDR = 24
-++ IPV6_PKTOPTIONS = 25
-++ IPV6_CHECKSUM = 26
-++ IPV6_BINDV6ONLY = 27
-++ IPV6_IPSEC_POLICY = 28
-++ IPV6_FAITH = 29
-++ IPV6_FW_ADD = 30
-++ IPV6_FW_DEL = 31
-++ IPV6_FW_FLUSH = 32
-++ IPV6_FW_ZERO = 33
-++ IPV6_FW_GET = 34
-++ IPV6_RTHDR_LOOSE = 0
-++ IPV6_RTHDR_STRICT = 1
-++ IPV6_RTHDR_TYPE_0 = 0
-++ IPV6_DEFAULT_MULTICAST_HOPS = 1
-++ IPV6_DEFAULT_MULTICAST_LOOP = 1
-++ IPV6_PORTRANGE_DEFAULT = 0
-++ IPV6_PORTRANGE_HIGH = 1
-++ IPV6_PORTRANGE_LOW = 2
-++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-++ IPV6CTL_FORWARDING = 1
-++ IPV6CTL_SENDREDIRECTS = 2
-++ IPV6CTL_DEFHLIM = 3
-++ IPV6CTL_DEFMTU = 4
-++ IPV6CTL_FORWSRCRT = 5
-++ IPV6CTL_STATS = 6
-++ IPV6CTL_MRTSTATS = 7
-++ IPV6CTL_MRTPROTO = 8
-++ IPV6CTL_MAXFRAGPACKETS = 9
-++ IPV6CTL_SOURCECHECK = 10
-++ IPV6CTL_SOURCECHECK_LOGINT = 11
-++ IPV6CTL_ACCEPT_RTADV = 12
-++ IPV6CTL_KEEPFAITH = 13
-++ IPV6CTL_LOG_INTERVAL = 14
-++ IPV6CTL_HDRNESTLIMIT = 15
-++ IPV6CTL_DAD_COUNT = 16
-++ IPV6CTL_AUTO_FLOWLABEL = 17
-++ IPV6CTL_DEFMCASTHLIM = 18
-++ IPV6CTL_GIF_HLIM = 19
-++ IPV6CTL_KAME_VERSION = 20
-++ IPV6CTL_USE_DEPRECATED = 21
-++ IPV6CTL_RR_PRUNE = 22
-++ IPV6CTL_MAPPED_ADDR = 23
-++ IPV6CTL_BINDV6ONLY = 24
-++ IPV6CTL_RTEXPIRE = 25
-++ IPV6CTL_RTMINEXPIRE = 26
-++ IPV6CTL_RTMAXCACHE = 27
-++ IPV6CTL_MAXID = 28
-+*** misc/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:26:27 2005
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:19:02 2005
-+***************
-+*** 0 ****
-+--- 1,3 ----
-++ #! /bin/sh
-++ set -v
-++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i73157 b/editors/openoffice.org-vcltesttool/files/patch-i73157
deleted file mode 100644
index 17d987622060..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i73157
+++ /dev/null
@@ -1,30 +0,0 @@
---- epm/epm-3.7.patch.orig	Tue Aug  1 22:20:23 2006
-+++ epm/epm-3.7.patch	Sat Dec 23 07:00:30 2006
-@@ -68,7 +68,11 @@
-         fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-       }
- ***************
--*** 330,337 ****
-+*** 326,337 ****
-+    if (Verbosity)
-+      puts("Building FreeBSD pkg binary distribution...");
-+  
-+!   if (run_command(NULL, "pkg_create -p / -s %s -c %s -d %s -f %s %s",
-                     current, commentname, descrname, plistname, name))
-       return (1);
-   
-@@ -77,7 +81,11 @@
-   
-    /*
-     * Remove temporary files...
----- 348,356 ----
-+--- 344,356 ----
-+    if (Verbosity)
-+      puts("Building FreeBSD pkg binary distribution...");
-+  
-+!   if (run_command(NULL, "/usr/sbin/pkg_create -p / -s %s -c %s -d %s -f %s %s",
-                     current, commentname, descrname, plistname, name))
-       return (1);
-   
-
-
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i73217 b/editors/openoffice.org-vcltesttool/files/patch-i73217
index 3dc7b4e28912..712631a136f1 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-i73217
+++ b/editors/openoffice.org-vcltesttool/files/patch-i73217
@@ -1,3 +1,5 @@
+It won't fix in the master as it breaks the POSIX.
+
 Index: epm/epm-3.7.patch
 ===================================================================
 RCS file: /cvs/external/epm/epm-3.7.patch,v
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i76115 b/editors/openoffice.org-vcltesttool/files/patch-i76115
deleted file mode 100644
index f090b4337b09..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i76115
+++ /dev/null
@@ -1,102 +0,0 @@
-Sync amd64 bridge with sixtyfour10 CWS.
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx.orig	Sat Sep 16 11:47:13 2006
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Tue Apr  3 20:36:13 2007
-@@ -49,6 +49,7 @@
- #include "bridges/cpp_uno/shared/unointerfaceproxy.hxx"
- #include "bridges/cpp_uno/shared/vtables.hxx"
- 
-+#include "abi.hxx"
- #include "share.hxx"
- 
- using namespace ::rtl;
-@@ -122,7 +123,7 @@
-                 // value verbatim, as a double without conversion.
- 				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
- 			else
--				*pDS++ = *reinterpret_cast<double *>( pSV++ );
-+				*pDS++ = *pSV++;
- 			break;
- 
- 		case 'H': // 64-bit Word
-@@ -165,7 +166,7 @@
- 
- //==================================================================================================
- static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
--							  void * pRegisterReturn, typelib_TypeClass eReturnType,
-+							  void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
- 							  char * pPT, sal_uInt64 * pStackLongs, sal_uInt32 nStackLongs)
- {
- 	sal_uInt32 nr_gpr, nr_fpr, nr_stack;
-@@ -175,8 +176,6 @@
- 	if (nr_stack)
- 		nr_stack = (nr_stack + 1) & ~1;
- 	
--	bool bReturnsSimpleType = bridges::cpp_uno::shared::isSimpleType( eReturnType );
--
- #if OSL_DEBUG_LEVEL > 1
- 	// Let's figure out what is really going on here
- 	fprintf(stderr,"callVirtualMethod() parameters string is %s\n", pPT);
-@@ -244,7 +243,7 @@
- #undef ARG_GPR
-     }
- 
--	if ( bReturnsSimpleType )
-+	if ( bSimpleReturn )
- 		a0 = (sal_uInt64) pThis;
- 	else
- 		a1 = (sal_uInt64) pThis;
-@@ -275,7 +274,7 @@
- 	// Perform the call
- 	ReturnValue aRet = ( ( FunctionCall ) pMethod )( a0, a1, a2, a3, a4, a5 );
- 
--	switch (eReturnType)
-+	switch (pReturnTypeDescr->eTypeClass)
- 	{
- 	case typelib_TypeClass_HYPER:
- 	case typelib_TypeClass_UNSIGNED_HYPER:
-@@ -301,6 +300,15 @@
- 	case typelib_TypeClass_DOUBLE:
- 		*reinterpret_cast<double *>( pRegisterReturn ) = *reinterpret_cast<double*>( &aRet.f.xmm0 );
- 		break;
-+    default: {
-+        sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
-+        if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0) {
-+            if (nRetSize > 8)
-+                static_cast<sal_uInt64 *>(pRegisterReturn)[1] = aRet.i.rdx;
-+            static_cast<sal_uInt64 *>(pRegisterReturn)[0] = aRet.i.rax;
-+        }
-+        break;
-+    }
- 	}
- }
- 
-@@ -327,13 +335,15 @@
- 	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
- 	
- 	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
--	
-+
-+	bool bSimpleReturn = true;	
- 	if (pReturnTypeDescr)
- 	{
--		if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
--		{
-+		if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
-+			bSimpleReturn = false;
-+
-+		if (bSimpleReturn)
- 			pCppReturn = pUnoReturn; // direct way for simple types
--		}
- 		else
- 		{
- 			// complex return via ptr
-@@ -458,7 +468,7 @@
- 		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 7), "UNALIGNED STACK !!! (Please DO panic)" );
- 		callVirtualMethod(
- 			pAdjustedThisPtr, aVtableSlot.index,
--			pCppReturn, pReturnTypeDescr->eTypeClass, pParamType,
-+			pCppReturn, pReturnTypeDescr, bSimpleReturn, pParamType,
- 			(sal_uInt64 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_uInt64) );
- 		// NO exception occured...
- 		*ppUnoExc = 0;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i76141 b/editors/openoffice.org-vcltesttool/files/patch-i76141
deleted file mode 100644
index c1d964b3b5c2..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i76141
+++ /dev/null
@@ -1,839 +0,0 @@
---- berkeleydb/db-4.2.52.patch	26 Mar 2007 12:24:38 -0000	1.19
-+++ berkeleydb/db-4.2.52.patch	3 Jul 2007 01:03:31 -0000
-@@ -222,7 +222,7 @@
- ! 
- ! .INCLUDE :  target.mk
- *** misc/db-4.2.52.NC/dist/configure	2003-12-03 22:10:02.000000000 +0100
----- misc/build/db-4.2.52.NC/dist/configure	2007-02-19 16:12:12.000000000 +0100
-+--- misc/build/db-4.2.52.NC/dist/configure	2007-07-02 21:00:00.000000000 -0400
- ***************
- *** 3518,3525 ****
-   # Set CFLAGS/CXXFLAGS.  We MUST set the flags before we call autoconf
-@@ -262,6 +262,23 @@
-   	test "$with_gnu_ld" != no && break
-   	;;
- ***************
-+*** 9328,9334 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 9330,9336 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 10398,10404 ****
-       #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-       #	       `"' quotes if we put them in here... so don't!
-@@ -327,6 +344,57 @@
-   	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-   	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-   	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+***************
-+*** 12872,12878 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 12885,12891 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 15849,15855 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 15862,15868 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 18114,18120 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 18127,18133 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/db-4.2.52.NC/dist/ltmain.sh	2003-04-26 19:45:37.000000000 +0200
- --- misc/build/db-4.2.52.NC/dist/ltmain.sh	2007-02-19 16:12:12.000000000 +0100
- ***************
---- curl/curl-7.12.2.patch	25 Sep 2006 13:33:49 -0000	1.9
-+++ curl/curl-7.12.2.patch	5 Apr 2007 00:01:20 -0000
-@@ -1,3 +1,73 @@
-+*** misc/curl-7.12.2/configure	Sun Oct 17 18:22:10 2004
-+--- misc/build/curl-7.12.2/configure	Wed Apr  4 19:56:30 2007
-+***************
-+*** 9456,9462 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 9456,9462 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 13154,13160 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 13154,13160 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 16303,16309 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 16303,16309 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 18650,18656 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 18650,18656 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 13:12:17 2004
- --- misc/build/curl-7.12.2/ltmain.sh	Thu Jun 22 13:07:14 2006
- ***************
---- freetype/freetype-2.2.1.patch	3 Aug 2006 14:58:26 -0000	1.2
-+++ freetype/freetype-2.2.1.patch	5 Apr 2007 00:07:40 -0000
-@@ -1,5 +1,75 @@
--*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h	Mon Jan 30 17:49:42 2006
----- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h	Thu Jul 13 16:04:27 2006
-+*** misc/freetype-2.2.1/builds/unix/configure	Fri May 12 11:12:27 2006
-+--- misc/build/freetype-2.2.1/builds/unix/configure	Wed Apr  4 20:05:15 2007
-+***************
-+*** 10644,10650 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 10644,10650 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 14420,14426 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14420,14426 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17684,17690 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17684,17690 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 20153,20159 ****
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 20153,20159 ----
-+  freebsd* | dragonfly*)
-+    # DragonFly does not have aout.  When/if they implement a new
-+    # versioning mechanism, adjust this.
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h	Mon Jan 30 11:49:42 2006
-+--- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h	Wed Apr  4 20:04:02 2007
- ***************
- *** 17,24 ****
- --- 17,26 ----
---- libwpd/libwpd-0.8.8.diff	19 Jan 2007 15:57:46 -0000	1.1.4.1
-+++ libwpd/libwpd-0.8.8.diff	5 Apr 2007 00:13:31 -0000
-@@ -1,3 +1,73 @@
-+*** misc/libwpd-0.8.8/configure	Tue Jan  9 05:35:10 2007
-+--- misc/build/libwpd-0.8.8/configure	Wed Apr  4 20:10:49 2007
-+***************
-+*** 8089,8095 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 8089,8095 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 11808,11814 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11808,11814 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 14978,14984 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14978,14984 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17346,17352 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17346,17352 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/libwpd-0.8.8/src/lib/WP1Part.cpp	2007-01-03 14:07:55.000000000 +0100
- --- misc/build/libwpd-0.8.8/src/lib/WP1Part.cpp	2007-01-13 00:18:52.000000000 +0100
- ***************
-
---- libxml2/libxml2-2.6.17.patch	26 Mar 2007 12:25:19 -0000	1.5
-+++ libxml2/libxml2-2.6.17.patch	3 May 2007 17:31:33 -0000
-@@ -34,6 +34,74 @@
-   fi
-   echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
- ***************
-+*** 8547,8553 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 8547,8553 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 12266,12272 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 12266,12272 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 15436,15442 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 15436,15442 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17804,17810 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17804,17810 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 26339,26347 ****
-   
-   echo "$as_me:$LINENO: checking for setsockopt" >&5
---- libxmlsec/xmlsec1-1.2.6.patch	27 Mar 2007 09:36:38 -0000	1.19
-+++ libxmlsec/xmlsec1-1.2.6.patch	3 May 2007 18:12:52 -0000
-@@ -158,6 +158,23 @@
-   	# is EXPORTS), use it as is; otherwise, prepend...
-   	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 7778,7784 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 7779,7785 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 9046,9052 ****
-         ;;
-       esac
-@@ -215,6 +232,23 @@
-         # built for inclusion in a dll (and should export symbols for example).
-         lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
- ***************
-+*** 11497,11503 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11498,11504 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 13259,13269 ****
-         lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-         ;;
-@@ -257,6 +291,23 @@
-   	# is EXPORTS), use it as is; otherwise, prepend...
-   	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 14667,14673 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14668,14674 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 15607,15617 ****
-         lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-         ;;
-@@ -316,6 +367,23 @@
-   	# is EXPORTS), use it as is; otherwise, prepend...
-   	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 17035,17041 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17036,17042 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 24598,24604 ****
-   fi
-   
---- moz/mozilla-source-1.7.5.patch.orig	Fri Apr 27 15:23:29 2007
-+++ moz/mozilla-source-1.7.5.patch	Fri Apr 27 15:32:07 2007
-@@ -266,6 +266,23 @@
- *** misc/mozilla/configure	Tue Oct 12 00:13:29 2004
- --- misc/build/mozilla/configure	Thu Mar 29 14:27:08 2007
- ***************
-+*** 5228,5234 ****
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+--- 5228,5234 ----
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+***************
- *** 5895,5901 ****
-          MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
-          MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
-@@ -311,6 +328,23 @@
- *** misc/mozilla/configure.in	Tue Oct 12 00:13:29 2004
- --- misc/build/mozilla/configure.in	Thu Mar 29 14:27:08 2007
- ***************
-+*** 1006,1012 ****
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+--- 1006,1012 ----
-+      ;;
-+  
-+  *-freebsd*)
-+!     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
-+  	DLL_SUFFIX=".so.1.0"
-+  	DSO_LDOPTS="-shared"
-+      fi
-+***************
- *** 1536,1542 ****
-          MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
-          MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
-@@ -449,6 +483,25 @@
-   ASM_SUFFIX	= @ASM_SUFFIX@
-   PROG_SUFFIX	= @PROG_SUFFIX@
-   MOD_NAME	= @NSPR_MODNAME@
-+*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk	Tue Mar 26 16:51:46 2002
-+--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk	Wed Apr  4 20:56:05 2007
-+***************
-+*** 66,72 ****
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+--- 66,72 ----
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
- *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper	Wed Apr  2 19:22:39 2003
- --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper	Thu Mar 29 14:27:08 2007
- ***************
-@@ -524,6 +577,23 @@
-   MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-   PR_MD_ASFILES=
- ***************
-+*** 3465,3471 ****
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 3465,3471 ----
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+***************
- *** 3832,3837 ****
- --- 3833,3839 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -604,6 +674,23 @@
-   MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-   PR_MD_ASFILES=
- ***************
-+*** 896,902 ****
-+      AC_DEFINE(FREEBSD)
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 896,902 ----
-+      AC_DEFINE(FREEBSD)
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+***************
- *** 1144,1149 ****
- --- 1145,1151 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -7562,6 +7649,44 @@
-   
-       switch (name) {
-       case MAX_CONNECTIONS:
-+*** misc/mozilla/nsprpub/configure	Tue Sep 14 17:14:38 2004
-+--- misc/build/mozilla/nsprpub/configure	Wed Apr  4 20:56:33 2007
-+***************
-+*** 3407,3413 ****
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 3407,3413 ----
-+  EOF
-+  
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+*** misc/mozilla/nsprpub/configure.in	Tue Sep 14 17:14:38 2004
-+--- misc/build/mozilla/nsprpub/configure.in	Wed Apr  4 20:56:40 2007
-+***************
-+*** 922,928 ****
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      AC_DEFINE(HAVE_SOCKLEN_T)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
-+--- 922,928 ----
-+      AC_DEFINE(HAVE_BSD_FLOCK)
-+      AC_DEFINE(HAVE_SOCKLEN_T)
-+      CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+!     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+      if test "$MOZ_OBJFORMAT" = "elf"; then
-+          DLL_SUFFIX=so
-+      else
- *** misc/mozilla/nsprpub/build/cygwin-wrapper	Wed Apr  2 19:22:38 2003
- --- misc/build/mozilla/nsprpub/build/cygwin-wrapper	Thu Mar 29 14:27:08 2007
- ***************
-@@ -8090,6 +8215,25 @@
- + ifdef NS_USE_GCC
- + NSPR31_LIB_PREFIX = lib
- + endif
-+*** misc/mozilla/security/coreconf/FreeBSD.mk	Wed Mar 26 20:17:25 2003
-+--- misc/build/mozilla/security/coreconf/FreeBSD.mk	Wed Apr  4 20:56:48 2007
-+***************
-+*** 63,69 ****
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
-+--- 63,69 ----
-+  
-+  ARCH			= freebsd
-+  
-+! MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+  
-+  ifeq ($(MOZ_OBJFORMAT),elf)
-+  DLL_SUFFIX		= so
- *** misc/mozilla/security/coreconf/command.mk	Fri Feb 15 17:53:12 2002
- --- misc/build/mozilla/security/coreconf/command.mk	Thu Mar 29 14:27:09 2007
- ***************
---- sndfile/libsndfile-1.0.9.patch	3 Feb 2006 17:31:46 -0000	1.3
-+++ sndfile/libsndfile-1.0.9.patch	5 Apr 2007 00:31:26 -0000
-@@ -83,6 +83,23 @@
-     shlibpath_var=DYLD_LIBRARY_PATH
-     shrext='$(test .$module = .yes && echo .so || echo .dylib)'
- ***************
-+*** 7871,7877 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 7878,7884 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 9111,9120 ****
-         ;;
-       esac
-@@ -143,6 +160,23 @@
-       module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct_CXX=no
- ***************
-+*** 11560,11566 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11567,11573 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 14069,14084 ****
-       	  lt_int_apple_cc_single_mod=yes
-       	fi
-@@ -178,6 +212,23 @@
-             module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         hardcode_direct_F77=no
- ***************
-+*** 14700,14706 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14707,14713 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 16414,16429 ****
-       	  lt_int_apple_cc_single_mod=yes
-       	fi
-@@ -212,6 +263,23 @@
-           fi
-             module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         hardcode_direct_GCJ=no
-+***************
-+*** 17045,17051 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17052,17058 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- *** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 05:02:07 2004
- --- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Jan 23 20:13:31 2006
- ***************
---- vigra/vigra1.4.0.patch	12 Oct 2006 10:35:19 -0000	1.3
-+++ vigra/vigra1.4.0.patch	5 Apr 2007 00:40:20 -0000
-@@ -1,3 +1,42 @@
-+diff -uprN misc/vigra1.4.0/configure misc/build/vigra1.4.0/configure
-+--- misc/vigra1.4.0/configure	Tue Dec 20 23:53:28 2005
-++++ misc/build/vigra1.4.0/configure	Wed Apr  4 20:35:48 2007
-+@@ -7259,7 +7259,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
-+@@ -10961,7 +10961,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
-+@@ -14110,7 +14110,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
-+@@ -16461,7 +16461,7 @@ kfreebsd*-gnu)
-+   ;;
-+ 
-+ freebsd*)
-+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+   version_type=freebsd-$objformat
-+   case $version_type in
-+     freebsd-elf*)
- diff -uprN misc/vigra1.4.0/include/vigra/array_vector.hxx misc/build/vigra1.4.0/include/vigra/array_vector.hxx
- --- misc/vigra1.4.0/include/vigra/array_vector.hxx	2005-12-21 05:53:30.000000000 +0100
- +++ misc/build/vigra1.4.0/include/vigra/array_vector.hxx	2006-08-31 12:08:15.172679000 +0200
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i76968 b/editors/openoffice.org-vcltesttool/files/patch-i76968
deleted file mode 100644
index 8bf3e43d703d..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i76968
+++ /dev/null
@@ -1,642 +0,0 @@
-Sync FreeBSD-specific files with CWS sixtyfour11.
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk	Thu Jan 25 08:27:35 2007
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk	Wed Apr 25 10:57:20 2007
-@@ -52,11 +52,6 @@
- CFLAGS += -DLEAK_STATIC_DATA
- .ENDIF
- 
--NOOPTFILES= \
--	$(SLO)$/uno2cpp.obj
--
--
--CFLAGSNOOPT=-O0
- 
- SLOFILES= \
- 	$(SLO)$/abi.obj			\
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Thu May  3 21:45:19 2007
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Wed Apr 25 10:57:33 2007
-@@ -38,6 +38,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <rtl/alloc.h>
- 
- #include <com/sun/star/uno/genfunc.hxx>
-@@ -55,265 +56,188 @@
- using namespace ::rtl;
- using namespace ::com::sun::star::uno;
- 
--void dummy_can_throw_anything( char const * );
--
--// 6 integral parameters are passed in registers
--const sal_uInt32 GPR_COUNT = 6;
--
--// 8 floating point parameters are passed in SSE registers
--const sal_uInt32 FPR_COUNT = 8;
--
--static inline void
--invoke_count_words(char *		pPT,      // Parameter Types
--				   sal_uInt32 &	nr_gpr,   // Number of arguments in GPRs
--				   sal_uInt32 &	nr_fpr,   // Number of arguments in FPRs
--				   sal_uInt32 &	nr_stack) // Number of arguments in stack
--{
--	nr_gpr = 0;
--	nr_fpr = 0;
--	nr_stack = 0;
--	char c;
--	
--	while ((c = *pPT++) != 'X')
--	{
--		if (c == 'F' || c == 'D')
--		{
--            if (nr_fpr < FPR_COUNT)
--                nr_fpr++;
--            else
--                nr_stack++;
--		}
--		else
--		{
--            if (nr_gpr < GPR_COUNT)
--                nr_gpr++;
--            else
--                nr_stack++;
--		}
--	}
--}
--
--static void
--invoke_copy_to_stack(sal_uInt64 * pDS,  // Stack Storage
--					 char *       pPT,  // Parameter Types
--					 sal_uInt64 * pSV,  // Source Values
--					 sal_uInt64 * pGPR, // General Purpose Registers
--					 double *     pFPR) // Floating-Point Registers
--{
--	sal_uInt32 nr_gpr = 0;
--	sal_uInt32 nr_fpr = 0;
--	sal_uInt64 value;
--	char c;
--	
--	while ((c = *pPT++) != 'X')
--	{
--		switch (c)
--		{
--		case 'D': // Double
--			if (nr_fpr < FPR_COUNT)
--				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
--			else
--				*pDS++ = *pSV++;
--			break;
--
--		case 'F': // Float
--			if (nr_fpr < FPR_COUNT)
--                // The value in %xmm register is already prepared to
--                // be retrieved as a float. Therefore, we pass the
--                // value verbatim, as a double without conversion.
--				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
--			else
--				*pDS++ = *pSV++;
--			break;
--
--		case 'H': // 64-bit Word
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *pSV++;
--			else
--				*pDS++ = *pSV++;
--			break;
--
--		case 'I': // 32-bit Word
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt32 *>( pSV++ );
--			else
--				*pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV++ );
--			break;
--
--		case 'S': // 16-bit Word
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt16 *>( pSV++ );
--			else
--				*pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV++ );
--			break;
--
--		case 'B': // Byte
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt8 *>( pSV++ );
--			else
--				*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV++ );
--			break;
--
--		default: // Default, assume 64-bit values
--			if (nr_gpr < GPR_COUNT)
--				pGPR[nr_gpr++] = *pSV++;
--			else
--				*pDS++ = *pSV++;
--			break;
--		}
--	}
--}
--
- //==================================================================================================
- static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
--							  void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
--							  char * pPT, sal_uInt64 * pStackLongs, sal_uInt32 nStackLongs)
--{
--	sal_uInt32 nr_gpr, nr_fpr, nr_stack;
--	invoke_count_words(pPT, nr_gpr, nr_fpr, nr_stack);
-+                              void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
-+                              sal_uInt64 *pStack, sal_uInt32 nStack,
-+                              sal_uInt64 *pGPR, sal_uInt32 nGPR,
-+                              double *pFPR, sal_uInt32 nFPR) __attribute__((noinline));
- 
--	// Stack, if used, must be 16-bytes aligned
--	if (nr_stack)
--		nr_stack = (nr_stack + 1) & ~1;
--	
-+static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
-+                              void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
-+                              sal_uInt64 *pStack, sal_uInt32 nStack,
-+                              sal_uInt64 *pGPR, sal_uInt32 nGPR,
-+                              double *pFPR, sal_uInt32 nFPR)
-+{
- #if OSL_DEBUG_LEVEL > 1
--	// Let's figure out what is really going on here
--	fprintf(stderr,"callVirtualMethod() parameters string is %s\n", pPT);
--	{
--		sal_uInt32  k = nStackLongs;
--		sal_uInt64 *q = pStackLongs;
--		while (k > 0)
--		{
--			fprintf(stderr, "uno stack is: %lx\n", *q);
--			k--;
--			q++;
--		}
--	}
--#endif
--
--	// Load parameters to stack, if necessary
--    sal_uInt64 *stack = (sal_uInt64 *) __builtin_alloca(nr_stack * 8);
--    sal_uInt64 gpregs[GPR_COUNT];
--    double fpregs[FPR_COUNT];
--    invoke_copy_to_stack(stack, pPT, pStackLongs, gpregs, fpregs);
--
--    // Load FPR registers from fpregs[]
--    register double d0 asm("xmm0");
--    register double d1 asm("xmm1");
--    register double d2 asm("xmm2");
--    register double d3 asm("xmm3");
--    register double d4 asm("xmm4");
--    register double d5 asm("xmm5");
--    register double d6 asm("xmm6");
--    register double d7 asm("xmm7");
--
--    switch (nr_fpr) {
--#define ARG_FPR(N) \
--    case N+1: d##N = fpregs[N];
--        ARG_FPR(7);
--        ARG_FPR(6);
--        ARG_FPR(5);
--        ARG_FPR(4);
--        ARG_FPR(3);
--        ARG_FPR(2);
--        ARG_FPR(1);
--        ARG_FPR(0);
--    case 0:;
--#undef ARG_FPR
--    }
--    
--    // Load GPR registers from gpregs[]
--    register sal_uInt64 a0 asm("rdi");
--    register sal_uInt64 a1 asm("rsi");
--    register sal_uInt64 a2 asm("rdx");
--    register sal_uInt64 a3 asm("rcx");
--    register sal_uInt64 a4 asm("r8");
--    register sal_uInt64 a5 asm("r9");
--    
--    switch (nr_gpr) {
--#define ARG_GPR(N) \
--    case N+1: a##N = gpregs[N];
--        ARG_GPR(5);
--        ARG_GPR(4);
--        ARG_GPR(3);
--        ARG_GPR(2);
--        ARG_GPR(1);
--        ARG_GPR(0);
--    case 0:;
--#undef ARG_GPR
-+    // Let's figure out what is really going on here
-+    {
-+        fprintf( stderr, "= callVirtualMethod() =\nGPR's (%d): ", nGPR );
-+        for ( int i = 0; i < nGPR; ++i )
-+            fprintf( stderr, "0x%lx, ", pGPR[i] );
-+        fprintf( stderr, "\nFPR's (%d): ", nFPR );
-+        for ( int i = 0; i < nFPR; ++i )
-+            fprintf( stderr, "%f, ", pFPR[i] );
-+        fprintf( stderr, "\nStack (%d): ", nStack );
-+        for ( int i = 0; i < nStack; ++i )
-+            fprintf( stderr, "0x%lx, ", pStack[i] );
-+        fprintf( stderr, "\n" );
-     }
-+#endif
- 
--	if ( bSimpleReturn )
--		a0 = (sal_uInt64) pThis;
--	else
--		a1 = (sal_uInt64) pThis;
--
--    // Ensure that assignments to SSE registers won't be optimized away
--    asm("" ::
--        "x" (d0), "x" (d1), "x" (d2), "x" (d3),
--        "x" (d4), "x" (d5), "x" (d6), "x" (d7));
-+    // The call instruction within the asm section of callVirtualMethod may throw
-+    // exceptions.  So that the compiler handles this correctly, it is important
-+    // that (a) callVirtualMethod might call dummy_can_throw_anything (although this
-+    // never happens at runtime), which in turn can throw exceptions, and (b)
-+    // callVirtualMethod is not inlined at its call site (so that any exceptions are
-+    // caught which are thrown from the instruction calling callVirtualMethod):
-+    if ( !pThis )
-+        CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything( "xxx" ); // address something
-+
-+    // Should not happen, but...
-+    if ( nFPR > x86_64::MAX_SSE_REGS )
-+        nFPR = x86_64::MAX_SSE_REGS;
-+    if ( nGPR > x86_64::MAX_GPR_REGS )
-+        nGPR = x86_64::MAX_GPR_REGS;
- 
-     // Get pointer to method
-     sal_uInt64 pMethod = *((sal_uInt64 *)pThis);
-     pMethod += 8 * nVtableIndex;
-     pMethod = *((sal_uInt64 *)pMethod);
- 
--	union ReturnValue {
--		struct {
--			sal_uInt64 rax;
--			sal_uInt64 rdx;
--		} i;
--		struct {
--			double xmm0;
--			double xmm1;
--		} f;
--	};
-+    // Load parameters to stack, if necessary
-+    if ( nStack )
-+    {
-+        // 16-bytes aligned
-+        sal_uInt32 nStackBytes = ( ( nStack + 1 ) >> 1 ) * 16;
-+        sal_uInt64 *pCallStack = (sal_uInt64 *) __builtin_alloca( nStackBytes );
-+        memcpy( pCallStack, pStack, nStackBytes );
-+    }
- 
--	typedef ReturnValue (* FunctionCall )( sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64 );
-+    // Return values
-+    sal_uInt64 rax;
-+    sal_uInt64 rdx;
-+    double xmm0;
- 
--	// Perform the call
--	ReturnValue aRet = ( ( FunctionCall ) pMethod )( a0, a1, a2, a3, a4, a5 );
-+    asm volatile (
-+        
-+        // Fill the xmm registers
-+        "movq %2, %%rax\n\t"
- 
--	switch (pReturnTypeDescr->eTypeClass)
--	{
--	case typelib_TypeClass_HYPER:
--	case typelib_TypeClass_UNSIGNED_HYPER:
--		*reinterpret_cast<sal_uInt64 *>( pRegisterReturn ) = aRet.i.rax;
--		break;
--	case typelib_TypeClass_LONG:
--	case typelib_TypeClass_UNSIGNED_LONG:
--	case typelib_TypeClass_ENUM:
--		*reinterpret_cast<sal_uInt32 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt32*>( &aRet.i.rax );
--		break;
--	case typelib_TypeClass_CHAR:
--	case typelib_TypeClass_SHORT:
--	case typelib_TypeClass_UNSIGNED_SHORT:
--		*reinterpret_cast<sal_uInt16 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt16*>( &aRet.i.rax );
--		break;
--	case typelib_TypeClass_BOOLEAN:
--	case typelib_TypeClass_BYTE:
--		*reinterpret_cast<sal_uInt8 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt8*>( &aRet.i.rax );
--		break;
--	case typelib_TypeClass_FLOAT:
--		*reinterpret_cast<float *>( pRegisterReturn ) = *reinterpret_cast<float*>( &aRet.f.xmm0 );
--		break;
--	case typelib_TypeClass_DOUBLE:
--		*reinterpret_cast<double *>( pRegisterReturn ) = *reinterpret_cast<double*>( &aRet.f.xmm0 );
--		break;
--    default: {
--        sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
--        if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0) {
--            if (nRetSize > 8)
--                static_cast<sal_uInt64 *>(pRegisterReturn)[1] = aRet.i.rdx;
--            static_cast<sal_uInt64 *>(pRegisterReturn)[0] = aRet.i.rax;
--        }
-+        "movsd   (%%rax), %%xmm0\n\t"
-+        "movsd  8(%%rax), %%xmm1\n\t"
-+        "movsd 16(%%rax), %%xmm2\n\t"
-+        "movsd 24(%%rax), %%xmm3\n\t"
-+        "movsd 32(%%rax), %%xmm4\n\t"
-+        "movsd 40(%%rax), %%xmm5\n\t"
-+        "movsd 48(%%rax), %%xmm6\n\t"
-+        "movsd 56(%%rax), %%xmm7\n\t"
-+
-+        // Fill the general purpose registers
-+        "movq %1, %%rax\n\t"
-+
-+        "movq    (%%rax), %%rdi\n\t"
-+        "movq   8(%%rax), %%rsi\n\t"
-+        "movq  16(%%rax), %%rdx\n\t"
-+        "movq  24(%%rax), %%rcx\n\t"
-+        "movq  32(%%rax), %%r8\n\t"
-+        "movq  40(%%rax), %%r9\n\t"
-+
-+        // Perform the call
-+        "movq %0, %%r11\n\t"
-+        "movq %3, %%rax\n\t"
-+        "call *%%r11\n\t"
-+
-+        // Fill the return values
-+        "movq   %%rax, %4\n\t"
-+        "movq   %%rdx, %5\n\t"
-+        "movsd %%xmm0, %6\n\t"
-+        :
-+        : "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR ),
-+          "m" ( rax ), "m" ( rdx ), "m" ( xmm0 )
-+        : "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r11"
-+    );
-+
-+    switch (pReturnTypeDescr->eTypeClass)
-+    {
-+    case typelib_TypeClass_HYPER:
-+    case typelib_TypeClass_UNSIGNED_HYPER:
-+        *reinterpret_cast<sal_uInt64 *>( pRegisterReturn ) = rax;
-         break;
-+    case typelib_TypeClass_LONG:
-+    case typelib_TypeClass_UNSIGNED_LONG:
-+    case typelib_TypeClass_ENUM:
-+        *reinterpret_cast<sal_uInt32 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt32*>( &rax );
-+        break;
-+    case typelib_TypeClass_CHAR:
-+    case typelib_TypeClass_SHORT:
-+    case typelib_TypeClass_UNSIGNED_SHORT:
-+        *reinterpret_cast<sal_uInt16 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt16*>( &rax );
-+        break;
-+    case typelib_TypeClass_BOOLEAN:
-+    case typelib_TypeClass_BYTE:
-+        *reinterpret_cast<sal_uInt8 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt8*>( &rax );
-+        break;
-+    case typelib_TypeClass_FLOAT:
-+    case typelib_TypeClass_DOUBLE:
-+        *reinterpret_cast<double *>( pRegisterReturn ) = xmm0;
-+        break;
-+    default:
-+        {
-+            sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
-+            if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0)
-+            {
-+                if (nRetSize > 8)
-+                    static_cast<sal_uInt64 *>(pRegisterReturn)[1] = rdx;
-+                static_cast<sal_uInt64 *>(pRegisterReturn)[0] = rax;
-+            }
-+            break;
-+        }
-     }
--	}
- }
- 
-+//================================================================================================== 
-+
-+// Macros for easier insertion of values to registers or stack
-+// pSV - pointer to the source
-+// nr - order of the value [will be increased if stored to register]
-+// pFPR, pGPR - pointer to the registers
-+// pDS - pointer to the stack [will be increased if stored here]
-+
-+// The value in %xmm register is already prepared to be retrieved as a float,
-+// thus we treat float and double the same
-+#define INSERT_FLOAT_DOUBLE( pSV, nr, pFPR, pDS ) \
-+	if ( nr < x86_64::MAX_SSE_REGS ) \
-+		pFPR[nr++] = *reinterpret_cast<double *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV ); // verbatim!
-+
-+#define INSERT_INT64( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt64 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV );
-+
-+#define INSERT_INT32( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt32 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV );
-+
-+#define INSERT_INT16( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt16 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV );
-+
-+#define INSERT_INT8( pSV, nr, pGPR, pDS ) \
-+	if ( nr < x86_64::MAX_GPR_REGS ) \
-+		pGPR[nr++] = *reinterpret_cast<sal_uInt8 *>( pSV ); \
-+	else \
-+		*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
- 
- //================================================================================================== 
-+
- static void cpp_call(
- 	bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
- 	bridges::cpp_uno::shared::VtableSlot aVtableSlot,
-@@ -322,54 +246,52 @@
- 	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
- {
- 	// Maxium space for [complex ret ptr], values | ptr ...
--  	char * pCppStack		= (char *)__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) );
--  	char * pCppStackStart	= pCppStack;
-+	// (but will be used less - some of the values will be in pGPR and pFPR)
-+  	sal_uInt64 *pStack = (sal_uInt64 *)__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) );
-+  	sal_uInt64 *pStackStart = pStack;
- 
--	// We need to know parameter types for callVirtualMethod() so generate a signature string
--	char * pParamType		= (char *)__builtin_alloca( nParams + 3 );
--	char * pPT				= pParamType;
-+	sal_uInt64 pGPR[x86_64::MAX_GPR_REGS];
-+	sal_uInt32 nGPR = 0;
-+
-+	double pFPR[x86_64::MAX_SSE_REGS];
-+	sal_uInt32 nFPR = 0;
- 
- 	// Return
- 	typelib_TypeDescription * pReturnTypeDescr = 0;
- 	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
- 	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
- 	
--	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion (see below)
- 
- 	bool bSimpleReturn = true;	
--	if (pReturnTypeDescr)
-+	if ( pReturnTypeDescr )
- 	{
- 		if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
- 			bSimpleReturn = false;
- 
--		if (bSimpleReturn)
-+		if ( bSimpleReturn )
- 			pCppReturn = pUnoReturn; // direct way for simple types
- 		else
- 		{
- 			// complex return via ptr
--			pCppReturn = *(void **)pCppStack = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
--												? __builtin_alloca( pReturnTypeDescr->nSize )
--												: pUnoReturn); // direct way
--			*pPT++ = 'H';
--			pCppStack += sizeof(void *);
-+			pCppReturn = bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )?
-+						 __builtin_alloca( pReturnTypeDescr->nSize ) : pUnoReturn;
-+			INSERT_INT64( &pCppReturn, nGPR, pGPR, pStack );
- 		}
- 	}
- 
- 	// Push "this" pointer
- 	void * pAdjustedThisPtr = reinterpret_cast< void ** >( pThis->getCppI() ) + aVtableSlot.offset;
--	*(void **)pCppStack = pAdjustedThisPtr;
--	*pPT++ = 'H';
--	pCppStack += sizeof(void *);
-+	INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack );
- 
--	// stack space
- 	// Args
--	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams );
- 	// Indizes of values this have to be converted (interface conversion cpp<=>uno)
- 	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
- 	// Type descriptions for reconversions
- 	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
- 	
--	sal_Int32 nTempIndizes   = 0;
-+	sal_Int32 nTempIndizes = 0;
- 	
- 	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
- 	{
-@@ -379,45 +301,32 @@
- 		
- 		if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
- 		{
--			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+			uno_copyAndConvertData( pCppArgs[nPos] = alloca( 8 ), pUnoArgs[nPos], pParamTypeDescr,
- 									pThis->getBridge()->getUno2Cpp() );
- 			
- 			switch (pParamTypeDescr->eTypeClass)
- 			{
--				
--				// we need to know type of each param so that we know whether to use
--				// gpr or fpr to pass in parameters:
--				// Key: I - 32-bit value passed in gpr
--				//      B - byte value passed in gpr
--				//      S - short value passed in gpr
--				//      F - float value pass in fpr
--				//      D - double value pass in fpr
--				//      H - long value passed in gpr
--				//      X - indicates end of parameter description string
--				
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+				INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack );
-+				break;
- 			case typelib_TypeClass_LONG:
- 			case typelib_TypeClass_UNSIGNED_LONG:
- 			case typelib_TypeClass_ENUM:
--				*pPT++ = 'I';
-+				INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack );
- 				break;
- 			case typelib_TypeClass_SHORT:
- 			case typelib_TypeClass_CHAR:
- 			case typelib_TypeClass_UNSIGNED_SHORT:
--				*pPT++ = 'S';
-+				INSERT_INT16( pCppArgs[nPos], nGPR, pGPR, pStack );
- 				break;
- 			case typelib_TypeClass_BOOLEAN:
- 			case typelib_TypeClass_BYTE:
--				*pPT++ = 'B';
-+				INSERT_INT8( pCppArgs[nPos], nGPR, pGPR, pStack );
- 				break;
- 			case typelib_TypeClass_FLOAT:
--				*pPT++ = 'F';
--				break;
- 			case typelib_TypeClass_DOUBLE:
--				*pPT++ = 'D';
--				break;
--			case typelib_TypeClass_HYPER:
--			case typelib_TypeClass_UNSIGNED_HYPER:
--				*pPT++ = 'H';
-+				INSERT_FLOAT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, pStack );
- 				break;
- 			}
- 
-@@ -430,7 +339,7 @@
- 			{
- 				// cpp out is constructed mem, uno out is not!
- 				uno_constructData(
--					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
- 					pParamTypeDescr );
- 				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
- 				// will be released at reconversion
-@@ -440,7 +349,7 @@
- 			else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr ))
- 			{
- 				uno_copyAndConvertData(
--					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
- 					pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
- 				
- 				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-@@ -449,27 +358,22 @@
- 			}
- 			else // direct way
- 			{
--				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				pCppArgs[nPos] = pUnoArgs[nPos];
- 				// no longer needed
- 				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
- 			}
--			// FIXME: is this the right way to pass these?
--			*pPT++='H';
-+			INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack );
- 		}
--		pCppStack += sizeof(sal_uInt64); // standard parameter length
- 	}
- 	
--	// terminate the signature string
--	*pPT++ = 'X';
--	*pPT = 0;
--
- 	try
- 	{
--		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 7), "UNALIGNED STACK !!! (Please DO panic)" );
- 		callVirtualMethod(
- 			pAdjustedThisPtr, aVtableSlot.index,
--			pCppReturn, pReturnTypeDescr, bSimpleReturn, pParamType,
--			(sal_uInt64 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_uInt64) );
-+			pCppReturn, pReturnTypeDescr, bSimpleReturn,
-+			pStackStart, ( pStack - pStackStart ),
-+			pGPR, nGPR,
-+			pFPR, nFPR );
- 		// NO exception occured...
- 		*ppUnoExc = 0;
- 		
-@@ -525,8 +429,8 @@
- 	}
- }
- 
--
- //==================================================================================================
-+
- namespace bridges { namespace cpp_uno { namespace shared {
- 
- void unoInterfaceProxyDispatch(
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i76969 b/editors/openoffice.org-vcltesttool/files/patch-i76969
deleted file mode 100644
index 123402727290..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i76969
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: solenv/inc/unxfbsd.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsd.mk,v
-retrieving revision 1.3
-diff -u -r1.3 unxfbsd.mk
---- solenv/inc/unxfbsd.mk	9 Mar 2007 09:07:55 -0000	1.3
-+++ solenv/inc/unxfbsd.mk	4 May 2007 16:22:53 -0000
-@@ -121,12 +121,6 @@
- # Compiler flags for debugging
- CFLAGSDEBUG=-g
- CFLAGSDBGUTIL=
--# Compiler flags for enabling optimizations
--.IF "$(PRODUCT)"!=""
--CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
--.ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT=   							# no optimizing for non products
--.ENDIF	# "$(PRODUCT)"!=""
- # Compiler flags for disabling optimizations
- CFLAGSNOOPT=-O0
- # Compiler flags for describing the output path
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.24
-diff -u -r1.24 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	19 Jul 2006 09:27:04 -0000	1.24
-+++ solenv/inc/unxfbsdi.mk	4 May 2007 16:22:53 -0000
-@@ -43,5 +43,12 @@
- # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
- ARCH_FLAGS*=-mtune=pentiumpro
- 
-+# Compiler flags for enabling optimizations
-+.IF "$(PRODUCT)"!=""
-+CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+.ELSE 	# "$(PRODUCT)"!=""
-+CFLAGSOPT= 					# no optimizing for non products
-+.ENDIF	# "$(PRODUCT)"!=""
-+
- # platform specific identifier for shared libs
- DLLPOSTFIX=fi
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i77615 b/editors/openoffice.org-vcltesttool/files/patch-i77615
deleted file mode 100644
index 89fe1aaee7c8..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i77615
+++ /dev/null
@@ -1,57 +0,0 @@
-For FreeBSD, libxslt builds libraries as libxslt.so.2 or something
-like that. Following patch fixes this.
-
-Index: libxslt/libxslt-1.1.16.patch
-===================================================================
-RCS file: /cvs/external/libxslt/libxslt-1.1.16.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxslt-1.1.16.patch
---- libxslt/libxslt-1.1.16.patch	10 May 2007 13:10:07 -0000	1.2
-+++ libxslt/libxslt-1.1.16.patch	20 May 2007 02:35:31 -0000
-@@ -108,3 +108,46 @@
- ! 
- ! exit 0
- 
-+*** misc/libxslt-1.1.16/ltmain.sh	Sun Feb 12 09:50:49 2006
-+--- misc/build/libxslt-1.1.16/ltmain.sh	Sun May 20 11:34:29 2007
-+***************
-+*** 3192,3200 ****
-+  	    revision="$number_revision"
-+  	    ;;
-+  	  freebsd-aout|freebsd-elf|sunos)
-+! 	    current="$number_major"
-+! 	    revision="$number_minor"
-+! 	    age="0"
-+  	    ;;
-+  	  irix|nonstopux)
-+  	    current=`expr $number_major + $number_minor - 1`
-+--- 3192,3200 ----
-+  	    revision="$number_revision"
-+  	    ;;
-+  	  freebsd-aout|freebsd-elf|sunos)
-+! 	    current=`expr $number_major + $number_minor`
-+! 	    age="$number_minor"
-+! 	    revision="$number_revision"
-+  	    ;;
-+  	  irix|nonstopux)
-+  	    current=`expr $number_major + $number_minor - 1`
-+***************
-+*** 3267,3274 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 3267,3274 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i78032 b/editors/openoffice.org-vcltesttool/files/patch-i78032
deleted file mode 100644
index e2b523c56e85..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i78032
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: store/util/makefile.mk
-===================================================================
-RCS file: /cvs/ucb/store/util/makefile.mk,v
-retrieving revision 1.19
-diff -u -r1.19 makefile.mk
---- store/util/makefile.mk	26 Mar 2007 13:45:45 -0000	1.19
-+++ store/util/makefile.mk	2 Jun 2007 01:40:18 -0000
-@@ -79,7 +79,7 @@
- .IF "$(GUI)"=="WNT"
- SHL1STDLIBS+= 	-lsupc++
- .ELSE
--.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="NETBSD"
- SHL1STDLIBS+= 	-lsupc++
- .ELIF "$(OS)"=="MACOSX"
- .IF "$(CCNUMVER)"<="000399999999"
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i79520 b/editors/openoffice.org-vcltesttool/files/patch-i79520
new file mode 100644
index 000000000000..ccc05e9cbc3c
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i79520
@@ -0,0 +1,10 @@
+--- svx/inc/svx/svdobj.hxx	6 Jul 2007 07:30:43 -0000	1.3
++++ svx/inc/svx/svdobj.hxx	12 Jul 2007 13:56:39 -0000	1.4
+@@ -531,6 +531,7 @@
+ //
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+ 
++class SvxShape;
+ class SVX_DLLPUBLIC SdrObject: public SfxListener, public tools::WeakBase< SdrObject >
+ {
+ private:
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i79527 b/editors/openoffice.org-vcltesttool/files/patch-i79527
new file mode 100644
index 000000000000..20c646f43f1e
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i79527
@@ -0,0 +1,19 @@
+Index: reportdesign/source/ui/dlg/GroupsSorting.cxx
+===================================================================
+RCS file: /cvs/dba/reportdesign/source/ui/dlg/GroupsSorting.cxx,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- reportdesign/source/ui/dlg/GroupsSorting.cxx	9 Jul 2007 11:56:29 -0000	1.2
++++ reportdesign/source/ui/dlg/GroupsSorting.cxx	12 Jul 2007 13:51:08 -0000	1.3
+@@ -1143,8 +1143,8 @@
+ 	    xGroup->setKeepTogether( m_aKeepTogetherLst.GetSelectEntryPos() );
+     if ( m_aGroupOnLst.GetSavedValue() != m_aGroupOnLst.GetSelectEntryPos() )
+     {
+-	    sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_Int32>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
+-	    xGroup->setGroupOn( nGroupOn );
++	    sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
++        xGroup->setGroupOn( nGroupOn );
+     }
+     if ( m_aGroupIntervalEd.GetSavedValue().ToInt32() != m_aGroupIntervalEd.GetValue() )
+     {