Index: head/editors/openoffice-4/Makefile
===================================================================
--- head/editors/openoffice-4/Makefile	(revision 393557)
+++ head/editors/openoffice-4/Makefile	(revision 393558)
@@ -1,411 +1,466 @@
 # Created by: Martin Blapp
 # $FreeBSD$
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	editors java
 MASTER_SITES=	APACHE/openoffice/${PORTVERSION}/source \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
 		LOCAL/truckman/openoffice:extsrc
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=		${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX=		-${LANG_SUFFIX}
 .endif
 DISTFILES=	${OOOSRC} unowinreg.dll:unoreg ${EXTSRC}:extsrc
+DIST_SUBDIR=	openoffice
 EXTRACT_ONLY=	${OOOSRC}
 
 MAINTAINER=	office@FreeBSD.org
 #de facto maintainer is truckman@FreeBSD.org
 #Frequent Patch submitters should optionally sign Apache iCLA
 COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
-LICENSE=	APACHE20
+LICENSE=		APACHE20 ADOBE BSD3CLAUSE BSD4CLAUSE BSL ICU MIT MPL \
+			PSFL TWAIN W3C
+LICENSE_COMB=		multi
+LICENSE_NAME_ADOBE=	Adobe Systems Incorporated license
+LICENSE_NAME_ICU=	ICU License
+LICENSE_NAME_TWAIN=	TWAIN Working Group license
+LICENSE_NAME_W3C=	W3C license
+LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE_ALv2
+LICENSE_FILE_ADOBE=	${WRKSRC}/LICENSE_ADOBE
+LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE_BSD3CLAUSE
+LICENSE_FILE_BSD4CLAUSE=	${WRKSRC}/LICENSE_BSD4CLAUSE
+LICENSE_FILE_BSL=	${WRKSRC}/LICENSE_BSL
+LICENSE_FILE_ICU=	${WRKSRC}/LICENSE_ICU
+LICENSE_FILE_MIT=	${WRKSRC}/LICENSE_MIT
+LICENSE_FILE_MPL=	${WRKSRC}/LICENSE_MPL
+LICENSE_FILE_PSFL=	${WRKSRC}/LICENSE_PSFL
+LICENSE_FILE_TWAIN=	${WRKSRC}/LICENSE_TWAIN
+LICENSE_FILE_W3C=	${WRKSRC}/LICENSE_W3C
+LICENSE_PERMS_ADOBE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_ICU=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_TWAIN=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_W3C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip	\
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww			\
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser	\
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip	\
 		zip:${PORTSDIR}/archivers/zip				\
 		ant:${PORTSDIR}/devel/apache-ant			\
+		${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \
 		dmake:${PORTSDIR}/devel/dmake				\
 		epm:${PORTSDIR}/devel/epm				\
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf		\
 		imake:${PORTSDIR}/devel/imake				\
 		gpatch:${PORTSDIR}/devel/patch				\
+		${LOCALBASE}/include/sane/sane.h:${PORTSDIR}/graphics/sane-backends \
 		${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \
 		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
 		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
 		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit		\
 		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh		\
 		bash:${PORTSDIR}/shells/bash				\
 		${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 LIB_DEPENDS=								\
 		libapr-1.so:${PORTSDIR}/devel/apr1			\
+		libnspr4.so:${PORTSDIR}/devel/nspr			\
 		libcurl.so:${PORTSDIR}/ftp/curl				\
 		libcairo.so:${PORTSDIR}/graphics/cairo			\
 		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			\
 		libexpat.so:${PORTSDIR}/textproc/expat2			\
 		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell	\
 		libhyphen.so:${PORTSDIR}/textproc/hyphen		\
 		libtextcat.so:${PORTSDIR}/textproc/libtextcat		\
 		libmythes-1.2.so:${PORTSDIR}/textproc/mythes		\
 		librdf.so:${PORTSDIR}/textproc/redland			\
-		libserf-1.so:${PORTSDIR}/www/serf
-#		libgraphite.so:${PORTSDIR}/graphics/silgraphite
+		libserf-1.so:${PORTSDIR}/www/serf			\
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=								\
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
 		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
 		${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
 
 AOOVERSION1=	4
 AOOVERSION2=	1
 AOOVERSION3=	1
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO411m6\(Build:9775\)
 SVNREVISION=	1617669
-EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20140918.tar.gz
+EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
 AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
 AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
 AOOSUFFIX=	${PORTVERSION}
 OOOSRC=		apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
 
 OOODIR=			openoffice${AOOVERSION1}
 AOOUDIR=		.openoffice.org\/${AOOVERSION1}
 INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
 EXECBASE?=		openoffice-${AOOSUFFIX}
-DIST_SUBDIR=		openoffice
 
 NO_LATEST_LINK=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_GL=		gl glu
 USE_GNOME=	gtk20 libxslt libidl glib20
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	openjdk
 JAVA_VERSION=	1.6+
 USE_PERL5=	build
 USE_XORG=	x11 ice xaw xau xext xrender xrandr \
 		xi xt xcursor xdamage xcomposite xfixes
 USES=		autoreconf:autoconf bison compiler cpe desktop-file-utils \
-		gmake jpeg perl5 pkgconfig python tar:bzip2
+		gettext-runtime gmake iconv jpeg perl5 pkgconfig python \
+		tar:bzip2
 WITHOUT_CPU_CFLAGS=	true
 CPE_PRODUCT=	${PORTNAME:S|apache-||}
 CPE_VENDOR=	apache
 
 OPTIONS_DEFINE=		CUPS GNOME GNOMEVFS MMEDIA CCACHE
 OPTIONS_DEFAULT=	CUPS GNOME GNOMEVFS MMEDIA
 GNOME_DESC=		GConf + screensaver presentation control via DBUS
 GNOMEVFS_DESC=		GNOME Virtual File System
 MMEDIA_DESC=		Multimedia backend for impress
 CCACHE_DESC=		Mimimize compile time of C/C++ programs
 
 CUPS_CONFIGURE_ENABLE=		cups
 CUPS_LIB_DEPENDS=		libcups.so:${PORTSDIR}/print/cups-client
 
 GNOME_CONFIGURE_ENABLE=		dbus gconf lockdown
 GNOME_LIB_DEPENDS=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 GNOME_USE=			GNOME=gconf2
 
 GNOMEVFS_CONFIGURE_ENABLE=	gnome-vfs
 GNOMEVFS_CONFIGURE_OFF=		--enable-gio
 GNOMEVFS_CONFIGURE_ON=		--disable-gio
 GNOMEVFS_USE=			GNOME=gnomevfs2
 
 MMEDIA_CONFIGURE_ENABLE=	gstreamer
 MMEDIA_USE=			GSTREAMER=yes
 
 .include <bsd.port.pre.mk>
 
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${COMPILER_TYPE} == clang
 . if ${COMPILER_VERSION} < 35 && ${ARCH} == amd64
 BUILD_DEPENDS+=		clang35:${PORTSDIR}/lang/clang35
 CPP=			clang-cpp35
 CC=			clang35
 CXX=			clang++35
 . endif
 CPPFLAGS+=		-I${LOCALBASE}/include
 .else
 USE_GCC=		yes
-SUBST=			"s/-fexceptions/& -fno-enforce-eh-specs/;s/-DHAVE_STL_INCLUDE_PATH//"
+SUBST=			"s/-fexceptions/& -fno-enforce-eh-specs/;s/-DHAVE_STL_INCLUDE_PATH/-DBOOST_TR1_DISABLE_INCLUDE_NEXT -DBOOST_TR1_GCC_INCLUDE_PATH=c++/"
 .endif
 
 .if ${ARCH} == amd64
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 .else
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
 LOCALIZED_LANG?=	en-US
 
 PACKAGE_PREFIX=		Apache_OpenOffice
 
 .if ${ARCH} == amd64
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
 .else
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86
 .endif
 
 .if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CCACHE_PREFIX=	ccache
 OOOCC=		${CCACHE_PREFIX} ${CC}
 OOOCXX=		${CCACHE_PREFIX} ${CXX}
 .else
 OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
 
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
 		PATH=${WRKSRC}/solenv/bin:$$PATH
 
 GNU_CONFIGURE=	yes
 WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
 WRKSRC?=	${WRKSUBDIR}/main
 SUB_FILES=	pkg-message
 SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR}
 
 CONFIGURE_ARGS+=							\
 			--with-system-apache-commons=yes		\
 			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
 			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \
 			--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
 			--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar \
 			--with-system-apr				\
 			--with-system-apr-util				\
 			--with-system-beanshell				\
 			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar	\
+			--with-system-boost				\
 			--enable-category-b				\
 			--with-system-cairo --enable-cairo		\
 			--with-system-coinmp				\
 			--with-system-curl				\
 			--enable-crashdump				\
 			--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-gtk					\
 			--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			\
 			--disable-kde					\
 			--disable-kde4					\
 			--with-system-libxml				\
 			--with-system-libxslt				\
 			--with-system-lucene				\
 			--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				\
 			--with-package-format="archive"			\
 			--with-system-poppler				\
 			--with-system-python				\
 			--with-system-redland				\
+			--with-system-sane				\
 			--with-system-serf				\
 			--with-system-stdlibs				\
 			--enable-symbols=small				\
 			--without-stlport				\
 			--with-vendor="FreeBSD ports system"		\
 			--enable-verbose				\
 			--with-system-vigra				\
 			--enable-wiki-publisher				\
+			--with-system-xrender				\
 			--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
 #OOOEXTENSIONS+=		pdfimport/pdfimport.oxt
 OOOEXTENSIONS+=		swext/wiki-publisher.oxt
 
 ICONS=	${WRKSRC}/sysui/desktop/icons
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	${RM} -f ${WRKDIR}/.PLIST*
 	${RM} -f ${WRKDIR}/.install_done.*
 	${RM} -f ${WRKDIR}/.package_done.*
 	${RM} -f ${WRKDIR}/.extract_done.*
 	${RM} -f ${WRKDIR}/.patch_done.*
 	${RM} -f ${WRKDIR}/.configure_done.*
 	${RM} -f ${WRKDIR}/.build_done.*
 	${MKDIR} ${WRKDIR}
 	${TOUCH} ${EXTRACT_COOKIE}
 	${TOUCH} ${PATCH_COOKIE}
 	${TOUCH} ${CONFIGURE_COOKIE}
 	${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 	${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
 	${RM} -rf ${WRKSRC}/l10n
+	${SED}  -e '\|^For main/vcl/unx/generic/fontmanager/parseAFM|,/^__/p' \
+		-e '\|^For PostScript(R) AFM|,/^__/p'			\
+		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_ADOBE}
+	${SED}  -e '\|^For main/unixODBC|,/^__/p'			\
+		-e '\|^For main/connectivity|,/^__/p'			\
+		-e '\|^For main/libtextcat/data|,/^__/p'		\
+		-e '\|^For integration of HSQLDB|,/^__/p'		\
+		-e '\|^For C preprocessor|,/^__/p'			\
+		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD3CLAUSE}
+	${SED}  -e '\|^For ICC |,/^__/p'				\
+		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD4CLAUSE}
+	${SED}  -e '\|^For integration of the C++ Boost |,/^__/p'	\
+		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSL}
+	${SED}  -e '\|^For main/i18npool/source/breakiterator|,/^__/p'	\
+		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_ICU}
+	${SED}  -e '\|^For Multi-Dimensional Data|,/^__/p'	\
+		-e '\|^For XSLT MathML Library|,/^__/p'			\
+		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_MIT}
+	${SED}  -e '\|^For XMLSec Library|,/^__/p'	\
+		-e d  ${WRKSRC}/LICENSE_category_b >> ${LICENSE_FILE_MIT}
+	${SED}  -e '\|^For Graphite|,$$d'	\
+		      ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL}
+	${SED}  -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p'	\
+		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL}
+	${SED}  -e '\|^For main/twain|,/^__/p'	\
+		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_TWAIN}
+	${SED}  -e '\|^For main/MathMLDTD|,/^__/p'	\
+		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_W3C}
 
 post-patch:
 .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
 	# 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
 .endif
 
 pre-configure:
 	${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
 
 do-build:
 	cd ${WRKSUBDIR} ; ${PRINTF} "[repositories]\n" > source_config
 	cd ${WRKSUBDIR} ; ${PRINTF} "main=active\n" >> source_config
 	cd ${WRKSUBDIR} ; ${PRINTF} "extras=active\n" >> source_config
 	cd ${WRKSRC} ; ./bootstrap
 	#
 	# numproc controls the number of parallel makes.
 	#
 	# dmproc is passed to dmake and controls parallelization at that
 	# level.
 	#
 	# dmproc > numproc seems to give shorter build times than
 	# numproc > dmproc.
 	#
 	# Select values for numproc and dmproc such that:
 	#  * numproc*dmproc >= MAKE_JOBS_NUMBER
 	#  * minimize numproc*dmproc-MAKE_JOBS_NUMBER
 	#  * dmproc >= numproc
 	#  * dmproc <= 2*numproc if MAKE_JOBS_NUMBER <= 3
 	#
 	cd ${WRKSRC} ; . ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ;  \
 	 export LANG=C LC_ALL=C FBSD_LDFLAGS="${LDFLAGS}" ;		  \
 	 if [ ${MAKE_JOBS_NUMBER} -le 3 ] ; then			  \
 	  numproc=1 ; dmproc=${MAKE_JOBS_NUMBER} ;			  \
 	 else								  \
 	  a=1 ;								  \
 	  while [ $$(( 2 * $${a} * $${a} )) -lt ${MAKE_JOBS_NUMBER} ]; do \
 	   a=$$(( $${a} + 1 )) ;					  \
 	  done ;							  \
 	  b=$$(( $${a} + 1 )) ;						  \
 	  ad=$$(( ( ${MAKE_JOBS_NUMBER} + $${a} - 1 ) / $${a} )) ;	  \
 	  ap=$$(( $${a} * $${ad} )) ;					  \
 	  bd=$$(( ( ${MAKE_JOBS_NUMBER} + $${b} - 1 ) / $${b} )) ;	  \
 	  bp=$$(( $${b} * $${bd} )) ;					  \
 	  if [ $${ap} -le $${bp} ]; then				  \
 	   numproc=$${a} ; dmproc=$${ad} ;				  \
 	  else								  \
 	   numproc=$${b} ; dmproc=$${bd} ;				  \
 	  fi ;								  \
 	 fi ;								  \
 	 build.pl --all -P$${numproc} -- -P$${dmproc}
 
 do-install:
 	cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
 	${RM} -Rf ${WRKDIR}/tmp
 	${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${ECHO_CMD} "extracting $$i" ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \
 	done
 	${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
 	cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
 	${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
 	${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/${AOOUDIR}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
 	${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
 	cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
 	${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program -type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${STRIP_CMD}
 	for prog in crashrep pagein uri-encode javaldx regmerge regview; do \
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/$${prog}; \
 	done
 	${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%SVNREVISION%%#${SVNREVISION}#g' \
 			-e 's#%%OOODIR%%#${OOODIR}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${STAGEDIR}${PREFIX}/bin/${EXECBASE}
 	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase
 	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc
 	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw
 	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang
 	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress
 	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath
 	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin
 	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter
 	cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
 	cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
 	cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \
 		${XARGS} -n 1 ${ECHO_CMD} @dir >> ${TMPPLIST}
 	for app in base calc draw impress math writer; do \
 		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
 			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
 		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
 	done
 	${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \
 		-e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \
 		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop
 	${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
 		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop
 	${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
 	${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
 	${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
 			${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
 	${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
 	for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
 		for app in base calc draw impress math printeradmin writer; do \
 			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
 				${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/ ; \
 				${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \
 				    ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png ; \
 				${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png" >> ${TMPPLIST} ; \
 			fi \
 		done ; \
 		for iconfile in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \
 			${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \
 			${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/mimetypes/$${iconfile} \
 			    ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \
 			${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \
 		done ; \
 	done
 	${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 
 .include <${FILESDIR}/Makefile.others>
 
 .include <bsd.port.post.mk>
Index: head/editors/openoffice-4/distinfo
===================================================================
--- head/editors/openoffice-4/distinfo	(revision 393557)
+++ head/editors/openoffice-4/distinfo	(revision 393558)
@@ -1,6 +1,6 @@
 SHA256 (openoffice/apache-openoffice-4.1.1-r1617669-src.tar.bz2) = bb89a6d2324ddfe4c475e5484fde0dea316078f6b8ff4d8a4ebc801d17f3ff9f
 SIZE (openoffice/apache-openoffice-4.1.1-r1617669-src.tar.bz2) = 219054455
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140918.tar.gz) = c7085dbf597a31ef332585ab57041b7ec8baf29c5f6029a60be7b7c63cfcb166
-SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140918.tar.gz) = 97839277
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
+SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
Index: head/editors/openoffice-4/files/patch-i118574
===================================================================
--- head/editors/openoffice-4/files/patch-i118574	(revision 393557)
+++ head/editors/openoffice-4/files/patch-i118574	(nonexistent)
@@ -1,323 +0,0 @@
---- unoxml/source/dom/attr.hxx.orig	2011-11-03 21:05:47.000000000 -0500
-+++ unoxml/source/dom/attr.hxx	2011-11-03 21:06:26.000000000 -0500
-@@ -30,6 +30,7 @@
- 
- #include <memory>
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- 
- #include <cppuhelper/implbase1.hxx>
---- unoxml/source/dom/characterdata.hxx.orig	2011-11-03 21:12:41.000000000 -0500
-+++ unoxml/source/dom/characterdata.hxx	2011-11-03 21:13:08.000000000 -0500
-@@ -28,6 +28,7 @@
- #ifndef DOM_CHARACTERDATA_HXX
- #define DOM_CHARACTERDATA_HXX
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- 
- #include <sal/types.h>
---- unoxml/source/dom/childlist.cxx.orig	2011-11-03 21:36:22.000000000 -0500
-+++ unoxml/source/dom/childlist.cxx	2011-11-03 21:37:22.000000000 -0500
-@@ -27,6 +27,7 @@
- 
- #include <childlist.hxx>
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- 
- #include <node.hxx>
---- unoxml/source/dom/document.hxx.orig	2011-11-03 20:59:53.000000000 -0500
-+++ unoxml/source/dom/document.hxx	2011-11-03 21:00:40.000000000 -0500
-@@ -31,6 +31,7 @@
- #include <set>
- #include <memory>
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- 
- #include <sal/types.h>
---- unoxml/source/dom/documentbuilder.cxx.orig	2011-11-03 21:15:44.000000000 -0500
-+++ unoxml/source/dom/documentbuilder.cxx	2011-11-03 21:16:26.000000000 -0500
-@@ -31,6 +31,7 @@
- #include <stdio.h>
- #include <stdarg.h>
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/xmlerror.h>
- #include <libxml/tree.h>
- 
---- unoxml/source/dom/documenttype.hxx.orig	2011-11-03 21:19:12.000000000 -0500
-+++ unoxml/source/dom/documenttype.hxx	2011-11-03 21:19:39.000000000 -0500
-@@ -28,6 +28,7 @@
- #ifndef DOM_DOCUMENTTYPE_HXX
- #define DOM_DOCUMENTTYPE_HXX
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- 
- #include <sal/types.h>
---- unoxml/source/dom/element.hxx.orig	2011-11-03 21:02:39.000000000 -0500
-+++ unoxml/source/dom/element.hxx	2011-11-03 21:03:48.000000000 -0500
-@@ -28,6 +28,7 @@
- #ifndef DOM_ELEMENT_HXX
- #define DOM_ELEMENT_HXX
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- 
- #include <com/sun/star/uno/Reference.h>
---- unoxml/source/dom/elementlist.hxx.orig	2011-11-03 21:33:35.000000000 -0500
-+++ unoxml/source/dom/elementlist.hxx	2011-11-03 21:34:07.000000000 -0500
-@@ -32,6 +32,7 @@
- 
- #include <boost/scoped_array.hpp>
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- 
- #include <sal/types.h>
---- unoxml/source/dom/entity.hxx.orig	2011-11-03 21:21:42.000000000 -0500
-+++ unoxml/source/dom/entity.hxx	2011-11-03 21:22:28.000000000 -0500
-@@ -28,6 +28,7 @@
- #ifndef DOM_ENTITY_HXX
- #define DOM_ENTITY_HXX
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- #include <libxml/entities.h>
- 
---- unoxml/source/dom/entityreference.hxx.orig	2011-11-03 21:24:36.000000000 -0500
-+++ unoxml/source/dom/entityreference.hxx	2011-11-03 21:25:13.000000000 -0500
-@@ -28,6 +28,7 @@
- #ifndef DOM_ENTITYREFERENCE_HXX
- #define DOM_ENTITYREFERENCE_HXX
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- 
- #include <com/sun/star/uno/Reference.h>
---- unoxml/source/dom/node.hxx.orig	2011-11-03 20:54:49.000000000 -0500
-+++ unoxml/source/dom/node.hxx	2011-11-03 20:56:47.000000000 -0500
-@@ -30,6 +30,7 @@
- 
- #include <hash_map>
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- 
- #include <sal/types.h>
---- unoxml/source/dom/notation.hxx.orig	2011-11-03 21:27:17.000000000 -0500
-+++ unoxml/source/dom/notation.hxx	2011-11-03 21:28:12.000000000 -0500
-@@ -28,6 +28,7 @@
- #ifndef DOM_NOTATION_HXX
- #define DOM_NOTATION_HXX
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- 
- #include <com/sun/star/uno/Reference.h>
---- unoxml/source/dom/processinginstruction.hxx.orig	2011-11-03 21:30:54.000000000 -0500
-+++ unoxml/source/dom/processinginstruction.hxx	2011-11-03 21:31:30.000000000 -0500
-@@ -28,6 +28,7 @@
- #ifndef DOM_PROCESSINGINSTRUCTION_HXX
- #define DOM_PROCESSINGINSTRUCTION_HXX
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- 
- #include <com/sun/star/uno/Reference.h>
---- unoxml/source/dom/text.hxx.orig	2011-11-03 21:10:46.000000000 -0500
-+++ unoxml/source/dom/text.hxx	2011-11-03 21:11:14.000000000 -0500
-@@ -28,6 +28,7 @@
- #ifndef DOM_TEXT_HXX
- #define DOM_TEXT_HXX
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- 
- #include <sal/types.h>
---- unoxml/source/events/eventdispatcher.hxx.orig	2011-11-03 21:51:05.000000000 -0500
-+++ unoxml/source/events/eventdispatcher.hxx	2011-11-03 21:55:59.000000000 -0500
-@@ -31,6 +31,7 @@
- #include <map>
- #include <vector>
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- 
- #include <rtl/ustring.hxx>
---- jvmfwk/source/elements.hxx.orig	2011-11-03 14:14:18.000000000 -0500
-+++ jvmfwk/source/elements.hxx	2011-11-03 14:24:14.000000000 -0500
-@@ -32,6 +32,7 @@
- #include "fwkutil.hxx"
- #include "rtl/ustring.hxx"
- #include "rtl/byteseq.hxx"
-+#include <cwchar>      // for std::mbstate_t
- #include "libxml/parser.h"
- #include "boost/optional.hpp"
- 
---- jvmfwk/source/fwkbase.cxx.orig	2011-11-03 14:31:12.000000000 -0500
-+++ jvmfwk/source/fwkbase.cxx	2011-11-03 14:32:34.000000000 -0500
-@@ -32,6 +32,7 @@
- #include "rtl/uri.hxx"
- #include "osl/thread.hxx"
- #include "osl/process.h"
-+#include <cwchar>      // for std::mbstate_t
- #include "libxml/xpathInternals.h"
- #include "osl/file.hxx"
- #include "osl/module.hxx"
---- jvmfwk/source/libxmlutil.hxx.orig	2011-11-03 14:28:02.000000000 -0500
-+++ jvmfwk/source/libxmlutil.hxx	2011-11-03 14:28:52.000000000 -0500
-@@ -27,7 +27,7 @@
- #if !defined INCLUDED_JVMFWK_LIBXMLUTIL_HXX
- #define INCLUDED_JVMFWK_LIBXMLUTIL_HXX
- 
--
-+#include <cwchar>      // for std::mbstate_t
- #include "libxml/parser.h"
- #include "libxml/xpath.h"
- //#include "libxml/xpathinternals.h"
---- xmlhelp/source/cxxhelp/provider/urlparameter.cxx.orig	2011-11-03 23:28:51.000000000 -0500
-+++ xmlhelp/source/cxxhelp/provider/urlparameter.cxx	2011-11-03 23:33:15.000000000 -0500
-@@ -46,6 +46,7 @@
- #include <comphelper/processfactory.hxx>
- #include <rtl/uri.hxx>
- #include <rtl/ustrbuf.hxx>
-+#include <cwchar>      // for std::mbstate_t
- #include <libxslt/xslt.h>
- #include <libxslt/transform.h>
- #include <libxslt/xsltutils.h>
---- unoxml/source/xpath/nodelist.hxx.orig	2011-11-03 21:42:28.000000000 -0500
-+++ unoxml/source/xpath/nodelist.hxx	2011-11-03 21:43:53.000000000 -0500
-@@ -38,6 +38,7 @@
- #include <com/sun/star/xml/dom/XNodeList.hpp>
- #include <com/sun/star/xml/xpath/XXPathObject.hpp>
- 
-+#include <cwchar>      // for std::mbstate_t
- #include "libxml/tree.h"
- #include "libxml/xpath.h"
- 
---- unoxml/source/xpath/xpathapi.cxx.orig	2011-11-03 21:46:02.000000000 -0500
-+++ unoxml/source/xpath/xpathapi.cxx	2011-11-03 21:46:34.000000000 -0500
-@@ -30,6 +30,7 @@
- #include <stdarg.h>
- #include <string.h>
- 
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- #include <libxml/xmlerror.h>
- #include <libxml/xpath.h>
-Index: main/forms/source/xforms/xpathlib/xpathlib.hxx
-===================================================================
---- forms/source/xforms/xpathlib/xpathlib.hxx	(revision 1235458)
-+++ forms/source/xforms/xpathlib/xpathlib.hxx	(working copy)
-@@ -20,7 +20,7 @@
-  *************************************************************/
- 
- 
--
-+#include <cwchar>      // for std::mbstate_t
- #include <libxml/tree.h>
- #include <libxml/xpath.h>
- #include <libxml/xpathInternals.h>
-
---- avmedia/source/gstreamer/gstplayer.hxx	2012-02-02 07:33:58.000000000 +0900
-+++ avmedia/source/gstreamer/gstplayer.hxx	2012-02-02 07:35:03.000000000 +0900
-@@ -24,6 +24,8 @@
- #ifndef _GSTPLAYER_HXX
- #define _GSTPLAYER_HXX
- 
-+#include <cwchar>      // for std::mbstate_t
-+
- #include "gstcommon.hxx"
- #include <glib.h>
- #include <glib/gatomic.h>
-
-
---- xmlsecurity/source/xmlsec/biginteger.cxx	2012-02-04 10:36:05.000000000 +0900
-+++ xmlsecurity/source/xmlsec/biginteger.cxx	2012-02-01 16:51:40.000000000 +0900
-@@ -19,7 +19,7 @@
-  * 
-  *************************************************************/
- 
--
-+#include <cwchar>      // for std::mbstate_t
- 
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_xmlsecurity.hxx"
-
---- xmlsecurity/source/xmlsec/errorcallback.cxx	2012-02-04 10:37:52.000000000 +0900
-+++ xmlsecurity/source/xmlsec/errorcallback.cxx	2012-02-01 16:51:40.000000000 +0900
-@@ -19,7 +19,7 @@
-  * 
-  *************************************************************/
- 
--
-+#include <cwchar>      // for std::mbstate_t
-
- 
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_xmlsecurity.hxx"
-
---- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx	2012-02-03 13:03:47.000000000 +0900
-+++ xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx	2012-02-01 16:51:40.000000000 +0900
-@@ -24,6 +24,8 @@
- #ifndef _XSECURITYENVIRONMENT_NSSIMPL_HXX_
- #define _XSECURITYENVIRONMENT_NSSIMPL_HXX_
- 
-+#include <cwchar>      // for std::mbstate_t
-+
- #include <sal/config.h>
- #include <rtl/ustring.hxx>
- #include <cppuhelper/factory.hxx>
-
-
---- xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx	2012-02-04 10:33:01.000000000 +0900
-+++ xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx	2012-02-01 16:51:40.000000000 +0900
-@@ -24,6 +24,8 @@
- #ifndef _SEINITIALIZERIMPL_HXX
- #define _SEINITIALIZERIMPL_HXX
- 
-+#include <cwchar>      // for std::mbstate_t
-+
- #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
- #include <com/sun/star/xml/crypto/XSEInitializer.hpp>
- 
-
---- xmlsecurity/source/xmlsec/saxhelper.hxx	2012-02-04 10:34:58.000000000 +0900
-+++ xmlsecurity/source/xmlsec/saxhelper.hxx	2012-02-01 16:51:40.000000000 +0900
-@@ -24,6 +24,8 @@
- #ifndef _SAXHELPER_HXX
- #define _SAXHELPER_HXX
- 
-+#include <cwchar>      // for std::mbstate_t
-+
- #include "libxml/tree.h"
- 
- #include <com/sun/star/xml/sax/SAXException.hpp>
-
---- xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx	2012-02-04 10:36:45.000000000 +0900
-+++ xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx	2012-02-01 16:51:40.000000000 +0900
-@@ -20,6 +20,7 @@
-  *************************************************************/
- 
- 
-+#include <cwchar>      // for std::mbstate_t
- 
- #ifndef _XMLELEMENTWRAPPER_XMLSECIMPL_HXX
- #define _XMLELEMENTWRAPPER_XMLSECIMPL_HXX
-
---- xmlsecurity/source/xmlsec/xmlstreamio.hxx	2012-02-04 10:37:09.000000000 +0900
-+++ xmlsecurity/source/xmlsec/xmlstreamio.hxx	2012-02-01 16:51:40.000000000 +0900
-@@ -19,7 +19,7 @@
-  * 
-  *************************************************************/
- 
--
-+#include <cwchar>      // for std::mbstate_t
-
- 
- #ifndef _XMLSTREAMIO_XMLSECIMPL_HXX_
- #define _XMLSTREAMIO_XMLSECIMPL_HXX_

Property changes on: head/editors/openoffice-4/files/patch-i118574
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/editors/openoffice-4/files/patch-CVE-2015-1774
===================================================================
--- head/editors/openoffice-4/files/patch-CVE-2015-1774	(revision 393557)
+++ head/editors/openoffice-4/files/patch-CVE-2015-1774	(revision 393558)
@@ -1,47 +1,39 @@
-Index: scp2/source/writer/module_writer.scp
-===================================================================
---- scp2/source/writer/module_writer.scp	(revision 1677189)
-+++ scp2/source/writer/module_writer.scp	(revision 1677190)
-@@ -40,7 +40,6 @@
-     Styles = (HIDDEN_ROOT);
-     Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
-     gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
--    gid_File_Lib_Hwpreader,
-     gid_File_Lib_Swd,
-     gid_File_Lib_Swui,
-     gid_File_Lib_Msword,
-Index: scp2/source/writer/file_writer.scp
-===================================================================
---- scp2/source/writer/file_writer.scp	(revision 1677189)
-+++ scp2/source/writer/file_writer.scp	(revision 1677190)
+--- scp2/source/writer/file_writer.scp.orig	2014-02-25 08:22:30 UTC
++++ scp2/source/writer/file_writer.scp
 @@ -25,8 +25,6 @@
  
  STD_LIB_FILE( gid_File_Lib_Swd , swd)
  
 -SPECIAL_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
 -
  File gid_File_Exe_Swriter
      BIN_FILE_BODY;
      Dir = gid_Brand_Dir_Program;
-Index: postprocess/packcomponents/makefile.mk
-===================================================================
---- postprocess/packcomponents/makefile.mk	(revision 1677189)
-+++ postprocess/packcomponents/makefile.mk	(revision 1677190)
-@@ -121,7 +121,6 @@
+--- scp2/source/writer/module_writer.scp.orig	2014-02-25 08:22:30 UTC
++++ scp2/source/writer/module_writer.scp
+@@ -40,7 +40,6 @@ Module gid_Module_Prg_Wrt_Bin
+     Styles = (HIDDEN_ROOT);
+     Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
+     gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
+-    gid_File_Lib_Hwpreader,
+     gid_File_Lib_Swd,
+     gid_File_Lib_Swui,
+     gid_File_Lib_Msword,
+--- postprocess/packcomponents/makefile.mk.orig	2014-06-18 11:45:22 UTC
++++ postprocess/packcomponents/makefile.mk
+@@ -121,7 +121,6 @@ my_components = \
      fps_office \
      frm \
      guesslang \
 -    hwp \
      i18npool \
      i18nsearch \
      lng \
-Index: postprocess/prj/build.lst
-===================================================================
---- postprocess/prj/build.lst	(revision 1677189)
-+++ postprocess/prj/build.lst	(revision 1677190)
+--- postprocess/prj/build.lst.orig	2014-02-25 08:23:13 UTC
++++ postprocess/prj/build.lst
 @@ -1,4 +1,4 @@
 -po      postprocess     ::      svgio accessibility automation basctl bean chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign sdext SWEXT:swext smoketestdoc uui writerfilter winaccessibility oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
 +po      postprocess     ::      svgio accessibility automation basctl bean chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign sdext SWEXT:swext smoketestdoc uui writerfilter winaccessibility oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
  po	postprocess			    	usr1	-	all	po_mkout NULL
  po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
  po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
Index: head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx
===================================================================
--- head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx	(nonexistent)
+++ head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx	(revision 393558)
@@ -0,0 +1,32 @@
+--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx.orig	2014-02-25 08:29:00 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>
+@@ -159,7 +164,7 @@ void cpp2uno_call(
+ 	(*pThis->getUnoI()->pDispatcher)(
+         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
+ 	
+-	// in case an exception occured...
++	// in case an exception occurred...
+ 	if (pUnoExc)
+ 	{
+ 		// destruct temporary in/inout params
+@@ -178,7 +183,7 @@ void cpp2uno_call(
+             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
+             // has to destruct the any
+ 	}
+-	else // else no exception occured...
++	else // else no exception occurred...
+ 	{
+ 		// temporary params
+ 		for ( ; nTempIndizes--; )

Property changes on: head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx
===================================================================
--- head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx	(revision 393557)
+++ head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx	(revision 393558)
@@ -1,33 +1,56 @@
 --- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx.orig	2014-02-25 08:29:00 UTC
 +++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
 @@ -24,7 +24,12 @@
  // MARKER(update_precomp.py): autogen include statement, do not remove
  #include "precompiled_bridges.hxx"
  
-+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || defined(__clang__)
++#include <cstddef>
 +#include <exception>
-+#endif
++#include <typeinfo>
 +
  #include <stdio.h>
 +#include <string.h>
  #include <dlfcn.h>
  #include <cxxabi.h>
  #include <hash_map>
-@@ -233,7 +238,7 @@ void raiseException( uno_Any * pUnoExc, 
+@@ -177,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
+@@ -191,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 ) ) );
+@@ -233,7 +246,7 @@ void raiseException( uno_Any * pUnoExc, 
          OUStringToOString(
              *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
              RTL_TEXTENCODING_ASCII_US ) );
 -    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
 +    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
  #endif
      void * pCppExc;
      type_info * rtti;
-@@ -307,7 +312,7 @@ void fillUnoException( __cxa_exception *
+@@ -307,7 +320,7 @@ void fillUnoException( __cxa_exception *
      OUString unoName( toUNOname( header->exceptionType->name() ) );
  #if OSL_DEBUG_LEVEL > 1
      OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
 -    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +    fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
  #endif
  	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
      if (0 == pExcTypeDescr)
Index: head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx
===================================================================
--- head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx	(revision 393557)
+++ head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx	(revision 393558)
@@ -1,67 +1,54 @@
---- 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.orig	2014-02-25 08:28:59 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
  
 +#ifdef __GLIBCXX__
  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 (
      void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
  
 +#ifdef __GLIBCXX__
  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__ */
Index: head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx
===================================================================
--- head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx	(revision 393557)
+++ head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx	(revision 393558)
@@ -1,14 +1,43 @@
---- 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.orig	2014-02-25 08:29:00 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
+ {
+@@ -266,7 +275,7 @@ static void cpp_call(
+ 			pAdjustedThisPtr, aVtableSlot.index,
+ 			pCppReturn, pReturnTypeDescr->eTypeClass,
+ 			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
+-		// NO exception occured...
++		// NO exception occurred...
+ 		*ppUnoExc = 0;
+ 		
+ 		// reconvert temporary params
+@@ -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--; )
Index: head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx
===================================================================
--- head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx	(nonexistent)
+++ head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx	(revision 393558)
@@ -0,0 +1,34 @@
+--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx.orig	2014-02-25 08:28:59 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>
+@@ -194,7 +195,7 @@ static typelib_TypeClass cpp2uno_call(
+ 	// invoke uno dispatch call
+ 	(*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
+ 	
+-	// in case an exception occured...
++	// in case an exception occurred...
+ 	if ( pUnoExc )
+ 	{
+ 		// destruct temporary in/inout params
+@@ -213,7 +214,7 @@ static typelib_TypeClass cpp2uno_call(
+ 		// is here for dummy
+ 		return typelib_TypeClass_VOID;
+ 	}
+-	else // else no exception occured...
++	else // else no exception occurred...
+ 	{
+ 		// temporary params
+ 		for ( ; nTempIndizes--; )

Property changes on: head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx
===================================================================
--- head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx	(revision 393557)
+++ head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx	(revision 393558)
@@ -1,11 +1,57 @@
---- 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.orig	2014-02-25 08:29:00 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?!" );
+@@ -238,7 +246,7 @@ void raiseException( uno_Any * pUnoExc, 
+         OUStringToOString(
+             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
+             RTL_TEXTENCODING_ASCII_US ) );
+-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
+ #endif
+     void * pCppExc;
+     type_info * rtti;
+@@ -312,7 +320,7 @@ void fillUnoException( __cxa_exception *
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+ #if OSL_DEBUG_LEVEL > 1
+     OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
+-    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
++    fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
+ #endif
+ 	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+     if (0 == pExcTypeDescr)
Index: head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx
===================================================================
--- head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx	(revision 393557)
+++ head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx	(revision 393558)
@@ -1,67 +1,54 @@
---- 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-02-25 08:28:59 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
  
 +#ifdef __GLIBCXX__
  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 (
      void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
  
 +#ifdef __GLIBCXX__
  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__ */
Index: head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx
===================================================================
--- head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx	(revision 393557)
+++ head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx	(revision 393558)
@@ -1,14 +1,45 @@
---- 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-02-25 08:29:00 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,
+@@ -407,7 +413,7 @@ static void cpp_call(
+                 Reference< XInterface >());
+         }
+ 
+-		// NO exception occured...
++		// NO exception occurred...
+ 		*ppUnoExc = 0;
+ 		
+ 		// reconvert temporary params
+@@ -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--; )
Index: head/editors/openoffice-4/files/patch-freebsd.mk
===================================================================
--- head/editors/openoffice-4/files/patch-freebsd.mk	(revision 393557)
+++ head/editors/openoffice-4/files/patch-freebsd.mk	(revision 393558)
@@ -1,26 +1,26 @@
---- solenv/gbuild/platform/freebsd.mk.orig	2014-09-19 18:16:41 UTC
+--- solenv/gbuild/platform/freebsd.mk.orig	2014-02-25 08:33:29 UTC
 +++ solenv/gbuild/platform/freebsd.mk
 @@ -96,6 +96,7 @@ gb_CXXFLAGS := \
  	-fvisibility-inlines-hidden \
  	-fvisibility=hidden \
  	-pipe \
 +	-DHAVE_STL_INCLUDE_PATH \
  
  ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
  gb_CFLAGS_WERROR := -Werror
 @@ -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)) \
 +	${FBSD_LDFLAGS} \
  	 \
  
  ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
Index: head/editors/openoffice-4/files/patch-i114430
===================================================================
--- head/editors/openoffice-4/files/patch-i114430	(revision 393557)
+++ head/editors/openoffice-4/files/patch-i114430	(revision 393558)
@@ -1,112 +1,101 @@
-Index: sal/inc/rtl/math.h
-===================================================================
---- sal/inc/rtl/math.h	(revision 1447988)
-+++ sal/inc/rtl/math.h	(working copy)
-@@ -396,6 +396,21 @@
+--- sal/inc/rtl/math.h.orig	2014-02-25 08:31:58 UTC
++++ sal/inc/rtl/math.h
+@@ -396,6 +396,21 @@ double SAL_CALL rtl_math_round(double fV
   */
  double SAL_CALL rtl_math_pow10Exp(double fValue, int nExp) SAL_THROW_EXTERN_C();
  
 +/** Similar to pow() with stricter exception handling for indeterminate values.
 +
 +    powr is specified in the IEEE 754 - 2008 Floating Point Standard.
 +
 +    @param fValue
 +    The value to be raised.
 +
 +    @param fExp
 +    The exponent.
 +
 +    @return
 +    powr(fValue, fExp)
 + */
 +double SAL_CALL rtl_math_powr(double fValue, double fExp) SAL_THROW_EXTERN_C();
 +
  /** Rounds value to 15 significant decimal digits.
  
      @param fValue
-Index: sal/inc/rtl/math.hxx
-===================================================================
---- sal/inc/rtl/math.hxx	(revision 1447988)
-+++ sal/inc/rtl/math.hxx	(working copy)
-@@ -186,6 +186,13 @@
+--- sal/inc/rtl/math.hxx.orig	2014-02-25 08:31:58 UTC
++++ sal/inc/rtl/math.hxx
+@@ -186,6 +186,13 @@ inline double pow10Exp(double fValue, in
      return rtl_math_pow10Exp(fValue, nExp);
  }
  
 +/** A wrapper around rtl_math_powr.
 + */
 +inline double powr(double fValue, double fExp)
 +{
 +    return rtl_math_powr(fValue, fExp);
 +}
 +
  /** A wrapper around rtl_math_approxValue.
   */
  inline double approxValue(double fValue)
-Index: sal/rtl/source/math.cxx
-===================================================================
---- sal/rtl/source/math.cxx	(revision 1447988)
-+++ sal/rtl/source/math.cxx	(working copy)
-@@ -1113,7 +1113,20 @@
+--- sal/rtl/source/math.cxx.orig	2014-02-25 08:31:57 UTC
++++ sal/rtl/source/math.cxx
+@@ -1113,6 +1113,19 @@ double SAL_CALL rtl_math_expm1( double f
      return (fe-1.0) * fValue / log(fe);
  }
  
 +double SAL_CALL rtl_math_powr( double fValue,  double fExp ) SAL_THROW_EXTERN_C()
 +{
 +    if ((fValue == 0.0  && fExp == 0.0) ||
 +	(rtl::math::isInf( fExp ) && !rtl::math::isSignBitSet( fExp )) ||
 +	(rtl::math::isInf( fValue ) && !rtl::math::isSignBitSet( fValue )))
 +    {
 +        double fResult;
 +        ::rtl::math::setNan( &fResult );
 +        return fResult;
 +    }
 +    return pow(fValue, fExp);
 +}
- 
 +
+ 
  double SAL_CALL rtl_math_log1p( double fValue ) SAL_THROW_EXTERN_C()
  {
-     // Use volatile because a compiler may be too smart "optimizing" the
-Index: sal/util/sal.map
-===================================================================
---- sal/util/sal.map	(revision 1447988)
-+++ sal/util/sal.map	(working copy)
-@@ -629,6 +629,8 @@
+--- sal/util/sal.map.orig	2014-02-25 08:31:48 UTC
++++ sal/util/sal.map
+@@ -629,6 +629,8 @@ UDK_3.12 { # AOO 3.5
      global:
          osl_loadAsciiModule;
          osl_loadAsciiModuleRelative;
 +
 +        rtl_math_powr;
  } UDK_3.11;
  
  PRIVATE_1.0 {
-Index: sc/source/core/tool/interpr5.cxx
-===================================================================
---- sc/source/core/tool/interpr5.cxx	(revision 1447988)
-+++ sc/source/core/tool/interpr5.cxx	(working copy)
-@@ -1611,14 +1611,14 @@
+--- sc/source/core/tool/interpr5.cxx.orig	2014-02-25 08:27:49 UTC
++++ sc/source/core/tool/interpr5.cxx
+@@ -1611,14 +1611,14 @@ void ScInterpreter::ScPow()
              if (bFlag)
              {   for ( SCSIZE i = 0; i < nCount; i++ )
                      if (pMat->IsValue(i))
 -                        pResMat->PutDouble(pow(fVal,pMat->GetDouble(i)), i);
 +                        pResMat->PutDouble(::rtl::math::powr(fVal,pMat->GetDouble(i)), i);
                      else
                          pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);
              }
              else
              {   for ( SCSIZE i = 0; i < nCount; i++ )
                      if (pMat->IsValue(i))
 -                        pResMat->PutDouble(pow(pMat->GetDouble(i),fVal), i);
 +                        pResMat->PutDouble(::rtl::math::powr(pMat->GetDouble(i),fVal), i);
                      else
                          pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);
              }
-@@ -1628,7 +1628,7 @@
+@@ -1628,7 +1628,7 @@ void ScInterpreter::ScPow()
              PushIllegalArgument();
      }
      else
 -        PushDouble(pow(fVal1,fVal2));
 +        PushDouble(::rtl::math::powr(fVal1,fVal2));
  }
  
  void ScInterpreter::ScSumProduct()
Index: head/editors/openoffice-4/files/patch-jpeg
===================================================================
--- head/editors/openoffice-4/files/patch-jpeg	(revision 393557)
+++ head/editors/openoffice-4/files/patch-jpeg	(revision 393558)
@@ -1,12 +1,15 @@
---- svtools/Library_svt.mk.orig	2014-02-25 00:28:36.000000000 -0800
-+++ svtools/Library_svt.mk	2014-08-04 21:40:00.000000000 -0700
-@@ -76,6 +76,9 @@
+--- svtools/Library_svt.mk.orig	2014-09-19 17:47:52 UTC
++++ svtools/Library_svt.mk
+@@ -76,6 +76,12 @@ $(eval $(call gb_Library_add_linked_libs
  $(eval $(call gb_Library_set_ldflags,svt,\
  	$$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
  ))
++ifeq ($(OS),FREEBSD)
++# JDK jpeg library on FreeBSD lives under ${JAVA_HOME}/jre/lib/${ARCH}/
 +$(eval $(call gb_Library_set_ldflags,svt,\
-+	$$(shell echo $$(LDFLAGS) | sed 's/ -L[^ ]*\/jre\/lib\/[^ ]*//g') \
++	$$(filter-out -L$$(JAVA_HOME)/jre/lib/%,$$(LDFLAGS)) \
 +))
++endif
  ifeq ($(GUIBASE),os2)
  # YD FIXME above is not working... needs ldflags hack...
  $(eval $(call gb_Library_set_ldflags,svt,\
Index: head/editors/openoffice-4/files/patch-nss
===================================================================
--- head/editors/openoffice-4/files/patch-nss	(revision 393557)
+++ head/editors/openoffice-4/files/patch-nss	(revision 393558)
@@ -1,43 +1,62 @@
---- set_soenv.in~	2014-01-22 15:21:04.000000000 +0900
-+++ set_soenv.in	2014-02-03 12:12:03.000000000 +0900
-@@ -1864,6 +1864,8 @@
+--- set_soenv.in.orig	2014-06-06 06:58:10 UTC
++++ set_soenv.in
+@@ -1823,6 +1823,8 @@ ToFile( "PKGFORMAT",         "@PKGFORMAT
  ToFile( "SYSTEM_STDLIBS",    "@SYSTEM_STDLIBS@",   "e" );
  ToFile( "SYSTEM_ZLIB",       "@SYSTEM_ZLIB@",      "e" );
  ToFile( "SYSTEM_NSS",        "@SYSTEM_NSS@",       "e" );
 +ToFile( "NSS_CFLAGS",        "@NSS_CFLAGS@",       "e" );
 +ToFile( "NSS_LIBS",          "@NSS_LIBS@",         "e" );
  ToFile( "SYSTEM_OPENSSL",    "@SYSTEM_OPENSSL@",   "e" );
  ToFile( "OPENSSL_CFLAGS",    "@OPENSSL_CFLAGS@",   "e" );
  ToFile( "OPENSSL_LIBS",      "@OPENSSL_LIBS@",     "e" );
-
---- xmlsecurity/util/makefile.mk	2014-02-03 15:50:50.000000000 +0900
-+++ xmlsecurity/util/makefile.mk	2014-02-03 16:03:11.000000000 +0900
-@@ -98,12 +98,12 @@
+--- xmlsecurity/source/xmlsec/nss/makefile.mk.orig	2014-02-25 08:23:37 UTC
++++ xmlsecurity/source/xmlsec/nss/makefile.mk
+@@ -44,12 +44,8 @@ CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
+ 
+ .IF "$(SYSTEM_NSS)" != "YES"
+ MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+-NSS_INC = $(MOZ_INC)$/nss
+-NSPR_INC = $(MOZ_INC)$/nspr
+-.ELSE
+-# TODO: better use pkgconfig to find the proper system include path
+-NSS_INC = /usr/include/nss3
+-NSPR_INC = /usr/include/nspr4
++NSS_CFLAGS = -I$(MOZ_INC)$/nss
++NSPR_CFLAGS = -I$(MOZ_INC)$/nspr
+ .ENDIF
+ 
+ .IF "$(GUI)" == "WNT"
+@@ -105,10 +101,10 @@ CDEFS += -DXMLSEC_NO_XSLT
+ # --- Files --------------------------------------------------------
+ 
+ SOLARINC += \
+- -I$(NSPR_INC) \
++ $(NSPR_CFLAGS) \
+  -I$(PRJ)$/source$/xmlsec
+ 
+-SOLARINC += -I$(NSS_INC)
++SOLARINC += $(NSS_CFLAGS)
+ 
+ SLOFILES = \
+ 	$(SLO)$/nssinitializer.obj \
+--- xmlsecurity/util/makefile.mk.orig	2014-02-25 08:23:37 UTC
++++ xmlsecurity/util/makefile.mk
+@@ -98,13 +98,17 @@ SHL2STDLIBS +=			\
  SHL2STDLIBS +=-ldl
  .ENDIF
  
 -.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"!="YES"
-+.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"=="YES"
++.IF "$(ENABLE_NSS_MODULE)"=="YES"
++.IF "$(SYSTEM_NSS)"!="YES"
  .IF "$(NSPR_LIB)" != ""
  SHL2STDLIBS += $(NSPR_LIB)
  .ENDIF
--.IF "$(NSS_LIB)" != ""
--SHL2STDLIBS += $(NSS_LIB)
-+.IF "$(NSS_LIBS)" != ""
+ .IF "$(NSS_LIB)" != ""
+ SHL2STDLIBS += $(NSS_LIB)
+ .ENDIF
++.ELSE
 +SHL2STDLIBS += $(NSS_LIBS)
++.ENDIF
  .ENDIF
- .ENDIF
  
---- xmlsecurity/source/xmlsec/nss/makefile.mk	2014-01-22 15:07:16.000000000 +0900
-+++ xmlsecurity/source/xmlsec/nss/makefile.mk	2014-02-03 16:13:30.000000000 +0900
-@@ -48,8 +48,8 @@
- NSPR_INC = $(MOZ_INC)$/nspr
- .ELSE
- # TODO: better use pkgconfig to find the proper system include path
--NSS_INC = /usr/include/nss3
--NSPR_INC = /usr/include/nspr4
-+NSS_INC = $(NSS_CFLAGS)
-+NSPR_INC = $(NSS_CFLAGS)
- .ENDIF
- 
- .IF "$(GUI)" == "WNT"
+ .IF "$(CRYPTO_ENGINE)" == "mscrypto"
Index: head/editors/openoffice-4/files/patch-sal
===================================================================
--- head/editors/openoffice-4/files/patch-sal	(revision 393557)
+++ head/editors/openoffice-4/files/patch-sal	(revision 393558)
@@ -1,13 +1,13 @@
---- sal/inc/rtl/string.hxx	2014-01-24 03:32:49.000000000 +0900
-+++ sal/inc/rtl/string.hxx	2014-02-04 14:57:30.000000000 +0900
-@@ -234,8 +234,9 @@
+--- sal/inc/rtl/string.hxx.orig	2014-06-19 07:47:24 UTC
++++ sal/inc/rtl/string.hxx
+@@ -234,8 +234,9 @@ private:
        @return a pointer to a (not necessarily null-terminated) byte string
        representing the characters of this string object.
      */
 -    operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; }
 +
  public:
 +    operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; }
      /** Returns a reference to a character of this string. */
      sal_Char& operator[]( int n ) { return pData->buffer[n]; }
      /** Returns a const reference to a character of this string. */
Index: head/editors/openoffice-4/files/patch-set_soenv.in
===================================================================
--- head/editors/openoffice-4/files/patch-set_soenv.in	(revision 393557)
+++ head/editors/openoffice-4/files/patch-set_soenv.in	(revision 393558)
@@ -1,79 +1,79 @@
---- set_soenv.in.orig	2015-01-17 23:35:07.000000000 -0800
-+++ set_soenv.in	2015-02-23 16:02:44.000000000 -0800
-@@ -359,7 +359,7 @@
+--- set_soenv.in.orig	2014-06-06 06:58:10 UTC
++++ set_soenv.in
+@@ -359,7 +359,7 @@ elsif ( $platform =~ m/kfreebsd/ ) 
  elsif ( $platform =~ m/freebsd/ ) 
  {     $BIG_SVX        = "TRUE";
        $COM            = "GCC";
 -      $COMPATH        = '@COMPATH@'; 
 +      $COMPATH        = '@COMPATH@' . '/bin'; 
        $CVER           = "C300";
        $GUI            = "UNX";
        $GUIBASE        = "unx";
-@@ -2617,26 +2617,37 @@
+@@ -2575,26 +2575,37 @@ sub GetCorrectPath
  	my @originalPairs = @_;
  	my @pairs = @originalPairs;
  	my @Path = split /$ps/, $oldPath;
 +	my @buildPath;
 +	my @sysPath;
 +	my $elem;
 +
 +	for $elem (@Path) {
 +	    if ($elem eq '.' || $elem =~ m'^$SOLARENV/' ||
 +		$elem =~ m'/solenv/') {
 +		    push @buildPath, $elem;
 +	    } else {
 +		    push @sysPath, $elem;
 +	    }
 +	}
  
  	while (@pairs) {
  	    my $path = shift @pairs;
  	    my $cmd = shift @pairs;
  	    my $to_append = 1;
 -	    my $elem;
  
  	    if (! -x "$path/$cmd") {
  		AddWarning ("Missing executable $path/$cmd\n");
  	    }
  
 -	    for $elem (@Path) {
 +	    for $elem (@sysPath) {
  		if ($elem eq $path) {
  #		    print "Hit duplicate path in path; break\n";
  		    $to_append = 0;
  		    last;
  		}
 -		if (-f "$elem/$cmd") {
 +		if (-f "$elem/$cmd" && ! -l "$elem/$cmd") {
  #		    print "Element already in path ...\n";
 -		    unshift @Path, $path;
 +		    unshift @sysPath, $path;
  		    $to_append = 0;
  		    last;
  		} else {
-@@ -2644,7 +2655,7 @@
+@@ -2602,7 +2613,7 @@ sub GetCorrectPath
  		}
  	    }
  	    if ($to_append) {
 -		push @Path, $path;
 +		push @sysPath, $path;
  	    }
  	}
  
-@@ -2654,14 +2665,14 @@
+@@ -2612,14 +2623,14 @@ sub GetCorrectPath
  	    my $cmd = shift @pairs;
  	    my $realpath;
  
 -	    $realpath = PathLookup ($cmd, @Path);
 +	    $realpath = PathLookup ($cmd, @sysPath);
  	    if (!($realpath eq $path)) {
  		AddWarning ("Path conflict for executables " .
                              "$path/$cmd against $realpath");
  	    }
  	}
  
 -	return join $ps, CleanupPath (@Path);
 +	return join $ps, @buildPath, CleanupPath (@sysPath);
  }
  
  #------------------------------------------------------------
Index: head/editors/openoffice-4/files/patch-unxfbsd.mk
===================================================================
--- head/editors/openoffice-4/files/patch-unxfbsd.mk	(revision 393557)
+++ head/editors/openoffice-4/files/patch-unxfbsd.mk	(revision 393558)
@@ -1,54 +1,54 @@
---- solenv/inc/unxfbsd.mk.orig	2014-09-19 18:16:56 UTC
+--- solenv/inc/unxfbsd.mk.orig	2014-02-25 08:33:35 UTC
 +++ solenv/inc/unxfbsd.mk
 @@ -27,7 +27,7 @@ ASM=
  AFLAGS=
  
  SOLAR_JAVA*=
 -PICSWITCH*:=-fpic
 +PICSWITCH*:=-fPIC
  JAVAFLAGSDEBUG=-g
  
  # Include arch specific makefile.
-@@ -49,7 +49,7 @@ JAVAFLAGSDEBUG=-g
+@@ -43,7 +43,7 @@ JAVAFLAGSDEBUG=-g
  #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
 +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"
-@@ -88,7 +88,7 @@ CFLAGSENABLESYMBOLS=-g # was temporarily
+@@ -82,7 +82,7 @@ CFLAGSENABLESYMBOLS=-g # was temporarily
  # flags for the C++ Compiler
  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
  
-@@ -156,7 +156,7 @@ LINKFLAGSRUNPATH_OXT=
+@@ -150,7 +150,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 $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
  
  # linker flags for linking applications
  LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-@@ -199,11 +199,11 @@ STDSHLCUIMT+=-ltcmalloc
+@@ -193,11 +193,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
  
Index: head/editors/openoffice-4/files/patch-webdav
===================================================================
--- head/editors/openoffice-4/files/patch-webdav	(revision 393557)
+++ head/editors/openoffice-4/files/patch-webdav	(revision 393558)
@@ -1,133 +1,132 @@
---- 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
+--- ucb/source/ucp/webdav/SerfCallbacks.hxx.orig	2014-02-25 08:24:42 UTC
++++ ucb/source/ucp/webdav/SerfCallbacks.hxx
 @@ -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
+--- ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx.orig	2014-02-25 08:24:43 UTC
++++ ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
 @@ -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
+--- ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx.orig	2014-02-25 08:24:42 UTC
++++ ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
 @@ -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
+--- ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx.orig	2014-02-25 08:24:43 UTC
++++ ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
 @@ -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
+--- ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx.orig	2014-02-25 08:24:43 UTC
++++ ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
 @@ -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
+--- ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx.orig	2014-02-25 08:24:43 UTC
++++ ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
 @@ -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
+--- ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx.orig	2014-02-25 08:24:43 UTC
++++ ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
 @@ -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
+--- ucb/source/ucp/webdav/SerfRequestProcessor.hxx.orig	2014-02-25 08:24:43 UTC
++++ ucb/source/ucp/webdav/SerfRequestProcessor.hxx
 @@ -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
+--- ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx.orig	2014-02-25 08:24:42 UTC
++++ ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
 @@ -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"
+--- ucb/source/ucp/webdav/SerfSession.cxx.orig	2014-02-25 08:24:43 UTC
++++ ucb/source/ucp/webdav/SerfSession.cxx
+@@ -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.orig	2014-02-25 08:24:43 UTC
++++ ucb/source/ucp/webdav/SerfTypes.hxx
+@@ -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/SerfUri.hxx.orig	2014-02-25 08:24:43 UTC
++++ ucb/source/ucp/webdav/SerfUri.hxx
+@@ -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"
+ 
Index: head/editors/openoffice-4/files/pkg-message.in
===================================================================
--- head/editors/openoffice-4/files/pkg-message.in	(revision 393557)
+++ head/editors/openoffice-4/files/pkg-message.in	(revision 393558)
@@ -1,41 +1,40 @@
 Apache OpenOffice Build %%AOOTAG%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
 Apache OpenOffice %%AOOTAG%% will soon be installed in
 %%PREFIX%%/%%EXECBASE%%
 
-1. User installation
+1. Scanner interface
 --------------------
+To enable the scanner interface, install the sane-backends package.
 
-Just type "%%EXECBASE%%" after you have successfully
-installed the package. If there is no installed
-.openoffice.org directory in your home directory, the
-setup installs the "%%AOOUDIR%%" folder.
+2. User installation
+--------------------
+Just type "%%EXECBASE%%" after you have successfully installed
+the package.  If there is no installed .openoffice.org directory in your
+home directory, the setup installs the "%%AOOUDIR%%" folder.
 
-2. Starting Apache OpenOffice
+3. Starting Apache OpenOffice
 -----------------------------
+There are some wrappers installed for faster startup.  Add "%%PREFIX%%/bin/"
+to your PATH and you will be able to use them.
 
-There are some wrappers installed for faster startup.
-Add "%%PREFIX%%/bin/" to your PATH and you will be able
-to use them.
-
 %%PREFIX%%/bin/%%EXECBASE%%
 %%PREFIX%%/bin/%%EXECBASE%%-sbase
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
 %%PREFIX%%/bin/%%EXECBASE%%-setofficelang
 %%PREFIX%%/bin/%%EXECBASE%%-smath
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
 %%PREFIX%%/bin/%%EXECBASE%%-spadmin
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
-OO.org does need $LANG to be set to a suitable value.
+OpenOffice does need $LANG to be set to a suitable value.
 
-3. If you run into problems
+4. If you run into problems
 --------------------------------------------------
-If you somehow run into problems, please remove the already
-installed "%%AOOUDIR%%" directory in your home directory,
-then  redo the user installation and the problems should go
-away.
+If you somehow run into problems, please remove the already installed
+"%%AOOUDIR%%" directory in your home directory, then redo the
+user installation and the problems should go away.