diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index 95e6d692d36f..d7bf35a7823f 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -1,530 +1,530 @@
 # Created by: Martin Blapp
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	editors java
 MASTER_SITES=	https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \
 		https://archive.apache.org/dist/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
 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
 
 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					\
 		epm:devel/epm						\
 		${LOCALBASE}/bin/gperf:devel/gperf			\
 		imake:devel/imake					\
 		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				\
 		libpng.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/ipopt				\
 		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 jpeg perl5 pkgconfig \
 		shared-mime-info ssl tar:bzip2 xorg
 USE_GL=		gl glu
 USE_GNOME=	gtk20 libxslt libidl glib20
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
 JAVA_RUN=	jdk
 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=	11
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO4111m1\(Build:9808\)
 GITREVISION=	bdb20b2a64
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
 AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
 AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
 AOOSUFFIX=	${PORTVERSION}
 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 defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 
 .include <${FILESDIR}/Makefile.localized>
 
 PYTHON_DISTFILE=	38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz
 GCC_EXTRA_DISTFILES=	d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
 			d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-system-boost
 BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 . if ${COMPILER_VERSION} < 130
 CONFIGURE_ARGS+=	--with-system-vigra
 BUILD_DEPENDS+=	${LOCALBASE}/bin/vigra-config:graphics/vigra
 . endif
 . if ${ARCH} == amd64
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-align16
 . endif
 .endif
 
 # These extra distfiles are needed to use the bundled versions of
 # boost and vigra for compatiblity with gcc.  Also include them
 # for the makesum target so they are included in distinfo
 .if ${CHOSEN_COMPILER_TYPE} == gcc || ${COMPILER_VERSION} >= 130 || \
 	make(makesum) || make(distclean)
 DISTFILES+=		${GCC_EXTRA_DISTFILES:C/.*/&:sf/g}
 .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} \
 		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-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-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}
 .if ${CHOSEN_COMPILER_TYPE} == gcc || ${COMPILER_VERSION} >= 130 
 .  for f in ${GCC_EXTRA_DISTFILES}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f}
 .  endfor
 .endif
 	${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
 
 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-devel/Makefile b/editors/openoffice-devel/Makefile
index 7118d540cb49..a5e03b82902f 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -1,532 +1,532 @@
 # Created by: Martin Blapp
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP}
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	editors java
 MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
 		LOCAL/truckman/openoffice:snap,extsrc \
 		SF/oooextras.mirror/:sf
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=		${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX=		-${LANG_SUFFIX}
 .endif
 PKGNAMESUFFIX=		-devel
 DISTFILES=	${AOOSRC}${AOODISTTAG} ${EXTSRC}:extsrc
 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 (developer version)
 
 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
 BROKEN_powerpc64=	fails to compile: aoo-4.2.0/main/solver/420/unxfbsdppc64.pro/inc/stl/vector:31:11: fatal error: boost/tr1/tr1/vector: No such file or directory
 
 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					\
 		epm:devel/epm						\
 		${LOCALBASE}/bin/gperf:devel/gperf			\
 		imake:devel/imake					\
 		gpatch:devel/patch					\
 		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends	\
 		${JAVALIBDIR}/commons-lang3.jar:java/apache-commons-lang3 \
 		${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				\
 		libpng.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/ipopt				\
 		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-lang3.jar:java/apache-commons-lang3 \
 		${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 jpeg perl5 pkgconfig \
 		python:3.7 shared-mime-info ssl tar:${TARTYPE} xorg
 USE_GL=		gl glu
 USE_GNOME=	gtk20 libxslt libidl glib20
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
 JAVA_RUN=	jdk
 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-4*
 
 AOOVERSION1=	4
 AOOVERSION2=	2
 AOOVERSION3=	0
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO420m4\(Build:9823\)
 GITREVISION=	febe0adc7c
 TIMESTAMP=	1633255994
 #AOORC=rc3
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
 AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
 AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
 .if defined(AOORC)
 AOOSUFFIX=	${AOOVERSION}-${AOORC}
 AOOSRC=		apache-openoffice-${AOOVERSION}-${GITREVISION}-src${EXTRACT_SUFX}
 AOODISTTAG=
 TARTYPE=	bzip2
 .else
 AOOSUFFIX=	${PORTVERSION}
 AOOSRC=		apache-openoffice-${TIMESTAMP}-${GITREVISION}-src${EXTRACT_SUFX}
 AOODISTTAG=	:snap
 TARTYPE=	xz
 .endif
 
 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 MMEDIA \
 			MYSQL PDFIMPORT REPORT_BUILDER SDK WIKI_PUBLISHER
 OPTIONS_DEFAULT=	CUPS GNOME MMEDIA 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
 MMEDIA_DESC=		Multimedia backend for impress
 MYSQL_DESC=		Build MySQL Connector extension
 PDFIMPORT_DESC=		Build and install PDF import extension
 REPORT_BUILDER_DESC=	Build and install Report builder extension (Broken)
 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
 
 MMEDIA_CONFIGURE_ENABLE=	gstreamer
 MMEDIA_USE=			GSTREAMER1=yes
 
 MYSQL_CONFIGURE_ENABLE=		mysql-connector
 MYSQL_CONFIGURE_WITH=		system-mysql
 MYSQL_LIB_DEPENDS=		libmysqlcppconn.so:databases/mysql-connector-c++
 MYSQL_USES=			mysql
 
 SDK_CONFIGURE_ENABLE=		odk
 SDK_DISTFILES=			unowinreg.dll:unoreg
 
 PDFIMPORT_BROKEN=		PDFIMPORT is not compatible with poppler-0.7x API
 PDFIMPORT_CONFIGURE_ENABLE=	pdfimport
 
 REPORT_BUILDER_BROKEN=		REPORT_BUILDER option requires additional .jar files
 REPORT_BUILDER_CONFIGURE_ENABLE=	report-builder
 REPORT_BUILDER_JAR_DEPENDS=
 REPORT_BUILDER_BUILD_DEPENDS=	${REPORT_BUILDER_JAR_DEPENDS}
 REPORT_BUILDER_RUN_DEPENDS=	${REPORT_BUILDER_JAR_DEPENDS}
 
 WIKI_PUBLISHER_CONFIGURE_ENABLE=	wiki-publisher
 WIKI_PUBLISHER_CONFIGURE_WITH=						\
 	commons-codec-jar=${JAVALIBDIR}/commons-codec.jar		\
 	commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar
 WIKI_PUBLISHER_JAR_DEPENDS=						\
 	${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec	\
 	${JAVALIBDIR}/commons-httpclient.jar:java/apache-commons-httpclient
 WIKI_PUBLISHER_BUILD_DEPENDS=	${WIKI_PUBLISHER_JAR_DEPENDS}
 WIKI_PUBLISHER_RUN_DEPENDS=	${WIKI_PUBLISHER_JAR_DEPENDS}
 
 # 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 defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 
 .if ${PORT_OPTIONS:MREPORT_BUILDER} || ${PORT_OPTIONS:MWIKI_PUBLISHER}
 BUILD_DEPENDS+=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 RUN_DEPENDS+=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 CONFIGURE_ARGS+=	--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar
 .else
 CONFIGURE_ARGS+=	--without-commons-logging
 .endif
 
 .include <${FILESDIR}/Makefile.localized>
 
 GCC_EXTRA_DISTFILES=	d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
 			d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-system-boost
 BUILD_DEPENDS+=		${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 . if ${COMPILER_VERSION} < 130
 CONFIGURE_ARGS+=	--with-system-vigra
 BUILD_DEPENDS+=		${LOCALBASE}/bin/vigra-config:graphics/vigra
 . endif
 .endif
 
 # These extra distfiles are needed to use the bundled versions of
 # boost and vigra for compatiblity with gcc.  Also include them
 # for the makesum target so they are included in distinfo
 .if ${CHOSEN_COMPILER_TYPE} == gcc || ${COMPILER_VERSION} >= 130 || \
 	make(makesum) || make(distclean)
 DISTFILES+=		${GCC_EXTRA_DISTFILES:C/.*/&:sf/g}
 .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=*}
 
 GNU_CONFIGURE=	yes
 WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
 WRKSRC?=	${WRKSUBDIR}/main
 SUB_FILES=	pkg-message
 SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} \
 		PRINSTALLATION_BASEDIR=${PRINSTALLATION_BASEDIR}
 
 CONFIGURE_ARGS+=							\
 			--enable-gio					\
 			--disable-gnome-vfs				\
 			--disable-gconf					\
 			--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-lang3.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-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-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"			\
 			--with-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
 
 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}
 .if ${CHOSEN_COMPILER_TYPE} == gcc || ${COMPILER_VERSION} >= 130
 .  for f in ${GCC_EXTRA_DISTFILES}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f}
 .  endfor
 .endif
 	${CP} ${FILESDIR}/freebsd-aoo-intro-developer.png \
 		${WRKSRC}/default_images/introabout/intro.png
 	${CP} ${FILESDIR}/freebsd-aoo-about-developer.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}
 	${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}
 
 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}
 
 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
 	${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/math/asl/Makefile b/math/asl/Makefile
index 77fae840f7ad..40988e8efe57 100644
--- a/math/asl/Makefile
+++ b/math/asl/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	asl
 DISTVERSIONPREFIX=	releases/
-DISTVERSION=	1.4.4
+DISTVERSION=	2.0.0
 CATEGORIES=	math
 MASTER_SITES=	https://coin-or-tools.github.io/ThirdParty-ASL/:solvers
 PKGNAMEPREFIX=	coin-or-
 DISTFILES=	solvers-64919f75f.tgz:solvers
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	COIN-OR autotools harness to build AMPL Solver Library
 
 LICENSE=	EPL
 
 USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or-tools
 GH_PROJECT=	ThirdParty-ASL
 
 GNU_CONFIGURE=	yes
 
-INSTALL_TARGET=install-strip
+INSTALL_TARGET=	install-strip
 
 BINARY_ALIAS=	make=${GMAKE}
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc*} || ${ARCH} == riscv64
 CFLAGS+=	-DASL_NO_FP_INIT
 .endif
 
 post-extract:
 	@cd ${WRKSRC} && ${LN} -s ../solvers .
 
 post-patch: # patch the side project
 	@cd ${WRKSRC} && \
 		(${ECHO} "#include <sys/stat.h>" && cat solvers/funcadd1.c) > solvers/funcadd1.c.new && \
 		${MV} solvers/funcadd1.c.new solvers/funcadd1.c
 
 .include <bsd.port.mk>
diff --git a/math/asl/distinfo b/math/asl/distinfo
index f7d1c3f53933..e07efbec7b93 100644
--- a/math/asl/distinfo
+++ b/math/asl/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1643656607
+TIMESTAMP = 1645600598
 SHA256 (solvers-64919f75f.tgz) = e212926d1d797701adc901ef18eaab6b15edd13f9281dd8c9266e3cdaf8c2dd3
 SIZE (solvers-64919f75f.tgz) = 360043
-SHA256 (coin-or-tools-ThirdParty-ASL-releases-1.4.4_GH0.tar.gz) = dc742ec8ccec65f0af692879f3d51af76d743d5bcafac0714d01e15a6f9147ad
-SIZE (coin-or-tools-ThirdParty-ASL-releases-1.4.4_GH0.tar.gz) = 254368
+SHA256 (coin-or-tools-ThirdParty-ASL-releases-2.0.0_GH0.tar.gz) = b617b6d46a2722189dedef7c8013f7e21ebe677fe34cc6b62fabb1639fd3a96d
+SIZE (coin-or-tools-ThirdParty-ASL-releases-2.0.0_GH0.tar.gz) = 247662
diff --git a/math/asl/pkg-plist b/math/asl/pkg-plist
index a70c27def433..87e835ba355d 100644
--- a/math/asl/pkg-plist
+++ b/math/asl/pkg-plist
@@ -1,16 +1,16 @@
-include/coin/ThirdParty/arith.h
-include/coin/ThirdParty/asl.h
-include/coin/ThirdParty/asl_pfg.h
-include/coin/ThirdParty/asl_pfgh.h
-include/coin/ThirdParty/funcadd.h
-include/coin/ThirdParty/getstub.h
-include/coin/ThirdParty/nlp.h
-include/coin/ThirdParty/nlp2.h
-include/coin/ThirdParty/opcode.hd
-include/coin/ThirdParty/psinfo.h
-include/coin/ThirdParty/r_opn.hd
-include/coin/ThirdParty/stdio1.h
+include/coin-or/asl/arith.h
+include/coin-or/asl/asl.h
+include/coin-or/asl/asl_pfg.h
+include/coin-or/asl/asl_pfgh.h
+include/coin-or/asl/funcadd.h
+include/coin-or/asl/getstub.h
+include/coin-or/asl/nlp.h
+include/coin-or/asl/nlp2.h
+include/coin-or/asl/opcode.hd
+include/coin-or/asl/psinfo.h
+include/coin-or/asl/r_opn.hd
+include/coin-or/asl/stdio1.h
 lib/libcoinasl.so
-lib/libcoinasl.so.1
-lib/libcoinasl.so.1.4.4
+lib/libcoinasl.so.2
+lib/libcoinasl.so.2.0.0
 libdata/pkgconfig/coinasl.pc
diff --git a/math/bonmin/Makefile b/math/bonmin/Makefile
index dc42d16600ad..14b1580e6811 100644
--- a/math/bonmin/Makefile
+++ b/math/bonmin/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	bonmin
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	1.8.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Basic Open-source Nonlinear Mixed INteger programming
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/Bonmin/LICENSE
 
 LIB_DEPENDS=	libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libipopt.so:math/ipopt \
 		libopenblas.so:math/openblas
 
 USES=		blaslapack compiler:c++11-lang gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	Bonmin
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 TEST_TARGET=	test
 
 SUB_FILES=	${PORTNAME}.msc
 SUB_LIST=	PORTVERSION=${PORTVERSION}
 
 post-install:
 	# install MiniZinc configuration file
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/minizinc/solvers
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.msc ${STAGEDIR}${PREFIX}/share/minizinc/solvers
 
 .include <bsd.port.mk>
diff --git a/math/casadi/Makefile b/math/casadi/Makefile
index 17a8ddc0ba89..9e85dae657b7 100644
--- a/math/casadi/Makefile
+++ b/math/casadi/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	casadi
 DISTVERSION=	3.5.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Symbolic framework for numeric optimization
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		cmake compiler:c++11-lang pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-fPIC
 CXXFLAGS+=	-fPIC
 
 CMAKE_OFF=	WITH_DEEPBIND WITH_BUILD_BLASFEO
 
 # cmake-3.16: disable build of examples (they are not installed anyways),
 # and fail due to not setting up the linker environment properly:
 CMAKE_OFF+=	WITH_EXAMPLES
 
 OPTIONS_DEFINE=		BLASFEO BONMIN CLANG IPOPT LAPACK QPOASES
 OPTIONS_DEFAULT=	BLASFEO BONMIN IPOPT LAPACK QPOASES
 OPTIONS_SUB=		yes
 
 BLASFEO_DESC=		Build with BLASFEO
 BLASFEO_CMAKE_BOOL=	WITH_BLASFEO
 BLASFEO_BUILD_DEPENDS=	blasfeo>0:math/blasfeo
 
 BONMIN_DESC=		Build with Bonmin
 BONMIN_CMAKE_BOOL=	WITH_BONMIN
 BONMIN_USES=		blaslapack:netlib fortran
 BONMIN_LIB_DEPENDS=	libbonmin.so:math/bonmin \
 			libCbcSolver.so:math/cbc \
 			libCgl.so:math/cgl \
 			libClp.so:math/clp \
 			libcoinasl.so:math/asl \
 			libCoinUtils.so:math/coinutils \
 			libipopt.so:math/ipopt \
 			libnauty.so:math/nauty \
 			libopenblas.so:math/openblas \
 			libOsi.so:math/osi
 
 CLANG_DESC=		Build with clang for JIT
 CLANG_CMAKE_BOOL=	WITH_CLANG
 CLANG_BROKEN=		Fails to find clang
 
 IPOPT_DESC=		Build with IPopt
 IPOPT_CMAKE_BOOL=	WITH_IPOPT
 IPOPT_USES=		blaslapack:netlib fortran
 IPOPT_LIB_DEPENDS=	libipopt.so:math/ipopt
 
 LAPACK_DESC=		Build with LAPACK
 LAPACK_CMAKE_BOOL=	WITH_LAPACK
 LAPACK_USES=		blaslapack:openblas
 
 QPOASES_DESC=		Build with qpOASES
 QPOASES_CMAKE_BOOL=	WITH_QPOASES
 QPOASES_LIB_DEPENDS=	libopenblas.so:math/openblas
 QPOASES_IMPLIES=	LAPACK
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLANG}
 # use clang from ports because cmake can't find base llvm for JIT
 BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 RUN_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 CPP=		clang-cpp${LLVM_DEFAULT}
 CC=		clang${LLVM_DEFAULT}
 CXX=		clang++${LLVM_DEFAULT}
 .endif
 
 PORTSCOUT=	limit:^.*[1-9]\..* # prevent tags like ge2
 
 .include <bsd.port.mk>
diff --git a/math/cbc/Makefile b/math/cbc/Makefile
index cc8f0e07b0e9..843265e562c2 100644
--- a/math/cbc/Makefile
+++ b/math/cbc/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	cbc
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	2.10.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Coin-or Branch and Cut: mixed integer programming solver
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/Cbc/LICENSE
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libcoinmumps.so:math/ipopt \
 		libCoinUtils.so:math/coinutils \
 		liblapack.so:math/lapack \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi
 
 USES=		compiler:c++11-lang fortran gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	Cbc
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-nauty-lib="-L${LOCALBASE}/lib -lnauty" --with-nauty-incdir=${LOCALBASE}/include/nauty
 
 CONFLICTS_INSTALL=	libcouchbase # bin/cbc
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 .include <bsd.port.mk>
diff --git a/math/cgl-conic/Makefile b/math/cgl-conic/Makefile
index 3090f85222bf..93859d266089 100644
--- a/math/cgl-conic/Makefile
+++ b/math/cgl-conic/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	cgl-conic
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	1.0.0-6
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gc96de60
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Strategies for conic problems for COIN-OR Cut Generation
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libipopt.so:math/ipopt \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas \
 		libOsiConic.so:math/osi-conic \
 		libOsiIpopt.so:math/osiipopt \
 		libOsi.so:math/osi
 
 USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	aykutbulut
 GH_PROJECT=	CGL-CONIC
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/math/cgl/Makefile b/math/cgl/Makefile
index 3f31e2c86e09..56ae5bcf0259 100644
--- a/math/cgl/Makefile
+++ b/math/cgl/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	cgl
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	0.60.4
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of cut generators for COIN-OR packages that use cuts
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/Cgl/LICENSE
 
 LIB_DEPENDS=	libcoinasl.so:math/asl \
 		libblas.so:math/blas \
 		libcoinmetis.so:math/ipopt \
 		libCoinUtils.so:math/coinutils \
 		libClp.so:math/clp \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi
 
 USES=		compiler:c++11-lang gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	Cgl
 
 GNU_CONFIGURE=	yes
 
 TEST_TARGET=	test
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libCgl.so.*
 
 .include <bsd.port.mk>
diff --git a/math/clp/Makefile b/math/clp/Makefile
index 8951df549c13..f128b1fbe0d5 100644
--- a/math/clp/Makefile
+++ b/math/clp/Makefile
@@ -1,47 +1,47 @@
 # Created by: Robin Schilham
 
 PORTNAME=	Clp
 DISTVERSION=	1.17.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	https://www.coin-or.org/download/source/${PORTNAME}/
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	co9co9@gmail.com
 COMMENT=	Linear Programming Solver
 
 LICENSE=	EPL
 
 BUILD_DEPENDS=	coin-or-Data-Sample>0:math/coin-or-data-sample \
 		coin-or-Data-Netlib>0:math/coin-or-data-netlib
 LIB_DEPENDS=	libcoinasl.so:math/asl \
 		libcoinmumps.so:math/ipopt \
 		libCoinUtils.so:math/coinutils \
 		libOsi.so:math/osi
 RUN_DEPENDS=	coin-or-Data-Sample>0:math/coin-or-data-sample \
 		coin-or-Data-Netlib>0:math/coin-or-data-netlib
 
 USES=		blaslapack compiler:c++11-lang fortran libtool pathfix pkgconfig tar:tgz
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
 		--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" \
 		--with-osi-incdir="${LOCALBASE}/include/coin" --with-osi-lib="${LOCALBASE}/lib/libOsi.so" \
 		--with-coinutils-incdir="${LOCALBASE}/include/coin" --with-coinutils-lib="${LOCALBASE}/lib/libCoinUtils.so" \
 		--with-netlib-datadir="${LOCALBASE}/share/coin/Data/Netlib" \
 		--with-sample-datadir="${LOCALBASE}/share/coin/Data/Sample" \
 		--datadir=${DATADIR}
 
 TEST_TARGET=	unitTest
 TEST_WRKSRC=	${WRKSRC}/${PORTNAME}
 
 OPTIONS_DEFINE=	DEBUG DOCS
 PORTDOCS=	*
 
 CXXFLAGS+=	-ffast-math
 DEBUG_CXXFLAGS=	-fomit-frame-pointer
 
 .include <bsd.port.mk>
diff --git a/math/coinmp/Makefile b/math/coinmp/Makefile
index 667162c2e0b9..6980b0867f29 100644
--- a/math/coinmp/Makefile
+++ b/math/coinmp/Makefile
@@ -1,73 +1,73 @@
 # Created by: Pedro Giffuni
 
 PORTNAME=	CoinMP
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	1.8.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Optimization library with support for COIN-OR CLP, CBC, and CGL
 
 LICENSE=	CPL
 LICENSE_NAME=	Common Public License, Version 1.0
 LICENSE_FILE=	${WRKSRC}/CoinMP/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libcoinmumps.so:math/ipopt \
 		libCoinUtils.so:math/coinutils \
 		libopenblas.so:math/openblas
 
 USES=		compiler:c++11-lang libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	CoinMP
 
 GNU_CONFIGURE=	yes
 
 CXXFLAGS+=	-ffast-math
 
 PLIST_FILES=	include/coin/CoinMP.h \
 		include/coin/CoinMPConfig.h \
 		lib/libCoinMP.so \
 		lib/libCoinMP.so.1 \
 		lib/libCoinMP.so.1.8.4 \
 		libdata/pkgconfig/coinmp.pc
 
 OPTIONS_DEFINE=	DOCS FORTRAN GLPK
 
 FORTRAN_DESC=	Use BLAS/LAPACK with the Fortran interface
 GLPK_DESC=	GNU Linear Programming Kit support
 
 PORTDOCS=	*
 
 FORTRAN_USES=		fortran blaslapack
 FORTRAN_CONFIGURE_ON=	--with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
 			--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib"
 
 GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
 GLPK_CONFIGURE_ON=	--with-gmpl-incdir=${LOCALBASE}/include	\
 			--with-gmpl-lib="-L${LOCALBASE}/lib -lglpk"
 GLPK_CONFIGURE_OFF=	--disable-glpk-libcheck
 
 INSTALL_TARGET=	install-strip
 
 TEST_TARGET=	unitTest
 
 post-patch::
 	@${REINPLACE_CMD} \
 		-e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g' \
 		-e 's|addlibs_DATA = examples/Makefile examples/example.c||g' \
 		-e 's|DocInstallDir = $$(datadir)/coin/doc/$$(PACKAGE_NAME)|DocInstallDir = $$(datadir)/doc/CoinMP/$$(PACKAGE_NAME)|' \
 		-e 's|	$$(MAKE) $$(AM_MAKEFLAGS) install-data-hook||' \
 		${WRKSRC}/Makefile.in ${WRKSRC}/CoinMP/Makefile.in
 	@${REINPLACE_CMD} -e 's|addlibsdir = $$(DESTDIR)$$(datadir)/coin/doc/CoinMP|addlibsdir = |' ${WRKSRC}/CoinMP/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/math/couenne/Makefile b/math/couenne/Makefile
index 2685f534ec3c..4e50828b53b7 100644
--- a/math/couenne/Makefile
+++ b/math/couenne/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	couenne
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	0.5.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Convex Over and Under Envelopes for NonliNear Estimation
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/Couenne/LICENSE
 
 LIB_DEPENDS=	libbonmin.so:math/bonmin \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libipopt.so:math/ipopt \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi
 
 USES=		blaslapack:netlib fortran gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	Couenne
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-nauty-incdir=${LOCALBASE}/include/nauty --with-nauty-lib=${LOCALBASE}/lib/libnauty.so # see https://github.com/coin-or/Couenne/issues/58
 
 INSTALL_TARGET=	install-strip
 
 SUB_FILES=	${PORTNAME}.msc
 SUB_LIST=	PORTVERSION=${PORTVERSION}
 
 post-install:
 	# install MiniZinc configuration file
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/minizinc/solvers
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.msc ${STAGEDIR}${PREFIX}/share/minizinc/solvers
 
 .include <bsd.port.mk>
diff --git a/math/disco/Makefile b/math/disco/Makefile
index ba2c29ef1646..26109ac878df 100644
--- a/math/disco/Makefile
+++ b/math/disco/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	disco
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	1.0.0-33
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g68720be
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Discrete Conic Optimization Solver
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libnauty.a:math/nauty
 LIB_DEPENDS=	libAlps.so:math/alps \
 		libBcps.so:math/bcps \
 		libblas.so:math/blas \
 		libbonmin.so:math/bonmin \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libCglConic.so:math/cgl-conic \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libipopt.so:math/ipopt \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libOsiConic.so:math/osi-conic \
 		libOsiIpopt.so:math/osiipopt
 
 USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	DisCO
 
 GNU_CONFIGURE=	yes
 
 CONFLICTS_INSTALL=	disco mono mono[0-9]*
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/math/gravity/Makefile b/math/gravity/Makefile
index 340e9aa3596b..53256a0466a1 100644
--- a/math/gravity/Makefile
+++ b/math/gravity/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	gravity
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.20210512
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Mathematical modeling for optimization and machine learning
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/adjacency_list.hpp:devel/boost-libs \
 		gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT} # not sure why does it need gcc, maybe for libquadmath.so
 LIB_DEPENDS=	libblas.so:math/blas \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libipopt.so:math/ipopt \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas
 RUN_DEPENDS=	gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT}
 
 USES=		cmake compiler:c++11-lang eigen:3 localbase:ldflags pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	Gravity
 GH_TAGNAME=	da941e9
 
 CMAKE_ARGS+=	-DIPOPT_ROOT_DIR=${LOCALBASE}
 CMAKE_ON=	Boost Ipopt
 
 LDFLAGS+=	-L${LOCALBASE}/lib/gcc${GCC_DEFAULT}
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_EXAMPLES:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${WRKSRC}/bin/Release/gravity_test
 
 .include <bsd.port.mk>
diff --git a/math/ipopt/Makefile b/math/ipopt/Makefile
index 9c94d03e5fa9..fd555f6c077d 100644
--- a/math/ipopt/Makefile
+++ b/math/ipopt/Makefile
@@ -1,66 +1,66 @@
 # Created by: Pedro Giffuni
 
 PORTNAME=	Ipopt
 DISTVERSION=	3.12.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	https://www.coin-or.org/download/source/Ipopt/ \
 		http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD/:metis \
 		http://mumps.enseeiht.fr/:mumps
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		metis-4.0.3.tar.gz:metis MUMPS_4.10.0.tar.gz:mumps
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Software package for large-scale nonlinear optimization
 
 LICENSE=	EPL
 
 LIB_DEPENDS=	libcoinasl.so:math/asl
 
 USES=		blaslapack compiler:c++11-lang fortran libtool pathfix \
 		pkgconfig tar:tgz
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 TEST_TARGET=	test
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ENV+=	PKG_CONFIG_PATH=${PREFIX}/libdata/pkgconfig \
 		CXX="${CXX} -B${LOCALBASE}/bin"
 CONFIGURE_ARGS=	--with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib"	\
 		--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib"
 
 CXXFLAGS+=	-ffast-math
 DEBUG_CXXFLAGS=	-fomit-frame-pointer
 
 DOCSDIR=	${PREFIX}/share/coin/doc/${PORTNAME}
 
 OPTIONS_DEFINE=		DEBUG DOCS
 
 DOCS_ALL_TARGET=	all doxydoc
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 PORTDOCS=		*
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1)
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 post-extract:
 	@(${ECHO} "Extracting Metis and Mumps ThirdParty libraries ..." )
 	@(cd ${WRKSRC}/ThirdParty/Metis && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/metis-4.0.3.tar.gz ${EXTRACT_AFTER_ARGS});
 	@(${MV} ${WRKSRC}/ThirdParty/Metis/metis-4.0.? ${WRKSRC}/ThirdParty/Metis/metis-4.0);
 	@(cd ${WRKSRC}/ThirdParty/Mumps && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/MUMPS_4.10.0.tar.gz ${EXTRACT_AFTER_ARGS});
 	@(${MV} ${WRKSRC}/ThirdParty/Mumps/MUMPS_4.10.0 ${WRKSRC}/ThirdParty/Mumps/MUMPS);
 
 pre-patch:
 	@(cd ${WRKSRC}/ThirdParty/Mumps && ${PATCH} -p0 < mumps.patch && ${PATCH} -p0 < mumps_mpi.patch )
 	@(${MV} ${WRKSRC}/ThirdParty/Mumps/MUMPS/libseq/mpi.h ${WRKSRC}/ThirdParty/Mumps/MUMPS/libseq/mumps_mpi.h);
 
 pre-build: # workaround: configure fails to find the 'rand' function, need to investigate. This patch unbreaks the build.
 	@${REINPLACE_CMD} -e 's|.*HAVE_RAND.*|#define HAVE_RAND 1|' ${WRKSRC}/Ipopt/src/Common/config.h
 
 .include <bsd.port.post.mk>
diff --git a/math/openturns/Makefile b/math/openturns/Makefile
index b4b4e59729a6..3ebe7aa39223 100644
--- a/math/openturns/Makefile
+++ b/math/openturns/Makefile
@@ -1,98 +1,98 @@
 PORTNAME=	openturns
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Uncertainty treatment library
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		flex:textproc/flex \
 		spectra>0:math/spectra
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 		libblas.so:math/blas \
 		libbonmin.so:math/bonmin \
 		libcamd.so:math/suitesparse-camd \
 		libceres.so:math/ceres-solver \
 		libCbc.so:math/cbc \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libCgl.so:math/cgl \
 		libcholmod.so:math/suitesparse-cholmod \
 		libClp.so:math/clp \
 		libcminpack.so:math/cminpack \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libcolamd.so:math/suitesparse-colamd \
 		libcxsparse.so:math/suitesparse-cxsparse \
 		libdlib.so:science/dlib-cpp \
 		libgif.so:graphics/giflib \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libgmp.so:math/gmp \
 		libhdf5_cpp.so:science/hdf5 \
 		libipopt.so:math/ipopt \
 		liblapack.so:math/lapack \
 		libmetis.so:math/metis \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libnauty.so:math/nauty \
 		libnlopt.so:math/nlopt \
 		libOsi.so:math/osi \
 		libpng16.so:graphics/png \
 		libprimesieve.so:math/primesieve \
 		libspqr.so:math/suitesparse-spqr \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libsz.so:science/szip \
 		libtbb.so:devel/onetbb \
 		libunwind.so:devel/libunwind
 
 USES=		bison blaslapack:openblas cmake eigen:3 gnome jpeg localbase:ldflags pkgconfig sqlite xorg # compiler:c++14-lang
 USE_GITHUB=	yes
 USE_GNOME=	libxml2
 USE_XORG=	ice sm x11 xau xcb xdmcp xext
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBLAS_LIBRARIES=${LOCALBASE}/lib/libopenblas.so -DLAPACK_LIBRARIES=${LOCALBASE}/lib/libopenblas.so \
 		-DOPENTURNS_EXAMPLE_PATH:STRING=share/examples/openturns \
 		-DOPENTURNS_DOC_PATH:STRING=share/doc/openturns
 CMAKE_OFF=	USE_DOXYGEN USE_SPHINX
 CMAKE_OFF+=	USE_HMAT # broken with hmat-oss-1.7.1: https://github.com/openturns/openturns/issues/1868
 
 TEST_TARGET=	check # 10 tests are known to fail: https://github.com/openturns/openturns/issues/1919
 
 OPTIONS_DEFINE=		PYTHON EXAMPLES
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
 PYTHON_USES=		python
 PYTHON_CMAKE_BOOL=	BUILD_PYTHON
 PYTHON_CMAKE_ON=	-DSWIG_EXECUTABLE=${LOCALBASE}/bin/swig
 PYTHON_PY_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}chaospy>0:math/py-chaospy@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 PYTHON_BUILD_DEPENDS=	swig:devel/swig \
 			${PYTHON_PY_DEPENDS}
 PYTHON_RUN_DEPENDS=	${PYTHON_PY_DEPENDS}
 
 PORTEXAMPLES=		*
 
 LLVM_VERSION=	12 # workaround for clang-13 crash: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261341
 
 # use clang from ports because cmake can't find base llvm for JIT
 BUILD_DEPENDS+=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 RUN_DEPENDS+=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 CPP=		clang-cpp${LLVM_VERSION}
 CC=		clang${LLVM_VERSION}
 CXX=		clang++${LLVM_VERSION}
 
 post-install:
 	@${RM} -r ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile
index b092bc4f6400..32bae080ca3b 100644
--- a/math/or-tools/Makefile
+++ b/math/or-tools/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	or-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.2
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Google's Operations Research tools
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE-2.0.txt
 
 PATCH_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libcoinasl.so:math/asl \
 		libcoinmetis.so:math/ipopt \
 		libCoinUtils.so:math/coinutils \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libOsiClp.so:math/clp \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libprotobuf.so:devel/protobuf
 
 USES=		blaslapack cmake:testing compiler:c++17-lang pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	BUILD_PYTHON BUILD_DEPS INSTALL_BUILD_DEPS BUILD_EXAMPLES BUILD_SAMPLES
 CMAKE_ON=	BUILD_CXX
 CMAKE_TESTING_ON=	BUILD_EXAMPLES BUILD_CXX_EXAMPLES
 
 CONFIGURE_ENV=	UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}
 
 OPTIONS_DEFINE=		FLATZINC SCIP
 OPTIONS_DEFAULT=	FLATZINC #SCIP
 OPTIONS_SUB=		yes
 
 FLATZINC_DESC=		Build FlatZinc - MiniZinc interface
 FLATZINC_CMAKE_BOOL=	BUILD_FLATZINC
 
 SCIP_DESC=		Use the SCIP solver # SCIP package isn't built because of licensing restrictions
 SCIP_CMAKE_BOOL=	USE_SCIP
 SCIP_LIB_DEPENDS=	libscip.so:math/SCIP
 
 post-patch:
 	# fix for https://github.com/google/or-tools/issues/2526 suggested there
 	@gsed -i '11i \ \ LINKER_LANGUAGE Cxx' \
 		${WRKSRC}/ortools/init/CMakeLists.txt
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete
 
 .include <bsd.port.mk>
diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile
index 623d97c15228..7ec82b4b5bed 100644
--- a/math/py-or-tools/Makefile
+++ b/math/py-or-tools/Makefile
@@ -1,79 +1,80 @@
 PORTNAME=	or-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.2
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Google's Operations Research tools (Python binding)
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE-2.0.txt
 
 BROKEN_i386=	SWIG wrapped code invalid in 32 bit architecture, regenerate code using -DSWIGWORDSIZE32 # see https://github.com/google/or-tools/issues/2130
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}absl-py>0:devel/py-absl-py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		protoc-gen-mypy:devel/py-mypy-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${PY_FLAVOR} \
 		swig:devel/swig
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libcoinasl.so:math/asl \
 		libcoinmumps.so:math/ipopt \
 		libCoinUtils.so:math/coinutils \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libOsiClp.so:math/clp \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libprotobuf.so:devel/protobuf
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		blaslapack cmake:insource compiler:c++17-lang pkgconfig python:3.6+
 USE_PYTHON=	flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 
 CMAKE_OFF=	BUILD_DEPS INSTALL_BUILD_DEPS BUILD_TESTING BUILD_EXAMPLES
 CMAKE_ON=	BUILD_PYTHON
 CMAKE_ARGS=	-DSWIG_EXECUTABLE=${LOCALBASE}/bin/swig -DFREEBSD_PYTHON_VER=${PYTHON_VER}
 CONFIGURE_ENV=	UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}
 BUILD_ENV=	UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}
 
 OPTIONS_DEFINE=		SCIP
 
 SCIP_DESC=		Use the SCIP solver # SCIP package isn't built because of licensing restrictions
 SCIP_CMAKE_BOOL=	USE_SCIP
 SCIP_LIB_DEPENDS=	libscip.so:math/SCIP
 
 post-patch:
 	@${REINPLACE_CMD} -e '/absl::container/s,^,#,' \
 		${WRKSRC}/ortools/constraint_solver/CMakeLists.txt \
 		${WRKSRC}/ortools/glop/CMakeLists.txt \
 		${WRKSRC}/ortools/linear_solver/CMakeLists.txt \
 		${WRKSRC}/ortools/sat/CMakeLists.txt
 
 do-install: # by default cmake installs the whole or-tools project without the python part, so extract the wheel and install python files manually here
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} && \
 		unzip ${BUILD_WRKSRC}/python/dist/ortools-${DISTVERSION}*.whl && \
 		${RM} -rf ortools-*.dist-info
 	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name "*.so" -o -name "*.so.*" | ${XARGS} ${STRIP_CMD}
 
 do-test: install
 .for e in arc_flow_cutting_stock_sat.py bus_driver_scheduling_sat.py cover_rectangle_sat.py cvrptw_plot.py qubo_sat.py # list is from examples/python/CMakeLists.txt
 	@cd ${WRKSRC}/examples/python && \
 		${ECHO} "==> Running ${PORTNAME} test ${e} ..." && \
 		${PYTHON_CMD} ${e} && \
 		${ECHO} "... test ${e} succeeded"
 .endfor
 
 .include <bsd.port.mk>
diff --git a/math/symphony/Makefile b/math/symphony/Makefile
index c008460d1a83..6426e105e310 100644
--- a/math/symphony/Makefile
+++ b/math/symphony/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	symphony
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	5.6.18
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Solver and development framework for mixed-integer linear programs
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/SYMPHONY/LICENSE
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libcoinasl.so:math/asl \
 		libcoinmumps.so:math/ipopt \
 		libCoinUtils.so:math/coinutils \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libClp.so:math/clp
 
 USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	${PORTNAME:tu}
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	test
 
 .include <bsd.port.mk>
diff --git a/misc/openmvg/Makefile b/misc/openmvg/Makefile
index 658aa6ba1f01..14f67f55001a 100644
--- a/misc/openmvg/Makefile
+++ b/misc/openmvg/Makefile
@@ -1,94 +1,95 @@
 PORTNAME=	openmvg
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	misc science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Multiple View Geometry (MVG) library
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 ONLY_FOR_ARCHS=	amd64 armv7 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	need to figure out which TARGET_ARCHITECTURE values correspond to other architectures, plus "generic" is broken
 
 #HPP_DEPENDS=	cereal>0:devel/cereal # external cereal is currently broken, see https://github.com/openMVG/openMVG/issues/1963
 #BUILD_DEPENDS=	${HPP_DEPENDS}
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 		libblas.so:math/blas \
 		libcamd.so:math/suitesparse-camd \
 		libCbc.so:math/cbc \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libceres.so:math/ceres-solver \
 		libCgl.so:math/cgl \
 		libcholmod.so:math/suitesparse-cholmod \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libcolamd.so:math/suitesparse-colamd \
 		libcoinmumps.so:math/ipopt \
 		libcxsparse.so:math/suitesparse-cxsparse \
 		libemon.so:math/lemon \
 		libflann_cpp.so:math/flann \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libglpk.so:math/glpk \
 		libgmp.so:math/gmp \
 		libjbig.so:graphics/jbigkit \
 		libmetis.so:math/metis \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libpng.so:graphics/png \
 		libspqr.so:math/suitesparse-spqr \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libtiff.so:graphics/tiff \
 		libunwind.so:devel/libunwind
 LIB_DEPENDS+=	liblz4.so:archivers/liblz4 # workaround for https://github.com/openMVG/openMVG/issues/1798
 #RUN_DEPENDS=	${HPP_DEPENDS}
 
 USES=		cmake compiler:c++11-lang eigen:3 jpeg qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	openMVG
 GH_PROJECT=	openMVG
 GH_TUPLE=	openMVG-thirdparty:cereal:ac168fe:cereal/dependencies/cereal
 WRKSRC_SUBDIR=	src
 USE_QT=		core gui opengl svg widgets buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DEIGEN_INCLUDE_DIR_HINTS=${LOCALBASE}/include/eigen3 \
 		-DFLANN_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DLEMON_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DOSI_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DCOINUTILS_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DCLP_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DCERES_DIR_HINTS=${LOCALBASE}/include
 CMAKE_ON=	OpenMVG_BUILD_SHARED
 CMAKE_OFF=	OpenMVG_BUILD_TESTS OpenMVG_BUILD_EXAMPLES
 
 CXXFLAGS+=	-fPIC \
 		-I${LOCALBASE}/include # because flann is looked for in a wrong directiory: https://github.com/openMVG/openMVG/issues/1284
 LDFLAGS+=	-L${LOCALBASE}/lib -llz4 # workaround for https://github.com/openMVG/openMVG/issues/1798
 
 OPTIONS_SINGLE=			SIMD_${ARCH:tu}
 OPTIONS_SINGLE_SIMD_AMD64=	K8 CORE MEROM NEHALEM
 OPTIONS_SINGLE_SIMD_I386=	${OPTIONS_SINGLE_SIMD_AMD64}
 OPTIONS_DEFAULT_amd64=		K8
 OPTIONS_DEFAULT_i386=		K8
 
 SIMD_AMD64_DESC=		Use SSE SIMD optimizations for
 SIMD_I386_DESC=			${SIMD_AMD64_DESC}
 K8_DESC=			K8 architecture (SSE2)
 CORE_DESC=			Core architecture (up to SSE3)
 MEROM_DESC=			Merom architecture (up to SSSE3)
 NEHALEM_DESC=			Nehalem architecture (up to SSE4.2)
 
 K8_CMAKE_ON=			-DTARGET_ARCHITECTURE=k8
 CORE_CMAKE_ON=			-DTARGET_ARCHITECTURE=core
 MEROM_CMAKE_ON=			-DTARGET_ARCHITECTURE=merom
 NEHALEM_CMAKE_ON=		-DTARGET_ARCHITECTURE=nehalem
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/openMVG_dependencies/osi_clp
 
 .include <bsd.port.mk>