60 files changed, 498 insertions, 6747 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 22e7edd89a9a..5b8bf2721e9a 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -20,9 +20,6 @@ DISTFILES+=	${OOOSRC} unowinreg.dll:unowinreg
 .if defined(WITH_GPC)
 DISTFILES+=	gpc231.tar.Z:gpc
 .endif
-.if defined(WITH_GNUGCJ)
-DISTFILES+=	${ANT_DISTFILE}:antbin
-.endif
 EXTRACT_ONLY=	${OOOSRC}
 
 MAINTAINER=	openoffice@FreeBSD.org
@@ -34,7 +31,7 @@ DISTFILES+=	${CWSARCHIVE}:cws
 .endif
 CWSARCHIVE=	${WITH_CWS}.tar.gz
 
-OOOVERSION=	2.2.1
+OOOVERSION=	2.3.0
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -53,29 +50,29 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
-.if !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
-.endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
+.if (${OSVERSION} >= 700000)
+BROKEN=		Build broken with JDK internal error
+.endif
+
 ONLY_FOR_ARCHS=	i386 amd64
 
 .if ${ARCH} == amd64
-GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 .else
-GCC_TARGET=		${ARCH}-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		18
-OOOTAG?=		OOF680_m${MILESTONE}
+MILESTONE?=		5
+OOOTAG?=		OOG680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
 EXECBASE?=		openoffice.org-${OOOVERSION}
@@ -86,7 +83,7 @@ EXECBASE=		openoffice.org-${OOOVERSION}-${WITH_CWS}
 DIST_SUBDIR=		openoffice.org2
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86_64
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
 .else
 PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 .endif
@@ -102,39 +99,19 @@ PKGNAMESUFFIX=		-${LANG_SUFFIX}
 
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-.if defined(WITH_GNUGCJ)
-GCCVER=41
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-BUILD_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
-RUN_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-RUN_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
-.else
-.if ${ARCH} == amd64
-GCCVER=41
-BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
-RUN_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
-.else
-GCCVER=34
-BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
-.endif
-.endif
-
+USE_GCC=	4.2
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CCACHE_PREFIX=	ccache
+OOOCC=		${CCACHE_PREFIX} ${CC}
+OOOCXX=		${CCACHE_PREFIX} ${CXX}
 .else
-CCACHE_PREFIX=
+OOOCC=		${CC}
+OOOCXX=		${CXX}
 .endif
-.if (${GCCVER} == 41)
-CC=	gcc41
-CXX=	g++41
-.endif
-.if (${GCCVER} == 34)
-CC=	gcc-ooo
-CXX=	g++-ooo
-.endif
-CC:=	${CCACHE_PREFIX} ${CC}
-CXX:=	${CCACHE_PREFIX} ${CXX}
+CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
+		CPPFLAGS="-I${LOCALBASE}/include"	\
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
@@ -142,15 +119,9 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
+		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
-.if defined(WITH_GNUGCJ)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
-ANT_DISTFILE=	apache-ant-${ANT_VERSION}-bin.tar.bz2
-ANT_VERSION=	1.6.5
-.else
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-.endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -161,28 +132,19 @@ CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
-.if defined(WITH_GNUGCJ)
-CONFIGURE_ENV+=		PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}"
-.endif
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
 			--enable-symbols=SMALL
-
-.if ${ARCH} == amd64 || ${GCCVER} == 41
+.if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
-.endif
-.if (${GCCVER} == 41)
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
 .if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .endif
-.if defined(WITH_GNUGCJ)
-EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
-.endif
 .if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
 EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 .endif
@@ -213,9 +175,6 @@ post-extract:
 .if defined(WITH_CWS)
 	cd ${WRKSRC} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/${CWSARCHIVE}
 .endif
-.if defined(WITH_GNUGCJ)
-	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-.endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index a0242e93bb9f..558f5ccfa5ca 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,15 +1,12 @@
-MD5 (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = b078b19bdb92394b4f449e6ea0c6d0ff
-SHA256 (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = 16e5e5df57ad95ee7185141d45f8ebade2b31b6b569416bb0cfd6a032f6c9684
-SIZE (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = 268962943
+MD5 (openoffice.org2/OOo_OOG680_m5_source.tar.bz2) = deb17dd1ff727682e24965a213b41b7b
+SHA256 (openoffice.org2/OOo_OOG680_m5_source.tar.bz2) = 8fc02f802b928b5c88273eb482e1d9d79690e953b1317448a3eed506d3f88eca
+SIZE (openoffice.org2/OOo_OOG680_m5_source.tar.bz2) = 291604133
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
 MD5 (openoffice.org2/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2/gpc231.tar.Z) = 27917
-MD5 (openoffice.org2/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
-SHA256 (openoffice.org2/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
-SIZE (openoffice.org2/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 MD5 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SHA256 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
 SIZE (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index 4f35a20cc4a2..f31353c9e2fe 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -2,11 +2,12 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
-.if !defined(WITH_GNUGCJ)
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}/lib/jvm/java-gcj41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
-.endif
+
+#.if defined(WITH_VBA)
+#CONFIGURE_ARGS+=        --enable-vba --with-vba-package-format="builtin"
+#EXTRA_PATCHES+=	${FILESDIR}/cws-npower7.diff
+#.endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
@@ -92,6 +93,11 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .endif
+#.if !defined(WITH_VBA)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with VBA support with"
+#	@${ECHO} "make -DWITH_VBA"
+#.endif
 .if !defined(WITH_SYSTEM_FREETYPE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with freetype2 from ports with"
@@ -120,11 +126,6 @@ pre-fetch:
 	@${ECHO} "zh-CN zh-TW zu"
 	@${ECHO} "Default: en-US"
 .endif
-.if !defined(WITH_GNUGCJ)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-	@${ECHO} "make -DWITH_GNUGCJ"
-.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
diff --git a/editors/openoffice-3/files/gcj-fbsdworkaround b/editors/openoffice-3/files/gcj-fbsdworkaround
deleted file mode 100644
index ee41bf0f6839..000000000000
--- a/editors/openoffice-3/files/gcj-fbsdworkaround
+++ /dev/null
@@ -1,30 +0,0 @@
---- config_office/configure~	Sat Mar  4 16:12:31 2006
-+++ config_office/configure	Sat Mar  4 16:12:45 2006
-@@ -7544,7 +7544,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgcjawt  $LIBS"
-+LIBS="-lgcjawt  -pthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-
-http://qa.openoffice.org/issues/show_bug.cgi?id=63095
-Index: stoc/source/javaloader/makefile.mk
-===================================================================
-RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
-retrieving revision 1.16
-diff -u -r1.16 makefile.mk
---- stoc/source/javaloader/makefile.mk	8 Sep 2005 07:57:58 -0000	1.16
-+++ stoc/source/javaloader/makefile.mk	13 Mar 2006 00:53:41 -0000
-@@ -59,7 +59,8 @@
- 		$(CPPUHELPERLIB) 	\
- 		$(CPPULIB)			\
- 		$(SALLIB) \
--        $(JVMACCESSLIB)
-+        $(JVMACCESSLIB) \
-+        -L/usr/local/lib -liconv
- 
- SHL1VERSIONMAP = javaloader.map
- SHL1DEPN=		
diff --git a/editors/openoffice-3/files/patch-i65514 b/editors/openoffice-3/files/patch-i65514
index 07755cda662b..cc8221264c59 100644
--- a/editors/openoffice-3/files/patch-i65514
+++ b/editors/openoffice-3/files/patch-i65514
@@ -1,141 +1,12 @@
-diff -u -r1.17 db-4.2.52.patch
---- berkeleydb/db-4.2.52.patch	1 Dec 2006 12:59:45 -0000	1.17
-+++ berkeleydb/db-4.2.52.patch	23 Jan 2007 07:10:29 -0000
-@@ -54,6 +54,20 @@
- ! SLOFILES= $(SLO)$/strcasecmp.obj
- ! 
- ! .INCLUDE :  target.mk
-+*** misc/db-4.2.52.NC/dist/config.hin	Wed Dec  3 16:10:00 2003
-+--- misc/build/db-4.2.52.NC/dist/config.hin	Fri May 19 17:37:41 2006
-+***************
-+*** 193,198 ****
-+--- 193,201 ----
-+  /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */
-+  #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
-+  
-++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */
-++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
-++ 
-+  /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-+  #undef HAVE_NDIR_H
-+
- *** misc/db-4.2.52.NC/common/makefile.mk	2006-12-01 13:57:33.000000000 +0100
- --- misc/build/db-4.2.52.NC/common/makefile.mk	2006-12-01 13:57:19.000000000 +0100
- ***************
-@@ -306,6 +320,76 @@
-   	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'
-+***************
-+*** 28556,28561 ****
-+--- 28556,28606 ----
-+  rm -f conftest.$ac_objext conftest.$ac_ext
-+  fi
-+  
-++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
-++ if test "$db_cv_mutex" = no; then
-++ cat >conftest.$ac_ext <<_ACEOF
-++ #line $LINENO "configure"
-++ /* confdefs.h.  */
-++ _ACEOF
-++ cat confdefs.h >>conftest.$ac_ext
-++ cat >>conftest.$ac_ext <<_ACEOF
-++ /* end confdefs.h.  */
-++ 
-++ int
-++ main ()
-++ {
-++ 
-++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__)
-++ 	exit(0);
-++ #else
-++ 	FAIL TO COMPILE/LINK
-++ #endif
-++ 
-++   ;
-++   return 0;
-++ }
-++ _ACEOF
-++ rm -f conftest.$ac_objext
-++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-++   (eval $ac_compile) 2>&5
-++   ac_status=$?
-++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } &&
-++          { ac_try='test -s conftest.$ac_objext'
-++   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-++   (eval $ac_try) 2>&5
-++   ac_status=$?
-++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); }; }; then
-++   db_cv_mutex="x86_64/gcc-assembly"
-++ else
-++   echo "$as_me: failed program was:" >&5
-++ sed 's/^/| /' conftest.$ac_ext >&5
-++ 
-++ fi
-++ rm -f conftest.$ac_objext conftest.$ac_ext
-++ fi
-++ 
-+  # S390/cc: IBM OS/390 Unix
-+  if test "$db_cv_mutex" = no; then
-+  cat >conftest.$ac_ext <<_ACEOF
-+***************
-+*** 28971,28976 ****
-+--- 29016,29028 ----
-+  x86/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
-+  			cat >>confdefs.h <<\_ACEOF
-+  #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
-++ _ACEOF
-++ 
-++ 
-++ ;;
-++ x86_64/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
-++ 			cat >>confdefs.h <<\_ACEOF
-++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
-+  _ACEOF
-+
-+  
- *** 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	2006-12-01 13:57:19.000000000 +0100
- ***************
-@@ -1059,3 +1143,39 @@
- ! 			$(SLO)$/xa_map.obj
- ! 
- ! .INCLUDE :  target.mk
-+*** misc/db-4.2.52.NC/dbinc/mutex.h	Sat Sep 20 17:40:49 2003
-+--- misc/build/db-4.2.52.NC/dbinc/mutex.h	Fri May 19 12:43:58 2006
-+***************
-+*** 781,786 ****
-+--- 781,811 ----
-+  #endif
-+  #endif
-+  
-++ /*********************************************************************
-++  * x86_64/gcc assembly.
-++  *********************************************************************/
-++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
-++ typedef unsigned char tsl_t;
-++ 
-++ #ifdef LOAD_ACTUAL_MUTEX_CODE
-++ /*
-++  * For gcc/x86-64, 0 is clear, 1 is set.
-++  */
-++ #define	MUTEX_SET(tsl) ({						\
-++ 	register tsl_t *__l = (tsl);					\
-++ 	int __r;							\
-++ 	asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
-++ 	    : "=&a" (__r), "=m" (*__l)					\
-++ 	    : "1" (*__l)						\
-++ 	    );								\
-++ 	__r & 1;							\
-++ })
-++ 
-++ #define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-++ #define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-++ #endif
-++ #endif
-++ 
-+  /*
-+   * Mutex alignment defaults to one byte.
-+   *
+--- berkeleydb/makefile.mk	25 May 2007 10:48:51 -0000	1.40
++++ berkeleydb/makefile.mk	2 Jul 2007 20:15:24 -0000
+@@ -107,6 +107,9 @@
+ .IF "$(SOLAR_JAVA)"!=""
+ CONFIGURE_FLAGS+=--enable-java
+ .ENDIF
++.IF "$(COM)$(CPU)"=="GCCX"
++CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
++.ENDIF
+ 
+ BUILD_DIR=$(CONFIGURE_DIR)
+ BUILD_DIR_OUT=$(CONFIGURE_DIR)
diff --git a/editors/openoffice-3/files/patch-i65974 b/editors/openoffice-3/files/patch-i65974
new file mode 100644
index 000000000000..40de0acde40f
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i65974
@@ -0,0 +1,12 @@
+--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	16 Sep 2006 17:46:13 -0000	1.7
++++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	22 Jun 2007 21:36:24 -0000
+@@ -94,6 +94,9 @@
+     static char const * ar[] = {
+ 
+         "/lib/" JFW_PLUGIN_ARCH "/client",
++#if SAL_TYPES_SIZEOFPOINTER == 8
++        "/lib/" JFW_PLUGIN_ARCH "/server",
++#endif
+         "/lib/" JFW_PLUGIN_ARCH "/native_threads", 
+         "/lib/" JFW_PLUGIN_ARCH
+ 
diff --git a/editors/openoffice-3/files/patch-i66667 b/editors/openoffice-3/files/patch-i66667
deleted file mode 100644
index c1d8cd362e9b..000000000000
--- a/editors/openoffice-3/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/files/patch-i67904 b/editors/openoffice-3/files/patch-i67904
deleted file mode 100644
index d2fb32236151..000000000000
--- a/editors/openoffice-3/files/patch-i67904
+++ /dev/null
@@ -1,80 +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.11
-diff -u -r1.11 mozilla-source-1.7.5.patch
---- moz/mozilla-source-1.7.5.patch	19 Jul 2006 09:37:17 -0000	1.11
-+++ moz/mozilla-source-1.7.5.patch	29 Jul 2006 09:53:10 -0000
-@@ -7705,7 +7705,7 @@
-  
- -#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
- +#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/files/patch-i69418 b/editors/openoffice-3/files/patch-i69418
deleted file mode 100644
index dd23c55e4c9b..000000000000
--- a/editors/openoffice-3/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/files/patch-i69994 b/editors/openoffice-3/files/patch-i69994
deleted file mode 100644
index 9d2718b4763c..000000000000
--- a/editors/openoffice-3/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/files/patch-i73157 b/editors/openoffice-3/files/patch-i73157
deleted file mode 100644
index 17d987622060..000000000000
--- a/editors/openoffice-3/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/files/patch-i73217 b/editors/openoffice-3/files/patch-i73217
index 3dc7b4e28912..712631a136f1 100644
--- a/editors/openoffice-3/files/patch-i73217
+++ b/editors/openoffice-3/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/files/patch-i76115 b/editors/openoffice-3/files/patch-i76115
deleted file mode 100644
index f090b4337b09..000000000000
--- a/editors/openoffice-3/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/files/patch-i76141 b/editors/openoffice-3/files/patch-i76141
deleted file mode 100644
index 03edb6bcf94b..000000000000
--- a/editors/openoffice-3/files/patch-i76141
+++ /dev/null
@@ -1,860 +0,0 @@
---- berkeleydb/db-4.2.52.patch	Fri Apr  6 21:51:24 2007
-+++ berkeleydb/db-4.2.52.patch	Fri Apr  6 21:51:52 2007
-@@ -255,6 +255,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*)
-+--- 9328,9334 ----
-+    ;;
-+  
-+  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!
-@@ -321,8 +338,59 @@
-   	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*)
-+--- 12883,12889 ----
-+    ;;
-+  
-+  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*)
-+--- 15860,15866 ----
-+    ;;
-+  
-+  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*)
-+--- 18125,18131 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 28556,28561 ****
----- 28556,28606 ----
-+--- 28567,28617 ----
-   rm -f conftest.$ac_objext conftest.$ac_ext
-   fi
-   
-@@ -376,7 +444,7 @@
-   cat >conftest.$ac_ext <<_ACEOF
- ***************
- *** 28971,28976 ****
----- 29016,29028 ----
-+--- 29027,29039 ----
-   x86/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
-   			cat >>confdefs.h <<\_ACEOF
-   #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
-@@ -388,7 +456,7 @@
- + 			cat >>confdefs.h <<\_ACEOF
- + #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
-   _ACEOF
--
-+  
-   
- *** 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	2006-12-01 13:57:19.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	Thu Jan 19 13:23:31 2006
-+++ libxml2/libxml2-2.6.17.patch	Wed Apr  4 18:38:01 2007
-@@ -1,6 +1,40 @@
- *** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
- --- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
- ***************
-+*** 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*)
-+***************
-+*** 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*)
-+***************
- *** 26339,26347 ****
-   
-   echo "$as_me:$LINENO: checking for setsockopt" >&5
---- libxmlsec/xmlsec1-1.2.6.patch	24 Oct 2006 13:31:14 -0000	1.16
-+++ libxmlsec/xmlsec1-1.2.6.patch	5 Apr 2007 00:47:31 -0000
-@@ -17,8 +17,25 @@
-   
-   .SUFFIXES:
-   .SUFFIXES: .c .lo .o .obj
--*** misc/xmlsec1-1.2.6/configure	Thu Aug 26 08:00:34 2004
----- misc/build/xmlsec1-1.2.6/configure	Thu Sep 28 18:00:38 2006
-+*** misc/xmlsec1-1.2.6/configure	Thu Aug 26 02:00:34 2004
-+--- misc/build/xmlsec1-1.2.6/configure	Wed Apr  4 20:43:24 2007
-+***************
-+*** 7778,7784 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 7778,7784 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- ***************
- *** 9046,9052 ****
-         ;;
-@@ -37,6 +54,57 @@
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-       archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ***************
-+*** 11497,11503 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11497,11503 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 14667,14673 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14667,14673 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17035,17041 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17035,17041 ----
-+    ;;
-+  
-+  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	Wed Apr  4 19:22:49 2007
-+++ moz/mozilla-source-1.7.5.patch	Wed Apr  4 21:08:38 2007
-@@ -134,6 +134,23 @@
- *** misc/mozilla/configure	2004-10-12 06:13:29.000000000 +0200
- --- misc/build/mozilla/configure	2006-02-24 09:41:55.000000000 +0100
- ***************
-+*** 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'
-@@ -174,6 +202,23 @@
- *** misc/mozilla/configure.in	2004-10-12 06:13:29.000000000 +0200
- --- misc/build/mozilla/configure.in	2006-02-24 09:41:55.000000000 +0100
- ***************
-+*** 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'
-@@ -211,6 +267,25 @@
-       CC="\$(CYGWIN_WRAPPER) $CC"
-       CXX="\$(CYGWIN_WRAPPER) $CXX"
-       CPP="\$(CYGWIN_WRAPPER) $CPP"
-+*** 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	2003-04-03 01:22:39.000000000 +0200
- --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper	2006-02-24 09:41:55.000000000 +0100
- ***************
-@@ -341,6 +416,23 @@
- *** misc/mozilla/directory/c-sdk/configure	2004-09-14 23:14:38.000000000 +0200
- --- misc/build/mozilla/directory/c-sdk/configure	2006-02-24 09:41:55.000000000 +0100
- ***************
-+*** 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 ****
- --- 3832,3838 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -363,6 +455,23 @@
- *** misc/mozilla/directory/c-sdk/configure.in	2004-09-14 23:14:38.000000000 +0200
- --- misc/build/mozilla/directory/c-sdk/configure.in	2006-02-24 09:41:55.000000000 +0100
- ***************
-+*** 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 ****
- --- 1144,1150 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -6830,6 +6939,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	2003-04-03 01:22:38.000000000 +0200
- --- misc/build/mozilla/nsprpub/build/cygwin-wrapper	2006-02-24 09:41:55.000000000 +0100
- ***************
-@@ -7060,6 +7207,25 @@
-       gDirServiceProvider->SetProfileDir(profileDir);  
-       mCurrentProfileName.Assign(aCurrentProfile);    
-       gProfileDataAccess->SetCurrentProfile(aCurrentProfile);
-+*** 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	2002-02-15 23:53:12.000000000 +0100
- --- misc/build/mozilla/security/coreconf/command.mk	2006-02-24 09:41:55.000000000 +0100
- ***************
---- neon/neon.patch	Tue Feb  6 09:08:59 2007
-+++ neon/neon.patch	Thu Apr  5 14:36:14 2007
-@@ -1,5 +1,24 @@
--*** misc/neon-0.24.7/src/config.h	Tue Jan 30 16:51:33 2007
----- misc/build/neon-0.24.7/src/config.h	Tue Jan 30 16:51:05 2007
-+*** misc/neon-0.24.7/configure	Mon Jul  5 14:35:21 2004
-+--- misc/build/neon-0.24.7/configure	Thu Apr  5 14:31:11 2007
-+***************
-+*** 6344,6350 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 6344,6350 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+*** misc/neon-0.24.7/src/config.h	Thu Apr  5 14:35:31 2007
-+--- misc/build/neon-0.24.7/src/config.h	Thu Apr  5 14:30:40 2007
- ***************
- *** 1 ****
- ! dummy
---- sablot/Sablot-0.52.patch	19 Jun 2006 17:27:11 -0000	1.20
-+++ sablot/Sablot-0.52.patch	5 Apr 2007 00:24:32 -0000
-@@ -632,3 +632,22 @@
-       };
-       return cnt;
-   }
-+*** misc/Sablot-0.52/tools/ltconfig	Fri Apr 13 05:50:59 2001
-+--- misc/build/Sablot-0.52/tools/ltconfig	Wed Apr  4 20:22:37 2007
-+***************
-+*** 1887,1893 ****
-+    ;;
-+    
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case "$version_type" in
-+      freebsd-elf*)
-+--- 1887,1893 ----
-+    ;;
-+    
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case "$version_type" in
-+      freebsd-elf*)
---- 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/files/patch-i78417 b/editors/openoffice-3/files/patch-i78417
new file mode 100644
index 000000000000..fee06f2fa429
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i78417
@@ -0,0 +1,10 @@
+--- sw/source/core/bastyp/swregion.cxx
++++ sw/source/core/bastyp/swregion.cxx
+@@ -79,6 +79,7 @@
+ {
+ 	if( rDel )
+ 	{
++		pData = (SwRect*) pData;
+ 		*(pData+nPos) = rRect;
+ 		rDel = FALSE;
+ 	}
diff --git a/editors/openoffice-3/files/patch-i78875 b/editors/openoffice-3/files/patch-i78875
new file mode 100644
index 000000000000..aff1f83eead5
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i78875
@@ -0,0 +1,31 @@
+Index: libtextcat/libtextcat-2.2.patch
+===================================================================
+RCS file: /cvs/external/libtextcat/libtextcat-2.2.patch,v
+retrieving revision 1.3
+diff -u -r1.3 libtextcat-2.2.patch
+--- libtextcat/libtextcat-2.2.patch	21 Jun 2007 16:05:43 -0000	1.3
++++ libtextcat/libtextcat-2.2.patch	25 Jun 2007 11:12:26 -0000
+@@ -18,6 +18,23 @@
+   # when you set need_version to no, make sure it does not cause -set_version
+   # flags to be left without arguments
+   archive_cmds=
++***************
++*** 6280,6286 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 6281,6287 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
+ *** misc/libtextcat-2.2/src/Makefile.in	Thu May 22 13:39:52 2003
+ --- misc/build/libtextcat-2.2/src/Makefile.in	Thu Jun 21 17:44:15 2007
+ ***************
diff --git a/editors/openoffice-3/files/patch-i80003 b/editors/openoffice-3/files/patch-i80003
new file mode 100644
index 000000000000..453610348c91
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i80003
@@ -0,0 +1,22 @@
+correct patch by jkim
+http://www.openoffice.org/nonav/issues/showattachment.cgi/47084/patch-i80003
+will be go into cws obo15.
+
+Index: libxslt/makefile.mk
+===================================================================
+RCS file: /cvs/external/libxslt/makefile.mk,v
+retrieving revision 1.7
+diff -u -r1.7 makefile.mk
+--- libxslt/makefile.mk	19 Jul 2007 11:21:19 -0000	1.7
++++ libxslt/makefile.mk	24 Jul 2007 20:33:55 -0000
+@@ -96,6 +96,10 @@
+ BUILD_DIR=$(CONFIGURE_DIR)
+ .ENDIF
+ 
++.IF "$(OS)"=="FREEBSD"
++xslt_LDFLAGS+=-L$(SOLARLIBDIR)
++.ENDIF
++
+ OUT2INC=libxslt$/*.h
+ 
+ .IF "$(OS)"=="MACOSX"
diff --git a/editors/openoffice-3/files/patch-i80129 b/editors/openoffice-3/files/patch-i80129
new file mode 100644
index 000000000000..90fd4ceb9dc5
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i80129
@@ -0,0 +1,18 @@
+Merely a workaround
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.14
+diff -u -r1.14 ure.scp
+--- scp2/source/ure/ure.scp	18 Jul 2007 08:07:32 -0000	1.14
++++ scp2/source/ure/ure.scp	27 Jul 2007 22:07:16 -0000
+@@ -610,6 +610,8 @@
+ #endif
+ #elif defined MACOSX
+     Name = SCP2_URE_DL_NORMAL(xml2.2);
++#elif defined FREEBSD
++    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
+ #else
+     Name = SCP2_URE_DL_VER(xml2, 2);
+ #endif
diff --git a/editors/openoffice-3/files/patch-i80295 b/editors/openoffice-3/files/patch-i80295
new file mode 100644
index 000000000000..d66798903a3c
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i80295
@@ -0,0 +1,20 @@
+Index: svx/source/dialog/cuifmsearch.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v
+retrieving revision 1.6
+diff -u -r1.6 cuifmsearch.hxx
+--- svx/source/dialog/cuifmsearch.hxx	31 Jul 2007 13:56:33 -0000	1.6
++++ svx/source/dialog/cuifmsearch.hxx	3 Aug 2007 05:35:05 -0000
+@@ -93,10 +93,10 @@
+ 
+ struct FmSearchProgress;
+ 
++class FmSearchEngine;
++
+ class FmSearchDialog : public ModalDialog
+ {
+-	friend class FmSearchEngine;
+-
+ 	// meine ganzen Controls
+     FixedLine       m_flSearchFor;
+ 	RadioButton		m_rbSearchForText;
diff --git a/editors/openoffice-3/files/rtld-workaround-i66667 b/editors/openoffice-3/files/rtld-workaround-i66667
index b73949eee465..26c0b1b4a88c 100644
--- a/editors/openoffice-3/files/rtld-workaround-i66667
+++ b/editors/openoffice-3/files/rtld-workaround-i66667
@@ -1,10 +1,10 @@
 Index: vcl/unx/gtk/app/gtkinst.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
-retrieving revision 1.14.88.1
-diff -u -r1.14.88.1 gtkinst.cxx
---- vcl/unx/gtk/app/gtkinst.cxx	10 Aug 2006 14:53:08 -0000	1.14.88.1
-+++ vcl/unx/gtk/app/gtkinst.cxx	21 Aug 2006 05:38:21 -0000
+retrieving revision 1.14
+diff -u -r1.14 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
++++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
 @@ -43,6 +43,7 @@
  #include <plugins/gtk/atkbridge.hxx>
  
@@ -13,14 +13,15 @@ diff -u -r1.14.88.1 gtkinst.cxx
  
  #if OSL_DEBUG_LEVEL > 1
  #include <stdio.h>
-@@ -111,13 +112,28 @@
+@@ -111,13 +112,27 @@
  		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
  		pYieldMutex->ThreadsLeave();
  	}
 -	static bool hookLocks( oslModule pModule )
 +	static bool hookLocks( void )
  	{
- 		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
+-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
++		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
  		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
  
 +		/* XXX GDK library path should be set by configure. */
@@ -37,14 +38,13 @@ diff -u -r1.14.88.1 gtkinst.cxx
 +#endif
 +			return false;
 +		}
-+
  		GdkLockFn gdk_threads_set_lock_functions =
 -				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
 +				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
  		if ( !gdk_threads_set_lock_functions )
  		{
  #if OSL_DEBUG_LEVEL > 1
-@@ -150,7 +166,7 @@
+@@ -150,7 +165,7 @@
  		if ( !g_thread_supported() )
  			g_thread_init( NULL );
  
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 22e7edd89a9a..5b8bf2721e9a 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -20,9 +20,6 @@ DISTFILES+=	${OOOSRC} unowinreg.dll:unowinreg
 .if defined(WITH_GPC)
 DISTFILES+=	gpc231.tar.Z:gpc
 .endif
-.if defined(WITH_GNUGCJ)
-DISTFILES+=	${ANT_DISTFILE}:antbin
-.endif
 EXTRACT_ONLY=	${OOOSRC}
 
 MAINTAINER=	openoffice@FreeBSD.org
@@ -34,7 +31,7 @@ DISTFILES+=	${CWSARCHIVE}:cws
 .endif
 CWSARCHIVE=	${WITH_CWS}.tar.gz
 
-OOOVERSION=	2.2.1
+OOOVERSION=	2.3.0
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -53,29 +50,29 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
-.if !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
-.endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
+.if (${OSVERSION} >= 700000)
+BROKEN=		Build broken with JDK internal error
+.endif
+
 ONLY_FOR_ARCHS=	i386 amd64
 
 .if ${ARCH} == amd64
-GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 .else
-GCC_TARGET=		${ARCH}-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		18
-OOOTAG?=		OOF680_m${MILESTONE}
+MILESTONE?=		5
+OOOTAG?=		OOG680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
 EXECBASE?=		openoffice.org-${OOOVERSION}
@@ -86,7 +83,7 @@ EXECBASE=		openoffice.org-${OOOVERSION}-${WITH_CWS}
 DIST_SUBDIR=		openoffice.org2
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86_64
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
 .else
 PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 .endif
@@ -102,39 +99,19 @@ PKGNAMESUFFIX=		-${LANG_SUFFIX}
 
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-.if defined(WITH_GNUGCJ)
-GCCVER=41
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-BUILD_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
-RUN_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-RUN_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
-.else
-.if ${ARCH} == amd64
-GCCVER=41
-BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
-RUN_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
-.else
-GCCVER=34
-BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
-.endif
-.endif
-
+USE_GCC=	4.2
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CCACHE_PREFIX=	ccache
+OOOCC=		${CCACHE_PREFIX} ${CC}
+OOOCXX=		${CCACHE_PREFIX} ${CXX}
 .else
-CCACHE_PREFIX=
+OOOCC=		${CC}
+OOOCXX=		${CXX}
 .endif
-.if (${GCCVER} == 41)
-CC=	gcc41
-CXX=	g++41
-.endif
-.if (${GCCVER} == 34)
-CC=	gcc-ooo
-CXX=	g++-ooo
-.endif
-CC:=	${CCACHE_PREFIX} ${CC}
-CXX:=	${CCACHE_PREFIX} ${CXX}
+CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
+		CPPFLAGS="-I${LOCALBASE}/include"	\
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
@@ -142,15 +119,9 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
+		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
-.if defined(WITH_GNUGCJ)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
-ANT_DISTFILE=	apache-ant-${ANT_VERSION}-bin.tar.bz2
-ANT_VERSION=	1.6.5
-.else
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-.endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -161,28 +132,19 @@ CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
-.if defined(WITH_GNUGCJ)
-CONFIGURE_ENV+=		PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}"
-.endif
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
 			--enable-symbols=SMALL
-
-.if ${ARCH} == amd64 || ${GCCVER} == 41
+.if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
-.endif
-.if (${GCCVER} == 41)
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
 .if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .endif
-.if defined(WITH_GNUGCJ)
-EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
-.endif
 .if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
 EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 .endif
@@ -213,9 +175,6 @@ post-extract:
 .if defined(WITH_CWS)
 	cd ${WRKSRC} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/${CWSARCHIVE}
 .endif
-.if defined(WITH_GNUGCJ)
-	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-.endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index a0242e93bb9f..558f5ccfa5ca 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,15 +1,12 @@
-MD5 (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = b078b19bdb92394b4f449e6ea0c6d0ff
-SHA256 (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = 16e5e5df57ad95ee7185141d45f8ebade2b31b6b569416bb0cfd6a032f6c9684
-SIZE (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = 268962943
+MD5 (openoffice.org2/OOo_OOG680_m5_source.tar.bz2) = deb17dd1ff727682e24965a213b41b7b
+SHA256 (openoffice.org2/OOo_OOG680_m5_source.tar.bz2) = 8fc02f802b928b5c88273eb482e1d9d79690e953b1317448a3eed506d3f88eca
+SIZE (openoffice.org2/OOo_OOG680_m5_source.tar.bz2) = 291604133
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
 MD5 (openoffice.org2/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2/gpc231.tar.Z) = 27917
-MD5 (openoffice.org2/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
-SHA256 (openoffice.org2/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
-SIZE (openoffice.org2/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 MD5 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SHA256 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
 SIZE (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice.org-2/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index 4f35a20cc4a2..f31353c9e2fe 100644
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/files/Makefile.knobs
@@ -2,11 +2,12 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
-.if !defined(WITH_GNUGCJ)
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}/lib/jvm/java-gcj41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
-.endif
+
+#.if defined(WITH_VBA)
+#CONFIGURE_ARGS+=        --enable-vba --with-vba-package-format="builtin"
+#EXTRA_PATCHES+=	${FILESDIR}/cws-npower7.diff
+#.endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
@@ -92,6 +93,11 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .endif
+#.if !defined(WITH_VBA)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with VBA support with"
+#	@${ECHO} "make -DWITH_VBA"
+#.endif
 .if !defined(WITH_SYSTEM_FREETYPE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with freetype2 from ports with"
@@ -120,11 +126,6 @@ pre-fetch:
 	@${ECHO} "zh-CN zh-TW zu"
 	@${ECHO} "Default: en-US"
 .endif
-.if !defined(WITH_GNUGCJ)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-	@${ECHO} "make -DWITH_GNUGCJ"
-.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
diff --git a/editors/openoffice.org-2/files/gcj-fbsdworkaround b/editors/openoffice.org-2/files/gcj-fbsdworkaround
deleted file mode 100644
index ee41bf0f6839..000000000000
--- a/editors/openoffice.org-2/files/gcj-fbsdworkaround
+++ /dev/null
@@ -1,30 +0,0 @@
---- config_office/configure~	Sat Mar  4 16:12:31 2006
-+++ config_office/configure	Sat Mar  4 16:12:45 2006
-@@ -7544,7 +7544,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgcjawt  $LIBS"
-+LIBS="-lgcjawt  -pthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-
-http://qa.openoffice.org/issues/show_bug.cgi?id=63095
-Index: stoc/source/javaloader/makefile.mk
-===================================================================
-RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
-retrieving revision 1.16
-diff -u -r1.16 makefile.mk
---- stoc/source/javaloader/makefile.mk	8 Sep 2005 07:57:58 -0000	1.16
-+++ stoc/source/javaloader/makefile.mk	13 Mar 2006 00:53:41 -0000
-@@ -59,7 +59,8 @@
- 		$(CPPUHELPERLIB) 	\
- 		$(CPPULIB)			\
- 		$(SALLIB) \
--        $(JVMACCESSLIB)
-+        $(JVMACCESSLIB) \
-+        -L/usr/local/lib -liconv
- 
- SHL1VERSIONMAP = javaloader.map
- SHL1DEPN=		
diff --git a/editors/openoffice.org-2/files/patch-i65514 b/editors/openoffice.org-2/files/patch-i65514
index 07755cda662b..cc8221264c59 100644
--- a/editors/openoffice.org-2/files/patch-i65514
+++ b/editors/openoffice.org-2/files/patch-i65514
@@ -1,141 +1,12 @@
-diff -u -r1.17 db-4.2.52.patch
---- berkeleydb/db-4.2.52.patch	1 Dec 2006 12:59:45 -0000	1.17
-+++ berkeleydb/db-4.2.52.patch	23 Jan 2007 07:10:29 -0000
-@@ -54,6 +54,20 @@
- ! SLOFILES= $(SLO)$/strcasecmp.obj
- ! 
- ! .INCLUDE :  target.mk
-+*** misc/db-4.2.52.NC/dist/config.hin	Wed Dec  3 16:10:00 2003
-+--- misc/build/db-4.2.52.NC/dist/config.hin	Fri May 19 17:37:41 2006
-+***************
-+*** 193,198 ****
-+--- 193,201 ----
-+  /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */
-+  #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
-+  
-++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */
-++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
-++ 
-+  /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-+  #undef HAVE_NDIR_H
-+
- *** misc/db-4.2.52.NC/common/makefile.mk	2006-12-01 13:57:33.000000000 +0100
- --- misc/build/db-4.2.52.NC/common/makefile.mk	2006-12-01 13:57:19.000000000 +0100
- ***************
-@@ -306,6 +320,76 @@
-   	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'
-+***************
-+*** 28556,28561 ****
-+--- 28556,28606 ----
-+  rm -f conftest.$ac_objext conftest.$ac_ext
-+  fi
-+  
-++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
-++ if test "$db_cv_mutex" = no; then
-++ cat >conftest.$ac_ext <<_ACEOF
-++ #line $LINENO "configure"
-++ /* confdefs.h.  */
-++ _ACEOF
-++ cat confdefs.h >>conftest.$ac_ext
-++ cat >>conftest.$ac_ext <<_ACEOF
-++ /* end confdefs.h.  */
-++ 
-++ int
-++ main ()
-++ {
-++ 
-++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__)
-++ 	exit(0);
-++ #else
-++ 	FAIL TO COMPILE/LINK
-++ #endif
-++ 
-++   ;
-++   return 0;
-++ }
-++ _ACEOF
-++ rm -f conftest.$ac_objext
-++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-++   (eval $ac_compile) 2>&5
-++   ac_status=$?
-++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } &&
-++          { ac_try='test -s conftest.$ac_objext'
-++   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-++   (eval $ac_try) 2>&5
-++   ac_status=$?
-++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); }; }; then
-++   db_cv_mutex="x86_64/gcc-assembly"
-++ else
-++   echo "$as_me: failed program was:" >&5
-++ sed 's/^/| /' conftest.$ac_ext >&5
-++ 
-++ fi
-++ rm -f conftest.$ac_objext conftest.$ac_ext
-++ fi
-++ 
-+  # S390/cc: IBM OS/390 Unix
-+  if test "$db_cv_mutex" = no; then
-+  cat >conftest.$ac_ext <<_ACEOF
-+***************
-+*** 28971,28976 ****
-+--- 29016,29028 ----
-+  x86/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
-+  			cat >>confdefs.h <<\_ACEOF
-+  #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
-++ _ACEOF
-++ 
-++ 
-++ ;;
-++ x86_64/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
-++ 			cat >>confdefs.h <<\_ACEOF
-++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
-+  _ACEOF
-+
-+  
- *** 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	2006-12-01 13:57:19.000000000 +0100
- ***************
-@@ -1059,3 +1143,39 @@
- ! 			$(SLO)$/xa_map.obj
- ! 
- ! .INCLUDE :  target.mk
-+*** misc/db-4.2.52.NC/dbinc/mutex.h	Sat Sep 20 17:40:49 2003
-+--- misc/build/db-4.2.52.NC/dbinc/mutex.h	Fri May 19 12:43:58 2006
-+***************
-+*** 781,786 ****
-+--- 781,811 ----
-+  #endif
-+  #endif
-+  
-++ /*********************************************************************
-++  * x86_64/gcc assembly.
-++  *********************************************************************/
-++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
-++ typedef unsigned char tsl_t;
-++ 
-++ #ifdef LOAD_ACTUAL_MUTEX_CODE
-++ /*
-++  * For gcc/x86-64, 0 is clear, 1 is set.
-++  */
-++ #define	MUTEX_SET(tsl) ({						\
-++ 	register tsl_t *__l = (tsl);					\
-++ 	int __r;							\
-++ 	asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
-++ 	    : "=&a" (__r), "=m" (*__l)					\
-++ 	    : "1" (*__l)						\
-++ 	    );								\
-++ 	__r & 1;							\
-++ })
-++ 
-++ #define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-++ #define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-++ #endif
-++ #endif
-++ 
-+  /*
-+   * Mutex alignment defaults to one byte.
-+   *
+--- berkeleydb/makefile.mk	25 May 2007 10:48:51 -0000	1.40
++++ berkeleydb/makefile.mk	2 Jul 2007 20:15:24 -0000
+@@ -107,6 +107,9 @@
+ .IF "$(SOLAR_JAVA)"!=""
+ CONFIGURE_FLAGS+=--enable-java
+ .ENDIF
++.IF "$(COM)$(CPU)"=="GCCX"
++CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
++.ENDIF
+ 
+ BUILD_DIR=$(CONFIGURE_DIR)
+ BUILD_DIR_OUT=$(CONFIGURE_DIR)
diff --git a/editors/openoffice.org-2/files/patch-i65974 b/editors/openoffice.org-2/files/patch-i65974
new file mode 100644
index 000000000000..40de0acde40f
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i65974
@@ -0,0 +1,12 @@
+--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	16 Sep 2006 17:46:13 -0000	1.7
++++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	22 Jun 2007 21:36:24 -0000
+@@ -94,6 +94,9 @@
+     static char const * ar[] = {
+ 
+         "/lib/" JFW_PLUGIN_ARCH "/client",
++#if SAL_TYPES_SIZEOFPOINTER == 8
++        "/lib/" JFW_PLUGIN_ARCH "/server",
++#endif
+         "/lib/" JFW_PLUGIN_ARCH "/native_threads", 
+         "/lib/" JFW_PLUGIN_ARCH
+ 
diff --git a/editors/openoffice.org-2/files/patch-i66667 b/editors/openoffice.org-2/files/patch-i66667
deleted file mode 100644
index c1d8cd362e9b..000000000000
--- a/editors/openoffice.org-2/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/files/patch-i67904 b/editors/openoffice.org-2/files/patch-i67904
deleted file mode 100644
index d2fb32236151..000000000000
--- a/editors/openoffice.org-2/files/patch-i67904
+++ /dev/null
@@ -1,80 +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.11
-diff -u -r1.11 mozilla-source-1.7.5.patch
---- moz/mozilla-source-1.7.5.patch	19 Jul 2006 09:37:17 -0000	1.11
-+++ moz/mozilla-source-1.7.5.patch	29 Jul 2006 09:53:10 -0000
-@@ -7705,7 +7705,7 @@
-  
- -#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
- +#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/files/patch-i69418 b/editors/openoffice.org-2/files/patch-i69418
deleted file mode 100644
index dd23c55e4c9b..000000000000
--- a/editors/openoffice.org-2/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/files/patch-i69994 b/editors/openoffice.org-2/files/patch-i69994
deleted file mode 100644
index 9d2718b4763c..000000000000
--- a/editors/openoffice.org-2/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/files/patch-i73157 b/editors/openoffice.org-2/files/patch-i73157
deleted file mode 100644
index 17d987622060..000000000000
--- a/editors/openoffice.org-2/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/files/patch-i73217 b/editors/openoffice.org-2/files/patch-i73217
index 3dc7b4e28912..712631a136f1 100644
--- a/editors/openoffice.org-2/files/patch-i73217
+++ b/editors/openoffice.org-2/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/files/patch-i76115 b/editors/openoffice.org-2/files/patch-i76115
deleted file mode 100644
index f090b4337b09..000000000000
--- a/editors/openoffice.org-2/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/files/patch-i76141 b/editors/openoffice.org-2/files/patch-i76141
deleted file mode 100644
index 03edb6bcf94b..000000000000
--- a/editors/openoffice.org-2/files/patch-i76141
+++ /dev/null
@@ -1,860 +0,0 @@
---- berkeleydb/db-4.2.52.patch	Fri Apr  6 21:51:24 2007
-+++ berkeleydb/db-4.2.52.patch	Fri Apr  6 21:51:52 2007
-@@ -255,6 +255,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*)
-+--- 9328,9334 ----
-+    ;;
-+  
-+  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!
-@@ -321,8 +338,59 @@
-   	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*)
-+--- 12883,12889 ----
-+    ;;
-+  
-+  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*)
-+--- 15860,15866 ----
-+    ;;
-+  
-+  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*)
-+--- 18125,18131 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 28556,28561 ****
----- 28556,28606 ----
-+--- 28567,28617 ----
-   rm -f conftest.$ac_objext conftest.$ac_ext
-   fi
-   
-@@ -376,7 +444,7 @@
-   cat >conftest.$ac_ext <<_ACEOF
- ***************
- *** 28971,28976 ****
----- 29016,29028 ----
-+--- 29027,29039 ----
-   x86/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
-   			cat >>confdefs.h <<\_ACEOF
-   #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
-@@ -388,7 +456,7 @@
- + 			cat >>confdefs.h <<\_ACEOF
- + #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
-   _ACEOF
--
-+  
-   
- *** 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	2006-12-01 13:57:19.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	Thu Jan 19 13:23:31 2006
-+++ libxml2/libxml2-2.6.17.patch	Wed Apr  4 18:38:01 2007
-@@ -1,6 +1,40 @@
- *** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
- --- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
- ***************
-+*** 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*)
-+***************
-+*** 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*)
-+***************
- *** 26339,26347 ****
-   
-   echo "$as_me:$LINENO: checking for setsockopt" >&5
---- libxmlsec/xmlsec1-1.2.6.patch	24 Oct 2006 13:31:14 -0000	1.16
-+++ libxmlsec/xmlsec1-1.2.6.patch	5 Apr 2007 00:47:31 -0000
-@@ -17,8 +17,25 @@
-   
-   .SUFFIXES:
-   .SUFFIXES: .c .lo .o .obj
--*** misc/xmlsec1-1.2.6/configure	Thu Aug 26 08:00:34 2004
----- misc/build/xmlsec1-1.2.6/configure	Thu Sep 28 18:00:38 2006
-+*** misc/xmlsec1-1.2.6/configure	Thu Aug 26 02:00:34 2004
-+--- misc/build/xmlsec1-1.2.6/configure	Wed Apr  4 20:43:24 2007
-+***************
-+*** 7778,7784 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 7778,7784 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- ***************
- *** 9046,9052 ****
-         ;;
-@@ -37,6 +54,57 @@
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-       archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ***************
-+*** 11497,11503 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11497,11503 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 14667,14673 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14667,14673 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17035,17041 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17035,17041 ----
-+    ;;
-+  
-+  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	Wed Apr  4 19:22:49 2007
-+++ moz/mozilla-source-1.7.5.patch	Wed Apr  4 21:08:38 2007
-@@ -134,6 +134,23 @@
- *** misc/mozilla/configure	2004-10-12 06:13:29.000000000 +0200
- --- misc/build/mozilla/configure	2006-02-24 09:41:55.000000000 +0100
- ***************
-+*** 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'
-@@ -174,6 +202,23 @@
- *** misc/mozilla/configure.in	2004-10-12 06:13:29.000000000 +0200
- --- misc/build/mozilla/configure.in	2006-02-24 09:41:55.000000000 +0100
- ***************
-+*** 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'
-@@ -211,6 +267,25 @@
-       CC="\$(CYGWIN_WRAPPER) $CC"
-       CXX="\$(CYGWIN_WRAPPER) $CXX"
-       CPP="\$(CYGWIN_WRAPPER) $CPP"
-+*** 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	2003-04-03 01:22:39.000000000 +0200
- --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper	2006-02-24 09:41:55.000000000 +0100
- ***************
-@@ -341,6 +416,23 @@
- *** misc/mozilla/directory/c-sdk/configure	2004-09-14 23:14:38.000000000 +0200
- --- misc/build/mozilla/directory/c-sdk/configure	2006-02-24 09:41:55.000000000 +0100
- ***************
-+*** 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 ****
- --- 3832,3838 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -363,6 +455,23 @@
- *** misc/mozilla/directory/c-sdk/configure.in	2004-09-14 23:14:38.000000000 +0200
- --- misc/build/mozilla/directory/c-sdk/configure.in	2006-02-24 09:41:55.000000000 +0100
- ***************
-+*** 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 ****
- --- 1144,1150 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -6830,6 +6939,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	2003-04-03 01:22:38.000000000 +0200
- --- misc/build/mozilla/nsprpub/build/cygwin-wrapper	2006-02-24 09:41:55.000000000 +0100
- ***************
-@@ -7060,6 +7207,25 @@
-       gDirServiceProvider->SetProfileDir(profileDir);  
-       mCurrentProfileName.Assign(aCurrentProfile);    
-       gProfileDataAccess->SetCurrentProfile(aCurrentProfile);
-+*** 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	2002-02-15 23:53:12.000000000 +0100
- --- misc/build/mozilla/security/coreconf/command.mk	2006-02-24 09:41:55.000000000 +0100
- ***************
---- neon/neon.patch	Tue Feb  6 09:08:59 2007
-+++ neon/neon.patch	Thu Apr  5 14:36:14 2007
-@@ -1,5 +1,24 @@
--*** misc/neon-0.24.7/src/config.h	Tue Jan 30 16:51:33 2007
----- misc/build/neon-0.24.7/src/config.h	Tue Jan 30 16:51:05 2007
-+*** misc/neon-0.24.7/configure	Mon Jul  5 14:35:21 2004
-+--- misc/build/neon-0.24.7/configure	Thu Apr  5 14:31:11 2007
-+***************
-+*** 6344,6350 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 6344,6350 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+*** misc/neon-0.24.7/src/config.h	Thu Apr  5 14:35:31 2007
-+--- misc/build/neon-0.24.7/src/config.h	Thu Apr  5 14:30:40 2007
- ***************
- *** 1 ****
- ! dummy
---- sablot/Sablot-0.52.patch	19 Jun 2006 17:27:11 -0000	1.20
-+++ sablot/Sablot-0.52.patch	5 Apr 2007 00:24:32 -0000
-@@ -632,3 +632,22 @@
-       };
-       return cnt;
-   }
-+*** misc/Sablot-0.52/tools/ltconfig	Fri Apr 13 05:50:59 2001
-+--- misc/build/Sablot-0.52/tools/ltconfig	Wed Apr  4 20:22:37 2007
-+***************
-+*** 1887,1893 ****
-+    ;;
-+    
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case "$version_type" in
-+      freebsd-elf*)
-+--- 1887,1893 ----
-+    ;;
-+    
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case "$version_type" in
-+      freebsd-elf*)
---- 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/files/patch-i78417 b/editors/openoffice.org-2/files/patch-i78417
new file mode 100644
index 000000000000..fee06f2fa429
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i78417
@@ -0,0 +1,10 @@
+--- sw/source/core/bastyp/swregion.cxx
++++ sw/source/core/bastyp/swregion.cxx
+@@ -79,6 +79,7 @@
+ {
+ 	if( rDel )
+ 	{
++		pData = (SwRect*) pData;
+ 		*(pData+nPos) = rRect;
+ 		rDel = FALSE;
+ 	}
diff --git a/editors/openoffice.org-2/files/patch-i78875 b/editors/openoffice.org-2/files/patch-i78875
new file mode 100644
index 000000000000..aff1f83eead5
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i78875
@@ -0,0 +1,31 @@
+Index: libtextcat/libtextcat-2.2.patch
+===================================================================
+RCS file: /cvs/external/libtextcat/libtextcat-2.2.patch,v
+retrieving revision 1.3
+diff -u -r1.3 libtextcat-2.2.patch
+--- libtextcat/libtextcat-2.2.patch	21 Jun 2007 16:05:43 -0000	1.3
++++ libtextcat/libtextcat-2.2.patch	25 Jun 2007 11:12:26 -0000
+@@ -18,6 +18,23 @@
+   # when you set need_version to no, make sure it does not cause -set_version
+   # flags to be left without arguments
+   archive_cmds=
++***************
++*** 6280,6286 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 6281,6287 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
+ *** misc/libtextcat-2.2/src/Makefile.in	Thu May 22 13:39:52 2003
+ --- misc/build/libtextcat-2.2/src/Makefile.in	Thu Jun 21 17:44:15 2007
+ ***************
diff --git a/editors/openoffice.org-2/files/patch-i80003 b/editors/openoffice.org-2/files/patch-i80003
new file mode 100644
index 000000000000..453610348c91
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i80003
@@ -0,0 +1,22 @@
+correct patch by jkim
+http://www.openoffice.org/nonav/issues/showattachment.cgi/47084/patch-i80003
+will be go into cws obo15.
+
+Index: libxslt/makefile.mk
+===================================================================
+RCS file: /cvs/external/libxslt/makefile.mk,v
+retrieving revision 1.7
+diff -u -r1.7 makefile.mk
+--- libxslt/makefile.mk	19 Jul 2007 11:21:19 -0000	1.7
++++ libxslt/makefile.mk	24 Jul 2007 20:33:55 -0000
+@@ -96,6 +96,10 @@
+ BUILD_DIR=$(CONFIGURE_DIR)
+ .ENDIF
+ 
++.IF "$(OS)"=="FREEBSD"
++xslt_LDFLAGS+=-L$(SOLARLIBDIR)
++.ENDIF
++
+ OUT2INC=libxslt$/*.h
+ 
+ .IF "$(OS)"=="MACOSX"
diff --git a/editors/openoffice.org-2/files/patch-i80129 b/editors/openoffice.org-2/files/patch-i80129
new file mode 100644
index 000000000000..90fd4ceb9dc5
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i80129
@@ -0,0 +1,18 @@
+Merely a workaround
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.14
+diff -u -r1.14 ure.scp
+--- scp2/source/ure/ure.scp	18 Jul 2007 08:07:32 -0000	1.14
++++ scp2/source/ure/ure.scp	27 Jul 2007 22:07:16 -0000
+@@ -610,6 +610,8 @@
+ #endif
+ #elif defined MACOSX
+     Name = SCP2_URE_DL_NORMAL(xml2.2);
++#elif defined FREEBSD
++    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
+ #else
+     Name = SCP2_URE_DL_VER(xml2, 2);
+ #endif
diff --git a/editors/openoffice.org-2/files/patch-i80295 b/editors/openoffice.org-2/files/patch-i80295
new file mode 100644
index 000000000000..d66798903a3c
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i80295
@@ -0,0 +1,20 @@
+Index: svx/source/dialog/cuifmsearch.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v
+retrieving revision 1.6
+diff -u -r1.6 cuifmsearch.hxx
+--- svx/source/dialog/cuifmsearch.hxx	31 Jul 2007 13:56:33 -0000	1.6
++++ svx/source/dialog/cuifmsearch.hxx	3 Aug 2007 05:35:05 -0000
+@@ -93,10 +93,10 @@
+ 
+ struct FmSearchProgress;
+ 
++class FmSearchEngine;
++
+ class FmSearchDialog : public ModalDialog
+ {
+-	friend class FmSearchEngine;
+-
+ 	// meine ganzen Controls
+     FixedLine       m_flSearchFor;
+ 	RadioButton		m_rbSearchForText;
diff --git a/editors/openoffice.org-2/files/rtld-workaround-i66667 b/editors/openoffice.org-2/files/rtld-workaround-i66667
index b73949eee465..26c0b1b4a88c 100644
--- a/editors/openoffice.org-2/files/rtld-workaround-i66667
+++ b/editors/openoffice.org-2/files/rtld-workaround-i66667
@@ -1,10 +1,10 @@
 Index: vcl/unx/gtk/app/gtkinst.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
-retrieving revision 1.14.88.1
-diff -u -r1.14.88.1 gtkinst.cxx
---- vcl/unx/gtk/app/gtkinst.cxx	10 Aug 2006 14:53:08 -0000	1.14.88.1
-+++ vcl/unx/gtk/app/gtkinst.cxx	21 Aug 2006 05:38:21 -0000
+retrieving revision 1.14
+diff -u -r1.14 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
++++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
 @@ -43,6 +43,7 @@
  #include <plugins/gtk/atkbridge.hxx>
  
@@ -13,14 +13,15 @@ diff -u -r1.14.88.1 gtkinst.cxx
  
  #if OSL_DEBUG_LEVEL > 1
  #include <stdio.h>
-@@ -111,13 +112,28 @@
+@@ -111,13 +112,27 @@
  		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
  		pYieldMutex->ThreadsLeave();
  	}
 -	static bool hookLocks( oslModule pModule )
 +	static bool hookLocks( void )
  	{
- 		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
+-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
++		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
  		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
  
 +		/* XXX GDK library path should be set by configure. */
@@ -37,14 +38,13 @@ diff -u -r1.14.88.1 gtkinst.cxx
 +#endif
 +			return false;
 +		}
-+
  		GdkLockFn gdk_threads_set_lock_functions =
 -				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
 +				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
  		if ( !gdk_threads_set_lock_functions )
  		{
  #if OSL_DEBUG_LEVEL > 1
-@@ -150,7 +166,7 @@
+@@ -150,7 +165,7 @@
  		if ( !g_thread_supported() )
  			g_thread_init( NULL );
  
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 22e7edd89a9a..5b8bf2721e9a 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -20,9 +20,6 @@ DISTFILES+=	${OOOSRC} unowinreg.dll:unowinreg
 .if defined(WITH_GPC)
 DISTFILES+=	gpc231.tar.Z:gpc
 .endif
-.if defined(WITH_GNUGCJ)
-DISTFILES+=	${ANT_DISTFILE}:antbin
-.endif
 EXTRACT_ONLY=	${OOOSRC}
 
 MAINTAINER=	openoffice@FreeBSD.org
@@ -34,7 +31,7 @@ DISTFILES+=	${CWSARCHIVE}:cws
 .endif
 CWSARCHIVE=	${WITH_CWS}.tar.gz
 
-OOOVERSION=	2.2.1
+OOOVERSION=	2.3.0
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -53,29 +50,29 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
-.if !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava
-.endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
+.if (${OSVERSION} >= 700000)
+BROKEN=		Build broken with JDK internal error
+.endif
+
 ONLY_FOR_ARCHS=	i386 amd64
 
 .if ${ARCH} == amd64
-GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 .else
-GCC_TARGET=		${ARCH}-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		18
-OOOTAG?=		OOF680_m${MILESTONE}
+MILESTONE?=		5
+OOOTAG?=		OOG680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
 EXECBASE?=		openoffice.org-${OOOVERSION}
@@ -86,7 +83,7 @@ EXECBASE=		openoffice.org-${OOOVERSION}-${WITH_CWS}
 DIST_SUBDIR=		openoffice.org2
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86_64
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
 .else
 PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 .endif
@@ -102,39 +99,19 @@ PKGNAMESUFFIX=		-${LANG_SUFFIX}
 
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-.if defined(WITH_GNUGCJ)
-GCCVER=41
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-BUILD_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
-RUN_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-RUN_DEPENDS+=	${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
-.else
-.if ${ARCH} == amd64
-GCCVER=41
-BUILD_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
-RUN_DEPENDS+=	gcc41:${PORTSDIR}/lang/gcc41
-.else
-GCCVER=34
-BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
-.endif
-.endif
-
+USE_GCC=	4.2
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CCACHE_PREFIX=	ccache
+OOOCC=		${CCACHE_PREFIX} ${CC}
+OOOCXX=		${CCACHE_PREFIX} ${CXX}
 .else
-CCACHE_PREFIX=
+OOOCC=		${CC}
+OOOCXX=		${CXX}
 .endif
-.if (${GCCVER} == 41)
-CC=	gcc41
-CXX=	g++41
-.endif
-.if (${GCCVER} == 34)
-CC=	gcc-ooo
-CXX=	g++-ooo
-.endif
-CC:=	${CCACHE_PREFIX} ${CC}
-CXX:=	${CCACHE_PREFIX} ${CXX}
+CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
+		CPPFLAGS="-I${LOCALBASE}/include"	\
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
@@ -142,15 +119,9 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
+		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
-.if defined(WITH_GNUGCJ)
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
-ANT_DISTFILE=	apache-ant-${ANT_VERSION}-bin.tar.bz2
-ANT_VERSION=	1.6.5
-.else
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-.endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -161,28 +132,19 @@ CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
-.if defined(WITH_GNUGCJ)
-CONFIGURE_ENV+=		PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}"
-.endif
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
 			--enable-symbols=SMALL
-
-.if ${ARCH} == amd64 || ${GCCVER} == 41
+.if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
-.endif
-.if (${GCCVER} == 41)
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
 .if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .endif
-.if defined(WITH_GNUGCJ)
-EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
-.endif
 .if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
 EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 .endif
@@ -213,9 +175,6 @@ post-extract:
 .if defined(WITH_CWS)
 	cd ${WRKSRC} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/${CWSARCHIVE}
 .endif
-.if defined(WITH_GNUGCJ)
-	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-.endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index a0242e93bb9f..558f5ccfa5ca 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,15 +1,12 @@
-MD5 (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = b078b19bdb92394b4f449e6ea0c6d0ff
-SHA256 (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = 16e5e5df57ad95ee7185141d45f8ebade2b31b6b569416bb0cfd6a032f6c9684
-SIZE (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = 268962943
+MD5 (openoffice.org2/OOo_OOG680_m5_source.tar.bz2) = deb17dd1ff727682e24965a213b41b7b
+SHA256 (openoffice.org2/OOo_OOG680_m5_source.tar.bz2) = 8fc02f802b928b5c88273eb482e1d9d79690e953b1317448a3eed506d3f88eca
+SIZE (openoffice.org2/OOo_OOG680_m5_source.tar.bz2) = 291604133
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
 MD5 (openoffice.org2/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2/gpc231.tar.Z) = 27917
-MD5 (openoffice.org2/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
-SHA256 (openoffice.org2/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
-SIZE (openoffice.org2/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 MD5 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SHA256 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
 SIZE (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index 4f35a20cc4a2..f31353c9e2fe 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/files/Makefile.knobs
@@ -2,11 +2,12 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
-.if !defined(WITH_GNUGCJ)
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}/lib/jvm/java-gcj41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
-.endif
+
+#.if defined(WITH_VBA)
+#CONFIGURE_ARGS+=        --enable-vba --with-vba-package-format="builtin"
+#EXTRA_PATCHES+=	${FILESDIR}/cws-npower7.diff
+#.endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
@@ -92,6 +93,11 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .endif
+#.if !defined(WITH_VBA)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with VBA support with"
+#	@${ECHO} "make -DWITH_VBA"
+#.endif
 .if !defined(WITH_SYSTEM_FREETYPE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with freetype2 from ports with"
@@ -120,11 +126,6 @@ pre-fetch:
 	@${ECHO} "zh-CN zh-TW zu"
 	@${ECHO} "Default: en-US"
 .endif
-.if !defined(WITH_GNUGCJ)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-	@${ECHO} "make -DWITH_GNUGCJ"
-.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
diff --git a/editors/openoffice.org-3/files/gcj-fbsdworkaround b/editors/openoffice.org-3/files/gcj-fbsdworkaround
deleted file mode 100644
index ee41bf0f6839..000000000000
--- a/editors/openoffice.org-3/files/gcj-fbsdworkaround
+++ /dev/null
@@ -1,30 +0,0 @@
---- config_office/configure~	Sat Mar  4 16:12:31 2006
-+++ config_office/configure	Sat Mar  4 16:12:45 2006
-@@ -7544,7 +7544,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgcjawt  $LIBS"
-+LIBS="-lgcjawt  -pthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-
-http://qa.openoffice.org/issues/show_bug.cgi?id=63095
-Index: stoc/source/javaloader/makefile.mk
-===================================================================
-RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
-retrieving revision 1.16
-diff -u -r1.16 makefile.mk
---- stoc/source/javaloader/makefile.mk	8 Sep 2005 07:57:58 -0000	1.16
-+++ stoc/source/javaloader/makefile.mk	13 Mar 2006 00:53:41 -0000
-@@ -59,7 +59,8 @@
- 		$(CPPUHELPERLIB) 	\
- 		$(CPPULIB)			\
- 		$(SALLIB) \
--        $(JVMACCESSLIB)
-+        $(JVMACCESSLIB) \
-+        -L/usr/local/lib -liconv
- 
- SHL1VERSIONMAP = javaloader.map
- SHL1DEPN=		
diff --git a/editors/openoffice.org-3/files/patch-i65514 b/editors/openoffice.org-3/files/patch-i65514
index 07755cda662b..cc8221264c59 100644
--- a/editors/openoffice.org-3/files/patch-i65514
+++ b/editors/openoffice.org-3/files/patch-i65514
@@ -1,141 +1,12 @@
-diff -u -r1.17 db-4.2.52.patch
---- berkeleydb/db-4.2.52.patch	1 Dec 2006 12:59:45 -0000	1.17
-+++ berkeleydb/db-4.2.52.patch	23 Jan 2007 07:10:29 -0000
-@@ -54,6 +54,20 @@
- ! SLOFILES= $(SLO)$/strcasecmp.obj
- ! 
- ! .INCLUDE :  target.mk
-+*** misc/db-4.2.52.NC/dist/config.hin	Wed Dec  3 16:10:00 2003
-+--- misc/build/db-4.2.52.NC/dist/config.hin	Fri May 19 17:37:41 2006
-+***************
-+*** 193,198 ****
-+--- 193,201 ----
-+  /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */
-+  #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
-+  
-++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */
-++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
-++ 
-+  /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-+  #undef HAVE_NDIR_H
-+
- *** misc/db-4.2.52.NC/common/makefile.mk	2006-12-01 13:57:33.000000000 +0100
- --- misc/build/db-4.2.52.NC/common/makefile.mk	2006-12-01 13:57:19.000000000 +0100
- ***************
-@@ -306,6 +320,76 @@
-   	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'
-+***************
-+*** 28556,28561 ****
-+--- 28556,28606 ----
-+  rm -f conftest.$ac_objext conftest.$ac_ext
-+  fi
-+  
-++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
-++ if test "$db_cv_mutex" = no; then
-++ cat >conftest.$ac_ext <<_ACEOF
-++ #line $LINENO "configure"
-++ /* confdefs.h.  */
-++ _ACEOF
-++ cat confdefs.h >>conftest.$ac_ext
-++ cat >>conftest.$ac_ext <<_ACEOF
-++ /* end confdefs.h.  */
-++ 
-++ int
-++ main ()
-++ {
-++ 
-++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__)
-++ 	exit(0);
-++ #else
-++ 	FAIL TO COMPILE/LINK
-++ #endif
-++ 
-++   ;
-++   return 0;
-++ }
-++ _ACEOF
-++ rm -f conftest.$ac_objext
-++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-++   (eval $ac_compile) 2>&5
-++   ac_status=$?
-++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } &&
-++          { ac_try='test -s conftest.$ac_objext'
-++   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-++   (eval $ac_try) 2>&5
-++   ac_status=$?
-++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); }; }; then
-++   db_cv_mutex="x86_64/gcc-assembly"
-++ else
-++   echo "$as_me: failed program was:" >&5
-++ sed 's/^/| /' conftest.$ac_ext >&5
-++ 
-++ fi
-++ rm -f conftest.$ac_objext conftest.$ac_ext
-++ fi
-++ 
-+  # S390/cc: IBM OS/390 Unix
-+  if test "$db_cv_mutex" = no; then
-+  cat >conftest.$ac_ext <<_ACEOF
-+***************
-+*** 28971,28976 ****
-+--- 29016,29028 ----
-+  x86/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
-+  			cat >>confdefs.h <<\_ACEOF
-+  #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
-++ _ACEOF
-++ 
-++ 
-++ ;;
-++ x86_64/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
-++ 			cat >>confdefs.h <<\_ACEOF
-++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
-+  _ACEOF
-+
-+  
- *** 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	2006-12-01 13:57:19.000000000 +0100
- ***************
-@@ -1059,3 +1143,39 @@
- ! 			$(SLO)$/xa_map.obj
- ! 
- ! .INCLUDE :  target.mk
-+*** misc/db-4.2.52.NC/dbinc/mutex.h	Sat Sep 20 17:40:49 2003
-+--- misc/build/db-4.2.52.NC/dbinc/mutex.h	Fri May 19 12:43:58 2006
-+***************
-+*** 781,786 ****
-+--- 781,811 ----
-+  #endif
-+  #endif
-+  
-++ /*********************************************************************
-++  * x86_64/gcc assembly.
-++  *********************************************************************/
-++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
-++ typedef unsigned char tsl_t;
-++ 
-++ #ifdef LOAD_ACTUAL_MUTEX_CODE
-++ /*
-++  * For gcc/x86-64, 0 is clear, 1 is set.
-++  */
-++ #define	MUTEX_SET(tsl) ({						\
-++ 	register tsl_t *__l = (tsl);					\
-++ 	int __r;							\
-++ 	asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
-++ 	    : "=&a" (__r), "=m" (*__l)					\
-++ 	    : "1" (*__l)						\
-++ 	    );								\
-++ 	__r & 1;							\
-++ })
-++ 
-++ #define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-++ #define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-++ #endif
-++ #endif
-++ 
-+  /*
-+   * Mutex alignment defaults to one byte.
-+   *
+--- berkeleydb/makefile.mk	25 May 2007 10:48:51 -0000	1.40
++++ berkeleydb/makefile.mk	2 Jul 2007 20:15:24 -0000
+@@ -107,6 +107,9 @@
+ .IF "$(SOLAR_JAVA)"!=""
+ CONFIGURE_FLAGS+=--enable-java
+ .ENDIF
++.IF "$(COM)$(CPU)"=="GCCX"
++CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
++.ENDIF
+ 
+ BUILD_DIR=$(CONFIGURE_DIR)
+ BUILD_DIR_OUT=$(CONFIGURE_DIR)
diff --git a/editors/openoffice.org-3/files/patch-i65974 b/editors/openoffice.org-3/files/patch-i65974
new file mode 100644
index 000000000000..40de0acde40f
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i65974
@@ -0,0 +1,12 @@
+--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	16 Sep 2006 17:46:13 -0000	1.7
++++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	22 Jun 2007 21:36:24 -0000
+@@ -94,6 +94,9 @@
+     static char const * ar[] = {
+ 
+         "/lib/" JFW_PLUGIN_ARCH "/client",
++#if SAL_TYPES_SIZEOFPOINTER == 8
++        "/lib/" JFW_PLUGIN_ARCH "/server",
++#endif
+         "/lib/" JFW_PLUGIN_ARCH "/native_threads", 
+         "/lib/" JFW_PLUGIN_ARCH
+ 
diff --git a/editors/openoffice.org-3/files/patch-i66667 b/editors/openoffice.org-3/files/patch-i66667
deleted file mode 100644
index c1d8cd362e9b..000000000000
--- a/editors/openoffice.org-3/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/files/patch-i67904 b/editors/openoffice.org-3/files/patch-i67904
deleted file mode 100644
index d2fb32236151..000000000000
--- a/editors/openoffice.org-3/files/patch-i67904
+++ /dev/null
@@ -1,80 +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.11
-diff -u -r1.11 mozilla-source-1.7.5.patch
---- moz/mozilla-source-1.7.5.patch	19 Jul 2006 09:37:17 -0000	1.11
-+++ moz/mozilla-source-1.7.5.patch	29 Jul 2006 09:53:10 -0000
-@@ -7705,7 +7705,7 @@
-  
- -#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
- +#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/files/patch-i69418 b/editors/openoffice.org-3/files/patch-i69418
deleted file mode 100644
index dd23c55e4c9b..000000000000
--- a/editors/openoffice.org-3/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/files/patch-i69994 b/editors/openoffice.org-3/files/patch-i69994
deleted file mode 100644
index 9d2718b4763c..000000000000
--- a/editors/openoffice.org-3/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/files/patch-i73157 b/editors/openoffice.org-3/files/patch-i73157
deleted file mode 100644
index 17d987622060..000000000000
--- a/editors/openoffice.org-3/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/files/patch-i73217 b/editors/openoffice.org-3/files/patch-i73217
index 3dc7b4e28912..712631a136f1 100644
--- a/editors/openoffice.org-3/files/patch-i73217
+++ b/editors/openoffice.org-3/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/files/patch-i76115 b/editors/openoffice.org-3/files/patch-i76115
deleted file mode 100644
index f090b4337b09..000000000000
--- a/editors/openoffice.org-3/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/files/patch-i76141 b/editors/openoffice.org-3/files/patch-i76141
deleted file mode 100644
index 03edb6bcf94b..000000000000
--- a/editors/openoffice.org-3/files/patch-i76141
+++ /dev/null
@@ -1,860 +0,0 @@
---- berkeleydb/db-4.2.52.patch	Fri Apr  6 21:51:24 2007
-+++ berkeleydb/db-4.2.52.patch	Fri Apr  6 21:51:52 2007
-@@ -255,6 +255,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*)
-+--- 9328,9334 ----
-+    ;;
-+  
-+  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!
-@@ -321,8 +338,59 @@
-   	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*)
-+--- 12883,12889 ----
-+    ;;
-+  
-+  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*)
-+--- 15860,15866 ----
-+    ;;
-+  
-+  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*)
-+--- 18125,18131 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
- *** 28556,28561 ****
----- 28556,28606 ----
-+--- 28567,28617 ----
-   rm -f conftest.$ac_objext conftest.$ac_ext
-   fi
-   
-@@ -376,7 +444,7 @@
-   cat >conftest.$ac_ext <<_ACEOF
- ***************
- *** 28971,28976 ****
----- 29016,29028 ----
-+--- 29027,29039 ----
-   x86/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
-   			cat >>confdefs.h <<\_ACEOF
-   #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
-@@ -388,7 +456,7 @@
- + 			cat >>confdefs.h <<\_ACEOF
- + #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
-   _ACEOF
--
-+  
-   
- *** 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	2006-12-01 13:57:19.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	Thu Jan 19 13:23:31 2006
-+++ libxml2/libxml2-2.6.17.patch	Wed Apr  4 18:38:01 2007
-@@ -1,6 +1,40 @@
- *** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
- --- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
- ***************
-+*** 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*)
-+***************
-+*** 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*)
-+***************
- *** 26339,26347 ****
-   
-   echo "$as_me:$LINENO: checking for setsockopt" >&5
---- libxmlsec/xmlsec1-1.2.6.patch	24 Oct 2006 13:31:14 -0000	1.16
-+++ libxmlsec/xmlsec1-1.2.6.patch	5 Apr 2007 00:47:31 -0000
-@@ -17,8 +17,25 @@
-   
-   .SUFFIXES:
-   .SUFFIXES: .c .lo .o .obj
--*** misc/xmlsec1-1.2.6/configure	Thu Aug 26 08:00:34 2004
----- misc/build/xmlsec1-1.2.6/configure	Thu Sep 28 18:00:38 2006
-+*** misc/xmlsec1-1.2.6/configure	Thu Aug 26 02:00:34 2004
-+--- misc/build/xmlsec1-1.2.6/configure	Wed Apr  4 20:43:24 2007
-+***************
-+*** 7778,7784 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 7778,7784 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
- ***************
- *** 9046,9052 ****
-         ;;
-@@ -37,6 +54,57 @@
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-       archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ***************
-+*** 11497,11503 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 11497,11503 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 14667,14673 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 14667,14673 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+***************
-+*** 17035,17041 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 17035,17041 ----
-+    ;;
-+  
-+  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	Wed Apr  4 19:22:49 2007
-+++ moz/mozilla-source-1.7.5.patch	Wed Apr  4 21:08:38 2007
-@@ -134,6 +134,23 @@
- *** misc/mozilla/configure	2004-10-12 06:13:29.000000000 +0200
- --- misc/build/mozilla/configure	2006-02-24 09:41:55.000000000 +0100
- ***************
-+*** 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'
-@@ -174,6 +202,23 @@
- *** misc/mozilla/configure.in	2004-10-12 06:13:29.000000000 +0200
- --- misc/build/mozilla/configure.in	2006-02-24 09:41:55.000000000 +0100
- ***************
-+*** 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'
-@@ -211,6 +267,25 @@
-       CC="\$(CYGWIN_WRAPPER) $CC"
-       CXX="\$(CYGWIN_WRAPPER) $CXX"
-       CPP="\$(CYGWIN_WRAPPER) $CPP"
-+*** 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	2003-04-03 01:22:39.000000000 +0200
- --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper	2006-02-24 09:41:55.000000000 +0100
- ***************
-@@ -341,6 +416,23 @@
- *** misc/mozilla/directory/c-sdk/configure	2004-09-14 23:14:38.000000000 +0200
- --- misc/build/mozilla/directory/c-sdk/configure	2006-02-24 09:41:55.000000000 +0100
- ***************
-+*** 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 ****
- --- 3832,3838 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -363,6 +455,23 @@
- *** misc/mozilla/directory/c-sdk/configure.in	2004-09-14 23:14:38.000000000 +0200
- --- misc/build/mozilla/directory/c-sdk/configure.in	2006-02-24 09:41:55.000000000 +0100
- ***************
-+*** 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 ****
- --- 1144,1150 ----
-       MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -6830,6 +6939,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	2003-04-03 01:22:38.000000000 +0200
- --- misc/build/mozilla/nsprpub/build/cygwin-wrapper	2006-02-24 09:41:55.000000000 +0100
- ***************
-@@ -7060,6 +7207,25 @@
-       gDirServiceProvider->SetProfileDir(profileDir);  
-       mCurrentProfileName.Assign(aCurrentProfile);    
-       gProfileDataAccess->SetCurrentProfile(aCurrentProfile);
-+*** 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	2002-02-15 23:53:12.000000000 +0100
- --- misc/build/mozilla/security/coreconf/command.mk	2006-02-24 09:41:55.000000000 +0100
- ***************
---- neon/neon.patch	Tue Feb  6 09:08:59 2007
-+++ neon/neon.patch	Thu Apr  5 14:36:14 2007
-@@ -1,5 +1,24 @@
--*** misc/neon-0.24.7/src/config.h	Tue Jan 30 16:51:33 2007
----- misc/build/neon-0.24.7/src/config.h	Tue Jan 30 16:51:05 2007
-+*** misc/neon-0.24.7/configure	Mon Jul  5 14:35:21 2004
-+--- misc/build/neon-0.24.7/configure	Thu Apr  5 14:31:11 2007
-+***************
-+*** 6344,6350 ****
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+--- 6344,6350 ----
-+    ;;
-+  
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case $version_type in
-+      freebsd-elf*)
-+*** misc/neon-0.24.7/src/config.h	Thu Apr  5 14:35:31 2007
-+--- misc/build/neon-0.24.7/src/config.h	Thu Apr  5 14:30:40 2007
- ***************
- *** 1 ****
- ! dummy
---- sablot/Sablot-0.52.patch	19 Jun 2006 17:27:11 -0000	1.20
-+++ sablot/Sablot-0.52.patch	5 Apr 2007 00:24:32 -0000
-@@ -632,3 +632,22 @@
-       };
-       return cnt;
-   }
-+*** misc/Sablot-0.52/tools/ltconfig	Fri Apr 13 05:50:59 2001
-+--- misc/build/Sablot-0.52/tools/ltconfig	Wed Apr  4 20:22:37 2007
-+***************
-+*** 1887,1893 ****
-+    ;;
-+    
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    version_type=freebsd-$objformat
-+    case "$version_type" in
-+      freebsd-elf*)
-+--- 1887,1893 ----
-+    ;;
-+    
-+  freebsd*)
-+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+    version_type=freebsd-$objformat
-+    case "$version_type" in
-+      freebsd-elf*)
---- 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/files/patch-i78417 b/editors/openoffice.org-3/files/patch-i78417
new file mode 100644
index 000000000000..fee06f2fa429
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i78417
@@ -0,0 +1,10 @@
+--- sw/source/core/bastyp/swregion.cxx
++++ sw/source/core/bastyp/swregion.cxx
+@@ -79,6 +79,7 @@
+ {
+ 	if( rDel )
+ 	{
++		pData = (SwRect*) pData;
+ 		*(pData+nPos) = rRect;
+ 		rDel = FALSE;
+ 	}
diff --git a/editors/openoffice.org-3/files/patch-i78875 b/editors/openoffice.org-3/files/patch-i78875
new file mode 100644
index 000000000000..aff1f83eead5
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i78875
@@ -0,0 +1,31 @@
+Index: libtextcat/libtextcat-2.2.patch
+===================================================================
+RCS file: /cvs/external/libtextcat/libtextcat-2.2.patch,v
+retrieving revision 1.3
+diff -u -r1.3 libtextcat-2.2.patch
+--- libtextcat/libtextcat-2.2.patch	21 Jun 2007 16:05:43 -0000	1.3
++++ libtextcat/libtextcat-2.2.patch	25 Jun 2007 11:12:26 -0000
+@@ -18,6 +18,23 @@
+   # when you set need_version to no, make sure it does not cause -set_version
+   # flags to be left without arguments
+   archive_cmds=
++***************
++*** 6280,6286 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 6281,6287 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
+ *** misc/libtextcat-2.2/src/Makefile.in	Thu May 22 13:39:52 2003
+ --- misc/build/libtextcat-2.2/src/Makefile.in	Thu Jun 21 17:44:15 2007
+ ***************
diff --git a/editors/openoffice.org-3/files/patch-i80003 b/editors/openoffice.org-3/files/patch-i80003
new file mode 100644
index 000000000000..453610348c91
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i80003
@@ -0,0 +1,22 @@
+correct patch by jkim
+http://www.openoffice.org/nonav/issues/showattachment.cgi/47084/patch-i80003
+will be go into cws obo15.
+
+Index: libxslt/makefile.mk
+===================================================================
+RCS file: /cvs/external/libxslt/makefile.mk,v
+retrieving revision 1.7
+diff -u -r1.7 makefile.mk
+--- libxslt/makefile.mk	19 Jul 2007 11:21:19 -0000	1.7
++++ libxslt/makefile.mk	24 Jul 2007 20:33:55 -0000
+@@ -96,6 +96,10 @@
+ BUILD_DIR=$(CONFIGURE_DIR)
+ .ENDIF
+ 
++.IF "$(OS)"=="FREEBSD"
++xslt_LDFLAGS+=-L$(SOLARLIBDIR)
++.ENDIF
++
+ OUT2INC=libxslt$/*.h
+ 
+ .IF "$(OS)"=="MACOSX"
diff --git a/editors/openoffice.org-3/files/patch-i80129 b/editors/openoffice.org-3/files/patch-i80129
new file mode 100644
index 000000000000..90fd4ceb9dc5
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i80129
@@ -0,0 +1,18 @@
+Merely a workaround
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.14
+diff -u -r1.14 ure.scp
+--- scp2/source/ure/ure.scp	18 Jul 2007 08:07:32 -0000	1.14
++++ scp2/source/ure/ure.scp	27 Jul 2007 22:07:16 -0000
+@@ -610,6 +610,8 @@
+ #endif
+ #elif defined MACOSX
+     Name = SCP2_URE_DL_NORMAL(xml2.2);
++#elif defined FREEBSD
++    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
+ #else
+     Name = SCP2_URE_DL_VER(xml2, 2);
+ #endif
diff --git a/editors/openoffice.org-3/files/patch-i80295 b/editors/openoffice.org-3/files/patch-i80295
new file mode 100644
index 000000000000..d66798903a3c
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i80295
@@ -0,0 +1,20 @@
+Index: svx/source/dialog/cuifmsearch.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v
+retrieving revision 1.6
+diff -u -r1.6 cuifmsearch.hxx
+--- svx/source/dialog/cuifmsearch.hxx	31 Jul 2007 13:56:33 -0000	1.6
++++ svx/source/dialog/cuifmsearch.hxx	3 Aug 2007 05:35:05 -0000
+@@ -93,10 +93,10 @@
+ 
+ struct FmSearchProgress;
+ 
++class FmSearchEngine;
++
+ class FmSearchDialog : public ModalDialog
+ {
+-	friend class FmSearchEngine;
+-
+ 	// meine ganzen Controls
+     FixedLine       m_flSearchFor;
+ 	RadioButton		m_rbSearchForText;
diff --git a/editors/openoffice.org-3/files/rtld-workaround-i66667 b/editors/openoffice.org-3/files/rtld-workaround-i66667
index b73949eee465..26c0b1b4a88c 100644
--- a/editors/openoffice.org-3/files/rtld-workaround-i66667
+++ b/editors/openoffice.org-3/files/rtld-workaround-i66667
@@ -1,10 +1,10 @@
 Index: vcl/unx/gtk/app/gtkinst.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
-retrieving revision 1.14.88.1
-diff -u -r1.14.88.1 gtkinst.cxx
---- vcl/unx/gtk/app/gtkinst.cxx	10 Aug 2006 14:53:08 -0000	1.14.88.1
-+++ vcl/unx/gtk/app/gtkinst.cxx	21 Aug 2006 05:38:21 -0000
+retrieving revision 1.14
+diff -u -r1.14 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
++++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
 @@ -43,6 +43,7 @@
  #include <plugins/gtk/atkbridge.hxx>
  
@@ -13,14 +13,15 @@ diff -u -r1.14.88.1 gtkinst.cxx
  
  #if OSL_DEBUG_LEVEL > 1
  #include <stdio.h>
-@@ -111,13 +112,28 @@
+@@ -111,13 +112,27 @@
  		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
  		pYieldMutex->ThreadsLeave();
  	}
 -	static bool hookLocks( oslModule pModule )
 +	static bool hookLocks( void )
  	{
- 		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
+-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
++		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
  		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
  
 +		/* XXX GDK library path should be set by configure. */
@@ -37,14 +38,13 @@ diff -u -r1.14.88.1 gtkinst.cxx
 +#endif
 +			return false;
 +		}
-+
  		GdkLockFn gdk_threads_set_lock_functions =
 -				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
 +				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
  		if ( !gdk_threads_set_lock_functions )
  		{
  #if OSL_DEBUG_LEVEL > 1
-@@ -150,7 +166,7 @@
+@@ -150,7 +165,7 @@
  		if ( !g_thread_supported() )
  			g_thread_init( NULL );