Upgrade to apache-openoffice SVN revision 1667428.

Word around broken build on FreeBSD 11.0-CURRENT i386, which appears
to be a code generation bug in clang 3.6 when using -Os optimization.

Build using the ports version of graphics/silgraphite instead of
building an internal copy.

When building with clang, use the ports version of devel/boost-libs
instead of an internal copy.

Use the dictionaries already installed by ports.

Update the patch-bridges and patch-*.mk patches to versions that
will be sent upstream.  The latter are tuned for clang to use as
is, with only some minor additional tweaks needed for gcc.

Nuke patch-webdav because it has been incorporated upstream.

Wordsmith pkg-message.

Various Makefile cleanups.

Differential Revision:	https://reviews.freebsd.org/D2108
Reviewed by:	pfg
Approved by:	mat (mentor)

14 files changed, 254 insertions, 262 deletions

diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index a789d21198ee..6c19298a21c6 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
-PORTREVISION=	2
+#PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	editors java
 MASTER_SITES=	http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
@@ -51,6 +51,7 @@ LIB_DEPENDS=								\
 		libjpeg.so:${PORTSDIR}/graphics/jpeg			\
 		libpng.so:${PORTSDIR}/graphics/png			\
 		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib	\
+		libgraphite.so:${PORTSDIR}/graphics/silgraphite		\
 		libCoinMP.so:${PORTSDIR}/math/coinmp			\
 		libfreetype.so:${PORTSDIR}/print/freetype2		\
 		libnss3.so:${PORTSDIR}/security/nss			\
@@ -61,7 +62,6 @@ LIB_DEPENDS=								\
 		libmythes-1.2.so:${PORTSDIR}/textproc/mythes		\
 		librdf.so:${PORTSDIR}/textproc/redland			\
 		libserf-1.so:${PORTSDIR}/www/serf
-#		libgraphite.so:${PORTSDIR}/graphics/silgraphite
 RUN_DEPENDS=								\
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
@@ -73,7 +73,7 @@ AOOVERSION2=	2
 AOOVERSION3=	0
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO420m1\(Build:9800\)
-SVNREVISION=	1652526
+SVNREVISION=	1667428
 #AOORC=rc3
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150118.tar.gz
 
@@ -83,10 +83,12 @@ AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
 AOOSUFFIX=	${AOOVERSION}-${AOORC}
 OOOSRC=		apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
 AOODISTTAG=
+TARTYPE=	bzip2
 .else
 AOOSUFFIX=	${PORTVERSION}
 OOOSRC=		apache-openoffice-r${SVNREVISION}-src${EXTRACT_SUFX}
 AOODISTTAG=	:snap
+TARTYPE=	xz
 .endif
 
 OOODIR=			openoffice${AOOVERSION1}
@@ -111,7 +113,7 @@ USE_PERL5=	build
 USE_XORG=	x11 ice xaw xau xext xrender xrandr \
 		xi xt xcursor xdamage xcomposite xfixes
 USES=		bison compiler desktop-file-utils gmake perl5 pkgconfig python \
-		tar:xz
+		tar:${TARTYPE}
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
 
@@ -136,16 +138,16 @@ GNOMEVFS_CONFIGURE_ENABLE=	gnome-vfs
 .if ${COMPILER_TYPE} == clang
 . if ${COMPILER_VERSION} < 35 && ${ARCH} == amd64
 BUILD_DEPENDS+=		clang35:${PORTSDIR}/lang/clang35
-CPP=			${LOCALBASE}/bin/clang-cpp35
-CC=			${LOCALBASE}/bin/clang35
-CXX=			${LOCALBASE}/bin/clang++35
+CPP=			clang-cpp35
+CC=			clang35
+CXX=			clang++35
 . endif
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs
+CONFIGURE_ARGS+=	--with-system-boost
 CPPFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-I${LOCALBASE}/lib
-SUBST=			s+%%RPATH%%++;s/%%HAVE_STL_INCLUDE_PATH%%/-DHAVE_STL_INCLUDE_PATH/;s/-fno-enforce-eh-specs//
 .else
 USE_GCC=		yes
-SUBST=			s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+;s/%%HAVE_STL_INCLUDE_PATH%%//
+SUBST=			"s/-fexceptions/& -fno-enforce-eh-specs/;s/-DHAVE_STL_INCLUDE_PATH//"
 .endif
 
 .if ${ARCH} == amd64
@@ -204,15 +206,19 @@ CONFIGURE_ARGS+=							\
 			--with-system-curl				\
 			--enable-crashdump				\
 			--enable-dbus					\
+			--with-system-dicts				\
 			--with-epm=${LOCALBASE}/bin/epm			\
 			--with-system-expat				\
 			--disable-fetch-external			\
 			--without-fonts					\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--with-gperf=${LOCALBASE}/bin/gperf		\
+			--with-system-graphite				\
 			--enable-gstreamer				\
 			--with-system-hunspell				\
+			--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 			--with-system-hyphen				\
+			--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
 			--with-system-jpeg				\
 			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
 			--with-system-libtextcat			\
@@ -223,6 +229,7 @@ CONFIGURE_ARGS+=							\
 			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
 			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
 			--with-system-mythes				\
+			--with-external-thes-dir=${LOCALBASE}/share/mythes \
 			--with-system-nss				\
 			--enable-opengl					\
 			--with-system-openssl				\
@@ -239,9 +246,6 @@ CONFIGURE_ARGS+=							\
 			--with-system-vigra				\
 			--enable-wiki-publisher				\
 			--with-system-zlib
-# system-graphite causes breakage when compiled with clang and linked
-# with libc++ because aoo is compiled with gcc and linked with libstdc++.
-#			--with-system-graphite
 
 #OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
 #OOOEXTENSIONS+=		presenter/presenter-screen.oxt
@@ -276,11 +280,15 @@ post-extract:
 	${RM} -rf ${WRKSRC}/l10n
 
 post-patch:
-	${REINPLACE_CMD} -e "${SUBST}" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
-	${REINPLACE_CMD} -e "${SUBST}" ${WRKSRC}/solenv/inc/unxfbsd.mk
-.if defined (USE_GCC) && ${ARCH} == i386
+.if defined (USE_GCC)
+	${REINPLACE_CMD} -e ${SUBST} ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
+	${REINPLACE_CMD} -e ${SUBST} ${WRKSRC}/solenv/inc/unxfbsd.mk
+.endif
+.if ${ARCH} == i386
 	# g++49 -Os sometimes leaves inline class methods undefined
-	if [ ${CXX} = g++49 ]; then \
+	# autodoc core dumps when built with with -Os clang 3.6 on i386
+	if [ ${CXX} = g++49 -o \
+	     ${COMPILER_TYPE} = clang -a ${COMPILER_VERSION} = 36 ]; then \
 		${REINPLACE_CMD} -e "s/ := -Os/ := -O0/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk; \
 		${REINPLACE_CMD} -e "s/=-Os /=-O0 /" ${WRKSRC}/solenv/inc/unxfbsdi.mk; \
 	fi
@@ -294,7 +302,7 @@ do-build:
 	cd ${WRKSUBDIR} ; ${PRINTF} "main=active\n" >> source_config
 	cd ${WRKSUBDIR} ; ${PRINTF} "extras=active\n" >> source_config
 	cd ${WRKSRC} ; ./bootstrap
-	cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util  ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
+	cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" FBSD_LDFLAGS="${LDFLAGS}" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util  ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
 
 do-install:
 	cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 61c42cfad6d2..7901c8bb2064 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openoffice/apache-openoffice-r1652526-src.tar.xz) = 0db1401923df096dd9497813ef5849f3fbe91f9c49f32e252a389649315ec906
-SIZE (openoffice/apache-openoffice-r1652526-src.tar.xz) = 215154504
+SHA256 (openoffice/apache-openoffice-r1667428-src.tar.xz) = 2c481e0f14f3f804b303ae5468991b4b7cdc82ce20660545cfb8cef2f5117c2f
+SIZE (openoffice/apache-openoffice-r1667428-src.tar.xz) = 215181884
 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150118.tar.gz) = b01b8894469a80667b0551ea6c0abffd3fb9e79c8a304d48091ff57ab53f10b7
 SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150118.tar.gz) = 102513542
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx
new file mode 100644
index 000000000000..401be50215c7
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx
@@ -0,0 +1,14 @@
+--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx.orig	2014-09-19 17:51:13 UTC
++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx
+@@ -24,6 +24,11 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_bridges.hxx"
+ 
++#include <typeinfo>
++#include <exception>
++#include <cstddef>
++#include <cxxabi.h>
++
+ #include <com/sun/star/uno/genfunc.hxx>
+ #include "com/sun/star/uno/RuntimeException.hpp"
+ #include <uno/data.h>
diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx
index 098e7c168b03..86ce7f990e50 100644
--- a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx
+++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx
@@ -1,11 +1,37 @@
 --- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx.orig	2014-09-19 17:51:13 UTC
 +++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
-@@ -24,7 +24,7 @@
+@@ -24,9 +24,9 @@
  // MARKER(update_precomp.py): autogen include statement, do not remove
  #include "precompiled_bridges.hxx"
  
 -#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))
-+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || defined(__clang__)
++#include <cstddef>
  #include <exception>
+-#endif
++#include <typeinfo>
+ 
+ #include <stdio.h>
+ #include <string.h>
+@@ -182,7 +182,12 @@ type_info * RTTI::getRTTI( typelib_Compo
+                 char const * rttiName = symName.getStr() +4;
+ #if OSL_DEBUG_LEVEL > 1
+                 fprintf( stderr,"generated rtti for %s\n", rttiName );
++#ifndef __GLIBCXX__ /* #i124421# */
++                const OString aCUnoName = OUStringToOString( unoName, RTL_TEXTENCODING_UTF8);
++                OSL_TRACE( "TypeInfo for \"%s\" not found and cannot be generated.\n", aCUnoName.getStr());
++#endif /* __GLIBCXX__ */
  #endif
++#ifdef __GLIBCXX__ /* #i124421# */
+                 if (pTypeDescr->pBaseTypeDescription)
+                 {
+                     // ensure availability of base
+@@ -196,6 +201,9 @@ type_info * RTTI::getRTTI( typelib_Compo
+                     // this class has no base class
+                     rtti = new __class_type_info( strdup( rttiName ) );
+                 }
++#else /* __GLIBCXX__ */
++                rtti = NULL;
++#endif /* __GLIBCXX__ */
  
+                 pair< t_rtti_map::iterator, bool > insertion(
+                     m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx
index 534898c4061d..7dd1aebb37c0 100644
--- a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx
+++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx
@@ -1,18 +1,17 @@
 --- bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx.orig	2014-09-19 17:51:12 UTC
 +++ bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx
-@@ -26,6 +26,11 @@
- #include <typeinfo>
- #include <exception>
- #include <cstddef>
-+#ifndef __GLIBCXX__
-+#include <cxxabi.h>
-+
-+using namespace ::__cxxabiv1;
-+#endif /* ! __GLIBCXX__ */
+@@ -23,10 +23,6 @@
  
+ #include "uno/mapping.h"
+ 
+-#include <typeinfo>
+-#include <exception>
+-#include <cstddef>
+-
  namespace CPPU_CURRENT_NAMESPACE
  {
-@@ -34,6 +39,7 @@ void dummy_can_throw_anything( char cons
+ 
+@@ -34,6 +30,7 @@ void dummy_can_throw_anything( char cons
  
  // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
  
@@ -20,11 +19,12 @@
  struct _Unwind_Exception
  {
      unsigned exception_class __attribute__((__mode__(__DI__)));
-@@ -63,11 +69,13 @@ struct __cxa_exception
+@@ -62,18 +59,21 @@ struct __cxa_exception
+     
      _Unwind_Exception unwindHeader;
  };    
- 
 +#endif /* __GLIBCXX__ */
+ 
  extern "C" void *__cxa_allocate_exception(
      std::size_t thrown_size ) throw();
  extern "C" void __cxa_throw (
@@ -34,34 +34,21 @@
  struct __cxa_eh_globals
  {
      __cxa_exception *caughtExceptions;
-@@ -75,6 +83,7 @@ struct __cxa_eh_globals
+     unsigned int uncaughtExceptions;
  };
  extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
- 
 +#endif /* __GLIBCXX__ */
+ 
  // -----
  
+@@ -81,6 +81,10 @@ extern "C" __cxa_eh_globals *__cxa_get_g
+ void raiseException(
+     uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
  //==================================================================================================
-@@ -84,3 +93,22 @@ void raiseException(
++#ifndef __GLIBCXX__
++using __cxxabiv1:: __cxa_exception;
++#endif /* __GLIBCXX__ */
++
  void fillUnoException(
      __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
  }
-+#ifndef __GLIBCXX__
-+
-+class __class_type_info : public std::type_info
-+{
-+public:
-+        explicit __class_type_info( const char* pRttiName)
-+        : std::type_info( pRttiName)
-+        {}
-+};
-+
-+class __si_class_type_info : public __class_type_info
-+{
-+        const __class_type_info* mpBaseType;
-+public:
-+        explicit __si_class_type_info( const char* pRttiName, __class_type_info* pBaseType)
-+        : __class_type_info( pRttiName), mpBaseType( pBaseType)
-+        {}
-+};
-+#endif /* ! __GLIBCXX__ */
diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx
index 289424d7bbcc..f9d7e6894586 100644
--- a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx
+++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx
@@ -1,14 +1,34 @@
 --- bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig	2014-09-19 17:51:13 UTC
 +++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx
-@@ -305,7 +305,11 @@ static void cpp_call(
+@@ -24,6 +24,10 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_bridges.hxx"
+ 
++#include <typeinfo>
++#include <exception>
++#include <cstddef>
++#include <cxxabi.h>
+ #include <stdlib.h>
+ 
+ #include <com/sun/star/uno/genfunc.hxx>
+@@ -39,6 +43,11 @@
+ 
+ using namespace ::rtl;
+ using namespace ::com::sun::star::uno;
++#ifdef __GLIBCXX__
++using CPPU_CURRENT_NAMESPACE::__cxa_get_globals;
++#else
++using __cxxabiv1::__cxa_get_globals;
++#endif
+ 
+ namespace
+ {
+@@ -305,7 +314,7 @@ static void cpp_call(
   	catch (...)
   	{
    		// fill uno exception
-+#ifndef __GLIBCXX__
+-		fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
 +		CPPU_CURRENT_NAMESPACE::fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-+#else /* __GLIBCXX__ */
- 		fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-+#endif /* __GLIBCXX__ */
          
  		// temporary params
  		for ( ; nTempIndizes--; )
diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx
new file mode 100644
index 000000000000..9ef38997e656
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx
@@ -0,0 +1,16 @@
+--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx.orig	2014-09-19 17:51:12 UTC
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx
+@@ -24,9 +24,10 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_bridges.hxx"
+ 
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <hash_map>
++#include <typeinfo>
++#include <exception>
++#include <cstddef>
++#include <cxxabi.h>
+ 
+ #include <rtl/alloc.h>
+ #include <osl/mutex.hxx>
diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx
index b463e756b8a0..cbedb922a655 100644
--- a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx
+++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx
@@ -1,11 +1,39 @@
 --- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx.orig	2014-09-19 17:51:13 UTC
 +++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx
-@@ -24,7 +24,7 @@
+@@ -24,9 +24,9 @@
  // MARKER(update_precomp.py): autogen include statement, do not remove
  #include "precompiled_bridges.hxx"
  
 -#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))
-+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || defined(__clang__)
++#include <cstddef>
  #include <exception>
- #endif
+-#endif
++#include <typeinfo>
  
+ #include <stdio.h>
+ #include <string.h>
+@@ -182,7 +182,12 @@ type_info * RTTI::getRTTI( typelib_Compo
+                 char const * rttiName = symName.getStr() +4;
+ #if OSL_DEBUG_LEVEL > 1
+                 fprintf( stderr,"generated rtti for %s\n", rttiName );
++#ifndef __GLIBCXX__ /* #i124421# */
++                const OString aCUnoName = OUStringToOString( unoName, RTL_TEXTENCODING_UTF8);
++                OSL_TRACE( "TypeInfo for \"%s\" not found and cannot be generated.\n", aCUnoName.getStr());
++#endif /* __GLIBCXX__ */
+ #endif
++#ifdef __GLIBCXX__ /* #i124421# */
+                 if (pTypeDescr->pBaseTypeDescription)
+                 {
+                     // ensure availability of base
+@@ -196,7 +201,10 @@ type_info * RTTI::getRTTI( typelib_Compo
+                     // this class has no base class
+                     rtti = new __class_type_info( strdup( rttiName ) );
+                 }
+-                
++#else /* __GLIBCXX__ */
++                rtti = NULL;
++#endif /* __GLIBCXX__ */
++
+                 pair< t_rtti_map::iterator, bool > insertion(
+                     m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
+                 OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx
index a1e9fa3855fb..36fcd49c91ea 100644
--- a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx
+++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx
@@ -1,18 +1,17 @@
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx.orig	2014-09-19 10:51:12.000000000 -0700
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx	2015-03-13 09:58:02.000000000 -0700
-@@ -26,6 +26,11 @@
- #include <typeinfo>
- #include <exception>
- #include <cstddef>
-+#ifndef __GLIBCXX__
-+#include <cxxabi.h>
-+
-+using namespace ::__cxxabiv1;
-+#endif /* ! __GLIBCXX__ */
+--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx.orig	2014-09-19 17:51:12 UTC
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx
+@@ -23,10 +23,6 @@
  
+ #include "uno/mapping.h"
+ 
+-#include <typeinfo>
+-#include <exception>
+-#include <cstddef>
+-
  namespace CPPU_CURRENT_NAMESPACE
  {
-@@ -34,6 +39,7 @@
+ 
+@@ -34,6 +30,7 @@ void dummy_can_throw_anything( char cons
  
  // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
  
@@ -20,11 +19,12 @@
  struct _Unwind_Exception
  {
      unsigned exception_class __attribute__((__mode__(__DI__)));
-@@ -63,11 +69,13 @@
+@@ -62,18 +59,21 @@ struct __cxa_exception
+     
      _Unwind_Exception unwindHeader;
  };    
- 
 +#endif /* __GLIBCXX__ */
+ 
  extern "C" void *__cxa_allocate_exception(
      std::size_t thrown_size ) throw();
  extern "C" void __cxa_throw (
@@ -34,34 +34,21 @@
  struct __cxa_eh_globals
  {
      __cxa_exception *caughtExceptions;
-@@ -75,6 +83,7 @@
+     unsigned int uncaughtExceptions;
  };
  extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
- 
 +#endif /* __GLIBCXX__ */
+ 
  // -----
  
+@@ -81,6 +81,10 @@ extern "C" __cxa_eh_globals *__cxa_get_g
+ void raiseException(
+     uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
  //==================================================================================================
-@@ -84,3 +93,22 @@
++#ifndef __GLIBCXX__
++using __cxxabiv1:: __cxa_exception;
++#endif /* __GLIBCXX__ */
++
  void fillUnoException(
      __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
  }
-+#ifndef __GLIBCXX__
-+
-+class __class_type_info : public std::type_info
-+{
-+public:
-+        explicit __class_type_info( const char* pRttiName)
-+        : std::type_info( pRttiName)
-+        {}
-+};
-+
-+class __si_class_type_info : public __class_type_info
-+{
-+        const __class_type_info* mpBaseType;
-+public:
-+        explicit __si_class_type_info( const char* pRttiName, __class_type_info* pBaseType)
-+        : __class_type_info( pRttiName), mpBaseType( pBaseType)
-+        {}
-+};
-+#endif /* ! __GLIBCXX__ */
diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx
index 736f9dc61f76..a3a03091bfc7 100644
--- a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx
+++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx
@@ -1,14 +1,36 @@
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx.orig	2014-09-19 10:51:13.000000000 -0700
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	2015-03-13 09:48:24.000000000 -0700
-@@ -446,7 +446,11 @@
+--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx.orig	2014-09-19 17:51:13 UTC
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx
+@@ -24,9 +24,10 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_bridges.hxx"
+ 
+-#include <exception>
+ #include <typeinfo>
+-#include <stdio.h>
++#include <exception>
++#include <cstddef>
++#include <cxxabi.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
+@@ -47,6 +48,11 @@
+ 
+ using namespace ::rtl;
+ using namespace ::com::sun::star::uno;
++#ifdef __GLIBCXX__
++using CPPU_CURRENT_NAMESPACE::__cxa_get_globals;
++#else
++using __cxxabiv1::__cxa_get_globals;
++#endif
+ 
+ //==================================================================================================
+ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
+@@ -446,7 +452,7 @@ static void cpp_call(
   	catch (...)
   	{
    		// fill uno exception
-+#ifndef __GLIBCXX__
+-		fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
 +		CPPU_CURRENT_NAMESPACE::fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-+#else /* __GLIBCXX__ */
- 		fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-+#endif /* __GLIBCXX__ */
          
  		// temporary params
  		for ( ; nTempIndizes--; )
diff --git a/editors/openoffice-devel/files/patch-freebsd.mk b/editors/openoffice-devel/files/patch-freebsd.mk
index ae9ea3630f0c..c8edec5029cf 100644
--- a/editors/openoffice-devel/files/patch-freebsd.mk
+++ b/editors/openoffice-devel/files/patch-freebsd.mk
@@ -4,15 +4,23 @@
  	-fvisibility-inlines-hidden \
  	-fvisibility=hidden \
  	-pipe \
-+	%%HAVE_STL_INCLUDE_PATH%% \
++	-DHAVE_STL_INCLUDE_PATH \
  
  ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
  gb_CFLAGS_WERROR := -Werror
-@@ -121,6 +122,7 @@ gb_LinkTarget_LDFLAGS += \
+@@ -110,7 +111,6 @@ endif
+ gb_LinkTarget_EXCEPTIONFLAGS := \
+ 	-DEXCEPTIONS_ON \
+ 	-fexceptions \
+-	-fno-enforce-eh-specs \
+ 
+ gb_LinkTarget_NOEXCEPTIONFLAGS := \
+ 	-DEXCEPTIONS_OFF \
+@@ -121,6 +121,7 @@ gb_LinkTarget_LDFLAGS += \
  	-Wl,-z,combreloc \
  	-Wl,-z,defs \
  	$(subst -L../lib , ,$(SOLARLIB)) \
-+	%%RPATH%% \
++	${FBSD_LDFLAGS} \
  	 \
  
  ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
diff --git a/editors/openoffice-devel/files/patch-unxfbsd.mk b/editors/openoffice-devel/files/patch-unxfbsd.mk
index ad4194f9b1e0..d2db5b64e151 100644
--- a/editors/openoffice-devel/files/patch-unxfbsd.mk
+++ b/editors/openoffice-devel/files/patch-unxfbsd.mk
@@ -14,34 +14,41 @@
  
  # _PTHREADS is needed for the stl
 -CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 %%HAVE_STL_INCLUDE_PATH%%
++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DHAVE_STL_INCLUDE_PATH
  
  # enable visibility define in "sal/types.h"
  .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-@@ -86,14 +86,14 @@ CFLAGSENABLESYMBOLS=-g # was temporarily
- .ENDIF
- 
+@@ -88,7 +88,7 @@ CFLAGSENABLESYMBOLS=-g # was temporarily
  # flags for the C++ Compiler
--CFLAGSCC= -pipe $(ARCH_FLAGS) 
-+CFLAGSCC= -pipe $(ARCH_FLAGS) %%RPATH%%
+ CFLAGSCC= -pipe $(ARCH_FLAGS) 
  # Flags for enabling exception handling
 -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
 +CFLAGSEXCEPTIONS=-fexceptions
  # Flags for disabling exception handling
  CFLAGS_NO_EXCEPTIONS=-fno-exceptions
  
- # -fpermissive should be removed as soon as possible
--CFLAGSCXX= -pipe $(ARCH_FLAGS) 
-+CFLAGSCXX= -pipe $(ARCH_FLAGS) %%RPATH%%
- .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
- CFLAGSCXX += -fvisibility-inlines-hidden
- .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 @@ -156,7 +156,7 @@ LINKFLAGSRUNPATH_OXT=
  LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\'
  #LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
  LINKFLAGSRUNPATH_NONE=
 -LINKFLAGS=-Wl,-z,combreloc  $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
-+LINKFLAGS=-Wl,-z,combreloc %%RPATH%% $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
++LINKFLAGS=-Wl,-z,combreloc $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
  
  # linker flags for linking applications
  LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
+@@ -199,11 +199,11 @@ STDSHLCUIMT+=-ltcmalloc
+ .ENDIF
+ 
+ # libraries for linking applications
+-STDLIBGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+-STDLIBCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
++STDLIBGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ${FBSD_LDFLAGS}
++STDLIBCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ${FBSD_LDFLAGS}
+ # libraries for linking shared libraries
+-STDSHLGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+-STDSHLCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
++STDSHLGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ${FBSD_LDFLAGS}
++STDSHLCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ${FBSD_LDFLAGS}
+ 
+ X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
+ 
diff --git a/editors/openoffice-devel/files/patch-webdav b/editors/openoffice-devel/files/patch-webdav
deleted file mode 100644
index aebe1baa6d2c..000000000000
--- a/editors/openoffice-devel/files/patch-webdav
+++ /dev/null
@@ -1,133 +0,0 @@
---- ucb/source/ucp/webdav/SerfUri.hxx_	2014-02-04 14:39:02.000000000 +0900
-+++ ucb/source/ucp/webdav/SerfUri.hxx	2014-02-04 14:39:18.000000000 +0900
-@@ -23,7 +23,7 @@
- #ifndef INCLUDED_SERFURI_HXX
- #define INCLUDED_SERFURI_HXX
- 
--#include <apr-util/apr_uri.h>
-+#include <apr_uri.h>
- #include <rtl/ustring.hxx>
- #include "DAVException.hxx"
- 
---- ucb/source/ucp/webdav/SerfSession.cxx_	2014-02-04 14:40:19.000000000 +0900
-+++ ucb/source/ucp/webdav/SerfSession.cxx	2014-02-04 14:40:26.000000000 +0900
-@@ -30,7 +30,7 @@
- #include "ucbhelper/simplecertificatevalidationrequest.hxx"
- 
- #include "AprEnv.hxx"
--#include <apr/apr_strings.h>
-+#include <apr_strings.h>
- 
- #include "DAVAuthListener.hxx"
- #include "SerfTypes.hxx"
-
---- ucb/source/ucp/webdav/SerfTypes.hxx	2014-01-24 03:33:21.000000000 +0900
-+++ ucb/source/ucp/webdav/SerfTypes.hxx	2014-02-04 14:38:44.000000000 +0900
-@@ -24,7 +24,7 @@
- #ifndef INCLUDED_SERFTYPES_HXX
- #define INCLUDED_SERFTYPES_HXX
- 
--#include <serf/serf.h>
-+#include <serf.h>
- 
- typedef serf_connection_t SerfConnection;
- 
---- ucb/source/ucp/webdav/SerfCallbacks.hxx.orig	2014-02-25 00:24:42.000000000 -0800
-+++ ucb/source/ucp/webdav/SerfCallbacks.hxx	2014-07-28 01:11:38.000000000 -0700
-@@ -23,7 +23,7 @@
- #ifndef INCLUDED_CALLBACKS_HXX
- #define INCLUDED_CALLBACKS_HXX
- 
--#include <serf/serf.h>
-+#include <serf.h>
- 
- extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt,
-                                            serf_bucket_t **read_bkt,
---- ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
-+++ ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx	2014-07-28 01:11:43.000000000 -0700
-@@ -24,7 +24,7 @@
- 
- #include "SerfCopyReqProcImpl.hxx"
- 
--#include <serf/serf.h>
-+#include <serf.h>
- 
- namespace http_dav_ucp
- {
---- ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx.orig	2014-02-25 00:24:42.000000000 -0800
-+++ ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx	2014-07-28 01:11:47.000000000 -0700
-@@ -24,7 +24,7 @@
- 
- #include "SerfDeleteReqProcImpl.hxx"
- 
--#include <serf/serf.h>
-+#include <serf.h>
- 
- namespace http_dav_ucp
- {
---- ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
-+++ ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx	2014-07-28 01:11:51.000000000 -0700
-@@ -24,7 +24,7 @@
- 
- #include "SerfMkColReqProcImpl.hxx"
- 
--#include <serf/serf.h>
-+#include <serf.h>
- 
- namespace http_dav_ucp
- {
---- ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
-+++ ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx	2014-07-28 01:11:57.000000000 -0700
-@@ -24,7 +24,7 @@
- 
- #include "SerfMoveReqProcImpl.hxx"
- 
--#include <serf/serf.h>
-+#include <serf.h>
- 
- namespace http_dav_ucp
- {
---- ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
-+++ ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx	2014-07-28 01:12:00.000000000 -0700
-@@ -24,7 +24,7 @@
- 
- #include "SerfPostReqProcImpl.hxx"
- 
--#include <serf/serf.h>
-+#include <serf.h>
- 
- using namespace com::sun::star;
- 
---- ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
-+++ ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx	2014-07-28 01:12:05.000000000 -0700
-@@ -26,7 +26,7 @@
- 
- #include "SerfPutReqProcImpl.hxx"
- 
--#include <serf/serf.h>
-+#include <serf.h>
- 
- namespace http_dav_ucp
- {
---- ucb/source/ucp/webdav/SerfRequestProcessor.hxx.orig	2014-02-25 00:24:43.000000000 -0800
-+++ ucb/source/ucp/webdav/SerfRequestProcessor.hxx	2014-07-28 01:12:10.000000000 -0700
-@@ -26,7 +26,7 @@
- #include <apr_errno.h>
- #include <apr_pools.h>
- 
--#include <serf/serf.h>
-+#include <serf.h>
- 
- #include "DAVTypes.hxx"
- #include "DAVResource.hxx"
---- ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx.orig	2014-02-25 00:24:42.000000000 -0800
-+++ ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx	2014-07-28 01:12:14.000000000 -0700
-@@ -22,7 +22,7 @@
- #ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
- #define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
- 
--#include <serf/serf.h>
-+#include <serf.h>
- 
- #include <sal/types.h>
- #include "DAVRequestEnvironment.hxx"
diff --git a/editors/openoffice-devel/files/pkg-message.in b/editors/openoffice-devel/files/pkg-message.in
index cb3cab509d72..4a3474bc2b1b 100644
--- a/editors/openoffice-devel/files/pkg-message.in
+++ b/editors/openoffice-devel/files/pkg-message.in
@@ -10,11 +10,12 @@ Apache OpenOffice %%AOOTAG%% will soon be installed in
 --------------------
 
 Just type "%%EXECBASE%%" after you have successfully
-installed the package. If there is no installed OO.org dir
-in your homedir, the setup installs "%%AOOUDIR%%" folder.
+installed the package. If there is no installed
+.openoffice.org directory in your home directory, the
+setup installs the "%%AOOUDIR%%" folder.
 
-2. Starting OO.org
-------------------
+2. Starting Apache OpenOffice
+-----------------------------
 
 There are some wrappers installed for faster startup.
 Add "%%PREFIX%%/bin/" to your PATH and you will be able
@@ -35,5 +36,6 @@ OO.org does need $LANG to be set to a suitable value.
 3. If you run into problems
 --------------------------------------------------
 If you somehow run into problems, please remove the already
-installed "%%AOOUDIR%%" dir in your homedir. Redo the user
-installation and the problems should go away.
+installed "%%AOOUDIR%%" directory in your home directory,
+then  redo the user installation and the problems should go
+away.