diff --git a/math/topologic/Makefile b/math/topologic/Makefile
index c5814d76fb56..a173a553e13c 100644
--- a/math/topologic/Makefile
+++ b/math/topologic/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	topologic
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 PKGNAMESUFFIX=	-space-modeling-library
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for topological representations of architectural spaces
 WWW=		https://topologic.app/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libtbb.so:devel/onetbb \
 		libTKernel.so:cad/opencascade \
 		libuuid.so:misc/libuuid
 
-USES=		cmake compiler:c++14-lang localbase:ldflags
+USES=		cmake compiler:c++17-lang dos2unix localbase:ldflags
+DOS2UNIX_FILES=	CMakeLists.txt
 USE_LDCONFIG=	${PREFIX}/lib/TopologicCore
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wassimj
 GH_PROJECT=	Topologic
 
 CMAKE_ARGS=	-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE
 
 .include <bsd.port.mk>
diff --git a/math/topologic/files/patch-CMakeLists.txt b/math/topologic/files/patch-CMakeLists.txt
index 5f2b6955a614..636171ac1e37 100644
--- a/math/topologic/files/patch-CMakeLists.txt
+++ b/math/topologic/files/patch-CMakeLists.txt
@@ -1,7 +1,7 @@
---- CMakeLists.txt.orig	2024-05-05 07:06:42 UTC
+--- CMakeLists.txt.orig	2026-06-13 21:07:53 UTC
 +++ CMakeLists.txt
-@@ -12,4 +12,3 @@ add_subdirectory(TopologicCore)
- 
- # Sub-projects
- add_subdirectory(TopologicCore)
--add_subdirectory(TopologicPythonBindings)
+@@ -12,4 +12,3 @@ add_subdirectory(TopologicCore)
+ 
+ # Sub-projects
+ add_subdirectory(TopologicCore)
+-add_subdirectory(TopologicPythonBindings)
diff --git a/math/topologic/files/patch-TopologicCore_src_CellComplex.cpp b/math/topologic/files/patch-TopologicCore_src_CellComplex.cpp
new file mode 100644
index 000000000000..29a3c895bba9
--- /dev/null
+++ b/math/topologic/files/patch-TopologicCore_src_CellComplex.cpp
@@ -0,0 +1,20 @@
+--- TopologicCore/src/CellComplex.cpp.orig	2024-05-05 07:38:08 UTC
++++ TopologicCore/src/CellComplex.cpp
+@@ -113,7 +113,7 @@ namespace TopologicCore
+ 
+ 		occtBuilder.MakeCompSolid(occtCompSolid);
+ 
+-		TopTools_ListOfShape::iterator occtSolidIterator = rkOcctSolids.begin();
++		TopTools_ListOfShape::const_iterator occtSolidIterator = rkOcctSolids.begin();
+ 		CellComplex::Ptr pCellComplex = nullptr;
+ 
+ 		// If there is only one solid, create a CellComplex with only that cells
+@@ -264,7 +264,7 @@ namespace TopologicCore
+ 
+ 		TopTools_ListOfShape occtListToTake;
+ 		TopTools_ListOfShape occtListToAvoid;
+-		for (TopTools_ListIteratorOfListOfShape occtShapeIterator(occtCellsBuildersArguments);
++		for (TopTools_ListOfShape::Iterator occtShapeIterator(occtCellsBuildersArguments);
+ 			occtShapeIterator.More();
+ 			occtShapeIterator.Next())
+ 		{
diff --git a/math/topologic/files/patch-TopologicCore_src_Graph.cpp b/math/topologic/files/patch-TopologicCore_src_Graph.cpp
new file mode 100644
index 000000000000..d4ad2a82a373
--- /dev/null
+++ b/math/topologic/files/patch-TopologicCore_src_Graph.cpp
@@ -0,0 +1,20 @@
+--- TopologicCore/src/Graph.cpp.orig	2024-05-05 07:38:08 UTC
++++ TopologicCore/src/Graph.cpp
+@@ -999,7 +999,7 @@ namespace TopologicCore
+ 		}
+ 
+         std::queue<TopoDS_Vertex> occtVertexQueue;
+-        TopTools_DataMapOfShapeInteger occtVertexDistanceMap; // also to check if the vertex is processed
++        NCollection_DataMap<TopoDS_Shape, Standard_Integer, TopTools_ShapeMapHasher> occtVertexDistanceMap; // also to check if the vertex is processed
+         
+         occtVertexQueue.push(occtCoincidentStartVertex);
+         
+@@ -1021,7 +1021,7 @@ namespace TopologicCore
+             {
+                 const TopoDS_Vertex& rkOcctAdjacentVertex = TopoDS::Vertex(occtVertexAdjacency.Value());
+                 try {
+-                    const int& rDistance = occtVertexDistanceMap.Find(rkOcctAdjacentVertex);
++                    const Standard_Integer& rDistance = occtVertexDistanceMap.Find(rkOcctAdjacentVertex);
+ 
+                     // vertex is already processed, so continue.
+                     continue; 
diff --git a/math/topologic/files/patch-TopologicCore_src_Utilities_EdgeUtility.cpp b/math/topologic/files/patch-TopologicCore_src_Utilities_EdgeUtility.cpp
new file mode 100644
index 000000000000..b44590a330a3
--- /dev/null
+++ b/math/topologic/files/patch-TopologicCore_src_Utilities_EdgeUtility.cpp
@@ -0,0 +1,11 @@
+--- TopologicCore/src/Utilities/EdgeUtility.cpp.orig	2024-05-05 07:38:08 UTC
++++ TopologicCore/src/Utilities/EdgeUtility.cpp
+@@ -54,7 +54,7 @@ namespace TopologicUtilities
+ 		else
+ 		{
+ 			// else more than 2 vertices
+-			Handle(TColgp_HArray1OfPnt) pOcctPoints = new TColgp_HArray1OfPnt(1, numberOfVertices);
++			Handle(NCollection_HArray1<gp_Pnt>) pOcctPoints = new NCollection_HArray1<gp_Pnt>(1, numberOfVertices);
+ 			int i = 1;
+ 			for (const TopologicCore::Vertex::Ptr& kpVertex : rkVertices)
+ 			{