Index: head/editors/openoffice-4/Makefile
===================================================================
--- head/editors/openoffice-4/Makefile	(revision 382434)
+++ head/editors/openoffice-4/Makefile	(revision 382435)
@@ -1,367 +1,373 @@
 # Created by: Martin Blapp
 # $FreeBSD$
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION}
-PORTREVISION=	7
+PORTREVISION=	8
 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
 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
 
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip	\
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip	\
 		zip:${PORTSDIR}/archivers/zip				\
 		ant:${PORTSDIR}/devel/apache-ant			\
 		dmake:${PORTSDIR}/devel/dmake				\
 		epm:${PORTSDIR}/devel/epm				\
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf		\
 		imake:${PORTSDIR}/devel/imake				\
 		gpatch:${PORTSDIR}/devel/patch				\
 		${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			\
 		libcurl.so:${PORTSDIR}/ftp/curl				\
 		libcairo.so:${PORTSDIR}/graphics/cairo			\
 		libjpeg.so:${PORTSDIR}/graphics/jpeg			\
 		libpng.so:${PORTSDIR}/graphics/png			\
 		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib	\
 		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
 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
 
 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_AUTOTOOLS=	autoconf
 USE_GL=		gl glu
 USE_GNOME=	gtk20 libxslt libidl glib20
 USE_GSTREAMER=	yes
 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=		bison compiler desktop-file-utils gmake perl5 pkgconfig python \
 		tar:bzip2
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
 
 OPTIONS_DEFINE=			CUPS GCONF GNOMEVFS CCACHE
 OPTIONS_DEFAULT=		CUPS GCONF GNOMEVFS
 GNOMEVFS_DESC=			Enable GNOME Virtual File System
 CCACHE_DESC=			Mimimize compile time of C/C++ programs
 
 CUPS_CONFIGURE_ENABLE=		cups
 CUPS_LIB_DEPENDS=		libcups.so:${PORTSDIR}/print/cups-client
 
 GCONF_USE=			GNOME=gconf2
 GCONF_CONFIGURE_ENABLE=		gconf
 
 GNOMEVFS_USE=			GNOME=gnomevfs2
 GNOMEVFS_CONFIGURE_ENABLE=	gnome-vfs
 
 .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=			${LOCALBASE}/bin/clang-cpp35
-CC=			${LOCALBASE}/bin/clang35
-CXX=			${LOCALBASE}/bin/clang++35
+CPP=			clang-cpp35
+CC=			clang35
+CXX=			clang++35
 . endif
 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
 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
 BASH?=		${PREFIX}/bin/bash
 SUB_FILES=	pkg-message
 SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR}
 
 .if defined(DISABLE_MAKE_JOBS)
 MAKE_JOBS_NUMBER=	4
 .endif
 
 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	\
 			--enable-category-b				\
 			--with-system-cairo --enable-cairo		\
 			--with-system-coinmp				\
 			--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		\
 			--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			\
 			--with-system-libxml				\
 			--with-system-libxslt				\
 			--enable-lockdown				\
 			--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-serf				\
 			--with-system-stdlibs				\
 			--enable-symbols=small				\
 			--without-stlport				\
 			--with-vendor="FreeBSD ports system"		\
 			--enable-verbose				\
 			--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
 #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
 
 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
 .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
-	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
 	${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/files/patch-freebsd.mk
===================================================================
--- head/editors/openoffice-4/files/patch-freebsd.mk	(revision 382434)
+++ head/editors/openoffice-4/files/patch-freebsd.mk	(revision 382435)
@@ -1,18 +1,26 @@
 --- solenv/gbuild/platform/freebsd.mk.orig	2014-09-19 18:16:41 UTC
 +++ solenv/gbuild/platform/freebsd.mk
 @@ -96,6 +96,7 @@ gb_CXXFLAGS := \
  	-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)
Index: head/editors/openoffice-4/files/patch-unxfbsd.mk
===================================================================
--- head/editors/openoffice-4/files/patch-unxfbsd.mk	(revision 382434)
+++ head/editors/openoffice-4/files/patch-unxfbsd.mk	(revision 382435)
@@ -1,47 +1,54 @@
 --- solenv/inc/unxfbsd.mk.orig	2014-09-19 18:16:56 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
  #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 %%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
+ 
Index: head/editors/openoffice-4/files/pkg-message.in
===================================================================
--- head/editors/openoffice-4/files/pkg-message.in	(revision 382434)
+++ head/editors/openoffice-4/files/pkg-message.in	(revision 382435)
@@ -1,39 +1,41 @@
 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
 --------------------
 
 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
 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.
 
 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.