12 files changed, 26 insertions, 10 deletions
diff --git a/cad/appcsxcad/Makefile b/cad/appcsxcad/Makefile
index a2ffaded6ade..96087df80292 100644
--- a/cad/appcsxcad/Makefile
+++ b/cad/appcsxcad/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	appcsxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/cad/csxcad/Makefile b/cad/csxcad/Makefile
index 525452bcaec8..618b05eea58e 100644
--- a/cad/csxcad/Makefile
+++ b/cad/csxcad/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	csxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile
index 0ba67b1b1140..905a09a5391f 100644
--- a/cad/freecad/Makefile
+++ b/cad/freecad/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	FreeCAD
 DISTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 
 MAINTAINER=	cmt@FreeBSD.org
@@ -61,8 +61,6 @@ USE_LDCONFIG=	yes
 
 CPE_VENDOR=	freecad_project
 
-VTK_VER=	9.2
-
 DOS2UNIX_GLOB=	*.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL
 SHEBANG_FILES=	src/Tools/freecad-thumbnailer
 
@@ -103,6 +101,8 @@ CMAKE_ARGS+=	-DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \
 
 CMAKE_INSTALL_PREFIX=	${PREFIX}/${PORTNAME}
 
+CXXFLAGS+=	-DGetCellLinks=GetLinks # fix for vtk-9.5.0: equivalent of this patch: https://github.com/FreeCAD/FreeCAD/issues/21731#issuecomment-2934487147
+
 OPTIONS_DEFINE=	COLLADA
 
 COLLADA_DESC=		Install pycollada for Collada files import
@@ -132,4 +132,5 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/Tools/freecad-thumbnailer \
 		${STAGEDIR}${PREFIX}/bin/freecad-thumbnailer
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile
index 9ac7249227da..fb7960f20fe5 100644
--- a/cad/horizon-eda/Makefile
+++ b/cad/horizon-eda/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	horizon-eda
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -24,7 +24,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpodofo09.so:graphics/podofo09 \
 		libspnav.so:misc/libspnav \
 		libTKDESTEP.so:cad/opencascade \
-		libuuid.so:misc/e2fsprogs-libuuid \
+		libuuid.so:misc/libuuid \
 		libzmq.so:net/libzmq4
 
 USES=		desktop-file-utils gnome libarchive localbase meson pkgconfig python:build sqlite
diff --git a/cad/ifcopenshell/Makefile b/cad/ifcopenshell/Makefile
index 811fc86d8d69..8810fd67d676 100644
--- a/cad/ifcopenshell/Makefile
+++ b/cad/ifcopenshell/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ifcopenshell
 PORTVERSION=	0.7.0.231127
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	cad
 
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 9a27fcdf5ddd..e80ff5dfbf56 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	opencascade
 DISTVERSIONPREFIX=	V
 DISTVERSION=	7_9_1
+PORTREVISION=	1
 CATEGORIES=	cad science
 DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
 
diff --git a/cad/opencascade/files/patch-CMakeLists.txt b/cad/opencascade/files/patch-CMakeLists.txt
index 3050b6fa3785..cb9a2eaeb89c 100644
--- a/cad/opencascade/files/patch-CMakeLists.txt
+++ b/cad/opencascade/files/patch-CMakeLists.txt
@@ -1,6 +1,15 @@
 --- CMakeLists.txt.orig	2025-05-20 11:17:10 UTC
 +++ CMakeLists.txt
-@@ -1101,7 +1101,7 @@ endif()
+@@ -908,6 +908,8 @@ OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_defs_flags")
+ # include original list of definitions and flags
+ OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_defs_flags")
+ 
++include(adm/cmake/vtk.cmake) # workaround for https://gitlab.kitware.com/vtk/vtk/-/issues/19716
++
+ foreach (OCCT_3RDPARTY_LIST ${OCCT_3RDPARTY_CMAKE_LIST})
+   OCCT_INCLUDE_CMAKE_FILE (${OCCT_3RDPARTY_LIST})
+ endforeach()
+@@ -1101,7 +1103,7 @@ endif()
  endif()
  
  # validating custom.bat/sh for changes
@@ -9,7 +18,7 @@
    file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
    string(FIND "${CUSTOM_CONTENT}" "${ADDITIONAL_CUSTOM_CONTENT}" pos)
    if (pos EQUAL -1)
-@@ -1340,7 +1340,7 @@ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONF
+@@ -1340,7 +1342,7 @@ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONF
  endforeach()
  # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
  install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile
index 8e7966ee9ba4..5ceb64708105 100644
--- a/cad/openvsp/Makefile
+++ b/cad/openvsp/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	openvsp
 DISTVERSIONPREFIX=	${GH_PROJECT}_
 DISTVERSION=	3.43.0
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	fernape@FreeBSD.org
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index fb3124e7d5ff..04d8535804ea 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	oregano
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.84.43
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	cad
 MASTER_SITES=	https://waf.io/:new_waf # for Python-3.11 compatibility
 DISTFILES=	waf-2.1.1:new_waf
diff --git a/cad/pcb-rnd/Makefile b/cad/pcb-rnd/Makefile
index 577c90d59d89..a00ec5804c9c 100644
--- a/cad/pcb-rnd/Makefile
+++ b/cad/pcb-rnd/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pcb-rnd
 DISTVERSION=	3.1.6
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.repo.hu/projects/pcb-rnd/releases/
 
diff --git a/cad/qcsxcad/Makefile b/cad/qcsxcad/Makefile
index 6a5e384ec7f4..0b75f90ab823 100644
--- a/cad/qcsxcad/Makefile
+++ b/cad/qcsxcad/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	qcsxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/cad/repsnapper/Makefile b/cad/repsnapper/Makefile
index a7ef51ebd375..b2368922ab11 100644
--- a/cad/repsnapper/Makefile
+++ b/cad/repsnapper/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	repsnapper
 DISTVERSION=	2.5a5
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	martin.dieringer@gmx.de