- update to 3.4.2

15 files changed, 333 insertions, 93 deletions

diff --git a/editors/libreoffice/files/patch-bin__build-ooo b/editors/libreoffice/files/patch-bin__build-ooo
deleted file mode 100644
index af172980320b..000000000000
--- a/editors/libreoffice/files/patch-bin__build-ooo
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bin/build-ooo.orig	2010-11-11 15:41:38.000000000 +0100
-+++ ./bin/build-ooo	2010-12-20 12:58:30.590567445 +0100
-@@ -11,7 +11,7 @@
- 
- export TARFILE_LOCATION
- 
--if test "z$BUILD_WIN32" = "z" -a "z`uname -s`" != "zSunOS" -a "z`uname -s`" != "zDarwin" -a "z`uname -s`" != "zOpenBSD"; then
-+if test "z$BUILD_WIN32" = "z" -a "z`uname -s`" != "zSunOS" -a "z`uname -s`" != "zDarwin" -a "z`uname -s`" != "zOpenBSD" -a "z`uname -s`" != "zFreeBSD"; then
-     if ! test -f /proc/cpuinfo; then
-         echo "Looks like proc isn't mounted - this means almost certain"
-         echo "Java related weird build failure: please check /proc"
diff --git a/editors/libreoffice/files/patch-bin__ooinstall b/editors/libreoffice/files/patch-bin__ooinstall
deleted file mode 100644
index b9f224a8d09f..000000000000
--- a/editors/libreoffice/files/patch-bin__ooinstall
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bin/ooinstall.orig	2010-11-30 21:15:58.000000000 +0100
-+++ ./bin/ooinstall	2010-12-20 12:58:30.609567023 +0100
-@@ -31,7 +31,7 @@
-     return 0;
- }
- 
--( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
-+( $^O =~ /freebsd/i) || ( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
- 
- suck_setup ("./setup") || suck_setup ("bin/setup") || die "can't find bin/setup";
- 
diff --git a/editors/libreoffice/files/patch-build__libreoffice____desktop__scripts__unopkg.sh b/editors/libreoffice/files/patch-build__libreoffice____desktop__scripts__unopkg.sh
deleted file mode 100644
index 98d959051c79..000000000000
--- a/editors/libreoffice/files/patch-build__libreoffice____desktop__scripts__unopkg.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/libreoffice/desktop/scripts/unopkg.sh.orig	2010-12-12 21:12:42.000000000 +0100
-+++ build/libreoffice/desktop/scripts/unopkg.sh	2011-02-08 07:56:57.385242809 +0100
-@@ -45,7 +45,7 @@
- 
- # this is a temporary hack until we can live with the default search paths
- case "`uname -s`" in
--OpenBSD)
-+OpenBSD|FreeBSD)
-     sd_prog1="$sd_prog/../basis-link/program"
-     sd_prog2="$sd_prog/../basis-link/ure-link/lib"
-     LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
diff --git a/editors/libreoffice/files/patch-build__libreoffice__configure.in b/editors/libreoffice/files/patch-build__libreoffice__configure.in
deleted file mode 100644
index 0a507d2d8d29..000000000000
--- a/editors/libreoffice/files/patch-build__libreoffice__configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./build/libreoffice/configure.in.orig	2010-12-17 23:08:36.000000000 +0100
-+++ ./build/libreoffice/configure.in	2010-12-20 14:42:55.766436619 +0100
-@@ -2022,7 +2022,7 @@
- dnl ===================================================================
- AC_MSG_CHECKING([for GNU tar])
- for a in $GNUTAR gtar gnutar tar; do
--      $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
-+      $a --version 2> /dev/null | grep bsdtar  2>&1 > /dev/null
-       if test $? -eq 0;  then
-            GNUTAR=$a
-            break
diff --git a/editors/libreoffice/files/patch-build__libreoffice__oox__util__makefile.mk b/editors/libreoffice/files/patch-build__libreoffice__oox__util__makefile.mk
deleted file mode 100644
index 3daefd59fbbb..000000000000
--- a/editors/libreoffice/files/patch-build__libreoffice__oox__util__makefile.mk
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./build/libreoffice/oox/util/makefile.mk.orig	2010-11-11 16:18:11.000000000 +0100
-+++ ./build/libreoffice/oox/util/makefile.mk	2010-12-20 12:58:30.627567313 +0100
-@@ -79,6 +79,7 @@
-         $(MSFILTERLIB)	\
-         $(UNOTOOLSLIB)	\
-         $(XMLOFFLIB)    \
-+	-lcrypto \
-         $(TOOLSLIB)
- 
- # link openssl, copied this bit from ucb/source/ucp/webdav/makefile.mk
diff --git a/editors/libreoffice/files/patch-build__libreoffice__padmin__source__spadmin.sh b/editors/libreoffice/files/patch-build__libreoffice__padmin__source__spadmin.sh
deleted file mode 100644
index facba8878da2..000000000000
--- a/editors/libreoffice/files/patch-build__libreoffice__padmin__source__spadmin.sh
+++ /dev/null
@@ -1,17 +0,0 @@
---- build/libreoffice/padmin/source/spadmin.sh.orig	2011-02-07 15:14:56.498245000 +0100
-+++ build/libreoffice/padmin/source/spadmin.sh	2011-02-07 17:38:31.692337005 +0100
-@@ -43,6 +43,14 @@
- sd_prog=`pwd`
- cd "$sd_cwd"
- 
-+case "`uname -s`" in 
-+	OpenBSD|FREEBSD)
-+		sd_prog1="$sd_prog/../basis-link/program"
-+		sd_prog2="$sd_prog/../basis-link/use-link/lib"
-+		LD_LIRBARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-+		export LD_LIBRARY_PATH
-+		;;
-+esac
- #collect all bootstrap variables specified on the command line
- #so that they can be passed as arguments to javaldx later on
- for arg in $@
diff --git a/editors/libreoffice/files/patch-build__libreoffice__scripts__soffice.sh b/editors/libreoffice/files/patch-build__libreoffice__scripts__soffice.sh
deleted file mode 100644
index 83b92e28bddc..000000000000
--- a/editors/libreoffice/files/patch-build__libreoffice__scripts__soffice.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/libreoffice/desktop/scripts/soffice.sh.orig	2010-12-12 21:12:42.000000000 +0100
-+++ build/libreoffice/desktop/scripts/soffice.sh	2011-01-30 09:50:00.890272369 +0100
-@@ -64,7 +64,7 @@
- 
- # this is a temporary hack until we can live with the default search paths
- case "`uname -s`" in
--OpenBSD)
-+OpenBSD|FreeBSD)
-     sd_prog1="$sd_prog/../basis-link/program"
-     sd_prog2="$sd_prog/../basis-link/ure-link/lib"
-     LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
diff --git a/editors/libreoffice/files/patch-build__libreoffice__solenv__bin__ooinstall b/editors/libreoffice/files/patch-build__libreoffice__solenv__bin__ooinstall
deleted file mode 100644
index 1ced95766ecb..000000000000
--- a/editors/libreoffice/files/patch-build__libreoffice__solenv__bin__ooinstall
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./build/libreoffice/solenv/bin/ooinstall.orig	2010-11-30 21:17:23.000000000 +0100
-+++ ./build/libreoffice/solenv/bin/ooinstall	2010-12-20 12:58:30.630567408 +0100
-@@ -14,7 +14,7 @@
- $path = '';
- $do_link = 0;
- 
--( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
-+( $^O =~ /freebsd/i ) || ( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
- 
- # Workaround for system Mozilla
- if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {
diff --git a/editors/libreoffice/files/patch-clone__filters__oox__source__token__makefile.mk b/editors/libreoffice/files/patch-clone__filters__oox__source__token__makefile.mk
new file mode 100644
index 000000000000..84bd1c7c2c9d
--- /dev/null
+++ b/editors/libreoffice/files/patch-clone__filters__oox__source__token__makefile.mk
@@ -0,0 +1,11 @@
+--- clone/filters/oox/source/token/makefile.mk.orig	2011-07-22 14:33:31.988113939 +0000
++++ clone/filters/oox/source/token/makefile.mk	2011-07-22 14:34:30.469770138 +0000
+@@ -56,7 +56,7 @@
+ $(SLO)$/tokenmap.obj : $(INCCOM)$/tokenhash.inc $(INCCOM)$/tokennames.inc $(GENHEADERPATH)$/tokens.hxx $(MISC)$/do_tokens
+ 
+ $(INCCOM)$/tokenhash.inc : $(MISC)$/tokenhash.gperf $(MISC)$/do_tokens
+-    $(AUGMENT_LIBRARY_PATH) gperf --compare-strncmp $(MISC)$/tokenhash.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" | $(GREP) -v "^#line" >$(INCCOM)$/tokenhash.inc
++    $(AUGMENT_LIBRARY_PATH) $(GPERF) --compare-strncmp $(MISC)$/tokenhash.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" | $(GREP) -v "^#line" >$(INCCOM)$/tokenhash.inc
+ 
+ $(MISC)$/do_tokens $(do_phony) : tokens.txt tokens.pl tokens.hxx.head tokens.hxx.tail $(GENHEADERPATH)$/tokens.hxx $(INCCOM)$/tokennames.inc $(MISC)$/tokenhash.gperf
+     @@-$(RM) $@
diff --git a/editors/libreoffice/files/patch-clone_ure_sal_inc_sal_main.h b/editors/libreoffice/files/patch-clone_ure_sal_inc_sal_main.h
new file mode 100644
index 000000000000..ed7c8925b818
--- /dev/null
+++ b/editors/libreoffice/files/patch-clone_ure_sal_inc_sal_main.h
@@ -0,0 +1,50 @@
+--- clone/ure/sal/inc/sal/main.h.orig	2011-07-29 03:42:07.000000000 +0300
++++ clone/ure/sal/inc/sal/main.h	2011-07-29 03:50:55.000000000 +0300
+@@ -30,8 +30,11 @@
+ #define _SAL_MAIN_H_
+ 
+ #include <sal/types.h>
+-#if defined(AIX)
++#if defined(AIX) || defined(FREEBSD)
+ #   include <unistd.h>
++//*Hurl*, *Puke*, temp fix only, will
++//cause other weirdness eventually
++#  define BROKEN_SHUTDOWN
+ #endif
+ 
+ #ifdef __cplusplus
+@@ -41,6 +44,16 @@
+ void SAL_CALL sal_detail_initialize(int argc, char ** argv);
+ void SAL_CALL sal_detail_deinitialize();
+ 
++/**
++ * TODO(gliaskos): Use this hack for now but we should remove it eventually.
++ * ctx: http://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg04427.html 
++ */
++#ifdef BROKEN_SHUTDOWN
++#  define MAINRET(x) _exit(x)
++#else
++#  define MAINRET(x) return x
++#endif
++
+ #define SAL_MAIN_WITH_ARGS_IMPL \
+ int SAL_CALL main(int argc, char ** argv) \
+ { \
+@@ -48,7 +61,7 @@
+     sal_detail_initialize(argc, argv);   \
+     ret = sal_main_with_args(argc, argv); \
+     sal_detail_deinitialize(); \
+-    return ret; \
++    MAINRET(ret); \
+ }
+ 
+ #define SAL_MAIN_IMPL \
+@@ -58,7 +71,7 @@
+     sal_detail_initialize(argc, argv); \
+     ret = sal_main(); \
+     sal_detail_deinitialize(); \
+-    return ret; \
++    MAINRET(ret); \
+ }
+ 
+ /* Definition macros for CRT entries */
diff --git a/editors/libreoffice/files/patch-configure.in b/editors/libreoffice/files/patch-configure.in
new file mode 100644
index 000000000000..5e3d88fdbe0b
--- /dev/null
+++ b/editors/libreoffice/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- configure.in.orig	2011-07-21 02:57:19.000000000 +0300
++++ configure.in	2011-07-21 02:58:05.000000000 +0300
+@@ -8086,7 +8086,7 @@
+ dnl Number of CPUs to use during the build
+ dnl ===================================================================
+ AC_MSG_CHECKING([for number of processors to use])
+-if test "z`uname -s`" = "zDarwin" -o "z`uname -s`" = "zNetBSD" -o "z`uname -s`" = "zOpenBSD"; then
++if test "z`uname -s`" = "zDarwin" -o "z`uname -s`" = "zNetBSD" -o "z`uname -s`" = "zOpenBSD" -o "z`uname -s`" = "zFreeBSD"; then
+     BUILD_NCPUS=`sysctl -n hw.ncpu`
+ else
+     BUILD_NCPUS=`grep $'^processor\t*:' /proc/cpuinfo | wc -l`
diff --git a/editors/libreoffice/files/patch-solenv__inc__unx.mk b/editors/libreoffice/files/patch-solenv__inc__unx.mk
new file mode 100644
index 000000000000..a39fd67012b9
--- /dev/null
+++ b/editors/libreoffice/files/patch-solenv__inc__unx.mk
@@ -0,0 +1,17 @@
+--- solenv/inc/unx.mk.orig	2011-07-23 08:18:24.000000000 +0300
++++ solenv/inc/unx.mk	2011-07-23 08:20:06.000000000 +0300
+@@ -139,8 +139,12 @@
+ .INCLUDE : unxbsds.mk
+ .ENDIF
+ 
+-.IF "$(COM)$(OS)" == "GCCFREEBSD"
+-.INCLUDE : unxfbsd.mk
++.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
++.INCLUDE : unxfbsdi.mk
++.ENDIF
++
++.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDX"
++.INCLUDE : unxfbsdx.mk
+ .ENDIF
+ 
+ .IF "$(COM)$(OS)" == "GCCOPENBSD"
diff --git a/editors/libreoffice/files/patch-solenv__inc__unxfbsd.mk b/editors/libreoffice/files/patch-solenv__inc__unxfbsd.mk
new file mode 100644
index 000000000000..91a1271d39a5
--- /dev/null
+++ b/editors/libreoffice/files/patch-solenv__inc__unxfbsd.mk
@@ -0,0 +1,186 @@
+--- solenv/inc/unxfbsd.mk.orig	2011-07-23 08:03:22.000000000 +0300
++++ solenv/inc/unxfbsd.mk	2011-07-23 08:08:39.000000000 +0300
+@@ -27,178 +27,12 @@
+ 
+ # Makefile for FreeBSD.
+ 
+-ASM=
+-AFLAGS=
++.INCLUDE : unxgcc.mk
+ 
+-SOLAR_JAVA*=
+-JAVAFLAGSDEBUG=-g
++DLLPOSTFIX=fb
+ 
+-# Include arch specific makefile.
+-.IF "$(CPUNAME)" == "INTEL"
+-.INCLUDE : unxfbsdi.mk
+-.ENDIF
+-.IF "$(CPUNAME)" == "X86_64"
+-.INCLUDE : unxfbsdx.mk
+-.ENDIF
+-
+-# filter for supressing verbose messages from linker
+-#not needed at the moment
+-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
+-
+-# _PTHREADS is needed for the stl
+-CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
+-
+-# enable visibility define in "sal/types.h"
+-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+-
+-# this is a platform with JAVA support
+-.IF "$(SOLAR_JAVA)"!=""
+-JAVADEF=-DSOLAR_JAVA
+-.IF "$(debug)"==""
+-JAVA_RUNTIME=-ljava
+-.ELSE
+-JAVA_RUNTIME=-ljava_g
+-.ENDIF
+-.ENDIF
+-
+-# name of C++ Compiler
+-CXX*=g++
+-# name of C Compiler
+-CC*=gcc
+-.IF "$(SYSBASE)"!=""
+-CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
+-CXX+:=$(CFLAGS_SYSBASE)
+-CC+:=$(CFLAGS_SYSBASE)
+-.ENDIF          # "$(SYSBASE)"!=""
+-CFLAGS+=-fmessage-length=0 -c
+-
+-# flags to enable build with symbols
+-CFLAGSENABLESYMBOLS=-g
+-
+-# flags for the C++ Compiler
+-CFLAGSCC= -pipe $(ARCH_FLAGS)
+-# Flags for enabling exception handling
+-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+-# Flags for disabling exception handling
+-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+-
+-# -fpermissive should be removed as soon as possible
+-CFLAGSCXX= -pipe $(ARCH_FLAGS)
+-PICSWITCH:=-fpic
+-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+-CFLAGSCXX += -fvisibility-inlines-hidden
+-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+-
+-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+-CFLAGSOBJGUIMT=
+-# Compiler flags for compiling static object in multi threaded environment with character user interface
+-CFLAGSOBJCUIMT=
+-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+-CFLAGSSLOGUIMT=$(PICSWITCH)
+-# Compiler flags for compiling shared object in multi threaded environment with character user interface
+-CFLAGSSLOCUIMT=$(PICSWITCH)
+-# Compiler flags for profiling
+-CFLAGSPROF=
+-# Compiler flags for debugging
+-CFLAGSDEBUG=-g
+-CFLAGSDBGUTIL=
+-# Compiler flags for disabling optimizations
+-CFLAGSNOOPT=-O0
+-# Compiler flags for describing the output path
+-CFLAGSOUTOBJ=-o
+-
+-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
+-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
+-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
+-    -Wno-non-virtual-dtor
+-CFLAGSWALLCC=$(CFLAGSWARNCC)
+-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
+-CFLAGSWERRCC=-Werror
+-
+-# Once all modules on this platform compile without warnings, set
+-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
+-# settings.mk): Currently this is not tested on FreeBSD
+-#MODULES_WITH_WARNINGS :=
+-
+-# switches for dynamic and static linking
+-STATIC		= -Wl,-Bstatic
+-DYNAMIC		= -Wl,-Bdynamic
+-
+-# name of linker
+-LINK*=$(CXX)
+-LINKC*=$(CC)
++# disable exceptions in boost
++CFLAGS_NO_EXCEPTIONS+=-DBOOST_NO_EXCEPTIONS
+ 
+ # default linker flags
+-LINKFLAGSDEFS*=#-Wl,-z,defs
+-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
+-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+-    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
+-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
+-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+-LINKFLAGSRUNPATH_OXT=
+-LINKFLAGSRUNPATH_NONE=
+-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
+-
+-# linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic
+-
+-# linker flags for linking shared libraries
+-LINKFLAGSSHLGUI= -shared
+-LINKFLAGSSHLCUI= -shared
+-
+-LINKFLAGSTACK=
+-LINKFLAGSPROF=
+-LINKFLAGSDEBUG=-g
+-LINKFLAGSOPT=
+-
+-# linker flags for optimization (symbol hashtable)
+-# for now, applied to symbol scoped libraries, only
+-LINKFLAGSOPTIMIZE*=-Wl,-O1
+-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+-
+-SONAME_SWITCH=-Wl,-h
+-
+-# Sequence of libs does matter !
+-
+-STDLIBCPP=-lstdc++
+-
+-# default objectfilenames to link
+-STDOBJVCL=$(L)/salmain.o
+-STDOBJGUI=
+-STDSLOGUI=
+-STDOBJCUI=
+-STDSLOCUI=
+-
+-# libraries for linking applications
+-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
+-STDLIBCUIMT=$(PTHREAD_LIBS) -lm
+-# libraries for linking shared libraries
+-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
+-STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+-
+-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+-
+-# name of library manager
+-LIBMGR=ar
+-LIBFLAGS=-r
+-
+-# tool for generating import libraries
+-IMPLIB=
+-IMPLIBFLAGS=
+-
+-MAPSYM=
+-MAPSYMFLAGS=
+-
+-RC=irc
+-RCFLAGS=-fo$@ $(RCFILES)
+-RCLINK=
+-RCLINKFLAGS=
+-RCSETVERSION=
+-
+-# platform specific identifier for shared libs
+-DLLPRE=lib
+-DLLPOST=.so
++LINKFLAGSDEFS:=
diff --git a/editors/libreoffice/files/patch-solenv__inc__unxfbsdi.mk b/editors/libreoffice/files/patch-solenv__inc__unxfbsdi.mk
new file mode 100644
index 000000000000..24560ca0d9da
--- /dev/null
+++ b/editors/libreoffice/files/patch-solenv__inc__unxfbsdi.mk
@@ -0,0 +1,28 @@
+--- solenv/inc/unxfbsdi.mk.orig	2011-07-23 08:03:39.000000000 +0300
++++ solenv/inc/unxfbsdi.mk	2011-07-23 08:26:34.000000000 +0300
+@@ -25,22 +25,7 @@
+ #
+ #*************************************************************************
+ 
+-#
+-# FreBSD/i386 specific defines
+-#
+- 
+-CDEFS+=-DX86
+-
+-# architecture dependent flags for the C and C++ compiler that can be changed by
+-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+-ARCH_FLAGS*=-mtune=pentiumpro
+-
+-# Compiler flags for enabling optimizations
+-.IF "$(PRODUCT)"!=""
+-CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
+-.ELSE 	# "$(PRODUCT)"!=""
+-CFLAGSOPT= 					# no optimizing for non products
+-.ENDIF	# "$(PRODUCT)"!=""
++# FreeBSD/i386 specific defines
+ 
+-# platform specific identifier for shared libs
+-DLLPOSTFIX=fi
++.INCLUDE : unxfbsd.mk
++CDEFS+=-DX86 
diff --git a/editors/libreoffice/files/patch-solenv__inc__unxfbsdx.mk b/editors/libreoffice/files/patch-solenv__inc__unxfbsdx.mk
new file mode 100644
index 000000000000..c609b42d5aad
--- /dev/null
+++ b/editors/libreoffice/files/patch-solenv__inc__unxfbsdx.mk
@@ -0,0 +1,30 @@
+--- solenv/inc/unxfbsdx.mk.orig	2011-07-23 08:03:44.000000000 +0300
++++ solenv/inc/unxfbsdx.mk	2011-07-23 08:26:13.000000000 +0300
+@@ -25,25 +25,8 @@
+ #
+ #*************************************************************************
+ 
+-#
+-# FreBSD/amd64 specific defines
+-#
++# FreeBSD/amd64 specific defines
+ 
++.INCLUDE : unxfbsd.mk
+ CDEFS+=-DX86_64
+-
+-# architecture dependent flags for the C and C++ compiler that can be changed by
+-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+-.IF "$(CPUNAME)" == "X86_64"
+-ARCH_FLAGS*=
+-.ENDIF
+-
+-# Compiler flags for enabling optimizations
+-.IF "$(PRODUCT)"!=""
+-CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
+-.ELSE 	# "$(PRODUCT)"!=""
+-CFLAGSOPT=   					# no optimizing for non products
+-.ENDIF	# "$(PRODUCT)"!=""
+-
+-# platform specific identifier for shared libs
+-DLLPOSTFIX=fx
+ BUILD64=1