diff --git a/cad/appcsxcad/Makefile b/cad/appcsxcad/Makefile
index eeacd1ff5ed4..5d9e2e08c5c8 100644
--- a/cad/appcsxcad/Makefile
+++ b/cad/appcsxcad/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	appcsxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.2-9
 DISTVERSIONSUFFIX=	-g97ba30e
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Minimal GUI Application using the QCSXCAD library
 WWW=		https://github.com/thliebig/AppCSXCAD
 
 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
+		libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
 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
+CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
 
 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 <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/csxcad/Makefile b/cad/csxcad/Makefile
index 4c2563b0c173..1830a6ad817f 100644
--- a/cad/csxcad/Makefile
+++ b/cad/csxcad/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	csxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.2-109
 DISTVERSIONSUFFIX=	-gcd9decb
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library to describe geometrical objects
 WWW=		https://github.com/thliebig/CSXCAD
 
 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
+		libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
 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
+		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index b9c939f64ac6..16c5269f22fe 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -1,184 +1,183 @@
 PORTNAME=	opencascade
 PORTVERSION=	7.6.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	cad science
 MASTER_SITES=	LOCAL/thierry
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Open CASCADE Technology, 3D modeling & numerical simulation
 WWW=		https://www.opencascade.org/
 
 LICENSE=	OCTPL
 LICENSE_NAME=	LGPL21 with exception
 LICENSE_FILE=	${WRKSRC}/OCCT_LGPL_EXCEPTION.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	rapidjson>0:devel/rapidjson			\
 		${LOCALBASE}/lib/qt5/bin/qmake:devel/qt5-qmake	\
 		${LOCALBASE}/lib/qt5/bin/moc:devel/qt5-buildtools
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig	\
 		libfreetype.so:print/freetype2		\
 		libexpat.so:textproc/expat2		\
 		libpng16.so:graphics/png		\
-		libvtksys-${VTKVER}.so:math/vtk${VTKVER:R}
+		libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R}
 RUN_DEPENDS=	bash:shells/bash
 
 # Check ${WRKSRC}/dox/overview/overview.md
 # and ${WRKSRC}/dox/dev_guides/building
 USES=		alias:10 cmake compiler:c++14-lang dos2unix gettext-runtime	\
 		gl gnome localbase python qt:5 shebangfix tk tar:tgz xorg
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xi xmu xrender xscrnsaver xt
 USE_GL=		egl gl glesv2 glu
 USE_GNOME=	libxml2
 
 DOS2UNIX_FILES=	adm/templates/*
 SHEBANG_FILES=	adm/templates/*.sh	\
 		adm/templates/*.sh.in	\
 		adm/templates/*.sh.main	\
 		adm/genconf.tcl		\
 		adm/start.tcl		\
 		gendoc
 ENVSH=		adm/templates/env.sh
 
-VTKVER=		9.1
-
 OPTIONS_DEFINE=	DOCS DOXYGEN FFMPEG VIS
 VIS_DESC=	Build Visualizazion module (requires OpenGL, freetype, ftgl)
 OPTIONS_DEFAULT=FFMPEG VIS
 OPTIONS_SUB=	yes
 
 REINPLACE_ARGS=	-i ""
 LDFLAGS+=	-Wl,--allow-shlib-undefined -lexecinfo
 CMAKE_ARGS+=	-DINSTALL_DIR=${OCCROOT}				\
 		-DINSTALL_DIR_INCLUDE=${PREFIX}/include/OpenCASCADE	\
 		-DINSTALL_DIR_LIB=${PREFIX}/lib				\
 		-DINSTALL_DIR_CMAKE=${PREFIX}/lib/cmake			\
 		-DINSTALL_DIR_DATA=${OCCROOT}/data			\
 		-DINSTALL_DIR_RESOURCE=${OCCROOT}/resources		\
 		-DINSTALL_DIR_SAMPLES=${OCCROOT}/samples		\
 		-DINSTALL_DIR_TESTS=${OCCROOT}/tests			\
 		-DINSTALL_TEST_CASES:BOOL=ON				\
 		-DUSE_FREETYPE:BOOL=ON					\
 		-DUSE_TBB:BOOL=OFF					\
 		-DUSE_RAPIDJSON:BOOL=ON					\
 		-DUSE_VTK:BOOL=ON					\
-		-D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTKVER}
+		-D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTK_VER}
 CONFIGURE_ENV+=	DESTDIR=${STAGEDIR}
 
 .if defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-DCMAKE_MESSAGE_CONTEXT_SHOW:BOOL=ON	\
 		-DCMAKE_MESSAGE_LOG_LEVEL:STRING=DEBUG
 .endif
 
 # TODO: TBB to be replaced by onetbb later
 #CMAKE_ARGS+=	-DUSE_EIGEN:BOOL=ON -DUSE_TBB:BOOL=ON
 #USES+=		eigen:3
 #LIB_DEPENDS+=	libtbb.so:devel/tbb
 
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	opencascade740 # OpenCAS/bin/DRAWEXE
 
 LOCCROOT=	OpenCAS
 OCCROOT=	${PREFIX}/${LOCCROOT}
 PLIST_SUB=	OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE}	\
 		VE=${PORTVERSION:R:R} VER=${PORTVERSION}
 
 FFMPEG_CMAKE_ON=	-DUSE_FFMPEG:BOOL=ON
 FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=OFF
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg		\
 			libtheoraenc.so:multimedia/libtheora	\
 			libunistring.so:devel/libunistring	\
 			libvdpau.so:multimedia/libvdpau		\
 			libxvidcore.so:multimedia/xvid		\
 			libp11-kit.so:security/p11-kit		\
 			libx264.so:multimedia/libx264		\
 			libtasn1.so:security/libtasn1		\
 			libvorbis.so:audio/libvorbis		\
 			libdav1d.so:multimedia/dav1d		\
 			libnettle.so:security/nettle		\
 			libgnutls.so:security/gnutls		\
 			libvpx.so:multimedia/libvpx		\
 			libx265.so:multimedia/x265		\
 			libdrm.so:graphics/libdrm		\
 			libva.so:multimedia/libva		\
 			libaom.so:multimedia/aom		\
 			libmp3lame.so:audio/lame		\
 			libffi.so:devel/libffi			\
 			libidn2.so:dns/libidn2			\
 			libogg.so:audio/libogg			\
 			libopus.so:audio/opus			\
 			libgmp.so:math/gmp
 
 VIS_CMAKE_ON=		-DUSE_FREEIMAGE:BOOL=ON	\
 			-DUSE_GLES2:BOOL=ON	\
 			-D3RDPARTY_FREETYPE_DIR=${LOCALBASE}
 VIS_CMAKE_OFF=		-DUSE_FREEIMAGE:BOOL=OFF	\
 			-DUSE_GLES2:BOOL=OFF
 VIS_LIB_DEPENDS=	libftgl.so:graphics/ftgl	\
 			libfreeimageplus.so:graphics/freeimage
 VIS_USE=		GL=glesv2
 
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_USE=	TEX=latex:build
 DOXYGEN_BUILD_DEPENDS=	bash:shells/bash		\
 			doxygen:devel/doxygen		\
 			dot:graphics/graphviz		\
 			pdftex:print/tex-basic-engines	\
 			inkscape:graphics/inkscape
 DOXYGEN_RUN_DEPENDS=	${LOCALBASE}/www/MathJax/MathJax.js:www/mathjax
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == mips || ${ARCH} == powerpc || ${ARCH} == powerpcspe || ${ARCH} == "i386"
 BITS=	32
 .else
 BITS=	64
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Warning: to build OpenCascade, you should have at least"
 	@${ECHO_MSG} "2.6 Gb of free disk space in build area!"
 	@${ECHO_MSG}
 
 pre-patch:
 	${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/src/BRepMesh/delabella.cpp\
 		${WRKSRC}/src/OSD/OSD_MemInfo.cxx
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|' ${WRKSRC}/gendoc
 	${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|' ${WRKSRC}/adm/genconfdeps.tcl
 	${GREP} -rl x86_64 ${WRKSRC} | ${XARGS} ${REINPLACE_CMD}	\
 		-e 's|x86_64|amd64|'
 .for es in ${ENVSH}
 	${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es}
 .endfor
 
 post-build-DOXYGEN-on:
 	(cd ${WRKSRC} && ./gendoc -overview)
 
 post-install:
 	${MV} ${STAGEDIR}${OCCROOT}/bin/DRAWEXE-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/DRAWEXE
 	(cd ${STAGEDIR}${PREFIX}/bin &&							\
 	${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bin/DRAWEXE)
 
 post-install-DOXYGEN-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/overview && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${RM} -r ${STAGEDIR}${DOCSDIR}/latex
 	${RM} ${STAGEDIR}${DOCSDIR}/html/build_upgrade_building_3rdparty.html.bak
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 	${RM} -rf /tmp/testOCC
 	${MKDIR} /tmp/testOCC
 	bash -c "\
 	cd ${OCCROOT} && . ${OCCROOT}/bin/env.sh &&	\
 	CSF_TestScriptsPath=${OCCROOT}/tests		\
 	CSF_TestDataPath=${OCCROOT}/data		\
 	DRAWEXE -f ${FILESDIR}/regtest "
 .endif
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/qcsxcad/Makefile b/cad/qcsxcad/Makefile
index 8fc566507178..6dfa29d35df1 100644
--- a/cad/qcsxcad/Makefile
+++ b/cad/qcsxcad/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	qcsxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.2-9
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g3f09a8b
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Qt-GUI for CSXCAD
 WWW=		https://github.com/thliebig/QCSXCAD
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libCSXCAD.so:cad/csxcad \
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libpng16.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libtinyxml.so:textproc/tinyxml \
-		libvtkCommonCore-9.1.so:math/vtk9
+		libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
 USES=		cmake gl jpeg pkgconfig qt:5 xorg
 USE_QT=		core gui opengl sql widgets xml buildtools:build qmake:build
 USE_XORG=	ice sm x11 xext xt
 USE_GL=		gl opengl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	thliebig
 GH_PROJECT=	${PORTNAME:tu}
 
-CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1
+CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/qcsxcad/files/patch-QVTKStructure.cpp b/cad/qcsxcad/files/patch-QVTKStructure.cpp
new file mode 100644
index 000000000000..4036157911b4
--- /dev/null
+++ b/cad/qcsxcad/files/patch-QVTKStructure.cpp
@@ -0,0 +1,145 @@
+- workaround for https://github.com/thliebig/QCSXCAD/issues/10
+
+--- QVTKStructure.cpp.orig	2022-10-23 18:25:43 UTC
++++ QVTKStructure.cpp
+@@ -113,12 +113,12 @@ QVTKStructure::QVTKStructure()
+ #endif
+ 
+ 	ren = vtkRenderer::New();
+-	VTKWidget->GetRenderWindow()->AddRenderer(ren);
++	VTKWidget->renderWindow()->AddRenderer(ren);
+ 
+ 	AddAxes();
+ 	SetBackgroundColor(255,255,255);
+ 
+-	SetCallback(VTKWidget->GetRenderWindow()->GetInteractor());
++	SetCallback(VTKWidget->renderWindow()->GetInteractor());
+ }
+ 
+ QVTKStructure::~QVTKStructure()
+@@ -137,7 +137,7 @@ void QVTKStructure::AddAxes()
+ 	marker->SetOrientationMarker(assembly);
+ 	marker->SetViewport(0.0,0.0,0.25,0.25);
+ 
+-	marker->SetInteractor(VTKWidget->GetRenderWindow()->GetInteractor());
++	marker->SetInteractor(VTKWidget->renderWindow()->GetInteractor());
+ 	marker->SetEnabled(1);
+ 	marker->InteractiveOff();
+ 
+@@ -159,7 +159,7 @@ void QVTKStructure::SetBackgroundColor(int r, int g, i
+ 	{
+ 		if (ActorGridPlane[i]!=NULL) ActorGridPlane[i]->GetProperty()->SetColor(irgb);
+ 	}
+-    VTKWidget->GetRenderWindow()->GetInteractor()->Render();
++    VTKWidget->renderWindow()->GetInteractor()->Render();
+ }
+ 
+ void QVTKStructure::SetGeometry(ContinuousStructure *CS)
+@@ -277,20 +277,20 @@ void QVTKStructure::RenderGrid()
+ void QVTKStructure::RenderGridX(int plane_pos)
+ {
+ 	RenderGridDir(0,plane_pos);
+-	VTKWidget->GetRenderWindow()->GetInteractor()->Render();
++	VTKWidget->renderWindow()->GetInteractor()->Render();
+ }
+ 
+ void QVTKStructure::RenderGridY(int plane_pos)
+ {
+ 	RenderGridDir(1,plane_pos);
+-	VTKWidget->GetRenderWindow()->GetInteractor()->Render();
++	VTKWidget->renderWindow()->GetInteractor()->Render();
+ 
+ }
+ 
+ void QVTKStructure::RenderGridZ(int plane_pos)
+ {
+ 	RenderGridDir(2,plane_pos);
+-	VTKWidget->GetRenderWindow()->GetInteractor()->Render();
++	VTKWidget->renderWindow()->GetInteractor()->Render();
+ }
+ 
+ void QVTKStructure::RenderGridDir(int dir, unsigned int plane_pos)
+@@ -413,13 +413,13 @@ void QVTKStructure::SetGridOpacity(int val)
+ 	{
+ 		if (ActorGridPlane[i]!=NULL) ActorGridPlane[i]->GetProperty()->SetOpacity((double)val/255.0);
+ 	}
+-	VTKWidget->GetRenderWindow()->GetInteractor()->Render();
++	VTKWidget->renderWindow()->GetInteractor()->Render();
+ }
+ 
+ void QVTKStructure::ResetView()
+ {
+ 	ren->ResetCamera();
+-    VTKWidget->GetRenderWindow()->GetInteractor()->Render();
++    VTKWidget->renderWindow()->GetInteractor()->Render();
+ }
+ 
+ void QVTKStructure::setXY()
+@@ -472,7 +472,7 @@ void QVTKStructure::SetPropOpacity(unsigned int uiID, 
+ 			if (LayerPrimitives.at(i).VTKProp!=NULL) LayerPrimitives.at(i).VTKProp->SetOpacity2All((double)val/255.0);
+ 		}
+ 	}
+-	VTKWidget->GetRenderWindow()->GetInteractor()->Render();
++	VTKWidget->renderWindow()->GetInteractor()->Render();
+ }
+ 
+ void QVTKStructure::RenderGeometry()
+@@ -679,7 +679,7 @@ void QVTKStructure::RenderGeometry()
+ 			}
+ 		}
+ 	}
+-	VTKWidget->GetRenderWindow()->GetInteractor()->Render();
++	VTKWidget->renderWindow()->GetInteractor()->Render();
+ }
+ 
+ void QVTKStructure::RenderDiscMaterialModel()
+@@ -716,7 +716,7 @@ void QVTKStructure::RenderDiscMaterialModel()
+ 			delete transform;
+ 		}
+ 	}
+-	VTKWidget->GetRenderWindow()->GetInteractor()->Render();
++	VTKWidget->renderWindow()->GetInteractor()->Render();
+ }
+ 
+ void QVTKStructure::SetParallelProjection(bool val, bool render)
+@@ -725,18 +725,18 @@ void QVTKStructure::SetParallelProjection(bool val, bo
+ 	cam->SetParallelProjection(val);
+ 
+ 	if (render)
+-		VTKWidget->GetRenderWindow()->GetInteractor()->Render();
++		VTKWidget->renderWindow()->GetInteractor()->Render();
+ }
+ 
+ void QVTKStructure::Set2DInteractionStyle(bool val, bool render)
+ {
+ 	if (val)
+-		VTKWidget->GetRenderWindow()->GetInteractor()->SetInteractorStyle(vtkInteractorStyleRubberBand2DPlane::New());
++		VTKWidget->renderWindow()->GetInteractor()->SetInteractorStyle(vtkInteractorStyleRubberBand2DPlane::New());
+ 	else
+-		VTKWidget->GetRenderWindow()->GetInteractor()->SetInteractorStyle(vtkInteractorStyleTrackballCamera::New());
++		VTKWidget->renderWindow()->GetInteractor()->SetInteractorStyle(vtkInteractorStyleTrackballCamera::New());
+ 
+ 	if (render)
+-		VTKWidget->GetRenderWindow()->GetInteractor()->Render();
++		VTKWidget->renderWindow()->GetInteractor()->Render();
+ }
+ 
+ void QVTKStructure::SaveCamData()
+@@ -765,7 +765,7 @@ void QVTKStructure::RestoreCamData(bool render)
+ 	Camera->Modified();
+ 
+ 	if (render)
+-		VTKWidget->GetRenderWindow()->GetInteractor()->Render();
++		VTKWidget->renderWindow()->GetInteractor()->Render();
+ }
+ 
+ 
+@@ -777,7 +777,7 @@ void QVTKStructure::ExportView2Image()
+ 		return;
+ 
+ 	vtkWindowToImageFilter* filter = vtkWindowToImageFilter::New();
+-	filter->SetInput(VTKWidget->GetRenderWindow());
++	filter->SetInput(VTKWidget->renderWindow());
+ 
+ 	vtkPNGWriter* png_writer= vtkPNGWriter::New();
+ 	png_writer->SetInputConnection(filter->GetOutputPort());
diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile
index ca1d9e58fc2d..1596606bff82 100644
--- a/graphics/cloudcompare/Makefile
+++ b/graphics/cloudcompare/Makefile
@@ -1,91 +1,92 @@
 PORTNAME=	cloudcompare
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.12.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	3D point cloud processing software
 WWW=		https://www.cloudcompare.org/
 
 LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi
 
 USES=		cmake compiler:c++11-lang localbase:ldflags qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	CloudCompare
 GH_PROJECT=	${GH_ACCOUNT}
 GH_TUPLE=	CloudCompare:CCCoreLib:f0d5450:CloudCompare/libs/qCC_db/extern/CCCoreLib
 
 USE_QT=		concurrent core gui opengl printsupport widgets buildtools:build qmake:build svg linguisttools:build
 USE_LDCONFIG=	yes
 
 # PDAL support disabled ATM
 # plugins/core/IO/qPDALIO/src/LASFilter.cpp:1360:24: error: no member named 'incompatibleSrs' in 'pdal::LasHeader'
 OPTIONS_DEFINE=	DXFLIB GAMEPAD GDAL PLUGINS SHAPELIB
 OPTIONS_DEFAULT=DXFLIB GAMEPAD GDAL PLUGINS SHAPELIB
 OPTIONS_SUB=	yes
 
 DXFLIB_DESC=	Enable AutoCAD DXF file support
 GAMEPAD_DESC=	Enable Qt gamepad support
 GDAL_DESC=	Enable raster file support
 PDAL_DESC=	Enable point cloud data support
 SHAPELIB_DESC=	Enable shape file support
 
 DXFLIB_CMAKE_BOOL=	OPTION_USE_DXF_LIB
 
 GAMEPAD_USE=		QT=gamepad
 GAMEPAD_CMAKE_BOOL=	OPTION_SUPPORT_GAMEPADS
 
 GDAL_CMAKE_BOOL=	OPTION_USE_GDAL
 GDAL_CMAKE_ON=		-DGDAL_INCLUDE_DIR=${PREFIX}/include \
 			-DGDAL_LIBRARY=${PREFIX}/lib/libgdal.so
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 
 PDAL_CMAKE_BOOL=	PLUGIN_IO_QPDAL
 PDAL_CMAKE_ON=		-DJSON_ROOT_DIR=${PREFIX}/include/jsoncpp
 PDAL_LIB_DEPENDS=	libpdal_base.so:math/pdal
 
 SHAPELIB_CMAKE_BOOL=	OPTION_USE_SHAPE_LIB
 SHAPELIB_LIB_DEPENDS=	libshp.so:devel/shapelib
 
 PLUGINS_USES=		eigen:3 gl jpeg xorg
 PLUGINS_CMAKE_BOOL=	PLUGIN_STANDARD_QANIMATION	\
 			PLUGIN_STANDARD_QBROOM		\
 			PLUGIN_STANDARD_QCOMPASS	\
 			PLUGIN_STANDARD_QCSF		\
 			PLUGIN_IO_QCSV_MATRIX		\
 			PLUGIN_GL_QEDL			\
 			PLUGIN_STANDARD_QFACETS		\
 			PLUGIN_STANDARD_QHPR		\
 			PLUGIN_STANDARD_QM3C2		\
 			PLUGIN_STANDARD_QPCV		\
 			PLUGIN_IO_QPHOTOSCAN		\
 			PLUGIN_STANDARD_QRANSAC_SD	\
 			PLUGIN_STANDARD_QSRA		\
 			PLUGIN_GL_QSSAO # plugins requiring rare external libs are left out, TODO maybe add some of them?
 PLUGINS_CMAKE_ON=	-DEIGEN_ROOT_DIR:BOOL=${LOCALBASE}/include/eigen3
 PLUGINS_CXXFLAGS=	${PLUGINS_CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
 PLUGINS_CXXFLAGS_clang=	-Wno-narrowing
 PLUGINS_CXXFLAGS+=	-DEIGEN_DONT_PARALLELIZE # OpenMP is broken in cmake: see bug#223678
 PLUGINS_USE=		XORG=ice,sm,x11,xext,xt GL=gl,glu
 PLUGINS_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 			libexpat.so:textproc/expat2 \
 			libflann_cpp.so:math/flann \
 			libfreetype.so:print/freetype2 \
 			libpng.so:graphics/png \
 			libtiff.so:graphics/tiff \
-			libvtkCommonCore-9.1.so:math/vtk9
+			libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 PLUGINS_IMPLIES=	SHAPELIB
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},1' ${WRKSRC}/snap/gui/ccViewer.desktop ${WRKSRC}/snap/gui/cloudcompare.desktop
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/snap/gui/ccViewer.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/snap/gui/ccViewer.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/snap/gui/cloudcompare.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/snap/gui/cloudcompare.png ${STAGEDIR}${PREFIX}/share/pixmaps
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile
index e760e0d066a7..863f080022cf 100644
--- a/graphics/f3d/Makefile
+++ b/graphics/f3d/Makefile
@@ -1,60 +1,65 @@
 PORTNAME=	f3d
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast and minimalist 3D viewer
 WWW=		https://f3d-app.github.io/f3d/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreeimage.so:graphics/freeimage \
+		libfreetype.so:print/freetype2 \
 		libhdf5.so:science/hdf5 \
+		libImath-3_1.so:math/Imath \
 		libnetcdf.so:science/netcdf \
-		libvtkCommonMisc-9.1.so:math/vtk9
+		libvtkCommonMisc-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
-USES=		cmake:testing compiler:c++17-lang desktop-file-utils gl xorg
+USES=		cmake:testing compiler:c++17-lang desktop-file-utils gl tcl tk xorg
 USE_GL=		gl glu
 USE_XORG=	ice sm x11 xt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	f3d-app
 
 OPTIONS_GROUP=			MODULES
 OPTIONS_GROUP_MODULES=		ALEMBIC ASSIMP EXODUS EXTERNAL_RENDERING OCCT RAYTRACING
 OPTIONS_DEFAULT=		ALEMBIC ASSIMP EXODUS OCCT
 
 MODULES_DESC=			Build modules:
 
 ALEMBIC_DESC=			Alembic module (ABC files)
 ALEMBIC_CMAKE_BOOL=		F3D_MODULE_ALEMBIC
 ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic
 
 ASSIMP_DESC=			Assimp module (FBX, OFF, DAE and DXF files)
 ASSIMP_CMAKE_BOOL=		F3D_MODULE_ASSIMP
 ASSIMP_LIB_DEPENDS=		libassimp.so:multimedia/assimp
 
 EXODUS_DESC=			ExodusII module
 EXODUS_CMAKE_BOOL=		F3D_MODULE_EXODUS
 
 EXTERNAL_RENDERING_DESC=	External rendering module
 EXTERNAL_RENDERING_CMAKE_BOOL=	F3D_MODULE_EXTERNAL_RENDERING
 EXTERNAL_RENDERING_BROKEN=	Requires VTK::RenderingExternal enabled in VTK
 
 OCCT_DESC=			OpenCASCADE module (STEP and IGES files)
 OCCT_USES=			localbase:ldflags
 OCCT_CMAKE_BOOL=		F3D_MODULE_OCCT
 OCCT_LIB_DEPENDS=		libTKBRep.so:cad/opencascade
 OCCT_CMAKE_ON=			-DOpenCASCADE_DIR=${LOCALBASE}/lib/cmake
 
 RAYTRACING_DESC=		Raytracing module
 RAYTRACING_CMAKE_BOOL=		F3D_MODULE_RAYTRACING
 RAYTRACING_BROKEN=		Requires VTK::RenderingRayTracing enabled in VTK
 
 post-install:
 	@${RM} -r ${STAGEDIR}${DOCSDIR}
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/mirtk/Makefile b/graphics/mirtk/Makefile
index 95ab382b3636..c61b9cb48a22 100644
--- a/graphics/mirtk/Makefile
+++ b/graphics/mirtk/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	mirtk
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.0-178
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=	-g973ce2f
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Medical Image Registration ToolKit (MIRTK)
 WWW=		https://mirtk.github.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		nifticlib>0:science/nifticlib
 LIB_DEPENDS=	libpng16.so:graphics/png
 
 USES=		cmake compiler:c++11-lang eigen:3 perl5 python
 USE_GITHUB=	yes
 GH_ACCOUNT=	BioMedIA
 GH_PROJECT=	${PORTNAME:tu}
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		TBB VTK
 OPTIONS_DEFAULT=	TBB VTK
 
 TBB_DESC=		Build with TBB
 TBB_CMAKE_BOOL=		WITH_TBB
 TBB_LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 VTK_DESC=		Build with the VTK toolkit
 VTK_CMAKE_BOOL=		WITH_VTK
-VTK_LIB_DEPENDS=	libvtkCommonCore-9.1.so:math/vtk9 \
+VTK_LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} \
 			libexpat.so:textproc/expat2
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index db1706d1ce2c..a8d09526279a 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,238 +1,239 @@
 PORTNAME=	opencv
 DISTVERSION=	4.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Open Source Computer Vision library
 WWW=		https://www.opencv.org/
 
 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_LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 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 <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/pcl-pointclouds/Makefile b/graphics/pcl-pointclouds/Makefile
index 00511605899e..0b5962b04a65 100644
--- a/graphics/pcl-pointclouds/Makefile
+++ b/graphics/pcl-pointclouds/Makefile
@@ -1,87 +1,88 @@
 PORTNAME=	pcl
 DISTVERSION=	1.12.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics math
 MASTER_SITES=	https://github.com/PointCloudLibrary/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	-pointclouds
 DISTNAME=	source
 DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}/${DISTVERSION}
 
 PATCH_SITES=	https://github.com/PointCloudLibrary/pcl/commit/
 # backport of patches fixing build
 PATCHFILES=	d253f645f0bfbcd2c818fa5d0a6970c61f39c6b5.patch:-p1 \
 		b220d4b3e259dba0686d0b7cdbff10c668176ded.patch:-p1
 # backport of patches fixing tests
 PATCHFILES+=	ba388061b0f9ed9584e57d6019c30b044a657c3e.patch:-p1 \
 		614e19d96bd8415dbfb52d86df0f3774a9f462fe.patch:-p1 \
 		09c76582b5ff0f2b942609f5c85744f1ce96e332.patch:-p1 \
 		5be6766fbb8f5e9b2fe97a077dd5be53e5fc6983.patch:-p1 \
 		09ea81f995f00b9565037b0fafe121eccfe4cf57.patch:-p1
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Point Cloud Library
 WWW=		https://pointclouds.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BROKEN_i386=		undefined reference to `__atomic_load'
 NOT_FOR_ARCHS=		armv6 armv7
 NOT_FOR_ARCHS_REASON=	common/include/pcl/pcl_macros.h:420:4: error: aligned_malloc not supported on your platform
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libexpat.so:textproc/expat2 \
 		libflann_cpp.so:math/flann \
 		libfreetype.so:print/freetype2 \
 		liblz4.so:archivers/liblz4 \
 		libpcap.so:net/libpcap \
 		libtiff.so:graphics/tiff
 
 USES=		cmake:testing compiler:c++14-lang eigen:3 jpeg localbase:ldflags python xorg
 USE_XORG=	x11 xext xt ice sm
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	google:gtest
 GH_PROJECT=	googletest:gtest
 GH_TAGNAME=	release-1.11.0:gtest
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # workaround, otherwise USE_GITHUB=nodefault doesn't work #'
 
 CMAKE_TESTING_ON=	BUILD_global_tests # 6 tests are known to fail: https://github.com/PointCloudLibrary/pcl/issues/5127
 CMAKE_TESTING_TARGET=	tests
 CMAKE_ARGS=		-DGTEST_SRC_DIR=${WRKSRC_gtest}/googletest -DGTEST_INCLUDE_DIR=${WRKSRC_gtest}/googletest/include
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PLIST_SUB=	SHL3=${DISTVERSION} SHL2=${DISTVERSION:R}
 
 DATADIR=	${PREFIX}/share/${PORTNAME}-${DISTVERSION:R}  # match the directory where the project installs .cmake files
 
 OPTIONS_DEFINE=		OPENGL PNG QHULL QT5 VTK
-OPTIONS_DEFAULT=	PNG # QHULL is disabled due to conflicts qhull8 vs. qhull
+OPTIONS_DEFAULT=	PNG VTK # QHULL is disabled due to conflicts qhull8 vs. qhull
 OPTIONS_SUB=		yes
 
 OPENGL_CMAKE_BOOL=	WITH_OPENGL # it finds OpenGL, but no binaries are linked with it: https://github.com/PointCloudLibrary/pcl/issues/2641
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gl,glu
 
 PNG_CMAKE_BOOL=		WITH_PNG
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 QHULL_DESC=		Include convex-hull operations
 QHULL_CMAKE_BOOL=	WITH_QHULL
 QHULL_LIB_DEPENDS=	libqhull_r.so:math/qhull
 
 QT5_CMAKE_ON=		-DWITH_QT=QT5
 QT5_CMAKE_OFF=		-DWITH_QT=NO
 QT5_BROKEN=		WITH_QT doesn't do anything, should be used by apps, but apps is also broken: see https://github.com/PointCloudLibrary/pcl/issues/2642
 
 VTK_DESC=		Build VTK visualizations
 VTK_USES=		gl qt:5
 VTK_USE=		GL=gl,glu QT=core,gui,opengl,widgets,buildtools:build,qmake:build
 VTK_CMAKE_BOOL=		WITH_VTK
-VTK_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1
-VTK_LIB_DEPENDS=	libvtkCommonCore-9.1.so:math/vtk9
+VTK_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
+VTK_LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile
index 3cf99e3a366a..da3da21e75c7 100644
--- a/graphics/py-mayavi/Makefile
+++ b/graphics/py-mayavi/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	mayavi
 DISTVERSION=	4.8.1
+PORTREVISION=	1
 CATEGORIES=	graphics science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Application and library for 3D visualization and plotting in Python
 WWW=		http://code.enthought.com/pages/mayavi-project.html
 
 LICENSE=			BSD3CLAUSE LGPL21 LGPL20 EPL LGPL3 BSD2CLAUSE APACHE11 # see ${WRKSRC}/image_LICENSE.txt
 LICENSE_COMB=			multi
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE.txt
 LICENSE_FILE_LGPL21=		${WRKSRC}/image_LICENSE_Nuvola.txt
 LICENSE_FILE_LGPL20=		${WRKSRC}/image_LICENSE_CP.txt
 LICENSE_FILE_EPL=		${WRKSRC}/image_LICENSE_Eclipse.txt
 LICENSE_FILE_LGPL3=		${WRKSRC}/image_LICENSE_OOo.txt
 LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/LICENSE_YORICK.txt
 LICENSE_FILE_APACHE11=		${WRKSRC}/LICENSE_COLORBREWER.txt
 
-BUILD_DEPENDS=	vtk9>0:math/vtk9 \
-		${PYNUMPY} \
+BUILD_DEPENDS=	${PYNUMPY} \
 		${PY_SPHINX} \
 		sphinx-build:textproc/py-sphinx@${PY_FLAVOR}
-RUN_DEPENDS=	vtk9>0:math/vtk9 \
-		${PYNUMPY} \
+LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
+RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}apptools>0:devel/py-apptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}envisage>0:devel/py-envisage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyface>=6.1.1:devel/py-pyface@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traits>=6.0.0:devel/py-traits@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitsui>=7.0.0:graphics/py-traitsui@${PY_FLAVOR} # list is in mayavi/__init__.py
 
 USES=		python:3.6+ shebangfix
 USE_PYTHON=	noflavors distutils autoplist # noflavors to force python to be of the same version as in vtk9, which always has default python version
 
 USE_WX=		3.1
 WX_COMPS=	python:run
 
 SHEBANG_FILES=	mayavi/tests/csv_files/csv_2_py
 
 POST_PLIST=	fix-plist
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tvtk/array_ext*.so
 
 fix-plist:
 	@${REINPLACE_CMD} -e "s|${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}/mayavi/preferences/__pycache__$$||" ${TMPPLIST}
 	@${REINPLACE_CMD} -e "s|${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}/tvtk/plugins/scene/__pycache__$$||" ${TMPPLIST}
 
 do-test:
 	@${SETENV} ${TEST_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} ${WRKSRC}/examples/mayavi/interactive/coil_design_application.py
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/py-pyvista/Makefile b/graphics/py-pyvista/Makefile
index a21b438873da..22f6e6bbeb0a 100644
--- a/graphics/py-pyvista/Makefile
+++ b/graphics/py-pyvista/Makefile
@@ -1,26 +1,28 @@
 PORTNAME=	pyvista
 DISTVERSION=	0.34.2
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Pythonic interface to VTK
 WWW=		https://github.com/pyvista/pyvista
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scooby>=0.5.1:devel/py-scooby@${PY_FLAVOR} \
-		vtk9>0:math/vtk9
+		vtk${VTK_VER:R}>0:math/vtk${VTK_VER:R}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile
index bfd29082a0a7..6b6aa3281f70 100644
--- a/math/vtk9/Makefile
+++ b/math/vtk9/Makefile
@@ -1,136 +1,139 @@
 PORTNAME=	vtk
-DISTVERSION=	9.1.0
-PORTREVISION=	8
+DISTVERSION=	9.2.2
 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
 WWW=		https://vtk.org/
 
 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 # mpi4py should be here, but this fails, see https://gitlab.kitware.com/vtk/vtk/-/issues/18693
 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
+		# all modules can be obtailed by: find . -name vtk.module
+		# there's also CMake/vtkWrapSettings.cmake with options
 
 # disable finding Qt6
 CMAKE_ON+=	CMAKE_DISABLE_FIND_PACKAGE_Qt6
 
+# enable all modules
+#CMAKE_ON+=	VTK_BUILD_ALL_MODULES
+
 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.
+OPTIONS_DEFINE=	DESIGNER DOCS OMPI OSMESA PYTHON QT5 EXAMPLES
+OPTIONS_DEFAULT=	OMPI 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
+OMPI_DESC=	OpenMPI (Message Passing Interface) support
 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
+# Option groups that enable groups of modules in VTK
+VTK_GROUPS=		JAVA TCLTK
+OPTIONS_GROUP=		GROUPS
+OPTIONS_GROUP_GROUPS=	${VTK_GROUPS}
+GROUPS_DESC=		Groups
+.for w in ${VTK_GROUPS}
+$w_DESC=		Enable $w group
 .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
+QT5_CMAKE_ON=		-DVTK_GROUP_ENABLE_Qt:STRING=YES \
+			-DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5
+
+#QT6_USES=		qt:6
+#QT6_USE=		QT=base,declarative,tools:build
+#QT6_CMAKE_ON=		-DVTK_GROUP_ENABLE_Qt:STRING=YES \
+			-DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5
 
 DESIGNER_CMAKE_BOOL=	QT_DESIGNER_PLUGIN
 DESIGNER_USE=		QT=designer
 DESIGNER_IMPLIES=	QT5
 
-MPI_CMAKE_BOOL=		VTK_USE_MPI
-#MPI_USES=		mpi:openmpi # fails, needs investigation: The following options helpers are incorrectly set after bsd.port.options.mk and are ineffective: MPI_CFLAGS MPI_LIBS
-MPI_BUILD_DEPENDS=	openmpi>0:net/openmpi
-MPI_RUN_DEPENDS=	openmpi>0:net/openmpi
-MPI_CMAKE_ON=		-DMPIEXEC=${LOCALBASE}/mpi/openmpi/bin/mpiexec
+OMPI_CMAKE_BOOL=	VTK_USE_MPI
+OMPI_USES=		mpi:openmpi
 
 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_BOOL=	VTK_WRAP_JAVA
 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} \
+TCLTK_CMAKE_ON=		-DVTK_GROUP_ENABLE_Tk:STRING=YES \
+			-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
 
-.if ${PORT_OPTIONS:MPYTHON} && ${PORT_OPTIONS:MMPI}
+.if ${PORT_OPTIONS:MPYTHON} && ${PORT_OPTIONS:MOMPI}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 .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
 	# workaround for: VTK installs mpi4py which makes it to conflict with the standalone mpi4py package, see https://gitlab.kitware.com/vtk/vtk/-/issues/18691
 	@${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/mpi4py
 
 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/math/vtk9/distinfo b/math/vtk9/distinfo
index cfc8330ff50a..8985e4d4b042 100644
--- a/math/vtk9/distinfo
+++ b/math/vtk9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637434253
-SHA256 (VTK-9.1.0.tar.gz) = 8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96
-SIZE (VTK-9.1.0.tar.gz) = 47871165
+TIMESTAMP = 1665288935
+SHA256 (VTK-9.2.2.tar.gz) = 1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075
+SIZE (VTK-9.2.2.tar.gz) = 53801737
diff --git a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c
deleted file mode 100644
index e52da58e3878..000000000000
--- a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.orig	2022-06-22 15:58:58.543731000 +0200
-+++ ThirdParty/exodusII/vtkexodusII/src/ex_utils.c	2022-06-22 16:00:28.263448000 +0200
-@@ -1770,7 +1770,9 @@
-         */
- 
-         /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */
-+#if !defined(NC_SZIP_NN)
-         const int NC_SZIP_NN = 32;      /* Selects nearest neighbor coding method for szip. */
-+#endif
-         /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */
-         const int SZIP_PIXELS_PER_BLOCK =
-             file->compression_level == 0 ? 32 : file->compression_level;
diff --git a/math/vtk9/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c b/math/vtk9/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c
deleted file mode 100644
index bd453a0dc9ca..000000000000
--- a/math/vtk9/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ThirdParty/libproj/vtklibproj/src/pj_mutex.c.orig	2020-04-25 01:23:01 UTC
-+++ ThirdParty/libproj/vtklibproj/src/pj_mutex.c
-@@ -124,7 +124,7 @@ void pj_acquire_lock()
-         pthread_mutex_lock( &pj_precreated_lock);
- 
-         pthread_mutexattr_init(&mutex_attr);
--#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
-+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE) || defined(__FreeBSD__)
-         pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
- #else
-         pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
diff --git a/science/avogadrolibs/Makefile b/science/avogadrolibs/Makefile
index d7d8859067ea..dd2f0f21d2a2 100644
--- a/science/avogadrolibs/Makefile
+++ b/science/avogadrolibs/Makefile
@@ -1,76 +1,78 @@
 PORTNAME=	avogadrolibs
 DISTVERSION=	1.97.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Avogadro2 libraries for chemical editor and visualization applications
 WWW=		https://www.openchemistry.org/projects/avogadro2/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	googletest>0:devel/googletest \
 		molequeue>0:misc/molequeue
 
 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:73a5bbc: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 OPENGL QT5 SPGLIB # MMTF
 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
 MMTF_BROKEN=		see https://github.com/OpenChemistry/avogadrolibs/issues/1185
 
 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_USES=		xorg
 VTK_USE=		QT=opengl XORG=x11
 VTK_CMAKE_BOOL=		USE_VTK
-VTK_LIB_DEPENDS=	libvtksys-9.1.so:math/vtk9 \
+VTK_LIB_DEPENDS=	libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R} \
 			libfreetype.so:print/freetype2
 VTK_IMPLIES=		QT5
 VTK_BROKEN=		Needs https://github.com/psavery/genXrdPattern, see https://github.com/OpenChemistry/avogadrolibs/issues/1186
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile
index 30a7b9adef4a..186720eed33f 100644
--- a/science/elmerfem/Makefile
+++ b/science/elmerfem/Makefile
@@ -1,118 +1,119 @@
 PORTNAME=	elmerfem
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 
 MAINTAINER=	henrik@gulbra.net
 COMMENT=	Multiphysical simulation software
 WWW=		https://www.csc.fi/web/elmer
 
 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
+			libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R}
 OCC_USES=		python
 OCC_CMAKE_BOOL=		WITH_OCC
 OCC_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.0 \
 			-DPython3_EXECUTABLE=${PYTHON_CMD}
 
 _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 <../../math/vtk9/Makefile.version>
 .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-configure:
 	# workaround for https://github.com/ElmerCSC/elmerfem/issues/334
 	@${REINPLACE_CMD} -e 's| -lMPI::MPI_C | |' ${BUILD_WRKSRC}/ElmerGUI/Application/CMakeFiles/ElmerGUI.dir/link.txt
 
 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/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp b/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp
index 5187c4d8599f..aed35f60ceed 100644
--- a/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp
+++ b/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp
@@ -1,64 +1,101 @@
 - includes workaround for https://github.com/ElmerCSC/elmerfem/issues/304
 
---- ElmerGUI/Application/cad/cadview.cpp.orig	2021-11-10 14:49:01 UTC
+--- ElmerGUI/Application/cad/cadview.cpp.orig	2020-11-10 19:52:44 UTC
 +++ ElmerGUI/Application/cad/cadview.cpp
 @@ -74,7 +74,7 @@
  #include <BRepAdaptor_Curve2d.hxx>
  #include <BRepBndLib.hxx>
  #include <BRepGProp.hxx>
 -#include <BRepMesh.hxx>
 +#include <BRepMesh_IncrementalMesh.hxx>
  #include <BRepTools.hxx>
  #include <BRep_Builder.hxx>
  #include <BRep_Tool.hxx>
+@@ -104,7 +104,7 @@ static void pickEventHandler(vtkObject* caller, unsign
+   QVTKWidget* qvtkWidget = cadView->GetQVTKWidget();
+ #endif
+ 
+-  vtkAbstractPicker* picker = qvtkWidget->GetInteractor()->GetPicker();
++  vtkAbstractPicker* picker = qvtkWidget->interactor()->GetPicker();
+   vtkPropPicker* propPicker = vtkPropPicker::SafeDownCast(picker);
+   vtkActor* actor = propPicker->GetActor();
+ 
+@@ -146,15 +146,15 @@ CadView::CadView(QWidget *parent) : QMainWindow(parent
+ 
+   renderer = vtkRenderer::New();
+   renderer->SetBackground(1, 1, 1);
+-  qVTKWidget->GetRenderWindow()->AddRenderer(renderer);
++  qVTKWidget->renderWindow()->AddRenderer(renderer);
+   renderer->GetRenderWindow()->Render();
+ 
+   vtkPropPicker *propPicker = vtkPropPicker::New();
+   vtkCallbackCommand *cbcPick = vtkCallbackCommand::New();
+-  qVTKWidget->GetInteractor()->SetPicker(propPicker);
++  qVTKWidget->interactor()->SetPicker(propPicker);
+   cbcPick->SetClientData(this);
+   cbcPick->SetCallback(pickEventHandler);
+-  qVTKWidget->GetInteractor()->GetPicker()->AddObserver(vtkCommand::PickEvent,
++  qVTKWidget->interactor()->GetPicker()->AddObserver(vtkCommand::PickEvent,
+                                                         cbcPick);
+   propPicker->Delete();
+   cbcPick->Delete();
 @@ -343,9 +343,6 @@ bool CadView::readFile(QString fileName) {
  
      const gp_Trsf &Transformation = Location.Transformation();
  
 -    const Poly_Array1OfTriangle &Triangles = Triangulation->Triangles();
 -    const TColgp_Array1OfPnt &Nodes = Triangulation->Nodes();
 -
      int nofTriangles = Triangulation->NbTriangles();
      int nofNodes = Triangulation->NbNodes();
  
 @@ -366,8 +363,8 @@ bool CadView::readFile(QString fileName) {
      vtkTriangle *triangle = vtkTriangle::New();
      partGrid->Allocate(nofTriangles, nofTriangles);
  
 -    for (int i = Triangles.Lower(); i <= Triangles.Upper(); i++) {
 -      Triangles(i).Get(n0, n1, n2);
 +    for (int i = 1; i <= nofTriangles; i++) {
 +      Triangulation->Triangle(i).Get(n0, n1, n2);
  
        if (Face.Orientation() != TopAbs_FORWARD) {
          int tmp = n2;
 @@ -375,9 +372,9 @@ bool CadView::readFile(QString fileName) {
          n1 = tmp;
        }
  
 -      triangle->GetPointIds()->SetId(0, n0 - Nodes.Lower());
 -      triangle->GetPointIds()->SetId(1, n1 - Nodes.Lower());
 -      triangle->GetPointIds()->SetId(2, n2 - Nodes.Lower());
 +      triangle->GetPointIds()->SetId(0, n0 - 1);
 +      triangle->GetPointIds()->SetId(1, n1 - 1);
 +      triangle->GetPointIds()->SetId(2, n2 - 1);
  
        partGrid->InsertNextCell(triangle->GetCellType(),
                                 triangle->GetPointIds());
 @@ -385,13 +382,13 @@ bool CadView::readFile(QString fileName) {
  
      double x[3];
      vtkPoints *partPoints = vtkPoints::New();
 -    for (int i = Nodes.Lower(); i <= Nodes.Upper(); i++) {
 -      gp_XYZ XYZ = Nodes(i).Coord();
 +    for (int i = 1; i <= nofNodes; i++) {
 +      gp_XYZ XYZ = Triangulation->Node(i).Coord();
        Transformation.Transforms(XYZ);
        x[0] = XYZ.X();
        x[1] = XYZ.Y();
        x[2] = XYZ.Z();
 -      partPoints->InsertPoint(i - Nodes.Lower(), x);
 +      partPoints->InsertPoint(i - 1, x);
      }
  
      partGrid->SetPoints(partPoints);
+@@ -490,7 +487,7 @@ bool CadView::readFile(QString fileName) {
+   // Draw:
+   //------
+   renderer->ResetCamera();  
+-  qVTKWidget->GetRenderWindow()->Render();
++  qVTKWidget->renderWindow()->Render();
+ 
+   QCoreApplication::processEvents();
+ 
diff --git a/science/elmerfem/files/patch-ElmerGUI_Application_vtkpost_vtkpost.cpp b/science/elmerfem/files/patch-ElmerGUI_Application_vtkpost_vtkpost.cpp
new file mode 100644
index 000000000000..77962f421b0e
--- /dev/null
+++ b/science/elmerfem/files/patch-ElmerGUI_Application_vtkpost_vtkpost.cpp
@@ -0,0 +1,53 @@
+--- ElmerGUI/Application/vtkpost/vtkpost.cpp.orig	2020-11-10 19:52:44 UTC
++++ ElmerGUI/Application/vtkpost/vtkpost.cpp
+@@ -124,6 +124,8 @@
+ 
+ using namespace std;
+ 
++#define GetRenderWindow renderWindow // renaming for VTK-9.2.2
++
+ // Custom print for QtScript:
+ //----------------------------
+ #if QT_VERSION >= 0x040403
+@@ -171,7 +173,7 @@ static void pEventHandler(vtkObject* caller, unsigned 
+   QVTKWidget* qvtkWidget = vtkPost->GetQVTKWidget();
+ #endif
+ 
+-  vtkAbstractPicker* picker = qvtkWidget->GetInteractor()->GetPicker();
++  vtkAbstractPicker* picker = qvtkWidget->interactor()->GetPicker();
+   vtkPropPicker* propPicker = vtkPropPicker::SafeDownCast(picker);
+ 
+   vtkActor* actor = propPicker->GetActor();
+@@ -382,14 +384,14 @@ VtkPost::VtkPost(QWidget *parent)
+   // Create a cell picker and set the callback & observer:
+   //------------------------------------------------------
+   vtkPropPicker* propPicker = vtkPropPicker::New();
+-  qvtkWidget->GetInteractor()->SetPicker(propPicker);
++  qvtkWidget->interactor()->SetPicker(propPicker);
+   propPicker->Delete();
+ 
+   vtkCallbackCommand* cbcPick = vtkCallbackCommand::New();
+   cbcPick->SetClientData(this);
+   cbcPick->SetCallback(pEventHandler);
+ 
+-  vtkAbstractPicker* picker = qvtkWidget->GetInteractor()->GetPicker();
++  vtkAbstractPicker* picker = qvtkWidget->interactor()->GetPicker();
+   picker->AddObserver(vtkCommand::EndPickEvent, cbcPick);
+   cbcPick->Delete();
+ 
+@@ -402,7 +404,7 @@ VtkPost::VtkPost(QWidget *parent)
+   cbcPlane->SetCallback(iEventHandler);
+ 
+   planeWidget = vtkImplicitPlaneWidget::New();
+-  planeWidget->SetInteractor(qvtkWidget->GetInteractor());
++  planeWidget->SetInteractor(qvtkWidget->interactor());
+   planeWidget->AddObserver(vtkCommand::InteractionEvent, cbcPlane);
+   cbcPlane->Delete();
+ 
+@@ -3519,4 +3521,4 @@ void VtkPost::viewZXmPlaneSlot(){
+   renderer->GetActiveCamera()->SetViewUp(1,0,0);
+   renderer->ResetCamera();
+   redrawSlot();
+-}
+\ No newline at end of file
++}
diff --git a/science/liggghts/Makefile b/science/liggghts/Makefile
index 67dbf51aa74b..b61e17b9a047 100644
--- a/science/liggghts/Makefile
+++ b/science/liggghts/Makefile
@@ -1,44 +1,46 @@
 PORTNAME=	liggghts
 DISTVERSION=	3.8.0-58
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g6e28cfe3
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Discrete element method particle simulation software
 WWW=		https://www.cfdem.com/liggghts-open-source-discrete-element-method-particle-simulation-code
 
 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
+		libvtkViewsCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
 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 \
+CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}
 
 WRKSRC_SUBDIR=	src
 
 CFLAGS+=	-fPIC
 CXXFLAGS+=	-fPIC \
-		-I${LOCALBASE}/include/vtk-9.1
+		-I${LOCALBASE}/include/vtk-${VTK_VER}
 
 BINARY_ALIAS=	sed=gsed
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/science/liggghts/files/patch-dump__mesh__vtm.cpp b/science/liggghts/files/patch-dump__mesh__vtm.cpp
new file mode 100644
index 000000000000..6c42615cbf43
--- /dev/null
+++ b/science/liggghts/files/patch-dump__mesh__vtm.cpp
@@ -0,0 +1,11 @@
+--- dump_mesh_vtm.cpp.orig	2022-10-23 21:34:40 UTC
++++ dump_mesh_vtm.cpp
+@@ -60,6 +60,8 @@
+ #include <vtkMPI.h>
+ #include <vtkMPICommunicator.h>
+ 
++#include <vtkVersionMacros.h>
++
+ using namespace LAMMPS_NS;
+ 
+ /* ---------------------------------------------------------------------- */
diff --git a/science/liggghts/files/patch-dump__vtk.h b/science/liggghts/files/patch-dump__vtk.h
new file mode 100644
index 000000000000..c56ea383b8ab
--- /dev/null
+++ b/science/liggghts/files/patch-dump__vtk.h
@@ -0,0 +1,11 @@
+--- dump_vtk.h.orig	2022-10-23 21:45:06 UTC
++++ dump_vtk.h
+@@ -54,6 +54,8 @@
+ #include <list>
+ #include <string>
+ 
++#include <vtkVersionMacros.h>
++
+ namespace LAMMPS_NS
+ {
+ 
diff --git a/science/liggghts/patch-dump__vtk.cpp b/science/liggghts/patch-dump__vtk.cpp
new file mode 100644
index 000000000000..96cdec713678
--- /dev/null
+++ b/science/liggghts/patch-dump__vtk.cpp
@@ -0,0 +1,11 @@
+--- dump_vtk.cpp.orig	2022-10-23 21:34:06 UTC
++++ dump_vtk.cpp
+@@ -59,6 +59,8 @@
+ #include <vtkXMLPImageDataWriter.h>
+ #include <sstream>
+ 
++#include <vtkVersionMacros.h>
++
+ namespace LAMMPS_NS
+ {
+ 
diff --git a/science/openems/Makefile b/science/openems/Makefile
index 3d297459af5d..67b5f0fe2055 100644
--- a/science/openems/Makefile
+++ b/science/openems/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	openems
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.35-76
 DISTVERSIONSUFFIX=	-gd4448fa
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Electromagnetic field solver using the EC-FDTD method
 WWW=		https://openems.de/start/
 
 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
+		libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
 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 \
+CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} \
 		-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 <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index 962bd7d1c951..e3cf79cafd7d 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -1,165 +1,166 @@
 PORTNAME=	paraview
 DISTVERSION=	5.10.1
-PORTREVISION=	6
+PORTREVISION=	7
 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
 WWW=		https://www.paraview.org/
 
 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	\
+		vtk${VTK_VER:R}>0:math/vtk${VTK_VER:R} \
 		${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 <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>