diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk
index c6e1f6ec8305..57575ac913a2 100644
--- a/Mk/Uses/cmake.mk
+++ b/Mk/Uses/cmake.mk
@@ -1,182 +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 _internal
 
-_CMAKE_VERSION=		3.28.1
+_CMAKE_VERSION=		3.28.2
 
 # 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}
 RUN_DEPENDS+=		${CMAKE_BIN}:devel/cmake-core
 .    endif
 
 .    if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE?=	Debug
 .    else
 CMAKE_BUILD_TYPE?=	Release
 .    endif #defined(WITH_DEBUG)
 
 PLIST_SUB+=		CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:tl}"
 
 .    if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
 INSTALL_TARGET?=	install/strip
 .    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})
 CMAKE_ARGS+=		${CMAKE_${_bool_kind}:C/.*/-D&:BOOL=${_bool_kind}/}
 .      endif
 .    endfor
 
 CMAKE_INSTALL_PREFIX?=	${PREFIX}
 
 .    if defined(BATCH) || defined(PACKAGE_BUILDING)
 CMAKE_NOCOLOR=		yes
 .    endif
 
 .    if defined(CMAKE_NOCOLOR)
 CMAKE_ARGS+=		-DCMAKE_COLOR_MAKEFILE:BOOL=OFF
 .    endif
 
 _CMAKE_MSG=		"===>  Performing in-source build"
 CMAKE_SOURCE_PATH?=	${WRKSRC}
 
 .    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
 
 # 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}"
 # USES=gmake sets MAKE_CMD and ninja.mk does too (it also messes with MAKEFILE and MAKE_CMD).
 .        if ! empty(USES:Mgmake)
 BROKEN=		USES=gmake is incompatible with cmake's ninja-generator (try cmake:noninja)
 .        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)
 BROKEN=		USES=emacs is incompatible with cmake's ninja-generator (try cmake:noninja)
 .        endif
 .      include "${USESDIR}/ninja.mk"
 .      endif
 .    endif
 
 .    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
 
 .    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})
 CMAKE_TESTING_ARGS+=		${CMAKE_TESTING_${_bool_kind}:C/.*/-D&:BOOL=${_bool_kind}/}
 .        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 0d56c7fc5db9..127a5da4982c 100644
--- a/devel/cmake-core/Makefile
+++ b/devel/cmake-core/Makefile
@@ -1,110 +1,107 @@
 PORTNAME=	cmake
 # Remember to update devel/cmake-doc and devel/cmake-gui as well.
 DISTVERSION=	${_CMAKE_VERSION}
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-core
 
-PATCH_SITES=	https://gitlab.kitware.com/cmake/cmake/-/commit/
-PATCHFILES=	61436858e431b137252b3d5e63ee579c7c575103.patch:-p1 # Fix pkg-config trailing whitespace
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Cross-platform Makefile generator
 WWW=		https://www.cmake.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/Copyright.txt
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libjsoncpp.so:devel/jsoncpp \
 		libuv.so:devel/libuv \
 		librhash.so:security/rhash
 
 USES=		cmake:_internal compiler:c++11-lang cpe localbase ncurses ssl
 
 CPE_VENDOR=	cmake_project
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=make
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--datadir="/${DATADIR_REL}" \
 		--docdir="/${DOCSDIR_REL}" \
 		--system-expat \
 		--system-jsoncpp \
 		--system-zlib \
 		--system-zstd \
 		--system-bzip2 \
 		--system-liblzma \
 		--system-libarchive \
 		--system-librhash \
 		--system-libuv \
 		--no-system-cppdap \
 		--no-system-curl \
 		--no-system-nghttp2 \
 		--parallel=${MAKE_JOBS_NUMBER} \
 		--init="${WRKSRC}/InitialCache.cmake"
 
 # Quick fix to enable build with non-base SSL (PR: 274512)
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 
 OPTIONS_DEFINE=		DOCS CPACK
 OPTIONS_DEFAULT=	CPACK
 OPTIONS_SUB=		yes
 
 CPACK_DESC=		Enable FreeBSD generator in CPack (experimental)
 CPACK_LIB_DEPENDS=	libpkg.so:${PKG_ORIGIN}
 
 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"
 	@${FIND} ${WRKSRC} -name "*.bak" -delete -o -name "*.orig" -delete
 
 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
 
 # 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-core/distinfo b/devel/cmake-core/distinfo
index 836e0fa39de9..0cb0e15d0571 100644
--- a/devel/cmake-core/distinfo
+++ b/devel/cmake-core/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1703157829
-SHA256 (cmake-3.28.1.tar.gz) = 15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad
-SIZE (cmake-3.28.1.tar.gz) = 11065923
+TIMESTAMP = 1706732211
+SHA256 (cmake-3.28.2.tar.gz) = 1466f872dc1c226f373cf8fba4230ed216a8f108bd54b477b5ccdfd9ea2d124a
+SIZE (cmake-3.28.2.tar.gz) = 11067468
 SHA256 (61436858e431b137252b3d5e63ee579c7c575103.patch) = d18eb7ae3ccb364b7a38a8de73f392f8abd4a26b8d59462983038f570df3c146
 SIZE (61436858e431b137252b3d5e63ee579c7c575103.patch) = 1949
diff --git a/devel/cmake-core/files/patch-Modules_FindFreetype.cmake b/devel/cmake-core/files/patch-Modules_FindFreetype.cmake
deleted file mode 100644
index 43bee7c19f86..000000000000
--- a/devel/cmake-core/files/patch-Modules_FindFreetype.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-Hunk 1: Set FREETYPE_INCLUDE_DIR_ft2build and FREETYPE_INCLUDE_DIR_freetype2
-if the freetype config is found for backwards compatibility.
-Regressed by [1].
-
-Hunk 2: Fix some weirdness that happens in games/arx-libertatis where the
-the REMOVE_DUPLICATES directive of the CMake list() command removes the
-OpenAL library from the link libraries list because it was the next
-library in the list. It is unlikely that one would have both the debug
-and release versions of FreeType installed on FreeBSD as we don't
-currently have the infrastructure to simultaneously support a suffixed
-and non-suffixed freetype library. Honestly, I don't even know what this
-contruct is supposed to represent. The CMake set() command [3] doesn't
-specify allowance of metadata constructs like "optimized" and "debug"
-before variable assignment and further confuses ports like
-graphics/ogre3d that try to link against nonsense libraries like
--loptimized and -ldebug.
-Regessed by [2].
-
-[1] https://gitlab.kitware.com/cmake/cmake/-/commit/d83d925045484c882527477b01596073f45d3faa
-[2] https://gitlab.kitware.com/cmake/cmake/-/commit/1cfc708eea11df5fd8c438f517e24940b6cc1917
-[3] https://cmake.org/cmake/help/latest/command/set.html
-
---- Modules/FindFreetype.cmake.orig	2023-12-14 15:47:27 UTC
-+++ Modules/FindFreetype.cmake
-@@ -106,6 +106,8 @@ if (freetype_FOUND)
-       INTERFACE_LINK_LIBRARIES freetype)
-   endif ()
-   get_property(FREETYPE_INCLUDE_DIRS TARGET freetype PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-+  get_property(FREETYPE_INCLUDE_DIR_ft2build TARGET freetype PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-+  get_property(FREETYPE_INCLUDE_DIR_freetype2 TARGET freetype PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-   get_property(FREETYPE_LIBRARIES TARGET freetype PROPERTY INTERFACE_LINK_LIBRARIES)
-   get_property(_Freetype_location TARGET freetype PROPERTY IMPORTED_IMPLIB)
-   if (NOT _Freetype_location)
-@@ -128,11 +130,7 @@ if (freetype_FOUND)
-         get_property(_Freetype_location_release TARGET freetype PROPERTY LOCATION_RELWITHDEBINFO)
-       endif ()
-       get_property(_Freetype_location_debug TARGET freetype PROPERTY LOCATION_DEBUG)
--      if (_Freetype_location_release AND _Freetype_location_debug)
--        set(_Freetype_location
--          optimized "${_Freetype_location_release}"
--          debug "${_Freetype_location_debug}")
--      elseif (_Freetype_location_release)
-+      if (_Freetype_location_release)
-         set(_Freetype_location "${_Freetype_location_release}")
-       elseif (_Freetype_location_debug)
-         set(_Freetype_location "${_Freetype_location_debug}")
diff --git a/devel/cmake-core/files/patch-Source_cmQtAutoGenInitializer.cxx b/devel/cmake-core/files/patch-Source_cmQtAutoGenInitializer.cxx
deleted file mode 100644
index 135878301077..000000000000
--- a/devel/cmake-core/files/patch-Source_cmQtAutoGenInitializer.cxx
+++ /dev/null
@@ -1,25 +0,0 @@
-CMake >= 3.27 exports the CXX std to moc. This is a workaround for
-a moc parsing bug that happens parsing headers from libc++ < 14 when
-the CXX std > 17.
-
-usr/include/c++/v1/concept:318:1: error: Parse error at "::" [1]
-
-Moc should theoretically be able to parse this. [2] Not exactly sure
-why it's failing.
-
-[1] https://cgit.freebsd.org/src/tree/contrib/llvm-project/libcxx/include/concepts?h=stable/12#n318
-[2] https://code.qt.io/cgit/qt/qtbase.git/tree/src/tools/moc/moc.cpp?h=6.6.0#n631
-
---- Source/cmQtAutoGenInitializer.cxx.orig	2023-10-06 13:08:35 UTC
-+++ Source/cmQtAutoGenInitializer.cxx
-@@ -1797,6 +1797,10 @@ bool cmQtAutoGenInitializer::SetupWriteAutogenInfo()
-       if (this->Moc.PredefsCmd.size() >= 3) {
-         this->Moc.PredefsCmd.insert(this->Moc.PredefsCmd.begin() + 1,
-                                     CompileOptionValue);
-+#if defined(__FreeBSD__) && __FreeBSD_version < 1302000
-+        this->Moc.PredefsCmd.insert(this->Moc.PredefsCmd.begin() + 1,
-+                                    "-D_LIBCPP_HAS_NO_CONCEPTS");
-+#endif
-       }
-     }
-     info.SetArray("MOC_PREDEFS_CMD", this->Moc.PredefsCmd);
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index 93b80bca5260..891d82a48971 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	cmake
 DISTVERSION=	${_CMAKE_VERSION}
 CATEGORIES=	devel
 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_QT_qt5=	core gui widgets buildtools:build qmake:build
 _USE_QT_qt6=	base
 USE_QT=		${_USE_QT_${FLAVOR}}
 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_CURL \
 		CMAKE_USE_SYSTEM_EXPAT \
 		CMAKE_USE_SYSTEM_FORM \
 		CMAKE_USE_SYSTEM_JSONCPP \
 		CMAKE_USE_SYSTEM_LIBARCHIVE \
 		CMAKE_USE_SYSTEM_LIBRHASH \
 		CMAKE_USE_SYSTEM_LIBUV \
 		SPHINX_MAN
 CMAKE_OFF=	BUILD_CursesDialog \
 		CMake_SPHINX_DEPEND_ON_EXECUTABLES \
 		CMAKE_USE_SYSTEM_CPPDAP
 
 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
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/cmake-gui/pkg-plist b/devel/cmake-gui/pkg-plist
index c8776a4ce24e..ecf8b2669453 100644
--- a/devel/cmake-gui/pkg-plist
+++ b/devel/cmake-gui/pkg-plist
@@ -1,6 +1,6 @@
 bin/cmake-gui
-man/man1/cmake-gui.1.gz
 share/applications/cmake-gui.desktop
 share/icons/hicolor/128x128/apps/CMakeSetup.png
 share/icons/hicolor/32x32/apps/CMakeSetup.png
+share/man/man1/cmake-gui.1.gz
 share/mime/packages/cmakecache.xml
diff --git a/devel/cmake-man/Makefile b/devel/cmake-man/Makefile
index 52cc7adfd9f1..1be3e0ec0420 100644
--- a/devel/cmake-man/Makefile
+++ b/devel/cmake-man/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	cmake
 DISTVERSION=	${_CMAKE_VERSION}
 CATEGORIES=	devel
 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_ARGS=	-DCMAKE_DOC_DIR:STRING="${DOCSDIR_REL}" \
+		-DCMAKE_MAN_DIR:STRING="share/man"
 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
+	@${RM} ${STAGEDIR}${PREFIX}/share/man/man1/cmake-gui.1
 
 .include <bsd.port.mk>
diff --git a/devel/cmake-man/pkg-plist b/devel/cmake-man/pkg-plist
index 5c78b9e6bd6e..149ce217571e 100644
--- a/devel/cmake-man/pkg-plist
+++ b/devel/cmake-man/pkg-plist
@@ -1,25 +1,25 @@
-man/man1/ccmake.1.gz
-man/man1/cmake.1.gz
-man/man1/cpack.1.gz
-man/man1/ctest.1.gz
-man/man7/cmake-buildsystem.7.gz
-man/man7/cmake-commands.7.gz
-man/man7/cmake-compile-features.7.gz
-man/man7/cmake-configure-log.7.gz
-man/man7/cmake-cxxmodules.7.gz
-man/man7/cmake-developer.7.gz
-man/man7/cmake-env-variables.7.gz
-man/man7/cmake-file-api.7.gz
-man/man7/cmake-generator-expressions.7.gz
-man/man7/cmake-generators.7.gz
-man/man7/cmake-language.7.gz
-man/man7/cmake-modules.7.gz
-man/man7/cmake-packages.7.gz
-man/man7/cmake-policies.7.gz
-man/man7/cmake-presets.7.gz
-man/man7/cmake-properties.7.gz
-man/man7/cmake-qt.7.gz
-man/man7/cmake-server.7.gz
-man/man7/cmake-toolchains.7.gz
-man/man7/cmake-variables.7.gz
-man/man7/cpack-generators.7.gz
+share/man/man1/ccmake.1.gz
+share/man/man1/cmake.1.gz
+share/man/man1/cpack.1.gz
+share/man/man1/ctest.1.gz
+share/man/man7/cmake-buildsystem.7.gz
+share/man/man7/cmake-commands.7.gz
+share/man/man7/cmake-compile-features.7.gz
+share/man/man7/cmake-configure-log.7.gz
+share/man/man7/cmake-cxxmodules.7.gz
+share/man/man7/cmake-developer.7.gz
+share/man/man7/cmake-env-variables.7.gz
+share/man/man7/cmake-file-api.7.gz
+share/man/man7/cmake-generator-expressions.7.gz
+share/man/man7/cmake-generators.7.gz
+share/man/man7/cmake-language.7.gz
+share/man/man7/cmake-modules.7.gz
+share/man/man7/cmake-packages.7.gz
+share/man/man7/cmake-policies.7.gz
+share/man/man7/cmake-presets.7.gz
+share/man/man7/cmake-properties.7.gz
+share/man/man7/cmake-qt.7.gz
+share/man/man7/cmake-server.7.gz
+share/man/man7/cmake-toolchains.7.gz
+share/man/man7/cmake-variables.7.gz
+share/man/man7/cpack-generators.7.gz