diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk
index bba26ba1c816..8c02a6475155 100644
--- a/Mk/Uses/cmake.mk
+++ b/Mk/Uses/cmake.mk
@@ -1,170 +1,182 @@
 # Provide support for CMake based projects
 #
 # Feature:		cmake
 # Usage:		USES=cmake or USES=cmake:ARGS
 # Valid ARGS:		insource, run, noninja, testing
 # ARGS description:
 # insource		do not perform an out-of-source build
 # noninja		don't use ninja instead of make
 #			Setting this should be an exception, and hints to an issue
 #			inside the ports build system.
 #			A few corner cases never use ninja, and are handled, to reduce
 #			the usage of 'noninja'.:
 #				1) fortran ports
 #				2) ports that set BUILD_- or INSTALL_WRKSRC to
 #				   something different than CONFIGURE_WRKSRC
 # run			add a runtime dependency on cmake
 # testing		add the test target based on ctest
 #			Additionally, CMAKE_TESTING_ON, CMAKE_TESTING_OFF, CMAKE_TESTING_ARGS, CMAKE_TESTING_TARGET
 #			can be defined to override the default values.
+# _internal		Not to be used by any other ports than the ones created from the release-tarball of cmake
 #
 #
 # Additional variables that affect cmake behaviour:
 #
 # User defined variables:
 # CMAKE_NOCOLOR		- Disable colour build output
 #			Default: not set, unless BATCH or PACKAGE_BUILDING is defined
 #
 # Variables for ports:
 # CMAKE_ON		Appends -D<var>:bool=ON  to the CMAKE_ARGS,
 # CMAKE_OFF		Appends -D<var>:bool=OFF to the CMAKE_ARGS.
 # CMAKE_ARGS		- Arguments passed to cmake
 #			Default: see below
 # CMAKE_BUILD_TYPE	- Type of build (cmake predefined build types).
 #			Projects may have their own build profiles.
 #			CMake supports the following types: Debug,
 #			Release, RelWithDebInfo and MinSizeRel.
 #			Debug and Release profiles respect system
 #			CFLAGS, RelWithDebInfo and MinSizeRel will set
 #			CFLAGS to "-O2 -g" and "-Os -DNDEBUG".
 #			Default: Release, if WITH_DEBUG is not set,
 #			Debug otherwise
 # CMAKE_SOURCE_PATH	- Path to the source directory
 #			Default: ${WRKSRC}
 #
 # MAINTAINER: kde@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_CMAKE_MK)
 _INCLUDE_USES_CMAKE_MK=	yes
 
-_valid_ARGS=		insource run noninja testing
+_valid_ARGS=		insource run noninja testing _internal
+
+_CMAKE_VERSION=		3.24.3
 
 # Sanity check
 .  for arg in ${cmake_ARGS}
 .    if empty(_valid_ARGS:M${arg})
 IGNORE=	Incorrect 'USES+= cmake:${cmake_ARGS}' usage: argument [${arg}] is not recognized
 .    endif
 .  endfor
 
+# Check whehter other flags than only '_internal' are passed (this should be equivalent to PORT = devel/cmake-core
+.  if ${cmake_ARGS} != _internal
 CMAKE_BIN=		${LOCALBASE}/bin/cmake
 BUILD_DEPENDS+=		${CMAKE_BIN}:devel/cmake-core
 
-.  if ${cmake_ARGS:Mrun}
+.    if ${cmake_ARGS:Mrun}
 RUN_DEPENDS+=		${CMAKE_BIN}:devel/cmake-core
-.  endif
+.    endif
 
-.  if defined(WITH_DEBUG)
+.    if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE?=	Debug
-.  else
+.    else
 CMAKE_BUILD_TYPE?=	Release
-.  endif #defined(WITH_DEBUG)
+.    endif #defined(WITH_DEBUG)
 
 PLIST_SUB+=		CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:tl}"
 
-.  if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
+.    if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
 INSTALL_TARGET?=	install/strip
-.  endif
+.    endif
 
 CMAKE_ARGS+=		-DCMAKE_C_COMPILER:STRING="${CC}" \
 			-DCMAKE_CXX_COMPILER:STRING="${CXX}" \
 			-DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
 			-DCMAKE_C_FLAGS_DEBUG:STRING="${CFLAGS}" \
 			-DCMAKE_C_FLAGS_RELEASE:STRING="${CFLAGS} -DNDEBUG" \
 			-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
 			-DCMAKE_CXX_FLAGS_DEBUG:STRING="${CXXFLAGS}" \
 			-DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS} -DNDEBUG" \
 			-DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \
 			-DCMAKE_MODULE_LINKER_FLAGS:STRING="${LDFLAGS}" \
 			-DCMAKE_SHARED_LINKER_FLAGS:STRING="${LDFLAGS}" \
 			-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
 			-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
 			-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES \
 			-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=YES \
 			-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 			-DFETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON
 
 # Handle the option-like CMAKE_ON and CMAKE_OFF lists.
-.  for _bool_kind in ON OFF
-.    if defined(CMAKE_${_bool_kind})
+.    for _bool_kind in ON OFF
+.      if defined(CMAKE_${_bool_kind})
 CMAKE_ARGS+=		${CMAKE_${_bool_kind}:C/.*/-D&:BOOL=${_bool_kind}/}
-.    endif
-.  endfor
+.      endif
+.    endfor
 
 CMAKE_INSTALL_PREFIX?=	${PREFIX}
 
-.  if defined(BATCH) || defined(PACKAGE_BUILDING)
+.    if defined(BATCH) || defined(PACKAGE_BUILDING)
 CMAKE_NOCOLOR=		yes
-.  endif
+.    endif
 
-.  if defined(CMAKE_NOCOLOR)
+.    if defined(CMAKE_NOCOLOR)
 CMAKE_ARGS+=		-DCMAKE_COLOR_MAKEFILE:BOOL=OFF
-.  endif
+.    endif
 
 _CMAKE_MSG=		"===>  Performing in-source build"
 CMAKE_SOURCE_PATH?=	${WRKSRC}
 
-.  if empty(cmake_ARGS:Minsource)
+.    if empty(cmake_ARGS:Minsource)
 _CMAKE_MSG=		"===>  Performing out-of-source build"
 CONFIGURE_WRKSRC=	${WRKDIR}/.build
 BUILD_WRKSRC?=		${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC?=	${CONFIGURE_WRKSRC}
 TEST_WRKSRC?=		${CONFIGURE_WRKSRC}
-.  endif
+.    endif
 
 # By default we use the ninja generator.
 #  Except, if cmake:run is set (cmake not wanted as generator)
 #             fortran is used, as the ninja-generator does not handle it.
 #             or if CONFIGURE_WRKSRC does not match  BUILD_WRKSRC or INSTALL_WRKSRC
 #             as the build.ninja file won't be where ninja expects it.
-.  if empty(cmake_ARGS:Mnoninja) && empty(cmake_ARGS:Mrun) && empty(USES:Mfortran)
-.    if "${CONFIGURE_WRKSRC}" == "${BUILD_WRKSRC}" && "${CONFIGURE_WRKSRC}" == "${INSTALL_WRKSRC}"
+.    if empty(cmake_ARGS:Mnoninja) && empty(cmake_ARGS:Mrun) && empty(USES:Mfortran)
+.      if "${CONFIGURE_WRKSRC}" == "${BUILD_WRKSRC}" && "${CONFIGURE_WRKSRC}" == "${INSTALL_WRKSRC}"
 # USES=gmake sets MAKE_CMD and ninja.mk does too (it also messes with MAKEFILE and MAKE_CMD).
-.      if ! empty(USES:Mgmake)
+.        if ! empty(USES:Mgmake)
 BROKEN=		USES=gmake is incompatible with cmake's ninja-generator (try cmake:noninja)
-.      endif
+.        endif
 # USES=emacs appends EMACS=<path> to MAKE_ARGS, which then get passed to ninja.
 # Since ninja doesn't support that kind of variable-setting on the command-line,
 # it errors out.
-.      if ! empty(USES:Memacs)
+.        if ! empty(USES:Memacs)
 BROKEN=		USES=emacs is incompatible with cmake's ninja-generator (try cmake:noninja)
-.      endif
+.        endif
 .      include "${USESDIR}/ninja.mk"
+.      endif
 .    endif
-.  endif
 
-.  if !target(do-configure)
+.    if !target(do-configure)
 do-configure:
 	@${ECHO_MSG} ${_CMAKE_MSG}
 	${MKDIR} ${CONFIGURE_WRKSRC}
 	@cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH}
-.  endif
+.    endif
 
-.  if !target(do-test) && ${cmake_ARGS:Mtesting}
+.    if !target(do-test) && ${cmake_ARGS:Mtesting}
 CMAKE_TESTING_ON?=		BUILD_TESTING
 CMAKE_TESTING_TARGET?=		test
 
 # Handle the option-like CMAKE_TESTING_ON and CMAKE_TESTING_OFF lists.
-.    for _bool_kind in ON OFF
-.      if defined(CMAKE_TESTING_${_bool_kind})
+.      for _bool_kind in ON OFF
+.        if defined(CMAKE_TESTING_${_bool_kind})
 CMAKE_TESTING_ARGS+=		${CMAKE_TESTING_${_bool_kind}:C/.*/-D&:BOOL=${_bool_kind}/}
-.      endif
-.    endfor
+.        endif
+.      endfor
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET}
+.    endif
+.  endif
+
+.  if !empty(cmake_ARGS:M_internal)
+MASTER_SITES?=	https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \
+		https://www.cmake.org/files/v${DISTVERSION}/
+
 .  endif
 
 .endif #!defined(_INCLUDE_USES_CMAKE_MK)
diff --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile
index e26de76210d9..4561410066f5 100644
--- a/devel/cmake-core/Makefile
+++ b/devel/cmake-core/Makefile
@@ -1,96 +1,96 @@
 PORTNAME=	cmake
 # Remember to update devel/cmake-doc and devel/cmake-gui as well.
-DISTVERSION=	3.24.3
+DISTVERSION=	${_CMAKE_VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \
 		https://www.cmake.org/files/v${PORTVERSION}/
 PKGNAMESUFFIX=	-core
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Cross-platform Makefile generator
 WWW=		https://www.cmake.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/Copyright.txt
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libjsoncpp.so:devel/jsoncpp \
 		libuv.so:devel/libuv \
 		librhash.so:security/rhash
 
-USES=		compiler:c++11-lang cpe ncurses
+USES=		cmake:_internal compiler:c++11-lang cpe ncurses
 
 CPE_VENDOR=	cmake_project
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=make
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--datadir="/${DATADIR_REL}" \
 		--docdir="/${DOCSDIR_REL}" \
 		--system-libs \
 		--parallel=${MAKE_JOBS_NUMBER} \
 		--init="${WRKSRC}/InitialCache.cmake"
 
 OPTIONS_DEFINE=	DOCS CPACK
 OPTIONS_SUB=	yes
 
 CPACK_DESC=		Enable FreeBSD generator in CPack (experimental)
 CPACK_LIB_DEPENDS=	libpkg.so:${PKG_ORIGIN}
 CPACK_USES_OFF=		libarchive
 # When CPACK is on, uses base libarchive and won't pass stage-qa
 
 CXXFLAGS+=	-D__BSD_VISIBLE
 
 .include <bsd.port.pre.mk>
 
 .if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
 INSTALL_TARGET=	install/strip
 .endif
 
 # Before running configure, substitute in the values of options
 # for the build. CMake's configure doesn't accept --with-foo
 # or similar options: it expects them to be set in CMake-style
 # syntax in the initial cache.
 pre-configure:
 	@${CP} "${FILESDIR}/InitialCache.cmake" "${WRKSRC}/InitialCache.cmake"
 
 pre-configure-CPACK-on:
 	@${REINPLACE_CMD} \
 		-e 's/@@CPACK_OPTION_VALUE@@/ON/' \
 		-e 's/@@CPACK_OPTION_COMMENT@@//' \
 		"${WRKSRC}/InitialCache.cmake"
 
 pre-configure-CPACK-off:
 	@${REINPLACE_CMD} \
 		-e 's/@@CPACK_OPTION_VALUE@@/OFF/' \
 		-e 's/@@CPACK_OPTION_COMMENT@@/# /' \
 		"${WRKSRC}/InitialCache.cmake"
 
 post-patch:
 	@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \
 		${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \
 		${XARGS} -0 -n 100 ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g; \
 			s,/usr/X11R6,${LOCALBASE},g'
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 		${WRKSRC}/Source/cmLocalGenerator.cxx \
 		${WRKSRC}/Source/CPack/cmCPackGenerator.cxx \
 		${WRKSRC}/bootstrap
 	@${REINPLACE_CMD} -e 's,/opt/kde4,${PREFIX},g' \
 		${WRKSRC}/Modules/FindKDE4.cmake
 	@${REINPLACE_CMD} -e 's,/usr/include,${LOCALBASE}/include,' \
 		${WRKSRC}/Modules/FindDCMTK.cmake
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/Modules/FindFLEX.cmake
 	@${FIND} ${WRKSRC} -name "*.bak" -delete -o -name "*.orig" -delete
 
 # cmake-gui(1) is installed by devel/cmake-gui. Remove the man page's source to
 # prevent it from being built/installed by devel/cmake.
 	${RM} ${WRKSRC}/Help/manual/cmake-gui.1.rst
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Auxiliary/cmake-mode.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp
 	# The .NoDartCoverage is supposed to suppress testing in the
 	# source directories, but gets accidentally installed.
 	@${FIND} ${STAGEDIR}${PREFIX} -name ".NoDartCoverage" -delete
 
 .include <bsd.port.post.mk>
diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile
index c7c2f79f4a1e..4da5ba04af7d 100644
--- a/devel/cmake-doc/Makefile
+++ b/devel/cmake-doc/Makefile
@@ -1,34 +1,33 @@
 PORTNAME=	cmake
-DISTVERSION=	3.24.3
+DISTVERSION=	${_CMAKE_VERSION}
 CATEGORIES=	devel
-MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-doc
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	HTML and Qt Creator helpfiles for CMake
 WWW=		https://www.cmake.org
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/Copyright.txt
 
 BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 DISTINFO_FILE=	${.CURDIR}/../cmake-core/distinfo
 
 NO_ARCH=	yes
 USES=		cmake qt:5
 USE_QT=		help:build
 USE_LOCALE=	en_US.UTF-8
 
 CMAKE_OFF=	SPHINX_MAN
 CMAKE_ON=	SPHINX_HTML SPHINX_QTHELP
 CMAKE_ARGS=	-DCMAKE_DOC_DIR:STRING="${DOCSDIR_REL}" \
 		-DQHELPGENERATOR_EXECUTABLE=${QT_BINDIR}/qhelpgenerator
 CMAKE_SOURCE_PATH=	${WRKSRC}/Utilities/Sphinx
 
 ALL_TARGET=	documentation
 INSTALL_TARGET=	install
 
 PLIST_SUB=	CMAKEVERSION="${DISTVERSION:S/.//g:C/-.*//}"
 
 .include <bsd.port.mk>
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index f3c21bf90e82..8fc18a76114a 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -1,62 +1,61 @@
 PORTNAME=	cmake
-DISTVERSION=	3.24.3
+DISTVERSION=	${_CMAKE_VERSION}
 CATEGORIES=	devel
-MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-gui-${FLAVOR}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt-based GUI for CMake
 WWW=		https://www.cmake.org
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/Copyright.txt
 
 BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libjsoncpp.so:devel/jsoncpp \
 		libuv.so:devel/libuv \
 		librhash.so:security/rhash
 
 FLAVORS=	qt5 qt6
 FLAVOR?=	qt5
 
 qt5_CONFLICTS_INSTALL=	cmake-gui-qt6
 qt6_CONFLICTS_INSTALL=	cmake-gui-qt5
 
 USES=		cmake:run,insource compiler:c++11-lang desktop-file-utils libarchive \
 		shared-mime-info qt:${FLAVOR:S/qt//}
 _USE_QT5=	core gui widgets buildtools:build qmake:build
 _USE_QT6=	base
 USE_QT=		${_USE_QT${FLAVOR:S/qt//}}
 CMAKE_ARGS=	-DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \
 		-DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \
 		-DCMake_QT_MAJOR_VERSION=${FLAVOR:S/qt//}
 CMAKE_ON=	BUILD_QtDialog \
 		CMAKE_USE_SYSTEM_LIBRARIES \
 		SPHINX_MAN
 CMAKE_OFF=	BUILD_CursesDialog \
 		CMake_SPHINX_DEPEND_ON_EXECUTABLES
 
 ALL_TARGET=	cmake-gui documentation
 
 CXXFLAGS+=	-D__BSD_VISIBLE
 
 INSTALL_WRKSRC=	${WRKSRC}/Source/QtDialog
 
 DISTINFO_FILE=	${.CURDIR}/../cmake-core/distinfo
 
 post-patch:
 	@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \
 		${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \
 		${XARGS} -0 -n 100 ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g; \
 			s,/usr/X11R6,${LOCALBASE},g'
 
 pre-install:
 	${LN} -sf ${CMAKE_BIN} ${WRKSRC}/bin
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/Utilities/Sphinx/man/cmake-gui.1 \
 		${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/cmake-man/Makefile b/devel/cmake-man/Makefile
index f20282e33ad1..52cc7adfd9f1 100644
--- a/devel/cmake-man/Makefile
+++ b/devel/cmake-man/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	cmake
-DISTVERSION=	3.24.3
+DISTVERSION=	${_CMAKE_VERSION}
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \
-		https://www.cmake.org/files/v${DISTVERSION}/
 PKGNAMESUFFIX=	-man
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Manual pages for CMake
 WWW=		https://www.cmake.org/
 
 LICENSE=	BSD3CLAUSE
 
+DISTINFO_FILE=	${.CURDIR}/../cmake-core/distinfo
+
 BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 USES=		cmake
 USE_LOCALE=	en_US.UTF-8
 
 NO_ARCH=	yes
 DISTINFO_FILE=	${.CURDIR}/../cmake-core/distinfo
 
 CMAKE_OFF=	SPHINX_HTML SPHINX_QTHELP
 CMAKE_ON=	SPHINX_MAN
 CMAKE_ARGS=	-DCMAKE_DOC_DIR:STRING="${DOCSDIR_REL}"
 CMAKE_SOURCE_PATH=	${WRKSRC}/Utilities/Sphinx
 
 ALL_TARGET=	documentation
 INSTALL_TARGET=	install
 
 PLIST_SUB=	CMAKEVERSION="${DISTVERSION:S/.//g:C/-.*//}"
 
 post-install:
 # Installed by devel/cmake-gui
 	@${RM} ${STAGEDIR}${PREFIX}/man/man1/cmake-gui.1
 
 .include <bsd.port.mk>
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 61c8814a97e2..fe3cc2a9ae1a 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	cmake
-DISTVERSION=	3.24.3
+DISTVERSION=	${_CMAKE_VERSION}
 CATEGORIES=	devel
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Meta-port to connect all CMake bits
 WWW=		https://www.cmake.org/
 
 LICENSE=	BSD3CLAUSE
 
 USES=		cmake:run metaport
 
 NO_LICENSES_INSTALL=	yes
 PLIST_FILES=	# not applicable
 
 OPTIONS_DEFINE=	DOCS GUI MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 
 GUI_DESC=		Qt-based GUI
 
 DOCS_RUN_DEPENDS=	${LOCALBASE}/share/doc/cmake/html/index.html:devel/cmake-doc
 GUI_RUN_DEPENDS=	${LOCALBASE}/bin/cmake-gui:devel/cmake-gui
 MANPAGES_RUN_DEPENDS=	${LOCALBASE}/man/man1/cmake.1.gz:devel/cmake-man
 
 # Mk/Uses/cmake.mk sets do-configure which we don't want for a meta-port
 do-configure:
 
 .include <bsd.port.mk>
diff --git a/devel/kms-cmake-utils/Makefile b/devel/kms-cmake-utils/Makefile
index 5bb55a8231e7..05010bb4dc08 100644
--- a/devel/kms-cmake-utils/Makefile
+++ b/devel/kms-cmake-utils/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	kms-cmake-utils
 DISTVERSION=	6.18.0
 PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	CMake common files used to build all Kurento C/C++ projects
 WWW=		https://github.com/Kurento/kms-cmake-utils
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	Kurento
 
 NO_ARCH=	yes
 
-PLIST_SUB=	CMAKE_VERSION=3.24
+PLIST_SUB=	CMAKE_VERSION=${_CMAKE_VERSION:R}
 
 .include <bsd.port.mk>