Change the build behaviour so that the shared libraries names remain unchanged with a fb suffix instead of fi on x86 and fx on x86_64

Fix plist on i386 [1]
Fix spadmin[2]
Fix unopkg[3]

Reported by:	makc[1], Sergio de Almeida Lenzi <lenzi.sergio _at_ gmail.com>[2], dougb[3]
Feature safe:	yes

5 files changed, 443 insertions, 220 deletions

diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index fb638c316dc4..9c424655166f 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libreoffice
 PORTVERSION=	3.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 LOVERSION=	3.3.0.4
 CATEGORIES=	editors
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/ \
diff --git a/editors/libreoffice/files/patch-build__libreoffice____desktop__scripts__unopkg.sh b/editors/libreoffice/files/patch-build__libreoffice____desktop__scripts__unopkg.sh
new file mode 100644
index 000000000000..98d959051c79
--- /dev/null
+++ b/editors/libreoffice/files/patch-build__libreoffice____desktop__scripts__unopkg.sh
@@ -0,0 +1,11 @@
+--- 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__padmin__source__spadmin.sh b/editors/libreoffice/files/patch-build__libreoffice__padmin__source__spadmin.sh
new file mode 100644
index 000000000000..facba8878da2
--- /dev/null
+++ b/editors/libreoffice/files/patch-build__libreoffice__padmin__source__spadmin.sh
@@ -0,0 +1,17 @@
+--- 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__solenv__inc__unxfbsd.mk b/editors/libreoffice/files/patch-build__libreoffice__solenv__inc__unxfbsd.mk
new file mode 100644
index 000000000000..555ff9ce1d7f
--- /dev/null
+++ b/editors/libreoffice/files/patch-build__libreoffice__solenv__inc__unxfbsd.mk
@@ -0,0 +1,214 @@
+--- build/libreoffice/solenv/inc/unxfbsd.mk.orig	2010-11-11 16:08:07.000000000 +0100
++++ build/libreoffice/solenv/inc/unxfbsd.mk	2011-02-07 20:16:30.183383826 +0100
+@@ -27,203 +27,17 @@
+ 
+ # Makefile for FreeBSD.
+ 
+-ASM=
+-AFLAGS=
+-
+-SOLAR_JAVA*=
+-JAVAFLAGSDEBUG=-g
+-
+ # Include arch specific makefile.
+ .IF "$(CPUNAME)" == "INTEL"
+-.INCLUDE : unxfbsdi.mk
++CDEFS+=	-DX86
+ .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 -DSTLPORT_VERSION=450
+-
+-# 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; required for crashdump feature
+-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+-CFLAGSENABLESYMBOLS=-g1
+-.ELSE
+-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
+-
+-.ENDIF
+-
+-# 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)
+-
+-# 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 -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-
+-# 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
+-
+-.IF "$(USE_STLP_DEBUG)" != ""
+-.IF "$(STLPORT_VER)" >= "500"
+-LIBSTLPORT=$(DYNAMIC) -lstlportstlg
+-LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
+-.ELSE
+-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+-.ENDIF
+-.ELSE # "$(USE_STLP_DEBUG)" != ""
+-.IF "$(STLPORT_VER)" >= "500"
+-LIBSTLPORT=$(DYNAMIC) -lstlport
+-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
+-.ELSE
+-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++CDEFS+= -DX86_86
++ARCH_FLAGS*=
++BUILD64=1
+ .ENDIF
+-.ENDIF # "$(USE_STLP_DEBUG)" != ""
+-
+-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+ 
+-# 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
++.INCLUDE : unxgcc.mk
++  
++  # platform specific identifier for shared libs
++DLLPOSTFIX=fb
diff --git a/editors/libreoffice/pkg-plist b/editors/libreoffice/pkg-plist
index 8c0f71a566bf..bfc435e89133 100644
--- a/editors/libreoffice/pkg-plist
+++ b/editors/libreoffice/pkg-plist
@@ -3203,15 +3203,15 @@ lib/libreoffice/basis%%LOVER%%/program/unohelper.py
 lib/libreoffice/basis%%LOVER%%/program/unorc
 lib/libreoffice/basis%%LOVER%%/program/uri-encode
 lib/libreoffice/basis%%LOVER%%/program/versionrc
-lib/libreoffice/basis%%LOVER%%/program/basprovfx.uno.so
+lib/libreoffice/basis%%LOVER%%/program/basprovfb.uno.so
 lib/libreoffice/basis%%LOVER%%/program/cairocanvas.uno.so
 lib/libreoffice/basis%%LOVER%%/program/canvasfactory.uno.so
 lib/libreoffice/basis%%LOVER%%/program/cmdmail.uno.so
 lib/libreoffice/basis%%LOVER%%/program/configmgr.uno.so
-lib/libreoffice/basis%%LOVER%%/program/deploymentfx.uno.so
-lib/libreoffice/basis%%LOVER%%/program/deploymentguifx.uno.so
+lib/libreoffice/basis%%LOVER%%/program/deploymentfb.uno.so
+lib/libreoffice/basis%%LOVER%%/program/deploymentguifb.uno.so
 lib/libreoffice/basis%%LOVER%%/program/desktopbe1.uno.so
-lib/libreoffice/basis%%LOVER%%/program/dlgprovfx.uno.so
+lib/libreoffice/basis%%LOVER%%/program/dlgprovfb.uno.so
 lib/libreoffice/basis%%LOVER%%/program/fastsax.uno.so
 lib/libreoffice/basis%%LOVER%%/program/fpicker.uno.so
 lib/libreoffice/basis%%LOVER%%/program/fps_gnome.uno.so
@@ -3223,169 +3223,169 @@ lib/libreoffice/basis%%LOVER%%/program/i18nsearch.uno.so
 lib/libreoffice/basis%%LOVER%%/program/kde-open-url
 %%KDEOPT%%lib/libreoffice/basis%%LOVER%%/program/fps_kde4.uno.so
 %%KDEOPT%%lib/libreoffice/basis%%LOVER%%/program/kde4be1.uno.so
-%%KDEOPT%%lib/libreoffice/basis%%LOVER%%/program/libvclplug_kde4fx.so
-lib/libreoffice/basis%%LOVER%%/program/libabpfx.so
-lib/libreoffice/basis%%LOVER%%/program/libaccfx.so
-lib/libreoffice/basis%%LOVER%%/program/libadabasuifx.so
-lib/libreoffice/basis%%LOVER%%/program/libanalysisfx.so
+%%KDEOPT%%lib/libreoffice/basis%%LOVER%%/program/libvclplug_kde4fb.so
+lib/libreoffice/basis%%LOVER%%/program/libabpfb.so
+lib/libreoffice/basis%%LOVER%%/program/libaccfb.so
+lib/libreoffice/basis%%LOVER%%/program/libadabasuifb.so
+lib/libreoffice/basis%%LOVER%%/program/libanalysisfb.so
 lib/libreoffice/basis%%LOVER%%/program/libanimcore.so
-lib/libreoffice/basis%%LOVER%%/program/libavmediafx.so
+lib/libreoffice/basis%%LOVER%%/program/libavmediafb.so
 lib/libreoffice/basis%%LOVER%%/program/libavmediagst.so
-lib/libreoffice/basis%%LOVER%%/program/libbasctlfx.so
-lib/libreoffice/basis%%LOVER%%/program/libbasebmpfx.so
-lib/libreoffice/basis%%LOVER%%/program/libbasegfxfx.so
-lib/libreoffice/basis%%LOVER%%/program/libbibfx.so
+lib/libreoffice/basis%%LOVER%%/program/libbasctlfb.so
+lib/libreoffice/basis%%LOVER%%/program/libbasebmpfb.so
+lib/libreoffice/basis%%LOVER%%/program/libbasegfxfb.so
+lib/libreoffice/basis%%LOVER%%/program/libbibfb.so
 lib/libreoffice/basis%%LOVER%%/program/libcached1.so
-lib/libreoffice/basis%%LOVER%%/program/libcalcfx.so
-lib/libreoffice/basis%%LOVER%%/program/libcanvastoolsfx.so
-lib/libreoffice/basis%%LOVER%%/program/libchartcontrollerfx.so
-lib/libreoffice/basis%%LOVER%%/program/libchartmodelfx.so
-lib/libreoffice/basis%%LOVER%%/program/libcharttoolsfx.so
-lib/libreoffice/basis%%LOVER%%/program/libchartviewfx.so
+lib/libreoffice/basis%%LOVER%%/program/libcalcfb.so
+lib/libreoffice/basis%%LOVER%%/program/libcanvastoolsfb.so
+lib/libreoffice/basis%%LOVER%%/program/libchartcontrollerfb.so
+lib/libreoffice/basis%%LOVER%%/program/libchartmodelfb.so
+lib/libreoffice/basis%%LOVER%%/program/libcharttoolsfb.so
+lib/libreoffice/basis%%LOVER%%/program/libchartviewfb.so
 lib/libreoffice/basis%%LOVER%%/program/libcollator_data.so
-lib/libreoffice/basis%%LOVER%%/program/libcommunifx.so
+lib/libreoffice/basis%%LOVER%%/program/libcommunifb.so
 lib/libreoffice/basis%%LOVER%%/program/libcomphelp4gcc3.so
-lib/libreoffice/basis%%LOVER%%/program/libcppcanvasfx.so
-lib/libreoffice/basis%%LOVER%%/program/libctlfx.so
-lib/libreoffice/basis%%LOVER%%/program/libcuifx.so
-lib/libreoffice/basis%%LOVER%%/program/libdatefx.so
-lib/libreoffice/basis%%LOVER%%/program/libdbacfgfx.so
-lib/libreoffice/basis%%LOVER%%/program/libdbafx.so
-lib/libreoffice/basis%%LOVER%%/program/libdbasefx.so
-lib/libreoffice/basis%%LOVER%%/program/libdbaxmlfx.so
-lib/libreoffice/basis%%LOVER%%/program/libdbmmfx.so
-lib/libreoffice/basis%%LOVER%%/program/libdbpfx.so
+lib/libreoffice/basis%%LOVER%%/program/libcppcanvasfb.so
+lib/libreoffice/basis%%LOVER%%/program/libctlfb.so
+lib/libreoffice/basis%%LOVER%%/program/libcuifb.so
+lib/libreoffice/basis%%LOVER%%/program/libdatefb.so
+lib/libreoffice/basis%%LOVER%%/program/libdbacfgfb.so
+lib/libreoffice/basis%%LOVER%%/program/libdbafb.so
+lib/libreoffice/basis%%LOVER%%/program/libdbasefb.so
+lib/libreoffice/basis%%LOVER%%/program/libdbaxmlfb.so
+lib/libreoffice/basis%%LOVER%%/program/libdbmmfb.so
+lib/libreoffice/basis%%LOVER%%/program/libdbpfb.so
 lib/libreoffice/basis%%LOVER%%/program/libdbpool2.so
-lib/libreoffice/basis%%LOVER%%/program/libdbtoolsfx.so
-lib/libreoffice/basis%%LOVER%%/program/libdbufx.so
-lib/libreoffice/basis%%LOVER%%/program/libdeploymentmiscfx.so
-lib/libreoffice/basis%%LOVER%%/program/libdesktop_detectorfx.so
+lib/libreoffice/basis%%LOVER%%/program/libdbtoolsfb.so
+lib/libreoffice/basis%%LOVER%%/program/libdbufb.so
+lib/libreoffice/basis%%LOVER%%/program/libdeploymentmiscfb.so
+lib/libreoffice/basis%%LOVER%%/program/libdesktop_detectorfb.so
 lib/libreoffice/basis%%LOVER%%/program/libdict_ja.so
 lib/libreoffice/basis%%LOVER%%/program/libdict_zh.so
-lib/libreoffice/basis%%LOVER%%/program/libdrawinglayerfx.so
-lib/libreoffice/basis%%LOVER%%/program/libeditengfx.so
-lib/libreoffice/basis%%LOVER%%/program/libeggtrayfx.so
-lib/libreoffice/basis%%LOVER%%/program/libegifx.so
+lib/libreoffice/basis%%LOVER%%/program/libdrawinglayerfb.so
+lib/libreoffice/basis%%LOVER%%/program/libeditengfb.so
+lib/libreoffice/basis%%LOVER%%/program/libeggtrayfb.so
+lib/libreoffice/basis%%LOVER%%/program/libegifb.so
 lib/libreoffice/basis%%LOVER%%/program/libembobj.so
 lib/libreoffice/basis%%LOVER%%/program/libemboleobj.so
-lib/libreoffice/basis%%LOVER%%/program/libemefx.so
-lib/libreoffice/basis%%LOVER%%/program/libepbfx.so
-lib/libreoffice/basis%%LOVER%%/program/libepgfx.so
-lib/libreoffice/basis%%LOVER%%/program/libeppfx.so
-lib/libreoffice/basis%%LOVER%%/program/libepsfx.so
-lib/libreoffice/basis%%LOVER%%/program/libeptfx.so
-lib/libreoffice/basis%%LOVER%%/program/liberafx.so
-lib/libreoffice/basis%%LOVER%%/program/libetifx.so
-lib/libreoffice/basis%%LOVER%%/program/libevoabfx.so
+lib/libreoffice/basis%%LOVER%%/program/libemefb.so
+lib/libreoffice/basis%%LOVER%%/program/libepbfb.so
+lib/libreoffice/basis%%LOVER%%/program/libepgfb.so
+lib/libreoffice/basis%%LOVER%%/program/libeppfb.so
+lib/libreoffice/basis%%LOVER%%/program/libepsfb.so
+lib/libreoffice/basis%%LOVER%%/program/libeptfb.so
+lib/libreoffice/basis%%LOVER%%/program/liberafb.so
+lib/libreoffice/basis%%LOVER%%/program/libetifb.so
+lib/libreoffice/basis%%LOVER%%/program/libevoabfb.so
 lib/libreoffice/basis%%LOVER%%/program/libevtatt.so
-lib/libreoffice/basis%%LOVER%%/program/libexpfx.so
+lib/libreoffice/basis%%LOVER%%/program/libexpfb.so
 lib/libreoffice/basis%%LOVER%%/program/libfileacc.so
-lib/libreoffice/basis%%LOVER%%/program/libfilefx.so
+lib/libreoffice/basis%%LOVER%%/program/libfilefb.so
 lib/libreoffice/basis%%LOVER%%/program/libfilterconfig1.so
-lib/libreoffice/basis%%LOVER%%/program/libflashfx.so
-lib/libreoffice/basis%%LOVER%%/program/libflatfx.so
-lib/libreoffice/basis%%LOVER%%/program/libforfx.so
-lib/libreoffice/basis%%LOVER%%/program/libforuifx.so
-lib/libreoffice/basis%%LOVER%%/program/libfrmfx.so
-lib/libreoffice/basis%%LOVER%%/program/libfwefx.so
-lib/libreoffice/basis%%LOVER%%/program/libfwifx.so
-lib/libreoffice/basis%%LOVER%%/program/libfwkfx.so
-lib/libreoffice/basis%%LOVER%%/program/libfwlfx.so
-lib/libreoffice/basis%%LOVER%%/program/libfwmfx.so
-lib/libreoffice/basis%%LOVER%%/program/libguesslangfx.so
-lib/libreoffice/basis%%LOVER%%/program/libhelplinkerfx.so
+lib/libreoffice/basis%%LOVER%%/program/libflashfb.so
+lib/libreoffice/basis%%LOVER%%/program/libflatfb.so
+lib/libreoffice/basis%%LOVER%%/program/libforfb.so
+lib/libreoffice/basis%%LOVER%%/program/libforuifb.so
+lib/libreoffice/basis%%LOVER%%/program/libfrmfb.so
+lib/libreoffice/basis%%LOVER%%/program/libfwefb.so
+lib/libreoffice/basis%%LOVER%%/program/libfwifb.so
+lib/libreoffice/basis%%LOVER%%/program/libfwkfb.so
+lib/libreoffice/basis%%LOVER%%/program/libfwlfb.so
+lib/libreoffice/basis%%LOVER%%/program/libfwmfb.so
+lib/libreoffice/basis%%LOVER%%/program/libguesslangfb.so
+lib/libreoffice/basis%%LOVER%%/program/libhelplinkerfb.so
 lib/libreoffice/basis%%LOVER%%/program/libhwp.so
-lib/libreoffice/basis%%LOVER%%/program/libhyphenfx.so
+lib/libreoffice/basis%%LOVER%%/program/libhyphenfb.so
 lib/libreoffice/basis%%LOVER%%/program/libi18nisolang1gcc3.so
-lib/libreoffice/basis%%LOVER%%/program/libi18npaperfx.so
+lib/libreoffice/basis%%LOVER%%/program/libi18npaperfb.so
 lib/libreoffice/basis%%LOVER%%/program/libi18nregexpgcc3.so
 lib/libreoffice/basis%%LOVER%%/program/libi18nutilgcc3.so
-lib/libreoffice/basis%%LOVER%%/program/libicdfx.so
-lib/libreoffice/basis%%LOVER%%/program/libicgfx.so
-lib/libreoffice/basis%%LOVER%%/program/libidxfx.so
-lib/libreoffice/basis%%LOVER%%/program/libimefx.so
+lib/libreoffice/basis%%LOVER%%/program/libicdfb.so
+lib/libreoffice/basis%%LOVER%%/program/libicgfb.so
+lib/libreoffice/basis%%LOVER%%/program/libidxfb.so
+lib/libreoffice/basis%%LOVER%%/program/libimefb.so
 lib/libreoffice/basis%%LOVER%%/program/libindex_data.so
-lib/libreoffice/basis%%LOVER%%/program/libipbfx.so
-lib/libreoffice/basis%%LOVER%%/program/libipdfx.so
-lib/libreoffice/basis%%LOVER%%/program/libipsfx.so
-lib/libreoffice/basis%%LOVER%%/program/libiptfx.so
-lib/libreoffice/basis%%LOVER%%/program/libipxfx.so
-lib/libreoffice/basis%%LOVER%%/program/libirafx.so
-lib/libreoffice/basis%%LOVER%%/program/libitgfx.so
-lib/libreoffice/basis%%LOVER%%/program/libitifx.so
-lib/libreoffice/basis%%LOVER%%/program/liblngfx.so
-lib/libreoffice/basis%%LOVER%%/program/liblnthfx.so
+lib/libreoffice/basis%%LOVER%%/program/libipbfb.so
+lib/libreoffice/basis%%LOVER%%/program/libipdfb.so
+lib/libreoffice/basis%%LOVER%%/program/libipsfb.so
+lib/libreoffice/basis%%LOVER%%/program/libiptfb.so
+lib/libreoffice/basis%%LOVER%%/program/libipxfb.so
+lib/libreoffice/basis%%LOVER%%/program/libirafb.so
+lib/libreoffice/basis%%LOVER%%/program/libitgfb.so
+lib/libreoffice/basis%%LOVER%%/program/libitifb.so
+lib/libreoffice/basis%%LOVER%%/program/liblngfb.so
+lib/libreoffice/basis%%LOVER%%/program/liblnthfb.so
 lib/libreoffice/basis%%LOVER%%/program/liblocaledata_en.so
 lib/libreoffice/basis%%LOVER%%/program/liblocaledata_es.so
 lib/libreoffice/basis%%LOVER%%/program/liblocaledata_euro.so
 lib/libreoffice/basis%%LOVER%%/program/liblocaledata_others.so
-lib/libreoffice/basis%%LOVER%%/program/liblogfx.so
-lib/libreoffice/basis%%LOVER%%/program/liblwpftfx.so
+lib/libreoffice/basis%%LOVER%%/program/liblogfb.so
+lib/libreoffice/basis%%LOVER%%/program/liblwpftfb.so
 lib/libreoffice/basis%%LOVER%%/program/libmcnttype.so
 lib/libreoffice/basis%%LOVER%%/program/libmozbootstrap.so
-lib/libreoffice/basis%%LOVER%%/program/libmsfilterfx.so
-lib/libreoffice/basis%%LOVER%%/program/libmsformsfx.uno.so
-lib/libreoffice/basis%%LOVER%%/program/libmswordfx.so
-lib/libreoffice/basis%%LOVER%%/program/libmsworksfx.so
+lib/libreoffice/basis%%LOVER%%/program/libmsfilterfb.so
+lib/libreoffice/basis%%LOVER%%/program/libmsformsfb.uno.so
+lib/libreoffice/basis%%LOVER%%/program/libmswordfb.so
+lib/libreoffice/basis%%LOVER%%/program/libmsworksfb.so
 lib/libreoffice/basis%%LOVER%%/program/libmtfrenderer.uno.so
-lib/libreoffice/basis%%LOVER%%/program/libmysqlfx.so
-lib/libreoffice/basis%%LOVER%%/program/libodbcbasefx.so
-lib/libreoffice/basis%%LOVER%%/program/libodbcfx.so
-lib/libreoffice/basis%%LOVER%%/program/liboffaccfx.so
-lib/libreoffice/basis%%LOVER%%/program/liboooimprovecorefx.so
-lib/libreoffice/basis%%LOVER%%/program/libooxfx.so
+lib/libreoffice/basis%%LOVER%%/program/libmysqlfb.so
+lib/libreoffice/basis%%LOVER%%/program/libodbcbasefb.so
+lib/libreoffice/basis%%LOVER%%/program/libodbcfb.so
+lib/libreoffice/basis%%LOVER%%/program/liboffaccfb.so
+lib/libreoffice/basis%%LOVER%%/program/liboooimprovecorefb.so
+lib/libreoffice/basis%%LOVER%%/program/libooxfb.so
 lib/libreoffice/basis%%LOVER%%/program/libpackage2.so
-lib/libreoffice/basis%%LOVER%%/program/libpcrfx.so
-lib/libreoffice/basis%%LOVER%%/program/libpdffilterfx.so
-lib/libreoffice/basis%%LOVER%%/program/libplacewarefx.so
-lib/libreoffice/basis%%LOVER%%/program/libpreloadfx.so
-lib/libreoffice/basis%%LOVER%%/program/libprotocolhandlerfx.so
+lib/libreoffice/basis%%LOVER%%/program/libpcrfb.so
+lib/libreoffice/basis%%LOVER%%/program/libpdffilterfb.so
+lib/libreoffice/basis%%LOVER%%/program/libplacewarefb.so
+lib/libreoffice/basis%%LOVER%%/program/libpreloadfb.so
+lib/libreoffice/basis%%LOVER%%/program/libprotocolhandlerfb.so
 lib/libreoffice/basis%%LOVER%%/program/libpyuno.so
-lib/libreoffice/basis%%LOVER%%/program/libqstart_gtkfx.so
+lib/libreoffice/basis%%LOVER%%/program/libqstart_gtkfb.so
 lib/libreoffice/basis%%LOVER%%/program/librecentfile.so
-lib/libreoffice/basis%%LOVER%%/program/libresfx.so
-lib/libreoffice/basis%%LOVER%%/program/librptfx.so
-lib/libreoffice/basis%%LOVER%%/program/librptuifx.so
-lib/libreoffice/basis%%LOVER%%/program/librptxmlfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsaxfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsbfx.so
-lib/libreoffice/basis%%LOVER%%/program/libscdfx.so
-lib/libreoffice/basis%%LOVER%%/program/libscfiltfx.so
-lib/libreoffice/basis%%LOVER%%/program/libscfx.so
-lib/libreoffice/basis%%LOVER%%/program/libscnfx.so
+lib/libreoffice/basis%%LOVER%%/program/libresfb.so
+lib/libreoffice/basis%%LOVER%%/program/librptfb.so
+lib/libreoffice/basis%%LOVER%%/program/librptuifb.so
+lib/libreoffice/basis%%LOVER%%/program/librptxmlfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsaxfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsbfb.so
+lib/libreoffice/basis%%LOVER%%/program/libscdfb.so
+lib/libreoffice/basis%%LOVER%%/program/libscfiltfb.so
+lib/libreoffice/basis%%LOVER%%/program/libscfb.so
+lib/libreoffice/basis%%LOVER%%/program/libscnfb.so
 lib/libreoffice/basis%%LOVER%%/program/libscriptframe.so
-lib/libreoffice/basis%%LOVER%%/program/libscuifx.so
+lib/libreoffice/basis%%LOVER%%/program/libscuifb.so
 lib/libreoffice/basis%%LOVER%%/program/libsdbc2.so
-lib/libreoffice/basis%%LOVER%%/program/libsdbtfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsddfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsdfiltfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsdfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsduifx.so
-lib/libreoffice/basis%%LOVER%%/program/libsfxfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsimplecmfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsmdfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsmfx.so
+lib/libreoffice/basis%%LOVER%%/program/libsdbtfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsddfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsdfiltfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsdfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsduifb.so
+lib/libreoffice/basis%%LOVER%%/program/libsfxfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsimplecmfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsmdfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsmfb.so
 lib/libreoffice/basis%%LOVER%%/program/libsofficeapp.so
-lib/libreoffice/basis%%LOVER%%/program/libsolverfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsotfx.so
-lib/libreoffice/basis%%LOVER%%/program/libspafx.so
-lib/libreoffice/basis%%LOVER%%/program/libspellfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsplfx.so
+lib/libreoffice/basis%%LOVER%%/program/libsolverfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsotfb.so
+lib/libreoffice/basis%%LOVER%%/program/libspafb.so
+lib/libreoffice/basis%%LOVER%%/program/libspellfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsplfb.so
 lib/libreoffice/basis%%LOVER%%/program/libsrtrs1.so
-lib/libreoffice/basis%%LOVER%%/program/libstsfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsvgfilterfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsvlfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsvtfx.so
-lib/libreoffice/basis%%LOVER%%/program/libsvxcorefx.so
-lib/libreoffice/basis%%LOVER%%/program/libsvxfx.so
-lib/libreoffice/basis%%LOVER%%/program/libswdfx.so
-lib/libreoffice/basis%%LOVER%%/program/libswfx.so
-lib/libreoffice/basis%%LOVER%%/program/libswuifx.so
-lib/libreoffice/basis%%LOVER%%/program/libt602filterfx.so
+lib/libreoffice/basis%%LOVER%%/program/libstsfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsvgfilterfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsvlfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsvtfb.so
+lib/libreoffice/basis%%LOVER%%/program/libsvxcorefb.so
+lib/libreoffice/basis%%LOVER%%/program/libsvxfb.so
+lib/libreoffice/basis%%LOVER%%/program/libswdfb.so
+lib/libreoffice/basis%%LOVER%%/program/libswfb.so
+lib/libreoffice/basis%%LOVER%%/program/libswuifb.so
+lib/libreoffice/basis%%LOVER%%/program/libt602filterfb.so
 lib/libreoffice/basis%%LOVER%%/program/libtextconv_dict.so
-lib/libreoffice/basis%%LOVER%%/program/libtextconversiondlgsfx.so
-lib/libreoffice/basis%%LOVER%%/program/libtkfx.so
-lib/libreoffice/basis%%LOVER%%/program/libtlfx.so
+lib/libreoffice/basis%%LOVER%%/program/libtextconversiondlgsfb.so
+lib/libreoffice/basis%%LOVER%%/program/libtkfb.so
+lib/libreoffice/basis%%LOVER%%/program/libtlfb.so
 lib/libreoffice/basis%%LOVER%%/program/libtvhlp1.so
 lib/libreoffice/basis%%LOVER%%/program/libucb1.so
 lib/libreoffice/basis%%LOVER%%/program/libucbhelper4gcc3.so
@@ -3395,29 +3395,29 @@ lib/libreoffice/basis%%LOVER%%/program/libucpftp1.so
 lib/libreoffice/basis%%LOVER%%/program/libucphier1.so
 lib/libreoffice/basis%%LOVER%%/program/libucppkg1.so
 lib/libreoffice/basis%%LOVER%%/program/libunopkgapp.so
-lib/libreoffice/basis%%LOVER%%/program/libunordffx.so
-lib/libreoffice/basis%%LOVER%%/program/libunoxmlfx.so
-lib/libreoffice/basis%%LOVER%%/program/libupdchkfx.so
-lib/libreoffice/basis%%LOVER%%/program/libutlfx.so
-lib/libreoffice/basis%%LOVER%%/program/libuuifx.so
-lib/libreoffice/basis%%LOVER%%/program/libvbahelperfx.so
-lib/libreoffice/basis%%LOVER%%/program/libvbaobjfx.uno.so
-lib/libreoffice/basis%%LOVER%%/program/libvbaswobjfx.uno.so
-lib/libreoffice/basis%%LOVER%%/program/libvclfx.so
-lib/libreoffice/basis%%LOVER%%/program/libvclplug_genfx.so
-lib/libreoffice/basis%%LOVER%%/program/libvclplug_gtkfx.so
-lib/libreoffice/basis%%LOVER%%/program/libvclplug_svpfx.so
-lib/libreoffice/basis%%LOVER%%/program/libwpftfx.so
-lib/libreoffice/basis%%LOVER%%/program/libwpgimportfx.so
-lib/libreoffice/basis%%LOVER%%/program/libwriterfilterfx.so
-lib/libreoffice/basis%%LOVER%%/program/libxcrfx.so
-lib/libreoffice/basis%%LOVER%%/program/libxmlfafx.so
-lib/libreoffice/basis%%LOVER%%/program/libxmlfdfx.so
-lib/libreoffice/basis%%LOVER%%/program/libxmxfx.so
-lib/libreoffice/basis%%LOVER%%/program/libxoffx.so
-lib/libreoffice/basis%%LOVER%%/program/libxofx.so
-lib/libreoffice/basis%%LOVER%%/program/libxsltdlgfx.so
-lib/libreoffice/basis%%LOVER%%/program/libxsltfilterfx.so
+lib/libreoffice/basis%%LOVER%%/program/libunordffb.so
+lib/libreoffice/basis%%LOVER%%/program/libunoxmlfb.so
+lib/libreoffice/basis%%LOVER%%/program/libupdchkfb.so
+lib/libreoffice/basis%%LOVER%%/program/libutlfb.so
+lib/libreoffice/basis%%LOVER%%/program/libuuifb.so
+lib/libreoffice/basis%%LOVER%%/program/libvbahelperfb.so
+lib/libreoffice/basis%%LOVER%%/program/libvbaobjfb.uno.so
+lib/libreoffice/basis%%LOVER%%/program/libvbaswobjfb.uno.so
+lib/libreoffice/basis%%LOVER%%/program/libvclfb.so
+lib/libreoffice/basis%%LOVER%%/program/libvclplug_genfb.so
+lib/libreoffice/basis%%LOVER%%/program/libvclplug_gtkfb.so
+lib/libreoffice/basis%%LOVER%%/program/libvclplug_svpfb.so
+lib/libreoffice/basis%%LOVER%%/program/libwpftfb.so
+lib/libreoffice/basis%%LOVER%%/program/libwpgimportfb.so
+lib/libreoffice/basis%%LOVER%%/program/libwriterfilterfb.so
+lib/libreoffice/basis%%LOVER%%/program/libxcrfb.so
+lib/libreoffice/basis%%LOVER%%/program/libxmlfafb.so
+lib/libreoffice/basis%%LOVER%%/program/libxmlfdfb.so
+lib/libreoffice/basis%%LOVER%%/program/libxmxfb.so
+lib/libreoffice/basis%%LOVER%%/program/libxoffb.so
+lib/libreoffice/basis%%LOVER%%/program/libxofb.so
+lib/libreoffice/basis%%LOVER%%/program/libxsltdlgfb.so
+lib/libreoffice/basis%%LOVER%%/program/libxsltfilterfb.so
 lib/libreoffice/basis%%LOVER%%/program/libxstor.so
 lib/libreoffice/basis%%LOVER%%/program/localebe1.uno.so
 lib/libreoffice/basis%%LOVER%%/program/migrationoo2.uno.so
@@ -3429,15 +3429,15 @@ lib/libreoffice/basis%%LOVER%%/program/pyuno.so
 lib/libreoffice/basis%%LOVER%%/program/sax.uno.so
 lib/libreoffice/basis%%LOVER%%/program/simplecanvas.uno.so
 lib/libreoffice/basis%%LOVER%%/program/slideshow.uno.so
-lib/libreoffice/basis%%LOVER%%/program/stringresourcefx.uno.so
+lib/libreoffice/basis%%LOVER%%/program/stringresourcefb.uno.so
 lib/libreoffice/basis%%LOVER%%/program/syssh.uno.so
 lib/libreoffice/basis%%LOVER%%/program/ucpexpand1.uno.so
 lib/libreoffice/basis%%LOVER%%/program/ucpext.uno.so
 lib/libreoffice/basis%%LOVER%%/program/ucptdoc1.uno.so
 lib/libreoffice/basis%%LOVER%%/program/updatefeed.uno.so
-lib/libreoffice/basis%%LOVER%%/program/vbaeventsfx.uno.so
+lib/libreoffice/basis%%LOVER%%/program/vbaeventsfb.uno.so
 lib/libreoffice/basis%%LOVER%%/program/vclcanvas.uno.so
-%%JAVAOPT%%lib/libreoffice/basis%%LOVER%%/program/libjdbcfx.so
+%%JAVAOPT%%lib/libreoffice/basis%%LOVER%%/program/libjdbcfb.so
 %%JAVAOPT%%lib/libreoffice/basis%%LOVER%%/program/libhsqldb.so
 %%JAVAOPT%%lib/libreoffice/basis%%LOVER%%/program/libofficebean.so
 %%JAVAOPT%%lib/libreoffice/basis%%LOVER%%/program/classes/XSLTFilter.jar
@@ -7618,139 +7618,120 @@ lib/libreoffice/share/extensions/presenter-screen/description.xml
 lib/libreoffice/share/extensions/presenter-screen/help/component.txt
 lib/libreoffice/share/extensions/presenter-screen/help/bg/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/bg/help.jar
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/bg/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
-lib/libreoffice/share/extensions/presenter-screen/help/bg/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/bg/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/bg/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/bg/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/bg/help.db_
 lib/libreoffice/share/extensions/presenter-screen/help/bg/help.key_
 lib/libreoffice/share/extensions/presenter-screen/help/es/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/es/help.jar
-lib/libreoffice/share/extensions/presenter-screen/help/es/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/es/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/es/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/es/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/es/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/es/help.db_
 lib/libreoffice/share/extensions/presenter-screen/help/es/help.key_
 lib/libreoffice/share/extensions/presenter-screen/help/pl/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/pl/help.jar
 lib/libreoffice/share/extensions/presenter-screen/help/pl/help.key_
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/pl/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
-lib/libreoffice/share/extensions/presenter-screen/help/pl/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/pl/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/pl/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/pl/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/pl/help.db_
 lib/libreoffice/share/extensions/presenter-screen/help/hu/help.ht_
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/hu/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/hu/help.jar
 lib/libreoffice/share/extensions/presenter-screen/help/hu/help.key_
-lib/libreoffice/share/extensions/presenter-screen/help/hu/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/hu/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/hu/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/hu/help.db_
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/hu/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/fa/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/fa/help.jar
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/fa/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
-lib/libreoffice/share/extensions/presenter-screen/help/fa/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/fa/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/fa/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/fa/caption/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/fa/help.db_
 lib/libreoffice/share/extensions/presenter-screen/help/fa/help.key_
 lib/libreoffice/share/extensions/presenter-screen/help/lt/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/lt/help.jar
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/lt/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
-lib/libreoffice/share/extensions/presenter-screen/help/lt/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/lt/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/lt/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/lt/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/lt/help.key_
 lib/libreoffice/share/extensions/presenter-screen/help/lt/help.db_
 lib/libreoffice/share/extensions/presenter-screen/help/nl/help.key_
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/nl/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/nl/help.jar
 lib/libreoffice/share/extensions/presenter-screen/help/nl/help.ht_
-lib/libreoffice/share/extensions/presenter-screen/help/nl/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/nl/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/nl/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/nl/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/nl/help.db_
 lib/libreoffice/share/extensions/presenter-screen/help/fr/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/fr/help.jar
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/fr/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
-lib/libreoffice/share/extensions/presenter-screen/help/fr/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/fr/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/fr/caption/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/fr/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/fr/help.key_
 lib/libreoffice/share/extensions/presenter-screen/help/fr/help.db_
 lib/libreoffice/share/extensions/presenter-screen/help/ja/help.key_
 lib/libreoffice/share/extensions/presenter-screen/help/ja/help.db_
-lib/libreoffice/share/extensions/presenter-screen/help/ja/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/ja/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/ja/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/ja/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/ja/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/ja/help.jar
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/ja/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
-lib/libreoffice/share/extensions/presenter-screen/help/pt-BR/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/pt-BR/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/pt-BR/caption/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/pt-BR/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/pt-BR/help.db_
 lib/libreoffice/share/extensions/presenter-screen/help/pt-BR/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/pt-BR/help.jar
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/pt-BR/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/pt-BR/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/pt-BR/help.key_
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/de/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/de/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/de/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/de/help.jar
 lib/libreoffice/share/extensions/presenter-screen/help/de/help.ht_
-lib/libreoffice/share/extensions/presenter-screen/help/de/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/de/help.key_
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/de/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/de/help.db_
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/ru/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
-lib/libreoffice/share/extensions/presenter-screen/help/ru/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/ru/caption/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/ru/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/ru/help.key_
 lib/libreoffice/share/extensions/presenter-screen/help/ru/help.db_
 lib/libreoffice/share/extensions/presenter-screen/help/ru/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/ru/help.jar
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/ru/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/sv/help.key_
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/sv/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/sv/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/sv/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/sv/help.db_
-lib/libreoffice/share/extensions/presenter-screen/help/sv/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/sv/help.ht_
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/sv/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/sv/help.jar
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/fi/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/fi/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/fi/help.jar
 lib/libreoffice/share/extensions/presenter-screen/help/fi/help.key_
-lib/libreoffice/share/extensions/presenter-screen/help/fi/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/fi/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/fi/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/fi/help.db_
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/fi/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/ko/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/ko/help.jar
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/ko/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/ko/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/ko/help.key_
-lib/libreoffice/share/extensions/presenter-screen/help/ko/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/ko/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/ko/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/ko/help.db_
-lib/libreoffice/share/extensions/presenter-screen/help/lv/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/lv/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/lv/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/lv/caption/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/lv/help.db_
 lib/libreoffice/share/extensions/presenter-screen/help/lv/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/lv/help.jar
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/lv/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/lv/help.key_
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/sl/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/sl/help.db_
 lib/libreoffice/share/extensions/presenter-screen/help/sl/help.key_
-lib/libreoffice/share/extensions/presenter-screen/help/sl/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/sl/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/sl/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/sl/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/sl/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/sl/help.jar
 lib/libreoffice/share/extensions/presenter-screen/help/ca/help.db_
-lib/libreoffice/share/extensions/presenter-screen/help/ca/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/ca/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/ca/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/ca/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/ca/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/ca/help.key_
 lib/libreoffice/share/extensions/presenter-screen/help/ca/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/ca/help.jar
 lib/libreoffice/share/extensions/presenter-screen/help/it/help.db_
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/it/caption/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
-lib/libreoffice/share/extensions/presenter-screen/help/it/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/it/content/com.sun.PresenterScreen-freebsd_x86_64%2Fpresenter.xhp
+lib/libreoffice/share/extensions/presenter-screen/help/it/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/it/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/it/help.ht_
 lib/libreoffice/share/extensions/presenter-screen/help/it/help.jar
 lib/libreoffice/share/extensions/presenter-screen/help/it/help.key_
-%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/en-US/caption/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
-lib/libreoffice/share/extensions/presenter-screen/help/en-US/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
+%%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/en-US/com.sun.PresenterScreen-freebsd_%%LOARCH%%/presenter.xhp
 %%NOJAVA%%lib/libreoffice/share/extensions/presenter-screen/help/en-US/content/com.sun.PresenterScreen-freebsd_%%LOARCH%%%2Fpresenter.xhp
 lib/libreoffice/share/extensions/presenter-screen/help/en-US/help.db_
 lib/libreoffice/share/extensions/presenter-screen/help/en-US/help.ht_