diff --git a/cad/py-gmsh/Makefile b/cad/py-gmsh/Makefile
index 09664fd914df..0a94c6da011c 100644
--- a/cad/py-gmsh/Makefile
+++ b/cad/py-gmsh/Makefile
@@ -1,60 +1,69 @@
 PORTNAME=	gmsh
-DISTVERSION=	4.14.0
-PORTREVISION=	1
+DISTVERSION=	5.0.0-git
 CATEGORIES=	cad python
-MASTER_SITES=	https://gmsh.info/src/
+MASTER_SITES=	LOCAL/thierry
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${DISTVERSION}-source
+DISTNAME=	${PORTNAME}-master-${GL_TAGNAME}
 DIST_SUBDIR=	gmsh
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Automatic 3D finite element mesh generator (gmsh's own binding)
 WWW=		https://gmsh.info/
 
 LICENSE=	AGPLv3+ APACHE20 GPLv3+ GPLv2+ LGPL21
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	swig:devel/swig
-LIB_DEPENDS=	libcgns.so:science/cgnslib \
+LIB_DEPENDS=	libmmg.so:science/mmg \
+		libmesquite.so:math/mesquite \
+		libcgns.so:science/cgnslib \
 		libfltk_images.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgmp.so:math/gmp \
 		libhdf5.so:science/hdf5 \
 		libmedC.so:french/med \
 		libpng16.so:graphics/png \
 		libsz.so:science/libaec \
 		libTKV3d.so:cad/opencascade
 
 USES=		cmake gl gnome jpeg python tar:tgz xorg
 USE_PYTHON=	flavors
 USE_GNOME=	cairo
 USE_GL=		gl glu
 USE_XORG=	ice sm x11 xcursor xext xfixes xft xinerama xrender
 USE_LDCONFIG=	${PYTHON_SITELIBDIR}
 
+# Pre-release, temporarily used to support OCCT-8
+#USE_GITLAB=	yes
+#GL_SITE=	https://gitlab.onelab.info/gmsh/gmsh
+GL_TAGNAME=	23c47b0e6a91f2f67afcbe3bf9ad1b5c253e96e2
+WRKSRC=		${WRKDIR}/gmsh-master
+
 PATCHDIR=	${PORTSDIR}/cad/gmsh/files
 
 CMAKE_ON=	ENABLE_WRAP_PYTHON ENABLE_PRIVATE_API ENABLE_OCC
 CMAKE_ARGS=	-DOCC_INC=${LOCALBASE}/include/OpenCASCADE \
 		-DGMSHPY_INSTALL_DIRECTORY=${PYTHON_SITELIBDIR}/gmshpy
 
 CXXFLAGS_powerpc64=	-mvsx
 
 post-install: # remove all except for the python binding
 	@cd ${STAGEDIR}${PREFIX} && \
 		${RM} -r \
 			bin/* \
 			include/gmsh* \
 			lib/gmsh.jl \
 			share/doc/gmsh \
 			share/man/man1/gmsh.1
+	# remove cmake files already installed by GMSH
+	@${RM} -rf ${STAGEDIR}${DATADIR}
 	# move "private API" libs to the python folder
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	@cd ${STAGEDIR} && \
 		${MV} \
 			${STAGEDIR}${PREFIX}/lib/gmsh* \
 			${STAGEDIR}${PREFIX}/lib/lib* \
 			${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/py-gmsh/distinfo b/cad/py-gmsh/distinfo
index 6cda1d3b7362..7a3344f61db8 100644
--- a/cad/py-gmsh/distinfo
+++ b/cad/py-gmsh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1755937481
-SHA256 (gmsh/gmsh-4.14.0-source.tgz) = db4d7da2062e9a4356a820832138ab99f97af6388bfeb21599a2eadfb0b76a28
-SIZE (gmsh/gmsh-4.14.0-source.tgz) = 18458158
+TIMESTAMP = 1785156884
+SHA256 (gmsh/gmsh-master-23c47b0e6a91f2f67afcbe3bf9ad1b5c253e96e2.tgz) = c0e0607c1d586b57036dcbb102543d16fc360bbba6f1cde98811cf30667bfaf9
+SIZE (gmsh/gmsh-master-23c47b0e6a91f2f67afcbe3bf9ad1b5c253e96e2.tgz) = 32124296
diff --git a/cad/py-gmsh/pkg-plist b/cad/py-gmsh/pkg-plist
index d11c3a463cb2..11c7c3a9af6b 100644
--- a/cad/py-gmsh/pkg-plist
+++ b/cad/py-gmsh/pkg-plist
@@ -1,21 +1,18 @@
-%%PYTHON_SITELIBDIR%%/gmsh-4.14.0.dev1.dist-info/METADATA
+%%PYTHON_SITELIBDIR%%/gmsh-5.0.0.dev1.dist-info/METADATA
 %%PYTHON_SITELIBDIR%%/gmsh.py
 %%PYTHON_SITELIBDIR%%/gmshpy/__init__.py
 %%PYTHON_SITELIBDIR%%/gmshpy/_gmshCommon.so
 %%PYTHON_SITELIBDIR%%/gmshpy/_gmshGeo.so
 %%PYTHON_SITELIBDIR%%/gmshpy/_gmshMesh.so
 %%PYTHON_SITELIBDIR%%/gmshpy/_gmshNumeric.so
 %%PYTHON_SITELIBDIR%%/gmshpy/_gmshPost.so
 %%PYTHON_SITELIBDIR%%/gmshpy/_gmshSolver.so
 %%PYTHON_SITELIBDIR%%/gmshpy/gmshCommon.py
 %%PYTHON_SITELIBDIR%%/gmshpy/gmshGeo.py
 %%PYTHON_SITELIBDIR%%/gmshpy/gmshMesh.py
 %%PYTHON_SITELIBDIR%%/gmshpy/gmshNumeric.py
 %%PYTHON_SITELIBDIR%%/gmshpy/gmshPost.py
 %%PYTHON_SITELIBDIR%%/gmshpy/gmshSolver.py
 %%PYTHON_SITELIBDIR%%/libgmsh.so
-%%PYTHON_SITELIBDIR%%/libgmsh.so.4.14
-%%PYTHON_SITELIBDIR%%/libgmsh.so.4.14.0
-%%DATADIR%%/gmshConfig.cmake
-%%DATADIR%%/gmshTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%DATADIR%%/gmshTargets.cmake
+%%PYTHON_SITELIBDIR%%/libgmsh.so.5.0
+%%PYTHON_SITELIBDIR%%/libgmsh.so.5.0.0