Update to DEV300_m96.

Funded by: OpenOffice.org community
Feature safe:	yes

8 files changed, 950 insertions, 12 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 11cfc922dd8c..e007857893a8 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -79,12 +79,12 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		95
+MILESTONE?=		96
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOTAG2=		${OOOTAG:C/_//g}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20101210
+SNAPDATE=		20101223
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
@@ -207,7 +207,7 @@ pre-configure:
 
 do-build:
 	@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
@@ -277,7 +277,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-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index c6bf734405c4..a06d5c489083 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openoffice.org3/OOo_DEV300_m95_source.tar.bz2) = 8e5fb436f3e12c59dd609e7efebe819a7e92107cdc58d54c0571a30acafe86af
-SIZE (openoffice.org3/OOo_DEV300_m95_source.tar.bz2) = 309043959
+SHA256 (openoffice.org3/OOo_DEV300_m96_source.tar.bz2) = 4b8a1235501b7e5bc32b44c93819e9db0dad33e8e83e25b2b67ea62a772123bd
+SIZE (openoffice.org3/OOo_DEV300_m96_source.tar.bz2) = 308946560
 SHA256 (openoffice.org3/ext_sources.20101009.tar.bz2) = e29d5c4f4264d1408119bb997aaae3a21ffb320bc67c8d83be2e6287b4f837f6
 SIZE (openoffice.org3/ext_sources.20101009.tar.bz2) = 214165372
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
diff --git a/editors/openoffice-3-devel/files/patch-i116477 b/editors/openoffice-3-devel/files/patch-i116477
new file mode 100644
index 000000000000..6e1ded848ce3
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i116477
@@ -0,0 +1,390 @@
+--- solenv/gbuild/gbuild.mk.org	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	2010-12-23 16:44:00.000000000 +0900
++++ solenv/gbuild/platform/freebsd.mk	2010-12-23 16:45:22.000000000 +0900
+@@ -0,0 +1,344 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2009 by Sun Microsystems, Inc.
++#
++# 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 -p
++
++gb_CC := gcc
++gb_CXX := g++
++gb_GCCP := gcc
++gb_AWK := awk
++
++# 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 := \
++	-DFREEBSD \
++	-D_PTHREADS \
++	-DUNIX \
++	-DUNX \
++	$(PTHREAD_CFLAGS) \
++
++ifeq ($(GXX_INCLUDE_PATH),)
++GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
++endif
++
++gb_COMPILERDEFS := \
++	-DGCC \
++	-D$(CVER) \
++	-DCVER=$(CVER) \
++	-DGLIBC=2 \
++	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
++	-DHAVE_GCC_VISIBILITY_FEATURE \
++	-DCPPU_ENV=gcc3 \
++
++ifeq ($(CPUNAME),X86_64)
++gb_CPUDEFS := -D$(CPUNAME)
++else
++gb_CPUDEFS := -DX86
++endif
++
++gb_CFLAGS := \
++	-Wall \
++	-Wendif-labels \
++	-Wextra \
++	-fmessage-length=0 \
++	-fno-strict-aliasing \
++	-fpic \
++	-fvisibility=hidden \
++	-pipe \
++
++gb_CXXFLAGS := \
++	-Wall \
++	-Wendif-labels \
++	-Wextra \
++	-Wno-ctor-dtor-privacy \
++	-Wno-non-virtual-dtor \
++	-Wreturn-type \
++	-Wshadow \
++	-Wuninitialized \
++	-fmessage-length=0 \
++	-fno-strict-aliasing \
++	-fno-use-cxa-atexit \
++	-fpic \
++	-fvisibility=hidden \
++	-fvisibility-inlines-hidden \
++	-pipe \
++
++ifneq ($(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)) \
++
++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
++
++
++# 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) \
++		-c $(3) \
++		-o $(1) \
++		-MMD -MT $(call gb_CObject_get_target,$(2)) \
++		-MF $(call gb_CObject_get_dep_target,$(2)) \
++		$(4) $(5) \
++		-I$(dir $(3)) \
++		$(6))
++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) \
++		-c $(3) \
++		-o $(1) \
++		-MMD -MT $(call gb_CxxObject_get_target,$(2)) \
++		-MF $(call gb_CxxObject_get_dep_target,$(2)) \
++		$(4) $(5) \
++		-I$(dir $(3)) \
++		$(6))
++endef
++
++
++# LinkTarget class
++
++define gb_LinkTarget__get_rpath_for_layer
++$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
++endef
++
++gb_LinkTarget__RPATHS := \
++	URELIB:'$$$$ORIGIN' \
++	UREBIN:'$$$$ORIGIN/../lib:$$$$ORIGIN' \
++	OOOLIB:'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' \
++	BRAND:'$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib' \
++	SDKBIN:'$$$$ORIGIN/../../ure-link/lib' \
++	NONEBIN:'$$$$ORIGIN/../lib:$$$$ORIGIN' \
++
++gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
++gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS)
++
++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
++$(call gb_Output_announce,$(2),$(true),LNK,4)
++$(call gb_Helper_abbreviate_dirs,\
++	mkdir -p $(dir $(1)) && \
++	$(gb_CXX) \
++		$(3) \
++		$(patsubst lib%.so,-l%,$(foreach lib,$(4),$(call gb_Library_get_filename,$(lib)))) \
++		$(foreach object,$(6),$(call gb_CObject_get_target,$(object))) \
++		$(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \
++		-Wl$(COMMA)--start-group $(foreach lib,$(5),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
++		-o $(1))
++endef
++
++
++# Library class
++
++gb_Library_DEFS := -D_DLL_
++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_Library_platform =
++
++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
++
++gb_Library_LAYER := \
++	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \
++	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
++	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \
++	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \
++	$(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):OOOLIB) \
++	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
++
++
++# StaticLibrary class
++
++gb_StaticLibrary_DEFS :=
++gb_StaticLibrary_TARGETTYPEFLAGS := -Wl,-z,noexecstack -static -nostdlib
++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_TARGETTYPEFLAGS :=
++gb_Executable_Executable_platform =
++
++gb_Executable_LAYER := \
++	$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
++	$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
++	$(foreach exe,$(gb_Executable_OOO),$(exe):OOOLIB) \
++	$(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_Library_get_layer,$(1))) \
++-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
++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)) \
++		$(3) \
++		$(4) \
++		-c -x c++-header $(2) \
++		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
++endef
++
++
++# ComponentTarget
++
++gb_ComponentTarget_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
++gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$OOO_BASE_DIR/program/
++
++
++# 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
+@@ -134,5 +134,22 @@
+ gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
+ endif
+ 
++ifeq ($(OS),FREEBSD)
++gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp4%,$(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
++
+ # vim: set noet sw=4 ts=4:
+ 
diff --git a/editors/openoffice-3-devel/files/patch-i116699 b/editors/openoffice-3-devel/files/patch-i116699
new file mode 100644
index 000000000000..efaf326ac601
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i116699
@@ -0,0 +1,79 @@
+--- framework/Library_fwe.mk	2010-12-23 11:32:17.000000000 +0900
++++ framework/Library_fwe.mk	2011-01-29 17:57:56.000000000 +0900
+@@ -104,6 +104,17 @@
+ 	pthread \
+ ))
+ endif
++
++ifeq ($(OS),FREEBSD)
++
++$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
++
++$(eval $(call gb_Library_add_linked_libs,fwe,\
++	m \
++	pthread \
++))
++endif
++
+ ifeq ($(OS),WNT)
+ $(eval $(call gb_Library_add_linked_libs,fwe,\
+ 	kernel32 \
+--- framework/Library_fwi.mk	2010-12-23 11:32:17.000000000 +0900
++++ framework/Library_fwi.mk	2011-01-29 17:58:17.000000000 +0900
+@@ -83,6 +83,13 @@
+ 	pthread \
+ ))
+ endif
++ifeq ($(OS),FREEBSD)
++$(eval $(call gb_Library_add_linked_libs,fwi,\
++	m \
++	pthread \
++))
++endif
++
+ ifeq ($(OS),WNT)
+ $(eval $(call gb_Library_add_linked_libs,fwi,\
+ 	advapi32 \
+--- framework/Library_fwk.mk	2010-12-23 11:32:17.000000000 +0900
++++ framework/Library_fwk.mk	2011-01-29 17:59:13.000000000 +0900
+@@ -189,6 +189,12 @@
+ 	pthread \
+ ))
+ endif
++ifeq ($(OS),FREEBSD)
++$(eval $(call gb_Library_add_linked_libs,fwk,\
++	m \
++	pthread \
++))
++endif
+ ifeq ($(OS),WNT)
+ $(eval $(call gb_Library_add_linked_libs,fwk,\
+ 	kernel32 \
+--- framework/Library_fwl.mk	2010-12-23 11:32:17.000000000 +0900
++++ framework/Library_fwl.mk	2011-01-29 17:59:36.000000000 +0900
+@@ -82,9 +82,8 @@
+ 	framework/source/uielement/simpletextstatusbarcontroller \
+ 	framework/source/uielement/toolbarsmenucontroller \
+ ))
+-ifeq ($(OS),LINUX)
++ifeq ($(OS),FREEBSD)
+ $(eval $(call gb_Library_add_linked_libs,fwl,\
+-	dl \
+ 	m \
+ 	pthread \
+ ))
+--- framework/Library_fwm.mk	2010-12-23 11:32:17.000000000 +0900
++++ framework/Library_fwm.mk	2011-01-29 18:00:04.000000000 +0900
+@@ -71,6 +71,12 @@
+ 	pthread \
+ ))
+ endif
++ifeq ($(OS),FREEBSD)
++$(eval $(call gb_Library_add_linked_libs,fwm,\
++	m \
++	pthread \
++))
++endif
+ ifeq ($(OS),WNT)
+ $(eval $(call gb_Library_add_linked_libs,fwm,\
+ 	kernel32 \
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 11cfc922dd8c..e007857893a8 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -79,12 +79,12 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		95
+MILESTONE?=		96
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOTAG2=		${OOOTAG:C/_//g}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20101210
+SNAPDATE=		20101223
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
@@ -207,7 +207,7 @@ pre-configure:
 
 do-build:
 	@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
@@ -277,7 +277,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-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index c6bf734405c4..a06d5c489083 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openoffice.org3/OOo_DEV300_m95_source.tar.bz2) = 8e5fb436f3e12c59dd609e7efebe819a7e92107cdc58d54c0571a30acafe86af
-SIZE (openoffice.org3/OOo_DEV300_m95_source.tar.bz2) = 309043959
+SHA256 (openoffice.org3/OOo_DEV300_m96_source.tar.bz2) = 4b8a1235501b7e5bc32b44c93819e9db0dad33e8e83e25b2b67ea62a772123bd
+SIZE (openoffice.org3/OOo_DEV300_m96_source.tar.bz2) = 308946560
 SHA256 (openoffice.org3/ext_sources.20101009.tar.bz2) = e29d5c4f4264d1408119bb997aaae3a21ffb320bc67c8d83be2e6287b4f837f6
 SIZE (openoffice.org3/ext_sources.20101009.tar.bz2) = 214165372
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
diff --git a/editors/openoffice.org-3-devel/files/patch-i116477 b/editors/openoffice.org-3-devel/files/patch-i116477
new file mode 100644
index 000000000000..6e1ded848ce3
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i116477
@@ -0,0 +1,390 @@
+--- solenv/gbuild/gbuild.mk.org	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	2010-12-23 16:44:00.000000000 +0900
++++ solenv/gbuild/platform/freebsd.mk	2010-12-23 16:45:22.000000000 +0900
+@@ -0,0 +1,344 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2009 by Sun Microsystems, Inc.
++#
++# 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 -p
++
++gb_CC := gcc
++gb_CXX := g++
++gb_GCCP := gcc
++gb_AWK := awk
++
++# 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 := \
++	-DFREEBSD \
++	-D_PTHREADS \
++	-DUNIX \
++	-DUNX \
++	$(PTHREAD_CFLAGS) \
++
++ifeq ($(GXX_INCLUDE_PATH),)
++GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
++endif
++
++gb_COMPILERDEFS := \
++	-DGCC \
++	-D$(CVER) \
++	-DCVER=$(CVER) \
++	-DGLIBC=2 \
++	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
++	-DHAVE_GCC_VISIBILITY_FEATURE \
++	-DCPPU_ENV=gcc3 \
++
++ifeq ($(CPUNAME),X86_64)
++gb_CPUDEFS := -D$(CPUNAME)
++else
++gb_CPUDEFS := -DX86
++endif
++
++gb_CFLAGS := \
++	-Wall \
++	-Wendif-labels \
++	-Wextra \
++	-fmessage-length=0 \
++	-fno-strict-aliasing \
++	-fpic \
++	-fvisibility=hidden \
++	-pipe \
++
++gb_CXXFLAGS := \
++	-Wall \
++	-Wendif-labels \
++	-Wextra \
++	-Wno-ctor-dtor-privacy \
++	-Wno-non-virtual-dtor \
++	-Wreturn-type \
++	-Wshadow \
++	-Wuninitialized \
++	-fmessage-length=0 \
++	-fno-strict-aliasing \
++	-fno-use-cxa-atexit \
++	-fpic \
++	-fvisibility=hidden \
++	-fvisibility-inlines-hidden \
++	-pipe \
++
++ifneq ($(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)) \
++
++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
++
++
++# 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) \
++		-c $(3) \
++		-o $(1) \
++		-MMD -MT $(call gb_CObject_get_target,$(2)) \
++		-MF $(call gb_CObject_get_dep_target,$(2)) \
++		$(4) $(5) \
++		-I$(dir $(3)) \
++		$(6))
++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) \
++		-c $(3) \
++		-o $(1) \
++		-MMD -MT $(call gb_CxxObject_get_target,$(2)) \
++		-MF $(call gb_CxxObject_get_dep_target,$(2)) \
++		$(4) $(5) \
++		-I$(dir $(3)) \
++		$(6))
++endef
++
++
++# LinkTarget class
++
++define gb_LinkTarget__get_rpath_for_layer
++$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
++endef
++
++gb_LinkTarget__RPATHS := \
++	URELIB:'$$$$ORIGIN' \
++	UREBIN:'$$$$ORIGIN/../lib:$$$$ORIGIN' \
++	OOOLIB:'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' \
++	BRAND:'$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib' \
++	SDKBIN:'$$$$ORIGIN/../../ure-link/lib' \
++	NONEBIN:'$$$$ORIGIN/../lib:$$$$ORIGIN' \
++
++gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
++gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS)
++
++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
++$(call gb_Output_announce,$(2),$(true),LNK,4)
++$(call gb_Helper_abbreviate_dirs,\
++	mkdir -p $(dir $(1)) && \
++	$(gb_CXX) \
++		$(3) \
++		$(patsubst lib%.so,-l%,$(foreach lib,$(4),$(call gb_Library_get_filename,$(lib)))) \
++		$(foreach object,$(6),$(call gb_CObject_get_target,$(object))) \
++		$(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \
++		-Wl$(COMMA)--start-group $(foreach lib,$(5),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
++		-o $(1))
++endef
++
++
++# Library class
++
++gb_Library_DEFS := -D_DLL_
++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_Library_platform =
++
++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
++
++gb_Library_LAYER := \
++	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \
++	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
++	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \
++	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \
++	$(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):OOOLIB) \
++	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
++
++
++# StaticLibrary class
++
++gb_StaticLibrary_DEFS :=
++gb_StaticLibrary_TARGETTYPEFLAGS := -Wl,-z,noexecstack -static -nostdlib
++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_TARGETTYPEFLAGS :=
++gb_Executable_Executable_platform =
++
++gb_Executable_LAYER := \
++	$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
++	$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
++	$(foreach exe,$(gb_Executable_OOO),$(exe):OOOLIB) \
++	$(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_Library_get_layer,$(1))) \
++-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
++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)) \
++		$(3) \
++		$(4) \
++		-c -x c++-header $(2) \
++		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
++endef
++
++
++# ComponentTarget
++
++gb_ComponentTarget_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
++gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$OOO_BASE_DIR/program/
++
++
++# 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
+@@ -134,5 +134,22 @@
+ gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
+ endif
+ 
++ifeq ($(OS),FREEBSD)
++gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp4%,$(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
++
+ # vim: set noet sw=4 ts=4:
+ 
diff --git a/editors/openoffice.org-3-devel/files/patch-i116699 b/editors/openoffice.org-3-devel/files/patch-i116699
new file mode 100644
index 000000000000..efaf326ac601
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i116699
@@ -0,0 +1,79 @@
+--- framework/Library_fwe.mk	2010-12-23 11:32:17.000000000 +0900
++++ framework/Library_fwe.mk	2011-01-29 17:57:56.000000000 +0900
+@@ -104,6 +104,17 @@
+ 	pthread \
+ ))
+ endif
++
++ifeq ($(OS),FREEBSD)
++
++$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
++
++$(eval $(call gb_Library_add_linked_libs,fwe,\
++	m \
++	pthread \
++))
++endif
++
+ ifeq ($(OS),WNT)
+ $(eval $(call gb_Library_add_linked_libs,fwe,\
+ 	kernel32 \
+--- framework/Library_fwi.mk	2010-12-23 11:32:17.000000000 +0900
++++ framework/Library_fwi.mk	2011-01-29 17:58:17.000000000 +0900
+@@ -83,6 +83,13 @@
+ 	pthread \
+ ))
+ endif
++ifeq ($(OS),FREEBSD)
++$(eval $(call gb_Library_add_linked_libs,fwi,\
++	m \
++	pthread \
++))
++endif
++
+ ifeq ($(OS),WNT)
+ $(eval $(call gb_Library_add_linked_libs,fwi,\
+ 	advapi32 \
+--- framework/Library_fwk.mk	2010-12-23 11:32:17.000000000 +0900
++++ framework/Library_fwk.mk	2011-01-29 17:59:13.000000000 +0900
+@@ -189,6 +189,12 @@
+ 	pthread \
+ ))
+ endif
++ifeq ($(OS),FREEBSD)
++$(eval $(call gb_Library_add_linked_libs,fwk,\
++	m \
++	pthread \
++))
++endif
+ ifeq ($(OS),WNT)
+ $(eval $(call gb_Library_add_linked_libs,fwk,\
+ 	kernel32 \
+--- framework/Library_fwl.mk	2010-12-23 11:32:17.000000000 +0900
++++ framework/Library_fwl.mk	2011-01-29 17:59:36.000000000 +0900
+@@ -82,9 +82,8 @@
+ 	framework/source/uielement/simpletextstatusbarcontroller \
+ 	framework/source/uielement/toolbarsmenucontroller \
+ ))
+-ifeq ($(OS),LINUX)
++ifeq ($(OS),FREEBSD)
+ $(eval $(call gb_Library_add_linked_libs,fwl,\
+-	dl \
+ 	m \
+ 	pthread \
+ ))
+--- framework/Library_fwm.mk	2010-12-23 11:32:17.000000000 +0900
++++ framework/Library_fwm.mk	2011-01-29 18:00:04.000000000 +0900
+@@ -71,6 +71,12 @@
+ 	pthread \
+ ))
+ endif
++ifeq ($(OS),FREEBSD)
++$(eval $(call gb_Library_add_linked_libs,fwm,\
++	m \
++	pthread \
++))
++endif
+ ifeq ($(OS),WNT)
+ $(eval $(call gb_Library_add_linked_libs,fwm,\
+ 	kernel32 \