Update to OOO340_m0. This is 3.4 beta.

cf.
http://development.openoffice.org/releases/3.4beta.html
http://openoffice.org/projects/www/lists/cws-announce/archive/2011-04/message/16
http://permalink.gmane.org/gmane.comp.openoffice.announce.cws/1886

11 files changed, 644 insertions, 46 deletions

diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 512c2fe4f11a..1419459fd308 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	openoffice.org
-PORTVERSION=	3.3.${SNAPDATE}
+PORTVERSION=	3.4.${SNAPDATE}
 CATEGORIES=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/:extsrc \
+		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/:l10nsdf \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
 DISTFILES+=	${OOOSRC} ${OOOEXTSRC} unowinreg.dll:unowinreg
 
@@ -18,13 +19,11 @@ DISTFILES+=	${OOOSRC} ${OOOEXTSRC} unowinreg.dll:unowinreg
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch)
 
-IGNORE=		3.3.0 has just been released
-
 CONFLICTS=	cppunit*
 
 EXTRATC_ONLY?=	${OOOSRC} ${OOOEXTSRC}
 
-OOOEXTSRC=	ext_sources.20101009.tar.bz2:extsrc
+OOOEXTSRC=	ext_sources.20110331.tar.bz2:extsrc l10n.OOO340.20110613.tar.bz2:l10nsdf
 
 NO_LATEST_LINK=	yes
 
@@ -70,12 +69,12 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		20
-OOOTAG?=		OOO330_m${MILESTONE}
+MILESTONE?=		0
+OOOTAG?=		OOO340_m${MILESTONE}
 OOOTAG2=		${OOOTAG:C/_//g}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20110121
+SNAPDATE=		20110409
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
@@ -148,9 +147,10 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--enable-pdfimport				\
 			--enable-wiki-publisher				\
 			--enable-report-builder				\
-			--with-use-shell=bash				\
+			--enable-verbose				\
+			--disable-gstreamer				\
 			--with-vendor="FreeBSD ports system"
-
+#disable-gstreamer: simple build fix req'ed
 OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
 OOOEXTENSIONS+=		presenter/presenter-screen.oxt
 OOOEXTENSIONS+=		pdfimport/pdfimport.oxt
@@ -193,8 +193,11 @@ pre-configure:
 .endif
 
 do-build:
+	@cd ${WRKDIR} ; ${PRINTF} "[repositories]\n" > source_config
+	@cd ${WRKDIR} ; ${PRINTF} "${OOOTAG}=active\n" >> source_config
+	@cd ${WRKDIR} ; ${PRINTF} "l10n=active\n" >> source_config
 	@cd ${WRKSRC} ; ./bootstrap
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "LIBINTL_PREFIX=${PREFIX}" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "LIBINTL_PREFIX=${PREFIX}" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; ../solenv/bin/build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
 
 .if ${LOCALIZED_LANG} == "alllangs"
 	@${MAKE} languagepack
@@ -218,7 +221,6 @@ do-install:
 	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
 	@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
-	@${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
 .else
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
@@ -232,7 +234,6 @@ do-install:
 .endif
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
 	@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
-	@${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
@@ -266,7 +267,7 @@ post-install:
 		-e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \
 		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop
 	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/qstart.desktop
+		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop
 	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
 	@${RM} -f ${DESKTOPDIR}/${EXECBASE}
 	@${MKDIR} ${DESKTOPDIR}
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index d0f64f68165b..00759f528c98 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,6 +1,8 @@
-SHA256 (openoffice.org3/OOo_OOO330_m20_source.tar.bz2) = dca1ca546ca54b678aa1d53ca541add50484a54bcd8dc19061e9932332d489f3
-SIZE (openoffice.org3/OOo_OOO330_m20_source.tar.bz2) = 308995356
-SHA256 (openoffice.org3/ext_sources.20101009.tar.bz2) = e29d5c4f4264d1408119bb997aaae3a21ffb320bc67c8d83be2e6287b4f837f6
-SIZE (openoffice.org3/ext_sources.20101009.tar.bz2) = 214165372
+SHA256 (openoffice.org3/OOo_OOO340_m0_source.tar.bz2) = 449db461fc6883afaecd5c5ba2dd2d63a9f9c6663ebb7f374e446e0805633f7e
+SIZE (openoffice.org3/OOo_OOO340_m0_source.tar.bz2) = 227339297
+SHA256 (openoffice.org3/ext_sources.20110331.tar.bz2) = 0ffa08f29a13a3d7e9bdcc8feb120b31398c46de4a1ba2be6665258f5caeeac3
+SIZE (openoffice.org3/ext_sources.20110331.tar.bz2) = 260892348
+SHA256 (openoffice.org3/l10n.OOO340.20110613.tar.bz2) = 568911ded002ec32c0b0a4eeede0a0510475626cfb0dcffd124716160302e9da
+SIZE (openoffice.org3/l10n.OOO340.20110613.tar.bz2) = 78997629
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-RC/files/patch-i108197 b/editors/openoffice.org-3-RC/files/patch-i108197
index 92b455532814..e25d98261f57 100644
--- a/editors/openoffice.org-3-RC/files/patch-i108197
+++ b/editors/openoffice.org-3-RC/files/patch-i108197
@@ -1,9 +1,9 @@
---- testtools/source/bridgetest/makefile.mk	2010-01-10 19:40:41.000000000 +0900
-+++ testtools/source/bridgetest/makefile.mk	2010-01-10 19:49:30.000000000 +0900
-@@ -143,8 +143,8 @@
- #################################################################
+--- testtools/source/bridgetest/makefile.mk.orig	2010-10-05 11:12:22.000000000 +0900
++++ testtools/source/bridgetest/makefile.mk	2010-10-09 15:05:22.000000000 +0900
+@@ -138,8 +138,8 @@
  
- runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk
+ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
+         $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
 -.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
 -	@echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me."
 +.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
diff --git a/editors/openoffice.org-3-RC/files/patch-i116477 b/editors/openoffice.org-3-RC/files/patch-i116477
new file mode 100644
index 000000000000..b6b3386f8135
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i116477
@@ -0,0 +1,455 @@
+--- solenv/gbuild/gbuild.mk	2010-12-23 16:46:52.000000000 +0900
++++ solenv/gbuild/gbuild.mk	2010-12-23 16:46:02.000000000 +0900
+@@ -120,11 +120,15 @@
+ ifeq ($(OS),MACOSX)
+ include $(GBUILDDIR)/platform/macosx.mk
+ else
++ifeq ($(OS),FREEBSD)
++include $(GBUILDDIR)/platform/freebsd.mk
++else
+ $(eval $(call gb_Output_error,Unsupported OS: $(OS)))
+ endif
+ endif
+ endif
+ endif
++endif
+ 
+ include $(foreach repo,$(gb_REPOS),$(repo)/RepositoryFixes.mk)
+ 
+--- /dev/null	2011-06-10 18:44:00.000000000 +0900
++++ solenv/gbuild/platform/freebsd.mk	2011-06-10 18:42:14.000000000 +0900
+@@ -0,0 +1,406 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2000, 2011 Oracle and/or its affiliates.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++GUI := UNX
++COM := GCC
++
++gb_MKTEMP := gmktemp -t gbuild.XXXXXX
++
++gb_CC := cc
++gb_CXX := g++
++gb_GCCP := gcc
++gb_AR := ar
++gb_AWK := awk
++gb_CLASSPATHSEP := :
++
++# normalize setsolar and configure env.
++ifeq ($(CPU),X)
++CPUNAME := X86_64
++endif
++
++# use CC/CXX if they are nondefaults
++ifneq ($(origin CC),default)
++gb_CC := $(CC)
++gb_GCCP := $(CC)
++endif
++ifneq ($(origin CXX),default)
++gb_CXX := $(CXX)
++endif
++
++gb_OSDEFS := \
++	-D$(OS) \
++	-D_PTHREADS \
++	-DUNIX \
++	-DUNX \
++	$(PTHREAD_CFLAGS) \
++
++ifeq ($(GXX_INCLUDE_PATH),)
++GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
++endif
++
++gb_COMPILERDEFS := \
++	-D$(COM) \
++	-DHAVE_GCC_VISIBILITY_FEATURE \
++	-DCPPU_ENV=gcc3 \
++	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
++
++ifeq ($(CPUNAME),X86_64)
++gb_CPUDEFS := -D$(CPUNAME)
++else
++gb_CPUDEFS := -DX86
++endif
++
++gb_CFLAGS := \
++	-Wall \
++	-Wendif-labels \
++	-Wextra \
++	-Wshadow \
++	-fPIC \
++	-fmessage-length=0 \
++	-fno-common \
++	-fno-strict-aliasing \
++	-fvisibility=hidden \
++	-pipe \
++
++gb_CXXFLAGS := \
++	-Wall \
++	-Wendif-labels \
++	-Wextra \
++	-Wno-ctor-dtor-privacy \
++	-Wno-non-virtual-dtor \
++	-Wshadow \
++	-fPIC \
++	-fmessage-length=0 \
++	-fno-common \
++	-fno-strict-aliasing \
++	-fno-use-cxa-atexit \
++	-fvisibility-inlines-hidden \
++	-fvisibility=hidden \
++	-pipe \
++
++ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
++gb_CFLAGS_WERROR := -Werror
++gb_CXXFLAGS_WERROR := -Werror
++endif
++
++ifneq ($(strip $(SYSBASE)),)
++#gb_CXXFLAGS += --sysroot=$(SYSBASE)
++#gb_CFLAGS += --sysroot=$(SYSBASE)
++endif
++gb_LinkTarget_EXCEPTIONFLAGS := \
++	-DEXCEPTIONS_ON \
++	-fexceptions \
++	-fno-enforce-eh-specs \
++
++gb_LinkTarget_NOEXCEPTIONFLAGS := \
++	-DEXCEPTIONS_OFF \
++	-fno-exceptions \
++
++gb_LinkTarget_LDFLAGS := \
++	-Wl,-rpath-link=$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
++	-Wl,-z,combreloc \
++	-Wl,-z,defs \
++	$(subst -L../lib , ,$(SOLARLIB)) \
++
++ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
++gb_LinkTarget_LDFLAGS += \
++	-Wl,--hash-style=both \
++
++endif
++
++ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
++gb_LinkTarget_LDFLAGS += \
++	-Wl,--dynamic-list-cpp-new \
++	-Wl,--dynamic-list-cpp-typeinfo \
++	-Wl,-Bsymbolic-functions \
++
++endif
++
++ifeq ($(gb_DEBUGLEVEL),2)
++gb_COMPILEROPTFLAGS := -O0
++else
++gb_COMPILEROPTFLAGS := -Os
++endif
++
++gb_COMPILERNOOPTFLAGS := -O0
++
++# Helper class
++
++gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
++
++
++# CObject class
++
++define gb_CObject__command
++$(call gb_Output_announce,$(2),$(true),C  ,3)
++$(call gb_Helper_abbreviate_dirs,\
++	mkdir -p $(dir $(1)) && \
++	mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
++	$(gb_CC) \
++		$(DEFS) $(CFLAGS) \
++		-c $(3) \
++		-o $(1) \
++		-MMD -MT $(call gb_CObject_get_target,$(2)) \
++		-MF $(call gb_CObject_get_dep_target,$(2)) \
++		-I$(dir $(3)) \
++		$(INCLUDE))
++endef
++
++
++# CxxObject class
++
++define gb_CxxObject__command
++$(call gb_Output_announce,$(2),$(true),CXX,3)
++$(call gb_Helper_abbreviate_dirs,\
++	mkdir -p $(dir $(1)) && \
++	mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
++	$(gb_CXX) \
++		$(DEFS) $(CXXFLAGS) \
++		-c $(3) \
++		-o $(1) \
++		-MMD -MT $(call gb_CxxObject_get_target,$(2)) \
++		-MF $(call gb_CxxObject_get_dep_target,$(2)) \
++		-I$(dir $(3)) \
++		$(INCLUDE_STL) $(INCLUDE))
++endef
++
++
++# LinkTarget class
++
++define gb_LinkTarget__get_rpath_for_layer
++$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
++endef
++
++gb_LinkTarget__RPATHS := \
++	URELIB:\dORIGIN \
++	UREBIN:\dORIGIN/../lib:\dORIGIN \
++	OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
++	BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib \
++	SDKBIN:\dORIGIN/../../ure-link/lib \
++	NONEBIN:\dORIGIN/../lib:\dORIGIN \
++
++gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
++gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
++
++ifeq ($(gb_DEBUGLEVEL),2)
++gb_LinkTarget_CXXFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
++gb_LinkTarget_CFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
++
++endif
++
++gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
++gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
++
++define gb_LinkTarget__command_dynamiclink
++$(call gb_Helper_abbreviate_dirs,\
++	mkdir -p $(dir $(1)) && \
++	$(gb_CXX) \
++		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
++		$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
++		$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
++		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
++		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
++		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
++		-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
++		-o $(1))
++endef
++
++define gb_LinkTarget__command_staticlink
++$(call gb_Helper_abbreviate_dirs,\
++	mkdir -p $(dir $(1)) && \
++	$(gb_AR) -rsu $(1) \
++		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
++		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
++		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
++		2> /dev/null)
++endef
++
++define gb_LinkTarget__command
++$(call gb_Output_announce,$(2),$(true),LNK,4)
++$(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1)))
++$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
++endef
++
++
++# Library class
++
++gb_Library_DEFS :=
++gb_Library_TARGETTYPEFLAGS := -shared -Wl,-z,noexecstack
++gb_Library_SYSPRE := lib
++gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
++gb_Library_PLAINEXT := .so
++gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
++ifeq ($(gb_PRODUCT),$(true))
++gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT)
++else
++gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT)
++endif
++
++ifeq ($(CPUNAME),X86_64)
++gb_Library_OOOEXT := fx$(gb_Library_PLAINEXT)
++gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
++else
++gb_Library_OOOEXT := fi$(gb_Library_PLAINEXT)
++gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
++endif
++
++gb_Library_PLAINLIBS_NONE += \
++	dl \
++	jpeg \
++	m \
++	pthread \
++	X11 \
++	z
++
++gb_Library_FILENAMES := \
++	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
++	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
++	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
++	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
++	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
++	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
++	$(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \
++	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
++	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
++	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
++
++
++gb_Library_LAYER := \
++	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
++	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
++	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
++	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
++	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
++	$(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \
++	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
++	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
++	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
++
++define gb_Library_get_rpath
++-Wl,-z,origin -Wl,-rpath,'$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \
++-Wl,-rpath-link,'$(gb_Library_OUTDIRLOCATION)'
++endef
++
++define gb_Library_Library_platform
++$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1))
++
++endef
++
++
++# StaticLibrary class
++
++gb_StaticLibrary_DEFS :=
++gb_StaticLibrary_SYSPRE := lib
++gb_StaticLibrary_PLAINEXT := .a
++gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
++
++gb_StaticLibrary_FILENAMES := \
++	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
++	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
++
++gb_StaticLibrary_StaticLibrary_platform =
++
++
++# Executable class
++
++gb_Executable_EXT :=
++
++gb_Executable_LAYER := \
++	$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
++	$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
++	$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
++	$(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
++	$(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
++
++
++define gb_Executable_get_rpath
++'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' \
++-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
++endef
++
++define gb_Executable_Executable_platform
++$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Executable_get_rpath,$(1))
++
++endef
++
++
++# CppunitTest class
++
++gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
++gb_CppunitTest_SYSPRE := libtest_
++gb_CppunitTest_EXT := .so
++gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
++gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
++
++define gb_CppunitTest_CppunitTest_platform
++$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
++
++endef
++
++# JunitTest class
++
++define gb_JunitTest_JunitTest_platform
++$(call gb_JunitTest_get_target,$(1)) : DEFS := \
++	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice}" \
++    -Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
++    -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
++
++endef
++
++# SdiTarget class
++
++gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
++
++# SrsPartMergeTarget
++
++gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
++
++# SrsPartTarget class
++
++gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
++gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
++
++define gb_SrsPartTarget__command_dep
++$(call gb_Helper_abbreviate_dirs,\
++	$(gb_GCCP) \
++		-MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
++		$(INCLUDE) \
++		$(DEFS) \
++		-c -x c++-header $(2) \
++		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
++endef
++
++
++# ComponentTarget
++
++gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
++gb_Library_COMPONENTPREFIXES := \
++    OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
++    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
++
++
++# vim: set noet sw=4 ts=4:
+
+--- RepositoryFixes.mk	2010-12-23 11:31:10.000000000 +0900
++++ RepositoryFixes.mk	2011-01-22 18:43:30.000000000 +0900
+@@ -169,6 +169,23 @@
+ 
+ endif
+ 
++ifeq ($(OS),FREEBSD)
++gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
++gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
++gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
++gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
++gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
++gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
++gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
++gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
++
++ifeq ($(USE_SYSTEM_STL),YES)
++gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
++gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
++endif
++
++endif
++
+ # we do not require a known rule for these, when using system libs
+ 
+ ifeq ($(USE_SYSTEM_STL),YES)
+
diff --git a/editors/openoffice.org-3-RC/files/patch-i116699 b/editors/openoffice.org-3-RC/files/patch-i116699
new file mode 100644
index 000000000000..bae040580048
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i116699
@@ -0,0 +1,11 @@
+--- framework/Library_fwe.mk.orig	2011-02-15 18:20:16.000000000 +0900
++++ framework/Library_fwe.mk	2011-02-19 13:09:58.000000000 +0900
+@@ -99,5 +99,8 @@
+ ifeq ($(OS),LINUX)
+ $(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
+ endif
++ifeq ($(OS),FREEBSD)
++$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
++endif
+ 
+ # vim: set noet sw=4 ts=4:
diff --git a/editors/openoffice.org-3-RC/files/patch-i65514 b/editors/openoffice.org-3-RC/files/patch-i65514
index f12266b5fede..1db72be7b5bd 100644
--- a/editors/openoffice.org-3-RC/files/patch-i65514
+++ b/editors/openoffice.org-3-RC/files/patch-i65514
@@ -1,9 +1,9 @@
---- berkeleydb/makefile.mk	2009-09-26 08:52:35.000000000 +0900
-+++ berkeleydb/makefile.mk	2009-09-26 08:54:31.000000000 +0900
-@@ -102,6 +102,9 @@
+--- berkeleydb/makefile.mk	2011-06-13 13:30:42.000000000 +0900
++++ berkeleydb/makefile.mk	2011-06-13 13:33:39.000000000 +0900
+@@ -97,6 +97,9 @@
  CONFIGURE_ACTION= \
  	..$/dist$/configure
- CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+ CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 CC='$(CC) $(SOLARLIB)'
 +.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX"
 +CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
 +.ENDIF
diff --git a/editors/openoffice.org-3-RC/files/patch-i91318 b/editors/openoffice.org-3-RC/files/patch-i91318
index 4348b75903da..3e5c3638b075 100644
--- a/editors/openoffice.org-3-RC/files/patch-i91318
+++ b/editors/openoffice.org-3-RC/files/patch-i91318
@@ -1,11 +1,11 @@
---- hyphen/hyphen-2.4.patch	2010-05-05 12:40:53.000000000 +0900
-+++ hyphen/hyphen-2.4.patch	2010-05-05 12:41:25.000000000 +0900
-@@ -167,3 +167,11 @@
+--- hyphen/hyphen-2.7.1.patch	2011-02-03 11:01:19.000000000 +0900
++++ hyphen/hyphen-2.7.1.patch	2011-02-06 06:21:47.000000000 +0900
+@@ -70,3 +70,11 @@
  +
  +.INCLUDE : target.mk
- Common subdirectories: misc/hyphen-2.4/tests and misc/build/hyphen-2.4/tests
-+--- misc/hyphen-2.4/tests/test.sh	2010-05-05 12:40:17.000000000 +0900
-++++ misc/build/hyphen-2.4/tests/test.sh	2010-05-05 12:40:31.000000000 +0900
+ +
++--- misc/hyphen-2.7.1/tests/test.sh	2010-05-05 12:40:17.000000000 +0900
+++++ misc/build/hyphen-2.7.1/tests/test.sh	2010-05-05 12:40:31.000000000 +0900
 +@@ -1,4 +1,4 @@
 +-#!/bin/bash
 ++#!/usr/bin/env bash
diff --git a/editors/openoffice.org-3-RC/files/patch-i91861 b/editors/openoffice.org-3-RC/files/patch-i91861
deleted file mode 100644
index 85dfde19f963..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-i91861
+++ /dev/null
@@ -1,14 +0,0 @@
---- vcl/source/glyphs/makefile.mk~	2009-11-18 13:58:31.000000000 +0900
-+++ vcl/source/glyphs/makefile.mk	2009-11-29 20:13:21.000000000 +0900
-@@ -41,7 +41,11 @@
- .INCLUDE :  settings.mk
- .INCLUDE :  $(PRJ)$/util$/makefile2.pmk
- 
-+.IF "$(OS)" != "FREEBSD"
- CFLAGS+= $(FREETYPE_CFLAGS)
-+.ELSE
-+ADDCDEFS+= $(FREETYPE_CFLAGS)
-+.ENDIF
- 
- # --- Files --------------------------------------------------------
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-icu b/editors/openoffice.org-3-RC/files/patch-icu
new file mode 100644
index 000000000000..b04a701dd71a
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-icu
@@ -0,0 +1,26 @@
+--- icu/icu4c-4_0_1-src.patch	2011-04-15 19:58:10.000000000 +0900
++++ icu/icu4c-4_0_1-src.patch	2011-06-14 17:12:52.000000000 +0900
+@@ -1,3 +1,23 @@
++--- misc/icu/source/config/mh-bsd-gcc	2009-01-15 16:46:10.000000000 +0900
+++++ misc/build/icu/source/config/mh-bsd-gcc	2011-06-14 17:12:14.000000000 +0900
++@@ -18,7 +18,15 @@
++ 
++ ## Compiler switch to embed a runtime search path
++ LD_RPATH=	
++-LD_RPATH_PRE=	-Wl,-rpath,
+++LD_RPATH_PRE=	-Wl,-z,origin -Wl,-rpath,
+++
+++## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
+++## (incl. the C++ runtime libs potentially found in the URE lib dir):
+++ENABLE_RPATH=YES
+++RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'
+++
+++#SH#  ENABLE_RPATH=YES
+++#SH#  RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'"
++ 
++ ## Compiler switch to embed a library name
++ LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
++
+ --- misc/icu/source/common/putil.c	2008-07-01 03:41:12.000000000 +0200
+ +++ misc/build/icu/source/common/putil.c	2008-09-02 07:01:29.335795765 +0200
+ @@ -52,7 +52,7 @@
diff --git a/editors/openoffice.org-3-RC/files/patch-sfx2+Module_sfx2.mk b/editors/openoffice.org-3-RC/files/patch-sfx2+Module_sfx2.mk
new file mode 100644
index 000000000000..8a8c5febd9b8
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-sfx2+Module_sfx2.mk
@@ -0,0 +1,17 @@
+Broken somehow. Should be fixed.
+
+--- sfx2/Module_sfx2.mk 2011-06-11 16:49:16.000000000 +0900
++++ sfx2/Module_sfx2.mk	2011-06-11 16:49:55.000000000 +0900
+@@ -34,9 +34,9 @@
+ 	Package_sdi \
+ ))
+ 
+-$(eval $(call gb_Module_add_check_targets,sfx2,\
+-	CppunitTest_sfx2_metadatable \
+-))
++#$(eval $(call gb_Module_add_check_targets,sfx2,\
++#	CppunitTest_sfx2_metadatable \
++#))
+ 
+ $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
+ 	JunitTest_sfx2_complex \
diff --git a/editors/openoffice.org-3-RC/files/patch-vcl b/editors/openoffice.org-3-RC/files/patch-vcl
new file mode 100644
index 000000000000..a0035611add9
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-vcl
@@ -0,0 +1,100 @@
+--- vcl/Library_desktop_detector.mk	2011-04-15 21:51:38.000000000 +0900
++++ vcl/Library_desktop_detector.mk	2011-06-15 06:04:43.000000000 +0900
+@@ -65,10 +65,6 @@
+ 	cppu \
+ 	sal \
+ 	vos3 \
+-    X11 \
+-    Xext \
+-    SM \
+-    ICE \
+ ))
+ 
+ $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
+
+
+--- vcl/Library_vclplug_gen.mk	2011-04-15 21:51:38.000000000 +0900
++++ vcl/Library_vclplug_gen.mk	2011-06-15 06:27:38.000000000 +0900
+@@ -56,10 +56,6 @@
+ 	cppu \
+ 	sal \
+ 	vos3 \
+-    X11 \
+-    Xext \
+-    SM \
+-    ICE \
+ 	$(gb_STDLIBS) \
+ ))
+ 
+@@ -203,4 +199,14 @@
+ 	pthread \
+ ))
+ endif
++
++ifeq ($(OS),FREEBSD)
++$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
++     $$(SOLARLIB) \
++    -lX11 \
++    -lXext \
++    -lSM \
++    -lICE \
++))
++endif
+ # vim: set noet sw=4 ts=4:
+
+
+--- vcl/Library_vclplug_gtk.mk	2011-04-15 21:51:38.000000000 +0900
++++ vcl/Library_vclplug_gtk.mk	2011-06-15 06:28:07.000000000 +0900
+@@ -85,10 +85,6 @@
+ 	cppu \
+ 	sal \
+ 	vos3 \
+-    X11 \
+-    Xext \
+-    SM \
+-    ICE \
+     $(gb_STDLIBS) \
+ ))
+ 
+--- vcl/Library_vclplug_svp.mk	2011-04-15 21:51:38.000000000 +0900
++++ vcl/Library_vclplug_svp.mk	2011-06-15 06:28:20.000000000 +0900
+@@ -62,10 +62,6 @@
+ 	cppu \
+ 	sal \
+ 	vos3 \
+-    X11 \
+-    Xext \
+-    SM \
+-    ICE \
+ 	$(gb_STDLIBS) \
+ ))
+ 
+--- vcl/Library_vcl.mk	2011-04-15 21:51:38.000000000 +0900
++++ vcl/Library_vcl.mk	2011-06-16 12:18:00.000000000 +0900
+@@ -45,13 +45,8 @@
+ 	-I$(OUTDIR)/inc/offuh \
+ 	-I$(OUTDIR)/inc/stl \
+ 	-I$(OUTDIR)/inc \
++         $$(FREETYPE_CFLAGS) \
+ ))
+-ifeq ($(GUIBASE),unx)
+-$(eval $(call gb_Library_set_cxxflags,vcl,\
+-    $$(CXXFLAGS) \
+-    $$(FREETYPE_CFLAGS) \
+-))
+-endif
+ 
+ $(eval $(call gb_Library_set_defs,vcl,\
+ 	$$(DEFS) \
+@@ -89,8 +84,9 @@
+ endif
+ endif
+ ifeq ($(GUIBASE),unx)
+-$(eval $(call gb_Library_add_linked_libs,vcl,\
+-    freetype \
++$(eval $(call gb_Library_set_ldflags,vcl,\
++    $$(LDFLAGS) \
++    $(FREETYPE_LIBS) \
+ ))
+ endif
+