diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 6d6caf8f84de..6796cab56497 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -1,199 +1,201 @@
 PORTNAME=	opencascade
 DISTVERSIONPREFIX=	V
 DISTVERSION=	7_8_0
+PORTREVISION=	1
 CATEGORIES=	cad science
+DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
 
 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		\
 		libtbbmalloc.so:devel/onetbb		\
 		libexpat.so:textproc/expat2		\
 		libdraco.so:archivers/draco		\
 		libpng16.so:graphics/png		\
 		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 eigen:3 gettext-runtime	\
 		gl gnome localbase python qt:5 shebangfix tk 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
 USE_QT=		core declarative gui network quick3d linguisttools widgets xml
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Open-Cascade-SAS
 GH_PROJECT=	OCCT
 
 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
 
 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				\
 		-DBUILD_Inspector:BOOL=ON				\
 		-DUSE_TCL:BOOL=ON					\
 		-DCAN_USE_TK:BOOL=ON -DUSE_TK:BOOL=ON			\
 		-DCAN_USE_XLIB:BOOL=ON -DUSE_XLIB:BOOL=ON		\
 		-DCAN_USE_FREETYPE:BOOL=ON -DUSE_FREETYPE:BOOL=ON	\
 		-DCAN_USE_VTK:BOOL=ON -DUSE_VTK:BOOL=ON			\
 		-DCAN_USE_EIGEN:BOOL=ON -DUSE_EIGEN:BOOL=ON		\
 		-DCAN_USE_RAPIDJSON:BOOL=ON -DUSE_RAPIDJSON:BOOL=ON	\
 		-DCAN_USE_DRACO:BOOL=ON -DUSE_DRACO:BOOL=ON		\
 		-DCAN_USE_TBB:BOOL=ON -DUSE_TBB:BOOL=ON			\
 		-D3RDPARTY_QT_DIR:PATH=${QT_LIBDIR}			\
 		-D3RDPARTY_DRACO_DIR:PATH=${LOCALBASE}			\
 		-D3RDPARTY_DRACO_LIBRARY=libdraco.so			\
 		-D3RDPARTY_DRACO_LIBRARY_DIR:PATH=${LOCALBASE}/lib	\
 		-D3RDPARTY_DRACO_INCLUDE_DIR:PATH=${LOCALBASE}/include/draco	\
 		-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
 
 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} VER=${PORTVERSION}
 
 FFMPEG_CMAKE_ON=	-DCAN_USE_FFMPEG:BOOL=ON -DUSE_FFMPEG:BOOL=ON \
 			-D3RDPARTY_FFMPEG_INCLUDE_DIR=${LOCALBASE}/ffmpeg4/include \
 			-D3RDPARTY_FFMPEG_DIR=${LOCALBASE}/ffmpeg4
 FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=OFF
 FFMPEG_LIB_DEPENDS=	libavcodec.so.58:multimedia/ffmpeg4	\
 			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=		-DCAN_USE_FREEIMAGE:BOOL=ON -DUSE_FREEIMAGE:BOOL=ON	\
 			-DCAN_USE_OPENGL:BOOL=ON -DUSE_OPENGL:BOOL=ON	\
 			-DCAN_USE_GLES2: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,opengl
 
 DOCS_DISTFILES=		documentation.tar.xz
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_USES=		tex
 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
 DOXYGEN_CMAKE_ON=	-DBUILD_DOC_Overview:BOOL=ON	\
 			-DINSTALL_DOC_Overview:BOOL=ON
 
 .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-stage:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake/OpenCASCADE
 	${MV} ${STAGEDIR}${PREFIX}/lib/cmake/*.cmake	\
 		${STAGEDIR}${PREFIX}/lib/cmake/OpenCASCADE
 
 post-install:
 	${MV} ${STAGEDIR}${OCCROOT}/bin/DRAWEXE-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/DRAWEXE
 	${RLN} ${STAGEDIR}${PREFIX}/bin/DRAWEXE ${STAGEDIR}${OCCROOT}/bin
 
 post-install-DOXYGEN-on:
 	${RLN} ${STAGEDIR}${OCCROOT}/${DOCSDIR_REL} ${STAGEDIR}${DOCSDIR}
 
 .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/opencascade/distinfo b/cad/opencascade/distinfo
index 1854ffc388f5..89e9a325924c 100644
--- a/cad/opencascade/distinfo
+++ b/cad/opencascade/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1711092244
-SHA256 (documentation.tar.xz) = 096cd0f268fa9f6a50818e1d628ac92ecf87e10fd72187e2e8d6be57dfe12530
-SIZE (documentation.tar.xz) = 48428565
-SHA256 (Open-Cascade-SAS-OCCT-V7_8_0_GH0.tar.gz) = 3c5cdd70de9c82d9f0be4b9400d618494cfecd28f502d110111060c9aaaf50c7
-SIZE (Open-Cascade-SAS-OCCT-V7_8_0_GH0.tar.gz) = 48428333
+TIMESTAMP = 1711099991
+SHA256 (opencascade-7_8_0/documentation.tar.xz) = 096cd0f268fa9f6a50818e1d628ac92ecf87e10fd72187e2e8d6be57dfe12530
+SIZE (opencascade-7_8_0/documentation.tar.xz) = 48428565
+SHA256 (opencascade-7_8_0/Open-Cascade-SAS-OCCT-V7_8_0_GH0.tar.gz) = 096cd0f268fa9f6a50818e1d628ac92ecf87e10fd72187e2e8d6be57dfe12530
+SIZE (opencascade-7_8_0/Open-Cascade-SAS-OCCT-V7_8_0_GH0.tar.gz) = 48428565
diff --git a/cad/opencascade/files/patch-adm_UDLIST b/cad/opencascade/files/patch-adm_UDLIST
deleted file mode 100644
index feee670d3393..000000000000
--- a/cad/opencascade/files/patch-adm_UDLIST
+++ /dev/null
@@ -1,10 +0,0 @@
---- adm/UDLIST.orig	2023-12-04 15:53:08 UTC
-+++ adm/UDLIST
-@@ -32,6 +32,7 @@ r OS
- n gp
- n math
- r OS
-+n FlexLexer
- t TKMath
- t TKernel
- n Adaptor2d
diff --git a/cad/opencascade/files/patch-src_Message_Message__AttributeMeter.cxx b/cad/opencascade/files/patch-src_Message_Message__AttributeMeter.cxx
deleted file mode 100644
index 38686e6cd8b4..000000000000
--- a/cad/opencascade/files/patch-src_Message_Message__AttributeMeter.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Message/Message_AttributeMeter.cxx.orig	2023-12-04 15:53:08 UTC
-+++ src/Message/Message_AttributeMeter.cxx
-@@ -253,6 +253,6 @@ void Message_AttributeMeter::DumpJson (Standard_OStrea
-        anIterator.More(); anIterator.Next())
-   {
-     OCCT_DUMP_VECTOR_CLASS (theOStream, Message::MetricToString (anIterator.Key()),
--                            2, anIterator.Value(), anIterator.Value())
-+                            2, anIterator.Value().first, anIterator.Value().second)
-   }
- }
diff --git a/cad/opencascade/files/patch-src_NCollection_NCollection__Array1.hxx b/cad/opencascade/files/patch-src_NCollection_NCollection__Array1.hxx
deleted file mode 100644
index 7a3f36deeade..000000000000
--- a/cad/opencascade/files/patch-src_NCollection_NCollection__Array1.hxx
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/NCollection/NCollection_Array1.hxx.orig	2023-12-04 15:53:08 UTC
-+++ src/NCollection/NCollection_Array1.hxx
-@@ -72,26 +72,10 @@ class NCollection_Array1 (public)
- 
-   using iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_Array1, value_type, false>;
-   using const_iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_Array1, value_type, true>;
-+  using Iterator = NCollection_Iterator<NCollection_Array1<TheItemType>>;
- 
- public:
- 
--  // Iterator class
--  class Iterator : public NCollection_Iterator<NCollection_Array1>
--  {
--  public:
--    using NCollection_Iterator<NCollection_Array1>::NCollection_Iterator;
--
--    const_reference Value() const
--    {
--      return *NCollection_Iterator<NCollection_Array1>::ValueIter();
--    }
--
--    reference ChangeValue()
--    {
--      return *NCollection_Iterator<NCollection_Array1>::ChangeValueIter();
--    }
--  };
--
-   const_iterator begin() const
-   {
-     return const_iterator(*this);
-@@ -150,7 +134,7 @@ class NCollection_Array1 (public)
-     mySize(theUpper - theLower + 1),
-     myPointer(nullptr),
-     myIsOwner(false),
--    allocator_type(theAlloc)
-+    myAllocator(theAlloc)
-   {
-     if (mySize == 0)
-     {
diff --git a/cad/opencascade/files/patch-src_NCollection_NCollection__DynamicArray.hxx b/cad/opencascade/files/patch-src_NCollection_NCollection__DynamicArray.hxx
deleted file mode 100644
index 28bc7579f5fa..000000000000
--- a/cad/opencascade/files/patch-src_NCollection_NCollection__DynamicArray.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/NCollection/NCollection_DynamicArray.hxx.orig	2023-12-04 15:53:08 UTC
-+++ src/NCollection/NCollection_DynamicArray.hxx
-@@ -77,25 +77,9 @@ class NCollection_DynamicArray (public)
- 
-   using iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_DynamicArray, value_type, false>;
-   using const_iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_DynamicArray, value_type, true>;
-+  using Iterator = NCollection_Iterator<NCollection_DynamicArray<TheItemType>>;
- 
- public:
--
--  // Iterator class
--  class Iterator : public NCollection_Iterator<NCollection_DynamicArray>
--  {
--  public:
--    using NCollection_Iterator<NCollection_DynamicArray>::NCollection_Iterator;
--
--    const_reference Value() const
--    {
--      return *NCollection_Iterator<NCollection_DynamicArray>::ValueIter();
--    }
--
--    reference ChangeValue()
--    {
--      return *NCollection_Iterator<NCollection_DynamicArray>::ChangeValueIter();
--    }
--  };
- 
-   const_iterator begin() const
-   {
diff --git a/cad/opencascade/files/patch-src_NCollection_NCollection__Iterator.hxx b/cad/opencascade/files/patch-src_NCollection_NCollection__Iterator.hxx
deleted file mode 100644
index 81d01c6b6809..000000000000
--- a/cad/opencascade/files/patch-src_NCollection_NCollection__Iterator.hxx
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/NCollection/NCollection_Iterator.hxx.orig	2023-12-04 15:53:08 UTC
-+++ src/NCollection/NCollection_Iterator.hxx
-@@ -94,6 +94,16 @@ class NCollection_Iterator (public)
-     ++(myCur);
-   }
- 
-+  const typename Container::const_reference Value() const
-+  {
-+    return *myCur;
-+  }
-+
-+  const typename Container::reference ChangeValue()
-+  {
-+    return *myCur;
-+  }
-+
-   bool operator==(const NCollection_Iterator& theOther) { return myLast == theOther.myLast && myCur == theOther.myCur; }
- 
-   bool operator!=(const NCollection_Iterator& theOther) { return myLast != theOther.myLast || myCur != theOther.myCur; }