diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile
index b11862b7c07b..64f25af610cf 100644
--- a/graphics/f3d/Makefile
+++ b/graphics/f3d/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	f3d
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast and minimalist 3D viewer
 WWW=		https://f3d.app/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg4 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreeimage.so:graphics/freeimage \
 		libfreetype.so:print/freetype2 \
 		libhdf5.so:science/hdf5 \
-		libImath-3_1.so:math/Imath \
 		libinotify.so:devel/libinotify \
 		libnetcdf.so:science/netcdf \
 		libtbb.so:devel/onetbb \
 		libvtkCommonMisc-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
 USES=		cmake:testing compiler:c++17-lang desktop-file-utils gl \
 		localbase:ldflags shared-mime-info tcl tk xorg
 USE_GL=		gl
 USE_XORG=	ice sm x11 xt
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	f3d-app
 
 CMAKE_OFF=	F3D_STRICT_BUILD # disable -Werror
 CMAKE_OFF+=	F3D_LINUX_APPLICATION_LINK_FILESYSTEM
 
 LDFLAGS+=	-linotify
 
 # dependency descroptions are in https://f3d.app/doc/dev/BUILD.html
 OPTIONS_GROUP=			MODULES PLUGINS
 OPTIONS_GROUP_MODULES=		EXTERNAL_RENDERING RAYTRACING
 OPTIONS_GROUP_PLUGINS=		ALEMBIC ASSIMP DRACO EXODUS OCCT
 OPTIONS_DEFAULT=		ALEMBIC ASSIMP DRACO EXODUS OCCT
 OPTIONS_SUB=			yes
 
 MODULES_DESC=			Build modules:
 
 ALEMBIC_DESC=			Alembic plugin (for ABC files)
 ALEMBIC_CMAKE_BOOL=		F3D_PLUGIN_BUILD_ALEMBIC
-ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic
+ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic \
+				libImath-3_1.so:math/Imath
 
 ASSIMP_DESC=			Assimp plugin (for FBX, OFF, DAE and DXF files)
 ASSIMP_CMAKE_BOOL=		F3D_PLUGIN_BUILD_ASSIMP
 ASSIMP_LIB_DEPENDS=		libassimp.so:multimedia/assimp
 
 DRACO_DESC=			Draco plugin
 DRACO_CMAKE_BOOL=		F3D_PLUGIN_BUILD_DRACO
 DRACO_LIB_DEPENDS=		libdraco.so:archivers/draco
 
 EXODUS_DESC=			ExodusII plugin
 EXODUS_CMAKE_BOOL=		F3D_PLUGIN_BUILD_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 plugin (for STEP and IGES files)
 OCCT_USES=			localbase:ldflags
 OCCT_CMAKE_BOOL=		F3D_PLUGIN_BUILD_OCCT
-OCCT_LIB_DEPENDS=		libTKBRep.so:cad/opencascade \
-				libdraco.so:archivers/draco
+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}
 	# component-based install
 	cd ${BUILD_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --install . --component configuration && \
 		${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --install . --component sdk && \
 		${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --install . --component mimetypes
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/f3d/pkg-plist b/graphics/f3d/pkg-plist
index cfd02f534d6f..cfcf91ed6ef6 100644
--- a/graphics/f3d/pkg-plist
+++ b/graphics/f3d/pkg-plist
@@ -1,91 +1,91 @@
 bin/f3d
 %%ALEMBIC%%%%ETCDIR%%/config.d/10_alembic.json
 %%ASSIMP%%%%ETCDIR%%/config.d/10_assimp.json
 %%DRACO%%%%ETCDIR%%/config.d/10_draco.json
 %%EXODUS%%%%ETCDIR%%/config.d/10_exodus.json
 %%ETCDIR%%/config.d/10_global.json
 %%ETCDIR%%/config.d/10_native.json
 %%ALEMBIC%%%%ETCDIR%%/thumbnail.d/10_alembic.json
 %%ASSIMP%%%%ETCDIR%%/thumbnail.d/10_assimp.json
 %%DRACO%%%%ETCDIR%%/thumbnail.d/10_draco.json
 %%EXODUS%%%%ETCDIR%%/thumbnail.d/10_exodus.json
 %%OCCT%%%%ETCDIR%%/config.d/10_occt.json
 %%ETCDIR%%/thumbnail.d/10_global.json
 %%ETCDIR%%/thumbnail.d/10_native.json
 %%OCCT%%%%ETCDIR%%/thumbnail.d/10_occt.json
 include/f3d/camera.h
 include/f3d/engine.h
 include/f3d/exception.h
 include/f3d/export.h
 include/f3d/image.h
 include/f3d/interactor.h
 include/f3d/loader.h
 include/f3d/log.h
 include/f3d/options.h
 include/f3d/plugin.h
 include/f3d/reader.h
 include/f3d/types.h
 include/f3d/utils.h
 include/f3d/vtkF3DFaceVaryingPointDispatcher.h
 include/f3d/vtkextModule.h
 include/f3d/window.h
 lib/cmake/f3d/application-config.cmake
 lib/cmake/f3d/f3dConfig.cmake
 lib/cmake/f3d/f3dConfigVersion.cmake
 lib/cmake/f3d/f3dEmbed.cmake
 lib/cmake/f3d/f3dLibraryTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/f3d/f3dLibraryTargets.cmake
 lib/cmake/f3d/f3dTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/f3d/f3dTargets.cmake
 lib/cmake/f3d/library-config.cmake
 lib/cmake/f3d_vtkext/f3d_vtkext-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/f3d_vtkext/f3d_vtkext-targets.cmake
 lib/cmake/f3d_vtkext/f3d_vtkext-vtk-module-properties.cmake
 lib/libf3d.so
 lib/libf3d.so.2
 lib/libf3d.so.2.4
 lib/libvtkext.so
-lib/libvtkextAlembic.a
-lib/libvtkextAssimp.a
-lib/libvtkextDraco.a
+%%ALEMBIC%%lib/libvtkextAlembic.a
+%%ASSIMP%%lib/libvtkextAssimp.a
+%%DRACO%%lib/libvtkextDraco.a
 lib/libvtkextNative.a
-lib/libvtkextOCCT.a
+%%OCCT%%lib/libvtkextOCCT.a
 lib/libvtkextPrivate.a
 lib/vtk/hierarchy/f3d_vtkext/vtkext-hierarchy.txt
 %%ALEMBIC%%share/applications/f3d-plugin-alembic.desktop
 %%ASSIMP%%share/applications/f3d-plugin-assimp.desktop
 %%DRACO%%share/applications/f3d-plugin-draco.desktop
 %%EXODUS%%share/applications/f3d-plugin-exodus.desktop
 share/applications/f3d-plugin-native.desktop
 %%OCCT%%share/applications/f3d-plugin-occt.desktop
 share/applications/f3d.desktop
 share/bash-completion/completions/f3d
 share/doc/F3D/LICENSE.md
 share/doc/F3D/THIRD_PARTY_LICENSES.md
 %%ALEMBIC%%%%DATADIR%%/plugins/alembic.json
 %%ASSIMP%%%%DATADIR%%/plugins/assimp.json
 %%DRACO%%%%DATADIR%%/plugins/draco.json
 %%EXODUS%%%%DATADIR%%/plugins/exodus.json
 %%DATADIR%%/plugins/native.json
 %%OCCT%%%%DATADIR%%/plugins/occt.json
 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/app.f3d.F3D.metainfo.xml
 share/mime/packages/f3d-3d-formats.xml
 share/mime/packages/f3d-3d-image-formats.xml
 %%ALEMBIC%%share/mime/packages/f3d-alembic-formats.xml
 %%ASSIMP%%share/mime/packages/f3d-assimp-formats.xml
 %%DRACO%%share/mime/packages/f3d-draco-formats.xml
 %%EXODUS%%share/mime/packages/f3d-exodus-formats.xml
 %%OCCT%%share/mime/packages/f3d-occt-formats.xml
 share/mime/packages/f3d-vtk-formats.xml
 %%ALEMBIC%%share/thumbnailers/f3d-plugin-alembic.thumbnailer
 %%ASSIMP%%share/thumbnailers/f3d-plugin-assimp.thumbnailer
 %%DRACO%%share/thumbnailers/f3d-plugin-draco.thumbnailer
 %%EXODUS%%share/thumbnailers/f3d-plugin-exodus.thumbnailer
 share/thumbnailers/f3d-plugin-native.thumbnailer
 %%OCCT%%share/thumbnailers/f3d-plugin-occt.thumbnailer
 share/zsh/site-functions/_f3d