diff --git a/archivers/vbz-compression/Makefile b/archivers/vbz-compression/Makefile
index 22103bd71678..f2614bebc686 100644
--- a/archivers/vbz-compression/Makefile
+++ b/archivers/vbz-compression/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	vbz-compression
 DISTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	archivers
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Variable byte integer encoding to compress Oxford Nanopore signal data
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENCE.txt
 
 BUILD_DEPENDS=	streamvbyte>=0.4.1:archivers/streamvbyte
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libzstd.so:archivers/zstd
 
 USES=		cmake
 USE_GITHUB=	yes
 USE_LDCONFIG=	${PREFIX}/hdf5/lib/plugin
 
 GH_ACCOUNT=	nanoporetech
 GH_PROJECT=	vbz_compression
 
 CMAKE_ARGS=	-DENABLE_CONAN=OFF \
 		-DENABLE_PERF_TESTING=OFF \
 		-DENABLE_PYTHON=OFF \
 		-DSTREAMVBYTE_INSTALL_DIR=${LOCALBASE} \
 		-DSTREAMVBYTE_STATIC_LIB=${LOCALBASE}/lib/libstreamvbyte_static.a
 
 PLIST_FILES=	hdf5/lib/plugin/libvbz_hdf_plugin.so
 
 .include <bsd.port.mk>
diff --git a/astro/oskar/Makefile b/astro/oskar/Makefile
index f34faf9bc5a2..73715f47e62a 100644
--- a/astro/oskar/Makefile
+++ b/astro/oskar/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	OSKAR
 DISTVERSION=	2.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	SKA Radio telescope simulator
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=		amd64 i386 powerpc powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	gccfeatures.h:54:4: This code has only been tested on x86 and powerpc platforms
 BROKEN_FreeBSD_12_powerpc64=	fails to compile: oskar_convert_cirs_relative_directions_to_enu_directions.c:67:29: 'csinl' undeclared (first use in this function)
 
 LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
 		libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec
 
 USES=		cmake compiler:c++11-lang localbase:ldflags python qt:5 \
 		shebangfix
 USE_QT=		core gui network widgets buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	apps/oskar_convert_cst_to_scalar.py
 USE_GITHUB=	yes
 GH_ACCOUNT=	OxfordSKA
 
 CMAKE_ARGS=	-DFREEBSD_FILESDIR:STRING=${FILESDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index 4db2391be77b..275582f837ba 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -1,194 +1,194 @@
 PORTNAME=	csound
 DISTVERSION=	6.15.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio lang
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Sound synthesizer
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		swig:devel/swig \
 		gmm++>0:math/gmm++
 LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile
 
 USES=		alias bison cmake compiler:c++11-lib cpe eigen:3 localbase ncurses python:build # is python needed: https://github.com/csound/csound/issues/1437 ?
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	csounds
 
 CONFLICTS_INSTALL= clearsilver go-cs libextractor outguess
 
 CFLAGS_powerpc=	-maltivec
 CFLAGS_powerpcspe=	-DPFFFT_SIMD_DISABLE
 CMAKE_ARGS=	-DBUILD_CSOUNDVST:BOOL=OFF \
 		-DBUILD_PD_CLASS:BOOL=OFF \
 		-DPYTHON_MODULE_INSTALL_DIR:PATH="${PYTHONPREFIX_SITELIBDIR}" \
 		-DOPSYS:STRING="${OPSYS}"
 CMAKE_OFF=	USE_ALSA BUILD_JAVA_INTERFACE BUILD_TESTS
 SSP_UNSAFE=	yes
 LDFLAGS+=	-lexecinfo
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		CURL FLTK HDF5 NLS OPENMP PORTAUDIO PULSEAUDIO
 OPTIONS_GROUP=		OPCODES # list is in Opcodes/CMakeLists.txt
 OPTIONS_GROUP_OPCODES=	BUCHLA CHUA COUNTER DSSI EXCITER FAUST FLUIDSYNTH IMAGE JACK LUA LINALG MP3OUT OSC P5GLOVE PADSYNTH PLATEREV PVSGENDY PYTHON SCANSYN SELECT SERIAL STACK STK VST4CS WIIMOTE # Opcodes/CMakeLists.txt, Opcodes/stk/CMakeLists.txt
 OPTIONS_DEFAULT=	FLTK OPENMP
 OPTIONS_DEFAULT+=	BUCHLA CHUA DSSI EXCITER FAUST IMAGE JACK LINALG OSC P5GLOVE PADSYNTH PLATEREV SCANSYN SELECT SERIAL STACK STK # for OPCODES
 OPTIONS_SUB=		yes
 
 OPCODES_DESC=		Build/install opcodes
 
 BUCHLA_DESC=		Build the Buchla filter opcode
 BUCHLA_CMAKE_BOOL=	BUILD_BUCHLA_OPCODES
 
 CHUA_DESC=		Build the chua opcodes
 CHUA_CMAKE_BOOL=	BUILD_CHUA_OPCODES
 
 COUNTER_DESC=		Build the serial opcode
 COUNTER_CMAKE_BOOL=	BUILD_COUNTER_OPCODES
 
 CURL_CMAKE_BOOL=	USE_CURL # see https://github.com/csound/csound/issues/1067
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 DSSI_DESC=		Build DSSI opcodes
 DSSI_BUILD_DEPENDS=	dssi>0:audio/dssi
 DSSI_LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat
 DSSI_RUN_DEPENDS=	dssi>0:audio/dssi
 DSSI_CMAKE_BOOL=	BUILD_DSSI_OPCODES
 DSSI_CFLAGS=		-isystem ${LOCALBASE}/include/dssi
 
 EXCITER_DESC=		Build the exciter opcode
 EXCITER_CMAKE_BOOL=	BUILD_EXCITER_OPCODES
 
 FLTK_DESC=		Build FLTK plugin and GUI
 FLTK_USES=		xorg
 FLTK_USE=		XORG=ice,sm,x11,xext
 FLTK_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 FLTK_CMAKE_ON=		-DBUILD_WINSOUND:BOOL=ON
 FLTK_CMAKE_OFF=		-DBUILD_CSOUND_AC:BOOL=OFF \
 			-DBUILD_VIRTUAL_KEYBOARD:BOOL=OFF \
 			-DUSE_FLTK:BOOL=OFF
 
 FAUST_DESC=		Build the Faust opcodes
 FAUST_USES=		ssl
 FAUST_LLVM_VERSION=	11 # should be the same as in audio/faust
 FAUST_LIB_DEPENDS=	libfaust.so:audio/faust
 FAUST_CMAKE_BOOL=	BUILD_FAUST_OPCODES
 FAUST_CMAKE_ON=		-DFAUST_LLVM_VERSION:STRING=${FAUST_LLVM_VERSION}
 
 FLUIDSYNTH_DESC=	Building FluidSynth opcodes
 FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CMAKE_BOOL=	BUILD_FLUID_OPCODES
 FLUIDSYNTH_BROKEN=	FluidSynth 2.x is broken upstream: https://github.com/csound/csound/issues/1078#issuecomment-441459803
 
 HDF5_DESC=		Build HDF5 read/write plugin
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 			libsz.so:science/libaec
 HDF5_CMAKE_BOOL=	BUILD_HDF5_OPCODES
 
 JACK_DESC=		Build the JACK related opcodes
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CMAKE_BOOL=	BUILD_JACK_OPCODES USE_JACK
 
 LINALG_DESC=		Build the linear algebra opcodes
 LINALG_CMAKE_BOOL=	BUILD_LINEAR_ALGEBRA_OPCODES
 LINALG_CXXFLAGS=	-DGMM_VERSION=x # workaround based on https://github.com/csound/csound/issues/1069#issuecomment-439648756
 
 LUA_DESC=		Build Lua Interface and module
 LUA_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUA_CMAKE_BOOL=		BUILD_CSOUND_AC_LUA_INTERFACE BUILD_LUA_INTERFACE BUILD_LUA_OPCODES
 
 NLS_USES=		gettext
 NLS_CMAKE_OFF=		-DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH="" \
 			-DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH="" \
 			-DLIBINTL_LIBRARY:FILEPATH="" \
 			-DUSE_GETTEXT:BOOL=OFF
 
 OPENMP_CMAKE_BOOL=	USE_OPEN_MP
 
 MP3OUT_DESC=		Build MP3OUT opcodes
 MP3OUT_CMAKE_BOOL=	BUILD_MP3OUT_OPCODE
 
 OSC_DESC=		Build OSC opcodes
 OSC_LIB_DEPENDS=	liblo.so:audio/liblo
 OSC_CMAKE_BOOL=		BUILD_OSC_OPCODES
 
 PADSYNTH_DESC=		Build the Padsynth opcode
 PADSYNTH_CMAKE_BOOL=	BUILD_PADSYNTH_OPCODES
 
 IMAGE_DESC=		Build Image opcodes
 IMAGE_LIB_DEPENDS=	libpng.so:graphics/png
 IMAGE_CMAKE_BOOL=	BUILD_IMAGE_OPCODES
 
 P5GLOVE_DESC=		Build PortAudio I/O module
 P5GLOVE_CMAKE_BOOL=	BUILD_P5GLOVE_OPCODES
 
 PORTAUDIO_DESC=		Build PortAudio I/O module
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CMAKE_BOOL=	USE_PORTAUDIO
 
 PULSEAUDIO_DESC=	Build PulseAudio I/O module
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	USE_PULSEAUDIO
 
 PLATEREV_DESC=		Build the platerev opcode
 PLATEREV_CMAKE_BOOL=	BUILD_PLATEREV_OPCODES
 
 PVSGENDY_DESC=		Build the pvsgendy opcode
 PVSGENDY_CMAKE_BOOL=	BUILD_PVSGENDY_OPCODE
 
 PYTHON_DESC=		Build the Python opcodes
 PYTHON_USES=		python
 PYTHON_CMAKE_BOOL=	BUILD_PYTHON_OPCODES
 
 SCANSYN_DESC=		Build the select opcodes
 SCANSYN_CMAKE_BOOL=	BUILD_SCANSYN_OPCODES
 
 SELECT_DESC=		Build the select opcode
 SELECT_CMAKE_BOOL=	BUILD_SELECT_OPCODE
 
 SERIAL_DESC=		Build the serial opcode
 SERIAL_CMAKE_BOOL=	BUILD_SERIAL_OPCODES
 
 STACK_DESC=		Build the stack opcodes
 STACK_CMAKE_BOOL=	BUILD_STACK_OPCODES
 
 STK_DESC=		Build the stk opcodes
 STK_CMAKE_BOOL=		BUILD_STK_OPCODES
 STK_LIB_DEPENDS=	libstk.so:audio/stk
 
 VST4CS_DESC=		Build the vst4cs opcodes
 VST4CS_CMAKE_BOOL=	BUILD_VST4CS_OPCODES
 
 WIIMOTE_DESC=		Build the Wiimote opcodes
 WIIMOTE_CMAKE_BOOL=	BUILD_WIIMOTE_OPCODES
 WIIMOTE_BROKEN=		Need to port wiiuse: https://github.com/rpavlik/wiiuse
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/include/Python2.7|${PYTHON_INCLUDEDIR}| ; \
 		 s|/usr/local|${LOCALBASE}| ; \
 		 /linuxjoystick/s|^|#| ; \
 		 s| dl)|)|' \
 		${WRKSRC}/Opcodes/CMakeLists.txt
 	@${REINPLACE_CMD} -e \
 		'/CMAKE_SYSTEM_NAME/s|"Linux"|"${OPSYS}"|' \
 		${WRKSRC}/Frontends/CMakeLists.txt
 	@${REINPLACE_CMD} -e \
 		's| mixer)| csmixer)|' \
 		${WRKSRC}/util/CMakeLists.txt
 
 post-install:
 	@${LN} -sf libcsnd6.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsnd6.so.6
 	@${LN} -sf libcsound64.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsound64.so.6
 
 post-install-FLTK-on:
 	@${LN} -sf libCsoundAC.so.6.0 ${STAGEDIR}${PREFIX}/lib/libCsoundAC.so.6
 
 .include <bsd.port.mk>
diff --git a/biology/kallisto/Makefile b/biology/kallisto/Makefile
index d28827b7ee2a..7b9a563fbef2 100644
--- a/biology/kallisto/Makefile
+++ b/biology/kallisto/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=		kallisto
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.48.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=		1
 CATEGORIES=		biology
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Quantify abundances of transcripts from RNA-Seq data
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BUILD_DEPENDS=	autoconf>=0:devel/autoconf
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec \
 		libhts.so:biology/htslib
 
 USES=		cmake:noninja compiler:c++11-lang gmake localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	pachterlab
 
 SUB_FILES=	kallisto-test
 
 PORTEXAMPLES=		*
 PLIST_FILES=		bin/kallisto
 EXAMPLES_PLIST_FILES=	bin/kallisto-test
 
 # hdf5 is being phased out and is no longer built in by default, but is still
 # required for Sleuth (requires kallisto bootstrap estimates) and other
 # downstream tools.  Remove this after Sleuth et al catch up.
 CMAKE_ARGS+=		-DUSE_HDF5:BOOL=ON
 MAKE_JOBS_UNSAFE=	yes
 LDFLAGS+=		-lhts -lz
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-extract:
 	${RM} -rf ${WRKSRC}/ext/htslib
 
 post-install-EXAMPLES-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/kallisto-test ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC}/test && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/biology/ncbi-vdb/Makefile b/biology/ncbi-vdb/Makefile
index 7fe25835a40c..28bc8b5f05b8 100644
--- a/biology/ncbi-vdb/Makefile
+++ b/biology/ncbi-vdb/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	ncbi-vdb
 DISTVERSION=	2.11.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	biology
 
 MAINTAINER=	mzaki@niid.go.jp
 COMMENT=	NCBI's virtualized back-end for accessing Sequence Read Archive
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	libs/search/nucstrstr.c requires SSE2 instructions
 
 BUILD_DEPENDS=	bash:shells/bash \
 		libepoll-shim>0:devel/libepoll-shim
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 		libhdf5.so:science/hdf5 \
 		libmbedtls.so:security/mbedtls
 
 USES=		compiler:c11 gmake localbase:ldflags perl5 shebangfix
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ncbi
 GH_TUPLE+=	ncbi:ngs:${DISTVERSION}:ngs # ported as biology/ngs-sdk
 
 SHEBANG_GLOB=	*.sh *.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xml2-prefix=${LOCALBASE} \
 		--with-hdf5-prefix=${LOCALBASE} \
 		--with-mbedtls-prefix=${LOCALBASE} \
 		CC="${CC}" CXX="${CXX}" TOOLS="${CHOSEN_COMPILER_TYPE}"
 MAKE_ENV+=	CPATH="${LOCALBASE}/include/libepoll-shim"
 MAKE_ARGS+=	CCNAME=${CC} CXXNAME=${CXX} PKGCFLAGS="${CFLAGS}"
 
 CFLAGS+=	-I${WRKSRC}/lib
 
 MAKE_JOBS_UNSAFE=	yes
 
 post-extract:
 	@${LN} -sf ${WRKSRC_ngs} ${WRKDIR}/ngs
 	@${LN} -sf ${WRKSRC} ${WRKDIR}/${PORTNAME}
 
 pre-patch:
 	@${CP} ${FILESDIR}/Makefile.bsd ${WRKSRC}/build/
 	@for f in ${WRKSRC}/build/ld.linux.*.sh; do ${CP} -p $${f} $${f%linux*}bsd$${f#*linux}; done
 	@${CP} -p ${WRKSRC}/build/ld.linux.gcc.sh ${WRKSRC}/build/ld.bsd.clang.sh
 	@${MKDIR} ${WRKSRC}/interfaces/os/bsd
 	@${CP} -p ${WRKSRC}/interfaces/os/mac/endian.h ${WRKSRC}/interfaces/os/bsd/
 
 post-patch:
 	@${GREP} -q '@@PREFIX@@' ${WRKSRC}/libs/kfg/config.c || (echo "@@PREFIX@@ in file/patch-libs_kfg_config.c is overwritten probably due to using 'make makepatch'"; exit 1)
 	@${REINPLACE_CMD} -e 's#@@PREFIX@@#"${PREFIX}"#' ${WRKSRC}/libs/kfg/config.c
 
 post-configure:
 	@${ECHO} ${CHOSEN_COMPILER_TYPE} > ${WRKSRC}/build/COMP
 
 # The 'install' target installs broken-looking static libs with symlinks.
 # This is intentional, see comments https://github.com/ncbi/ncbi-vdb/issues/36#issuecomment-817990790 This may change in future versions.
 
 .include <bsd.port.mk>
diff --git a/biology/sra-tools/Makefile b/biology/sra-tools/Makefile
index d44a18daf6d4..e4ebace60279 100644
--- a/biology/sra-tools/Makefile
+++ b/biology/sra-tools/Makefile
@@ -1,108 +1,108 @@
 PORTNAME=	sra-tools
 DISTVERSION=	2.11.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	NCBI's toolkit for handling data in INSDC Sequence Read Archives
 
 LICENSE=		PD LGPL21+
 LICENSE_COMB=		multi
 LICENSE_FILE_PD=	${WRKSRC}/LICENSE
 LICENSE_DISTFILES_LGPL21+ =
 
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	NCBI-VDB requires SSE2 instructions, no 32-bit support
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/lib/libngs-c++.a:biology/ngs-sdk
 LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 		libhdf5.so:science/hdf5 \
 		libepoll-shim.so:devel/libepoll-shim
 
 USES=		compiler:c11 gmake localbase:ldflags perl5 shebangfix
 USE_PERL5=	build
 USE_GITHUB=	yes
 
 SHEBANG_GLOB=	*.sh *.pl
 GH_ACCOUNT=	ncbi
 GH_TUPLE+=	ncbi:ngs:${DISTVERSION}:ngs/ngs # ported as biology/ngs-sdk
 GH_TUPLE+=	ncbi:ncbi-vdb:${DISTVERSION}:vdb/ncbi-vdb
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ngs-sdk-prefix=${LOCALBASE} \
 		--with-ncbi-vdb-sources=${NCBI_VDB_WRKSRC} \
 		--with-xml2-prefix=${LOCALBASE} \
 		--with-hdf5-prefix=${LOCALBASE} \
 		CC="${CC}" CXX="${CXX}" TOOLS="${CHOSEN_COMPILER_TYPE}" \
 		--with-ncbi-vdb-build=${NCBI_VDB_WRKSRC}/amd64-portbld-freebsd$$(${FREEBSD_RELEASE})
 MAKE_ARGS=	CCNAME=${CC} CXXNAME=${CXX} PKGCFLAGS="${CFLAGS}" \
 		INST_ETCDIR=${STAGEDIR}${PREFIX}/etc
 
 NCBI_VDB_WRKSRC=	${WRKSRC}/ncbi-vdb
 NCBI_VDB_FILESDIR=	${FILESDIR}
 FREEBSD_RELEASE=	uname -r | cut -d - -f 1
 
 CFLAGS+=	-I${WRKSRC}/interfaces/os/sun
 CXXFLAGS+=	-I${WRKSRC}/interfaces/os/sun
 
 CONFLICTS_INSTALL=	kget
 
 BINARY_ALIAS=	gcc=${CC} g++=${CXX}
 
 # for port developers, building with these options may fail
 OPTIONS_DEFINE=		DEBUG OPTIMIZED_CFLAGS TEST
 DEBUG_PREVENTS=		OPTIMIZED_CFLAGS
 DEBUG_CONFIGURE_WITH=	debug
 OPTIMIZED_CFLAGS_MAKE_ARGS_OFF=	OPT=""
 TEST_TEST_TARGET=	test
 TEST_USES=		python
 
 # ncbi-vdb build extras
 VDB_CONFIGURE_ARGS=	\
 		--with-xml2-prefix=${LOCALBASE} \
 		--with-hdf5-prefix=${LOCALBASE} \
 		--prefix=${PREFIX} \
 		--build=amd64-portbld-freebsd$$(${FREEBSD_RELEASE}) \
 		CC="${CC}" CXX="${CXX}" TOOLS="${CHOSEN_COMPILER_TYPE}"
 VDB_MAKE_ARGS+=	-j 1 CCNAME=${CC} CXXNAME=${CXX} PKGCFLAGS="${CFLAGS}"
 MAKE_ENV+=	CPATH="${LOCALBASE}/include/libepoll-shim"
 CFLAGS+=	-I${WRKSRC}/lib
 
 pre-patch:
 	@${CP} ${FILESDIR}/Makefile.bsd ${NCBI_VDB_WRKSRC}/build/
 	@${CP} ${FILESDIR}/ld.bsd.*.sh ${NCBI_VDB_WRKSRC}/build/
 	@${MKDIR} ${NCBI_VDB_WRKSRC}/interfaces/os/bsd
 	@${CP} -p ${NCBI_VDB_WRKSRC}/interfaces/os/mac/endian.h \
 		${NCBI_VDB_WRKSRC}/interfaces/os/bsd/
 
 post-patch:
 	@${GREP} -q '@@PREFIX@@' ${WRKSRC}/ncbi-vdb/libs/kfg/config.c || (echo "@@PREFIX@@ in file/patch-libs_kfg_config.c is overwritten probably due to using 'make makepatch'"; exit 1)
 	@${REINPLACE_CMD} -e 's#@@PREFIX@@#"${PREFIX}"#' ${WRKSRC}/ncbi-vdb/libs/kfg/config.c
 	@${LN} -s ${WRKSRC}/ncbi-vdb/interfaces/cc/gcc/x86_64 ${WRKSRC}/ncbi-vdb/interfaces/cc/gcc/amd64
 
 post-patch-TEST-on:
 	@${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/test/kget/Makefile
 
 pre-configure:
 	@${CP} ${NCBI_VDB_WRKSRC}/setup/os-arch.prl ${WRKSRC}/setup/os-arch.prl
 	# same as in biology/ncbi-vdb
 	@${CP} ${NCBI_VDB_FILESDIR}/Makefile.bsd ${WRKSRC}/build/
 	@${CP} ${NCBI_VDB_WRKSRC}/build/ld.bsd.*.sh ${WRKSRC}/build/
 	@${MKDIR} ${WRKSRC}/interfaces/override
 	@${CP} ${NCBI_VDB_WRKSRC}/interfaces/os/sun/atomic32.h ${WRKSRC}/interfaces/override
 	@${CP} ${FILESDIR}/byteswap.h ${WRKSRC}/interfaces/override
 	@cd ${WRKSRC}/ncbi-vdb && ./configure ${VDB_CONFIGURE_ARGS}
 	@${ECHO} ${CHOSEN_COMPILER_TYPE} > ${WRKSRC}/ncbi-vdb/build/COMP
 	@cd ${WRKSRC}/ncbi-vdb && ${DO_MAKE_BUILD} ${VDB_MAKE_ARGS}
 
 post-build-TEST-on:	do-test
 
 do-install:
 	cd ${WRKSRC}/amd64-portbld-freebsd*/sra-tools/bsd/clang/*/rel/bin && \
 	    for f in `ls *.${PORTVERSION}`; do \
 		${INSTALL_PROGRAM} $${f} \
 		${STAGEDIR}${PREFIX}/bin/`basename $${f%%.${PORTVERSION}}`; \
 	done
 
 .include <bsd.port.mk>
diff --git a/cad/appcsxcad/Makefile b/cad/appcsxcad/Makefile
index cc252dce0a30..15d682496d5a 100644
--- a/cad/appcsxcad/Makefile
+++ b/cad/appcsxcad/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	appcsxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.2-9
 DISTVERSIONSUFFIX=	-g97ba30e
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Minimal GUI Application using the QCSXCAD library
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libCSXCAD.so:cad/csxcad \
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libhdf5.so:science/hdf5 \
 		libpng16.so:graphics/png \
 		libQCSXCAD.so:cad/qcsxcad \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff \
 		libvtkCommonCore-9.1.so:math/vtk9
 
 USES=		cmake jpeg pkgconfig qt:5 xorg
 USE_QT=		core gui sql widgets xml buildtools_build qmake_build
 USE_XORG=	ice sm x11 xext xt
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	thliebig
 GH_PROJECT=	AppCSXCAD
 
 CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1
 
 PLIST_FILES=	bin/AppCSXCAD
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/AppCSXCAD.sh # shell script is only needed for Matlab
 
 # an example of file that AppCSXCAD opens (zipped): http://openems.de/forum/download/file.php?id=418&sid=6daebbb2df72b415fa2ec7031ffa6ca9
 
 .include <bsd.port.mk>
diff --git a/cad/csxcad/Makefile b/cad/csxcad/Makefile
index e6568913c10f..db980e906aee 100644
--- a/cad/csxcad/Makefile
+++ b/cad/csxcad/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	csxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.2-109
 DISTVERSIONSUFFIX=	-gcd9decb
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library to describe geometrical objects
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	cgal>0:math/cgal
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libfparser-4.5.so:math/fparser \
 		libgmp.so:math/gmp \
 		libhdf5.so:science/hdf5 \
 		libmpfr.so:math/mpfr \
 		libpng16.so:graphics/png \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff \
 		libtinyxml.so:textproc/tinyxml \
 		libvtkCommonCore-9.1.so:math/vtk9
 
 USES=		cmake jpeg pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	thliebig
 GH_PROJECT=	${PORTNAME:tu}
 
 CMAKE_ARGS=	-DFPARSER_ROOT_DIR=${LOCALBASE} \
 		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1
 
 .include <bsd.port.mk>
diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile
index 355da9cf25d4..a6408b7a828d 100644
--- a/cad/freecad/Makefile
+++ b/cad/freecad/Makefile
@@ -1,88 +1,88 @@
 PORTNAME=	FreeCAD
 DISTVERSION=	0.20
-PORTREVISION=	2
+PORTREVISION=	3
 # use these for bugfixes/snapshots
 # DISTVERSION=	0.18-16093 # git rev-list --count
 # DISTVERSIONSUFFIX=	-g690774c0e
 CATEGORIES=	cad
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	General purpose 3D CAD modeller
 
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	pyside_tool.py:devel/pyside2-tools@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} \
 		swig:devel/swig
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		${PY_BOOST} \
 		libpyside2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/pyside2@${PY_FLAVOR} \
 		libCoin.so:graphics/Coin \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R} \
 		libTKernel.so:cad/opencascade \
 		libxerces-c.so:textproc/xerces-c3 \
 		libboost_thread.so:devel/boost-libs \
 		libarea.so:devel/libarea \
 		libmed.so:french/med \
 		libmpi.so:net/mpich \
 		libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR} \
 		libhdf5-110.so:science/hdf5-110
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pivy>0:graphics/py-pivy@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		dos2unix compiler:c++17-lang cmake cpe gl eigen:3 fortran jpeg \
 		localbase:ldflags pkgconfig python:3.7+ localbase qt:5 xorg
 USE_GITHUB=	yes
 USE_XORG=	ice sm x11 xext xt
 USE_GL=		gl glu
 USE_QT=		buildtools concurrent core declarative gui location network \
 		opengl printsupport qmake_build svg webchannel webengine \
 		widgets xml xmlpatterns
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	freecad_project
 
 VTK_VER=	9.1
 
 DOS2UNIX_GLOB=	*.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL
 
 CMAKE_ARGS+=	-DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \
 		-DOPENMPI_INCLUDE_DIRS="${LOCALBASE}/mpi/openmpi/include" \
 		-DBUILD_QT5="ON" \
 		-DPYTHON_LIBRARY="${PYTHONBASE}/lib/libpython${PYTHON_VER}${PYTHON_ABIVER}.so" \
 		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" \
 		-DPYTHON_PACKAGES_PATH="${PYTHON_SITELIBDIR}" \
 		-DPYTHON_EXECUTABLE="${PYTHON_CMD}" \
 		-DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON" \
 		-DHDF5_CFLAGS="-I${LOCALBASE}/include/hdf5-110" \
 		-DHDF5_FOUND=TRUE \
 		-DHDF5_INCLUDE_DIRS="${LOCALBASE}/include/hdf5-110" \
 		-DHDF5_LIBRARIES="-L${LOCALBASE}/lib -lhdf5-110" \
 		-DHDF5_LIBRARY_DIRS="${LOCALBASE}/lib" \
 		-DPYSIDE2RCCBINARY="${RCC}" \
 		-DPYSIDE2UICBINARY="${UIC}" \
 		-DBUILD_ENABLE_CXX_STD=C++17
 
 CMAKE_INSTALL_PREFIX=	${PREFIX}/${PORTNAME}
 
 OPTIONS_DEFINE=	COLLADA
 
 COLLADA_DESC=		Install pycollada for Collada files import
 COLLADA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${PY_FLAVOR}
 
 DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data/freecad.svg" \
 		${PORTNAME} "Graphics;Engineering;" false
 
 post-patch:
 	@${REINPLACE_CMD} -e '/self\.rev/s/Unknown/${DISTVERSION:C/.*-//}/' \
 		${WRKSRC}/src/Tools/SubWCRev.py
 
 post-install:
 	${LN} -s ../${PORTNAME}/bin/FreeCAD ${STAGEDIR}${LOCALBASE}/bin/FreeCAD
 	${LN} -s ../${PORTNAME}/bin/FreeCADCmd ${STAGEDIR}${LOCALBASE}/bin/FreeCADCmd
 
 .include <bsd.port.mk>
diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index cca4d84dd17c..c5784669c511 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	gmsh
 DISTVERSION=	4.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://gmsh.info/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 DIST_SUBDIR=	gmsh
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Automatic 3D finite element mesh generator
 
 LICENSE=	AGPLv3+ APACHE20 GPLv3+ GPLv2+ LGPL21
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libgmp.so:math/gmp \
 		libhdf5.so:science/hdf5 \
 		libpng.so:graphics/png \
 		libsz.so:science/libaec \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	getdp:science/getdp
 
 USES=		blaslapack compiler:c++11-lang cmake fortran gl jpeg tar:tgz \
 		xorg
 
 USE_GL=		gl glu
 USE_XORG=	x11 xcursor xext xinerama xfixes xft xrender
 
 CMAKE_ARGS=	-DCMAKE_SKIP_RPATH:BOOL=YES
 
 LDFLAGS+=	-lexecinfo
 
 OPTIONS_DEFINE=	CGNS DOCS MED OCC SHARED STATIC
 OPTIONS_DEFAULT=	CGNS MED OCC
 OPTIONS_SUB=	yes
 
 CGNS_DESC=	Enable CGNS mesh import
 MED_DESC=	Enable MED mesh and post file formats
 OCC_DESC=	Enable OpenCASCADE geometrical models
 SHARED_DESC=	Build shared library and install header files
 STATIC_DESC=	Build static library
 
 PLIST_SUB=	VER=${PORTVERSION} VE=${PORTVERSION:R}
 
 # TODO
 # Dependencies against PythonLibs, swig and petsc are found and registered if
 # installed
 # => add knobs to handle them.
 
 CGNS_CMAKE_BOOL=	ENABLE_CGNS
 CGNS_LIB_DEPENDS=	libcgns.so:science/cgnslib
 DOCS_CMAKE_BOOL=	INSTALL_DOCS
 MED_CMAKE_BOOL=		ENABLE_MED
 MED_LIB_DEPENDS=	libmed.so:french/med
 OCC_CMAKE_BOOL=		ENABLE_OCC
 OCC_CMAKE_ON=		-DOCC_INC=${LOCALBASE}/include/OpenCASCADE
 OCC_LIB_DEPENDS=	libopenblas.so:math/openblas libTKernel.so:cad/opencascade
 OCC_USES=		gnome
 OCC_USE=		gnome=cairo
 SHARED_CMAKE_BOOL=	ENABLE_BUILD_SHARED
 SHARED_USE=		LDCONFIG=yes
 STATIC_CMAKE_BOOL=	ENABLE_BUILD_LIB
 
 post-install-SHARED-on:
 	${RM} -r ${STAGEDIR}/wrkdirs
 
 .include <bsd.port.mk>
diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile
index 1dbb915d87ef..21e7292deaf3 100644
--- a/devel/py-tables/Makefile
+++ b/devel/py-tables/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	tables
 PORTVERSION=	3.7.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Hierarchical database for Python
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		liblzo2.so:archivers/lzo2 \
 		libucl.so:archivers/ucl
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0:devel/py-mock@${PY_FLAVOR}
 
 CONFLICTS_BUILD=	zstd # conflicting version of zstd is bundled
 
 USES=		fortran localbase python:3.6+
 USE_PYTHON=	autoplist concurrent distutils cython
 
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		EXAMPLES
 OPTIONS_DEFINE_amd64=		AVX2
 
 AVX2_DESC=	Enable Haswell New Instructions (AVX2) support
 
 # Explicitly disable AVX2 otherwise it will be automatically enabled if the CPU
 # supports it.  If compiled in and run on hosts that have no AVX2 support, it
 # will trigger a SIGILL (Illegal instruction)
 # See also: https://github.com/PyTables/PyTables/issues/841
 AVX2_VARS_OFF=	MAKE_ENV+=DISABLE_AVX2=yes
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables/*.so
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/french/aster/Makefile b/french/aster/Makefile
index 31f71473e9ec..adbb17e53ccb 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -1,432 +1,432 @@
 PORTNAME=	aster
 DISTVERSION=	${ASTER_DISTVERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	french cad
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Code_Aster finite element method solver
 
 LICENSE=	GPLv2
 
 NOT_FOR_ARCHS=		armv6 armv7 i386 mips powerpc
 NOT_FOR_ARCHS_REASON=	ARG_MAX is too small for Code_Aster on 32 bits systems
 
 #-----------------------------------------------------------------------
 # You may define these options:
 #
 # - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among
 #			zsh (default), bash or ksh;
 # - WITH_ED: select an editor accepting '-display' (e.g. gvim, nedit);
 # - WITHOUT_ASTK_CLI: won't use the GUI from this machine;
 # - WITHOUT_GMSH: don't install GMSH (a mesh generator);
 # - WITHOUT_GRACE: don't install Grace (used to create 2D graph);
 # - WITH_MUMPS: install the interface between Code_Aster and MUMPS (experimental)
 #
 #-----------------------------------------------------------------------
 
 BUILD_DEPENDS+=	astk-serveur>0:cad/astk-serveur	\
 		${SHELL_INSTALL_ASTER}:shells/${SHIADEP}	\
 		gnproc:sysutils/coreutils			\
 		bash:shells/bash				\
 		getopt>0:misc/getopt				\
 		xterm:x11/xterm					\
 		${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 #		pylupdate5:textproc/py-qt5-xml
 LIB_DEPENDS+=	libhdf5.so:science/hdf5				\
 		libscotch.so:cad/scotch				\
 		libmetis.so:math/metis				\
 		libmed.so:french/med				\
 		libAsterInterface.so:science/tfel-edf
 RUN_DEPENDS+=	${SHELL_INSTALL_ASTER}:shells/${SHIADEP}	\
 		astk-serveur>0:cad/astk-serveur			\
 		xterm:x11/xterm					\
 		${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 
 USES=		bison blaslapack:openblas fortran gettext python:3.6+ qt:5 tk
 USE_BINUTILS=	yes
 USE_QT=		linguisttools_build
 
 #CONFLICTS_BUILD=${PYTHON_PKGNAMEPREFIX}cysignals-1.*
 
 HAS_CONFIGURE=	yes
 MAKE_ENV=	INCLUDES="${LOCALBASE}/include"	\
 		INCLUDEDIR="${LOCALBASE}/include"	\
 		LD_PRELOAD="${LOCALBASE}/lib/gcc${_GCC_VER}/libgcc_s.so.1"	\
 		PYTHONPATH="${PYTHON_SITELIBDIR}:${LOCALBASE}/aster/ASTK/ASTK_SERV"	\
 		PYTHONIOENCODING="utf-8" LANG=C LC_ALL="en_US.UTF-8"	\
 		LINKFLAGS="${LDFLAGS}" LD_LIBRARY_PATH="${LOCALBASE}/lib/gcc${_GCC_VER}"
 REINPLACE_ARGS=	-i ""
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 VER=		${PORTVERSION:R}
 VE=		${VER:R}
 WRKSRC=		${WRKDIR}/${PORTNAME}-full-src-${VER}
 
 PLIST_SUB=	VE=${VE}
 .if defined(WITHOUT_ASTK_CLI)
 SUB_FILES=	pkg-message.sans-astk
 .else
 SUB_FILES=	pkg-message
 .endif
 SUB_LIST=	tools_dir=${tools_dir}
 
 INTERACTIVE_SCRIPTS=	check_compilers.py setup.py
 
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300068
 BROKEN=	a larger value of ARG_MAX is needed for Code_Aster, please upgrade your system
 .endif
 
 .if ${ARCH} == "i386"
 FLAGARCH=	-DP_LINUX -DLINUX
 .else
 FLAGARCH=	-DLINUX64
 .endif
 
 .if defined(WITH_DEBUG)
 DEBUG_FLAGS=	--debug
 CFLAGS+=	-D__DEBUG_ALLOCATE__
 FFLAGS+=	-D__DEBUG_ALLOCATE__
 MAKE_ENV+=	FCFLAGS="-g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}"
 .else
 MAKE_ENV+=	FCFLAGS="${FFLAGS} -fno-tree-dse ${FLAGARCH}"
 .endif
 
 .if !defined(WITHOUT_ASTK_CLI)
 RUN_DEPENDS+=	astk-client>0:cad/astk-client
 PLIST_SUB+=	ASTK_CLIENT=""  ASTKDIR=${ASTKDIR}
 .else
 PLIST_SUB+=	ASTK_CLIENT="@comment " ASTKDIR=""
 .endif
 .if !defined(WITHOUT_GMSH)
 RUN_DEPENDS+=	${LOCALBASE}/bin/gmsh:cad/gmsh
 PLIST_SUB+=	GMSH=""
 .else
 PLIST_SUB+=	GMSH="@comment "
 .endif
 .if !defined(WITHOUT_GRACE)
 RUN_DEPENDS+=	xmgrace:math/grace
 PLIST_SUB+=	GRACE=""
 .else
 PLIST_SUB+=	GRACE="@comment "
 .endif
 .if defined(WITH_BOOST)
 LIB_DEPENDS+=	${PY_BOOST}
 .endif
 
 .if !defined(WITH_MPI)
 MPISEQ=		-lmpiseq
 MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord ${MPISEQ}
 LIB_DEPENDS+=	libmpiseq.so.5:math/mumps
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libscalapack.a:math/scalapack
 MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord -lscalapack -lexecinfo -L${LOCALBASE}/lib -lmpi
 LIB_DEPENDS+=	libcmumps.so.5:math/mumps
 .endif
 
 .if defined(WITH_MPI)
 LIB_DEPENDS+=	libmpi.so:net/mpich
 HOME_MPI=	${LOCALBASE}
 .endif
 
 .if defined(WITH_ZSH)
 SHIA=		zsh
 .elif defined(WITH_BASH)
 SHIA=		bash
 .elif defined(WITH_KSH)
 SHIA=		ksh93
 .elif exists(${LOCALBASE}/bin/zsh)
 SHIA=		zsh
 .elif exists(${LOCALBASE}/bin/bash)
 SHIA=		bash
 .elif exists(${LOCALBASE}/bin/ksh93)
 SHIA=		ksh93
 .else
 SHIA=		zsh
 .endif
 SHIADEP=	${SHIA}
 
 .if !defined(WITH_ED)
 . if exists(${LOCALBASE}/bin/nedit)
 WITH_ED=	nedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/nedit:editors/nedit
 . elif exists(${LOCALBASE}/bin/gvim)
 WITH_ED=	gvim
 RUN_DEPENDS+=	${LOCALBASE}/bin/gvim:editors/vim
 . elif exists(${LOCALBASE}/bin/emacs)
 WITH_ED=	emacs
 RUN_DEPENDS+=	${LOCALBASE}/bin/emacs:editors/emacs
 . elif exists(${LOCALBASE}/bin/gedit)
 WITH_ED=	gedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/gedit:editors/gedit
 . elif exists(${LOCALBASE}/bin/xedit)
 WITH_ED=	xedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/xedit:x11/xedit
 . else
 WITH_ED=	vi
 . endif
 .endif
 
 INST_DAT=	elements
 INST_SH=	as_run parallel_cp
 PFX2FIX=	bin/as_run etc/codeaster/aster etc/codeaster/profile.sh	\
 		${VE}/aster.conf ${VE}/lib/aster/aster_pkginfo.py	\
 		${VE}/share/aster/CTestTestfile.cmake			\
 		${VE}/include/aster/asterf_config.h			\
 		${VE}/include/aster/asterc_config.h			\
 		${VE}/share/aster/execute_codeaster			\
 		${VE}/share/aster/config.txt ${VE}/share/aster/profile.sh
 POSTPY2FIX=	post-patch-waf.engine post-patch-data__post_install
 POSTBASH2FIX=	execute_codeaster create_install_script
 inst_dir=	${PREFIX}/${PORTNAME}
 tools_dir=	${PREFIX}/${PORTNAME}/outils
 tools=		cmpfillin gpmetis graphchk m2gmetis mpmetis ndmetis gnuplot
 .if !defined(WITHOUT_GMSH)
 tools+=		gmsh
 .endif
 .if !defined(WITHOUT_GRACE)
 tools+=		gracebat xmgrace
 .endif
 v_ifdef=	${OPSYS:tu}
 SHELL_INSTALL_ASTER=	${LOCALBASE}/bin/${SHIA}
 tcl_dir=	${LOCALBASE}
 hdf_dir=	${LOCALBASE}
 lib_math=	"-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB} -lscotch -lscotcherr"
 
 LASTKDIR?=	${PORTNAME}/ASTK/ASTK_CLIENT
 ASTKDIR=	${LOCALBASE}/${LASTKDIR}
 
 BASH2RC=	products_data.py
 
 ExportPATH?=	/tmp/maillages
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|PREFER_SHARED_LIBS=False|PREFER_SHARED_LIBS=True|'	\
 		-e 's|/opt/aster|${STAGEDIR}${inst_dir}|' ${WRKSRC}/setup.cfg
 	${REINPLACE_CMD} -e 's|?ASTER_ROOT?|${STAGEDIR}${inst_dir}|'	\
 		${WRKSRC}/products.py
 	${REINPLACE_CMD} -e "s|'gfortran'|'${FC}'|g;s|'gcc'|'${CC}'|g"	\
 		-e "s|'g++'|'${CXX}'|g" ${WRKSRC}/check_compilers.py
 	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|"		\
 		-e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|"			\
 		-e "s|%%WRKDIR%%|${WRKDIR}|" ${WRKSRC}/as_setup.py
 .for sh in ${BASH2RC}
 	${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh}
 .endfor
 	${REINPLACE_CMD} -e 's|%%PYTHON_ABIVER%%|${PYTHON_ABIVER}|' ${WRKSRC}/setup.py
 	${ECHO_CMD} "_install_hdf5 = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_med = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_tcl = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_tk  = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_Pmw = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_Numeric = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_gmsh = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_gmsh2 = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_gibi = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_grace = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "XMGRACE = 'xmgrace'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_homard = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_eficas = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_astk = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_astk_serv = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_metis = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_mfront = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_mumps = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_omniORB = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_omniORBpy = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_pylotage = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_crpcrs = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_aster_Linux = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_scotch  = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "OPT_ENV = 'verbose=True'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "PYTHONPATH = '${PYTHON_SITELIBDIR}:${LOCALBASE}/aster/ASTK/ASTK_SERV'"\
 			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "PYTHON_INCLUDE = '${PYTHON_INCLUDEDIR}'"	>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_PYTHON = '${PYTHONBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "PYTHON_EXE = '${PYTHON_CMD}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_SCOTCH = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_METIS = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_GMSH = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_GIBI = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_HOMARD = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "INCLUDEDIR = ['${LOCALBASE}/include', '${LOCALBASE}/include/metis', ]"\
 			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_MUMPS = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_MFRONT = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MUMPSLIB = '${MUMPSLIB}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CC='${CC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "gcc='${CC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CXX='${CXX}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LD='${FC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "F90='${FC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MATHLIB='${lib_math} ${LDFLAGS} -lgfortran -lm -lkvm'"		\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic ${MPISEQ} -lc++ -lexecinfo -lutil -lpthread -lz'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "SYSLIB='-lpthread -lz'"			>> ${WRKSRC}/setup.cfg
 .if defined(WITH_MPI)
 	${ECHO_CMD} "HOME_MPI = '${HOME_MPI}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MPIRUN = 'mpirun'"				>> ${WRKSRC}/setup.cfg
 .else
 	${ECHO_CMD} "HOME_MPI = ''"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MPIRUN = ''"				>> ${WRKSRC}/setup.cfg
 .endif
 	${ECHO_CMD} "HOME_ZMAT = ''"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_HDF='${hdf_dir}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_MED='${LOCALBASE}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_TCL_TK='${tcl_dir}'"			>> ${WRKSRC}/setup.cfg
 .if defined(WITH_BOOST)
 	${ECHO_CMD} "HOME_BOOST='${LOCALBASE}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LIBPATH_BOOST='${LOCALBASE}/lib'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LIBNAME_BOOST='${PY_BOOST_LIB}'"		>> ${WRKSRC}/setup.cfg
 .endif
 	${ECHO_CMD} "BLASLIB='${_BLASLIB}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LAPACKLIB='lapack'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "GZIP='/usr/bin/gzip'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "SHELL_EXECUTION='${SHELL_INSTALL_ASTER}'"	>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "TERMINAL='xterm'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "EDITOR='${WITH_ED}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CXXFLAGS='${CXXFLAGS}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CXXFLAGS_DBG='${CXXFLAGS:C|-O2|--debug|}'"	>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LDFLAGS='${LDFLAGS}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "FFLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "FFLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 .if defined(WITH_MPI)
 	${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 .else
 	${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 .endif
 .for is in ${INTERACTIVE_SCRIPTS}
 	${REINPLACE_CMD} -e '/should_continue()/d'		\
 		${WRKSRC}/${is}
 .endfor
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-configure:
 	(cd ${CONFIGURE_WRKSRC}	\
 	&& TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.py ${DEBUG_FLAGS}	\
 		--prefix=${STAGEDIR}${inst_dir} test | tee ${CONFIGURE_LOG})
 	@${ECHO_MSG} "---------------- Debug ------------------"
 	${CAT} ${CONFIGURE_WRKSRC}/setup.log
 	@${ECHO_MSG} "------------ Fin debug ------------------"
 
 post-configure:
 	${MKDIR} ${STAGEDIR}${inst_dir}/etc
 	${CP} -R ${LOCALBASE}/aster/etc/codeaster ${STAGEDIR}${inst_dir}/etc/
 	${ECHO_CMD} "#?vers : VVV?" >> ${STAGEDIR}${inst_dir}/etc/codeaster/aster
 	${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin		\
 		${LOCALBASE}/aster/ASTK/ASTK_SERV/asrun		\
 		${LOCALBASE}/aster/ASTK/ASTK_SERV/share		\
 		${STAGEDIR}${inst_dir}
 	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|'	\
 		${STAGEDIR}${inst_dir}/bin/as_run
 	${MV} ${STAGEDIR}${inst_dir}/etc/codeaster/profile_astk.sh	\
 		${STAGEDIR}${inst_dir}/etc/codeaster/profile.sh
 .for sf in etc/codeaster/profile.sh asrun/installation.py
 	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster/ASTK/ASTK_SERV|${STAGEDIR}${inst_dir}|g'	\
 		-e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|g'	\
 		${STAGEDIR}${inst_dir}/${sf}
 .endfor
 
 pre-build:
 	${MKDIR} ${WRKDIR}/post_patches
 	${CP} ${FILESDIR}/post-patch-* ${WRKDIR}/post_patches/
 .for pp in ${POSTPY2FIX}
 	${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKDIR}/post_patches/${pp}
 .endfor
 
 do-build:
 	(cd ${BUILD_WRKSRC} &&	\
 	TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.py ${DEBUG_FLAGS} install aster	\
 		--prefix=${STAGEDIR}${inst_dir} | tee ${BUILD_WRKSRC}/build.log)
 
 do-install:
 	# build: already did the installation
 	@${DO_NADA}
 
 post-install:
 .for f in ${PFX2FIX}
 	${REINPLACE_CMD} -e 's|${STAGEDIR}||g' ${STAGEDIR}${inst_dir}/${f}
 .endfor
 .for f in ${POSTBASH2FIX}
 	${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|'	\
 		${STAGEDIR}${inst_dir}/${VE}/share/aster/${f}
 .endfor
 	${REINPLACE_CMD} -e 's|LINUX64|LINUX64, FREEBSD|'	\
 		${STAGEDIR}${inst_dir}/asrun/core/default_configuration.py
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py	\
 		-d ${PREFIX} -f ${inst_dir:S|${PREFIX}/||})
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py	\
 		-d ${PREFIX} -f ${inst_dir:S|${PREFIX}/||})
 	${CP} -p ${STAGEDIR}${inst_dir}/${VE}/bin/aster					\
 		${STAGEDIR}${inst_dir}/${VE}/bin/asterd
 	${STRIP_CMD} ${STAGEDIR}${inst_dir}/${VE}/bin/aster
 	${SED} -e 's|%%VER%%|${VE}|' < ${FILESDIR}/astout.export	\
 		> ${STAGEDIR}${inst_dir}/${VE}/astout.export
 	(cd ${STAGEDIR}${inst_dir} &&	\
 		${LN} -fs ${VE} ${STAGEDIR}${inst_dir}/STA${VE})
 .for conf in config.txt profile.sh
 	(cd ${STAGEDIR} && ${LN} -fs ${inst_dir}/${VE}/share/aster/${conf}	\
 		${STAGEDIR}${inst_dir}/STA${VE}/${conf})
 .endfor
 	${MKDIR} ${STAGEDIR}${tools_dir}
 .for outil in ${tools}
 	${LN} -fs ${LOCALBASE}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil}
 .endfor
 .if !defined(WITHOUT_ASTK_CLI)
 	${MKDIR} ${STAGEDIR}${PREFIX}/aster/ASTK/ASTK_SERV/etc/codeaster/astkrc
 	${LN} -fs ${ASTKDIR}/etc/astkrc/*	\
 		${STAGEDIR}${PREFIX}/aster/ASTK/ASTK_SERV/etc/codeaster/astkrc
 . for outil in astk bsf
 	${LN} -fs ${ASTKDIR}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil}
 . endfor
 .endif
 	${MKDIR} ${WRKDIR}/AvoidConflictWithASTK
 .for f in aster.install_${VE} profile.sh
 	${MV} ${STAGEDIR}${inst_dir}/etc/codeaster/${f} ${WRKDIR}/AvoidConflictWithASTK/
 .endfor
 	${RM} -r ${STAGEDIR}${inst_dir}/etc/codeaster/*
 .for f in aster.install_${VE} profile.sh
 	${MV} ${WRKDIR}/AvoidConflictWithASTK/${f} ${STAGEDIR}${inst_dir}/etc/codeaster/
 .endfor
 .for f in aster_pkginfo.cpython-${PYTHON_SUFFIX}.pyc aster_pkginfo.cpython-${PYTHON_SUFFIX}.opt-1.pyc
 	${RM} ${STAGEDIR}${inst_dir}/${VE}/lib/aster/__pycache__/${f}
 .endfor
 	${FIND} ${STAGEDIR}${PREFIX} -name "*.bak" -delete
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 	@${ECHO_MSG} "Note: homard must be installed to run some steps succesfully."
 	${MKDIR} ${ExportPATH}
 	${CP} ${inst_dir}/${VE}/astout.export /tmp/
 	(cd ${inst_dir}/${VE} &&	\
 	${LOCALBASE}/aster/bin/as_run --list --all --vers=${VE}	\
 		--filter='"I" not in testlist' -o /tmp/list_seq )
 	(cd /tmp &&	\
 	${LOCALBASE}/aster/bin/as_run astout.export) || ${TRUE}
 	@${ECHO_MSG} "Check /tmp/resu_test/NOOK"
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/french/med/Makefile b/french/med/Makefile
index 6984696c24d5..414b0357faac 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	med
 DISTVERSION=	4.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	french science
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Modelisation et Echanges de Donnees
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libhdf5-110.so:science/hdf5-110
 
 USES=		fortran gmake libtool tk
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USE_CXXSTD=	gnu++98
 CFLAGS+=	-fPIC
 CONFIGURE_ARGS=	--disable-python \
 		--with-hdf5=${LOCALBASE} \
 		--with-hdf5-include=${LOCALBASE}/include/hdf5-110
 CONFIGURE_ENV=	WISH=${WISH}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 TEST_WRKSRC=	${WRKSRC}/tests
 TEST_TARGET=	check  # XXX: one fail
 TEST_ENV=	${MAKE_ENV} HDF5_DISABLE_VERSION_CHECK=1
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 LIBVER=		11.0.0
 PLIST_SUB+=	VE=${LIBVER}
 
 PATCH_TK_SCRIPTS=	tools/mdump/xmdump2.in tools/mdump/xmdump3.in
 
 DOC2FIX=	. dox gif html html.dox jpg png
 TST2FIX=	c f
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|' \
 		${WRKSRC}/include/2.3.6/med_outils.h \
 		${WRKSRC}/include/med_outils.h
 .for dd in ${DOC2FIX}
 	${REINPLACE_CMD} -e 's|docdir = $$(datadir)/doc|docdir = @docdir@|'	\
 		${WRKSRC}/doc/${dd}/Makefile.in
 .endfor
 .for dd in ${TST2FIX}
 	${FIND} ${WRKSRC}/tests -name Makefile.in | ${XARGS}	\
 	${REINPLACE_CMD} -e 's|test${dd}dir = $$(bindir)/test|test${dd}dir = ${EXAMPLESDIR}/test|' \
 			-e 's|unittestsdir = $$(bindir)/unit|unittestsdir = ${EXAMPLESDIR}/unit|' \
 			-e 's|usescasesdir = $$(bindir)/uses|usescasesdir = ${EXAMPLESDIR}/uses|'
 .endfor
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} -e '/SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
 
 post-patch-EXAMPLES-off:
 	${REINPLACE_CMD} -e '/SUBDIRS/ s|tests||' ${WRKSRC}/Makefile.in
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf mdump3 mdump	\
 		&& ${LN} -sf xmdump3 xmdump)
 
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.mk>
diff --git a/graphics/alembic/Makefile b/graphics/alembic/Makefile
index 6a179f2352f6..f834e8c3ff4b 100644
--- a/graphics/alembic/Makefile
+++ b/graphics/alembic/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	alembic
 PORTVERSION=	1.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Open framework for storing and sharing graphic scene data
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libImath.so:math/Imath
 LIB_DEPENDS+=	libsz.so:science/libaec
 
 USES=		cmake compiler:c++11-lang
 USE_CXXSTD=	c++11
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	HDF5
 OPTIONS_DEFAULT=	HDF5
 OPTIONS_SUB=	yes
 
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CMAKE_ON=	-DUSE_HDF5:BOOL=ON
 
 PLIST_FILES=	lib/libAlembic.so.${PORTVERSION} \
 		lib/libAlembic.so.${PORTVERSION:R}
 
 do-test:
 	@cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS}
 
 .include <bsd.port.mk>
diff --git a/graphics/blender-lts29/Makefile b/graphics/blender-lts29/Makefile
index c357b1e75b3b..c0debe856cb5 100644
--- a/graphics/blender-lts29/Makefile
+++ b/graphics/blender-lts29/Makefile
@@ -1,233 +1,233 @@
 PORTNAME=	blender
 DISTVERSION=	2.93.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
 		http://public.planetmirror.com/pub/blender/source/
 # long term support v2.9x
 PKGNAMESUFFIX=	-lts29
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT=	3D modeling/rendering/animation package - LTS
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/doc/license/GPL3-license.txt
 
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	uses 64bit atomic functions
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
 		libboost_regex.so:devel/boost-libs
 RUN_DEPENDS=	${PYNUMPY}
 # libboost_regex.so just acts as a placeholder; several boost
 # libraries are used, if either of the most common options in blender
 # are set. We will pull boost in just to be on the safe side.
 
 USES=		cmake compiler:c++17-lang cpe gl jpeg python:3.9 shebangfix \
 		tar:xz xorg
 USE_XORG=	x11 xext xfixes xmu xrender
 USE_GL=		gl glu glew
 
 INSTALLS_ICONS=	yes
 CMAKE_OFF=	WITH_PYTHON_INSTALL \
 		WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \
 		WITH_CYCLES_LOGGING
 
 SHEBANG_FILES=	release/bin/blender-thumbnailer.py \
 		release/scripts/modules/bl_i18n_utils/merge_po.py \
 		release/scripts/modules/bl_i18n_utils/utils_rtl.py \
 		release/scripts/modules/blend_render_info.py
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
 CFLAGS_gcc=	-Wno-float-conversion
 CFLAGS_i386=	-march=i586
 CXXFLAGS_i386=	-march=i586
 
 # prevent conflict with other blender versions
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 PLIST_SUB+=	VER=${DISTVERSION:R} SUFFIX=${PKGNAMESUFFIX}
 SUB_FILES=	blender
 SUB_LIST=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} VER=${DISTVERSION:R} \
 		SUFFIX=${PKGNAMESUFFIX}
 OPTIONS_SUB=	yes
 
 .include "${.CURDIR}/Makefile.options"
 
 ALEMBIC_CMAKE_BOOL=		WITH_ALEMBIC
 ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic
 # note that this needs to be set to match alembics hdf5 option
 ALEMBIC_HDF5_REQUIRES=		ALEMBIC
 ALEMBIC_HDF5_CMAKE_BOOL=	WITH_ALEMBIC_HDF5
 ALEMBIC_HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 AVI_CMAKE_BOOL=			WITH_CODEC_AVI
 BULLET_CMAKE_BOOL=		WITH_BULLET
 CAMERATRACK_CMAKE_BOOL=		WITH_LIBMV WITH_SYSTEM_GLOG
 CAMERATRACK_LIB_DEPENDS=	libunwind.so:devel/libunwind \
 				libglog.so:devel/glog
 CAMERATRACK_ONLY_FOR_ARCHS=	i386 amd64 aarch64 powerpc64 powerpc64le
 CAMERATRACK_ONLY_FOR_ARCHS_REASON=	libunwind only supports x86/amd64/aarch64/powerpc64/powerpc64le
 CINEON_CMAKE_BOOL=		WITH_IMAGE_CINEON
 COLLADA_CMAKE_BOOL=		WITH_OPENCOLLADA
 COLLADA_LIB_DEPENDS=		libOpenCOLLADABaseUtils.so:graphics/opencollada \
 				libpcre.so:devel/pcre
 COLLADA_USE=			GNOME=libxml2
 COLLADA_USES=			gnome
 COMPOSITOR_CMAKE_BOOL=		WITH_COMPOSITOR
 CYCLES_IMPLIES=			OPENIMAGEIO TBB
 CYCLES_CMAKE_BOOL=		WITH_CYCLES
 CYCLES_LIB_DEPENDS=		libpugixml.so:textproc/pugixml
 CYCLESEMBR_IMPLIES=		CYCLES
 CYCLESEMBR_CMAKE_BOOL=		WITH_CYCLES_EMBREE
 CYCLESEMBR_LIB_DEPENDS=		libembree3.so:graphics/embree
 CYCLESEMBR_ONLY_FOR_ARCHS=	amd64
 CYCLESEMBR_ONLY_FOR_ARCHS_REASON=	embree only supports amd64
 CYCLESOSL_IMPLIES=		CYCLES
 CYCLESOSL_CMAKE_BOOL=		WITH_CYCLES_OSL WITH_LLVM
 CYCLESOSL_CMAKE_ON=		-DLLVM_STATIC:BOOL=OFF \
 				-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \
 				-DOSL_SHADER_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/shaders"
 CYCLESOSL_BUILD_DEPENDS=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
 CYCLESOSL_LIB_DEPENDS=		liboslcomp.so:graphics/openshadinglanguage
 CYCLESOSL_RUN_DEPENDS=		llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
 DDS_CMAKE_BOOL=			WITH_IMAGE_DDS
 DRACO_CMAKE_BOOL=		WITH_DRACO
 DRACO_USE=			LDCONFIG=${PYTHON_SITELIBDIR}
 EBOOL_CMAKE_BOOL=		WITH_GMP
 EBOOL_LIB_DEPENDS=		libgmp.so:math/gmp
 FFMPEG_CMAKE_BOOL=		WITH_CODEC_FFMPEG
 FFMPEG_LIB_DEPENDS=		libavutil.so:multimedia/ffmpeg \
 				libflite.so:audio/flite \
 				libpulse.so:audio/pulseaudio
 FFMPEG_LDFLAGS=			-L${LOCALBASE}/lib -lflite -lflite_cmu_us_kal -lflite_cmulex -lflite_usenglish
 FFTW3_CMAKE_BOOL=		WITH_FFTW3
 FFTW3_LIB_DEPENDS=		libfftw3.so:math/fftw3
 FRAMESERVER_CMAKE_BOOL=		WITH_IMAGE_FRAMESERVER
 FREESTYLE_CMAKE_BOOL=		WITH_FREESTYLE
 HDR_CMAKE_BOOL=			WITH_IMAGE_HDR
 HEADLESS_PREVENTS=		MENU XINPUT XF86VMODE
 HEADLESS_PREVENTS_MSG=		X11 options can't be used in headless mode
 HEADLESS_CMAKE_BOOL=		WITH_HEADLESS
 INPUT_NDOF_CMAKE_BOOL=		WITH_INPUT_NDOF
 JACK_CMAKE_BOOL=		WITH_JACK
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 LZO_CMAKE_BOOL=			WITH_LZO
 LZMA_CMAKE_BOOL=		WITH_LZMA
 MENU_USES=			desktop-file-utils
 MOD_BOOLEAN_CMAKE_BOOL=		WITH_MOD_BOOLEAN
 MOD_FLUID_IMPLIES=		TBB
 MOD_FLUID_CMAKE_BOOL=		WITH_MOD_FLUID
 MOD_OCEANSIM_IMPLIES=		FFTW3
 MOD_OCEANSIM_CMAKE_BOOL=	WITH_MOD_OCEANSIM
 MOD_REMESH_CMAKE_BOOL=		WITH_MOD_REMESH
 MOD_SMOKE_CMAKE_BOOL=		WITH_MOD_SMOKE
 NLS_CMAKE_BOOL=			WITH_INTERNATIONAL
 # Use iconv:wchar_t to force the usage of iconv from ports.
 # libboost_locale.so uses libiconv_open, while we only provide
 # iconv_open in 10.x+
 NLS_USES=			gettext iconv:lib,wchar_t
 OPENAL_CMAKE_BOOL=		WITH_OPENAL
 OPENAL_USES=			openal:al,alut
 OPENCOLORIO_CMAKE_BOOL=		WITH_OPENCOLORIO
 OPENCOLORIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio \
 				libyaml-cpp.so:devel/yaml-cpp \
 				libtinyxml.so:textproc/tinyxml \
 				libexpat.so:textproc/expat2 \
 				libpystring.so:devel/pystring
 OPENEXR_CMAKE_BOOL=		WITH_IMAGE_OPENEXR
 OPENEXR_CFLAGS=			-I${LOCALBASE}/include/Imath
 OPENEXR_LIB_DEPENDS=		libImath.so:math/Imath \
 				libOpenEXR.so:graphics/openexr
 OPENIMAGEIO_IMPLIES=		OPENEXR TIFF
 OPENIMAGEIO_CMAKE_BOOL=		WITH_OPENIMAGEIO
 OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
 OPENIMAGEIO_LDFLAGS=		-lOpenImageIO_Util
 OPENIMAGEDN_IMPLIES=		TBB
 OPENIMAGEDN_CMAKE_BOOL=		WITH_OPENIMAGEDENOISE
 OPENIMAGEDN_LIB_DEPENDS=	libOpenImageDenoise.so:graphics/oidn
 OPENIMAGEDN_ONLY_FOR_ARCHS=	amd64
 OPENIMAGEDN_ONLY_FOR_ARCHS_REASON=	oidn only supports amd64
 OPENJPEG_CMAKE_BOOL=		WITH_IMAGE_OPENJPEG
 OPENJPEG_LIB_DEPENDS=		libopenjp2.so:graphics/openjpeg
 # openmp usually works on amd64
 OPENMP_CMAKE_BOOL=		WITH_OPENMP
 OPENSUBDIV_CMAKE_BOOL=		WITH_OPENSUBDIV
 OPENSUBDIV_LIB_DEPENDS=		libosdCPU.so:graphics/opensubdiv
 OPENVDB_IMPLIES=		TBB
 OPENVDB_CMAKE_BOOL=		WITH_OPENVDB WITH_OPENVDB_BLOSC
 OPENVDB_LIB_DEPENDS=		libblosc.so:archivers/c-blosc \
 				libopenvdb.so:misc/openvdb
 RAYOPTIMIZATION_CMAKE_BOOL=	WITH_RAYOPTIMIZATION
 SDL_CMAKE_BOOL=			WITH_SDL
 SDL_USE=			SDL=sdl2
 SDL_USES=			sdl
 SNDFILE_CMAKE_BOOL=		WITH_CODEC_SNDFILE
 SNDFILE_LIB_DEPENDS=		libsndfile.so:audio/libsndfile
 TBB_CMAKE_BOOL=			WITH_TBB
 TBB_LIB_DEPENDS=		libtbb.so:devel/onetbb
 TIFF_CMAKE_BOOL=		WITH_IMAGE_TIFF
 TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
 TRACE_CMAKE_BOOL=		WITH_POTRACE
 TRACE_LIB_DEPENDS=		libpotrace.so:graphics/libpotrace
 XINPUT_CMAKE_BOOL=		WITH_X11_XINPUT
 XINPUT_USE=			XORG=xi
 XF86VMODE_CMAKE_BOOL=		WITH_X11_XF86VMODE
 XF86VMODE_USE=			XORG=xi,xxf86vm
 
 .if defined(WITH_DEBUG)
 CMAKE_ARGS+=		-DWITH_GHOST_DEBUG:BOOL=ON
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc*} || ${ARCH:Mriscv64*}
 CMAKE_ARGS+=	-DWITH_CPU_SIMD:BOOL=OFF
 .endif
 
 .if ${LLVM_DEFAULT:M[678]0}
 LLVM_VER=	90
 .else
 LLVM_VER=	${LLVM_DEFAULT}
 .endif
 
 post-build:
 	@(cd ${WRKSRC}/doc/manpage && \
 		${PYTHON_CMD} blender.1.py \
 			--blender ${INSTALL_WRKSRC}/bin/blender \
 			--output ${INSTALL_WRKSRC}/bin/${PORTNAME}.1)
 
 post-install:
 	${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/share/man/man1
 	# rename files to prevent conflict with other blender versions
 	${MV} ${STAGEDIR}${PREFIX}/share/blender \
 		${STAGEDIR}${PREFIX}/share/blender${PKGNAMESUFFIX}
 	${MV} ${STAGEDIR}${PREFIX}/share/doc/blender \
 		${STAGEDIR}${PREFIX}/share/doc/blender${PKGNAMESUFFIX}
 	${MV} ${STAGEDIR}${PREFIX}/bin/blender \
 		${STAGEDIR}${PREFIX}/bin/blender-bin${PKGNAMESUFFIX}
 	${INSTALL_SCRIPT} ${WRKDIR}/blender ${STAGEDIR}/${PREFIX}/bin/blender${PKGNAMESUFFIX}
 	${MV} ${STAGEDIR}${PREFIX}/bin/blender-thumbnailer.py \
 		${STAGEDIR}${PREFIX}/bin/blender${PKGNAMESUFFIX}-thumbnailer.py
 	${MV} ${STAGEDIR}${PREFIX}/share/man/man1/blender.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1/blender${PKGNAMESUFFIX}.1
 	${MV} ${STAGEDIR}${PREFIX}/share/applications/blender.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/blender${PKGNAMESUFFIX}.desktop
 	${MV} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/blender.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/blender${PKGNAMESUFFIX}.svg
 	${MV} ${STAGEDIR}${PREFIX}/share/icons/hicolor/symbolic/apps/blender-symbolic.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/symbolic/apps/blender${PKGNAMESUFFIX}-symbolic.svg
 
 post-install-DRACO-on:
 	# move draco pylib into site-packages
 	${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}/
 	${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/libextern_draco.so ${STAGEDIR}/${PYTHON_SITELIBDIR}/
 	${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/libextern_draco.so
 	@${RM} -R ${STAGEDIR}/${DATADIR}/${DISTVERSION:R}/python
 
 post-install-MENU-on:
 	@-update-desktop-database -q
 
 .include <bsd.port.mk>
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 3373d6dbcf89..0e0cd857cedd 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,215 +1,216 @@
 PORTNAME=	blender
 DISTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
 		http://public.planetmirror.com/pub/blender/source/
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT=	3D modeling/rendering/animation package
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/doc/license/GPL3-license.txt
 
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	uses 64bit atomic functions
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
 		libboost_regex.so:devel/boost-libs \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	${PYNUMPY}
 # libboost_regex.so just acts as a placeholder; several boost
 # libraries are used, if either of the most common options in blender
 # are set. We will pull boost in just to be on the safe side.
 
 USES=		cmake compiler:c++17-lang cpe gl jpeg python:3.10 shebangfix \
 		tar:xz xorg
 USE_XORG=	x11 xext xfixes xmu xrender
 USE_GL=		gl glu glew
 
 CMAKE_OFF=	WITH_PYTHON_INSTALL \
 		WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \
 		WITH_CYCLES_LOGGING WITH_USD
 
 SHEBANG_FILES=	release/scripts/modules/bl_i18n_utils/merge_po.py \
 		release/scripts/modules/bl_i18n_utils/utils_rtl.py \
 		release/scripts/modules/blend_render_info.py
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
 CFLAGS_gcc=	-Wno-float-conversion
 CFLAGS_i386=	-march=i586
 CXXFLAGS_i386=	-march=i586
 
 PLIST_SUB+=	VER=${DISTVERSION:R}
 OPTIONS_SUB=	yes
 SUB_FILES=	blender
 
 .include "${.CURDIR}/Makefile.options"
 
 ALEMBIC_CMAKE_BOOL=		WITH_ALEMBIC
 ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic
 # note that this needs to be set to match alembics hdf5 option
 ALEMBIC_HDF5_REQUIRES=		ALEMBIC
 ALEMBIC_HDF5_CMAKE_BOOL=	WITH_ALEMBIC_HDF5
 ALEMBIC_HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 AVI_CMAKE_BOOL=			WITH_CODEC_AVI
 BULLET_CMAKE_BOOL=		WITH_BULLET
 CAMERATRACK_CMAKE_BOOL=		WITH_LIBMV WITH_SYSTEM_GLOG
 CAMERATRACK_LIB_DEPENDS=	libunwind.so:devel/libunwind \
 				libglog.so:devel/glog
 CAMERATRACK_ONLY_FOR_ARCHS=	i386 amd64 aarch64 powerpc64 powerpc64le
 CAMERATRACK_ONLY_FOR_ARCHS_REASON=	libunwind only supports x86/amd64/aarch64/powerpc64/powerpc64le
 CINEON_CMAKE_BOOL=		WITH_IMAGE_CINEON
 COLLADA_CMAKE_BOOL=		WITH_OPENCOLLADA
 COLLADA_LIB_DEPENDS=		libOpenCOLLADABaseUtils.so:graphics/opencollada \
 				libpcre.so:devel/pcre
 COLLADA_USE=			GNOME=libxml2
 COLLADA_USES=			gnome
 COMPOSITOR_CMAKE_BOOL=		WITH_COMPOSITOR
 CYCLES_IMPLIES=			OPENIMAGEIO TBB
 CYCLES_CMAKE_BOOL=		WITH_CYCLES
 CYCLESEMBR_IMPLIES=		CYCLES
 CYCLESEMBR_CMAKE_BOOL=		WITH_CYCLES_EMBREE
 CYCLESEMBR_LIB_DEPENDS=		libembree3.so:graphics/embree
 CYCLESEMBR_ONLY_FOR_ARCHS=	amd64
 CYCLESEMBR_ONLY_FOR_ARCHS_REASON=	embree only supports amd64
 CYCLESOSL_IMPLIES=		CYCLES
 CYCLESOSL_CMAKE_BOOL=		WITH_CYCLES_OSL WITH_LLVM
 CYCLESOSL_CMAKE_ON=		-DLLVM_STATIC:BOOL=OFF \
 				-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \
 				-DOSL_SHADER_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/shaders"
 CYCLESOSL_BUILD_DEPENDS=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
 CYCLESOSL_LIB_DEPENDS=		liboslcomp.so:graphics/openshadinglanguage
 CYCLESOSL_RUN_DEPENDS=		llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
 DDS_CMAKE_BOOL=			WITH_IMAGE_DDS
 DRACO_CMAKE_BOOL=		WITH_DRACO
 DRACO_USE=			LDCONFIG=${PYTHON_SITELIBDIR}
 EBOOL_CMAKE_BOOL=		WITH_GMP
 EBOOL_LIB_DEPENDS=		libgmp.so:math/gmp
 FFMPEG_CMAKE_BOOL=		WITH_CODEC_FFMPEG
 FFMPEG_LIB_DEPENDS=		libavutil.so:multimedia/ffmpeg \
 				libflite.so:audio/flite
 FFMPEG_LDFLAGS=			-L${LOCALBASE}/lib -lflite -lflite_cmu_us_kal -lflite_cmulex -lflite_usenglish
 FFTW3_CMAKE_BOOL=		WITH_FFTW3
 FFTW3_LIB_DEPENDS=		libfftw3.so:math/fftw3
 FRAMESERVER_CMAKE_BOOL=		WITH_IMAGE_FRAMESERVER
 FREESTYLE_CMAKE_BOOL=		WITH_FREESTYLE
 HARU_CMAKE_BOOL=		WITH_HARU
 HARU_LIB_DEPENDS=		libhpdf.so:print/libharu
 HDR_CMAKE_BOOL=			WITH_IMAGE_HDR
 HEADLESS_PREVENTS=		MENU XINPUT XF86VMODE
 HEADLESS_PREVENTS_MSG=		X11 options can't be used in headless mode
 HEADLESS_CMAKE_BOOL=		WITH_HEADLESS
 INPUT_NDOF_CMAKE_BOOL=		WITH_INPUT_NDOF
 JACK_CMAKE_BOOL=		WITH_JACK WITH_JACK_DYNLOAD
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 LZO_CMAKE_BOOL=			WITH_LZO
 LZMA_CMAKE_BOOL=		WITH_LZMA
 MENU_USES=			desktop-file-utils
 MOD_BOOLEAN_CMAKE_BOOL=		WITH_MOD_BOOLEAN
 MOD_FLUID_IMPLIES=		TBB
 MOD_FLUID_CMAKE_BOOL=		WITH_MOD_FLUID
 MOD_OCEANSIM_IMPLIES=		FFTW3
 MOD_OCEANSIM_CMAKE_BOOL=	WITH_MOD_OCEANSIM
 MOD_REMESH_CMAKE_BOOL=		WITH_MOD_REMESH
 MOD_SMOKE_CMAKE_BOOL=		WITH_MOD_SMOKE
 NLS_CMAKE_BOOL=			WITH_INTERNATIONAL
 # Use iconv:wchar_t to force the usage of iconv from ports.
 # libboost_locale.so uses libiconv_open, while we only provide
 # iconv_open in 10.x+
 NLS_USES=			gettext iconv:lib,wchar_t
 OPENAL_CMAKE_BOOL=		WITH_OPENAL
 OPENAL_USES=			openal:al,alut
 OPENCOLORIO_CMAKE_BOOL=		WITH_OPENCOLORIO
 OPENCOLORIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio \
 				libyaml-cpp.so:devel/yaml-cpp \
 				libtinyxml.so:textproc/tinyxml \
 				libexpat.so:textproc/expat2 \
 				libpystring.so:devel/pystring
 OPENEXR_CMAKE_BOOL=		WITH_IMAGE_OPENEXR
 OPENEXR_CFLAGS=			-I${LOCALBASE}/include/Imath
 OPENEXR_LIB_DEPENDS=		libImath.so:math/Imath \
 				libOpenEXR.so:graphics/openexr
 OPENIMAGEIO_IMPLIES=		OPENEXR TIFF PUGIXML
 OPENIMAGEIO_CMAKE_BOOL=		WITH_OPENIMAGEIO
 OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
 OPENIMAGEIO_LDFLAGS=		-lOpenImageIO_Util
 OPENIMAGEDN_IMPLIES=		TBB
 OPENIMAGEDN_CMAKE_BOOL=		WITH_OPENIMAGEDENOISE
 OPENIMAGEDN_LIB_DEPENDS=	libOpenImageDenoise.so:graphics/oidn
 OPENIMAGEDN_ONLY_FOR_ARCHS=	amd64
 OPENIMAGEDN_ONLY_FOR_ARCHS_REASON=	oidn only supports amd64
 OPENJPEG_CMAKE_BOOL=		WITH_IMAGE_OPENJPEG
 OPENJPEG_LIB_DEPENDS=		libopenjp2.so:graphics/openjpeg
 # openmp usually works on amd64
 OPENMP_CMAKE_BOOL=		WITH_OPENMP
 OPENSUBDIV_CMAKE_BOOL=		WITH_OPENSUBDIV
 OPENSUBDIV_LIB_DEPENDS=		libosdCPU.so:graphics/opensubdiv
 OPENVDB_IMPLIES=		TBB
 OPENVDB_CMAKE_BOOL=		WITH_OPENVDB WITH_OPENVDB_BLOSC
 OPENVDB_LIB_DEPENDS=		libblosc.so:archivers/c-blosc \
 				libopenvdb.so:misc/openvdb
 PUGIXML_CMAKE_BOOL=		WITH_PUGIXML
 PUGIXML_LIB_DEPENDS=		libpugixml.so:textproc/pugixml
 PULSEAUDIO_CMAKE_BOOL=		WITH_PULSEAUDIO WITH_PULSEAUDIO_DYNLOAD
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 QUADRIFLOW_CMAKE_BOOL=		WITH_QUADRIFLOW
 RAYOPTIMIZATION_CMAKE_BOOL=	WITH_RAYOPTIMIZATION
 SDL_CMAKE_BOOL=			WITH_SDL WITH_SDL_DYNLOAD
 SDL_USE=			SDL=sdl2
 SDL_USES=			sdl
 SNDFILE_CMAKE_BOOL=		WITH_CODEC_SNDFILE
 SNDFILE_LIB_DEPENDS=		libsndfile.so:audio/libsndfile
 TBB_CMAKE_BOOL=			WITH_TBB
 TBB_LIB_DEPENDS=		libtbb.so:devel/onetbb
 THUMBNAILER_CMAKE_BOOL=		WITH_BLENDER_THUMBNAILER
 TIFF_CMAKE_BOOL=		WITH_IMAGE_TIFF
 TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
 TRACE_CMAKE_BOOL=		WITH_POTRACE
 TRACE_LIB_DEPENDS=		libpotrace.so:graphics/libpotrace
 XINPUT_CMAKE_BOOL=		WITH_X11_XINPUT
 XINPUT_USE=			XORG=xi
 XF86VMODE_CMAKE_BOOL=		WITH_X11_XF86VMODE
 XF86VMODE_USE=			XORG=xi,xxf86vm
 
 .if defined(WITH_DEBUG)
 CMAKE_ARGS+=		-DWITH_GHOST_DEBUG:BOOL=ON
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc*} || ${ARCH:Mriscv64*}
 CMAKE_ARGS+=		-DWITH_CPU_SIMD:BOOL=OFF
 .endif
 
 .if ${LLVM_DEFAULT:M[678]0}
 LLVM_VER=	90
 .else
 LLVM_VER=	${LLVM_DEFAULT}
 .endif
 
 post-build:
 	@(cd ${WRKSRC}/doc/manpage && \
 		${PYTHON_CMD} blender.1.py \
 			--blender ${INSTALL_WRKSRC}/bin/blender \
 			--output ${INSTALL_WRKSRC}/bin/${PORTNAME}.1)
 
 post-install:
 	${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/share/man/man1
 	${MV} ${STAGEDIR}/${PREFIX}/bin/blender ${STAGEDIR}/${PREFIX}/bin/blender-bin
 	${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' ${WRKDIR}/blender
 	${INSTALL_SCRIPT} ${WRKDIR}/blender ${STAGEDIR}/${PREFIX}/bin/blender
 
 post-install-DRACO-on:
 	# move draco pylib into site-packages
 	${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}/
 	${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/libextern_draco.so ${STAGEDIR}/${PYTHON_SITELIBDIR}/
 	${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/libextern_draco.so
 	@${RM} -R ${STAGEDIR}/${DATADIR}/${DISTVERSION:R}/python
 
 post-install-MENU-on:
 	@-update-desktop-database -q
 
 .include <bsd.port.mk>
diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile
index fabacf4568bf..73fd7e1543aa 100644
--- a/graphics/f3d/Makefile
+++ b/graphics/f3d/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	f3d
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast and minimalist 3D viewer
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf \
 		libvtkCommonMisc-9.1.so:math/vtk9
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gl tar:bzip2 xorg
 USE_GL=		gl glu
 USE_XORG=	ice sm x11 xt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	f3d-app
 
 PLIST_FILES=	bin/f3d \
 		lib/libf3d.so \
 		share/applications/f3d.desktop \
 		share/bash-completion/completions/f3d \
 		share/fish/vendor_completions.d/f3d.fish \
 		share/icons/hicolor/32x32/apps/f3d.png \
 		share/icons/hicolor/48x48/apps/f3d.png \
 		share/icons/hicolor/64x64/apps/f3d.png \
 		share/icons/hicolor/scalable/apps/f3d.svg \
 		share/metainfo/io.github.f3d_app.f3d.metainfo.xml \
 		share/zsh/site-functions/_f3d
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX} && ${RM} LICENSE README.md
 
 .include <bsd.port.mk>
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 79f4b506c5eb..a9fd88cac949 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -1,198 +1,199 @@
 PORTNAME=	gdal
 PORTVERSION=	3.5.1
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Translator library for raster geospatial data formats
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 BUILD_DEPENDS=	libgeotiff>=1.5.0:graphics/libgeotiff \
 		proj>=6,1:graphics/proj
 LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff \
 		libgif.so:graphics/giflib \
 		libjson-c.so:devel/json-c \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libqhull_r.so:math/qhull \
 		libtiff.so:graphics/tiff
 
 USES=		compiler:c++17-lang cpe gmake iconv jpeg localbase pkgconfig ssl tar:xz
 
 CFLAGS+=	-fPIC
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
 		--enable-static=yes \
 		--with-cpp14 \
 		--with-crypto=yes \
 		--with-geotiff=yes \
 		--with-gif=yes \
 		--with-gnm=yes \
 		--with-jpeg=yes \
 		--with-libjson-c=yes \
 		--with-liblzma=yes \
 		--with-libtiff=yes \
 		--with-libz=/usr \
 		--with-msg=no \
 		--with-pcidsk=internal \
 		--with-pcraster=internal \
 		--with-png=yes \
 		--with-proj=yes \
 		--with-qhull=yes \
 		--with-threads=yes \
 		--without-jpeg12 \
 		--without-libtool \
 		${ICONV_CONFIGURE_ARG}
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${WRKSRC} ${ICONV_LIB}
 MAKEFILE=	GNUmakefile
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 SLAVEDIRS=	graphics/py-gdal
 
 CPE_VENDOR=	osgeo
 
 HEADER_FILES=	alg/gdalwarpkernel_opencl.h \
 		alg/gvgcpfit.h \
 		alg/internal_qhull_headers.h \
 		alg/thinplatespline.h\
 		gcore/gdalexif.h \
 		gcore/gdaljp2metadatagenerator.h \
 		gcore/gdalsse_priv.h \
 		gnm/gnm_priv.h \
 		port/cpl_aws.h \
 		port/cpl_cpu_features.h \
 		port/cpl_google_cloud.h \
 		port/cpl_sha1.h \
 		port/cpl_sha256.h \
 		port/cpl_vsil_curl_priv.h \
 		port/cpl_worker_thread_pool.h
 
 OPTIONS_DEFINE=	ARMADILLO BRUNSLI CFITSIO CRYPTOPP CURL DEFLATE ECW EXPAT EXR FREEXL GEOS GTA HDF5 HEIF KML LERC LIBXML2 LZ4 MYSQL NETCDF ODBC OPENJPEG PCRE PCRE2 PGSQL RASTERLITE2 SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD
 OPTIONS_RADIO=	PDF
 OPTIONS_RADIO_PDF=	PODOFO POPPLER
 OPTIONS_DEFAULT=CURL EXPAT FREEXL GEOS LIBXML2 LZ4 OPENJPEG PCRE2 PGSQL POPPLER WEBP ZSTD \
 		HDF5 KML NETCDF SPATIALITE SFCGAL SQLITE XERCES
 OPTIONS_SUB=	yes
 BRUNSLI_DESC=	Brunsli support via libbrunsli library
 CRYPTOPP_DESC=	Cryptopp support
 DEFLATE_DESC=	Faster deflate support via libdeflate library
 EXR_DESC=	EXR support via OpenEXR library
 LERC_DESC=	LERC (Limited Error Raster Compression) support
 PCRE_DESC=	Regular expression support for SQLite
 PCRE2_DESC=	Regular expression support for SQLite
 RASTERLITE2_DESC=	RasterLite2 support
 TILEDB_DESC=	TileDB support
 
 ARMADILLO_CONFIGURE_OFF=--with-armadillo=no
 ARMADILLO_CONFIGURE_ON=	--with-armadillo=${LOCALBASE}
 ARMADILLO_LIB_DEPENDS=	libarmadillo.so:math/armadillo
 BRUNSLI_CONFIGURE_WITH=	brunsli
 BRUNSLI_LIB_DEPENDS=	libbrunslidec-c.so:graphics/brunsli
 CFITSIO_CONFIGURE_WITH=	cfitsio
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 CRYPTOPP_CONFIGURE_OFF=	--with-cryptopp=no
 CRYPTOPP_CONFIGURE_ON=	--with-cryptopp=${LOCALBASE}
 CRYPTOPP_LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 CURL_CONFIGURE_OFF=	--with-curl=no
 CURL_CONFIGURE_ON=	--with-curl=${LOCALBASE}/bin/curl-config
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 DEFLATE_CONFIGURE_WITH=	libdeflate
 DEFLATE_LIB_DEPENDS=	libdeflate.so:archivers/libdeflate
 ECW_CONFIGURE_WITH=	ecw
 ECW_LIB_DEPENDS=	libNCSEcw.so:graphics/libecwj2
 EXPAT_CONFIGURE_WITH=	expat
 EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 EXR_CONFIGURE_WITH=	exr
 EXR_LIB_DEPENDS=	libImath.so:math/Imath \
 			libOpenEXR.so:graphics/openexr
 EXR_CFLAGS=		-DInt64=uint64_t
 FREEXL_CONFIGURE_WITH=	freexl
 FREEXL_LIB_DEPENDS=	libfreexl.so:textproc/freexl
 GEOS_CONFIGURE_OFF=	--with-geos=no
 GEOS_CONFIGURE_ON=	--with-geos=${LOCALBASE}/bin/geos-config
 GEOS_LIB_DEPENDS=	libgeos.so:graphics/geos
 GTA_CONFIGURE_WITH=	gta
 GTA_LIB_DEPENDS=	libgta.so:devel/libgta
 HDF5_CONFIGURE_WITH=	hdf5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HEIF_CONFIGURE_WITH=	heif
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 KML_CONFIGURE_WITH=	libkml
 KML_LIB_DEPENDS=	libkmlbase.so:science/libkml
 LERC_CONFIGURE_OFF=	--with-lerc=no
 LERC_CONFIGURE_ON=	--with-lerc=${LOCALBASE}
 LERC_LIB_DEPENDS=	libLerc.so:graphics/lerc
 LIBXML2_CONFIGURE_OFF=	--with-xml2=no
 LIBXML2_CONFIGURE_ON=	--with-xml2=yes
 LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 LZ4_CONFIGURE_OFF=	--with-lz4=no
 LZ4_CONFIGURE_ON=	--with-lz4=yes
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 MYSQL_CONFIGURE_OFF=	--with-mysql=no
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}/bin/mysql_config
 MYSQL_USES=		mysql
 NETCDF_CONFIGURE_WITH=	netcdf
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 ODBC_CONFIGURE_WITH=	odbc
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 OPENJPEG_BUILD_DEPENDS=	openjpeg>=2.1.0:graphics/openjpeg
 OPENJPEG_CONFIGURE_WITH=openjpeg
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 PCRE_CONFIGURE_WITH=	pcre
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE2_CONFIGURE_WITH=	pcre2
 PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 PGSQL_CONFIGURE_WITH=	pg
 PGSQL_USES=		pgsql
 PODOFO_CONFIGURE_WITH=	podofo
 PODOFO_LIB_DEPENDS=	libpodofo.so:graphics/podofo
 POPPLER_CONFIGURE_WITH=	poppler=${LOCALBASE}
 POPPLER_LIB_DEPENDS=	libpoppler.so:graphics/poppler
 RASTERLITE2_CONFIGURE_OFF=	--with-rasterlite2=no
 RASTERLITE2_CONFIGURE_ON=	--with-rasterlite2=${LOCALBASE}
 RASTERLITE2_LIB_DEPENDS=librasterlite2.so:graphics/librasterlite2
 SFCGAL_CONFIGURE_OFF=	--with-sfcgal=no
 SFCGAL_CONFIGURE_ON=	--with-sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_LIB_DEPENDS=	libSFCGAL.so:databases/sfcgal
 SPATIALITE_CONFIGURE_WITH=	spatialite
 SPATIALITE_LIB_DEPENDS=	libspatialite.so:databases/spatialite
 SQLITE_CONFIGURE_WITH=	sqlite3
 SQLITE_USES=		sqlite
 TILEDB_CONFIGURE_OFF=	--with-tiledb=no
 TILEDB_CONFIGURE_ON=	--with-tiledb=${LOCALBASE}
 TILEDB_LIB_DEPENDS=	libtiledb.so:databases/tiledb
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 XERCES_CONFIGURE_WITH=	xerces
 XERCES_LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
 ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 post-patch:
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/alg/internal_libqhull/
 	@${RM} -r ${WRKSRC}/frmts/gif/giflib/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg12/
 	@${RM} -r ${WRKSRC}/frmts/png/libpng/
 	@${RM} -r ${WRKSRC}/frmts/zlib/
 	@${RM} -r ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
 	@${RM} -r ${WRKSRC}/third_party/LercLib/
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/scripts/gdal-bash-completion.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${HEADER_FILES} ${STAGEDIR}${PREFIX}/include/
 	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so
 
 .include <bsd.port.mk>
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index b4a67a477003..844ab23e85fd 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,237 +1,237 @@
 PORTNAME=	opencv
 DISTVERSION=	4.5.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Open Source Computer Vision library
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libharfbuzz.so:print/harfbuzz \
 		libhdf5.so:science/hdf5
 
 USES=		cmake compiler:c++14-lang cpe localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	WeChatCV:wechat
 GH_PROJECT=	opencv_contrib:contrib \
 		ade:ade \
 		opencv_3rdparty:extra_mod_3rdparty_boost_descr \
 		opencv_3rdparty:extra_mod_3rdparty_vgg \
 		opencv_3rdparty:wechat \
 		opencv_3rdparty:face \
 		opencv_3rdparty:ippicv
 GH_TAGNAME=	v0.1.1f:ade \
 		34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_3rdparty_boost_descr \
 		fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg \
 		a8b69ccc738421293254aec5ddb38bd523503252:wechat \
 		8afa57abc8229d611c4937165d20e2a2d9fc5a12:face \
 		a56b6ac6f030c312b2dce17430eef13aed9af274:ippicv
 
 CMAKE_ON=	OPENCV_GENERATE_PKGCONFIG
 CMAKE_OFF=	OPENCV_GENERATE_SETUPVARS \
 		BUILD_opencv_python2 \
 		BUILD_TESTS
 CMAKE_ARGS=	-DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules"
 
 DATADIR=	${PREFIX}/share/${PORTNAME}4
 
 PLIST_SUB=	SHLIB_VER=${DISTVERSION}
 
 OPTIONS_DEFINE=		EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL \
 			PATENTED PROTOBUF PYTHON TBB TESSERACT
 
 OPTIONS_GROUP=		GUI IMAGE VIDEO
 OPTIONS_GROUP_GUI=	GTK3 VTK
 OPTIONS_GROUP_IMAGE=	GPHOTO2 JPEG OPENEXR PNG TIFF
 OPTIONS_GROUP_VIDEO=	DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE
 
 OPTIONS_SINGLE=		BLAS
 OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NOBLAS
 
 OPTIONS_RADIO=		JPEG2K
 OPTIONS_RADIO_JPEG2K=	JASPER OPENJPEG
 
 OPTIONS_DEFAULT=	EIGEN GDAL GDCM OPENCL PROTOBUF PYTHON \
 			DC1394 GSTREAMER V4L VULKAN WEBP \
 			GPHOTO2 JPEG OPENEXR PNG TIFF \
 			OPENBLAS \
 			OPENJPEG
 OPTIONS_SUB=		yes
 
 # Normal options (EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL PATENTED PROTOBUF PYTHON TBB)
 EIGEN_DESC=		Add Eigen v3 Support, builds sfm modules
 EIGEN_CMAKE_BOOL=	WITH_EIGEN
 EIGEN_USES=		eigen:3
 
 GDAL_DESC=		Add Geospatial Data Abstraction Library Support
 GDAL_CMAKE_BOOL=	WITH_GDAL
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 
 GDCM_DESC=		Add Open source DICOM library Support
 GDCM_CMAKE_BOOL=	WITH_GDCM
 GDCM_LIB_DEPENDS=	libgdcmMSFF.so:devel/gdcm
 
 HARDENING_DESC=		Enables Build Hardening
 HARDENING_CMAKE_BOOL=	ENABLE_BUILD_HARDENING
 
 JAVA_DESC=		Enable Java Support
 JAVA_BUILD_DEPENDS=	ant:devel/apache-ant
 JAVA_CMAKE_BOOL=	BUILD_opencv_java BUILD_opencv_java_bindings_generator BUILD_JAVA
 JAVA_MAKE_ENV=		JAVACMD=${JAVA}
 JAVA_USE=		JAVA=yes
 
 LTO_DESC=		Enables Link Time Optimizations
 LTO_CMAKE_BOOL=		ENABLE_THIN_LTO
 
 OPENCL_DESC=		Add OpenCL Support
 OPENCL_CMAKE_BOOL=	WITH_OPENCL
 OPENCL_BUILD_DEPENDS=	opencl>=0:devel/opencl
 OPENCL_RUN_DEPENDS=	opencl>=0:devel/opencl
 
 PATENTED_DESC=		Enable patented 2d feature detection USE AT OWN RISK
 PATENTED_CMAKE_BOOL=	OPENCV_ENABLE_NONFREE
 
 PROTOBUF_DESC=		Enable protobuf support, builds dnn modules
 PROTOBUF_CMAKE_BOOL=	WITH_PROTOBUF
 PROTOBUF_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 PYTHON_DESC=		Enable Python Support 3.6 or greater
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
 PYTHON_USES=		python:3.6+
 PYTHON_CMAKE_BOOL=	BUILD_opencv_python3
 PYTHON_CMAKE_ON=	-DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR}
 
 TBB_DESC=		Add Intel Threading Building Blocks Support
 TBB_CMAKE_BOOL=		WITH_TBB
 TBB_LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 TESSERACT_DESC=		Add Tesseract-based OCR
 TESSERACT_LIB_DEPENDS=	libtesseract.so:graphics/tesseract
 TESSERACT_CMAKE_BOOL=	WITH_TESSERACT
 ###
 
 # GUI group options (GTK3 VTK)
 GTK3_USES=		gnome
 GTK3_USE=		gnome=gtk30
 GTK3_CMAKE_BOOL=	WITH_GTK
 
 VTK_DESC=		Include VTK library support (build opencv_viz module)
 VTK_CMAKE_BOOL=		WITH_VTK
 VTK_LIB_DEPENDS=	libvtkCommonCore-9.1.so:math/vtk9
 VTK_USES=		qt:5
 VTK_USE=		QT=buildtools_build,qmake_build
 ###
 
 # IMAGE group options (GPHOTO2 JPEG OPENEXR PNG TIFF)
 GPHOTO2_DESC=		Add Gphoto2 Support
 GPHOTO2_CMAKE_BOOL=	WITH_GPHOTO2
 GPHOTO2_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 
 JPEG_DESC=		Add LibJpeg Support
 JPEG_CMAKE_BOOL=	WITH_JPEG
 JPEG_USES=		jpeg
 
 OPENEXR_DESC=		Add OpenEXR Support
 OPENEXR_CMAKE_BOOL=	WITH_OPENEXR
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 
 PNG_DESC=		Add LibPNG Support
 PNG_CMAKE_BOOL=		WITH_PNG
 PNG_LIB_DEPENDS=	libpng16.so:graphics/png
 
 TIFF_DESC=		Add LibTIFF Support
 TIFF_CMAKE_BOOL=	WITH_TIFF
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 ###
 
 # VIDEO group options (DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE)
 DC1394_DESC=		IEEE 1394 camera support
 DC1394_CMAKE_BOOL=	WITH_1394
 DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
 
 FFMPEG_DESC=		Link with ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 GSTREAMER_DESC=		Add GSTREAMER Support
 GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER
 GSTREAMER_USES=		gstreamer
 
 V4L_DESC=		Enable support for Video for Linux
 V4L_CMAKE_BOOL=		WITH_V4L WITH_LIBV4L
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 VULKAN_DESC=		Add Vulkan Support
 VULKAN_CMAKE_BOOL=	WITH_VULKAN
 VULKAN_CMAKE_ON=	-DVULKAN_INCLUDE_DIRS=${LOCALBASE}/include
 VULKAN_BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 
 WEBP_DESC=		Add Webp Support
 WEBP_CMAKE_BOOL=	WITH_WEBP
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 XINE_DESC=		Add Xine Support
 XINE_CMAKE_BOOL=	WITH_XINE
 XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 ###
 
 # BLAS group options (ATLAS OPENBLAS NOBLAS)
 ATLAS_DESC=		ATLAS blas implementation with lapacke
 ATLAS_USES=		blaslapack:atlas
 ATLAS_LIB_DEPENDS=	liblapacke.so:math/lapacke
 
 OPENBLAS_DESC=		OpenBLAS blas implementation with lapacke
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_LIB_DEPENDS=	liblapacke.so:math/lapacke
 
 NOBLAS_DESC=		Disable support for lapack/blas
 NOBLAS_CMAKE_BOOL_OFF=	WITH_LAPACK
 ###
 
 # JPEG2K group options (JASPER OPENJPEG)
 JASPER_DESC=		Add Jasper Support for JPEG2000
 JASPER_CMAKE_BOOL=	WITH_JASPER
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 
 OPENJPEG_DESC=		Add OpenJPEG Support for JPEG2000, OpenCV preferred
 OPENJPEG_CMAKE_BOOL=	WITH_OPENJPEG
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 ###
 
 _IPPICV_i386=		ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz
 _IPPICV_amd64=		ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz
 
 post-extract:
 	# Handle contrib
 	${MV} ${WRKSRC_contrib} ${WRKSRC}/contrib
 	# Handle prefetched ade modul
 	${MKDIR} ${BUILD_WRKSRC}/3rdparty/ade
 	${MV} ${WRKSRC_ade} ${BUILD_WRKSRC}/3rdparty/ade
 	# Handle prefetched xfeatures2d
 	${MKDIR} ${BUILD_WRKSRC}/downloads/xfeatures2d
 	${CP} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
 	${CP} ${WRKSRC_extra_mod_3rdparty_vgg}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
 	# Handle prefetched wechat
 	${MKDIR} ${BUILD_WRKSRC}/downloads/wechat_qrcode
 	${CP} ${WRKSRC_wechat}/* ${BUILD_WRKSRC}/downloads/wechat_qrcode/
 	# Handle Face
 	${MKDIR} ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
 	${CP} ${WRKSRC_face}/* ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
 	# Handle ippicv
 .if defined(_IPPICV_${ARCH})
 	${MKDIR} ${BUILD_WRKSRC}/3rdparty/ippicv
 	(cd ${BUILD_WRKSRC}/3rdparty/ippicv && ${EXTRACT_CMD} -xf ${WRKSRC_ippicv}/${_IPPICV_${ARCH}})
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/lib/atlas-base|${LOCALBASE}/lib|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
 	${REINPLACE_CMD} -e 's|/usr/include/atlas|${LOCALBASE}/include|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
 
 .include <bsd.port.mk>
diff --git a/graphics/openimageio-ociov1/Makefile b/graphics/openimageio-ociov1/Makefile
index 9d9040c93bfd..0d7654a6b007 100644
--- a/graphics/openimageio-ociov1/Makefile
+++ b/graphics/openimageio-ociov1/Makefile
@@ -1,101 +1,102 @@
 PORTNAME=	openimageio
 DISTVERSIONPREFIX=	Release-
 DISTVERSION=	2.2.21.0
+PORTREVISION=	1
 CATEGORIES=	graphics multimedia
 PKGNAMESUFFIX=	-ociov1
 # special port to link oiio libs with ociov1
 # specifically to build blender-lts28 while still officially supported
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT=	OpenImageIO graphics library linked to ocio v1
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/tsl/robin_map.h:devel/robin-map
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libfmt.so:devel/libfmt \
 		libhdf5.so:science/hdf5 \
 		libheif.so:graphics/libheif \
 		libImath.so:math/Imath \
 		libOpenColorIOv1.so:graphics/opencoloriov1 \
 		libOpenEXR.so:graphics/openexr \
 		libpng.so:graphics/png \
 		libsquish.so:graphics/squish \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp
 
 USES=		cmake jpeg compiler:c++14-lang iconv:wchar_t
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenImageIO
 GH_PROJECT=	oiio
 
 CMAKE_ON=	USE_OCIO
 CMAKE_OFF=	BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \
 		STOP_ON_WARNING USE_OPENSSL USE_QT USE_OPENGL \
 		OIIO_BUILD_TESTS OIIO_BUILD_TOOLS USE_PYTHON
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		DICOM DOCS FFMPEG FREETYPE GIF \
 			OPENCV OPENJPEG PTEX RAW TBB VDB
 OPTIONS_DEFAULT=	DICOM FREETYPE GIF OPENJPEG PTEX
 OPTIONS_SUB=		yes
 
 DOCS_CMAKE_BOOL=	INSTALL_DOCS
 DOCS_CMAKE_ON=		-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR}
 
 DICOM_DESC=		DICOM/MEDICOM support
 DICOM_CMAKE_BOOL=	USE_DICOM
 DICOM_LIB_DEPENDS=	libdcmimage.so:graphics/dcmtk
 
 FFMPEG_DESC=		Use FFmpeg to support extra file types
 FFMPEG_CMAKE_BOOL=	USE_FFMPEG
 FFMPEG_LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
 
 FREETYPE_CMAKE_BOOL=	USE_FREETYPE
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_RUN_DEPENDS=	${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf
 
 GIF_CMAKE_BOOL=		USE_GIF
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 
 OPENCV_CMAKE_BOOL=	USE_OPENCV
 OPENCV_IMPLIES=		OPENJPEG
 OPENCV_LIB_DEPENDS=	libopencv_core.so:graphics/opencv
 
 OPENJPEG_CMAKE_BOOL=	USE_OPENJPEG
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
 PTEX_DESC=		ptex support
 PTEX_LIB_DEPENDS=	libPtex.so:graphics/ptex
 
 RAW_CMAKE_BOOL=		USE_LIBRAW
 RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw
 
 TBB_DESC=		Intel tbb support
 TBB_CMAKE_BOOL=		USE_TBB
 TBB_LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 VDB_DESC=		OpenVDB support
 VDB_CMAKE_ARGS=		-DCMAKE_CXX_STANDARD=14
 VDB_CMAKE_BOOL=		USE_OPENVDB
 VDB_LIB_DEPENDS=	libopenvdb.so:misc/openvdb
 
 # DISTVERSION has an extra digit which isn't in the lib name
 # for LIBVERS we want the first three digits
 PLIST_SUB=	SHL3=${PORTVERSION:R} SHL2=${PORTVERSION:R:R}
 DOCSDIR=	${PREFIX}/share/doc/openimageio-${PKGNAMESUFFIX}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|<OpenColorIO/|<OpenColorIOv1/|g' \
 		${WRKSRC}/src/libOpenImageIO/color_ocio.cpp
 
 post-install:
 	${FIND} ${STAGEDIR}${PREFIX}/include/OpenImageIO${PKGNAMESUFFIX} \
 		-name '*.h' -or -name '*.hpp' | \
 		${XARGS} ${REINPLACE_CMD} -e 's|<OpenImageIO/|<OpenImageIO${PKGNAMESUFFIX}/|g'
 	${FIND} ${STAGEDIR}${PREFIX}/include/OpenImageIO${PKGNAMESUFFIX} -name '*.bak' -delete
 	@(cd ${STAGEDIR}${PREFIX}/lib/cmake  && ${MV} OpenImageIO OpenImageIO${PKGNAMESUFFIX})
 	@(cd ${STAGEDIR}${PREFIX}/share/cmake/Modules && \
 		${MV} FindOpenImageIO.cmake FindOpenImageIO${PKGNAMESUFFIX}.cmake)
 
 .include <bsd.port.mk>
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 1e9afe1a895c..45e35d29cc0e 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -1,135 +1,135 @@
 PORTNAME=	openimageio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.3.17.0
 # PORTREVISION must be set with ?= so as not to stomp over
 # py-openimageio's PORTREVISION.
 # Also, just to be on the safe side, when resetting,
 # best keep PORTREVISION?=	0.
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
 COMMENT?=	OpenImageIO graphics library
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/tsl/robin_map.h:devel/robin-map
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libfmt.so:devel/libfmt \
 		libhdf5.so:science/hdf5 \
 		libheif.so:graphics/libheif \
 		libImath.so:math/Imath \
 		libOpenColorIO.so:graphics/opencolorio \
 		libOpenEXR.so:graphics/openexr \
 		libpng.so:graphics/png \
 		libsquish.so:graphics/squish \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp
 
 USES=		cmake jpeg compiler:c++14-lang iconv:wchar_t qt:5
 
 USE_QT+=	buildtools_build qmake_build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenImageIO
 GH_PROJECT=	oiio
 
 CMAKE_OFF=	BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \
 		STOP_ON_WARNING USE_OPENSSL OIIO_DOWNLOAD_MISSING_TESTDATA
 
 OPTIONS_DEFINE=		DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER \
 			OPENCV OPENJPEG PTEX RAW TBB TEST TOOLS VDB
 OPTIONS_DEFAULT=	DICOM FREETYPE GIF OPENJPEG PTEX TOOLS VDB
 OPTIONS_SUB=		yes
 
 DOCS_CMAKE_BOOL=	INSTALL_DOCS
 DOCS_CMAKE_ON=		-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR}
 
 DICOM_DESC=		DICOM/MEDICOM support
 DICOM_CMAKE_BOOL=	USE_DICOM
 DICOM_LIB_DEPENDS=	libdcmimage.so:graphics/dcmtk
 
 FFMPEG_DESC=		Use FFmpeg to support extra file types
 FFMPEG_CMAKE_BOOL=	USE_FFMPEG
 FFMPEG_LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
 
 FREETYPE_CMAKE_BOOL=	USE_FREETYPE
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_RUN_DEPENDS=	${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf
 
 GIF_CMAKE_BOOL=		USE_GIF
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 
 IMAGEVIEWER_DESC=	Build image viewer (requires Qt)
 IMAGEVIEWER_USES=	gl
 IMAGEVIEWER_IMPLIES=	TOOLS
 IMAGEVIEWER_CMAKE_BOOL=	USE_QT USE_OPENGL
 IMAGEVIEWER_USE=	GL=gl,glu,glew \
 			QT=buildtools,core,gui,opengl,qmake_build,widgets
 
 OPENCV_CMAKE_BOOL=	USE_OPENCV
 OPENCV_IMPLIES=		OPENJPEG
 OPENCV_LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv \
 			libopencv_core.so:graphics/opencv
 
 OPENJPEG_CMAKE_BOOL=	USE_OPENJPEG
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
 PTEX_DESC=		ptex support
 PTEX_LIB_DEPENDS=	libPtex.so:graphics/ptex
 
 RAW_CMAKE_BOOL=		USE_LIBRAW
 RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw
 
 TBB_DESC=		Intel tbb support
 TBB_CMAKE_BOOL=		USE_TBB
 TBB_LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 TEST_CMAKE_BOOL=	OIIO_BUILD_TESTS
 
 TOOLS_DESC=		Build CLI tools
 TOOLS_CMAKE_BOOL=	OIIO_BUILD_TOOLS
 
 VDB_DESC=		OpenVDB support
 VDB_CMAKE_BOOL=		USE_OPENVDB
 VDB_LIB_DEPENDS=	libopenvdb.so:misc/openvdb
 
 PLIST_SUB=	SHL3=${PORTVERSION:R} SHL2=${PORTVERSION:R:R} SHL1=${PORTVERSION:R:R:R}
 SHL2=		${PORTVERSION:R:R}
 SHL1=		${PORTVERSION:R:R:R}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/src/cmake/modules/FindPtex.cmake
 
 .include <bsd.port.options.mk>
 
 .if ${SLAVE_PORT} == yes
 BUILD_DEPENDS+=	${PREFIX}/share/cmake/pybind11/pybind11Config.cmake:devel/pybind11
 LIB_DEPENDS+=	libOpenImageIO.so:graphics/openimageio
 PLIST=		${PKGDIR}/pkg-plist-pybind
 USES+=		python
 USE_PYTHON=	flavors
 CMAKE_ON+=	USE_PYTHON
 # we don't need the apps built - only libs.
 CMAKE_OFF+=	USE_QT USE_OPENGL OIIO_BUILD_TOOLS OIIO_BUILD_TESTS \
 		EMBED_PLUGINS
 CMAKE_ARGS+=	-DPYTHON_VERSION:STRING=${PYTHON_VER}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/OpenImageIO*.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 .else # SLAVE_PORT != yes
 USE_LDCONFIG=	yes
 CMAKE_OFF+=	USE_PYTHON
 
 post-install:
 	${LN} -sf libOpenImageIO.so.${SHL2} \
 		${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.${SHL1}
 	${LN} -sf libOpenImageIO_Util.so.${SHL2} \
 		${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.${SHL1}
 
 do-test-TEST-on:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ARGS=-V ${MAKE_CMD} test
 .endif # SLAVE_PORT
 
 .include <bsd.port.mk>
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 33538120869d..881ca5890b7a 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -1,181 +1,182 @@
 PORTNAME=	qgis
 DISTVERSION=	3.22.9
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 PKGNAMESUFFIX=	-ltr
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.24.1:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		liblazperf.so:archivers/lazperf \
 		libmdal.so:math/mdal \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	astyle:devel/astyle \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}black>=19.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=0:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.1.0:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.7.0:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.12.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.0.7:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.24.1:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome pgsql pyqt:5 python:3.7+ qca qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYQT=	pyqt5 qscintilla2 pysip sip 
 USE_QT=		3d buildtools_build core concurrent dbus declarative \
 		designer_build qdoc_build gamepad gui linguist_build location \
 		network printsupport qmake_build script serialport \
 		sql sql-pgsql sql-sqlite3 svg uitools_build \
 		webengine webkit widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \
 		-DLazPerf_INCLUDE_DIR:PATH=${LOCALBASE}/include/lazperf \
 		-DWITH_INTERNAL_MDAL:BOOL=false \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_3D WITH_ASTYLE \
 		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_EPT WITH_POSTGRESQL \
 		WITH_PDAL
 CMAKE_OFF=	ENABLE_TESTS WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 OPTIONS_DEFINE=		GRASS SERVER
 OPTIONS_DEFAULT=	GRASS SERVER
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_SUB=		yes
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass7:databases/grass7
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS7
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 # QGIS requires flex >= 2.5.6, see
 # https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md
 .if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex
 .endif
 
 post-patch:
 # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
 # See bugs 242557 and 241687.
 .if ${OPSYS} == FreeBSD && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
 		${WRKSRC}/src/core/CMakeLists.txt
 .endif
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
 	@${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete
 	@${RM} /tmp/srs.db
 
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 7fdd5b934004..97f15013877e 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,177 +1,178 @@
 PORTNAME=	qgis
 DISTVERSION=	3.26.1
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.25.0:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libmdal.so:math/mdal \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	astyle:devel/astyle \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}black>=19.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=0:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.1.0:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.7.0:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.12.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.0.7:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.25.0:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome pgsql pyqt:5 python:3.7+ qca qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYQT=	pyqt5 qscintilla2 pysip sip 
 USE_QT=		3d buildtools_build core concurrent dbus declarative \
 		designer_build qdoc_build gamepad gui linguist_build location \
 		network printsupport qmake_build script serialport \
 		sql sql-pgsql sql-sqlite3 svg uitools_build \
 		webengine webkit widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_3D WITH_ASTYLE \
 		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_EPT  WITH_INTERNAL_LAZPERF \
 		WITH_POSTGRESQL WITH_PDAL
 CMAKE_OFF=	ENABLE_TESTS WITH_INTERNAL_MDAL WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis-ltr
 
 PLIST_SUB=	DISTVERSION=${PORTVERSION}
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 OPTIONS_DEFINE=		GRASS SERVER
 OPTIONS_DEFAULT=	GRASS SERVER
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_SUB=		yes
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass7:databases/grass7
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS7
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 # QGIS requires flex >= 2.5.6, see
 # https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md
 .if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex
 .endif
 
 post-patch:
 # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
 # See bugs 242557 and 241687.
 .if ${OPSYS} == FreeBSD && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
 		${WRKSRC}/src/core/CMakeLists.txt
 .endif
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
 	@${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete
 	@${RM} /tmp/srs.db
 
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 193c5e2168a8..e3470eb65903 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	vigra
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.11.1
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	graphics
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	VIGRA stands for "Vision with Generic Algorithms"
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libImath.so:math/Imath \
 		libsz.so:science/libaec
 
 USES=		cmake compiler:c++14-lang python:run shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	ukoethe
 GH_TAGNAME=	8acd73a
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include/Imath
 
 CMAKE_ARGS=	-DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \
 		-DDOCINSTALL:PATH=${DOCSDIR_REL}
 SHEBANG_FILES=	config/vigra-config.in
 
 OPTIONS_DEFINE=		HDF5 OPENEXR NUMPY DOCS FFTW
 OPTIONS_DEFAULT=	HDF5 OPENEXR FFTW ${OPTIONS_GROUP_IMAGEFORMATS}
 OPTIONS_GROUP=		IMAGEFORMATS
 OPTIONS_GROUP_IMAGEFORMATS=	PNG JPEG TIFF
 OPTIONS_SUB=		yes
 
 HDF5_CFLAGS=		-DH5_USE_110_API=1
 HDF5_CMAKE_BOOL=	WITH_HDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 
 OPENEXR_CMAKE_BOOL=	WITH_OPENEXR
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 
 NUMPY_DESC=		NumPy mathematical computing (USE Fortran/GCC47+)
 NUMPY_CMAKE_BOOL=	WITH_VIGRANUMPY
 NUMPY_USES=		compiler:gcc-c++11-lib python:build
 NUMPY_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
 			${PYNUMPY}
 NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
 			${PYNUMPY}
 NUMPY_LIB_DEPENDS=	${PY_BOOST}
 # On FreeBSD < 11 libc++ lacks support for sized delete operators.
 # GCC dropped the builtin version of these operators in 6+ by
 # defaulting to gnu++14. Force c++11 instead.
 # For a more detailed discussion see:
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219484
 NUMPY_CXXFLAGS=		-std=gnu++11
 
 PNG_CMAKE_BOOL=		WITH_PNG
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 JPEG_CMAKE_BOOL=	WITH_JPEG
 JPEG_USES=		jpeg
 
 TIFF_CMAKE_BOOL=	WITH_TIFF
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 FFTW_CMAKE_BOOL=	WITH_FFTW
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 			libfftw3f.so:math/fftw3-float
 
 post-package-NUMPY-on:
 	@${ECHO} ""
 	@${ECHO} "* BEWARE!"
 	@${ECHO} "* Using py-NumPY implies Fortran and GCC 4.7+ as hard dependencies"
 	@${ECHO} "* and require all ports, depending on vigra, to set USE_GCC=yes"
 	@${ECHO} ""
 
 .include <bsd.port.mk>
diff --git a/graphics/vv/Makefile b/graphics/vv/Makefile
index 498d345b932c..3abd607a9c7c 100644
--- a/graphics/vv/Makefile
+++ b/graphics/vv/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	vv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.0-383
 DISTVERSIONSUFFIX=	-g7a783a8b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast and simple 4D image viewer
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	googletest>0:devel/googletest # error: unable to find library -lGTest::GTest, see https://github.com/open-vv/vv/issues/74
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libgdcmCommon.so:devel/gdcm \
 		libhdf5_cpp.so:science/hdf5 \
 		libITKLabelMap-5.0.so:science/InsightToolkit \
 		libpng.so:graphics/png \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff \
 		libvtkIOSQL-8.2.so:math/vtk8
 
 USES=		cmake compiler:c++11-lang eigen:3 jpeg qt:5 xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	open-vv
 USE_QT=		core designer gui network sql widgets xml buildtools_build qmake_build
 USE_XORG=	ice sm x11 xext xt
 USE_CXXSTD=	c++11
 
 CMAKE_ARGS=	-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2
 
 PLIST_FILES=	bin/vv
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
 CXXFLAGS+=	-msse2 # workaround for ITK failing to add -msse2 on i386: https://github.com/open-vv/vv/issues/83 & https://github.com/InsightSoftwareConsortium/ITK/issues/2011
 .endif
 
 post-configure: # workaround for "error: unable to find library -lGTest::GTest", see https://github.com/open-vv/vv/issues/74
 	@${REINPLACE_CMD} -E 's/ -lGTest::(GTest|Main) / /g' ${BUILD_WRKSRC}/build.ninja
 
 .include <bsd.port.post.mk>
diff --git a/math/ambit/Makefile b/math/ambit/Makefile
index f596c0e5f59d..b2d90a4763af 100644
--- a/math/ambit/Makefile
+++ b/math/ambit/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	ambit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMESUFFIX=	-tensor # avoid clash with shells/ambit
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library for tensor product calculations
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libopenblas.so:math/openblas \
 		libsz.so:science/libaec
 
 USES=		cmake:testing compiler:c++11-lang python:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jturney
 
 # some declared cmake options do nothing: see https://github.com/jturney/ambit/issues/25 and the patch
 CMAKE_ON=		SHARED_ONLY ENABLE_OPENMP
 CMAKE_OFF=		ENABLE_TESTS # https://github.com/jturney/ambit/issues/24
 CMAKE_TESTING_ON=	ENABLE_TESTS
 
 .include <bsd.port.mk>
diff --git a/math/armadillo/Makefile b/math/armadillo/Makefile
index 092c3fae93fd..c4185bb8ef2f 100644
--- a/math/armadillo/Makefile
+++ b/math/armadillo/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	armadillo
 DISTVERSION=	11.2.3
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/arma
 
 MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	C++ linear algebra library
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libboost_date_time.so:devel/boost-libs \
 		libhdf5.so:science/hdf5 \
 		liblapack.so:math/lapack \
 		libsuperlu.so:math/superlu \
 		libsz.so:science/libaec
 
 USES=		blaslapack:openblas cmake:testing compiler:c++11-lang pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DPKG_CONFIG_DIR=${LOCALBASE}/libdata/pkgconfig/
 CMAKE_OFF=	BUILD_SMOKE_TEST
 CMAKE_TESTING_ON=	BUILD_SMOKE_TEST
 
 .include <bsd.port.mk>
diff --git a/math/deal.ii/Makefile b/math/deal.ii/Makefile
index 9104601442f3..76b3ccfad7b8 100644
--- a/math/deal.ii/Makefile
+++ b/math/deal.ii/Makefile
@@ -1,97 +1,98 @@
 PORTNAME=	deal.II
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.4.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Finite element Differential Equations Analysis Library (DEAL)
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BROKEN_FreeBSD_14=	clang crashes: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257876
 BROKEN_aarch64=		error: use of undeclared identifier '__TBB_machine_fetchadd4'
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/config.hpp:devel/boost-libs
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libhdf5.so:science/hdf5 \
 		libmetis.so:math/metis
 
 USES=		blaslapack cmake:testing compiler:c++17-lang localbase:ldflags
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tl:S/.//}
 GH_PROJECT=	${PORTNAME:tl:S/.//}
 
 CMAKE_OFF=	DEAL_II_ALLOW_BUNDLED DEAL_II_COMPONENT_EXAMPLES \
 		DEAL_II_WITH_P4EST DEAL_II_WITH_TRILINOS DEAL_II_WITH_UMFPACK \
 		DEAL_II_WITH_NANOFLANN DEAL_II_WITH_MUPARSER DEAL_II_WITH_ASSIMP \
 		DEAL_II_WITH_HDF5
 CMAKE_ON=	DEAL_II_FORCE_BUNDLED_TBB # instead of LIB_DEPENDS+=libtbb.so:devel/onetbb, pending https://github.com/dealii/dealii/issues/11561
 CMAKE_TESTING_ON=	FREEBSD_ENABLE_TESTS
 
 OPTIONS_DEFINE=		ADOLC ARPACK GSL LAPACK MPI NETCDF OPENCASCADE PETSC SCALAPACK SUNDIALS
 OPTIONS_DEFAULT=	GSL LAPACK # SUNDIALS
 
 ADOLC_DESC=		Compile with ADOL-C
 ADOLC_CMAKE_BOOL=	DEAL_II_WITH_ADOLC
 ADOLC_LIB_DEPENDS=	libadolc.so:math/adol-c
 ADOLC_BROKEN=		requires the development version: see https://github.com/dealii/dealii/issues/7293
 
 ARPACK_DESC=		Compile with Arpack and PArpack (only with MPI, LAPACK)
 ARPACK_CMAKE_BOOL=	DEAL_II_WITH_ARPACK
 ARPACK_CMAKE_ON=	-DARPACK_LINKER_FLAGS:STRING="${LDFLAGS}"
 ARPACK_BUILD_DEPENDS=	arpack-ng>0:math/arpack-ng
 ARPACK_RUN_DEPENDS=	arpack-ng>0:math/arpack-ng # itself doesn't link to arpack, but makes depending project link to it
 ARPACK_IMPLIES=		LAPACK
 
 GSL_DESC=		Compile with gsl
 GSL_CMAKE_BOOL=		DEAL_II_WITH_GSL
 GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 
 LAPACK_DESC=		Compile with LAPACK for matrix operations
 LAPACK_USES=		fortran
 LAPACK_CMAKE_BOOL=	DEAL_II_WITH_LAPACK
 LAPACK_CMAKE_ON=	-DLAPACK_LINKER_FLAGS:STRING="${LDFLAGS}"
 LAPACK_LIB_DEPENDS=	libopenblas.so:math/openblas
 
 MPI_DESC=		MPI support (math/sundials must be compiled with MPI)
 MPI_USES=		fortran
 MPI_CMAKE_BOOL=		DEAL_II_WITH_MPI
 MPI_CMAKE_ON=		-DMPI_LINKER_FLAGS:STRING="${LDFLAGS}"
 MPI_LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
 			libmpich.so:net/mpich
 
 NETCDF_DESC=		Compile with Netcdf (only with MPI)
 NETCDF_CMAKE_BOOL=	DEAL_II_WITH_NETCDF
 NETCDF_CMAKE_ON=	-DNETCDF_INCLUDE_DIR:STRING=${LOCALBASE}/include -DNETCDF_CPLUSPLUS_LIBRARY:STRING=${LOCALBASE}/lib/libnetcdf_c++4.so
 NETCDF_BROKEN=		see https://github.com/dealii/dealii/issues/7263
 
 OPENCASCADE_DESC=	Compile with OpenCascade
 OPENCASCADE_CMAKE_BOOL=	DEAL_II_WITH_OPENCASCADE
 OPENCASCADE_CMAKE_ON=	-DOPENCASCADE_INCLUDE_DIR:STRING=${LOCALBASE}/include/OpenCASCADE
 OPENCASCADE_LIB_DEPENDS=	libTKernel.so:cad/opencascade
 
 PETSC_DESC=		Compile with Petsc (only with MPI)
 PETSC_CMAKE_BOOL=	DEAL_II_WITH_PETSC
 PETSC_LIB_DEPENDS=	libpetsc.so:science/PETSc
 PETSC_BROKEN=		see https://github.com/dealii/dealii/issues/7260
 
 SCALAPACK_DESC=		Compile with ScaLAPACK (only with MPI)
 SCALAPACK_CMAKE_BOOL=	DEAL_II_WITH_SCALAPACK
 SCALAPACK_IMPLIES=	MPI LAPACK
 SCALAPACK_LIB_DEPENDS=	libscalapack.so:math/scalapack
 
 SUNDIALS_DESC=		Compile with SUNDIALS
 SUNDIALS_CMAKE_BOOL=	DEAL_II_WITH_SUNDIALS
 SUNDIALS_LIB_DEPENDS=	libsundials_arkode.so:math/sundials
 SUNDIALS_BROKEN=	Build fails with: Required variable "SUNDIALS_LIB_PAR" set to NOTFOUND
 
 post-patch: # unbundle boost
 	@${RM} -r ${WRKSRC}/dealii/bundled/boost-*
 
 post-stage:
 	@${RM} ${STAGEDIR}${PREFIX}/*.log
 
 .include <bsd.port.mk>
diff --git a/math/flann/Makefile b/math/flann/Makefile
index 30114a68bcb3..579410dcb7b2 100644
--- a/math/flann/Makefile
+++ b/math/flann/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	flann
 DISTVERSION=	1.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for fast nearest neighbor searches in high dimensional spaces
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		liblz4.so:archivers/liblz4 \
 		libsz.so:science/libaec
 
 USES=		cmake compiler:c++11-lang localbase:ldflags pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tkircher
 
 CMAKE_OFF=	BUILD_PYTHON_BINDINGS BUILD_MATLAB_BINDINGS BUILD_EXAMPLES BUILD_TESTS BUILD_DOC \
 		USE_OPENMP # OpenMP search is broken in cmake: https://gitlab.kitware.com/cmake/cmake/issues/17474
 
 post-install: # workaround for https://github.com/mariusmuja/flann/issues/466
 	${REINPLACE_CMD} -i '' -e 's/lib;-llz4/lib -llz4/' ${STAGEDIR}${PREFIX}/libdata/pkgconfig/flann.pc
 
 .include <bsd.port.mk>
diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index 679706859b34..717837b5a8b6 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	freefem++
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Partial differential equation solver
 
 LICENSE=	LGPL3
 
 BUILD_DEPENDS=	bash:shells/bash		\
 		gmm++>0:math/gmm++		\
 		pipe:misc/pipe			\
 		tetgen:math/tetgen
 LIB_DEPENDS=	libhdf5.so:science/hdf5		\
 		libamd.so:math/suitesparse-amd	\
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		libumfpack.so:math/suitesparse-umfpack	\
 		libarpack.so:math/arpack-ng	\
 		libfftw3.so:math/fftw3		\
 		libgsl.so:math/gsl		\
 		libipopt.so:math/ipopt		\
 		libmetis.so:math/metis		\
 		libscotch.so:cad/scotch		\
 		libcmumps.so:math/mumps		\
 		libnlopt.so:math/nlopt		\
 		libsuperlu.so:math/superlu	\
 		libsz.so:science/libaec
 RUN_DEPENDS=	bash:shells/bash		\
 		pipe:misc/pipe
 
 USES=		autoreconf bison blaslapack:openblas compiler:c++11-lib fortran	\
 		gl gmake localbase perl5 pkgconfig shebangfix xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeFem
 GH_PROJECT=	FreeFem-sources
 
 SHEBANG_GLOB=	ff-pkg-download.in
 SHEBANG_FILES=	examples/CheckAllEdp ./examples/misc/speedtest.sh
 
 CPPFLAGS+=	-I${LOCALBASE}/include/superlu
 .if !defined{WITH_DEBUG}
 LDFLAGS+=	-s
 .endif
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CNOFLAGS="${CFLAGS}" LIBS=-lz
 CONFIGURE_ARGS=	--disable-download		\
 		--without-mpi			\
 		--with-blas=${BLASLIB}		\
 		--with-lapack=${LAPACKLIB}
 
 USE_GL=		gl glu glut
 
 OPTIONS_DEFINE=	EXAMPLES
 OPTIONS_DEFAULT=EXAMPLES
 
 PORTEXAMPLES=	*
 
 PLIST_SUB=	VER=${PORTVERSION}
 DATADIR=	${PREFIX}/share/FreeFEM/${PORTVERSION}
 
 TEST_TARGET=	check
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|-llapack|${LAPACKLIB}|' ${WRKSRC}/configure.ac
 
 post-install:
 	@${MV} ${STAGEDIR}${DATADIR}/examples ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 922849706718..852142c447f0 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	labplot
 DISTVERSION=	2.8.2
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	math kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 
 PATCH_SITES=	https://invent.kde.org/education/labplot/-/commit/
 PATCHFILES=	375786ca124a1a6773c609236f8341890f23e1d8.diff:-p1 \
 		9e77b593030fdae0fbbad113415483b3ca51a654.diff:-p1
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Data plotting and function analysis tool by KDE
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgsl.so:math/gsl \
 		liblz4.so:archivers/liblz4 \
 		libspectre.so:print/libspectre \
 		libsz.so:science/libaec
 
 USES=		bison cmake compiler:c++11-lang desktop-file-utils kde:5 qt:5 \
 		shared-mime-info tar:xz
 USE_KDE=	archive attica auth bookmarks codecs completion config configwidgets \
 		coreaddons crash guiaddons i18n iconthemes itemviews \
 		jobwidgets kio newstuff notifications parts \
 		service solid sonnet syntaxhighlighting textwidgets unitconversion \
 		widgetsaddons windowsystem xmlgui \
 		doctools_build ecm_build
 USE_QT=		concurrent core dbus gui network printsupport serialport \
 		sql svg widgets xml \
 		buildtools_build qmake_build testlib_build
 
 CMAKE_OFF=	ENABLE_LIBCERF
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_KUserFeedback
 
 DATADIR=	${PREFIX}/share/labplot2
 
 OPTIONS_DEFINE=		CANTOR FITS FFTW3 HDF5 NETCDF
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 CANTOR_DESC=		Build with Cantor support
 CANTOR_CMAKE_BOOL=	ENABLE_CANTOR
 CANTOR_LIB_DEPENDS=	libcantorlibs.so:math/cantor \
 			libpoppler.so:graphics/poppler \
 			libpoppler-qt5.so:graphics/poppler-qt5
 FITS_DESC=		Flexible Image Transport System Data Format (FITS) Library
 FITS_CMAKE_BOOL=	ENABLE_FITS
 FITS_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 FFTW3_DESC=		Build with FFTW support
 FFTW3_CMAKE_BOOL=	ENABLE_FFTW
 FFTW3_LIB_DEPENDS=	libfftw3.so:math/fftw3
 HDF5_DESC=		Build with HDF5 support
 HDF5_CMAKE_BOOL=	ENABLE_HDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 NETCDF_DESC=		Build with NetCDF support
 NETCDF_CMAKE_BOOL=	ENABLE_NETCDF
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 .include <bsd.port.mk>
diff --git a/math/libmesh/Makefile b/math/libmesh/Makefile
index b977342f5897..84dbc918489b 100644
--- a/math/libmesh/Makefile
+++ b/math/libmesh/Makefile
@@ -1,92 +1,92 @@
 PORTNAME=	libmesh
 DISTVERSION=	1.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/libMesh/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Numerical simulation of partial differential equations
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libnlopt.so:math/nlopt
 
 USES=		compiler:c++17-lang eigen:3 gmake libtool localbase perl5 pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static \
 		--with-methods=opt \
 		--with-thread-model=pthread \
 		--datarootdir=${DATADIR} \
 		--enable-amr \
 		--enable-nlopt \
 		--disable-strict-lgpl \
 		--enable-tetgen \
 		--enable-triagle \
 		--with-boost=${LOCALBASE} \
 		--with-eigen-include=${LOCALBASE}/include/eigen3 \
 		--disable-netcdf --disable-netcdf-4 # https://github.com/libMesh/libmesh/issues/1542
 CONFIGURE_ARGS+=	--disable-metaphysicl # enabling this causes libmesh to install a bundled metaphysicl that would conflict with the metaphysicl package
 CONFIGURE_ARGS+=	--with-nlopt-include=${LOCALBASE}/include --with-nlopt-lib=${LOCALBASE}/lib # workaround for https://github.com/libMesh/libmesh/issues/3314
 MAKE_ARGS=	LDFLAGS="-pthread -lexecinfo -L${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
 
 CXXFLAGS+=	-I${WRKSRC}/contrib/parmetis/include # because parmetis.h isn't found for ./include/libmesh/parmetis_helper.h
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=			GLPK HDF5 MPI EXAMPLES
 OPTIONS_DEFAULT=		MPI
 GLPK_DESC=			Glpk linear programming solver library
 
 GLPK_CONFIGURE_ENABLE=		glpk
 GLPK_LIB_DEPENDS=		libglpk.so:math/glpk
 
 HDF5_CONFIGURE_ENABLE=		hdf5
 HDF5_LIB_DEPENDS=		libhdf5.so:science/hdf5
 
 MPI_CONFIGURE_ENABLE=		mpi
 MPI_CONFIGURE_ON=		--with-mpi=${LOCALBASE} --with-mpi-include=${LOCALBASE}/include --with-mpi-lib=${LOCALBASE}/lib
 MPI_LIB_DEPENDS=		libmpi.so:net/mpich
 
 EXAMPLES_CONFIGURE_ENABLE=	examples
 EXAMPLES_VARS=			PKGMESSAGE=pkg-message-examples
 
 SUB_FILES=			pkg-message-examples
 
 PORTEXAMPLES=	*
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${MV} ${STAGEDIR}${PREFIX}/etc/libmesh/Make.common ${STAGEDIR}${DATADIR}
 	@cd ${STAGEDIR}${PREFIX} && ${RM} -r \
 		etc/libmesh \
 		Make.common \
 		contrib \
 		libdata/pkgconfig/Make.common # https://github.com/libMesh/libmesh/issues/1539
 	# delete metis.h, see https://github.com/libMesh/libmesh/issues/3317
 	${RM} ${STAGEDIR}${PREFIX}/include/metis.h
 
 post-install-EXAMPLES-on:
 	# https://github.com/libMesh/libmesh/issues/1541
 	@${MV} ${STAGEDIR}${PREFIX}/examples ${STAGEDIR}${EXAMPLESDIR}
 	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -name Makefile | ${XARGS} ${REINPLACE_CMD} -i '' -e ' \
 		s|LIBMESH_DIR ?= .*|LIBMESH_DIR ?= ${PREFIX}| ; \
 		s|$$(LIBMESH_DIR)/Make.common|${DATADIR}/Make.common| ; \
 		s|LIBMESH_DIR/examples|LIBMESH_DIR/share/examples/${PORTNAME}| ; \
 		s|$$(libmesh_LDFLAGS)|$$(libmesh_LDFLAGS) -pthread|'
 	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -name run.sh | ${XARGS} ${CHMOD} +x
 	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -name run.sh | ${XARGS} ${REINPLACE_CMD} -i '' -e ' \
 		s|#set -x|export LIBMESH_DIR=${PREFIX}| ; \
 		s|#!/bin/bash|#!${LOCALBASE}/bin/bash| ; \
 		s|LIBMESH_DIR/examples|LIBMESH_DIR/share/examples/${PORTNAME}| ; \
 		s|reference_elements|share/${PORTNAME}/reference_elements|'
 	@${REINPLACE_CMD} -i '' -e 's|libmesh_LIBTOOL ?= /usr/local/contrib/bin/libtool|libmesh_LIBTOOL ?= libtool|' \
 		${STAGEDIR}${DATADIR}/Make.common
 
 .include <bsd.port.mk>
diff --git a/math/mathgl/Makefile b/math/mathgl/Makefile
index c58a726f7c2c..c160903f70e3 100644
--- a/math/mathgl/Makefile
+++ b/math/mathgl/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	mathgl
 DISTVERSION=	2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for high-quality scientific data visualization
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libhpdf.so:print/libharu \
 		libltdl.so:devel/libltdl \
 		libpng.so:graphics/png \
 		libsz.so:science/libaec
 
 USES=		cmake compiler:c++11-lang gettext-runtime gl jpeg xorg
 USE_GL=		gl glu glut
 USE_XORG=	xi xmu
 USE_LDCONFIG=	yes
 
 .for v in double gif glut gsl hdf5 jpeg ltdl mgl2 opengl pdf png zlib
 CMAKE_ARGS+=	-Denable-${v}=ON
 .endfor
 
 .for v in doc-info doc-html lgpl mgltex
 CMAKE_ARGS+=	-Denable-${v}=OFF
 .endfor
 
 OPTIONS_DEFINE=		PYTHON MPI
 OPTIONS_GROUP=		GRAPHICS
 OPTIONS_GROUP_GRAPHICS=	QT5 FLTK WXGTK
 OPTIONS_RADIO=		THREADS
 OPTIONS_RADIO_THREADS=	PTHREADS OPENMP
 OPTIONS_DEFAULT=	QT5
 OPTIONS_SUB=		yes
 GRAPHICS_DESC=		Graphics support
 PTHREADS_DESC=		Enable POSIX threads support (broken, fix pending release)
 OPENMP_DESC=		Parallel processing support via OpenMP (broken, cmake bug)
 FLTK_DESC=		Enable fltk widget
 PLIST_SUB=		SHLIB_VER=7.6.0
 
 PYTHON_CMAKE_BOOL=	enable-python
 PYTHON_BUILD_DEPENDS=	swig:devel/swig \
 			${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
 PYTHON_BROKEN=		Python option needs to be fixed: lgpl needs to be enabled for it
 
 MPI_CMAKE_BOOL=		enable-mpi
 MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 
 QT5_CMAKE_BOOL=		enable-qt5
 QT5_USE=		QT=core,gui,opengl,printsupport,widgets,buildtools_build,qmake_build
 QT5_USES=		desktop-file-utils qt:5 shared-mime-info
 
 FLTK_CMAKE_BOOL=	enable-fltk
 FLTK_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 FLTK_USE=		XORG=ice,sm,x11,xext
 
 WXGTK_CMAKE_BOOL=	wx
 WXGTK_USE=		WX=3.0+
 
 OPENMP_CMAKE_BOOL=	enable-openmp
 
 PTHREADS_CMAKE_BOOL=	enable-pthread
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MFLTK} && ! ${PORT_OPTIONS:MQT5}
 PLIST_SUB+=	FLTK_OR_QT5="@comment "
 .else
 PLIST_SUB+=	FLTK_OR_QT5=""
 .endif
 
 .if ${PORT_OPTIONS:MFLTK} && ${PORT_OPTIONS:MQT5}
 PLIST_SUB+=	FLTK_AND_QT5=""
 .else
 PLIST_SUB+=	FLTK_AND_QT5="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/matio/Makefile b/math/matio/Makefile
index d14c2cb4f1db..9625a58dbc48 100644
--- a/math/matio/Makefile
+++ b/math/matio/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	matio
 PORTVERSION=	1.5.23
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Library for reading and writing Matlab MAT files
 
 LICENSE=	BSD2CLAUSE
 
 USES=		7z compiler:c11 cpe libtool pathfix
 
 CPE_VENDOR=	matio_project
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 PLIST_SUB=	SHLIB_VER=11.0.4
 
 OPTIONS_DEFINE=	HDF5
 OPTIONS_DEFAULT=	HDF5
 
 HDF5_DESC=	Support for MAT file version 7.3
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CONFIGURE_ON=	--enable-mat73=yes \
 			--with-hdf5=${LOCALBASE}
 
 post-extract:
 	@${CHMOD} +x ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/math/mdal/Makefile b/math/mdal/Makefile
index 4b622e152c6d..c20b4642468f 100644
--- a/math/mdal/Makefile
+++ b/math/mdal/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	mdal
 DISTVERSION=	0.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math geography
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Mesh data abstration library
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/gtest/gtest.h:devel/googletest
 LIB_DEPENDS=	libpdal_base.so:math/pdal \
 		libnetcdf.so:science/netcdf \
 		libsqlite3.so:databases/sqlite3 \
 		libgdal.so:graphics/gdal \
 		libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec
 
 USES=		cmake gnome localbase
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	bin/mdal_translate \
 		bin/mdalinfo \
 		include/mdal.h \
 		lib/libmdal.so \
 		lib/libmdal_a.a
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	lutraconsulting
 GH_PROJECT=	MDAL
 GH_TAGNAME=	release-${DISTVERSION}
 
 CMAKE_ARGS=	-DSQLITE3_INCLUDE_DIRS="${LOCALBASE}/include" \
 		-DSQLITE3_LIBRARY="${LOCALBASE}/lib/libsqlite3.so"
 
 .include <bsd.port.mk>
diff --git a/math/moab/Makefile b/math/moab/Makefile
index 6f6471814442..3e6bda14db0e 100644
--- a/math/moab/Makefile
+++ b/math/moab/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	moab
 DISTVERSION=	5.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Component for representing and evaluating mesh data
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf \
 		libopenblas.so:math/openblas
 
 USES=		cmake eigen:3 fortran
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so \
 		-DLAPACK_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so \
 		-DFREEBSD_STAGEDIR:STRING=${STAGEDIR}
 
 BB_ACCOUNT=	fathomteam
 BB_PROJECT=	${PORTNAME}
 BB_COMMIT=	65880ffe833d
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
 OPTIONS_DEFINE=		MPI
 OPTIONS_DEFAULT=	MPI
 OPTIONS_SUB=		yes
 
 MPI_CMAKE_BOOL=		ENABLE_MPI
 MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 MPI_VARS=		CXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ CC=${LOCALBASE}/mpi/openmpi/bin/mpicc
 MPI_VARS+=		CONFLICTS_BUILD=mpich # otherwise bin/hexmodops gets linked with libmpi.so:net/mpich
 MPI_VARS_OFF=		USES=compiler:c++11-lang
 
 post-install:
 	# docs are just readmes
 	@${RM} -r ${STAGEDIR}${DOCSDIR}
 	# examples are installed into a wrong location, maybe fix them later?
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/examples
 
 .include <bsd.port.mk>
diff --git a/math/octave/Makefile b/math/octave/Makefile
index ef9964fcd666..8ad7e64ccc4c 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,138 +1,138 @@
 PORTNAME=	octave
 PORTVERSION=	${OCTAVE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	High-level interactive language for numerical computations
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gnuplot:math/gnuplot \
 		${LOCALBASE}/bin/gperf:devel/gperf \
 		gsed:textproc/gsed \
 		${LOCALBASE}/bin/makeinfo:print/texinfo
 RUN_DEPENDS=	gnuplot:math/gnuplot \
 		gsed:textproc/gsed \
 		${LOCALBASE}/bin/makeinfo:print/texinfo
 LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick \
 		libarpack.so:math/arpack-ng \
 		libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libfltk.so:x11-toolkits/fltk \
 		libftgl.so:graphics/ftgl \
 		libhdf5.so:science/hdf5 \
 		libpcre.so:devel/pcre \
 		libqhull_r.so:math/qhull \
 		libqrupdate.so:math/qrupdate \
 		libamd.so:math/suitesparse-amd \
 		libcamd.so:math/suitesparse-camd \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libcxsparse.so:math/suitesparse-cxsparse \
 		libklu.so:math/suitesparse-klu \
 		libumfpack.so:math/suitesparse-umfpack \
 		libglpk.so:math/glpk \
 		libgl2ps.so:print/gl2ps \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libdrm.so:graphics/libdrm \
 		libOSMesa.so:graphics/libosmesa \
 		libsundials_arkode.so:math/sundials \
 		libportaudio.so:audio/portaudio
 
 USES=		charsetfix fortran gmake libtool perl5 pkgconfig readline \
 		tar:xz compiler:c++14-lang \
 		desktop-file-utils gl iconv ncurses xorg
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 USE_QT=		core gui help network opengl \
 		qmake_build buildtools_build linguist_build \
 		printsupport sql widgets \
 		xml
 USE_XORG=	x11 xext xfixes xft \
 		xcursor xinerama xrender
 USE_GL=		gl glu
 
 OCTAVE_VERSION=	${PORTVERSION}
 GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
 PLIST_SUB=	OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt5
 CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf" \
 		JAVA_HOME=${JAVA_HOME} \
 		MAKEINFO=${LOCALBASE}/bin/makeinfo \
 		MKINFO=${LOCALBASE}/bin/makeinfo \
 		MOC_QTVER=${MOC} \
 		UIC_QTVER=${UIC} \
 		RCC_QTVER=${RCC} \
 		LRELEASE_QTVER=${LRELEASE} \
 		QCOLLECTIONGENERATOR_QTVER=${QCOLLECTIONGENERATOR} \
 		QHELPGENERATOR_QTVER=${QHELPGENERATOR} \
 		ac_cv_type_max_align_t=yes \
 		ac_cv_path_SED=${LOCALBASE}/bin/gsed
 
 CONFIGURE_ARGS=	--host=${GNU_HOST} \
 		--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
 		--with-lapack="${LAPACKLIB}" \
 		--enable-shared \
 		--disable-jit \
 		--disable-openmp \
 		--with-osmesa
 
 INFO=		octave liboctave
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	DOCS JAVA QT5
 
 OPTIONS_RADIO=		BLAS
 OPTIONS_RADIO_BLAS=	OPENBLAS NETLIB ATLAS
 OPTIONS_DEFAULT=	JAVA OPENBLAS QT5
 OPTIONS_SUB=		yes
 
 DOCS_CONFIGURE_ENABLE=	docs
 JAVA_CONFIGURE_ENABLE=	java
 QT5_CONFIGURE_WITH=	qt=5 qscintilla
 
 QT5_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 
 DOCS_USE=	TEX=dvipsk:build,formats:build
 JAVA_USE=	JAVA=yes
 JAVA_CFLAGS=	-I${JAVA_HOME}/include/${OPSYS:tl}
 QT5_USES=	qt:5
 OPENBLAS_USES=	blaslapack:openblas
 NETLIB_USES=	blaslapack:netlib
 ATLAS_USES=		blaslapack:atlas
 
 pre-configure:
 	${REINPLACE_CMD} 's+"makeinfo"+"${LOCALBASE}/bin/makeinfo"+' ${WRKSRC}/libinterp/corefcn/help.cc
 	${REINPLACE_CMD} 's/"-qt=$$qt_version"/"-qt=qt$$qt_version"/' ${WRKSRC}/configure
 
 post-install:
 	(cd ${STAGEDIR}${DATADIR} && ${LN} -s ${PORTVERSION}/imagelib  .)
 	${RM} -r ${STAGEDIR}${DATADIR}/${PORTVERSION}/etc/tests/fixed/${WRKDIR:C+/++:C+/.*++}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in liboctave/liboctave.ps \
 	refcard/refcard-a4.ps refcard/refcard-legal.ps \
 	refcard/refcard-letter.ps interpreter/octave.ps
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${INFO_PATH}
 .for file in interpreter/octave.info liboctave/liboctave.info
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${PREFIX}/${INFO_PATH}
 .endfor
 
 check regression-test: build
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check)
 
 .include "Makefile.version"
 .include <bsd.port.mk>
diff --git a/math/openturns/Makefile b/math/openturns/Makefile
index 37e6e45d87aa..1dc376977934 100644
--- a/math/openturns/Makefile
+++ b/math/openturns/Makefile
@@ -1,100 +1,100 @@
 PORTNAME=	openturns
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.19
-PORTREVISION=	3
+PORTREVISION=	4
 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 \
 		libboost_serialization.so:devel/boost-libs \
 		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 \
 		libpagmo.so:science/pagmo2 \
 		libpng16.so:graphics/png \
 		libprimesieve.so:math/primesieve \
 		libspqr.so:math/suitesparse-spqr \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libsz.so:science/libaec \
 		libtbb.so:devel/onetbb \
 		libunwind.so:devel/libunwind
 
 USES=		bison blaslapack:openblas cmake eigen:3 gnome jpeg localbase:ldflags pkgconfig sqlite xorg # compiler:c++17-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/pdal/Makefile b/math/pdal/Makefile
index c68b5ae8fb74..18477207c887 100644
--- a/math/pdal/Makefile
+++ b/math/pdal/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	pdal
 DISTVERSION=	2.3.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math databases graphics
 MASTER_SITES=	https://github.com/PDAL/PDAL/releases/download/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Library for translating and manipulating point cloud data
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libboost_thread.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libgeotiff.so:graphics/libgeotiff \
 		libxml2.so:textproc/libxml2 \
 		liblaszip.so:archivers/laszip \
 		libzstd.so:archivers/zstd \
 		${LIB_DEPENDS_${ARCH}}
 LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_armv7=	libunwind.so:devel/libunwind
 LIB_DEPENDS_i386=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64le=libunwind.so:devel/libunwind
 
 USES=		cmake compiler:c++11-lib pathfix pkgconfig ssl tar:bz2
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME:tu}-${DISTVERSION}-src
 
 CMAKE_ON=	WITH_LASZIP #LASZIP is recommended
 CMAKE_OFF=	WITH_TESTS
 
 OPTIONS_DEFINE=	BASH \
 		ICEBRIDGE PGPOINTCLOUD LAZPERF MBIO \
 
 OPTIONS_DEFAULT=	BASH \
 			ICEBRIDGE PGPOINTCLOUD LAZPERF MBIO
 
 #Plugins with lib not in port:
 #RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin, NITF (nitro)
 OPTIONS_SUB=	yes
 
 BASH_DESC=		BASH completion
 ICEBRIDGE_DESC=		Enable Icebridge plugin
 LAZPERF_DESC=		Enable LAZPerf plugin
 MBIO_DESC=		Enable MBIO plugin
 PGPOINTCLOUD_DESC=	Enable Coherent PostgreSQL Point Cloud plugin
 
 BASH_CMAKE_BOOL=	WITH_COMPLETION
 BASH_RUN_DEPENDS=	bash:shells/bash
 
 ICEBRIDGE_CMAKE_BOOL=	BUILD_PLUGIN_ICEBRIDGE
 ICEBRIDGE_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 			libsz.so:science/libaec
 
 LAZPERF_CMAKE_BOOL=	WITH_LAZPERF
 LAZPERF_LIB_DEPENDS=	liblazperf.so:archivers/lazperf
 
 MBIO_CMAKE_BOOL=	BUILD_PLUGIN_MBIO
 
 PGPOINTCLOUD_CMAKE_BOOL=	BUILD_PLUGIN_PGPOINTCLOUD
 PGPOINTCLOUD_USES=	pgsql
 
 CXXFLAGS_powerpc64=	-mvsx
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
 	${INSTALL_DATA} ${WRKSRC}/scripts/bash-completion/pdal \
 		${STAGEDIR}${PREFIX}/share/bash-completion/completions
 
 .include <bsd.port.mk>
diff --git a/math/psurface/Makefile b/math/psurface/Makefile
index 19c1e4738d5f..8ff022099d84 100644
--- a/math/psurface/Makefile
+++ b/math/psurface/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	psurface
 DISTVERSION=	2.0.0-13
 DISTVERSIONSUFFIX=	-gb5b6825
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Piecewise linear bijections between triangulated surfaces
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5
 
 USES=		autoreconf libtool localbase
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 TEST_TARGET=	check # 2 tests fail because the file examplefiles/tricube-anticlockwise.msh is missing, see https://github.com/psurface/psurface/issues/3
 
 .include <bsd.port.mk>
diff --git a/math/saga/Makefile b/math/saga/Makefile
index 0fa48b2af6c3..585f110bdffb 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -1,95 +1,96 @@
 PORTNAME=	saga
 PORTVERSION=	8.3.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	System for Automated Geoscientific Analyses
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
 		swig:devel/swig
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
 		libgdal.so:graphics/gdal \
 		libhdf5.so:science/hdf5 \
 		libhpdf.so:print/libharu \
 		libjasper.so:graphics/jasper \
 		libodbc.so:databases/unixODBC \
 		libopencv_core.so:graphics/opencv \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
 		libqhull_r.so:math/qhull \
 		libsvm.so:science/libsvm \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff
 RUN_DEPENDS:=	swig:devel/swig
 
 USES=		cmake compiler:c++11-lib dos2unix gnome \
 		iconv:wchar_t libtool localbase pkgconfig python
 DOS2UNIX_GLOB=	*.cpp *.h
 USE_LDCONFIG=	yes
 USE_WX=		3.1+
 
 CMAKE_ARGS+=	-DSVM_INCLUDE:PATH=${LOCALBASE}/include/svm.h
 CMAKE_ON=	WITH_DEV_TOOLS WITH_EXCERCISES WITH_MRMR WITH_SYSTEM_SVM
 CMAKE_ON+=	CMAKE_VERBOSE_MAKEFILE
 CMAKE_OFF+=	WITH_TOOLS_LAS WITH_TRIANGLE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/saga-gis
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	PGSQL OPENMP VIGRA
 OPTIONS_DEFAULT=	PGSQL VIGRA
 OPTIONS_DEFAULT_amd64=	OPENMP
 OPTIONS_DEFAULT_i386=	OPENMP
 OPTIONS_DEFAULT_powerpc64=	OPENMP
 OPTIONS_DEFAULT_powerpc64le=	OPENMP
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=	yes
 OPENMP_DESC=	Enable Multiprocessing (only amd64, i386 and powerpc64*)
 VIGRA_DESC=	Enable 'Vision with Generic Algorithms' Library
 
 OPENMP_CONFIGURE_ENABLE=	openmp
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgresql
 VIGRA_BUILD_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra
 VIGRA_RUN_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra
 
 .include <bsd.port.pre.mk>
 
 # make describe needs them here
 CPP=		clang-cpp${LLVM_DEFAULT}
 CC=		clang${LLVM_DEFAULT}
 CXX=		clang++${LLVM_DEFAULT}
 
 SUB_FILES=	pkg-message
 
 post-patch:
 .if ${ARCH} == "powerpc"
 	@${REINPLACE_CMD} -e 's|typedef unsigned long	DWORD;|typedef unsigned int	DWORD;|' \
 		${WRKSRC}/src/saga_core/saga_api/api_core.h
 .endif
 	@${REINPLACE_CMD} -e 's|PORTVERSION|${PORTVERSION}|' \
 		${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp
 	@${REINPLACE_CMD} -e 's|-lgomp|-lomp|' \
 		${WRKSRC}/src/accessories/templates/template4saga-tools/my_tool_library/Makefile
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga*.txt ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR}
 	${RM} ${STAGEDIR}${DATADIR}/saga_dic.txt ${STAGEDIR}${DATADIR}/saga_srs.txt
 # toolchains dir was moved in r2805 (and followups r2810,r2811,r2820)
 	(cd ${WRKSRC}/src/accessories && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${RM} -R ${STAGEDIR}${DATADIR}/CMakeLists.txt
 	${RM} -R ${STAGEDIR}${DATADIR}/templates/template4saga-tools/my_tool_library/Makefile.bak
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/
 # library helper files are not needed and cripple some math/qgis extensions
 	@${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la
 
 .include <bsd.port.post.mk>
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 082b82c0315d..456c7748112d 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,182 +1,182 @@
 PORTNAME=	scilab
 PORTVERSION=	6.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math cad java
 MASTER_SITES=	https://cgit.scilab.org/scilab/snapshot/
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Scientific software package for numerical computations
 
 LICENSE=	GPLv2 BSD3CLAUSE
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/COPYING-BSD
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 		libpcre.so:devel/pcre \
 		libcurl.so:ftp/curl \
 		libhdf5.so:science/hdf5 \
 		libarpack.so:math/arpack-ng \
 		libfftw3.so:math/fftw3 \
 		libmatio.so:math/matio \
 		libamd.so:math/suitesparse-amd \
 		libumfpack.so:math/suitesparse-umfpack
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		compiler:c++17-lang cpe desktop-file-utils eigen:3,build \
 		fortran gettext gmake gnome iconv:wchar_t libtool \
 		localbase ncurses pathfix pkgconfig shared-mime-info
 USE_LOCALE=	en_US.UTF-8
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-gfortran \
 		--without-emf \
 		--with-eigen-include=${LOCALBASE}/include/eigen3 \
 		${ICONV_CONFIGURE_ARG}
 LDFLAGS+=	${ICONV_LIB}
 
 CONFIGURE_ENV=	BLAS_LIBS="${BLASLIB}" LAPACK_LIBS="${LAPACKLIB}"
 INSTALL_TARGET=	install-strip
 WRKSRC_SUBDIR=	scilab
 
 PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
 OPTIONS_DEFINE=	GUI OCAML TK
 OPTIONS_RADIO=	BLAS
 OPTIONS_RADIO_BLAS=	ATLAS NETLIB OPENBLAS
 OPTIONS_DEFAULT=	GUI NETLIB OCAML TK
 OPTIONS_EXCLUDE_powerpc64=	GUI
 OPTIONS_EXCLUDE_powerpc64le=	GUI
 OPTIONS_SUB=	yes
 
 ATLAS_USES=	blaslapack:atlas
 NETLIB_USES=	blaslapack:netlib
 OPENBLAS_USES=	blaslapack:openblas
 
 GUI_DESC=	Java-based Graphical User Interface
 OCAML_DESC=	Scicos - dynamical system simulator (requires GUI)
 
 # Java dependencies:
 _GUI_DEPENDS+=	${JAVALIBDIR}/flexdock.jar:devel/flexdock \
 		${JAVALIBDIR}/jogl2.jar:graphics/jogamp-jogl \
 		foprep:math/jeuclid \
 		${JAVALIBDIR}/jhall.jar:java/javahelp \
 		${JAVALIBDIR}/jrosetta-api.jar:java/jrosetta \
 		${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
 		${JAVALIBDIR}/jgraphx.jar:java/jgraphx \
 		${JAVALIBDIR}/jlatexmath.jar:math/jlatexmath \
 		${LOCALBASE}/share/java/ecj-4.5.jar:lang/gcc-ecj45 \
 		${JAVALIBDIR}/lucene-core-5.5.5.jar:textproc/lucene5
 # Documentation, graphic export:
 _GUI_DEPENDS+=	${LOCALBASE}/share/java/fop/build/fop.jar:textproc/fop \
 		${JAVALIBDIR}/jlatexmath-fop.jar:math/jlatexmath \
 		${LOCALBASE}/share/java/batik/lib/batik-all.jar:graphics/batik \
 		${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \
 		${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io \
 		${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons
 # Code quality:
 _GUI_DEPENDS+=	${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils \
 		${JAVALIBDIR}/antlr.jar:devel/antlr \
 		${JAVALIBDIR}/junit4.jar:java/junit \
 		${LOCALBASE}/bin/splint:devel/splint
 # Documentation building:
 _GUI_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/javahelp/javahelp.xsl:textproc/docbook-xsl \
 		${JAVALIBDIR}/saxon9he.jar:textproc/saxon-he \
 		${JAVALIBDIR}/xml-apis-ext.jar:textproc/xml-commons \
 		xsltproc:textproc/libxslt
 # Other gui deps:
 _GUI_DEPENDS+=	${JAVALIBDIR}/looks.jar:devel/jgoodies-looks \
 		${JAVALIBDIR}/skinlf.jar:x11-toolkits/skinlf
 
 # Can't use USE_ANT because it overrides do-build target
 GUI_BUILD_DEPENDS=	${_GUI_DEPENDS} \
 			ant:devel/apache-ant
 GUI_RUN_DEPENDS=	${_GUI_DEPENDS}
 
 GUI_ALL_TARGET=	all doc
 GUI_USES=	gl
 GUI_USE=	GL=gl JAVA=yes
 GUI_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-bin-JAVA_HOME
 GUI_CONFIGURE_ON=	--with-jdk=${JAVA_HOME} \
 			--with-docbook=${LOCALBASE}/share/xsl/docbook \
 			--enable-build-help
 GUI_CONFIGURE_OFF=	--without-gui \
 			--without-javasci \
 			--without-xcos \
 			--disable-build-help
 
 OCAML_IMPLIES=		GUI
 OCAML_CONFIGURE_WITH=	modelica
 OCAML_BUILD_DEPENDS=	ocaml:lang/ocaml \
 	${LOCALBASE}/lib/ocaml/site-lib/num/META:math/ocaml-num
 OCAML_RUN_DEPENDS=	ocaml:lang/ocaml
 
 TK_CONFIGURE_OFF=	--without-tk
 TK_CONFIGURE_ON=	--with-tk-library=${LOCALBASE}/lib \
 			--with-tk-include=${TK_INCLUDEDIR} \
 			--with-tcl-library=${LOCALBASE}/lib \
 			--with-tcl-include=${TCL_INCLUDEDIR}
 TK_USES=	tk xorg
 TK_USE=		XORG=x11
 TK_RUN_DEPENDS=	${LOCALBASE}/lib/bwidget/init.tcl:x11-toolkits/bwidget
 
 .if !exists(/usr/include/omp.h)
 CONFIGURE_ARGS+=	--without-openmp
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (rank-1 and scalar)
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 .if ${PORT_OPTIONS:MGUI}
 DEPRECATED=	Depends on expired devel/avalon-framework
 EXPIRATION_DATE=2022-09-30
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' ${WRKSRC}/etc/librarypath.xml
 	@${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure
 
 post-patch-GUI-on:
 # scilab segfaults on FreeBSD with C locale
 	@${REINPLACE_CMD} 's,LC_ALL=C,,' ${WRKSRC}/Makefile.in
 	@# Configure fixes
 	@${REINPLACE_CMD} '/ac_java_jvm_jni_lib_flags/s,\(ljvm\),\1 -pthread,' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/lib/java|${JAVALIBDIR}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/lib64/jni|${LOCALBASE}/lib/|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} 's,\(DEFAULT_JAR_DIR="\),\1 \
 		${LOCALBASE}/share/java/classes \
 		${LOCALBASE}/share/java/fop/build \
 		${LOCALBASE}/share/java/batik/lib \
 		${LOCALBASE}/share/java/jeuclid/repo ,' ${WRKSRC}/configure
 # Prefer non-versioned files to avoid excessive rebuilds. This also fixes detection of fop.
 	@${REINPLACE_CMD} 's|batik-all\*\.jar|batik-all.jar|g; \
 			s|commons-io\*\.jar|commons-io.jar|g; \
 			s|commons-logging\*\.jar|commons-logging.jar|g; \
 			s|fop\*\.jar|fop.jar|g; \
 			s|jlatexmath\*\.jar|jlatexmath.jar|g; \
 			s|xmlgraphics-commons\*\.jar|xmlgraphics-commons.jar|g' \
 			${WRKSRC}/configure
 # Part of the jogamp-jogl-2.3 patch:
 	@${REINPLACE_CMD} -e 's|javax.media.opengl.glu.GLUnurbs|com.jogamp.opengl.glu.GLUnurbs|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|jogamp.common.os.MachineDescriptionRuntime|jogamp.common.os.MachineDataInfoRuntime|' ${WRKSRC}/configure
 	@# Run fixes
 	@${REINPLACE_CMD} -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/bin/scilab
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/.atoms
 
 post-install:
 	@# Remove empty dirs in DATADIR/modules - they will be removed by the
 	@# toolbox uninstaller otherwise if 3rd party toolboxes are used
 	@${FIND} ${STAGEDIR}${DATADIR}/modules -type d -empty -delete
 
 .include <bsd.port.post.mk>
diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile
index 06fac3fcbf9a..41abd1e3041d 100644
--- a/math/vtk9/Makefile
+++ b/math/vtk9/Makefile
@@ -1,122 +1,122 @@
 PORTNAME=	vtk
 DISTVERSION=	9.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math graphics
 MASTER_SITES=	https://vtk.org/files/release/${VTK_SHORT_VER}/
 PKGNAMESUFFIX=	9
 DISTNAME=	${PORTNAME:tu}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Visualization toolkit
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	\
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		alias cmake compiler:c++11-lang gl jpeg localbase xorg
 USE_LDCONFIG=	${PREFIX}/lib/vtk-${VTK_SHORT_VER}
 USE_XORG=	ice x11 xt xext sm xcursor xfixes xrender
 
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		VTK_INSTALL_NO_DOCUMENTATION \
 		Module_vtkTestingCore Module_vtkTestingRendering
 .for m in expat freetype hdf5 jpeg netcdf png tiff zlib
 CMAKE_ON+=	VTK_MODULE_USE_EXTERNAL_VTK_${m}
 .endfor
 CMAKE_ARGS=	-DVTK_INSTALL_LIBRARY_DIR=lib/vtk-${VTK_SHORT_VER} \
 		-DVTK_INSTALL_ARCHIVE_DIR=lib/vtk-${VTK_SHORT_VER} \
 		-DVTK_INSTALL_QT_DIR=/${QT_LIBDIR_REL}/plugins/designer \
 		-DSTAGEDIR=${STAGEDIR}
 		# all build options are documented here: https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/build.md
 
 VTK_SHORT_VER=	${PORTVERSION:R}
 
 DOCSDIR=	${PREFIX}/share/doc/vtk-${VTK_SHORT_VER}
 DATADIR=	${PREFIX}/share/vtk-${VTK_SHORT_VER}
 
 # Options
 OPTIONS_DEFINE=	DESIGNER DOCS MPI OSMESA PYTHON QT5 EXAMPLES
 OPTIONS_DEFAULT=	MPI PYTHON QT5 # vtk python binding is needed by other packages, and is unfortunately is unseparable. It is a candidate to be a subpackage.
 OSMESA_DESC=	Use Mesa for off-screen rendering
 DESIGNER_DESC=	Build the Qt Designer plugin
 OPTIONS_SUB=	yes
 
 # Options groups
 VTK_WRAPS=	JAVA TCLTK
 OPTIONS_GROUP=	WRAPPING
 OPTIONS_GROUP_WRAPPING=${VTK_WRAPS}
 GROUPS_DESC=	Groups
 WRAPPING_DESC=	Wrapping
 .for w in ${VTK_WRAPS}
 $w_DESC=	$w wrapping
 .endfor
 
 PYTHON_USES=		python:3.6+
 PYTHON_CMAKE_BOOL=	VTK_WRAP_PYTHON
 PYTHON_CMAKE_ON=	-DVTK_PYTHON_VERSION=${PYTHON_MAJOR_VER} -DPython3_EXECUTABLE=${PYTHON_CMD}
 PYTHON_VARS=		SUB_FILES=PKG-INFO SUB_LIST=PORTVERSION=${PORTVERSION}
 
 QT5_USES=		qt:5
 QT5_USE=		QT=core,declarative,gui,network,opengl,sql,uiplugin,widgets,x11extras,qmake_build,buildtools_build
 QT5_CMAKE_ON=		-DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 \
 			-DVTK_GROUP_ENABLE_Qt:STRING=YES \
 			-DVTK_MODULE_ENABLE_VTK_GUISupportQt:STRING=YES
 
 DESIGNER_CMAKE_BOOL=	QT_DESIGNER_PLUGIN
 DESIGNER_USE=		QT=designer
 DESIGNER_IMPLIES=	QT5
 
 MPI_CMAKE_BOOL=		VTK_USE_MPI
 MPI_LIB_DEPENDS=	libmpi.so:net/mpich
 MPI_CMAKE_ON=		-DMPIEXEC=${LOCALBASE}/mpi/openmpi/bin/mpiexec
 
 OSMESA_CMAKE_ON=	-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
 			-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
 			-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \
 			-DOPENGL_gl_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \
 			-DVTK_USE_X:BOOL=OFF
 OSMESA_LIB_DEPENDS=	libOSMesa.so:graphics/libosmesa
 
 # Wrapping
 JAVA_CATEGORIES=	java
 JAVA_VARS=		USE_JAVA=yes
 JAVA_CMAKE_BOOL=	VTK_WRAP_JAVA Module_vtkWrappingJava
 JAVA_CMAKE_ON=		-DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \
 			-DJAVA_AWT_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \
 			-DJAVA_JVM_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ATCH}/libjava.so
 
 TCLTK_USES=		tk
 TCLTK_CMAKE_BOOL=	VTK_WRAP_TCL VTK_Group_Tk
 TCLTK_CMAKE_ON=		-DTCL_INCLUDE_PATH:PATH=${TCL_INCLUDEDIR} \
 			-DTK_INCLUDE_PATH:PATH=${TK_INCLUDEDIR}  \
 			-DVTK_INSTALL_TCL_DIR=lib/vtk-${VTK_SHORT_VER}
 
 DOCS_CMAKE_BOOL=	BUILD_DOCUMENTATION
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 EXAMPLES_CMAKE_BOOL=	BUILD_EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MOSMESA}
 USES+=		gl
 USE_GL=		gl glu
 .endif
 
 CONFLICTS=	vtk6 vtk8
 
 do-install-PYTHON-on: # cmake doesn't install pip's .egg-info: https://gitlab.kitware.com/vtk/vtk/-/issues/18087
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/vtk-${DISTVERSION}-py${PYTHON_VER}.egg-info
 	@${INSTALL_DATA} ${WRKDIR}/PKG-INFO ${STAGEDIR}${PYTHON_SITELIBDIR}/vtk-${DISTVERSION}-py${PYTHON_VER}.egg-info
 
 post-install: # autoplist: thousands of files, complex dependencies on options
 	@cd ${STAGEDIR}${PREFIX} && \
 		${FIND} * -type f -or -type l >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/misc/adios2/Makefile b/misc/adios2/Makefile
index 64ede90a2e37..11a9559fa6fa 100644
--- a/misc/adios2/Makefile
+++ b/misc/adios2/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	adios2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.2
+PORTREVISION=	1
 CATEGORIES=	misc science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Next generation of ADIOS developed in the Exascale Computing Program
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	constant expression evaluates to 18446744073709551613 which cannot be narrowed to type 'unsigned int': https://github.com/ornladios/ADIOS2/issues/2469
 BROKEN_powerpc=	constant expression evaluates to 18446744073709551613 which cannot be narrowed to type 'unsigned int': https://github.com/ornladios/ADIOS2/issues/2469
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}mpi4py>=3.0.3:net/py-mpi4py@${PY_FLAVOR}
 BUILD_DEPENDS=	bash:shells/bash \
 		pybind11>0:devel/pybind11 \
 		${PYTHON_PKGNAMEPREFIX}pybind11>=2.4:devel/py-pybind11@${PY_FLAVOR} \
 		${PY_DEPENDS}
 LIB_DEPENDS=	libblosc.so:archivers/c-blosc \
 		libepoll-shim.so:devel/libepoll-shim \
 		libfabric.so:net/libfabric \
 		libffi.so:devel/libffi \
 		libhdf5.so:science/hdf5 \
 		libmpi.so:net/mpich \
 		libpng.so:graphics/png \
 		libsodium.so:security/libsodium \
 		libsz.so:science/libaec \
 		libzmq.so:net/libzmq4 \
 		libzfp.so:devel/zfp
 RUN_DEPENDS=	bash:shells/bash \
 		${PY_DEPENDS}
 
 USES=		bison cmake:testing compiler:c++11-lang fortran localbase:ldflags pkgconfig \
 		perl5 python shebangfix
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	cmake/install/post/adios2-config.pre.sh.in cmake/install/post/generate-adios2-config.sh.in \
 		source/utils/adios_reorganize/adios2_reorganize_wrapper source/utils/adios2_deactivate_bp
 SHEBANG_GLOB=	*.sh *.py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ornladios
 GH_PROJECT=	ADIOS2
 
 CMAKE_ARGS=	-DFREEBSD_PYTHON_VERSION=${PYTHON_VER}
 CMAKE_OFF=	BUILD_TESTING
 LDFLAGS+=	-lepoll-shim
 
 OPTIONS_DEFINE=	DOCS
 
 DOCSDIR=	${PREFIX}/share/doc/ADIOS2
 PORTDOCS=	*
 
 # several tests fail, see https://github.com/ornladios/ADIOS2/issues/3286
 
 .include <bsd.port.mk>
diff --git a/science/ALPSCore/Makefile b/science/ALPSCore/Makefile
index d6992a62de5d..4577429d7fca 100644
--- a/science/ALPSCore/Makefile
+++ b/science/ALPSCore/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	ALPSCore
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.0
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	science
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic algorithms and utilities for condensed matter physics
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 BROKEN_i386=	fails to build: no matching member function for call to 'read'
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec
 
 USES=		cmake compiler:c++11-lang eigen:3
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 TEST_TARGET=	test # 2 to 3 tests fail: https://github.com/ALPSCore/ALPSCore/issues/388
 
 CMAKE_ARGS+=	-DTesting:BOOL=OFF # enable only for the 'test' target
 CMAKE_ARGS_TEST=	-DTesting:BOOL=ON -DExtensiveTesting:BOOL=ON
 CXXFLAGS+=	-DNDEBUG # see https://github.com/ALPSCore/ALPSCore/issues/389
 LDFLAGS+=	-lexecinfo # https://github.com/ALPSCore/ALPSCore/issues/390
 
 OPTIONS_DEFINE=	DOXYGEN DOCS OPENMPI
 OPTIONS_DEFAULT=	OPENMPI
 
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_CMAKE_BOOL=	Documentation
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 OPENMPI_CMAKE_BOOL=	ENABLE_MPI
 OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPENMPI}
 CC=	${LOCALBASE}/mpi/openmpi/bin/mpicc
 CXX=	${LOCALBASE}/mpi/openmpi/bin/mpicxx
 .endif
 
 post-install-DOXYGEN-on:
 	@${RM} ${STAGEDIR}${DOCSDIR}/.tag
 
 pre-test:
 	@cd ${CONFIGURE_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_ARGS_TEST} ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
 
 .include <bsd.port.post.mk>
diff --git a/science/InsightToolkit/Makefile b/science/InsightToolkit/Makefile
index ca5d884fbe02..0b6ac31d9ea1 100644
--- a/science/InsightToolkit/Makefile
+++ b/science/InsightToolkit/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	InsightToolkit
 PORTVERSION=	5.0.1
 DISTVERSIONPREFIX=v
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	science biology
 MASTER_SITES=	https://github.com/InsightSoftwareConsortium/ITK/releases/download/v5.0.1/:data
 DISTFILES=	InsightData-5.0.1.tar.gz:data
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Insight Toolkit
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	googletest>=0:devel/googletest
 LIB_DEPENDS=	libgdcmCommon.so:devel/gdcm \
 		libexpat.so:textproc/expat2 \
 		libfftw.so:math/fftw \
 		libhdf5.so:science/hdf5 \
 		libpng.so:graphics/png \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff
 
 USES=		cmake compiler:c++11-lang eigen:3 jpeg pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	InsightSoftwareConsortium
 GH_PROJECT=	ITK
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON \
 		-DITK_FORBID_DOWNLOADS:BOOL=ON \
 		-DITK_LEGACY_SILENT:BOOL=ON \
 		-DITK_USE_KWSTYLE:BOOL=OFF \
 		-DITK_USE_SYSTEM_EXPAT:BOOL=ON \
 		-DITK_USE_SYSTEM_FFTW:BOOL=ON \
 		-DITK_USE_SYSTEM_GDCM:BOOL=ON \
 		-DITK_USE_SYSTEM_HDF5:BOOL=ON \
 		-DITK_USE_SYSTEM_JPEG:BOOL=ON \
 		-DITK_USE_SYSTEM_LIBRARIES:BOOL=ON \
 		-DITK_USE_SYSTEM_PNG:BOOL=ON \
 		-DITK_USE_SYSTEM_TIFF:BOOL=ON \
 		-DITK_USE_SYSTEM_ZLIB:BOOL=ON \
 		-DModule_ITKIOMIC:BOOL=ON \
 		-DModule_ITKIOTransformMINC:BOOL=ON \
 		-DModule_ITKReview:BOOL=ON
 USE_LDCONFIG=	${PREFIX}/lib/InsightToolkit
 ITK_VER=	${PORTVERSION:R}
 PLIST_SUB+=	ITK_VER=${ITK_VER}
 
 OPTIONS_DEFINE=	EXAMPLES TESTING
 EXAMPLES_DESC=	Build examples (very time consuming)
 TESTING_DESC=	Build testing programs (very time consuming)
 
 EXAMPLES_CMAKE_ON=	-DBUILD_EXAMPLES:BOOL=ON
 TESTING_CMAKE_ON=	-DBUILD_TESTING:BOOL=ON
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 PLIST_SUB+=	CHOSEN_COMPILER_TYPE="GNU"
 .else
 PLIST_SUB+=	CHOSEN_COMPILER_TYPE="Clang"
 .endif
 
 post-extract:
 	${MV} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/.ExternalData/* ${WRKSRC}/.ExternalData/
 	${RM} -r ${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.post.mk>
diff --git a/science/abinit/Makefile b/science/abinit/Makefile
index 57322a7efa44..5415c2434f75 100644
--- a/science/abinit/Makefile
+++ b/science/abinit/Makefile
@@ -1,97 +1,97 @@
 PORTNAME=	abinit
 DISTVERSION=	9.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Full-featured atomic-scale first-principles simulation software
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	gm4:devel/m4	\
 		${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}graphviz>0:graphics/py-graphviz@${PY_FLAVOR}
 LIB_DEPENDS=	libelpa.so:math/elpa		\
 		libsz.so:science/libaec		\
 		libelpa.so:math/elpa		\
 		libxc.so:science/libxc		\
 		libfftw3.so:math/fftw3		\
 		libhdf5.so:science/hdf5		\
 		libxml2.so:textproc/libxml2	\
 		libnetcdf.so:science/netcdf	\
 		libxmlf90.so:textproc/xmlf90	\
 		libwannier.so:science/wannier90	\
 		libnetcdff.so:science/netcdf-fortran
 RUN_DEPENDS=	atompaw:science/atompaw
 TEST_DEPENDS=	${PYNUMPY}	\
 		libyaml>0:textproc/libyaml
 
 USES=		autoreconf:build blaslapack:netlib fortran gmake gnome localbase:ldflags	\
 		python:3.7+ shebangfix
 USE_GITHUB=	yes
 USE_GNOME=	libxml2
 SHEBANG_FILES=	config/scripts/* doc/tutorial/paral_gspw_assets/abinit.sub.*
 SHEBANG_GLOB=	*.py
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC_LDFLAGS="${LDFLAGS}" CXX_LDFLAGS="${LDFLAGS}" FC_LDFLAGS="${LDFLAGS}"	\
 		H5CC="${LOCALBASE}/bin/h5cc" \
 		HDF5_CFLAGS="-I${LOCALBASE}/include" \
 		HDF5_LDFLAGS="-L${LOCALBASE}/lib -lhdf5" \
 		LINALG_FCFLAGS="-I${LOCALBASE}/include/elpa-2019.05.002/modules"	\
 		LINALG_LIBS="${BLASLIB}  ${LAPACKLIB} -lelpa"	\
 		NETCDF_FORTRAN_FCFLAGS=-I${LOCALBASE}/include	\
 		XMLF90_FCFLAGS=-I${LOCALBASE}/include	\
 		WANNIER90_LIBS="${BLASLIB}  ${LAPACKLIB} -lwannier"
 CONFIGURE_ARGS=	--with-fft --with-libxc --with-libxml2 --with-netcdf	\
 		--with-netcdf-fortran --with-wannier90 --with-xmlf90
 FCFLAGS+=	-ffree-line-length-none
 TEST_TARGET=	tests_abirules tests_buildsys
 TEST_WRKSRC=	${WRKSRC}/abichecks
 PORTDOCS=	*
 
 OPTIONS_DEFINE=			DOCS OPENMP MPI
 OPTIONS_DEFAULT=		OPENMP MPI
 
 OPENMP_CONFIGURE_ENABLE=	openmp
 OPENMP_LDFLAGS=			-lomp
 
 MPI_CONFIGURE_WITH=		mpi=yes
 # fftw3 not enabled because libfftw3_mpi is required but not packaged
 MPI_VARS=			FFLAGS+=-I${LOCALBASE}/include FCFLAGS+=-I${LOCALBASE}/include	\
 				CONFIGURE_ENV+=MPI_LIBS="`pkg-config --libs mpich` -lmpifort"	\
 				CONFIGURE_ENV+MPI_LDFLAGS="`pkg-config --libs mpich` -lmpifort"
 MPI_BUILD_DEPENDS=		mpich>0:net/mpich
 MPI_RUN_DEPENDS=		mpich>0:net/mpich
 
 .if defined(WITH_LEVMAR)
 # --with-levmar seems deprecated
 LIB_DEPENDS+=	liblevmar.so:math/levmar
 CONFIGURE_ENV+=	LEVMAR_LIBS="-llevmar ${BLASLIB} ${LAPACKLIB}"
 CONFIGURE_ARGS+=	--with-levmar
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 FCFLAGS+=	-fallow-argument-mismatch # see https://github.com/abinit/abinit/issues/41
 .endif
 
 pre-configure:
 	(cd ${WRKSRC} && ./autogen.sh)
 
 post-install-DOCS-on:
 	${REINPLACE_CMD} -e 's|/usr/bin/env  python|${PYTHON_CMD}|'	\
 		${WRKSRC}/doc/tutorial/paral_moldyn_assets/diag_moldyn.py
 	${RM} ${WRKSRC}/doc/tutorial/paral_moldyn_assets/diag_moldyn.py.bak
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/doc/tutorial ${STAGEDIR}${DOCSDIR}
 
 pre-test:
 	${TOUCH} ${TEST_WRKSRC}/make.log
 
 .include <bsd.port.post.mk>
diff --git a/science/ascent/Makefile b/science/ascent/Makefile
index 77b6b2a0042f..1ccc1f27742e 100644
--- a/science/ascent/Makefile
+++ b/science/ascent/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	ascent
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 PKGNAMESUFFIX=	-visualizer
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Visualization and analysis runtime for multi-physics HPC simulations
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 LIB_DEPENDS=	libconduit.so:science/conduit \
 		libhdf5.so:science/hdf5 \
 		libsiloh5.so:science/silo \
 		libsysinfo.so:devel/libsysinfo \
 		libsz.so:science/libaec
 
 USES=		cmake:testing compiler:c++11-lang fortran localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Alpine-DAV
 GH_TUPLE=	Alpine-DAV:spack_configs:26ea412:spack_configs/../scripts/uberenv_configs/spack_configs \
 		LLNL:blt:86a7d6b:blt/blt \
 		llnl:uberenv:105e384:uberenv/../scripts/uberenv
 
 CMAKE_OFF=	ENABLE_PYTHON ENABLE_DOCS ENABLE_TESTS ENABLE_EXAMPLES
 CMAKE_OFF+=	ENABLE_UTILS # utils are installed into a non-standard path, see https://github.com/Alpine-DAV/ascent/issues/814
 CMAKE_OFF+=	ENABLE_MPI # MPI fails to link, see https://github.com/Alpine-DAV/ascent/issues/813
 CMAKE_ARGS=	-DCONDUIT_DIR=${LOCALBASE}
 CMAKE_TESTING_ON=	ENABLE_TESTS # one testcase fails because conduit lacks HDF5, see https://github.com/LLNL/conduit/issues/840
 
 LDFLAGS+=	-lsysinfo
 
 WRKSRC_SUBDIR=	src
 
 .include <bsd.port.mk>
diff --git a/science/avogadro2/Makefile b/science/avogadro2/Makefile
index 2c4dd0b658d0..7e2d41cc02f2 100644
--- a/science/avogadro2/Makefile
+++ b/science/avogadro2/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	avogadro2
 DISTVERSION=	1.95.1
+PORTREVISION=	1
 CATEGORIES=	science
 
 # REGRESSION: https://github.com/OpenChemistry/avogadroapp/issues/191
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Chemical editor and visualization application
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	hdf5>0:science/hdf5
 LIB_DEPENDS=	libAvogadroCore.so:science/avogadrolibs \
 		libMoleQueueClient.so:misc/molequeue
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gl libarchive qt:5
 USE_QT=		core concurrent gui network widgets buildtools_build qmake_build
 USE_GL=		gl glew glu
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenChemistry
 GH_PROJECT=	avogadroapp
 GH_TUPLE=	flathub:shared-modules:a79072c:flathub_shared_modules/flatpak/shared-modules \
 		openchemistry:avogadro-i18n:3b8a86c:i18n/../avogadro-i18n
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc
 
 .include <bsd.port.mk>
diff --git a/science/avogadrolibs/Makefile b/science/avogadrolibs/Makefile
index fa146caa1036..9b1708fa7f2f 100644
--- a/science/avogadrolibs/Makefile
+++ b/science/avogadrolibs/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	avogadrolibs
 DISTVERSION=	1.95.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Avogadro2 libraries for chemical editor and visualization applications
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++17-lang eigen:3,build,run # eigen needs to be 'run' because it is written into cmake files
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenChemistry
 GH_TUPLE=	OpenChemistry:molecules:b1e16c5:molecules/../molecules \
 		OpenChemistry:crystals:c3e2468:crystals/../crystals
 
 CMAKE_ON=		BUILD_SHARED_LIBS
 CMAKE_TESTING_ON=	ENABLE_TESTING
 
 OPTIONS_DEFINE=		HDF5 LIBARCHIVE LIBMSYM MMTF OPENGL QT5 SPGLIB VTK
 OPTIONS_DEFAULT=	LIBARCHIVE LIBMSYM MMTF OPENGL QT5 SPGLIB
 OPTIONS_SUB=		yes
 
 HDF5_CMAKE_BOOL=	USE_HDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 			libsz.so:science/libaec
 
 LIBARCHIVE_DESC=	Enable optional Libarchive features
 LIBARCHIVE_CMAKE_BOOL=	USE_LIBARCHIVE
 LIBARCHIVE_USES=	libarchive
 LIBARCHIVE_IMPLIES=	QT5
 
 LIBMSYM_DESC=		Enable optional features using libmsym
 LIBMSYM_CMAKE_BOOL=	USE_LIBMSYM
 LIBMSYM_LIB_DEPENDS=	libmsym.so:science/libmsym
 LIBMSYM_IMPLIES=	QT5 # enables the 'symmetry' Qt plugin
 
 MMTF_DESC=		Enable optional features using mmtf
 MMTF_CMAKE_BOOL=	USE_MMTF
 MMTF_BUILD_DEPENDS=	mmtf-cpp>0:science/mmtf-cpp
 
 OPENGL_CMAKE_BOOL=	USE_OPENGL
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gl,glew,glu
 
 QT5_CMAKE_BOOL=		USE_QT
 QT5_USES=		qt:5
 QT5_USE=		QT=core,concurrent,gui,network,svg,widgets,buildtools_build,qmake_build
 QT5_IMPLIES=		OPENGL
 
 SPGLIB_DESC=		Enable optional features using spglib
 SPGLIB_CMAKE_BOOL=	USE_SPGLIB
 SPGLIB_CMAKE_ON=	-DSPGLIB_INCLUDE_DIR=${LOCALBASE}/include/spglib
 SPGLIB_LIB_DEPENDS=	libsymspg.so:science/spglib
 SPGLIB_IMPLIES=		QT5 # USE_SPGLIB only installs header file without USE_QT, and also installs SpaceGroup.a with USE_QT, see https://github.com/OpenChemistry/avogadrolibs/issues/610
 
 VTK_DESC=		Enable libraries that use VTK
 VTK_CMAKE_BOOL=		USE_VTK
 VTK_LIB_DEPENDS=	libvtksys-8.2.so:math/vtk8
 VTK_IMPLIES=		QT5
 VTK_BROKEN=		Needs https://github.com/psavery/genXrdPattern, etc
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc
 
 .include <bsd.port.mk>
diff --git a/science/axom/Makefile b/science/axom/Makefile
index 8792a4fa1a93..730edf31168e 100644
--- a/science/axom/Makefile
+++ b/science/axom/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	axom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Infrastructure for development of multi-physics applications and tools
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BROKEN_i386=	https://github.com/LLNL/axom/issues/743
 BROKEN_powerpc=	https://github.com/LLNL/axom/issues/743
 
 LIB_DEPENDS=	libconduit.so:science/conduit \
 		libhdf5.so:science/hdf5 \
 		libsiloh5.so:science/silo \
 		libsz.so:science/libaec
 RUN_DEPENDS=	sparsehash>0:devel/sparsehash
 
 USES=		cmake compiler:c++11-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_TUPLE=	LLNL:axom_data:b3d8e6f:axom_data/../data \
 		LLNL:blt:ddd5a0c:blt/cmake/blt \
 		LLNL:uberenv:a121a45:uberenv/scripts/uberenv
 
 CMAKE_OFF=	AXOM_ENABLE_DOCS AXOM_ENABLE_EXAMPLES AXOM_ENABLE_TESTS FREEBSD_ENABLE_EXAMPLES
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DCONDUIT_DIR=${LOCALBASE} \
 		-DHDF5_DIR=${LOCALBASE}
 
 LDFLAGS+=	-lexecinfo
 
 WRKSRC_SUBDIR=	src
 
 CONFLICTS_INSTALL=	libfmt # bundles and installs an incompatible libfmt version: https://github.com/LLNL/axom/issues/561, axom headers include fmt unnecessarily
 
 post-install: # installs headers of a third party library sparsehash: https://github.com/LLNL/axom/issues/365
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/sparsehash
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DAXOM_ENABLE_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index 61ff1c99ed37..216902c948ee 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -1,79 +1,79 @@
 PORTNAME=	cdo
 PORTVERSION=	2.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/26823/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Climate Data Operators
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
 OPTIONS_DEFAULT=CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
 OPTIONS_SUB=	yes
 CGRIBEX_DESC=	Use CGRIBEX library for GRIB1 files
 ECCODES_DESC=	Use ecCodes for GRIB files
 HDF5_IMPLIES=	SZIP
 NETCDF_IMPLIES=	HDF5
 UUID_DESC=	UUID support
 
 PORTSCOUT=	site:https://code.mpimet.mpg.de/projects/cdo/files
 
 USES=		compiler:c++14-lang gmake libtool localbase pathfix
 
 CONFIGURE_ARGS=	--disable-data \
 		--disable-extra \
 		--disable-fortran \
 		--disable-ieg \
 		--disable-openmp \
 		--disable-service \
 		--enable-cdi-lib \
 		--program-transform-name="" \
 		--with-zlib=/usr
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	check
 USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 
 CGRIBEX_CONFIGURE_WITH=	cgribex
 CGRIBEX_LIB_DEPENDS=	libcgribex.so:science/cgribex
 ECCODES_CONFIGURE_WITH=	eccodes
 ECCODES_LIB_DEPENDS=	libeccodes.so:science/eccodes
 HDF5_CONFIGURE_WITH=	hdf5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 JASPER_CONFIGURE_WITH=	jasper
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 NETCDF_CONFIGURE_WITH=	netcdf
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 PROJ_CONFIGURE_WITH=	proj
 PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 SZIP_CONFIGURE_WITH=	szlib
 SZIP_LIB_DEPENDS=	libsz.so:science/libaec
 UDUNITS_CONFIGURE_WITH=	udunits2
 UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 UUID_CONFIGURE_OFF=	ac_cv_func_uuid_create=no ac_cv_have_decl_uuid_create=no ac_cv_have_decl_uuid_generate=no ac_cv_lib_uuid_uuid_generate=no
 UUID_LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "sparc64"
 CFLAGS+=	-DPTHREAD_MUTEXATTR
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| contrib||' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$(libdir)/\($$$$pkgconfigfile\)|${PREFIX}/libdata/\1|' ${WRKSRC}/libcdi/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|unsigned32 |uint32_t |' ${WRKSRC}/libcdi/src/cdilib.c ${WRKSRC}/libcdi/src/util.c
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/libcdi/src/cdi.inc ${STAGEDIR}${PREFIX}/include/cdi.inc
 
 test-NETCDF-on:
 	@cd ${WRKSRC}/ && ${SETENV} CDO_PATH=src/cdo src/cdotest
 
 .include <bsd.port.post.mk>
diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile
index 2e7b88a982e5..00ae403f646e 100644
--- a/science/cgnslib/Makefile
+++ b/science/cgnslib/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	cgnslib
 PORTVERSION=	4.3.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	science
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	CFD General Notation System library code
 
 LICENSE=	AS-IS
 LICENSE_NAME=	AS-IS
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	CGNS
 GH_PROJECT=	CGNS
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 #CMAKE_ARGS=	-DOpenGL_GL_PREFERENCE:STRING="GLVND"
 CMAKE_ARGS=	-DOpenGL_GL_PREFERENCE:STRING="LEGACY"
 FFLAGS+=	-fPIC -std=legacy
 TEST_TARGET=	test
 
 OPTIONS_DEFINE=		FORTRAN HDF5 TESTS TOOLS
 OPTIONS_DEFAULT=	FORTRAN HDF5 TESTS TOOLS
 OPTIONS_SUB=		yes
 
 HDF5_DESC=		Enable HDF5 interface
 TESTS_DESC=		Enable test programs
 TOOLS_DESC=		Build the CGNSTools package
 
 FORTRAN_USES=		fortran
 FORTRAN_CMAKE_BOOL=	CGNS_ENABLE_FORTRAN
 
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5	\
 			libsz.so:science/libaec
 HDF5_CMAKE_BOOL=	CGNS_ENABLE_HDF5
 HDF5_CMAKE_ON=		-DHDF5_INCLUDE_PATH:PATH="${LOCALBASE}/include"
 
 TESTS_CMAKE_BOOL=	CGNS_ENABLE_TESTS
 
 TOOLS_USES=		gl localbase tk xorg
 TOOLS_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig	\
 			libfreetype.so:print/freetype2
 TOOLS_USE=		GL=egl,gl,glu	\
 			XORG=ice,sm,x11,xau,xcomposite,xcursor,xdamage,xdmcp,xext,xfixes,xft,xi,xinerama,xkbfile,xmu,xpm,xrandr,xrender,xres,xscrnsaver,xt,xtst,xv,xxf86vm
 TOOLS_CMAKE_BOOL=	CGNS_BUILD_CGNSTOOLS
 TOOLS_CMAKE_ON=		-DTCL_INCLUDE_PATH:STRING="${TCL_INCLUDEDIR}" \
 			-DTK_INCLUDE_PATH:STRING="${TK_INCLUDEDIR}"
 
 post-install:
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libcgns.so.${PORTVERSION:R} \
 		${STAGEDIR}${PREFIX}/lib/libcgns.so.${PORTVERSION:R:R}
 
 do-test:
 	cd ${TEST_WRKSRC} && \
 	${SETENV} ${TEST_ENV} ctest -C ${CMAKE_BUILD_TYPE}
 
 .include <bsd.port.mk>
diff --git a/science/chemps2/Makefile b/science/chemps2/Makefile
index 4fea31cc72cb..6007fc8be2da 100644
--- a/science/chemps2/Makefile
+++ b/science/chemps2/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	CheMPS2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Spin-adapted implementation of DMRG for ab initio quantum chemistry
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec
 
 USES=		blaslapack:openblas cmake fortran
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	SebWouters
 
 CMAKE_ARGS+=	-DSHARED_ONLY:BOOL=ON
 CMAKE_ARGS+=	-DENABLE_TESTS:BOOL=OFF
 CMAKE_ARGS+=	-DENABLE_XHOST:BOOL=OFF # shouldn't optimize the port in case of central build
 CMAKE_ARGS+=	-DENABLE_OPENMP:BOOL=OFF # find_package(OpenMP) is broken since the merge into cmake: bug#223678
 CMAKE_ARGS+=	-DLAPACK_LIBRARIES="-lopenblas" # can't find it using find_package for some reason
 
 .include <bsd.port.mk>
diff --git a/science/chrono/Makefile b/science/chrono/Makefile
index 6c46d90fc27a..ee44ad75189b 100644
--- a/science/chrono/Makefile
+++ b/science/chrono/Makefile
@@ -1,123 +1,123 @@
 PORTNAME=	chrono
 DISTVERSION=	7.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science devel
 PKGNAMESUFFIX=	-physics-simulation-engine
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	74df5c76d8d475818138a9a16ceccbd6f326247c.patch:-p1 # https://github.com/projectchrono/chrono/pull/295
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library for multi-physics simulation
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	use of overloaded operator '[]' is ambiguous (with operand types 'chrono::quaternion' and 'int'): https://github.com/projectchrono/chrono/issues/158
 BROKEN_aarch64=	cannot find -lFALSE, see https://github.com/projectchrono/chrono/issues/389
 
 BUILD_DEPENDS=	openmpi>0:net/openmpi
 LIB_DEPENDS=	libblas.so:math/blas \
 		libepoll-shim.so:devel/libepoll-shim \
 		libfabric.so:net/libfabric \
 		libhwloc.so:devel/hwloc2 \
 		libjson-c.so:devel/json-c \
 		libmetis.so:math/metis \
 		libpciaccess.so:devel/libpciaccess \
 		libpng16.so:graphics/png \
 		libscotch.so:cad/scotch \
 		libze_loader.so:devel/level-zero
 
 USES=		cmake compiler:c++14-lang eigen:3 fortran gnome jpeg xorg
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 USE_XORG=	x11 xau xcb xdmcp xext xxf86vm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	project${PORTNAME}
 
 ALL_MODULES=		Cascade Cosimulation Distributed FSI Irrlicht Multicore MUMPS OpenGL Pardiso_Project Postprocess Sensor SynChrono Vehicle
 # module names in a human readable case; for the list of available modules: grep -r "option(ENABLE_MODULE" work
 
 OPTIONS_DEFINE=			HDF5 DEMOS
 OPTIONS_GROUP=			MODULES
 OPTIONS_GROUP_MODULES=		${ALL_MODULES:tu}
 MODULES_DESC=			Enable modules:
 OPTIONS_DEFAULT=		HDF5
 OPTIONS_SUB=			yes
 
 HDF5_CMAKE_BOOL=		ENABLE_HDF5
 HDF5_LIB_DEPENDS=		libhdf5.so:science/hdf5
 
 DEMOS_DESC=			Build and install demo programs
 DEMOS_CMAKE_BOOL=		BUILD_DEMOS
 DEMOS_BROKEN=			/usr/local/lib/libdmumps.so: undefined reference to `mpi_pack_'
 
 CASCADE_CMAKE_ON=		-DCASCADE_INCLUDE_DIR:STRING=${LOCALBASE}/include/OpenCASCADE -DCASCADE_LIBDIR:STRING=${LOCALBASE}/lib
 CASCADE_LIB_DEPENDS=		libTKernel.so:cad/opencascade740
 
 DISTRIBUTED_BROKEN=		requires cuda_runtime_api.h in thrust package which is missing for some reason
 DISTRIBUTED_IMPLIES=		MULTICORE
 
 FSI_BROKEN=			requires CUDA
 
 IRRLICHT_LIB_DEPENDS=		libIrrlicht.so:x11-toolkits/irrlicht
 
 MULTICORE_BUILD_DEPENDS=	blaze>0:math/blaze \
 				thrust>0:devel/thrust
 
 MUMPS_CMAKE_ON=			-DMUMPS_ROOT:STRING=${LOCALBASE}
 MUMPS_LIB_DEPENDS=		libdmumps.so:math/mumps \
 				libopenblas.so:math/openblas
 
 PARDISO_PROJECT_BROKEN=		Not available for FreeBSD; License is restrictive
 
 SENSOR_BROKEN=			requires CUDA
 
 SYNCHRONO_USES=			localbase
 SYNCHRONO_BUILD_DEPENDS=	flatc:devel/flatbuffers205 # until https://github.com/projectchrono/chrono/issues/391 is fixed
 SYNCHRONO_LIB_DEPENDS=		libmpi.so:net/mpich
 SYNCHRONO_IMPLIES=		VEHICLE
 
 OPENGL_USES=			gl
 OPENGL_USE=			GL=gl,glu,glew
 OPENGL_BUILD_DEPENDS=		${LOCALBASE}/include/glm/glm.hpp:math/glm
 OPENGL_LIB_DEPENDS=		libglfw.so:graphics/glfw
 
 VEHICLE_LIB_DEPENDS=		libsz.so:science/libaec \
 				libmpi.so:net/openmpi
 
 .for module in ${ALL_MODULES}
 ${module:tu}_DESC=		Chrono ${module} module
 ${module:tu}_CMAKE_BOOL=	ENABLE_MODULE_${module:tu}
 .if "${${module:tu}_BROKEN}" == ""
 OPTIONS_DEFAULT+=	${module:tu}
 .endif
 .endfor
 
 #.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MVEHICLE} && ${PORT_OPTIONS:MIRRLICHT}
 PLIST_FILES+=	lib/libChronoEngine_vehicle_irrlicht.so
 .endif
 
 #.include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CXXFLAGS+=	-Wno-error=narrowing
 .endif
 
 post-extract:
 	@${RM} ${WRKSRC}/data/opensim/Rajagopal2015.orig
 
 post-patch:
 	@${FIND} ${WRKSRC} -name CMakeLists.txt -o -name "*.cmake*" | ${XARGS} ${REINPLACE_CMD} -i '' 's|lib64|lib|'
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS}
 
 .include <bsd.port.post.mk>
diff --git a/science/code_saturne/Makefile b/science/code_saturne/Makefile
index d382e59f3481..ad5c40077367 100644
--- a/science/code_saturne/Makefile
+++ b/science/code_saturne/Makefile
@@ -1,127 +1,128 @@
 PORTNAME=	code_saturne
 PORTVERSION=	7.1.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	science parallel
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	EDF's general purpose Computational Fluid Dynamics (CFD) software
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo	\
 		libcgns.so:science/cgnslib	\
 		libhdf5.so:science/hdf5		\
 		libmedC.so:french/med
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}	\
 		xmgrace:math/grace	\
 		bash:shells/bash	\
 		xterm:x11/xterm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	code-saturne
 
 USES=		autoreconf bison compiler:c11 fortran gettext gnome gmake \
 		iconv localbase libtool pyqt:5 python:3.7+ shebangfix xorg
 USE_GNOME=	libxml2
 USE_PYQT=	pyqt5 sip
 USE_XORG=	x11
 SHEBANG_FILES=	install_saturne.py tests/unittests.py bin/*.py build-aux/*.py
 CFLAGS+=	-D__XSI_VISIBLE
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-salome --without-salome-yacs --without-salome-kernel	\
 		--without-salome-gui --enable-python
 CONFIGURE_ENV=	ac_cv_path_SED=${LOCALBASE}/bin/gsed
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 BINARY_ALIAS=	python=${PYTHON_CMD} \
 		pyrcc5=pyrcc5-${PYTHON_VER} \
 		pyuic5=pyuic5-${PYTHON_VER}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES BATCH BLAS HYPRE MPICH MUMPS PETSC SCOTCH
 OPTIONS_DEFAULT=	BATCH BLAS HYPRE METIS MPICH MUMPS PETSC SCOTCH
 OPTIONS_RADIO=		METIS
 OPTIONS_RADIO_METIS=	METIS PARMETIS
 OPTIONS_SUB=		yes
 BLAS_DESC=		Support of BLAS
 BLAS_USES=		blaslapack
 BLAS_CONFIGURE_ON=	--with-blas=yes --with-blas-type=BLAS	\
 			--with-blas-include=${LOCALBASE}/include/cblas	\
 			--with-blas-lib=${LOCALBASE}/lib
 BLAS_LIB_DEPENDS=	libcblas.so:math/cblas
 BATCH_DESC=		Use Torque to submit batches
 BATCH_RUN_DEPENDS=	pbs-config:sysutils/torque
 HYPRE_DESC=		Support of HYPRE
 HYPRE_BUILD_DEPENDS=	hypre>0:science/hypre
 HYPRE_RUN_DEPENDS=	hypre>0:science/hypre
 HYPRE_CONFIGURE_ON=	--with-hypre="${LOCALBASE}"
 MPICH_USES=		mpi
 MPICH_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPICH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPICH_CONFIGURE_WITH=	mpi
 METIS_DESC=		Support of METIS
 METIS_LIB_DEPENDS=	libmetis.so:math/metis
 METIS_CONFIGURE_ON=	--with-metis-include="${LOCALBASE}/include"
 MUMPS_DESC=		Support of MUMPS
 MUMPS_LIB_DEPENDS=	libsmumps.so:math/mumps
 MUMPS_CONFIGURE_ON=	--with-mumps="${LOCALBASE}"
 MUMPS_CONFIGURE_ENV=	MUMPS_LIBS="-lmpiseq -llapack"
 PARMETIS_DESC=		Support of ParMETIS
 PARMETIS_LIB_DEPENDS=	libparmetis.so:math/parmetis
 PARMETIS_CONFIGURE_ON=	--with-metis-include="${LOCALBASE}/include/parmetis"	\
 			--with-metis-lib="${LOCALBASE}/lib/parmetis"
 PARMETIS_CONFIGURE_ENV=	LIBS=-lexecinfo
 PETSC_DESC=		Support of PETSc
 PETSC_LIB_DEPENDS=	libpetsc.so:science/PETSc
 PETSC_CONFIGURE_ON=	--with-petsc="${LOCALBASE}"
 SCOTCH_DESC=		Support of Scotch
 SCOTCH_LIB_DEPENDS=	libscotch.so:cad/scotch
 SCOTCH_CONFIGURE_ON=	--with-scotch-include="${LOCALBASE}/include"
 
 TEST_TARGET=	check
 
 .if defined(PACKAGE_BUILDING)
 TERM=		vt100	# Force for pointyhat to override su
 .else
 TERM?=		vt100	# Default value needed for tput in jail or tinderbox
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 # /wrkdirs/usr/ports/science/code_saturne/work/code_saturne-5.3.0/src/apps/.libs
 # /libsaturne.so:
 # undefined reference to `__atomic_compare_exchange'
 CONFIGURE_ARGS+=	--disable-openmp
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 USE_TEX=	tex:build
 BUILD_DEPENDS+=	fig2dev:print/fig2dev		\
 		doxygen:devel/doxygen		\
 		dot:graphics/graphviz		\
 		dvips:print/tex-dvipsk		\
 		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 BINARY_ALIAS+=	sphinx-build=sphinx-build-${PYTHON_VER}
 ALL_TARGET=	all pdf
 DOCS=		AUTHORS ChangeLog README
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|'	\
 		${WRKSRC}/Makefile.am
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/code_saturne/cs_solver
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/science/conduit/Makefile b/science/conduit/Makefile
index c49627744622..1e32feeb0672 100644
--- a/science/conduit/Makefile
+++ b/science/conduit/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	conduit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simplified data exchange for HPC simulations
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libmpi_cxx.so:net/openmpi \
 		libsiloh5.so:science/silo \
 		libsz.so:science/libaec
 
 USES=		cmake:testing compiler:c++11-lang fortran
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_TUPLE=	LLNL:blt:86a7d6b:blt/blt \
 		Alpine-DAV:spack_configs:85f7382:spack_configs/../scripts/uberenv_configs/spack_configs \
 		LLNL:uberenv:105e384:LLNL_uberenv/../scripts/uberenv
 
 WRKSRC_SUBDIR=	src
 
 CMAKE_ON=	ENABLE_FORTRAN ENABLE_MPI
 CMAKE_OFF=	CONDUIT_ENABLE_TESTS ENABLE_DOCS ENABLE_EXAMPLES ENABLE_GIT ENABLE_TESTS ENABLE_VALGRIND
 CMAKE_ARGS=	-DHDF5_DIR=${LOCALBASE} \
 		-DSILO_DIR=${LOCALBASE} \
 		-DFREEBSD_EXAMPLESDIR=${EXAMPLESDIR} # complete list of optional dependencies (enabled with *_DIR): https://llnl-conduit.readthedocs.io/en/latest/building.html
 #CMAKE_ARGS+=	-DADIOS_DIR=${LOCALBASE} # broken, see https://github.com/LLNL/conduit/issues/841
 CMAKE_TESTING_ON=	ENABLE_TESTS
 
 .include <bsd.port.mk>
diff --git a/science/dakota/Makefile b/science/dakota/Makefile
index 7bf0b67c90a1..b1602e482b48 100644
--- a/science/dakota/Makefile
+++ b/science/dakota/Makefile
@@ -1,98 +1,99 @@
 PORTNAME=	dakota
 DISTVERSION=	6.16.0
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://dakota.sandia.gov/sites/default/files/distributions/public/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-public-src-cli
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Interface between analysis codes & iterative systems analysis methods
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nanoflann>0:math/nanoflann
 LIB_DEPENDS=	libblas.so:math/blas \
 		libboost_system.so:devel/boost-libs \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libicui18n.so:devel/icu \
 		liblapack.so:math/lapack \
 		libnlopt.so:math/nlopt \
 		libpng16.so:graphics/png \
 		libsz.so:science/libaec
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cmake compiler:c++11-lang fortran gettext-runtime jpeg motif perl5 pkgconfig python shebangfix xorg
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xrender xt
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	stan-dev:math:v2.18.0:stanmath/stanmath
 
 SHEBANG_GLOB=	*.sh *.py
 SHEBANG_FILES=	interfaces/Python/mpitile \
 		scripts/pyprepro/dprepro \
 		scripts/pyprepro/pyprepro \
 		scripts/dprepro.perl \
 		test/dakota_test.perl
 
 CMAKE_ON=	HAVE_X_GRAPHICS # always enable graphics because w/out it a lot of unrelated files aren't installed due to bugs in the project
 CMAKE_ON+=	Boost_NO_BOOST_CMAKE \
 		DAKOTA_GIT_checkout
 #CMAKE_ON+=	HAVE_C3 # causes "duplicate include" error
 #CMAKE_ON+=	DAKOTA_DL_SOLVER # fails to compile: error: declaration of anonymous class must be a definition
 #CMAKE_ON+=	HAVE_NOWPAC # installs files into $PORTSDIR
 CMAKE_ON+=	HAVE_QUESO \
 		HAVE_MUQ MUQ_USE_PYTHON \
 		# enable some methods that aren't enabled by default, see the list @ src/DakotaIterator.cpp
 CMAKE_ON+=	DAKOTA_HAVE_GSL DAKOTA_HAVE_HDF5
 
 CMAKE_OFF=	DAKOTA_ENABLE_TESTS
 CMAKE_ARGS=	-DDakota_VERSION_SRC:STRING=${DISTVERSION} -DDakota_GIT_REVL:STRING=unknown -DDakota_RELEASE_DATE:${STRING}=20211115 \
 		-DPython_EXECUTABLE=${PYTHON_CMD} \
 		-DMUQ_STANMATH_DIR=${WRKSRC}/stanmath \
 		-DPython_EXECUTABLE=${PYTHON_CMD}
 
 CFLAGS+=	-DH5_USE_110_API=1
 FFLAGS+=	-fallow-argument-mismatch
 LDFLAGS+=	-lexecinfo
 
 CONFLICTS_BUILD=	dakota # self: picks up some bundled packages from the pre-installed dakota package and then fails to install them
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 	@${ECHO} ${DISTVERSION} > ${WRKSRC}/VERSION # expected by the 'install' target
 
 pre-configure: # MUQ_STANMATH_DIR is lost otherwise
 	@${REINPLACE_CMD} 's|find_package(PkgConfig)|set(MUQ_STANMATH_DIR ${WRKSRC}/stanmath)|' ${WRKSRC}/packages/external/muq2/cmake/finds/FindSTANMATH.cmake
 
 post-install:
 	# remove eigen3 that Dakota installs
 	cd ${STAGEDIR}${PREFIX} && ${RM} -r include/eigen3 share/eigen3
 	# remove cblas.h that Dakota installs
 	${RM} ${STAGEDIR}${PREFIX}/include/cblas.h
 	# remove *.orig files
 	${RM} ${STAGEDIR}${PREFIX}/include/colin/AppResponse.h.orig
 	# install libraries that it fails to install
 .for l in libmuqSamplingAlgorithms.so libmuqApproximation.so libmuqInference.so libmuqModeling.so libmuqOptimization.so libmuqUtilities.so
 	${INSTALL_LIB} ${BUILD_WRKSRC}/packages/external/muq2/lib/${l} ${STAGEDIR}${PREFIX}/lib
 .endfor
 
 do-test: # from Additional Test Suites @ https://dakota.sandia.gov/content/additional-test-suites (many tests are known to fail)
 	## minimal set of fast-running tests that should NOT FAIL (may DIFF, depending on platform / compiler)
 	#cd ${WRKSRC}/test && ./dakota_test.perl
 	## test suite that should PASS on any supported platform (NO DIFF or FAIL)
 	#cd ${WRKSRC}/test && ./dakota_test.perl --label-regex=AcceptanceTest
 	## run all Dakota tests active in this build (should PASS or DIFF)
 	#cd ${WRKSRC}/test && ./dakota_test.perl --label-regex=dakota_
 	# Tests should be this way, but this fails:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDAKOTA_ENABLE_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		(cd ${WRKSRC} && ctest -j 4 -L FastTest -LE Diff)
 
 .include <bsd.port.mk>
diff --git a/science/dynare/Makefile b/science/dynare/Makefile
index b004eddfb238..5cd83ecfe9b5 100644
--- a/science/dynare/Makefile
+++ b/science/dynare/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	dynare
 DISTVERSION=	5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science # economics
 MASTER_SITES=	https://www.dynare.org/release/source/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Software platform for handling a wide class of economic models
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=	cannot open module file 'ieee_arithmetic.mod' for reading at (1): No such file or directory
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/tokenizer.hpp:devel/boost-libs
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libmatio.so:math/matio \
 		libopenblas.so:math/openblas \
 		libsz.so:science/libaec
 RUN_DEPENDS=	epstool:graphics/epstool \
 		gnuplot:math/gnuplot \
 		pstoedit:graphics/pstoedit \
 		xfig:graphics/xfig # README says that these executables are required for the test suite
 
 USES=		bison compiler:c++17-lang fortran gmake localbase tar:xz
 USE_TEX=	pdftex
 USE_GCC=	yes # clang-11 fails: error: reference to local binding 'ii1' declared in enclosing function 'ss2Iteration_pruning'
 		# Clang still doesn't support this c++20 feature, see https://bugs.llvm.org/show_bug.cgi?id=49238
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-matlab \
 		--disable-doc
 
 FCFLAGS+=	-fPIC # required because configure tests with -shared
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=			OCTAVE
 OPTIONS_DEFAULT=		OCTAVE
 OPTIONS_SUB=			yes
 
 OCTAVE_DESC=			Integrate with Octave (main way to use Dynare)
 OCTAVE_CONFIGURE_ENABLE=	octave
 OCTAVE_CONFIGURE_ON=		--disable-mex-kalman-steady-state # Kalman Steady State MEX file for Octave - requires the non-free library slicot-5.0
 OCTAVE_BUILD_DEPENDS=		octave:math/octave
 OCTAVE_LIB_DEPENDS=		libfftw3.so:math/fftw3 \
 				libfftw3f.so:math/fftw3-float \
 				libgsl.so:math/gsl \
 				libumfpack.so:math/suitesparse-umfpack
 OCTAVE_RUN_DEPENDS=		octave:math/octave
 
 post-install:
 	# remove empty directories, see https://git.dynare.org/Dynare/dynare/-/issues/1835
 	@${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete
 
 .include <bsd.port.mk>
diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile
index a2d8e8f6c219..db305311cd23 100644
--- a/science/elmerfem/Makefile
+++ b/science/elmerfem/Makefile
@@ -1,112 +1,112 @@
 PORTNAME=	elmerfem
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 
 MAINTAINER=	henrik@gulbra.net
 COMMENT=	Multiphysical simulation software
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libhdf5.so:science/hdf5 \
 		libmetis.so:math/metis \
 		libmpich.so:net/mpich \
 		libnetcdf.so:science/netcdf \
 		libopenblas.so:math/openblas \
 		libparpack.so:math/arpack-ng
 
 USES=		cmake compiler:c++11-lang fortran
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
 
 USE_LDCONFIG=	${PREFIX}/lib/elmersolver
 CMAKE_ARGS=	-DELMER_FEM_REVISION:STRING=${GH_TAGNAME}
 
 ALL_TARGET=	# empty
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTSCOUT=	limit:^release-[1-9]
 
 CMAKE_ARGS+=	-DHAVE_INTTYPES_H=ON
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 .endif
 
 OPTIONS_DEFINE=		GUI OCC
 OPTIONS_DEFAULT=	GUI OCC
 OPTIONS_SUB=		yes
 
 GUI_DESC=		Build with ElmerGUI (Graphical User Interface)
 OCC_DESC=		Use OpenCASCADE for CAD import in ElmerGUI
 
 GUI_LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6
 GUI_USES=		gl jpeg qt:5 xorg
 GUI_USE=		gl=gl,glu xorg=ice,sm,x11,xext,xt qt=${_QT5_LIBS:ts,}
 GUI_CMAKE_BOOL=		WITH_ELMERGUI WITH_PARAVIEW
 GUI_CMAKE_ON=		-DQWT_LIBRARY=${QT_LIBDIR}/libqwt6.so \
 			-DQWT_INCLUDE_DIR=${QT_INCDIR}/qwt6 \
 			-DDESIRED_QT_VERSION=5 \
 			-DWITH_QT5:BOOL=TRUE \
 			-DQT_FOUND:BOOL=TRUE
 
 OCC_IMPLIES=		GUI
 OCC_LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 			libfreetype.so:print/freetype2 \
 			libpng.so:graphics/png \
 			libpython${_PYVERSION}.so:lang/python${PYTHON_SUFFIX} \
 			libtiff.so:graphics/tiff \
 			libTKernel.so:cad/opencascade \
 			libvtksys-9.1.so:math/vtk9
 OCC_USES=		python
 OCC_CMAKE_BOOL=		WITH_OCC
 OCC_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.0
 
 _LIBSTAGEDIR=	${STAGEDIR}/${PREFIX}/lib/elmersolver
 _PYVERSION=	${PYTHON_VER}${PYTHON_ABIVER}
 _QT5_LIBS=	buildtools_build concurrent core declarative gui location \
 		network opengl printsupport qmake_build script sensors \
 		sql svg webchannel webkit widgets xml
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CFLAGS_${ARCH}=	-fPIC
 CXXFLAGS_${ARCH}= -fPIC
 FCFLAGS+=	-fPIC
 FFLAGS+=	-fPIC
 .endif
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch between actual argument at (1) and actual argument at (2) (REAL(8)/COMPLEX(8)).
 # in theory, this should set FCFLAGS, but the port does not conform
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 post-patch:
 	@${RM} ${WRKSRC}/cmake/Modules/CMakeParseArguments.cmake
 	@${RM} -r ${WRKSRC}/elmergrid/src/metis-5.1.0
 	@${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \
 		${WRKSRC}/elmergrid/src/egparallel.c
 
 post-patch-OCC-on:
 	@${REINPLACE_CMD} -e "s|\$${VERSION}|`${PKG_QUERY} '%v' opencascade`|" \
 		"${WRKSRC}/cmake/Modules/FindOCE.cmake"
 	@${REINPLACE_CMD} -e 's|$${INCLUDE}|${LOCALBASE}/include/OpenCASCADE|' \
 		"${WRKSRC}/cmake/Modules/FindOCE.cmake"
 
 post-install:
 	${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver
 	${LN} -sf libelmersolver.so ${_LIBSTAGEDIR}/libelmersolver.so.0
 	${LN} -sf libfhuti.so ${_LIBSTAGEDIR}/libfhuti.so.0
 	${LN} -sf libmatc.so ${_LIBSTAGEDIR}/libmatc.so.0
 	${LN} -sf libmpi_stubs.so ${_LIBSTAGEDIR}/libmpi_stubs.so.0
 	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid
 
 do-test:
 	@cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS}
 
 .include <bsd.port.post.mk>
diff --git a/science/erkale/Makefile b/science/erkale/Makefile
index 8555996330c5..6329f06274b0 100644
--- a/science/erkale/Makefile
+++ b/science/erkale/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	erkale
 DISTVERSION=	g20220405
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum chemistry program to solve the electronic structure of atoms
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=	liberkale_omp.so.0.1.0: undefined reference to `__atomic_compare_exchange'
 
 BUILD_DEPENDS=	armadillo>0:math/armadillo
 LIB_DEPENDS=	libderiv.so:science/libint \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libint.so:science/libint \
 		libsz.so:science/libaec \
 		libxc.so:science/libxc
 RUN_DEPENDS=	${LOCALBASE}/share/erkale/basis/6-21G.gbs:science/erkale-pseudopotentials
 
 FLAVORS=	parallel serial
 FLAVOR?=	${FLAVORS:[1]}
 serial_PKGNAMESUFFIX=	-serial
 
 USES=		cmake:noninja compiler:c11 fortran pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	susilehtola
 GH_TAGNAME=	f005a9ed588d7b6fcda54648db16523419308cbd
 
 TEST_TARGET=	test
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DERKALE_SYSTEM_LIBRARY=${DATADIR}/basis
 
 PLIST_SUB=	SUFFIX="${SUFFIX}"
 
 .if ${FLAVOR} == serial
 CMAKE_OFF=	USE_OPENMP
 .else # parallel
 CMAKE_ON+=	USE_OPENMP
 SUFFIX=		_omp
 .endif
 
 OPTIONS_SINGLE=		LINALG
 OPTIONS_SINGLE_LINALG=	NETLIB OPENBLAS
 OPTIONS_DEFAULT=	OPENBLAS
 LINALG_DESC=		Linear algebra library
 
 NETLIB_USES=		blaslapack:netlib
 NETLIB_CMAKE_ON=	-DLAPACK_LIBRARIES:STRING=-llapack -DBLAS_LIBRARIES:STRING=-lblas
 NETLIB_LDFLAGS=		${LOCALBASE}/lib/libcblas.so ${LOCALBASE}/lib/liblapack.so ${LOCALBASE}/lib/libblas.so
 NETLIB_LIB_DEPENDS=	libcblas.so:math/cblas
 NETLIB_BROKEN=		choosing NETLIB causes a conflict: openblas-0.3.7_3,1 conflicts with cblas-1.0_12 on /usr/local/include/cblas.h
 
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_CMAKE_ON=	-DLAPACK_LIBRARIES:STRING=-lopenblas -DBLAS_LIBRARIES:STRING=-lopenblas
 
 .if ${FLAVOR} == parallel
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/include/erkale ${STAGEDIR}${PREFIX}/include/erkale${SUFFIX}
 	@${MV} ${STAGEDIR}${PREFIX}/bin/erkale_bastool ${STAGEDIR}${PREFIX}/bin/erkale_bastool${SUFFIX}
 .endif
 
 .include <bsd.port.mk>
diff --git a/science/fleur/Makefile b/science/fleur/Makefile
index 024fb4f0137f..c81b6d9dd363 100644
--- a/science/fleur/Makefile
+++ b/science/fleur/Makefile
@@ -1,82 +1,83 @@
 PORTNAME=	fleur
 DISTVERSION=	6.0.20220715
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	FLAPW code for atomic computations in quantum chemistry and physics
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	Fatal Error: Cannot find an intrinsic module named 'ieee_arithmetic' at (1)
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 
 USES=		cmake:noninja fortran gnome localbase:ldflags python:test tar:tgz
 USE_GNOME=	libxml2
 
 USE_GITLAB=	yes
 GL_SITE=	https://iffgit.fz-juelich.de
 GL_COMMIT=	a2934446e0eb1fcbf7a69d4d652c969cef0c8c8d
 
 FFLAGS=		-I${LOCALBASE}/include
 LDFLAGS+=	-llapack -lopenblas -lxml2 # to fix missing symbols, see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/670
 
 OPTIONS_DEFINE=		HDF5 KPLIB MPI SCALAPACK ELPA LIBXC WANNIER
 OPTIONS_DEFAULT=	MPI SCALAPACK ELPA WANNIER # HDF5 KPLIB LIBXC
 
 HDF5_CMAKE_BOOL=	CLI_FLEUR_USE_HDF5
 HDF5_CMAKE_ON=		-DHDF5_INCLUDE_DIRS=${LOCALBASE}/include
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_BROKEN=		Missing hdf5.mod in hdf5 # hdf5 doesn't include Fortran binding
 
 KPLIB_DESC=		Use kpLib library
 #KPLIB_CMAKE_BOOL=	CLI_FLEUR_USE_KPLIB
 KPLIB_DEPENDS=		libkplib.so:science/kplib
 KPLIB_BROKEN=		Fails to find the pre-installed libkplib.so library, see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/691
 
 MPI_CMAKE_BOOL=		CLI_FLEUR_USE_MPI
 MPI_LDFLAGS=		-lmpich -lmpifort
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 MPI_VARS=		SUFFIX=_MPI
 
 SCALAPACK_DESC=		Use the ScaLAPACK Scalable LAPACK library
 SCALAPACK_CMAKE_BOOL=	FLEUR_USE_SCALAPACK # no such variable, see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/692, it works only through LDFLAGS set below
 SCALAPACK_VARS=		FFLAGS+=-fallow-argument-mismatch
 SCALAPACK_LDFLAGS=	-lscalapack
 SCALAPACK_LIB_DEPENDS=	libscalapack.so:math/scalapack
 SCALAPACK_IMPLIES=	MPI
 
 ELPA_DESC=		Use libelpa, Eigenvalue SoLver for Petaflop Applications
 ELPA_CMAKE_BOOL=	FLEUR_USE_ELPA # no such variable, see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/689, it works only through FFLAGS set below
 ELPA_VARS=		FFLAGS+=-I${LOCALBASE}/include/elpa-2021.11.001/modules
 ELPA_LDFLAGS=		-lelpa
 ELPA_LIB_DEPENDS=	libelpa.so:math/elpa
 
 LIBXC_DESC=		Use libxc library
 LIBXC_CMAKE_BOOL=	CLI_FLEUR_USE_LIBXC
 LIBXC_LIB_DEPENDS=	libxc.so:science/libxc
 LIBXC_BROKEN=		Silently links with libxc when CLI_FLEUR_USE_LIBXC=OFF, see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/690
 
 WANNIER_DESC=		Use Wannier library
 WANNIER_CMAKE_BOOL=	CLI_FLEUR_USE_WANNIER
 WANNIER_LIB_DEPENDS=	libwannier.so:science/wannier90
 
 EXECUTABLES=	bin/fleur${SUFFIX} \
 		bin/inpgen
 PLIST_FILES=	${EXECUTABLES}
 
 CONFLICTS_BUILD=	libxc # see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/690
 
 post-install: # strip
 	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} ${EXECUTABLES}
 
 do-test:
 	# now: some tests fail or freeze, possibly because of missing hdf5 and kplib dependencies
 	# was: 9 testcases are known to fail, see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/671
 	@cd ${WRKSRC}/tests && pytest ../tests --build_dir=${TEST_WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index adf3433f1b03..3b1195344a63 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -1,152 +1,152 @@
 PORTNAME=	gnudatalanguage
 PORTVERSION=	1.0.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science lang
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT?=	Free IDL-compatible incremental compiler
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libgeotiff.so:graphics/libgeotiff\
 		libexpat.so:textproc/expat2	\
 		libplplot.so:math/plplot	\
 		libtiff.so:graphics/tiff	\
 		libshp.so:devel/shapelib	\
 		libpng.so:graphics/png		\
 		libsz.so:science/libaec		\
 		libps.so:print/pslib		\
 		libgsl.so:math/gsl
 
 USE_GITHUB=	yes
 GH_PROJECT=	gdl
 
 USES=		cmake compiler:c++11-lang fortran ncurses pkgconfig readline \
 		xorg
 USE_WX=		3.0+
 USE_XORG=	x11 sm ice xext
 
 # Disable ncurses and readline from ports
 # TODO:	create a port for Astron http://idlastro.gsfc.nasa.gov/ftp/astron.tar.gz
 # TODO:	create a port for TexToIdl http://physics.mnstate.edu/mcraig/textoidl/textoidl-2-1-2.tar
 
 CMAKE_ARGS=	-DREADLINEDIR:STRING="/usr"	\
 		-DOPENMP:BOOL=ON		\
 		-DNCURSESDIR:STRING="/usr"	\
 		-DPYTHON:BOOL=NO
 CPPFLAGS+=	${CFLAGS} -fno-inline -DNPY_NO_DEPRECATED_API -DNPY_1_7_API_VERSION
 CXXFLAGS+=	-std=gnu++11
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 TEST_TARGET=	test
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
 # Upstream prefer GraphicsMagick over ImageMackick
 # see https://github.com/gnudatalanguage/gdl/issues/611
 # and https://github.com/gnudatalanguage/gdl/issues/1044 for ImageMagick 7
 OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPI NETCDF PYTHON UDUNITS
 OPTIONS_DEFAULT=EIGEN FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS
 
 EIGEN_DESC=		Eigen3 support (boost performance)
 EIGEN_USES=		eigen:3
 EIGEN_CMAKE_ON=		-DEIGEN3:BOOL=YES
 EIGEN_CMAKE_OFF=	-DEIGEN3:BOOL=NO
 
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3		\
 			libfftw3f.so:math/fftw3-float
 FFTW_CMAKE_ON=		-DFFTW:BOOL=YES
 FFTW_CMAKE_OFF=		-DFFTW:BOOL=NO
 
 GLPK_DESC=		Support GLPK for Simplex (Linear programming)
 GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
 GLPK_CMAKE_ON=		-DGLPK=ON:BOOL=YES
 GLPK_CMAKE_OFF=		-DGLPK=OFF:BOOL=NO
 
 GRAPHICSMAGICK_DESC=		Support GraphicsMagick
 GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHICSMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=YES
 GRAPHICSMAGICK_CMAKE_OFF=	-DGRAPHICSMAGICK:BOOL=NO
 # Temporary swith to ImageMagick
 #IMAGEMAGICK_DESC=	Support ImageMagick
 #IMAGEMAGICK_LIB_DEPENDS=libMagick++-7.so:graphics/ImageMagick7
 #IMAGEMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=NO -DMAGICK:BOOL=YES -DMAGICKDIR=${LOCALBASE}
 #IMAGEMAGICK_CMAKE_OFF=	-DMAGICK:BOOL=NO
 
 GRIB_DESC=		Support GRIB messages
 GRIB_LIB_DEPENDS=	libeccodes.so:science/eccodes
 GRIB_CMAKE_ON=		-DGRIB:BOOL=YES
 GRIB_CMAKE_OFF=		-DGRIB:BOOL=NO
 
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CMAKE_ON=		-DHDF5:BOOL=YES
 HDF5_CMAKE_OFF=		-DHDF5:BOOL=NO -DHDF:BOOL=NO
 
 LIBPROJ4_DESC=		Support cartographic processes
 LIBPROJ4_LIB_DEPENDS=	libproj.so:graphics/proj
 LIBPROJ4_CMAKE_ON=	-DLIBPROJ:BOOL=YES
 LIBPROJ4_CMAKE_OFF=	-DLIBPROJ:BOOL=NO
 
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 MPI_CMAKE_ON=		-DMPI:BOOL=ON
 MPI_CMAKE_OFF=		-DMPI:BOOL=OFF -DMPIDIR=/none
 
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NETCDF_CMAKE_ON=	-DNETCDF:BOOL=YES -DHDF:BOOL=NO
 NETCDF_CMAKE_OFF=	-DNETCDF:BOOL=NO
 
 PYTHON_USES=		python:3.7+
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 PYTHON_CMAKE_ON=	-DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}"
 PYTHON_CMAKE_OFF=	-DPYTHON:BOOL=NO
 
 # QHULL IS NOT NEEDED YET!
 #QHULL_DESC=		Enable Triangulate and Qhull support
 #QHULL_LIB_DEPENDS=	libqhull.so:math/qhull
 #QHULL_CMAKE_ON=		-DQHULL:BOOL=YES
 #QHULL_CMAKE_OFF=	-DQHULL:BOOL=NO
 
 UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 UDUNITS_CMAKE_ON=	-DUDUNITS2:BOOL=YES
 UDUNITS_CMAKE_OFF=	-DUDUNITS2:BOOL=NO
 
 .if defined(BUILD_PYTHON_MODULE)
 CATEGORIES+=	python
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=YES
 PLIST=		${.CURDIR}/pkg-plist.pymod
 .else
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=NO
 .endif
 
 .if defined(BUILD_PYTHON_MODULE)
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/src/GDL.so ${STAGEDIR}${PYTHON_SITELIBDIR}/
 .endif
 
 .if !defined(BUILD_PYTHON_MODULE)
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite
 	(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/testsuite/)
 .endif
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 . if defined(BUILD_PYTHON_MODULE)
 	@${ECHO_CMD} 'import GDL' > ${WRKDIR}/testgdl.py
 	@${ECHO_CMD} 'print GDL.function("sin",(1,))' >> ${WRKDIR}/testgdl.py
 	${PYTHON_CMD} ${WRKDIR}/testgdl.py
 . else
 	@${ECHO_CMD} ".RUN ${EXAMPLESDIR}/testsuite/test_suite.pro"	\
 		> ${WRKDIR}/testgdl
 	@${ECHO_CMD} "exit" >> ${WRKDIR}/testgdl
 	${PREFIX}/bin/gdl < ${WRKDIR}/testgdl
 . endif
 .endif
 
 .include <bsd.port.mk>
diff --git a/science/h5utils/Makefile b/science/h5utils/Makefile
index 5dd206ca3a16..062bdf2cf7f6 100644
--- a/science/h5utils/Makefile
+++ b/science/h5utils/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	h5utils
 DISTVERSION=	1.13.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 
 MAINTAINER=	aehlig@linta.de
 COMMENT=	Set of utilities for visualization and conversion of HDF5 format
 
 LICENSE=	MIT GPLv2
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gawk:lang/gawk
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libpng.so:graphics/png \
 		libmatheval.so:devel/libmatheval
 
 USES=		autoreconf compiler:c++11-lang
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	stevengj
 
 CFLAGS+=	-L${LOCALBASE}/lib -I${LOCALBASE}/include -lpthread
 CXXFLAGS+=	-std=c++11
 
 OPTIONS_DEFINE=		OCTAVE
 OPTIONS_SUB=		yes
 
 OCTAVE_DESC=		With Octave support
 OCTAVE_CONFIGURE_WITH=	octave
 OCTAVE_BUILD_DEPENDS=	${LOCALBASE}/include/octave-${OCTAVE_VERSION}/octave/octave.h:math/octave
 OCTAVE_VARS=		PLIST_SUB+="OCTAVE_VERSION=${OCTAVE_VERSION} CONFIGURE_TARGET=${CONFIGURE_TARGET}"
 
 post-install-OCTAVE-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/octave/${OCTAVE_VERSION}/site/oct/${CONFIGURE_TARGET}/h5read.oct
 
 .include "../../math/octave/Makefile.version"
 .include <bsd.port.mk>
diff --git a/science/h5z-zfp/Makefile b/science/h5z-zfp/Makefile
index 2fe13ae85b74..5f6af11e3fda 100644
--- a/science/h5z-zfp/Makefile
+++ b/science/h5z-zfp/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	h5z-zfp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Registered ZFP compression plugin for HDF5
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libzfp.so:devel/zfp
 
 USES=		gmake localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_PROJECT=	${PORTNAME:tu}
 USE_LDCONFIG=	yes
 
 MAKE_ARGS=	SHELL=${LOCALBASE}/bin/bash \
 		HDF5_HOME=${STAGEDIR}${LOCALBASE} HDF5_LIB=${LOCALBASE}/lib \
 		ZFP_HOME=${STAGEDIR}${LOCALBASE} ZFP_LIB=${LOCALBASE}/lib \
 		PREPATH=-Wl,-rpath= SOEXT=so SHFLAG=-shared
 
 CFLAGS+=	-fPIC
 
 PLIST_FILES=	include/H5Zzfp.h \
 		include/H5Zzfp_lib.h \
 		include/H5Zzfp_plugin.h \
 		include/H5Zzfp_props.h \
 		lib/libh5zzfp.so \
 		plugin/libh5zzfp.so
 
 .include <bsd.port.mk>
diff --git a/science/helfem/Makefile b/science/helfem/Makefile
index 123c6ba37158..64375aec4001 100644
--- a/science/helfem/Makefile
+++ b/science/helfem/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	helfem
 DISTVERSION=	g20210912
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science # chemistry
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	4c0196c3ef3f254a22030eda787105c8a48df919.patch:-p1 # https://github.com/susilehtola/HelFEM/pull/7
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Finite element methods for electronic structure calculations
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libarmadillo.so:math/armadillo \
 		libgsl.so:math/gsl \
 		libhdf5_cpp.so:science/hdf5 \
 		libsz.so:science/libaec \
 		libxc.so:science/libxc
 
 USES=		cmake fortran
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	susilehtola
 GH_PROJECT=	HelFEM
 GH_TAGNAME=	21461e9
 
 CMAKE_ON=	HELFEM_FIND_DEPS BUILD_SHARED_LIBS
 
 .include <bsd.port.mk>
diff --git a/science/highfive/Makefile b/science/highfive/Makefile
index 417ed07b0347..8e155277968f 100644
--- a/science/highfive/Makefile
+++ b/science/highfive/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	highfive
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	science devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Header-only C++ HDF5 interface
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5
 RUN_DEPENDS=	${LOCALBASE}/include/boost/multi_array.hpp:devel/boost-libs \
 		${LOCALBASE}/include/xtensor/xtensor.hpp:math/xtensor
 TEST_DEPENDS=	catch>0:devel/catch
 
 USES=		cmake eigen:3,run
 USE_GITHUB=	yes
 GH_ACCOUNT=	BlueBrain
 GH_PROJECT=	HighFive
 
 CMAKE_OFF=	HIGHFIVE_USE_BOOST HIGHFIVE_UNIT_TESTS HIGHFIVE_EXAMPLES
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DHIGHFIVE_UNIT_TESTS:BOOL=ON -DHIGHFIVE_USE_BOOST=ON -DHIGHFIVE_USE_EIGEN:BOOL=ON -DHIGHFIVE_USE_XTENSOR=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/science/jdftx/Makefile b/science/jdftx/Makefile
index 30d3786fe561..91532a7526ac 100644
--- a/science/jdftx/Makefile
+++ b/science/jdftx/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	jdftx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Software for joint density functional theory in chemistry
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libblas.so:math/blas \
 		libcblas.so:math/cblas \
 		libfftw3.so:math/fftw3 \
 		libgsl.so:math/gsl \
 		liblapack.so:math/lapack
 RUN_DEPENDS=	bash:shells/bash
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++11-lang cmake fortran localbase:ldflags shebangfix
 SHEBANG_GLOB=	*.sh
 SHEBANG_FILES=	scripts/*
 SHEBANG_LANG=	octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	shankar1729
 USE_LDCONFIG=	yes
 
 TEST_TARGET=	test
 
 WRKSRC_SUBDIR=	${PORTNAME}
 
 CMAKE_ARGS=	-DLAPACK_LIBRARIES:STRING="-llapack -lblas"
 
 OPTIONS_DEFINE=		MPI LIBXC HDF5 SCALAPACK OCTAVE
 OPTIONS_DEFAULT=	MPI LIBXC
 
 MPI_CMAKE_BOOL=		EnableMPI
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 
 LIBXC_DESC=		Use LibXC for additional exchange-correlation functionals
 LIBXC_CMAKE_BOOL=	EnableLibXC
 LIBXC_LIB_DEPENDS=	libxc.so:science/libxc
 
 HDF5_CMAKE_BOOL=	EnableHDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_BROKEN=		use of undeclared identifier 'H5Pset_dxpl_mpio' # https://github.com/shankar1729/jdftx/issues/37
 
 SCALAPACK_DESC=		Enable ScaLAPACK support
 SCALAPACK_CMAKE_BOOL=	EnableScaLAPACK
 SCALAPACK_LIB_DEPENDS=	libscalapack.so:math/scalapack
 
 OCTAVE_DESC=		With Octave support (only for one script: dryRunToPDB)
 OCTAVE_RUN_DEPENDS=	octave:math/octave
 
 .include <bsd.port.mk>
diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index 7b34f1ad08d1..304916a2315d 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	kst
 DISTVERSION=	${KST_VERSION}.${KST_DATE}
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Data viewing and plotting tool
 
 LICENSE=	GPLv2 GFDL LGPL20
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_GFDL=	${WRKSRC}/COPYING-DOCS
 LICENSE_FILE_LGPL20=	${WRKSRC}/COPYING.LGPL
 
 LIB_DEPENDS=	libgsl.so:math/gsl \
 		libtiff.so:graphics/tiff
 
 USES=		cmake compiler:c++11-lang desktop-file-utils kde:5 pkgconfig \
 		qt:5 shared-mime-info
 USE_QT=		concurrent core gui network printsupport svg widgets xml \
 		buildtools_build linguisttools_build qmake_build
 USE_LDCONFIG=	yes
 
 KST_VERSION=	2.0.8
 KST_DATE=	20220216
 KST_COMMIT=	40cdf2d3
 KDE_INVENT=	40cdf2d397e4277ee7226188ef89ae3e0f12d884 graphics kst-plot
 
 CMAKE_ARGS=	-Dkst_install_prefix=${PREFIX} \
 		-Dkst_pch=off \
 		-Dkst_version_string=${KST_VERSION} \
 		-Dkst_revision="${KST_COMMIT} ${KST_DATE}" \
 		-DCMAKE_DISABLE_FIND_PACKAGE_Getdata=ON \
 		-Dkst_qt5=on
 
 PLIST_SUB=	SHLIB_VER=${KST_VERSION}
 
 OPTIONS_DEFINE=	FITS HDF5 MATLAB NETCDF
 OPTIONS_DEFAULT=	FITS HDF5 MATLAB
 OPTIONS_SUB=	yes
 
 FITS_DESC=	Support for data in FITS format
 FITS_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 FITS_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_CFITSIO=ON
 
 HDF5_DESC=	Support for data in HDF5 format
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=ON
 
 MATLAB_DESC=	Support for data in MATLAB format
 MATLAB_LIB_DEPENDS=	libmatio.so:math/matio
 MATLAB_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Matio=ON
 
 NETCDF_DESC=	Support for data in NetCDF format (broken)
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NETCDF_IGNORE=	does not support NetCDF 4
 NETCDF_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Netcdf=ON
 
 .include <bsd.port.mk>
diff --git a/science/lammps/Makefile b/science/lammps/Makefile
index fd814e45d51c..4a8f08f523b7 100644
--- a/science/lammps/Makefile
+++ b/science/lammps/Makefile
@@ -1,151 +1,151 @@
 PORTNAME=	lammps
 PORTVERSION=	${GH_TAGNAME:C/(stable|patch)_([0-9]{1,2})([A-Z][a-z][a-z])([0-9]{4})/\4.\3.\2/S/Jan/01/S/Feb/02/S/Mar/03/S/Apr/04/S/May/05/S/Jun/06/S/Jul/07/S/Aug/08/S/Sep/09/S/Oct/10/S/Nov/11/S/Dec/12/}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Classical molecular dynamics code with a focus on materials modeling
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	undefined reference to `__atomic_load'
 
 LIB_DEPENDS=	libevent.so:devel/libevent \
 		libfftw3.so:math/fftw3 \
 		libhwloc.so:devel/hwloc2 \
 		libnghttp2.so:www/libnghttp2 \
 		libpciaccess.so:devel/libpciaccess \
 		libssh2.so:security/libssh2 \
 		libzstd.so:archivers/zstd
 
 USES=		blaslapack:openblas cmake:noninja compiler:c++14-lang eigen:3 fortran gnome localbase:ldflags python shebangfix
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYTHON=	cython
 
 USE_GITHUB=	yes
 GH_TAGNAME=	stable_23Jun2022
 
 SHEBANG_GLOB=	*.sh *.bash
 SHEBANG_FILES=	lib/kokkos/bin/nvcc_wrapper
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_SOURCE_PATH=	${WRKSRC}/cmake
 CMAKE_ARGS=	-DBLA_VENDOR:STRING="OpenBLAS" ${CMAKE_ARGS_${CHOSEN_COMPILER_TYPE}} \
 		-DPython_EXECUTABLE=${PYTHON_CMD}
 CMAKE_ARGS_gcc=	-DBUILD_OMP:BOOL=false
 
 # enable packages (for a complete list see STANDARD_PACKAGES in cmake/CMakeLists.txt)
 CMAKE_ON+=	PKG_ASPHERE PKG_ATC PKG_AWPMD PKG_BOCS PKG_BODY PKG_BROWNIAN PKG_CG-DNA PKG_CG-SDK PKG_CLASS2
 CMAKE_ON+=	PKG_COLLOID PKG_COLVARS PKG_COMPRESS PKG_DIELECTRIC PKG_DIFFRACTION PKG_DIPOLE PKG_DPD-BASIC PKG_DPD-MESO PKG_DPD-REACT PKG_DPD-SMOOTH
 CMAKE_ON+=	PKG_DRUDE PKG_EFF PKG_EXTRA-COMPUTE PKG_EXTRA-DUMP PKG_EXTRA-FIX PKG_EXTRA-MOLECULE PKG_EXTRA-PAIR PKG_FEP PKG_GRANULAR PKG_H5MD
 CMAKE_ON+=	PKG_INTERLAYER PKG_KIM PKG_KSPACE PKG_LATBOLTZ PKG_LATTE PKG_MACHDYN PKG_MANIFOLD PKG_MANYBODY PKG_MC
 CMAKE_ON+=	PKG_MEAM PKG_MESSAGE PKG_MGPT PKG_MISC PKG_ML-IAP PKG_ML-RANN
 CMAKE_ON+=	PKG_ML-SNAP PKG_MOFFF PKG_MOLECULE PKG_MOLFILE PKG_MPIIO PKG_ORIENT PKG_PERI PKG_PHONON
 CMAKE_ON+=	PKG_PLUGIN PKG_PLUMED PKG_POEMS PKG_PTM PKG_PYTHON PKG_QEQ PKG_QMMM PKG_QTB PKG_REACTION PKG_REAXFF
 CMAKE_ON+=	PKG_REPLICA PKG_RIGID PKG_SHOCK PKG_SMTBQ PKG_SPH PKG_SPIN PKG_SRD PKG_TALLY PKG_UEF
 CMAKE_ON+=	PKG_VORONOI PKG_YAFF
 # Packages requiring extra downloades or dependencies: PKG_MSCG PKG_ADIOS PKG_MDI PKG_MESONT PKG_ML-PACE PKG_NETCDF PKG_ML-QUIP PKG_SCAFACOS PKG_VTK
 # PKG_ML-HDNNP downloads https://github.com/CompPhysVienna/n2p2/archive/v2.1.4.tar.gz
 
 OPTIONS_DEFINE=		EXCEPTIONS JPEG PNG GZIP FFMPEG
 OPTIONS_GROUP=		PARALLEL PACKAGES
 OPTIONS_DEFAULT=	EXCEPTIONS MPI OPENMP JPEG PNG GZIP FFMPEG H5MD KIM KOKKOS LATTE PLUMED VORONOI ${OPTIONS_DEFAULT_${CHOSEN_COMPILER_TYPE}}
 OPTIONS_SUB=		yes
 PARALLEL_DESC=		Enable parallelizations:
 PACKAGES_DESC=		Enable packages:
 OPTIONS_GROUP_PARALLEL=	MPI OPENMP ${OPTIONS_DEFINE_${CHOSEN_COMPILER_TYPE}}
 OPTIONS_GROUP_PACKAGES=	H5MD KIM KOKKOS LATTE PLUMED VORONOI VTK
 
 EXCEPTIONS_DESC=	Enable the use of C++ exceptions
 EXCEPTIONS_CMAKE_BOOL=	LAMMPS_EXCEPTIONS
 
 MPI_CMAKE_BOOL=		BUILD_MPI PKG_MPIIO PKG_USER-LB
 MPI_LIB_DEPENDS=	libmpi.so:net/mpich
 MPI_USES=		compiler:c11
 
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 FFMPEG_BUILD_DEPENDS=	ffmpeg:multimedia/ffmpeg
 FFMPEG_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
 
 JPEG_CMAKE_BOOL=	WITH_JPEG
 JPEG_USES=		jpeg
 
 PNG_CMAKE_BOOL=		WITH_PNG
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 GZIP_DESC=		Enable GZIP support
 GZIP_CMAKE_BOOL=	WITH_GZIP
 
 H5MD_DESC=		USER-H5MD package based on libhdf5
 H5MD_CMAKE_BOOL=	PKG_USER-H5MD
 H5MD_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 			libsz.so:science/libaec
 
 KIM_DESC=		KIM package based on the OpenKim library/repository
 KIM_USES=		pkgconfig
 KIM_CMAKE_BOOL=		PKG_KIM
 KIM_CMAKE_ON=		-DDOWNLOAD_KIM:BOOL=OFF
 KIM_LIB_DEPENDS=	libkim-api.so:science/kim-api \
 			libcurl.so:ftp/curl
 KIM_RUN_DEPENDS=	openkim-models>0:science/openkim-models
 
 KOKKOS_DESC=		kokkos package based on the libkokkos library
 KOKKOS_CMAKE_BOOL=	PKG_KOKKOS EXTERNAL_KOKKOS
 KOKKOS_LIB_DEPENDS=	libkokkoscore.so:devel/kokkos
 
 LATTE_DESC=		latte package based on the liblatte library
 LATTE_CMAKE_BOOL=	PKG_LATTE
 LATTE_LIB_DEPENDS=	liblatte.so:science/latte
 
 PLUMED_DESC=		plumed package based on the plumed library
 PLUMED_USES=		pkgconfig
 PLUMED_CMAKE_BOOL=	PKG_USER-PLUMED
 PLUMED_CMAKE_ON=	-DPLUMED_MODE=shared
 PLUMED_LIB_DEPENDS=	libplumed.so:science/plumed
 
 VORONOI_DESC=		voro++, Voronoi tessellation package
 VORONOI_CMAKE_BOOL=	PKG_VORONOI
 VORONOI_LIB_DEPENDS=	libvoro++.so:science/voro++
 
 VTK_DESC=		USER-VTK package based on the external vtk package
 VTK_CMAKE_BOOL=		PKG_USER-VTK
 VTK_CMAKE_ON=		-DVTK_DIR:PATH=${LOCALBASE}/lib/cmake/vtk-9.1
 VTK_USES=		qt:5 xorg
 VTK_USE=		qt=core,gui,sql,widgets xorg=ice,sm,x11,xext,xt
 VTK_LIB_DEPENDS=	libvtkImagingMath-8.2.so:math/vtk8 \
 			libexpat.so:textproc/expat2 \
 			libfreetype.so:print/freetype2 \
 			libtiff.so:graphics/tiff
 
 PORTSCOUT=	ignore:1 # due to a special version tagging scheme that this project uses portscout fails to find new versions, watching their GitHub release page instead
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENMP}
 CMAKE_ARGS+=	-DBUILD_OMP:BOOL=true
 .endif
 
 xpost-patch:
 	# adjust SHELL in Makefile
 	@${REINPLACE_CMD} 's|SHELL = /bin/bash|SHELL = ${LOCALBASE}/bin/bash|' ${WRKSRC}/src/Makefile
 	# fix python version, also see https://github.com/lammps/lammps/issues/3098, https://github.com/lammps/lammps/issues/3099
 	@${FIND} ${WRKSRC} -name "CMakeLists.txt" -o -name "*.cmake" | ${XARGS} ${REINPLACE_CMD} -e ' \
 		s|find_package(Python3 REQUIRED |find_package(Python $${FREEBSD_PYTHON_VER} EXACT REQUIRED |; \
 		s|find_package(Python 3.5 COMPONENTS |find_package(Python $${FREEBSD_PYTHON_VER} EXACT COMPONENTS |; \
 		s|find_package(Python 3.6 COMPONENTS |find_package(Python $${FREEBSD_PYTHON_VER} EXACT COMPONENTS |; \
 		s|find_package(Python3 REQUIRED |find_package(Python $${FREEBSD_PYTHON_VER} EXACT REQUIRED |; \
 		s|find_package(Python COMPONENTS |find_package(Python3 $${FREEBSD_PYTHON_VER} EXACT COMPONENTS |; \
 		s|find_package(Python3 COMPONENTS |find_package(Python3 $${FREEBSD_PYTHON_VER} EXACT COMPONENTS |; \
 		s|find_package(Python QUIET COMPONENTS |find_package(Python3 $${FREEBSD_PYTHON_VER} EXACT QUIET COMPONENTS |; \
 		s|find_package(Python REQUIRED COMPONENTS |find_package(Python3 $${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS | \
 		'
 
 post-patch-FFMPEG-off:
 	@${REINPLACE_CMD} 's|find_program(FFMPEG_EXECUTABLE|#&|' ${WRKSRC}/cmake/CMakeLists.txt
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/python*
 
 .include <bsd.port.mk>
diff --git a/science/liggghts/Makefile b/science/liggghts/Makefile
index d00e664f09b1..8725ba0b32f1 100644
--- a/science/liggghts/Makefile
+++ b/science/liggghts/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	liggghts
 DISTVERSION=	3.8.0-45
 DISTVERSIONSUFFIX=	-g86544c3f
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Discrete element method particle simulation software
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libhdf5_hl.so:science/hdf5 \
 		libmpi.so:net/mpich \
 		libnetcdf.so:science/netcdf \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libvtkViewsCore-9.1.so:math/vtk9
 
 USES=		compiler:c++17-lang cmake fortran gl jpeg python qt:5 xorg
 USE_XORG=	ice sm x11 xext xt
 USE_QT=		core declarative gui network opengl sql widgets qmake_build buildtools_build
 USE_GL=		gl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CFDEMproject
 GH_PROJECT=	${PORTNAME:tu}-PUBLIC
 
 CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}
 
 WRKSRC_SUBDIR=	src
 
 CFLAGS+=	-fPIC
 CXXFLAGS+=	-fPIC \
 		-I${LOCALBASE}/include/vtk-9.1
 
 BINARY_ALIAS=	sed=gsed
 
 .include <bsd.port.mk>
diff --git a/science/minc2/Makefile b/science/minc2/Makefile
index dceb3f1afd72..c20f099debd8 100644
--- a/science/minc2/Makefile
+++ b/science/minc2/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	minc
 PORTVERSION=	2.2.00
 DISTVERSIONPREFIX=	release-
-PORTREVISION=	11
+PORTREVISION=	12
 PORTEPOCH=	1
 CATEGORIES=	science biology
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Medical Imaging NetCDF
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_FreeBSD_13=	ld: error: duplicate symbol: matrix_errno
 BROKEN_FreeBSD_14=	ld: error: duplicate symbol: matrix_errno
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf
 RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	BIC-MNI
 
 MAKE_JOBS_UNSAFE=	yes
 
 USES=		autoreconf bison gmake libtool perl5 shebangfix
 SHEBANG_FILES=	progs/mincview/mincview
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared=yes --enable-static=yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-Wno-error=return-type
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFLICTS=	minc-1* zh-tk
 
 pre-patch:
 	@${RM} ${WRKSRC}/ac_config_aux/*
 	@${RM} ${WRKSRC}/progs/minccalc/gram.[ch]
 	@${RM} ${WRKSRC}/progs/mincgen/ncgentab.[ch]
 
 .include <bsd.port.mk>
diff --git a/science/mpb/Makefile b/science/mpb/Makefile
index 5ea360fcb5ce..6c5d4294b37b 100644
--- a/science/mpb/Makefile
+++ b/science/mpb/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	mpb
 DISTVERSION=	1.11.1
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://github.com/NanoComp/mpb/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	MIT Photonic-Bands
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libctl.so:science/libctl \
 		libfftw3.so:math/fftw3 \
 		libgc-threaded.so:devel/boehm-gc-threaded \
 		libguile-2.2.so:lang/guile2 \
 		libhdf5.so:science/hdf5
 
 USES=		fortran libtool pkgconfig readline
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
 # Do not use --with-mpi, because it is not guaranted
 # that science/hdf5 also built with option PARALLEL
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		ATLAS NLOPT OPENMP
 OPTIONS_DEFAULT=	NLOPT
 
 ATLAS_DESC=	Use math/atlas instead of math/openblas
 NLOPT_DESC=	Use math/nlopt (enable also in science/libctl)
 OPENMP_DESC=	Use OpenMP (enable also in math/fftw3)
 
 ATLAS_LIB_DEPENDS=	libatlas.so:math/atlas
 ATLAS_USES_OFF=		blaslapack:openblas
 ATLAS_CONFIGURE_ON=	--with-lapack=-lalapack
 ATLAS_CONFIGURE_OFF=	--with-blas=openblas --with-lapack=-lopenblas
 NLOPT_LIB_DEPENDS=	libnlopt.so:math/nlopt
 OPENMP_CONFIGURE_ON=	--with-openmp
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && \
 	${COPYTREE_SHARE} "*.ctl *.scm" ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
index d95c30afa90f..9e465b81f3e8 100644
--- a/science/netcdf/Makefile
+++ b/science/netcdf/Makefile
@@ -1,52 +1,53 @@
 PORTNAME=	netcdf
 PORTVERSION=	4.9.0
 DISTVERSIONPREFIX=	c-
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://downloads.unidata.ucar.edu/netcdf-c/${PORTVERSION}/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C library for machine-independent, array-oriented data access
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libhdf5.so:science/hdf5
 
 USES=		gmake libtool localbase ncurses pathfix pkgconfig:run
 
 CONFIGURE_ARGS=	--disable-filter-testing --disable-libxml2 \
 		--enable-byterange --enable-dap --enable-netcdf-4
 CPPFLAGS+=	-fPIC -DPIC
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 LIBS+=		-lexecinfo
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	hdf-4.[0-9]* netcdf-3.[0-9]* netcdf3-3.[0-9]*
 
 OPTIONS_DEFINE=	DOCS DOXYGEN SZIP
 OPTIONS_DEFAULT=SZIP
 OPTIONS_SUB=	yes
 DOXYGEN_IMPLIES=DOCS
 SZIP_DESC=	SZIP support (required if HDF5 was built with SZIP)
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENABLE=	doxygen
 SZIP_LIB_DEPENDS=	libsz.so:science/libaec
 SZIP_LIBS=		-lsz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl ||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/ int fileno(FILE\*);/d' ${WRKSRC}/libdispatch/d*.c ${WRKSRC}/ncgen/ncgen* ${WRKSRC}/ncgen3/ncgen* ${WRKSRC}/oc2/ocdump.c
 
 post-build-DOXYGEN-on:
 	cd ${WRKSRC}/docs/ && ${LOCALBASE}/bin/doxygen .
 
 post-install-DOXYGEN-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/docs/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/science/openems/Makefile b/science/openems/Makefile
index f7d5c0db03d2..b4e50ff8d0ce 100644
--- a/science/openems/Makefile
+++ b/science/openems/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	openems
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.35-76
 DISTVERSIONSUFFIX=	-gd4448fa
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Electromagnetic field solver using the EC-FDTD method
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	upstream only supports amd64 and powerpc64
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libCSXCAD.so:cad/csxcad \
 		libexpat.so:textproc/expat2 \
 		libfparser-4.5.so:math/fparser \
 		libhdf5.so:science/hdf5 \
 		libpng16.so:graphics/png \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff \
 		libtinyxml.so:textproc/tinyxml \
 		libvtkCommonCore-9.1.so:math/vtk9
 
 USES=		cmake jpeg pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	thliebig
 GH_PROJECT=	openEMS
 
 CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 \
 		-DLOCALBASE=${LOCALBASE}
 
 CXXFLAGS+=	-I${LOCALBASE}/include/fparser # fparser.pc probably returns a wrong value
 
 DATADIR=	${PREFIX}/share/openEMS
 
 post-install:
 	@${REINPLACE_CMD} -i '' -e 's|#!/bin/bash|#!/bin/sh|' ${STAGEDIR}${PREFIX}/bin/openEMS.sh
 
 .include <bsd.port.mk>
diff --git a/science/openmc/Makefile b/science/openmc/Makefile
index 8484d49c19d7..23605c632586 100644
--- a/science/openmc/Makefile
+++ b/science/openmc/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	openmc
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.13.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Monte Carlo neutron and photon transport simulation code
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	xtensor>0:math/xtensor
 LIB_DEPENDS=	libfmt.so:devel/libfmt \
 		libhdf5.so:science/hdf5 \
 		libpng16.so:graphics/png \
 		libpugixml.so:textproc/pugixml \
 		libsz.so:science/libaec
 
 USES=		cmake:noninja eigen:3 pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}-dev
 GH_TUPLE=	martinmoene:gsl-lite:913e86d:gsl_lite/vendor/gsl-lite
 
 BINARY_ALIAS=	git=false
 
 OPTIONS_DEFINE=		LIBMESH MPI OPENMP
 OPTIONS_DEFAULT=	MPI OPENMP
 
 LIBMESH_DESC=		Support for libMesh unstructured mesh tallies
 LIBMESH_CMAKE_BOOL=	libmesh
 LIBMESH_LIB_DEPENDS=	libmesh_opt.so:math/libmesh
 
 MPI_VARS=		CXX=${LOCALBASE}/bin/mpic++ # compilation breaks with OpenMPI-{3,4} and LIBMESH=ON
 MPI_BUILD_DEPENDS=	mpich>0:net/mpich
 MPI_RUN_DEPENDS=	mpich>0:net/mpich
 
 OPENMP_CMAKE_BOOL=	openmp
 
 post-install:
 	${RM} -r ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/science/openmolcas/Makefile b/science/openmolcas/Makefile
index bd4fb73e8cd4..84d6600f3d62 100644
--- a/science/openmolcas/Makefile
+++ b/science/openmolcas/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	openmolcas
 DISTVERSION=	22.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum chemistry software package
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	build breaks: Symbol 'maxfilesize' at (1) has no IMPLICIT type; did you mean 'mxfile'?
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec \
 		libxc.so:science/libxc
 
 USES=		cmake fortran python shebangfix
 USE_GCC=	yes # see https://gitlab.com/Molcas/OpenMolcas/-/issues/351
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	Molcas
 GL_PROJECT=	OpenMolcas
 GL_COMMIT=	f8df69cf87b241a15ebc82d72a8f9a031a385dd4
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	Reference-LAPACK:lapack:aa631b4b:lapack/External/lapack \
 		libwfa:libwfa:bbe3392a:libwfa/External/libwfa
 
 SHEBANG_FILES=	sbin/help_doc sbin/help_func sbin/help_basis sbin/setup sbin/verify sbin/version
 
 CMAKE_ARGS=	-DEXTERNAL_LIBXC:STRING=${LOCALBASE} \
 		-DFREEBSD_PYTHON_VER:STRING=${PYTHON_VER}
 #CMAKE_ON=	# for EFPLIB, MSYM see https://gitlab.com/Molcas/OpenMolcas/-/issues/350, for WFA - hdf5 needs updating
 CMAKE_OFF=	BUILD_TESTING
 
 CMAKE_INSTALL_PREFIX=	${DATADIR} # installed into DATADIR because it doesn't respect UNIX file path conventions, see https://gitlab.com/Molcas/OpenMolcas/-/issues/352
 
 BINARY_ALIAS=	cpp=${CPP} # cpp is called from cmake scripts
 
 post-install:
 	# remove unused static libraries, see https://gitlab.com/Molcas/OpenMolcas/-/issues/354
 	@${RM} -r ${STAGEDIR}${CMAKE_INSTALL_PREFIX}/lib
 	# remove unnecessary fines
 	@${RM} ${STAGEDIR}${CMAKE_INSTALL_PREFIX}/CONTRIBUTORS.md
 	@${RM} ${STAGEDIR}${CMAKE_INSTALL_PREFIX}/LICENSE
 	# remove empty doc directory
 	@${RMDIR} ${STAGEDIR}${DATADIR}/doc
 
 .include <bsd.port.mk>
diff --git a/science/opensph/Makefile b/science/opensph/Makefile
index f1530116c214..3cf3051d4839 100644
--- a/science/opensph/Makefile
+++ b/science/opensph/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	OpenSPH
 DISTVERSION=	0.3.8
-PORTREVISION=	5 # accounts for the upstream moving 0.3.8 release, including bugfixes
+PORTREVISION=	6 # accounts for the upstream moving 0.3.8 release, including bugfixes
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library and graphical tools for running SPH and N-body simulations
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	unconditional use of -msse4.1 and inclusion of immintrin.h
 
 TEST_DEPENDS=	catch>0:devel/catch
 
 USES=		compiler:c++14-lang qmake qt:5
 USE_GITLAB=	yes
 USE_WX=		3.1
 
 GL_SITE=	https://gitlab.com
 GL_ACCOUNT=	sevecekp
 GL_PROJECT=	sph
 GL_COMMIT=	7de6c044339f649e3d19e61f735a6a24572b792a
 
 QMAKE_SOURCE_PATH=	${WRKSRC}/sph.pro
 QMAKE_ARGS=		CONFIG+=release
 
 CXXFLAGS+=	-DSPH_CONFIG_SET
 
 TEST_WRKSRC=	${WRKDIR}/test
 
 BINARY_ALIAS=	wx-config=${LOCALBASE}/bin/wxgtk3u-3.1-config
 
 PLIST_FILES=	bin/opensph bin/opensph-cli bin/opensph-info
 
 OPTIONS_DEFINE=			CHAISCRIPT EIGEN HDF5 OPENMP TBB VDB
 OPTIONS_DEFAULT=		CHAISCRIPT EIGEN HDF5 OPENMP TBB VDB
 
 CHAISCRIPT_DESC=		Be able to read and modify particle data from a script
 CHAISCRIPT_QMAKE_ON=		CONFIG+=use_chaiscript
 CHAISCRIPT_BUILD_DEPENDS=	${LOCALBASE}/include/chaiscript/chaiscript.hpp:lang/chaiscript
 
 EIGEN_DESC=			Eigen for additional methods to set up initial conditions
 EIGEN_QMAKE_ON=			CONFIG+=use_eigen
 EIGEN_USES=			eigen:3
 
 HDF5_DESC=			Be able to read files generated by miluphcuda code
 HDF5_QMAKE_ON=			CONFIG+=use_hdf5
 HDF5_LIB_DEPENDS=		libhdf5.so:science/hdf5
 
 OPENMP_QMAKE_ON=		CONFIG+=use_openmp
 
 TBB_DESC=			Parallelize with Intel Threading Building Blocks
 TBB_QMAKE_ON=			CONFIG+=use_tbb
 TBB_LIB_DEPENDS=		libtbb.so:devel/onetbb
 
 VDB_DESC=			Use OpenVDB for converting particles to volumetric data
 VDB_QMAKE_ON=			CONFIG+=use_vdb
 VDB_LIB_DEPENDS=		libImath.so:math/Imath \
 				libopenvdb.so:misc/openvdb \
 				libtbb.so:devel/onetbb
 
 do-test:
 	@${REINPLACE_CMD} -e 's|Path(.*|Path("${TEST_WRKSRC}");|' ${WRKSRC}/test/utils/Config.h
 	@${MKDIR} ${TEST_WRKSRC}
 	@cd ${_QMAKE_WRKSRC} && \
 		${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS}  \
 			${WRKSRC}/test.pro \
 			${QMAKE_CONFIGURE_ARGS:?--:} ${QMAKE_CONFIGURE_ARGS}
 	@cd ${BUILD_WRKSRC}  && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS}
 	@cd ${TEST_WRKSRC}  && \
 		${WRKSRC}/test/test
 
 .include <bsd.port.mk>
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index cde6ea58ea7d..acde6c500c56 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -1,164 +1,164 @@
 PORTNAME=	paraview
 DISTVERSION=	5.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.paraview.org/files/v${VERMAJORMINOR}/
 DISTNAME=	ParaView-v${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Powerful scientific data visualization application
 
 LICENSE=	ParaView_License_1.2
 LICENSE_NAME=	ParaView_License
 LICENSE_FILE=	${WRKSRC}/License_v1.2.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_aarch64=	fails to link: undefined reference to `sbrk'
 
 BUILD_DEPENDS=	${PYNUMPY}	\
 		cli11>0:devel/cli11	\
 		utf8cpp>0:devel/utf8cpp	\
 		${LOCALBASE}/include/exprtk.hpp:math/exprtk	\
 		${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libfreetype.so:print/freetype2 \
 		libexpat.so:textproc/expat2 \
 		libjbig.so:graphics/jbigkit \
 		liborc-0.4.so:devel/orc \
 		libpcre.so:devel/pcre \
 		libicuuc.so:devel/icu \
 		libffi.so:devel/libffi \
 		liblas.so:devel/liblas \
 		libtbb.so:devel/onetbb \
 		libogg.so:audio/libogg \
 		libgl2ps.so:print/gl2ps \
 		libOT.so:math/openturns \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libhpdf.so:print/libharu \
 		libpdal_base.so:math/pdal \
 		libdrm.so:graphics/libdrm \
 		libcgns.so:science/cgnslib \
 		liblz4.so:archivers/liblz4 \
 		libnetcdf.so:science/netcdf \
 		libjsoncpp.so:devel/jsoncpp \
 		libprotobuf.so:devel/protobuf \
 		libpugixml.so:textproc/pugixml \
 		libavutil.so:multimedia/ffmpeg \
 		libcgraph.so:graphics/graphviz \
 		libtheora.so:multimedia/libtheora \
 		libgeotiff.so:graphics/libgeotiff \
 		libboost_thread.so:devel/boost-libs \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 RUN_DEPENDS=	${PYNUMPY}	\
 		bash:shells/bash	\
 		vtk9>0:math/vtk9	\
 		${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		alias cmake compiler:c11 eigen:3 fortran gl gnome jpeg localbase	\
 		pkgconfig python qt:5 shebangfix tar:xz xorg
 USE_GL=		gl glew glu glut
 USE_GNOME=	libxml2
 USE_QT=		buildtools_build core gui help network opengl qmake_build sql svg	\
 		widgets x11extras xmlpatterns
 USE_XORG=	ice sm x11 xau xcb xcursor xdamage xdmcp xext xfixes xorgproto xrender	\
 		xxf86vm
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DPARAVIEW_BUILD_SHARED_LIBS=ON \
 		-DPARAVIEW_BUILD_WITH_EXTERNAL=ON \
 		-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1 \
 		-DPARAVIEW_USE_PYTHON:BOOL=ON \
 		-DPARAVIEW_ENABLE_FFMPEG:BOOL=ON \
 		-DPARAVIEW_ENABLE_LAS:BOOL=ON \
 		-DPARAVIEW_ENABLE_WEB:BOOL=ON \
 		-DPARAVIEW_ENABLE_GDAL:BOOL=ON \
 		-DPARAVIEW_ENABLE_PDAL:BOOL=ON \
 		-DPARAVIEW_ENABLE_OPENTURNS:BOOL=ON \
 		-DPARAVIEW_ENABLE_OPENTURNS:BOOL=ON \
 		-DPARAVIEW_ENABLE_MOTIONFX:BOOL=ON \
 		-DPARAVIEW_ENABLE_XDMF2:BOOL=ON \
 		-DPARAVIEW_ENABLE_XDMF3:BOOL=ON \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_ParaView_vtkcatalyst:BOOL=OFF \
 		-DExternalData_OBJECT_STORES="${WRKDIR}/VTK/ExternalData/MD5" \
 		-DFREETYPE_INCLUDE_DIRS="${LOCALBASE}/include/freetype2"
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-DVTK_FORBID_DOWNLOADS:BOOL=ON
 .endif
 MAKE_ENV=	XDG_CONFIG_HOME=${WRKDIR}
 
 SHEBANG_GLOB=	*.py
 SHEBANG_FILES=	VTK/Examples/SearchScript.sh	\
 		VTK/Utilities/Maintenance/*.sh	\
 		Clients/CommandLineExecutables/paraview-config.in
 
 VERMAJORMINOR=	${PORTVERSION:R}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES MPI OSMESA
 OPTIONS_SUB=	yes
 OSMESA_DESC=	Use Mesa for off-screen rendering
 
 # mpi4py and other programs must be compiled against the same MPI provider
 MPI_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPI_USES=		mpi # mpich is set by default, use mpi:openmpi if needed
 MPI_CMAKE_ON=		-DPARAVIEW_USE_MPI:BOOL=ON
 MPI_CMAKE_OFF=		-DPARAVIEW_USE_MPI:BOOL=OFF
 
 OSMESA_LIB_DEPENDS=	libOSMesa.so:graphics/libosmesa
 OSMESA_USES_OFF=	desktop-file-utils
 OSMESA_CMAKE_BOOL=	VTK_OPENGL_HAS_OSMESA
 OSMESA_CMAKE_ON=	-DVTK_USE_X:BOOL="OFF" \
 			-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
 			-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so
 OSMESA_CMAKE_OFF=	-DVTK_USE_X:BOOL="ON"
 
 EXAMPLES_CMAKE_BOOL=	PARAVIEW_BUILD_EXAMPLES
 PORTEXAMPLES=		*
 
 #TEST_CMAKE_ON=		-DPARAVIEW_BUILD_TESTING=WANT	\
 			-DPARAVIEW_BUILD_VTK_TESTING=WANT
 
 # Error with ADIOS2
 #LIB_DEPENDS+=	libadios2_c.so:misc/adios2
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_ADIOS2:BOOL=ON
 # Missing GenericIO for CosmoTools
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_COSMOTOOLS:BOOL=ON
 # Errors with VisItBridge / VisItLib
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON
 # MomentInvariants needs to download a module
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_MOMENTINVARIANTS:BOOL=ON
 # No package for graphics/ospray
 #LIB_DEPENDS+=	libospray.so:graphics/ospray
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_RAYTRACING
 
 PLIST_SUB+=	VERMAJORMINOR=${VERMAJORMINOR}
 
 VTK9_CONFLICTS=	vtk.py vtkmodules/__init__.py vtkmodules/all.py	\
 		vtkmodules/gtk vtkmodules/numpy_interface	\
 		vtkmodules/qt vtkmodules/test vtkmodules/tk	\
 		vtkmodules/util vtkmodules/wx
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
 		${PATCH_WRKSRC}/VTK/IO/Image/vtkPNGReader.cxx
 	${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|'	\
 		${PATCH_WRKSRC}/VTK/Utilities/Maintenance/vtk_site_history.py
 
 post-install:
 	# vtk9 is not a real run dependency, but it installs several common files
 .for py in ${VTK9_CONFLICTS}
 	${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/${py}
 .endfor
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/science/py-PyNE/Makefile b/science/py-PyNE/Makefile
index 5cbc40b3dce0..abf63d4c46bb 100644
--- a/science/py-PyNE/Makefile
+++ b/science/py-PyNE/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	PyNE
 DISTVERSION=	0.7.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	http://raw.githubusercontent.com/pyne/data/master/:decay \
 		http://raw.githubusercontent.com/pyne/data/master/:cram \
 		http://raw.githubusercontent.com/pyne/data/master/:dlc \
 		http://raw.githubusercontent.com/pyne/data/master/:clc \
 		https://github.com/pyne/data/raw/master/:nuc_data
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	decay.tar.gz:decay \
 		cram.tar.gz:cram \
 		decay-linux-clang.tar.gz:dlc \
 		cram-linux-clang.tar.gz:clc \
 		prebuilt_nuc_data.h5:nuc_data
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	PyNE: The Nuclear Engineering Toolkit
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}tables>0:devel/py-tables@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 BUILD_DEPENDS=	cmake:devel/cmake \
 		${PY_DEPENDS}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libMOAB.so:math/moab \
 		libsz.so:science/libaec
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		compiler:c++17-lang fortran python:3.7+
 USE_PYTHON=	distutils cython flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pyne
 GH_PROJECT=	pyne
 
 MAKE_ENV=	DESTDIR=${STAGEDIR}
 FFLAGS+=	-fallow-argument-mismatch
 
 # all arguments are described here: http://pyne.io/install/source.html#source
 PY_EXTRA_ARGS=	--slow	# this chooses slow compilation of sources from {decay,cram}.tar.gz
 			# over incompatible pre-compiled assembly from {decay,cram}-linux-clang.tar.gz
 PY_EXTRA_ARGS+=	${_MAKE_JOBS}
 PY_EXTRA_ARGS+=	--hdf5 ${LOCALBASE}
 PY_EXTRA_ARGS+=	--moab ${LOCALBASE}
 
 PYDISTUTILS_CONFIGUREARGS=	${PY_EXTRA_ARGS}
 PYDISTUTILS_BUILDARGS=		${PY_EXTRA_ARGS}
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 post-extract:
 .for f in decay.tar.gz cram.tar.gz decay-linux-clang.tar.gz cram-linux-clang.tar.gz
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/src
 .endfor
 
 do-install:
 	# install project
 	cd ${INSTALL_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET}
 	# also install nuc_data.h5 because it is referred to in the code and is required by Jupyter notebooks
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/prebuilt_nuc_data.h5 ${STAGEDIR}${PYTHON_SITELIBDIR}/pyne/nuc_data.h5
 	# strip
 	${STRIP_CMD} \
 		${STAGEDIR}${LOCALBASE}/lib/lib*.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/pyne/*.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/pyne/xs/models.so
 
 .include <bsd.port.mk>
diff --git a/science/py-h5py/Makefile b/science/py-h5py/Makefile
index 3bf98e24c519..e32844aa52c8 100644
--- a/science/py-h5py/Makefile
+++ b/science/py-h5py/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	h5py
 PORTVERSION=	3.7.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	General-purpose Python interface to the HDF5 library
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/licenses/license.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython>=0.29.15:lang/cython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pkgconfig>=0,1:devel/py-pkgconfig@${PY_FLAVOR} \
 		${RUN_DEPENDS}
 LIB_DEPENDS=	libhdf5.so:science/hdf5
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.14.5,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		localbase pkgconfig python:3.7+
 USE_PYTHON=	autoplist concurrent cython distutils pytest
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/science/py-netCDF4/Makefile b/science/py-netCDF4/Makefile
index f2422030ea2d..9823120ec803 100644
--- a/science/py-netCDF4/Makefile
+++ b/science/py-netCDF4/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	netCDF4
 PORTVERSION=	1.5.8
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	rel
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Python Interface to the NetCDF Library (versions 3 and 4)
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}cftime>=0:devel/py-cftime@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_GITHUB=	yes
 GH_ACCOUNT=	Unidata
 GH_PROJECT=	netcdf4-python
 USE_PYTHON=	autoplist concurrent cython cython_run distutils
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${ECHO_CMD} -n > ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "[options]" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "use_ncconfig=True" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "ncconfig=${LOCALBASE}/bin/nc-config" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "[directories]" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "HDF5_libdir=${LOCALBASE}/lib" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "HDF5_incdir=${LOCALBASE}/include" >> ${WRKSRC}/setup.cfg
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/netCDF4/_netCDF4*.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/science/qmcpack/Makefile b/science/qmcpack/Makefile
index 6585d76306a8..c4f256cf28be 100644
--- a/science/qmcpack/Makefile
+++ b/science/qmcpack/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	qmcpack
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.14.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Many-body ab initio Quantum Monte Carlo code for quantum chemistry
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	undefined reference to `__atomic_load'
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libfftw3.so:math/fftw3 \
 		libhdf5.so:science/hdf5 \
 		libmpich.so:net/mpich \
 		libopenblas.so:math/openblas \
 		libsz.so:science/libaec
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		cmake:testing compiler:c++17-lang fortran gnome localbase:ldflags pkgconfig python shebangfix
 USE_GNOME=	libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tu}
 
 SHEBANG_FILES=	src/QMCTools/gpaw4qmcpack.py \
 		${NEXUS_PLIST_FILES:C/^/nexus\//}
 SHEBANG_GLOB=	check.sh
 
 CMAKE_OFF=	BUILD_UNIT_TESTS
 CMAKE_ARGS=	-DFREEBSD_PYTHON_VER=${PYTHON_VER}
 CMAKE_TESTING_ON=	BUILD_UNIT_TESTS # at least 3 testcases are known to fail
 
 PROGS=		convert4qmc convertpw4qmc gpaw4qmcpack.py ppconvert qmc-check-affinity qmc-extract-eshdf-kvectors qmc-get-supercell qmcfinitesize qmcpack qmcpack.settings
 PLIST_FILES=	${PROGS:C/^/bin\//}
 
 BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		NEXUS
 OPTIONS_DEFAULT=	NEXUS
 OPTIONS_SUB=		yes
 
 NEXUS_DESC=		Install Nexus (workflow utility) alongside QMCPACK
 NEXUS_CMAKE_BOOL=	INSTALL_NEXUS
 NEXUS_PY_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pyscf>0:science/py-pyscf@${PY_FLAVOR}
 NEXUS_BUILD_DEPENDS=	${NEXUS_PY_DEPENDS}
 NEXUS_RUN_DEPENDS=	${NEXUS_PY_DEPENDS}
 NEXUS_PLIST_FILES=	bin/eshdf \
 			bin/nxs-redo \
 			bin/nxs-sim \
 			bin/nxs-test \
 			bin/qdens \
 			bin/qdens-radial \
 			bin/qmc-fit \
 			bin/qmca
 
 .include <bsd.port.mk>
diff --git a/science/rmf/Makefile b/science/rmf/Makefile
index 8500a6338333..05161abb780f 100644
--- a/science/rmf/Makefile
+++ b/science/rmf/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	rmf
 DISTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library to support reading and writing of Rich Molecular Format files
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec
 
 USES=		compiler:c++17-lang cmake python:build shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	salilab
 
 SHEBANG_GLOB=	*.py
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 do-test:
 	@${RM} ${WRKSRC}/test/*.py
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFREEBSD_BUILS_WITH_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/science/silo/Makefile b/science/silo/Makefile
index 2d575f359636..3838ed19a5d6 100644
--- a/science/silo/Makefile
+++ b/science/silo/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	silo
 PORTVERSION=	4.10.2
 DISTVERSIONSUFFIX=	-bsd
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	science
 MASTER_SITES=	http://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${PORTNAME}/silo-${PORTVERSION}/
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Mesh and field I/O library and scientific database
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USES=		gmake libtool readline
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --disable-static
 INSTALL_TARGET=	install-strip
 
 CONFLICTS_INSTALL=		deforaos-browser # bin/browser
 
 OPTIONS_DEFINE=			FORTRAN HDF5 PYTHON
 OPTIONS_DEFAULT=		HDF5
 OPTIONS_SUB=			yes
 
 FORTRAN_CONFIGURE_ENABLE=	fortran
 FORTRAN_USES=			fortran
 
 HDF5_LIB_DEPENDS=		libhdf5.so:science/hdf5
 HDF5_CFLAGS=			-DH5_USE_110_API=1
 HDF5_CONFIGURE_ON=		--with-hdf5=${LOCALBASE}/include,${LOCALBASE}/lib
 HDF5_PLIST_SUB=			SUFX_HDF5="h5"
 HDF5_PLIST_SUB_OFF=		SUFX_HDF5=""
 
 PYTHON_CONFIGURE_ENABLE=	pythonmodule
 PYTHON_USES=			python
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|\(_Qt_dir/include\)"|\1/qt4"| ; \
 		 s|\(_Qt_dir/lib\)"|\1/qt4"| ; \
 		 s|\(/uic\)"|\1-qt4"| ; \
 		 s|\(/moc\)"|\1-qt4"| ; \
 		 s|\(/lrelease\)"|\1-qt4"| ; \
 		 s|\(/lupdate\)"|\1-qt4"|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		'/-avoid-version/s|^|#| ; \
 		 /^install-data-am/s|:.*|:|' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e \
 		'/-ldl/s|^|#|' ${WRKSRC}/tests/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|@libdir@|@pythondir@|' ${WRKSRC}/tools/python/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|\(INBUILD\));|\1, me);|' ${WRKSRC}/src/hdf5_drv/silo_hdf5.c
 
 .if defined(MAINTAINER_MODE)
 regression-test: build
 	@cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 .endif
 
 .include <bsd.port.mk>
diff --git a/science/votca/Makefile b/science/votca/Makefile
index 6c8ad2ba96bc..88771f5908b2 100644
--- a/science/votca/Makefile
+++ b/science/votca/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	votca
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2022
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
 PATCHFILES=	078c6814797749cd1b92a2b19f0302265ccf6463.patch:-p1 # fix testsuite build
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	CSG and XTP: libraries for atomistic simulations
 
 LICENSE=	APACHE20
 
 BROKEN_i386=	undefined reference to `__atomic_load'
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		rdkit>0:science/rdkit
 BUILD_DEPENDS=	bash:shells/bash \
 		lmp:science/lammps \
 		${PY_DEPENDS}
 LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
 		libecpint.so:science/libecpint \
 		libexpat.so:textproc/expat2 \
 		libfftw3.so:math/fftw3 \
 		libgromacs_d.so:science/gromacs \
 		libhdf5.so:science/hdf5 \
 		libint2.so:science/libint2 \
 		libsz.so:science/libaec \
 		libxc.so:science/libxc
 RUN_DEPENDS=	bash:shells/bash \
 		${PYNUMPY} \
 		${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		cmake compiler:c++14-lang eigen:3 perl5 pkgconfig python:run \
 		shebangfix
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 SHEBANG_GLOB=	*.sh *.pl *.py
 SHEBANG_FILES=	csg/scripts/csg_call.in csg/scripts/csg_inverse.in \
 		tools/scripts/votca_compare.in tools/scripts/votca_help2doc.in \
 		xtp/scripts/xtp_update_mapfile.in xtp/scripts/xtp_basisset.in xtp/share/benchmark/xtp_benchmark.in xtp/scripts/xtp_autogen_mapping.in \
 		xtp/scripts/xtp_modify_jobfile.in \
 		xtp/scripts/xtp_qmmm2qm.in
 
 CMAKE_ON=	BUILD_XTP
 CMAKE_ARGS=	-DLOCALBASE=${LOCALBASE} -DPython_EXECUTABLE=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		APPS
 OPTIONS_DEFAULT=	APPS
 OPTIONS_SUB=		yes
 
 APPS_DESC=		Build applications
 APPS_CMAKE_BOOL=	BUILD_CSGAPPS
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DENABLE_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile
index f45ae5d8ddca..6d199d4a5c89 100644
--- a/sysutils/slurm-wlm/Makefile
+++ b/sysutils/slurm-wlm/Makefile
@@ -1,136 +1,136 @@
 PORTNAME=	slurm
 DISTVERSION=	20.02.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	https://download.schedmd.com/slurm/
 PKGNAMESUFFIX=	-wlm
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple Linux Utility for Resource Management
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 NOT_FOR_ARCHS=		armv6 armv7 i386 mips powerpc powerpcspe
 NOT_FOR_ARCHS_REASON=	32-bit support is deprecated
 
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libsysinfo.so:devel/libsysinfo \
 		libmunge.so:security/munge \
 		liblz4.so:archivers/liblz4
 
 USES=		compiler:c11 cpe gmake gnome libtool localbase lua pkgconfig \
 		python:build readline shebangfix ssl tar:bz2
 CPE_VENDOR=	schedmd
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	slurmctld slurmd
 
 USERS=		slurm
 GROUPS=		${USERS}
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 SHEBANG_FILES=	doc/html/shtml2html.py doc/man/man2html.py
 
 OPTIONS_DEFINE=		CURL DOCS GUI HDF5 HWLOC IPMI MYSQL RRD
 OPTIONS_DEFAULT=	HDF5 HWLOC
 OPTIONS_SUB=		yes
 
 CURL_DESC=	Require cURL for elasticsearch plugins
 GUI_DESC=	Build sview GUI config tool
 HDF5_DESC=	Job profiling using HDF5
 HWLOC_DESC=	Portable hardware locality
 IPMI_DESC=	IPMI energy consumption accounting
 RRD_DESC=	RRD external sensor data collection
 
 DOCS_BUILD_DEPENDS=	man2html:textproc/man2html
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	libcurl
 
 GUI_USE=		GNOME=cairo,gdkpixbuf2,glib20,gtk20
 GUI_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 GUI_USES=		gettext
 GUI_CONFIGURE_ENABLE=	glibtest gtktest x11
 # Neither of these work.  See post-patch below.
 #GTK2_CONFIGURE_ENV_OFF=	ac_gtk_test=no
 #GTK2_CONFIGURE_OFF=	--disable-gtktest
 
 HDF5_LIB_DEPENDS=	libhdf5_cpp.so:science/hdf5 \
 			libsz.so:science/libaec
 HDF5_CONFIGURE_WITH=	hdf5
 HDF5_CONFIGURE_ENV=	H5CC=${LOCALBASE}/bin/h5cc
 
 HWLOC_LIB_DEPENDS=	libhwloc.so.15:devel/hwloc2
 HWLOC_CONFIGURE_WITH=	hwloc
 
 IPMI_LIB_DEPENDS=	libfreeipmi.so:sysutils/freeipmi
 IPMI_CONFIGURE_WITH=	freeipmi
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_OFF=	--with-mysql_config=/nonexistent
 
 RRD_LIB_DEPENDS=	librrd.so:databases/rrdtool
 RRD_CONFIGURE_WITH=	rrdtool
 
 # --docdir is non-functional
 # CONFIGURE_ARGS=	--docdir=${DOCSDIR}
 # FreeBSD Infiniband support is still experimental
 # slurmrestd does not build on FreeBSD
 CONFIGURE_ARGS=	--without-ofed --disable-slurmrestd
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
 
 CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include -fcommon
 LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lprocstat -fcommon
 
 # Hack around nonfunctional --disable-gtktest flag
 pre-configure-GUI-off:
 	@${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \
 		${WRKSRC}/configure
 
 # SLURM's configure enables interactive jobs if pty.h exists.  Replacing
 # #include <pty.h> with appropriate headers will therefore not work, so instead
 # add a pty.h for the build.
 pre-configure:
 	@${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm
 	@${REINPLACE_CMD} -e 's|sched_setaffinity|cpuset_setaffinity|g' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/configure
 
 	@${REINPLACE_CMD} -e 's|"/proc|"/compat/linux/proc|g' \
 		-e 's|(/proc)|(/compat/linux/proc)|g' \
 		${WRKSRC}/src/slurmd/slurmstepd/req.c \
 		${WRKSRC}/src/slurmd/slurmstepd/pdebug.c \
 		${WRKSRC}/src/slurmd/common/xcpuinfo.c \
 		${WRKSRC}/src/slurmd/common/xcgroup.c \
 		${WRKSRC}/src/slurmd/common/set_oomadj.c \
 		${WRKSRC}/src/slurmd/common/proctrack.c \
 		${WRKSRC}/src/common/callerid.c \
 		${WRKSRC}/src/plugins/task/affinity/affinity.c \
 		${WRKSRC}/src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c \
 		${WRKSRC}/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c \
 		${WRKSRC}/src/plugins/jobacct_gather/common/common_jag.c \
 		${WRKSRC}/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c \
 		${WRKSRC}/src/plugins/switch/cray_aries/scaling.c \
 		${WRKSRC}/src/plugins/proctrack/cray_aries/proctrack_cray_aries.c \
 		${WRKSRC}/src/plugins/proctrack/cgroup/proctrack_cgroup.c \
 		${WRKSRC}/src/plugins/proctrack/pgid/proctrack_pgid.c \
 		${WRKSRC}/src/plugins/proctrack/linuxproc/kill_tree.c \
 		${WRKSRC}/src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c \
 		${WRKSRC}/src/plugins/node_features/knl_generic/node_features_knl_generic.c \
 		${WRKSRC}/contribs/cray/pam_job.c
 
 	@if ${WHICH} sbatch > /dev/null; then \
 		${ECHO_CMD} "********************************************"; \
 		${ECHO_CMD} "Build may fail while slurm-wlm is installed."; \
 		${ECHO_CMD} "Deinstall slurm-wlm and run make again."; \
 		${ECHO_CMD} "********************************************"; \
 		false; \
 	fi
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/slurm.conf.example \
 		${STAGEDIR}${PREFIX}/etc/slurm.conf.sample
 
 .include <bsd.port.mk>