diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index 9384b4d1b0ed..cfbf6389c47d 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -1,526 +1,530 @@
 PORTNAME=	apache-openoffice
-PORTVERSION=	${AOOVERSION}
-PORTREVISION=	6
+PORTVERSION=	${AOOVERSION}${AOORCN:?.p${AOORCN}:}
+PORTREVISION=	0
 CATEGORIES=	editors java
-MASTER_SITES=	https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \
-		https://archive.apache.org/dist/openoffice/${PORTVERSION}/source/ \
+MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}${AOORCN:?-RC${AOORCN}:}/source/
+#MASTER_SITES=	https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \
+#		https://archive.apache.org/dist/openoffice/${PORTVERSION}/source
+MASTER_SITES+=	https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
 		LOCAL/truckman/openoffice:extsrc \
 		SF/oooextras.mirror/:sf
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=		${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX=		-${LANG_SUFFIX}
 .endif
 DISTFILES=	${AOOSRC} ${EXTSRC}:extsrc ${PYTHON_DISTFILE}:sf \
 		${GCC_EXTRA_DISTFILES:C/.*/&:sf/g}
 DIST_SUBDIR=	openoffice
 EXTRACT_ONLY=	${AOOSRC}
 
 MAINTAINER=	office@FreeBSD.org
 #de facto maintainer is truckman@FreeBSD.org
 #Frequent Patch submitters should (optionally) sign the Apache iCLA
 COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 WWW=		https://openoffice.apache.org/
 
 LICENSE=		APACHE20 ADOBE BSD3CLAUSE BSD4CLAUSE BSL ICU MIT MPL10 \
 			MPL11 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_MPL10=	${WRKSRC}/LICENSE_MPL10
 LICENSE_FILE_MPL11=	${WRKSRC}/LICENSE_MPL11
 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
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64
 
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:archivers/p5-Archive-Zip		\
 		${LOCALBASE}/bin/unzip:archivers/unzip			\
 		zip:archivers/zip					\
 		ant:devel/apache-ant					\
 		dmake:devel/dmake					\
 		${LOCALBASE}/bin/gperf:devel/gperf			\
 		imake:devel/imake					\
 		libunwind>=20211201_1:devel/libunwind			\
 		gpatch:devel/patch					\
 		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends	\
 		${JAVALIBDIR}/commons-lang.jar:java/apache-commons-lang \
 		${JAVALIBDIR}/junit.jar:java/junit			\
 		${JAVALIBDIR}/bsh.jar:lang/bsh				\
 		bash:shells/bash					\
 		${JAVALIBDIR}/lucene-core-3.6.2.jar:textproc/lucene	\
 		p5-XML-Parser>=0:textproc/p5-XML-Parser			\
 		p5-libwww>=0:www/p5-libwww				\
 		p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https
 LIB_DEPENDS=								\
 		libapr-1.so:devel/apr1					\
 		libnspr4.so:devel/nspr					\
 		libcurl.so:ftp/curl					\
 		libcairo.so:graphics/cairo				\
 		libpng16.so:graphics/png				\
 		libgraphite.so:graphics/silgraphite			\
 		libblas.so:math/blas					\
 		libCbcSolver.so:math/cbc				\
 		libCgl.so:math/cgl					\
 		libcoinasl.so:math/asl					\
 		libClpSolver.so:math/clp				\
 		libCoinMP.so:math/coinmp				\
 		libCoinUtils.so:math/coinutils				\
 		libcoinmumps.so:math/coin-or-mumps			\
 		libnauty.so:math/nauty					\
 		libopenblas.so:math/openblas				\
 		libOsi.so:math/osi					\
 		libfreetype.so:print/freetype2				\
 		libharfbuzz.so:print/harfbuzz				\
 		libnss3.so:security/nss					\
 		libexpat.so:textproc/expat2				\
 		libhunspell-1.7.so:textproc/hunspell			\
 		libhyphen.so:textproc/hyphen				\
 		libtextcat.so:textproc/libtextcat			\
 		libmythes-1.2.so:textproc/mythes			\
 		librdf.so:textproc/redland				\
 		libserf-1.so:www/serf					\
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=								\
 		${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
 		${JAVALIBDIR}/commons-lang.jar:java/apache-commons-lang \
 		${JAVALIBDIR}/bsh.jar:lang/bsh				\
 		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \
 		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
 		${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf
 # For libgfortran.so and libquadmath.so
 BUILD_DEPENDS+=	gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT}
 RUN_DEPENDS+=	gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT}
 
 USES=		autoreconf bison compiler:c++11-lib cpe desktop-file-utils \
 		gettext-runtime gl gmake gnome iconv java jpeg perl5 pkgconfig \
 		shared-mime-info ssl tar:bzip2 xorg
 USE_GL=		gl glu
 USE_GNOME=	gdkpixbuf gdkpixbuf2xlib gtk20 libxslt glib20
 JAVA_VENDOR=	openjdk
 USE_PERL5=	build
 USE_XORG=	ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
 		xinerama xrandr xrender xt
 
 CONFLICTS_INSTALL=	apache-openoffice-devel
 
 AOOVERSION1=	4
 AOOVERSION2=	1
-AOOVERSION3=	15
+AOOVERSION3=	16
+AOORCN=		1
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
-AOOTAG=		AOO4115m2\(Build:9813\)
-GITREVISION=	5f13fa0070
+AOOTAG=		AOO4116m1\(Build:9814\)
+GITREVISION=	204bfc1896
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
 AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
 AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
 AOOSUFFIX=	${AOOVERSION1}.${AOOVERSION2}
 AOOSRC=		apache-openoffice-${AOOVERSION}-${GITREVISION}-src${EXTRACT_SUFX}
 
 AOOUDIR=		.openoffice.org\/${AOOVERSION1}
 INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
 PRINSTALLATION_BASEDIR=	${PREFIX}/${INSTALLATION_BASEDIR}
 OOPATH=			${PRINSTALLATION_BASEDIR}/openoffice${AOOVERSION1}
 XDGDIR=			${OOPATH}/share/xdg
 XDGREL=			../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg
 EXECBASE?=		openoffice-${AOOSUFFIX}
 
 WITHOUT_CPU_CFLAGS=	true
 CPE_PRODUCT=	${PORTNAME:S|apache-||}
 CPE_VENDOR=	apache
 
 OPTIONS_DEFINE=		CRASHDUMP CUPS DBGUTIL DEBUG GNOME \
 			SDK WIKI_PUBLISHER
 OPTIONS_DEFAULT=	CUPS GNOME WIKI_PUBLISHER
 CRASHDUMP_DESC=		Enable crashdumps, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
 DBGUTIL_DESC=		Enable assertions, object counting. (non-production)
 DEBUG_DESC=		Compile with -O0, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
 GNOME_DESC=		Screensaver presentation control via DBUS
 SDK_DESC=		Build and install software development kit
 WIKI_PUBLISHER_DESC=	Build and install Wiki Publisher extension
 
 CRASHDUMP_CONFIGURE_ENABLE=	crashdump
 
 CUPS_CONFIGURE_ENABLE=		cups
 CUPS_LIB_DEPENDS=		libcups.so:print/cups
 
 DBGUTIL_CONFIGURE_ENABLE=	dbgutil
 
 DEBUG_CONFIGURE_ENABLE=		debug
 
 GNOME_CONFIGURE_ENABLE=		dbus lockdown
 GNOME_LIB_DEPENDS=		libdbus-1.so:devel/dbus \
 				libdbus-glib-1.so:devel/dbus-glib
 
 SDK_CONFIGURE_ENABLE=		odk
 SDK_DISTFILES=			unowinreg.dll:unoreg
 
 WIKI_PUBLISHER_CONFIGURE_ENABLE=	wiki-publisher
 WIKI_PUBLISHER_CONFIGURE_WITH=						\
 	commons-codec-jar=${JAVALIBDIR}/commons-codec.jar		\
 	commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar	\
 	commons-logging-jar=${JAVALIBDIR}/commons-logging.jar
 WIKI_PUBLISHER_JAR_DEPENDS=						\
 	${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec	\
 	${JAVALIBDIR}/commons-httpclient.jar:java/apache-commons-httpclient \
 	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 WIKI_PUBLISHER_BUILD_DEPENDS=	${WIKI_PUBLISHER_JAR_DEPENDS}
 WIKI_PUBLISHER_RUN_DEPENDS=	${WIKI_PUBLISHER_JAR_DEPENDS}
 WIKI_PUBLISHER_VARS=	BUNDLED_EXTENSIONS+=swext/wiki-publisher.oxt
 
 # Don't run gnome-post-icons until after post-install generates the plist
 TARGET_ORDER_OVERRIDE=	710:gnome-post-icons
 
 # Force the SDK option on for makesum to ensure that unowinreg.dll is
 # included in distinfo
 .if make(makesum) || make(distclean)
 WITH=	SDK
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500000
 # nm: '../unxfbsdi.pro/slo/b2dcubicbezier.o': Invalid argument
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-nm
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-symbols
 .else
 CONFIGURE_ARGS+=	--enable-strip-solver
 .endif
 
 .include <${FILESDIR}/Makefile.localized>
 
 PYTHON_DISTFILE=	38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz
 GCC_EXTRA_DISTFILES=	d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
+			e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz \
 			d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CPPFLAGS+=		-I${LOCALBASE}/include
 . if ${ARCH} == amd64
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-align16
 . endif
 .endif
 
 .if ${ARCH} == amd64
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
 .elif ${ARCH} == i386
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86
 .elif ${ARCH} == powerpc64
 FREEBSD_ENV_SET=	FreeBSDPPC64Env.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_ppc64
 .endif
 PACKAGE_PREFIX=		Apache_OpenOffice
 
 LOCALIZED_LANG?=	en-US
 
 AOO_MAKE_ENV=	${MAKE_ENV:NCPPFLAGS=*:NCFLAGS=*:NCXXFLAGS=*:NLDFLAGS=*}
 
 GNU_CONFIGURE=	yes
 WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
 WRKSRC?=	${WRKSUBDIR}/main
 SUB_FILES=	pkg-message
 SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} \
 		AOOVERSION=${AOOVERSION}				\
 		PRINSTALLATION_BASEDIR=${PRINSTALLATION_BASEDIR}
 
 CONFIGURE_ARGS+=							\
 			--disable-gconf					\
 			--enable-gio					\
 			--disable-gnome-vfs				\
 			--with-unix-wrapper=${EXECBASE}			\
 			--with-alloc=system				\
 			--with-ant-home=${LOCALBASE}/share/java/apache-ant \
 			--with-system-apache-commons=yes		\
 			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.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				\
 			--with-system-dicts				\
 			--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-jdk-home=${JAVA_HOME}			\
 			--with-system-jpeg				\
 			--with-junit=${JAVALIBDIR}/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"			\
 			--without-system-python				\
 			--with-system-redland				\
 			--with-system-sane				\
 			--with-system-serf				\
 			--with-system-stdlibs				\
 			--with-vendor="FreeBSD ports system"		\
 			--with-build-version="PKGNAME: ${PKGNAME:S/,/@/g}" \
 			--enable-verbose				\
 			--with-system-xrender				\
 			--with-system-zlib
 
 .if defined (BUNDLED_EXTENSIONS)
 CONFIGURE_ARGS+=	--with-bundled-prereg-extensions="${BUNDLED_EXTENSIONS}"
 .endif
 
 CREATE_TREE=	${WRKSRC}/sysui/desktop/share/create_tree.sh
 
 .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} ${WRKDIR}/.PLIST*
 	${RM} ${WRKDIR}/.install_done.*
 	${RM} ${WRKDIR}/.package_done.*
 	${RM} ${WRKDIR}/.extract_done.*
 	${RM} ${WRKDIR}/.patch_done.*
 	${RM} ${WRKDIR}/.configure_done.*
 	${RM} ${WRKDIR}/.build_done.*
 	${MKDIR} ${WRKDIR}
 	${TOUCH} ${EXTRACT_COOKIE}
 	${TOUCH} ${PATCH_COOKIE}
 	${TOUCH} ${CONFIGURE_COOKIE}
 	${TOUCH} ${BUILD_COOKIE}
 .endif
 
 do-extract-SDK-on:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
 
 post-extract:
 	${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${PYTHON_DISTFILE} ${WRKSUBDIR}/ext_sources/${PYTHON_DISTFILE}
 .for f in ${GCC_EXTRA_DISTFILES}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f}
 .endfor
 	${CP} ${FILESDIR}/freebsd-aoo-intro.png \
 		${WRKSRC}/default_images/introabout/intro.png
 	${CP} ${FILESDIR}/freebsd-aoo-about.png \
 		${WRKSRC}/default_images/introabout/about.png
 	${RM} -r ${WRKSRC}/l10n
 	${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
 	${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 Saxon|,/^__/p'				\
 		-e d ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL10}
 	${SED}  -e '\|^The following Licenses have some restrictions|,/^- For Network/p' \
 		-e d ${WRKSRC}/LICENSE_category_b |			\
 		${SED} -e :a -e '$d;N;2,3ba' -e 'P;D' > ${LICENSE_FILE_MPL11}
 	${SED}  -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL}
 	${ECHO} '' >> ${LICENSE_FILE_PSFL}
 	${SED}  -e '\|^For Python|,/^__/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:
 	${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '${AOOVERSION1}'/" \
 		${WRKSRC}/sysui/desktop/productversion.mk
 	${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \
 		${WRKSRC}/desktop/scripts/soffice.sh
 	${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE}
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 	# g++49 -Os sometimes leaves inline class methods undefined,
 	# affects fmgridif.cxx and ColumnControl.cxx
 	# See: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009>
 	if [ ${CXX} = g++49  ]; then \
 		${REINPLACE_CMD} -e "s/ := -Os/ := -Os -fno-devirtualize -fno-devirtualize-speculatively/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk; \
 		${REINPLACE_CMD} -e "s/=-Os /=-Os -fno-devirtualize -fno-devirtualize-speculatively /" ${WRKSRC}/solenv/inc/unxfbsdi.mk; \
 	fi
 .elif ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == clang
 	# autodoc and uno (bridgetest) core dump when built with with -Os
 	# on i386, affects file.cxx and bridgetest.cxx (at least).
 	# Using -O2 optimiztion works, and -Os is essentially -O2 with out
 	# loop unrolling.
 	# Changing optimization in just unxfbsdi.mk is sufficient to get
 	# a successful build, but change it in both places to avoid the
 	# possibility of obscure runtime problems, which is likely
 	# since this seems to be a generic bug in code generation for
 	# exception handling.
 	# See: <https://llvm.org/bugs/show_bug.cgi?id=24792>
 	${REINPLACE_CMD} -e "s/=-Os /=-O2 -fno-unroll-loops /" ${WRKSRC}/solenv/inc/unxfbsdi.mk
 	${REINPLACE_CMD} -e "s/ := -Os/ := -O2 -fno-unroll-loops/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
 .endif
 
 # Verify that lucene was built with the CONTRIB option instead of
 # failing mysteriously during the build
 pre-configure:
 	@if [ ! -f ${JAVALIBDIR}/lucene-analyzers-3.6.2.jar ]; then \
 		${ECHO} "error: textproc/lucene must be built with the CONTRIB option enabled"; \
 		exit 1; \
 	fi
 
 do-build:
 	${PRINTF} "[repositories]\nmain=active\nextras=active\n" > ${WRKSUBDIR}/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
 	#
 	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 ;								  \
 	cd ${WRKSRC}/instsetoo_native ;					  \
 	export ${AOO_MAKE_ENV} ;					  \
 	. ../${FREEBSD_ENV_SET} ;					  \
 	build.pl --all -P$${numproc} -- -P$${dmproc}
 
 PYDL=	${STAGEDIR}${OOPATH}/program/python-core-2.7.18/lib/lib-dynload
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
 		${STAGEDIR}${PREFIX}/share/mime/packages
 	@cd ${WRKSRC} ; \
 		. ${FREEBSD_ENV_SET} ; \
 		cd instsetoo_native/$${INPATH}/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \
 		for i in *.tar.?z ; do \
 			${ECHO_CMD} "extracting $$i" ; \
 			${TAR} -s '|./[^/]*/||' -xz -f $$i \
 				-C ${STAGEDIR}${PRINSTALLATION_BASEDIR} ; \
 		done
 	${RM} ${PYDL}/_sqlite3.so ${PYDL}/gdbm.so ${PYDL}/readline.so
 	${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
 	${REINPLACE_CMD} \
 		-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
 		${STAGEDIR}${OOPATH}/program/bootstraprc
 	@${RM} ${STAGEDIR}${OOPATH}/program/bootstraprc.bak
 	@${ECHO_CMD} "adding wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%OOPATH%%#${OOPATH}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			${WRKDIR}/openoffice-wrapper
 	${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${STAGEDIR}${PREFIX}/bin/${EXECBASE}
 	@cd ${STAGEDIR}${PREFIX}/bin; for i in printeradmin sbase scalc sdraw \
 		simpress smath spadmin swriter ; do \
 			${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \
 	done
 	@${ECHO_CMD} "adding desktop support"
 	@cd ${WRKSRC} ;						\
 	    . ${FREEBSD_ENV_SET} ;				\
 	    cd sysui/$${INPATH}/misc/openoffice ;		\
 	    DESTDIR=${STAGEDIR}					\
 		GNOMEDIR=${PREFIX}				\
 		ICON_PREFIX=openoffice${AOOVERSION1}		\
 		ICON_SOURCE_DIR=${WRKSRC}/sysui/desktop/icons	\
 		ICON_THEMES="hicolor/??x??"			\
 		KDEMAINDIR=${PREFIX}				\
 		PREFIX=openoffice${AOOVERSION1}			\
 		${SH} ${CREATE_TREE} ;				\
 	    ${INSTALL_DATA} apacheopenoffice.xml		\
 		${STAGEDIR}/${PREFIX}/share/mime/packages
 	@cd ${STAGEDIR}${DESKTOPDIR}; for i in base calc draw impress \
 		javafilter math printeradmin qstart startcenter writer ; do \
 			${LN} -sf ${XDGREL}/$${i}.desktop ${EXECBASE}-$${i}.desktop ; \
 	done
 
 do-install-SDK-on:
 	${TAR} -s '|./[^/]*/||' -xz -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
 		-f ${WRKSRC}/instsetoo_native/unxfbsd*.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/*.tar.gz
 	@f=${STAGEDIR}${OOPATH}/sdk/bin/unoapploader ; \
 		${CHMOD} 644 $${f} ; ${STRIP_CMD} $${f} ; ${CHMOD} 444 $${f}
 
 post-install:
 	@${ECHO_CMD} "generating plist";
 	@cd ${STAGEDIR}${PREFIX} ; (\
 		${FIND} -s bin -name "${EXECBASE}*" ; \
 		${FIND} -s ${INSTALLATION_BASEDIR} share/applications \
 			share/application-registry share/icons \
 			share/mime-info share/mime share/mimelnk \! -type d ; \
 		${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \
 			${SED} -e 's/^/@dir /' ; \
 	) >> ${TMPPLIST}
 
 .include <${FILESDIR}/Makefile.others>
 
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice-4/distinfo b/editors/openoffice-4/distinfo
index 6d6a3a0ad777..30cba2562b2b 100644
--- a/editors/openoffice-4/distinfo
+++ b/editors/openoffice-4/distinfo
@@ -1,13 +1,15 @@
-TIMESTAMP = 1707944647
-SHA256 (openoffice/apache-openoffice-4.1.15-5f13fa0070-src.tar.bz2) = 820b5a9e845d9f2476c89424648e68be66d3d54322ded93c60ebd40c930ac707
-SIZE (openoffice/apache-openoffice-4.1.15-5f13fa0070-src.tar.bz2) = 244099652
+TIMESTAMP = 1758677710
+SHA256 (openoffice/apache-openoffice-4.1.16-204bfc1896-src.tar.bz2) = a04b91a82db12f20a3d35cb47666401ccf73722c9c0da2bfd1dad89f77d00d6e
+SIZE (openoffice/apache-openoffice-4.1.16-204bfc1896-src.tar.bz2) = 244206337
 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/e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz) = 814de31e1413df945cdd34939b424c4cf7a94d1c481f2d44c99c8ca52b288063
+SIZE (openoffice/e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz) = 13161131
 SHA256 (openoffice/38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz) = da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814
 SIZE (openoffice/38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz) = 17539408
 SHA256 (openoffice/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52
 SIZE (openoffice/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = 58146647
 SHA256 (openoffice/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz) = 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f
 SIZE (openoffice/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz) = 16525605
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
diff --git a/editors/openoffice-4/files/patch-canvas_source_cairo_makefile.mk b/editors/openoffice-4/files/patch-canvas_source_cairo_makefile.mk
deleted file mode 100644
index aa9bf8b03708..000000000000
--- a/editors/openoffice-4/files/patch-canvas_source_cairo_makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- canvas/source/cairo/makefile.mk.orig	2021-04-02 12:58:20 UTC
-+++ canvas/source/cairo/makefile.mk
-@@ -49,7 +49,7 @@ DLLPRE =
- 
- 
- .IF "$(SYSTEM_CAIRO)" == "YES"
--CFLAGS+=$(CAIRO_CFLAGS)
-+INCSYSTEM+=$(CAIRO_CFLAGS)
- .ELSE
- CFLAGS+=-I$(SOLARINCDIR)/cairo
- .ENDIF
diff --git a/editors/openoffice-4/files/patch-configure.ac b/editors/openoffice-4/files/patch-configure.ac
deleted file mode 100644
index e7b392f1aea2..000000000000
--- a/editors/openoffice-4/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2025-04-12 20:16:51 UTC
-+++ configure.ac
-@@ -3377,7 +3377,7 @@ if test "$enable_epm" = "yes"; then
-    dnl ===================================================================
-    dnl Check for epm - not needed for windows
-    dnl ===================================================================
--   if test "$_os" != "WINNT"; then
-+   if test "$_os" != "WINNT" -a "$with_package_format" != "archive"; then
-       if test -n "$with_epm"; then
- 	      EPM=$with_epm
-       else
diff --git a/editors/openoffice-4/files/patch-connectivity_source_drivers_evoab2_makefile.mk b/editors/openoffice-4/files/patch-connectivity_source_drivers_evoab2_makefile.mk
deleted file mode 100644
index c82be1905eaa..000000000000
--- a/editors/openoffice-4/files/patch-connectivity_source_drivers_evoab2_makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- connectivity/source/drivers/evoab2/makefile.mk.orig	2020-10-06 14:16:17 UTC
-+++ connectivity/source/drivers/evoab2/makefile.mk
-@@ -41,7 +41,7 @@ PKGCONFIG_MODULES=gtk+-2.0
- PKGCONFIG_MODULES=gtk+-2.0
- .INCLUDE : pkg_config.mk
- 
--CFLAGS+=$(GOBJECT_CFLAGS)
-+INCSYSTEM+=$(GOBJECT_CFLAGS)
- 
- # --- Files -------------------------------------
- 
diff --git a/editors/openoffice-4/files/patch-connectivity_source_drivers_kab_makefile.mk b/editors/openoffice-4/files/patch-connectivity_source_drivers_kab_makefile.mk
deleted file mode 100644
index e53a78202a13..000000000000
--- a/editors/openoffice-4/files/patch-connectivity_source_drivers_kab_makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- connectivity/source/drivers/kab/makefile.mk.orig	2021-04-02 12:58:20 UTC
-+++ connectivity/source/drivers/kab/makefile.mk
-@@ -38,7 +38,7 @@ VISIBILITY_HIDDEN=TRUE
- .IF "$(GUI)" == "UNX"
- .IF "$(ENABLE_KAB)" == "TRUE"
- 
--CFLAGS+=$(KDE_CFLAGS)
-+INCSYSTEM+=$(KDE_CFLAGS)
- 
- .IF "$(KDE_ROOT)"!=""
- EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib
diff --git a/editors/openoffice-4/files/patch-forms_source_xforms_submission_makefile.mk b/editors/openoffice-4/files/patch-forms_source_xforms_submission_makefile.mk
deleted file mode 100644
index 29d5e45ec891..000000000000
--- a/editors/openoffice-4/files/patch-forms_source_xforms_submission_makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- forms/source/xforms/submission/makefile.mk.orig	2020-10-06 14:16:22 UTC
-+++ forms/source/xforms/submission/makefile.mk
-@@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS=TRUE
- .INCLUDE: $(PRJ)$/makefile.pmk
- 
- .IF "$(SYSTEM_LIBXML)" == "YES"
--CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-+INCSYSTEM+=$(LIBXML_CFLAGS)
-+CFLAGS+=-DSYSTEM_LIBXML
- .ENDIF
- 
- # --- Files --------------------------------------------------------
diff --git a/editors/openoffice-4/files/patch-forms_source_xforms_xpathlib_makefile.mk b/editors/openoffice-4/files/patch-forms_source_xforms_xpathlib_makefile.mk
deleted file mode 100644
index 89c9ff106212..000000000000
--- a/editors/openoffice-4/files/patch-forms_source_xforms_xpathlib_makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- forms/source/xforms/xpathlib/makefile.mk.orig	2020-10-06 14:16:22 UTC
-+++ forms/source/xforms/xpathlib/makefile.mk
-@@ -36,7 +36,8 @@ INCPRE+=$(PRJ)$/source$/inc
- INCPRE+=$(PRJ)$/source$/inc
- 
- .IF "$(SYSTEM_LIBXML)" == "YES"
--CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-+INCSYSTEM+=$(LIBXML_CFLAGS)
-+CFLAGS+=-DSYSTEM_LIBXML
- .ENDIF
- 
- # --- Files --------------------------------------------------------
diff --git a/editors/openoffice-4/files/patch-fpicker_source_unx_gnome_makefile.mk b/editors/openoffice-4/files/patch-fpicker_source_unx_gnome_makefile.mk
deleted file mode 100644
index 6f79e6eb7be9..000000000000
--- a/editors/openoffice-4/files/patch-fpicker_source_unx_gnome_makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- fpicker/source/unx/gnome/makefile.mk.orig	2021-04-02 12:58:21 UTC
-+++ fpicker/source/unx/gnome/makefile.mk
-@@ -56,7 +56,7 @@ CFLAGS+= $(WIDGETSET_CFLAGS)
- .ELSE
- 
- CFLAGS+= $(WIDGETSET_CFLAGS)
--CFLAGS+= $(PKGCONFIG_CFLAGS)
-+INCSYSTEM+= $(PKGCONFIG_CFLAGS)
- 
- # --- Files --------------------------------------------------------
- 
diff --git a/editors/openoffice-4/files/patch-fpicker_source_unx_kde4_makefile.mk b/editors/openoffice-4/files/patch-fpicker_source_unx_kde4_makefile.mk
deleted file mode 100644
index 669e096bb2a3..000000000000
--- a/editors/openoffice-4/files/patch-fpicker_source_unx_kde4_makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- fpicker/source/unx/kde4/makefile.mk.orig	2021-04-02 12:58:21 UTC
-+++ fpicker/source/unx/kde4/makefile.mk
-@@ -43,7 +43,7 @@ dummy:
- 
- .ELSE # we build for KDE
- 
--CFLAGS+= $(KDE4_CFLAGS)
-+INCSYSTEM+= $(KDE4_CFLAGS)
- 
- # --- Files --------------------------------------------------------
- 
diff --git a/editors/openoffice-4/files/patch-jvmfwk_source_makefile.mk b/editors/openoffice-4/files/patch-jvmfwk_source_makefile.mk
deleted file mode 100644
index 8a06fc9f2166..000000000000
--- a/editors/openoffice-4/files/patch-jvmfwk_source_makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- jvmfwk/source/makefile.mk.orig	2021-04-02 12:58:21 UTC
-+++ jvmfwk/source/makefile.mk
-@@ -34,7 +34,8 @@ UNIXVERSIONNAMES = UDK
- .INCLUDE: settings.mk
- 
- .IF "$(SYSTEM_LIBXML)" == "YES"
--CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-+INCSYSTEM+=$(LIBXML_CFLAGS)
-+CFLAGS+=-DSYSTEM_LIBXML
- .ENDIF
- 
- UNOUCROUT = $(OUT)$/inc
diff --git a/editors/openoffice-4/files/patch-l10ntools_source_help_makefile.mk b/editors/openoffice-4/files/patch-l10ntools_source_help_makefile.mk
deleted file mode 100644
index b56a1e8dc100..000000000000
--- a/editors/openoffice-4/files/patch-l10ntools_source_help_makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- l10ntools/source/help/makefile.mk.orig	2020-10-06 14:16:24 UTC
-+++ l10ntools/source/help/makefile.mk
-@@ -34,7 +34,7 @@ TARGETTYPE=CUI
- .INCLUDE : helplinker.pmk
-  
- .IF "$(SYSTEM_LIBXSLT)" == "YES"
--CFLAGS+= $(LIBXSLT_CFLAGS)
-+INCSYSTEM+= $(LIBXSLT_CFLAGS)
- .ELSE
- LIBXSLTINCDIR=external$/libxslt
- CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
diff --git a/editors/openoffice-4/files/patch-oox_source_core_makefile.mk b/editors/openoffice-4/files/patch-oox_source_core_makefile.mk
deleted file mode 100644
index 732f8945a87d..000000000000
--- a/editors/openoffice-4/files/patch-oox_source_core_makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- oox/source/core/makefile.mk.orig	2021-04-02 12:58:21 UTC
-+++ oox/source/core/makefile.mk
-@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
- .INCLUDE: $(PRJ)$/util$/makefile.pmk
- 
- .IF "$(SYSTEM_OPENSSL)" == "YES"
--CFLAGS+= $(OPENSSL_CFLAGS)
-+INCSYSTEM+= $(OPENSSL_CFLAGS)
- .ENDIF
- 
- # --- Files --------------------------------------------------------
diff --git a/editors/openoffice-4/files/patch-pyuno_source_loader_makefile.mk b/editors/openoffice-4/files/patch-pyuno_source_loader_makefile.mk
deleted file mode 100644
index ac2cfb0180c7..000000000000
--- a/editors/openoffice-4/files/patch-pyuno_source_loader_makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- pyuno/source/loader/makefile.mk.orig	2020-10-06 14:16:27 UTC
-+++ pyuno/source/loader/makefile.mk
-@@ -41,7 +41,7 @@ PYTHONLIB=$(PYTHON_LIBS)
- 
- .IF "$(SYSTEM_PYTHON)" == "YES"
- PYTHONLIB=$(PYTHON_LIBS)
--CFLAGS+=$(PYTHON_CFLAGS)
-+INCSYSTEM+=$(PYTHON_CFLAGS)
- .IF "$(EXTRA_CFLAGS)"!=""
- PYTHONLIB+=-framework Python
- .ENDIF # "$(EXTRA_CFLAGS)"!=""
diff --git a/editors/openoffice-4/files/patch-pyuno_source_module_makefile.mk b/editors/openoffice-4/files/patch-pyuno_source_module_makefile.mk
deleted file mode 100644
index a2ffb4a5af1b..000000000000
--- a/editors/openoffice-4/files/patch-pyuno_source_module_makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- pyuno/source/module/makefile.mk.orig	2020-10-06 14:16:27 UTC
-+++ pyuno/source/module/makefile.mk
-@@ -60,7 +60,7 @@ PYTHONLIB=$(PYTHON_LIBS)
- 
- .IF "$(SYSTEM_PYTHON)" == "YES"
- PYTHONLIB=$(PYTHON_LIBS)
--CFLAGS+=$(PYTHON_CFLAGS)
-+INCSYSTEM+=$(PYTHON_CFLAGS)
- .ELSE # "$(SYSTEM_PYTHON)" == "YES"
- .INCLUDE :  pyversion.mk
- CFLAGS+=-I$(SOLARINCDIR)$/python
diff --git a/editors/openoffice-4/files/patch-sccomp_source_solver_makefile.mk b/editors/openoffice-4/files/patch-sccomp_source_solver_makefile.mk
deleted file mode 100644
index 5160a24da180..000000000000
--- a/editors/openoffice-4/files/patch-sccomp_source_solver_makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- sccomp/source/solver/makefile.mk.orig	2021-04-02 12:58:22 UTC
-+++ sccomp/source/solver/makefile.mk
-@@ -66,7 +66,8 @@ DEF1NAME=       $(SHL1TARGET)
- DEF1NAME=       $(SHL1TARGET)
- 
- .IF "$(SYSTEM_COINMP)" == "YES"
--CFLAGS+= $(COINMP_CFLAGS) -DSYSTEM_COINMP
-+INCSYSTEM+= $(COINMP_CFLAGS)
-+CFLAGS+= -DSYSTEM_COINMP
- # Use the library flags from configure
- SHL1STDLIBS+=$(COINMP_LIBS)
- .ELSE
diff --git a/editors/openoffice-4/files/patch-set_soenv.in b/editors/openoffice-4/files/patch-set_soenv.in
deleted file mode 100644
index a5072d9bcb71..000000000000
--- a/editors/openoffice-4/files/patch-set_soenv.in
+++ /dev/null
@@ -1,67 +0,0 @@
---- set_soenv.in	2021-04-02 08:58:22.000000000 -0400
-+++ set_soenv.in	2021-04-17 14:43:53.000000000 -0400
-@@ -408,46 +403,26 @@
-       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
-       $EPM_FLAGS      = "-a arm";
-    }
--   elsif ($platform =~ m/^powerpc/)
--   {
--      if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
--         print "Setting FreeBSD PPC64 specific values... ";
--         $outfile = "FreeBSDPPC64Env.Set"; 
--         $OUTPATH = "unxfbsdppc64";
--         $CPUNAME = "POWERPC64";
--
--         if ( $JDK eq "gcj" ) {
--            $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
--            $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
--            $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
--         }
--      }
--      else {
--         print "Setting FreeBSD PPC specific values... ";
--         $outfile = "FreeBSDPPCEnv.Set"; 
--         $OUTPATH = "unxlngppc";
--         $CPUNAME = "POWERPC";
--
--         if ( $JDK eq "gcj" ) {
--            $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
--            $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
--            $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
--         elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
--         {  $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
--            $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
--            $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
--         }
--	 # OpenJDK
--	 elsif ($JDK =~ m/sun/) {
--	    $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
--	    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."server";
--	    $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
--	 }
--      }
--
-+   elsif (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8'))
-+   {  print "Setting FreeBSD PPC64 specific values... ";
-+      $outfile        = "FreeBSDPPC64Env.Set"; 
-       $CPU            = "P";
--
-+      $CPUNAME        = "POWERPC64";
-+      $OUTPATH        = "unxfbsdppc64";
-+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
-+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."server";
-+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
-    }
-+   elsif ($platform =~ m/powerpc/)
-+   {  print "Setting FreeBSD PPC specific values... ";
-+      $outfile        = "FreeBSDPPCEnv.Set"; 
-+      $CPU            = "P";
-+      $CPUNAME        = "POWERPC";
-+      $OUTPATH        = "unxfbsdppc";
-+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
-+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
-+   }
-    else
-    {  print "Unsupported FreeBSD architecture: $platform \n";
-          exit 1;
diff --git a/editors/openoffice-4/files/patch-shell_source_backends_kde4be_makefile.mk b/editors/openoffice-4/files/patch-shell_source_backends_kde4be_makefile.mk
deleted file mode 100644
index 4ddcef72e029..000000000000
--- a/editors/openoffice-4/files/patch-shell_source_backends_kde4be_makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- shell/source/backends/kde4be/makefile.mk.orig	2020-10-06 14:16:31 UTC
-+++ shell/source/backends/kde4be/makefile.mk
-@@ -45,7 +45,7 @@ DLLPRE =
- 
- .IF "$(ENABLE_KDE4)" == "TRUE"
- 
--CFLAGS+=$(KDE4_CFLAGS)
-+INCSYSTEM+=$(KDE4_CFLAGS)
- 
- # --- Files ---
- 
diff --git a/editors/openoffice-4/files/patch-shell_source_backends_kdebe_makefile.mk b/editors/openoffice-4/files/patch-shell_source_backends_kdebe_makefile.mk
deleted file mode 100644
index 057fc4e09b35..000000000000
--- a/editors/openoffice-4/files/patch-shell_source_backends_kdebe_makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- shell/source/backends/kdebe/makefile.mk.orig	2020-10-06 14:16:31 UTC
-+++ shell/source/backends/kdebe/makefile.mk
-@@ -45,7 +45,7 @@ DLLPRE =
- 
- .IF "$(ENABLE_KDE)" == "TRUE"
- 
--CFLAGS+=$(KDE_CFLAGS)
-+INCSYSTEM+=$(KDE_CFLAGS)
- 
- # --- Files ---
- 
diff --git a/editors/openoffice-4/files/patch-solenv_inc_target.mk b/editors/openoffice-4/files/patch-solenv_inc_target.mk
deleted file mode 100644
index 959c7d0c0950..000000000000
--- a/editors/openoffice-4/files/patch-solenv_inc_target.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- solenv/inc/target.mk.orig	2021-04-02 12:58:22 UTC
-+++ solenv/inc/target.mk
-@@ -57,9 +57,9 @@ INCLUDE:=
- INCLUDE:=
- .EXPORT : INCLUDE
- .IF "$(PRJINC)"!=""
--INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
-+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) $(INCSYSTEM)
- .ELSE		# "$(PRJINC)"!=""
--INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
-+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) $(INCSYSTEM)
- .ENDIF		# "$(PRJINC)"!=""
- INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
- .EXPORT : LIB
diff --git a/editors/openoffice-4/files/patch-ucb_source_ucp_webdav_makefile.mk b/editors/openoffice-4/files/patch-ucb_source_ucp_webdav_makefile.mk
deleted file mode 100644
index 5c5310cd36e1..000000000000
--- a/editors/openoffice-4/files/patch-ucb_source_ucp_webdav_makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
---- ucb/source/ucp/webdav/makefile.mk.orig	2021-04-02 12:58:23 UTC
-+++ ucb/source/ucp/webdav/makefile.mk
-@@ -56,7 +56,7 @@ SERFINCDIR=serf
- #
- 
- .IF "$(SYSTEM_APR)" == "YES"
--CFLAGS+= $(APR_CFLAGS)
-+INCSYSTEM+= $(APR_CFLAGS)
- SHL1STDLIBS+=$(APR_LIBS)
- .ELSE
- CFLAGS+= -I$(SOLARINCDIR)$/$(APRINCDIR)
-@@ -67,7 +67,7 @@ CFLAGS+=\
- .ENDIF
- 
- .IF "$(SYSTEM_APR_UTIL)" == "YES"
--CFLAGS+= $(APR_UTIL_CFLAGS)
-+INCSYSTEM+= $(APR_UTIL_CFLAGS)
- SHL1STDLIBS+=$(APR_UTIL_LIBS)
- .ELSE
- CFLAGS+= -I$(SOLARINCDIR)$/$(APRUTILINCDIR)
-@@ -78,7 +78,7 @@ CFLAGS+=\
- .ENDIF
- 
- .IF "$(SYSTEM_SERF)" == "YES"
--CFLAGS+= $(SERF_CFLAGS)
-+INCSYSTEM+= $(SERF_CFLAGS)
- SHL1STDLIBS+=$(SERF_LIBS)
- .ELSE
- CFLAGS+= -I$(SOLARINCDIR)$/$(SERFINCDIR)
-@@ -89,14 +89,14 @@ CFLAGS+=\
- .ENDIF
- 
- .IF "$(SYSTEM_LIBXML)" == "YES"
--CFLAGS+= $(LIBXML_CFLAGS)
-+INCSYSTEM+= $(LIBXML_CFLAGS)
- .ELSE
- LIBXMLINCDIR=external$/libxml
- CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
- .ENDIF
- 
- .IF "$(SYSTEM_OPENSSL)" == "YES"
--CFLAGS+= -I$(OPENSSL_CFLAGS)
-+INCSYSTEM+= -I$(OPENSSL_CFLAGS)
- SHL1STDLIBS+= $(OPENSSLLIB)
- .ELSE
- SHL1STDLIBS+= $(OPENSSLLIBST)
diff --git a/editors/openoffice-4/files/patch-unoxml_source_xpath_xpathapi.cxx b/editors/openoffice-4/files/patch-unoxml_source_xpath_xpathapi.cxx
deleted file mode 100644
index e81aaf1c06f8..000000000000
--- a/editors/openoffice-4/files/patch-unoxml_source_xpath_xpathapi.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
---- unoxml/source/xpath/xpathapi.cxx.orig	2020-10-06 14:16:35 UTC
-+++ unoxml/source/xpath/xpathapi.cxx
-@@ -267,7 +267,11 @@ namespace XPath
-         return selectSingleNode(contextNode, expr);
-     }
- 
--    static OUString make_error_message(xmlErrorPtr pError)
-+#if LIBXML_VERSION >= 21200
-+    static OUString make_error_message(const xmlError *pError)
-+#else
-+    static OUString make_error_message(xmlError *pError)
-+#endif
-     {
-         ::rtl::OUStringBuffer buf;
-         if (pError->message) {
-@@ -312,7 +316,11 @@ namespace XPath
-             OSL_ENSURE(sal_False, msg.getStr());
-         }
- 
--        static void structured_error_func(void * userData, xmlErrorPtr error)
-+#if LIBXML_VERSION >= 21200
-+        static void structured_error_func(void * userData, const xmlError *error)
-+#else
-+        static void structured_error_func(void * userData, xmlError *error)
-+#endif
-         {
-             (void) userData;
-             ::rtl::OUStringBuffer buf(
diff --git a/editors/openoffice-4/files/patch-vcl_unx_generic_fontmanager_fontconfig.cxx b/editors/openoffice-4/files/patch-vcl_unx_generic_fontmanager_fontconfig.cxx
deleted file mode 100644
index 8806abdb1e3b..000000000000
--- a/editors/openoffice-4/files/patch-vcl_unx_generic_fontmanager_fontconfig.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- vcl/unx/generic/fontmanager/fontconfig.cxx.orig	2020-10-06 14:16:35 UTC
-+++ vcl/unx/generic/fontmanager/fontconfig.cxx
-@@ -456,6 +456,7 @@ void FontCfgWrapper::addFontSet( FcSetName eSetName )
- 		if( m_nFcVersion > 20400 ) // #i115204# avoid trouble with old FC versions
- 		{
- 			FcPattern* pTestPattern = FcPatternDuplicate( pOrigPattern );
-+            FcDefaultSubstitute( pTestPattern );
- 			FcPatternAddBool( pTestPattern, FC_OUTLINE, FcTrue );
- 			// TODO: ignore all attributes that are not interesting for finding dupes
- 			//       e.g. by using pattern->ImplFontAttr->pattern conversion
diff --git a/editors/openoffice-4/files/patch-writerfilter_source_ooxml_RefAndPointer.hxx b/editors/openoffice-4/files/patch-writerfilter_source_ooxml_RefAndPointer.hxx
deleted file mode 100644
index ca7a35f3d1e8..000000000000
--- a/editors/openoffice-4/files/patch-writerfilter_source_ooxml_RefAndPointer.hxx
+++ /dev/null
@@ -1,24 +0,0 @@
---- writerfilter/source/ooxml/RefAndPointer.hxx.orig	2021-04-02 12:58:23 UTC
-+++ writerfilter/source/ooxml/RefAndPointer.hxx
-@@ -98,13 +98,14 @@ class RefAndPointer (public)
-     ChildClass * getPointer() const { return mpHandler; }
-     const uno::Reference<Interface> getRef() const { return mRef; }
- 
--    RefAndPointer & operator=
--    (const RefAndPointer & rSrc)
--    {
--        set(rSrc.getHandler());
--
--        return *this;
--    }
-+// ...RefAndPointer.hxx:104:18: error: no member named 'getHandler' in 'RefAndPointer<Interface, ChildClass>'; did you mean 'mpHandler'?
-+//    RefAndPointer & operator=
-+//    (const RefAndPointer & rSrc)
-+//    {
-+//        set(rSrc.getHandler());
-+//
-+//        return *this;
-+//    }
- 
-     bool is() { return getRef().is(); }
- 
diff --git a/editors/openoffice-4/files/patch-xmlhelp_source_cxxhelp_provider_makefile.mk b/editors/openoffice-4/files/patch-xmlhelp_source_cxxhelp_provider_makefile.mk
deleted file mode 100644
index 946e39cd7cae..000000000000
--- a/editors/openoffice-4/files/patch-xmlhelp_source_cxxhelp_provider_makefile.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- xmlhelp/source/cxxhelp/provider/makefile.mk.orig	2021-04-02 12:58:23 UTC
-+++ xmlhelp/source/cxxhelp/provider/makefile.mk
-@@ -49,14 +49,14 @@ CFLAGS +=  -DHAVE_EXPAT_H
- CFLAGS +=  -DHAVE_EXPAT_H
- 
- .IF "$(SYSTEM_LIBXML)" == "YES"
--CFLAGS+= $(LIBXML_CFLAGS)
-+INCSYSTEM+= $(LIBXML_CFLAGS)
- .ELSE
- LIBXMLINCDIR=external$/libxml
- CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
- .ENDIF
- 
- .IF "$(SYSTEM_LIBXSLT)" == "YES"
--CFLAGS+= $(LIBXSLT_CFLAGS)
-+INCSYSTEM+= $(LIBXSLT_CFLAGS)
- .ELSE
- LIBXSLTINCDIR=external$/libxslt
- CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
diff --git a/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_makefile.mk b/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_makefile.mk
deleted file mode 100644
index bb8fb3f26f79..000000000000
--- a/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- xmlsecurity/source/xmlsec/makefile.mk.orig	2020-10-06 14:16:36 UTC
-+++ xmlsecurity/source/xmlsec/makefile.mk
-@@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS = TRUE
- .INCLUDE :	$(PRJ)$/util$/target.pmk
- 
- .IF "$(SYSTEM_LIBXML)" == "YES"
--CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-+INCSYSTEM+=$(LIBXML_CFLAGS)
-+CFLAGS+=-DSYSTEM_LIBXML
- .ENDIF
- 
- .IF "$(ENABLE_NSS_MODULE)"!="YES"
diff --git a/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk b/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk
deleted file mode 100644
index b366deb73a49..000000000000
--- a/editors/openoffice-4/files/patch-xmlsecurity_source_xmlsec_nss_makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- xmlsecurity/source/xmlsec/nss/makefile.mk.orig	2021-04-02 12:58:23 UTC
-+++ xmlsecurity/source/xmlsec/nss/makefile.mk
-@@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS = TRUE
- .INCLUDE :	$(PRJ)$/util$/target.pmk
- 
- .IF "$(SYSTEM_LIBXML)" == "YES"
--CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-+INCSYSTEM+=$(LIBXML_CFLAGS)
-+CFLAGS+=-DSYSTEM_LIBXML
- .ENDIF
- 
- .IF "$(ENABLE_NSS_MODULE)"!="YES"