OpenBSD Mail Box: HEADS UP UPDATE: devel/cmake from 3.x to 4.x

On Fri Oct 10, 2025 at 10:15:22PM +0200, Rafael Sadowski wrote:
> Here is a diff to update CMake to 4.1.2 and modernise our cmake port.
> Get rid of a lot of old legacy stuff and patches as they are no
> longer needed.
>
> As you can see from the diff, CMake expected version >=3.5. (This
> version must be specified for every CMake project.) Since we build
> projects that are quite old - we still have many 2.x projects.
>
> A simple -DCMAKE_POLICY_VERSION_MINIMUM=3.5 is usually enough.
> Unless there are any bundled CMake projects with older cmake
> versions.
>
> For this such ports, I have such a helper sed (better solution welcome):
>
> +# find ${WRKSRC} -name "CMakeLists.txt" -type f -exec sed -i \
> +# -E 's/cmake_minimum_required$[[:space:]]*VERSION[[:space:]]+[^)]+$/cmake_minimum_required(VERSION 3.5)/g' \
> +# {} \;
>
> What I can't fix at the moment is: "audio/ncspot". Somehow, it's not
> a CMake port, but it uses cmake(1), and when I changed the rust cargo stuff
> with the sed patch, I get a message saying that the file has been
> changed -- cargo protection works ;)
>

I would like to commit this gigantic diff. It went throw a amr64 bulk
build. If some errors still occur, can we fix them in the tree?
Otherwise, I always work against rebase+rebuild.

Objections?

Rafael

diff --git a/archivers/blosc/Makefile b/archivers/blosc/Makefile
index ac411ea46fe..0480e656fa5 100644
--- a/archivers/blosc/Makefile
+++ b/archivers/blosc/Makefile
@@ -32,4 +32,6 @@ CONFIGURE_ARGS = -DPREFER_EXTERNAL_LZ4=ON \
-DPREFER_EXTERNAL_ZLIB=ON \
-DPREFER_EXTERNAL_ZSTD=ON

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/archivers/innoextract/Makefile b/archivers/innoextract/Makefile
index ae707aee032..de59ba0b97f 100644
--- a/archivers/innoextract/Makefile
+++ b/archivers/innoextract/Makefile
@@ -33,6 +33,8 @@ CONFIGURE_ARGS+=-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_INSTALL_MANDIR="man" \
-DDOXYGEN_EXECUTABLE="false"

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
NO_TEST= Yes

.include <bsd.port.arch.mk>
diff --git a/archivers/innoextract/patches/patch-cmake_VersionScript_cmake b/archivers/innoextract/patches/patch-cmake_VersionScript_cmake
new file mode 100644
index 00000000000..c7714b4fdc0
--- /dev/null
+++ b/archivers/innoextract/patches/patch-cmake_VersionScript_cmake
@@ -0,0 +1,12 @@
+Index: cmake/VersionScript.cmake
+--- cmake/VersionScript.cmake.orig
++++ cmake/VersionScript.cmake
+@@ -17,7 +17,7 @@
+ # misrepresented as being the original software.
+ # 3. This notice may not be removed or altered from any source distribution.
+
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+
+ # CMake script that reads a VERSION file and the current git history and the calls configure_file().
+ # This is used by version_file() in VersionString.cmake
diff --git a/archivers/libzip/Makefile b/archivers/libzip/Makefile
index 7049c0b0af4..a5452fa984a 100644
--- a/archivers/libzip/Makefile
+++ b/archivers/libzip/Makefile
@@ -25,4 +25,6 @@ CONFIGURE_ARGS = -DENABLE_COMMONCRYPTO=OFF \
-DENABLE_GNUTLS=OFF \
-DENABLE_MBEDTLS=OFF

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile
index 900593d975e..467d4eaa936 100644
--- a/archivers/snappy/Makefile
+++ b/archivers/snappy/Makefile
@@ -25,6 +25,8 @@ CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON \
-DINSTALL_GTEST=OFF \
-DSNAPPY_BUILD_BENCHMARKS=OFF

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.if ${MACHINE_ARCH:Marm}
CONFIGURE_ARGS += -DSNAPPY_HAVE_NEON=OFF \
-DSNAPPY_HAVE_NEON_CRC32=OFF
diff --git a/archivers/unarr/Makefile b/archivers/unarr/Makefile
index 4d600593752..6dd8e406d60 100644
--- a/archivers/unarr/Makefile
+++ b/archivers/unarr/Makefile
@@ -25,6 +25,8 @@ EXTRACT_SUFX = .tar.xz

MODULES = devel/cmake

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
LIB_DEPENDS = archivers/bzip2 \
archivers/xz

diff --git a/archivers/unshield/Makefile b/archivers/unshield/Makefile
index c06df2efa81..7c01f245d4e 100644
--- a/archivers/unshield/Makefile
+++ b/archivers/unshield/Makefile
@@ -17,6 +17,8 @@ WANTLIB= c crypto z

MODULES = devel/cmake

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
NO_TEST= Yes

.include <bsd.port.mk>
diff --git a/archivers/woff2/Makefile b/archivers/woff2/Makefile
index 75fc3fcfa1e..ebce6b2b8e0 100644
--- a/archivers/woff2/Makefile
+++ b/archivers/woff2/Makefile
@@ -20,6 +20,8 @@ WANTLIB += ${COMPILER_LIBCXX} brotlidec brotlienc c m
COMPILER= base-clang ports-gcc base-gcc
MODULES= devel/cmake

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
LIB_DEPENDS= archivers/brotli

NO_TEST= Yes
diff --git a/archivers/zipios/Makefile b/archivers/zipios/Makefile
index 0fd261ddc70..e6dedcdbf14 100644
--- a/archivers/zipios/Makefile
+++ b/archivers/zipios/Makefile
@@ -25,4 +25,6 @@ MODULES = devel/cmake
CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
-DBUILD_ZIPIOS_TESTS=OFF

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/archivers/zopfli/Makefile b/archivers/zopfli/Makefile
index e4a7901d6d0..1ffa8fe9deb 100644
--- a/archivers/zopfli/Makefile
+++ b/archivers/zopfli/Makefile
@@ -18,6 +18,7 @@ WANTLIB += ${COMPILER_LIBCXX} c m
MODULES = devel/cmake
COMPILER = base-clang ports-gcc base-gcc
CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=yes
+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
NO_TEST = Yes

.include <bsd.port.mk>
diff --git a/archivers/zziplib/Makefile b/archivers/zziplib/Makefile
index 872ae14f249..4c95914d782 100644
--- a/archivers/zziplib/Makefile
+++ b/archivers/zziplib/Makefile
@@ -30,6 +30,7 @@ MODULES = devel/cmake \
MODPY_RUNDEP = No

MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5

TEST_TARGET = tests

diff --git a/astro/stellarsolver/Makefile b/astro/stellarsolver/Makefile
index f223267d080..36c20f58812 100644
--- a/astro/stellarsolver/Makefile
+++ b/astro/stellarsolver/Makefile
@@ -28,5 +28,6 @@ LIB_DEPENDS = astro/wcslib \
math/cfitsio

CONFIGURE_ARGS = -DUSE_QT5=OFF
+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5

.include <bsd.port.mk>
diff --git a/audio/audiality2/Makefile b/audio/audiality2/Makefile
index 7338a1a45d7..c7a2361b34e 100644
--- a/audio/audiality2/Makefile
+++ b/audio/audiality2/Makefile
@@ -23,6 +23,8 @@ LIB_DEPENDS = devel/sdl2

CONFIGURE_ARGS = -DUSE_JACK=OFF

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
NO_TEST = Yes

.include <bsd.port.mk>
diff --git a/audio/chromaprint/Makefile b/audio/chromaprint/Makefile
index c535b68aa7b..5ef284dff08 100644
--- a/audio/chromaprint/Makefile
+++ b/audio/chromaprint/Makefile
@@ -31,6 +31,8 @@ CONFIGURE_ARGS = -DBUILD_TOOLS=ON \
CXXFLAGS += -I${LOCALBASE}/include
MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
do-test:
${WRKBUILD}/tests/all_tests

diff --git a/audio/clementine/Makefile b/audio/clementine/Makefile
index da419a2a9c3..a162cf5deea 100644
--- a/audio/clementine/Makefile
+++ b/audio/clementine/Makefile
@@ -97,6 +97,8 @@ CONFIGURE_ARGS += -DBUNDLE_PROJECTM_PRESETS=ON

MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
#CXXFLAGS+=" -Wno-error=cpp"

post-extract:
diff --git a/audio/clementine/patches/patch-3rdparty_libprojectm_CMakeLists_txt b/audio/clementine/patches/patch-3rdparty_libprojectm_CMakeLists_txt
index 0fc4440be97..9e499193487 100644
--- a/audio/clementine/patches/patch-3rdparty_libprojectm_CMakeLists_txt
+++ b/audio/clementine/patches/patch-3rdparty_libprojectm_CMakeLists_txt
@@ -1,15 +1,21 @@
Index: 3rdparty/libprojectm/CMakeLists.txt
--- 3rdparty/libprojectm/CMakeLists.txt.orig
+++ 3rdparty/libprojectm/CMakeLists.txt
-@@ -11,13 +11,15 @@ if (CMAKE_VERSION VERSION_GREATER "2.8.3")
- cmake_policy(SET CMP0017 OLD)
- endif (CMAKE_VERSION VERSION_GREATER "2.8.3")
+@@ -4,12 +4,8 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The projectM co

+ include(CheckCXXCompilerFlag)
+
+-cmake_policy(SET CMP0005 OLD)
+
+-# This policy was only added in cmake 2.8.4
+-if (CMAKE_VERSION VERSION_GREATER "2.8.3")
+- cmake_policy(SET CMP0017 OLD)
+-endif (CMAKE_VERSION VERSION_GREATER "2.8.3")
+set(CMAKE_CXX_STANDARD 14)

-+
+
set(USE_DEVIL OFF)
- set(USE_FBO ON)
+@@ -17,7 +13,7 @@ set(USE_FBO ON)
set(USE_FTGL OFF)
set(USE_GLES1 OFF)
set(USE_THREADS OFF)
@@ -18,7 +24,7 @@ Index: 3rdparty/libprojectm/CMakeLists.txt
set(USE_NATIVE_GLEW OFF)
set(USE_CG OFF)
set(BUILD_PROJECTM_STATIC ON)
-@@ -166,7 +168,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libproject
+@@ -166,7 +162,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libproject
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_SOURCE_DIR}/config.inp" @ONLY)

if(BUNDLE_PROJECTM_PRESETS)
diff --git a/audio/clementine/patches/patch-CMakeLists_txt b/audio/clementine/patches/patch-CMakeLists_txt
new file mode 100644
index 00000000000..d9e9f0e7cf1
--- /dev/null
+++ b/audio/clementine/patches/patch-CMakeLists_txt
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -1,8 +1,6 @@
+ cmake_minimum_required(VERSION 3.13.0)
+ project(clementine)
+
+-cmake_policy(SET CMP0053 OLD)
+-
+ include(CheckCXXCompilerFlag)
+ include(FindPkgConfig)
+ include(cmake/C++11Compat.cmake)
diff --git a/audio/glyr/Makefile b/audio/glyr/Makefile
index 6614f930cae..9e81c9cd35d 100644
--- a/audio/glyr/Makefile
+++ b/audio/glyr/Makefile
@@ -18,6 +18,8 @@ LIB_DEPENDS += net/curl \
databases/sqlite3 \
devel/glib2

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
NO_TEST = Yes

.include <bsd.port.mk>
diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index 6ae89dc1bad..ac79c6d1c1c 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -45,4 +45,6 @@ MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib -L${X11BASE}/lib

NO_TEST = Yes

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index cbd77e895ff..a6edf1c9b14 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -51,12 +51,19 @@ CONFIGURE_ARGS= -DWANT_ALSA=OFF \
# Disable Doxygen
CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
post-extract:
cp ${FILESDIR}/Sndio{Audio,Midi}Driver.h \
${WRKSRC}/src/core/include/hydrogen/IO
cp ${FILESDIR}/sndio_{audio,midi}_driver.cpp \
${WRKSRC}/src/core/src/IO

+pre-configure:
+ find ${WRKSRC}/ -name "CMakeLists.txt" -type f -exec sed -i \
+ -E 's/CMAKE_MINIMUM_REQUIRED$[[:space:]]*VERSION[[:space:]]+[^)]+$/cmake_minimum_required(VERSION 3.5)/g' \
+ {} \;
+
post-install:
cp -rp ${WRKSRC}/data/doc ${PREFIX}/share/doc/hydrogen

diff --git a/audio/libcue/Makefile b/audio/libcue/Makefile
index 55155d92ba9..b8751fc10aa 100644
--- a/audio/libcue/Makefile
+++ b/audio/libcue/Makefile
@@ -16,6 +16,7 @@ MODULES = devel/cmake
BUILD_DEPENDS = devel/bison

CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=ON
+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5

NO_TEST = Yes

diff --git a/audio/libebur128/Makefile b/audio/libebur128/Makefile
index 1d499cb0924..88d4795d6e2 100644
--- a/audio/libebur128/Makefile
+++ b/audio/libebur128/Makefile
@@ -16,6 +16,8 @@ WANTLIB += m
MODULES = devel/cmake
DEBUG_PACKAGES = ${BUILD_PACKAGES}

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
# enabling tests is somewhat useless: extra build dependency on
# libsndfile, plus the test requires a wav file to be useful,
# and it's definitely interactive
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index 086657b0557..080d492d997 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -31,4 +31,6 @@ LIB_DEPENDS = audio/libsamplerate \
# network access
TEST_IS_INTERACTIVE = Yes

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index d1c1e6a69d3..985bd9358ce 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -31,6 +31,8 @@ LIB_DEPENDS= net/neon \

CXXFLAGS += -I${LOCALBASE}/include

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
pre-configure:
sed -i 's,/usr/local,${LOCALBASE},g' \
${WRKSRC}/cmake/modules/FindNeon.cmake
diff --git a/audio/libmusicbrainz5/patches/patch-src_CMakeLists_txt b/audio/libmusicbrainz5/patches/patch-src_CMakeLists_txt
new file mode 100644
index 00000000000..3e04d942ecd
--- /dev/null
+++ b/audio/libmusicbrainz5/patches/patch-src_CMakeLists_txt
@@ -0,0 +1,13 @@
+Index: src/CMakeLists.txt
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -36,7 +36,8 @@ ADD_CUSTOM_COMMAND(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
+ COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
+- DEPENDS make-c-interface cinterface.xml *.inc
++ DEPENDS make-c-interface cinterface.xml c-int-medium-defines.inc c-int-query-source.inc c-int-source-funcs.inc
++ c-int-medium-source.inc c-int-release-defines.inc c-int-query-defines.inc c-int-release-source.inc
+ )
+
+ ADD_CUSTOM_TARGET(src_gen DEPENDS mb5_c.h)
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 09e4befc53c..1739372375f 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -27,6 +27,8 @@ CONFIGURE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON \
-DCMAKE_DISABLE_FIND_PACKAGE_Speex:BOOL=True \
-DCMAKE_DISABLE_FIND_PACKAGE_SQLite3:BOOL=True

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
LIB_DEPENDS= audio/flac \
audio/lame \
audio/libogg \
diff --git a/audio/libsoxr/Makefile b/audio/libsoxr/Makefile
index 377db039c35..a9914ad5a42 100644
--- a/audio/libsoxr/Makefile
+++ b/audio/libsoxr/Makefile
@@ -21,4 +21,7 @@ SITES= ${SITE_SOURCEFORGE:=soxr/}

MODULES= devel/cmake

+
+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index 3baea1eda17..b66409260dd 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -59,6 +59,8 @@ CONFIGURE_ARGS += -DWANT_CALF=OFF \
-DWANT_TAP=OFF \
-DWANT_VST=OFF

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
NO_TEST = Yes

.include <bsd.port.mk>
diff --git a/audio/lmms/patches/patch-CMakeLists_txt b/audio/lmms/patches/patch-CMakeLists_txt
index 216fd4608ac..9608fb1f635 100644
--- a/audio/lmms/patches/patch-CMakeLists_txt
+++ b/audio/lmms/patches/patch-CMakeLists_txt
@@ -3,6 +3,18 @@ don't link deprecated ossaudio on OpenBSD
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
+@@ -8,9 +8,9 @@ IF(COMMAND CMAKE_POLICY)
+ CMAKE_POLICY(SET CMP0005 NEW)
+ CMAKE_POLICY(SET CMP0003 NEW)
+ IF (CMAKE_MAJOR_VERSION GREATER 2)
+- CMAKE_POLICY(SET CMP0026 OLD)
++ CMAKE_POLICY(SET CMP0026 NEW)
+ CMAKE_POLICY(SET CMP0045 NEW)
+- CMAKE_POLICY(SET CMP0050 OLD)
++ CMAKE_POLICY(SET CMP0050 NEW)
+ ENDIF()
+ ENDIF(COMMAND CMAKE_POLICY)
+
@@ -366,12 +366,12 @@ ENDIF(WANT_OGGVORBIS)

@@ -18,3 +30,12 @@ Index: CMakeLists.txt

# check for ALSA
+@@ -539,7 +539,7 @@ IF(WIN32 OR WIN64)
+ ADD_CUSTOM_TARGET(bin2res COMMAND g++ "\"${BIN2RES_CPP}\"" -o "\"${BIN2RES}\"" DEPENDS "${BIN2RES_CPP}")
+ ELSE(WIN32 OR WIN64)
+ ADD_EXECUTABLE(bin2res buildtools/bin2res.cpp)
+- GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION)
++ set(BIN2RES $<TARGET_FILE:bin2res>)
+ ENDIF(WIN32 OR WIN64)
+
+ # we somehow have to make LMMS-binary depend on MOC-files
diff --git a/audio/mac/Makefile b/audio/mac/Makefile
index 7a09c4513e6..7b98baf8e5e 100644
--- a/audio/mac/Makefile
+++ b/audio/mac/Makefile
@@ -24,6 +24,8 @@ SITES= https://monkeysaudio.com/files/
WRKDIST= ${WRKDIR}/mac-${VERSION}
FIX_CRLF_FILES= Shared/*.h

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
post-extract:
mkdir ${WRKSRC}
mv ${WRKDIR}/!(mac-${VERSION}|bin) ${WRKSRC}
diff --git a/audio/milkytracker/Makefile b/audio/milkytracker/Makefile
index 638e02059f9..f58c51e32c5 100644
--- a/audio/milkytracker/Makefile
+++ b/audio/milkytracker/Makefile
@@ -34,6 +34,8 @@ LIB_DEPENDS = archivers/lhasa \

CONFIGURE_ARGS = -DCMAKE_INSTALL_DOCDIR=${PREFIX}/share/doc/milkytracker

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
CXXFLAGS += -Wno-narrowing

NO_TEST = Yes
@@ -46,4 +48,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/resources/pictures/carton.png \
${PREFIX}/share/icons/hicolor/128x128/apps/milkytracker.png

+
+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/audio/milkytracker/patches/patch-CMakeLists_txt b/audio/milkytracker/patches/patch-CMakeLists_txt
new file mode 100644
index 00000000000..b9a4a0351a2
--- /dev/null
+++ b/audio/milkytracker/patches/patch-CMakeLists_txt
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -164,7 +164,7 @@ elseif(HAIKU)
+ else()
+ # Workaround for SDL bug #3295, which occurs in SDL2 <2.0.5
+ # https://bugzilla.libsdl.org/show_bug.cgi?id=3295
+- cmake_policy(SET CMP0004 OLD)
++ cmake_policy(SET CMP0004 NEW)
+
+ find_package(SDL2 REQUIRED)
+ endif()
diff --git a/audio/mscore/Makefile b/audio/mscore/Makefile
index f1ae01791bf..24cbd826322 100644
--- a/audio/mscore/Makefile
+++ b/audio/mscore/Makefile
@@ -53,6 +53,8 @@ CONFIGURE_ARGS =-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DBUILD_TELEMETRY_MODULE=OFF \
-DMUSESCORE_BUILD_CONFIG=release

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
CXXFLAGS += -Wno-inconsistent-missing-override
CXXFLAGS += -I${LOCALBASE}/include -I${X11BASE}/include
MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
diff --git a/audio/musepack/Makefile b/audio/musepack/Makefile
index 76c0bbf6da4..4524ddbe70f 100644
--- a/audio/musepack/Makefile
+++ b/audio/musepack/Makefile
@@ -20,6 +20,8 @@ WANTLIB += c cue m

MODULES = devel/cmake

+CONFIGURE_ARGS = -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
LIB_DEPENDS = audio/libcue

NO_TEST = Yes
diff --git a/audio/ncspot/Makefile b/audio/ncspot/Makefile
index f0e65468406..8bc56affd65 100644
--- a/audio/ncspot/Makefile
+++ b/audio/ncspot/Makefile
@@ -31,6 +31,8 @@ MODCARGO_FEATURES = cursive/termion-backend \
mpris \
portaudio_backend

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
DOCDIR = ${PREFIX}/share/doc/ncspot/

post-install:
diff --git a/audio/ncspot/Makefile.rej b/audio/ncspot/Makefile.rej
new file mode 100644
index 00000000000..112f61d7f1d
--- /dev/null
+++ b/audio/ncspot/Makefile.rej
@@ -0,0 +1,13 @@
+@@ -47,6 +47,12 @@
+
+ .include "crates.inc"
+
++pre-configure:
++ find ${WRKSRC} -name "CMakeLists.txt" -type f -exec sed -i \
++ -E 's/cmake_minimum_required$[[:space:]]*VERSION[[:space:]]+[^)]+$/cmake_minimum_required(VERSION 3.5)/g' \
++ {} \;
++ sed -i 's/"files":{[^}]*}/"files":{}/' ${WRKSRC}/modcargo-crates/aws-lc-sys-0.22.0/.cargo-checksum.json
++
+ post-patch:
+ cp ${FILESDIR}/cpu_aarch64_openbsd.c ${MODCARGO_VENDOR_DIR}/aws-lc-sys-0.22.0/aws-lc/crypto/fipsmodule/cpucap/
+
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index c0d6f495c5a..5c84c9aa49c 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -39,6 +39,8 @@ CONFIGURE_ARGS =-DALSOFT_BACKEND_PIPEWIRE=Off \
-DCMAKE_DISABLE_FIND_PACKAGE_SDL2:Bool=Yes \
-DCMAKE_DISABLE_FIND_PACKAGE_SndFile:Bool=Yes

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.if ${MACHINE_ARCH} == "arm"
CONFIGURE_ARGS +=-DALSOFT_CPUEXT_NEON=Off
.endif
diff --git a/audio/soundtouch/Makefile b/audio/soundtouch/Makefile
index 121b350ad99..0d37e37f57b 100644
--- a/audio/soundtouch/Makefile
+++ b/audio/soundtouch/Makefile
@@ -21,6 +21,7 @@ COMPILER= base-clang ports-gcc base-gcc
MODULES= devel/cmake

CONFIGURE_ARGS= -DBUILD_SHARED_LIBS=ON
+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5

.if ${MACHINE_ARCH} == "i386"
CXXFLAGS += -DSOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS
diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile
index e24f9467348..3a67205c080 100644
--- a/audio/umurmur/Makefile
+++ b/audio/umurmur/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS = devel/libconfig \
devel/protobuf-c>=1.0.1

CONFIGURE_ARGS = -DSSL=openssl
+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5

NO_TEST = Yes

diff --git a/audio/ympd/Makefile b/audio/ympd/Makefile
index 7309ffee76e..72a31236a27 100644
--- a/audio/ympd/Makefile
+++ b/audio/ympd/Makefile
@@ -15,4 +15,6 @@ MODULES = devel/cmake
LIB_DEPENDS = audio/libmpdclient
WANTLIB += c crypto mpdclient pthread ssl

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index 7c79d0f2a7b..8775f4d74dc 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -38,6 +38,8 @@ CONFIGURE_ARGS= -DGuiModule=zest \
-DPaEnable=OFF \
-DSndioEnable=ON

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
post-patch:
sed -i s,/usr/X11R6,${X11BASE}, ${WRKSRC}/src/CMakeLists.txt
sed -i s,/usr/local,${TRUEPREFIX}, ${WRKSRC}/src/main.cpp \
diff --git a/cad/abc/Makefile b/cad/abc/Makefile
index 154d67ddd0a..c0cb83e830b 100644
--- a/cad/abc/Makefile
+++ b/cad/abc/Makefile
@@ -18,6 +18,8 @@ COMPILER = base-clang ports-gcc base-gcc

MODULES = devel/cmake

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
USE_GMAKE = Yes

NO_TEST = Yes
diff --git a/cad/graywolf/Makefile b/cad/graywolf/Makefile
index 18216db1401..db78de37a87 100644
--- a/cad/graywolf/Makefile
+++ b/cad/graywolf/Makefile
@@ -18,6 +18,8 @@ WANTLIB += ICE SM X11 Xext c gsl gslcblas m

MODULES = devel/cmake

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
LIB_DEPENDS = devel/gsl

# Really really not C99
diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile
index 05c1edcc539..3bca3be67dd 100644
--- a/cad/horizon-eda/Makefile
+++ b/cad/horizon-eda/Makefile
@@ -46,4 +46,9 @@ LIB_DEPENDS = archivers/libarchive \

DEBUG_PACKAGES = ${BUILD_PACKAGES}

+pre-configure:
+ find ${WRKSRC}/ -name "CMakeLists.txt" -type f -exec sed -i \
+ -E 's/cmake_minimum_required$[[:space:]]*VERSION[[:space:]]+[^)]+$/cmake_minimum_required(VERSION 3.5)/g' \
+ {} \;
+
.include <bsd.port.mk>
diff --git a/cad/lib3mf/Makefile b/cad/lib3mf/Makefile
index 4ba8683f409..945fc82d7b2 100644
--- a/cad/lib3mf/Makefile
+++ b/cad/lib3mf/Makefile
@@ -26,6 +26,8 @@ CONFIGURE_ARGS = -DUSE_INCLUDED_ZLIB=OFF \
-DUSE_INCLUDED_LIBZIP=OFF \
-DUSE_INCLUDED_SSL=OFF

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
post-install:
${MODPY_COMPILEALL} ${PREFIX}/include/Bindings/Python/Lib3MF.py

diff --git a/cad/prusaslicer/Makefile b/cad/prusaslicer/Makefile
index 06e7ee25c21..a73d9d7493d 100644
--- a/cad/prusaslicer/Makefile
+++ b/cad/prusaslicer/Makefile
@@ -78,4 +78,6 @@ CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSLIC3R_GTK=3 \
-DSLIC3R_PCH=OFF

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/cad/solvespace/Makefile b/cad/solvespace/Makefile
index 3532a5b06a4..480c651ea56 100644
--- a/cad/solvespace/Makefile
+++ b/cad/solvespace/Makefile
@@ -53,6 +53,8 @@ CONFIGURE_ARGS+= -DENABLE_GUI=ON \
-DMI_BUILD_SHARED=OFF \
-DMI_BUILD_OBJECT=OFF

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
# testsuite broken as is
NO_TEST = YES

diff --git a/cad/xtrkcad/Makefile b/cad/xtrkcad/Makefile
index 63d4177e07c..283997fdb72 100644
--- a/cad/xtrkcad/Makefile
+++ b/cad/xtrkcad/Makefile
@@ -46,6 +46,9 @@ RUN_DEPENDS += graphics/inkscape
post-extract:
rm -f ${WRKSRC}/app/tools/lib/linux/libzip.a

+
+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
CONFIGURE_ARGS += -DXTRKCAD_USE_GETTEXT=on
CONFIGURE_ENV += CFLAGS=-I${PREFIX}/include \
LDFLAGS="-pthread -L/usr/X11R6/lib -L${PREFIX}/lib -liconv -lintl"
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index 093801d9a91..8a5d35ebf6f 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -36,6 +36,8 @@ CONFIGURE_ARGS += -DINSTALL_MAN_DIR:STRING=man \
-DINSTALL_BASH_COMPLETION=OFF \
-Wno-dev

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
CFLAGS += -I${LOCALBASE}/include
LDFLAGS = -L${LOCALBASE}/lib -liconv -lintl

diff --git a/comms/hackrf/Makefile b/comms/hackrf/Makefile
index 2638e0d8f41..e5242d07a4f 100644
--- a/comms/hackrf/Makefile
+++ b/comms/hackrf/Makefile
@@ -35,4 +35,6 @@ NO_TEST = Yes

WRKSRC = ${WRKDIST}/host

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/comms/libhidapi/Makefile b/comms/libhidapi/Makefile
index 612a4a5bdc3..c12a069e030 100644
--- a/comms/libhidapi/Makefile
+++ b/comms/libhidapi/Makefile
@@ -27,6 +27,8 @@ LIB_DEPENDS = converters/libiconv \

MODULES = devel/cmake

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
DOCDIR = ${PREFIX}/share/doc/hidapi

NO_TEST = Yes
diff --git a/comms/sigrok/pulseview/Makefile b/comms/sigrok/pulseview/Makefile
index 89d0f2d2940..7158a7623e1 100644
--- a/comms/sigrok/pulseview/Makefile
+++ b/comms/sigrok/pulseview/Makefile
@@ -31,4 +31,6 @@ NO_TEST = Yes

DEBUG_PACKAGES = ${BUILD_PACKAGES}

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/converters/k2pdfopt/Makefile b/converters/k2pdfopt/Makefile
index 46c79e0a835..3c3e05bb560 100644
--- a/converters/k2pdfopt/Makefile
+++ b/converters/k2pdfopt/Makefile
@@ -46,4 +46,7 @@ FIX_CRLF_FILES = `find . -type f $ -name '*.txt' -o -name '*.[ch]' $`
post-install:
${INSTALL_MAN} ${WRKDIR}/debian/k2pdfopt.1 ${PREFIX}/man/man1

+
+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/converters/lastools/Makefile b/converters/lastools/Makefile
index 794ec95e62e..070694e4371 100644
--- a/converters/lastools/Makefile
+++ b/converters/lastools/Makefile
@@ -15,6 +15,8 @@ MODULES = devel/cmake
#c++11
COMPILER = base-clang ports-gcc

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
PROGS = laszip lasinfo lasprecision las2txt txt2las las2las lasdiff lasmerge lasindex
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lastools/
diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile
index 10d6ed3616d..d366e47d789 100644
--- a/converters/wv2/Makefile
+++ b/converters/wv2/Makefile
@@ -26,4 +26,6 @@ LIB_DEPENDS+= converters/libiconv \

CONFIGURE_ARGS +=-DLIBwv2_VERSION=${LIBwv2_VERSION}

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/converters/wv2/patches/patch-cmake_MacroCreateLibtoolFile_cmake b/converters/wv2/patches/patch-cmake_MacroCreateLibtoolFile_cmake
index 4d0096b6d27..c49bc85481c 100644
--- a/converters/wv2/patches/patch-cmake_MacroCreateLibtoolFile_cmake
+++ b/converters/wv2/patches/patch-cmake_MacroCreateLibtoolFile_cmake
@@ -1,27 +1,151 @@
---- cmake/MacroCreateLibtoolFile.cmake.orig Sat Oct 31 19:22:43 2009
-+++ cmake/MacroCreateLibtoolFile.cmake Fri Jul 13 11:07:39 2012
-@@ -16,19 +16,19 @@ MACRO(CREATE_LIBTOOL_FILE _target _install_DIR)
- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_age ${_target} LT_VERSION_AGE 0)
- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_revision ${_target} LT_VERSION_REVISION 0)
- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_installed ${_target} LT_INSTALLED yes)
+Index: cmake/MacroCreateLibtoolFile.cmake
+--- cmake/MacroCreateLibtoolFile.cmake.orig
++++ cmake/MacroCreateLibtoolFile.cmake
+@@ -8,46 +8,104 @@ MACRO(GET_TARGET_PROPERTY_WITH_DEFAULT _variable _targ
+ ENDIF (${_variable} MATCHES NOTFOUND)
+ ENDMACRO (GET_TARGET_PROPERTY_WITH_DEFAULT)
+
+-MACRO(CREATE_LIBTOOL_FILE _target _install_DIR)
+- GET_TARGET_PROPERTY(_target_location ${_target} LOCATION)
+- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_static_lib ${_target} STATIC_LIB "")
+- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dependency_libs ${_target} LT_DEPENDENCY_LIBS "")
+- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_current ${_target} LT_VERSION_CURRENT 0)
+- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_age ${_target} LT_VERSION_AGE 0)
+- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_revision ${_target} LT_VERSION_REVISION 0)
+- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_installed ${_target} LT_INSTALLED yes)
- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK yes)
-+ GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK no)
- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlopen ${_target} LT_DLOPEN "")
- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlpreopen ${_target} LT_DLPREOPEN "")
- GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE)
- GET_FILENAME_COMPONENT(_soname ${_target_location} NAME)
- SET(_laname ${PROJECT_BINARY_DIR}/${_laname}.la)
- FILE(WRITE ${_laname} "# ${_laname} - a libtool library file\n")
+- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlopen ${_target} LT_DLOPEN "")
+- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlpreopen ${_target} LT_DLPREOPEN "")
+- GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE)
+- GET_FILENAME_COMPONENT(_soname ${_target_location} NAME)
+- SET(_laname ${PROJECT_BINARY_DIR}/${_laname}.la)
+- FILE(WRITE ${_laname} "# ${_laname} - a libtool library file\n")
- FILE(WRITE ${_laname} "# Generated by CMake ${CMAKE_VERSION} (like GNU libtool)\n")
- FILE(WRITE ${_laname} "\n# Please DO NOT delete this file!\n# It is necessary for linking the library with libtool.\n\n" )
-+ FILE(APPEND ${_laname} "# Generated by CMake ${CMAKE_VERSION} (like GNU libtool)\n")
-+ FILE(APPEND ${_laname} "\n# Please DO NOT delete this file!\n# It is necessary for linking the library with libtool.\n\n" )
- FILE(APPEND ${_laname} "# The name that we can dlopen(3).\n")
+- FILE(APPEND ${_laname} "# The name that we can dlopen(3).\n")
- FILE(APPEND ${_laname} "dlname='${_soname}'\n\n")
-+ FILE(APPEND ${_laname} "dlname='${_soname}.${LIBwv2_VERSION}'\n\n")
- FILE(APPEND ${_laname} "# Names of this library.\n")
+- FILE(APPEND ${_laname} "# Names of this library.\n")
- FILE(APPEND ${_laname} "library_names='${_soname}.${_target_current}.${_target_age}.${_target_revision} ${_soname}.${_target_current} ${_soname}'\n\n")
-+ FILE(APPEND ${_laname} "library_names='${_soname}.${LIBwv2_VERSION} ${_soname}.${LIBwv2_VERSION} ${_soname}.${LIBwv2_VERSION}'\n\n")
- FILE(APPEND ${_laname} "# The name of the static archive.\n")
- FILE(APPEND ${_laname} "old_library='${_target_static_lib}'\n\n")
- FILE(APPEND ${_laname} "# Libraries that this one depends upon.\n")
+- FILE(APPEND ${_laname} "# The name of the static archive.\n")
+- FILE(APPEND ${_laname} "old_library='${_target_static_lib}'\n\n")
+- FILE(APPEND ${_laname} "# Libraries that this one depends upon.\n")
+- FILE(APPEND ${_laname} "dependency_libs='${_target_dependency_libs}'\n\n")
+- FILE(APPEND ${_laname} "# Names of additional weak libraries provided by this library\n")
+- FILE(APPEND ${_laname} "weak_library_names=''\n\n")
+- FILE(APPEND ${_laname} "# Version information for ${_laname}.\n")
+- FILE(APPEND ${_laname} "current=${_target_current}\n")
+- FILE(APPEND ${_laname} "age=${_target_age}\n")
+- FILE(APPEND ${_laname} "revision=${_target_revision}\n\n")
+- FILE(APPEND ${_laname} "# Is this an already installed library?\n")
+- FILE(APPEND ${_laname} "installed=${_target_installed}\n\n")
+- FILE(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\n")
+- FILE(APPEND ${_laname} "shouldnotlink=${_target_shouldnotlink}\n\n")
+- FILE(APPEND ${_laname} "# Files to dlopen/dlpreopen\n")
+- FILE(APPEND ${_laname} "dlopen='${_target_dlopen}'\n")
+- FILE(APPEND ${_laname} "dlpreopen='${_target_dlpreopen}'\n\n")
+- FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
+- FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}${_install_DIR}'\n")
+-# INSTALL( FILES ${_laname} ${_soname} DESTINATION ${CMAKE_INSTALL_PREFIX}${_install_DIR})
+- INSTALL( FILES ${_laname} DESTINATION ${CMAKE_INSTALL_PREFIX}${_install_DIR})
+-ENDMACRO(CREATE_LIBTOOL_FILE)
++macro(CREATE_LIBTOOL_FILE _target _install_DIR)
++ get_target_property(_target_static_lib ${_target} STATIC_LIB)
++ if(NOT _target_static_lib)
++ set(_target_static_lib "")
++ endif()
++
++ get_target_property(_target_dependency_libs ${_target} LT_DEPENDENCY_LIBS)
++ if(NOT _target_dependency_libs)
++ set(_target_dependency_libs "")
++ endif()
++
++ get_target_property(_target_current ${_target} LT_VERSION_CURRENT)
++ if(NOT _target_current)
++ set(_target_current 0)
++ endif()
++
++ get_target_property(_target_age ${_target} LT_VERSION_AGE)
++ if(NOT _target_age)
++ set(_target_age 0)
++ endif()
++
++ get_target_property(_target_revision ${_target} LT_VERSION_REVISION)
++ if(NOT _target_revision)
++ set(_target_revision 0)
++ endif()
++
++ get_target_property(_target_installed ${_target} LT_INSTALLED)
++ if(NOT _target_installed)
++ set(_target_installed yes)
++ endif()
++
++ get_target_property(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK)
++ if(NOT _target_shouldnotlink)
++ set(_target_shouldnotlink no)
++ endif()
++
++ get_target_property(_target_dlopen ${_target} LT_DLOPEN)
++ if(NOT _target_dlopen)
++ set(_target_dlopen "")
++ endif()
++
++ get_target_property(_target_dlpreopen ${_target} LT_DLPREOPEN)
++ if(NOT _target_dlpreopen)
++ set(_target_dlpreopen "")
++ endif()
++
++ # Verwende Output-Name statt LOCATION
++ get_target_property(_target_output_name ${_target} OUTPUT_NAME)
++ if(NOT _target_output_name)
++ set(_target_output_name ${_target})
++ endif()
++
++ # .la Dateiname erstellen
++ set(_laname ${PROJECT_BINARY_DIR}/lib${_target_output_name}.la)
++ set(_soname lib${_target_output_name}.so)
++
++ # .la Datei mit file(GENERATE) erstellen - wird zur Build-Zeit ausgewertet
++ set(_la_content "# lib${_target_output_name}.la - a libtool library file
++# Generated by CMake ${CMAKE_VERSION} (like GNU libtool)
++
++# Please DO NOT delete this file!
++# It is necessary for linking the library with libtool.
++
++# The name that we can dlopen(3).
++dlname='${_soname}.${LIBwv2_VERSION}'
++
++# Names of this library.
++library_names='${_soname}.${LIBwv2_VERSION} ${_soname}.${LIBwv2_VERSION} ${_soname}.${LIBwv2_VERSION}'
++
++# The name of the static archive.
++old_library='${_target_static_lib}'
++
++# Libraries that this one depends upon.
++dependency_libs='${_target_dependency_libs}'
++
++# Names of additional weak libraries provided by this library
++weak_library_names=''
++
++# Version information for lib${_target_output_name}.la.
++current=${_target_current}
++age=${_target_age}
++revision=${_target_revision}
++
++# Is this an already installed library?
++installed=${_target_installed}
++
++# Should we warn about portability when linking against -modules?
++shouldnotlink=${_target_shouldnotlink}
++
++# Files to dlopen/dlpreopen
++dlopen='${_target_dlopen}'
++dlpreopen='${_target_dlpreopen}'
++
++# Directory that this library needs to be installed in:
++libdir='${CMAKE_INSTALL_PREFIX}${_install_DIR}'
++")
++
++ file(GENERATE OUTPUT ${_laname} CONTENT "${_la_content}")
++
++ install(FILES ${_laname} DESTINATION ${CMAKE_INSTALL_PREFIX}${_install_DIR})
++endmacro()
diff --git a/databases/galera/Makefile b/databases/galera/Makefile
index 71080375a75..21d1d0b3613 100644
--- a/databases/galera/Makefile
+++ b/databases/galera/Makefile
@@ -33,7 +33,8 @@ WANTLIB += ${COMPILER_LIBCXX} boost_program_options-mt c crypto m ssl

CONFIGURE_ARGS+=-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DGALERA_VERSION=${GH_TAGNAME} \
- -DGALERA_SYSTEM_LIBS=pthread
+ -DGALERA_SYSTEM_LIBS=pthread \
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5

CFLAGS+= -I${LOCALBASE}/include
CXXFLAGS+= -I${LOCALBASE}/include
diff --git a/databases/kexi/Makefile b/databases/kexi/Makefile
index 114a775bc91..0d4c909bbaf 100644
--- a/databases/kexi/Makefile
+++ b/databases/kexi/Makefile
@@ -74,7 +74,7 @@ LIB_DEPENDS = databases/kdb>=3.2.0 \
devel/kreport>=3.2.0 \
databases/mariadb

-CONFIGURE_ARGS = -DBUILD_TESTING=On \
+CONFIGURE_ARGS = -DBUILD_TESTING=OFF \
-DBUILD_EXAMPLES=On \
-DKEXI_QTGUI_RUNTIME_AVAILABLE=On \
-DKEXI_ENABLE_QTGUI_FOR_TESTS=Off
@@ -86,4 +86,10 @@ CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5

TEST_IS_INTERACTIVE = X11

+#pre-configure:
+# find ${WRKSRC}/ -name "CMakeLists.txt" -type f -exec sed -i \
+# -E 's/cmake_minimum_required$[[:space:]]*VERSION[[:space:]]+[^)]+$/cmake_minimum_required(VERSION 3.5)/g' \
+# {} \;
+
+
.include <bsd.port.mk>
diff --git a/databases/kexi/patches/patch-cmake_modules_SetKexiCMakePolicies_cmake b/databases/kexi/patches/patch-cmake_modules_SetKexiCMakePolicies_cmake
new file mode 100644
index 00000000000..f5339f4a50e
--- /dev/null
+++ b/databases/kexi/patches/patch-cmake_modules_SetKexiCMakePolicies_cmake
@@ -0,0 +1,12 @@
+Index: cmake/modules/SetKexiCMakePolicies.cmake
+--- cmake/modules/SetKexiCMakePolicies.cmake.orig
++++ cmake/modules/SetKexiCMakePolicies.cmake
+@@ -9,7 +9,7 @@ cmake_policy(SET CMP0053 NEW) # TODO remove, temporary
+ # "Simplify variable reference and escape sequence evaluation"
+
+ if(POLICY CMP0059) # Don't treat DEFINITIONS as a built-in directory property.
+- cmake_policy(SET CMP0059 OLD)
++ cmake_policy(SET CMP0059 NEW)
+ endif()
+ if(POLICY CMP0063) # Honor visibility properties for all target types (since cmake 3.3)
+ cmake_policy(SET CMP0063 NEW)
diff --git a/databases/mariadb/Makefile b/databases/mariadb/Makefile
index 1b473642077..cc7905fc530 100644
--- a/databases/mariadb/Makefile
+++ b/databases/mariadb/Makefile
@@ -112,6 +112,8 @@ CONFIGURE_ARGS+=-DHAVE_PAM_APPL_H=0
# buildable on X86.
CONFIGURE_ARGS+=-DPLUGIN_COLUMNSTORE=NO

+CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.arch.mk>

.if !${PROPERTIES:Mlp64} || ${PROPERTIES:Mbe}
diff --git a/databases/mydumper/Makefile b/databases/mydumper/Makefile
index 4e151b346ec..122970c1d2d 100644
--- a/databases/mydumper/Makefile
+++ b/databases/mydumper/Makefile
@@ -23,4 +23,7 @@ LIB_DEPENDS = databases/mariadb \

NO_TEST = Yes

+
+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/databases/sqlitebrowser/Makefile b/databases/sqlitebrowser/Makefile
index 157e6e62e29..08a11ed1f90 100644
--- a/databases/sqlitebrowser/Makefile
+++ b/databases/sqlitebrowser/Makefile
@@ -30,4 +30,6 @@ SEPARATE_BUILD = Yes

NO_TEST = Yes

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
.include <bsd.port.mk>
diff --git a/devel/armips/Makefile b/devel/armips/Makefile
index 2e9ff4085e8..08785558477 100644
--- a/devel/armips/Makefile
+++ b/devel/armips/Makefile
@@ -18,6 +18,8 @@ COMPILER = base-clang ports-gcc

MODULES = devel/cmake

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
NO_TEST = Yes

do-install:
diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile
index adf680db693..8d3dee55dfb 100644
--- a/devel/bullet/Makefile
+++ b/devel/bullet/Makefile
@@ -53,6 +53,8 @@ CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON \
-DINSTALL_LIBS=ON \
-DUSE_DOUBLE_PRECISION=ON

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
CFLAGS += -I${X11BASE}/include
CXXFLAGS += -I${X11BASE}/include
MODCMAKE_LDFLAGS = -L${X11BASE}/lib
diff --git a/devel/cjson/Makefile b/devel/cjson/Makefile
index 4ede48ee412..590c3a84e4a 100644
--- a/devel/cjson/Makefile
+++ b/devel/cjson/Makefile
@@ -19,6 +19,8 @@ WANTLIB += m
MODULES = devel/cmake
DEBUG_PACKAGES = ${BUILD_PACKAGES}

+CONFIGURE_ARGS += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
# everything except tests (needs changing or removing if building cJSON_Utils)
ALL_TARGET = cjson

diff --git a/devel/cmake/Makefile.inc b/devel/cmake/Makefile.inc
index 95e3f6f5b68..72042f80a78 100644
--- a/devel/cmake/Makefile.inc
+++ b/devel/cmake/Makefile.inc
@@ -1,4 +1,4 @@
-VER = 3.31.8
+VER = 4.1.2
DISTNAME = cmake-${VER}
CATEGORIES ?= devel

diff --git a/devel/cmake/core/Makefile b/devel/cmake/core/Makefile
index 8be125d967a..f67fdb36141 100644
--- a/devel/cmake/core/Makefile
+++ b/devel/cmake/core/Makefile
@@ -3,7 +3,6 @@ DPB_PROPERTIES = parallel
PKGNAME = cmake-core-${VER}
PKGNAME-main = cmake-core-${VER}
PKGNAME-help = cmake-help-${VER}
-REVISION-main = 0

COMMENT-main = portable build system
COMMENT-help = files for CMake --help
diff --git a/devel/cmake/core/pkg/PLIST-help b/devel/cmake/core/pkg/PLIST-help
index 040d4a7d4ff..b43f618b0a5 100644
--- a/devel/cmake/core/pkg/PLIST-help
+++ b/devel/cmake/core/pkg/PLIST-help
@@ -1,17 +1,6 @@
@conflict cmake-<3.31.2p0v1
share/cmake/Help/
share/cmake/Help/command/
-share/cmake/Help/command/DEPRECATED_POLICY_VERSIONS.txt
-share/cmake/Help/command/DEVICE_LINK_OPTIONS.txt
-share/cmake/Help/command/FIND_XXX.txt
-share/cmake/Help/command/FIND_XXX_ORDER.txt
-share/cmake/Help/command/FIND_XXX_REGISTRY_VIEW.txt
-share/cmake/Help/command/FIND_XXX_ROOT.txt
-share/cmake/Help/command/GENEX_NOTE.txt
-share/cmake/Help/command/LINK_OPTIONS_LINKER.txt
-share/cmake/Help/command/OPTIONS_SHELL.txt
-share/cmake/Help/command/SUPPORTED_LANGUAGES.txt
-share/cmake/Help/command/UNSET_NOTE.txt
share/cmake/Help/command/add_compile_definitions.rst
share/cmake/Help/command/add_compile_options.rst
share/cmake/Help/command/add_custom_command.rst
@@ -213,7 +202,6 @@ share/cmake/Help/envvar/CXX.rst
share/cmake/Help/envvar/CXXFLAGS.rst
share/cmake/Help/envvar/DASHBOARD_TEST_FROM_CTEST.rst
share/cmake/Help/envvar/DESTDIR.rst
-share/cmake/Help/envvar/ENV_VAR.txt
share/cmake/Help/envvar/FC.rst
share/cmake/Help/envvar/FFLAGS.rst
share/cmake/Help/envvar/HIPCXX.rst
@@ -221,7 +209,6 @@ share/cmake/Help/envvar/HIPFLAGS.rst
share/cmake/Help/envvar/HIPHOSTCXX.rst
share/cmake/Help/envvar/ISPC.rst
share/cmake/Help/envvar/ISPCFLAGS.rst
-share/cmake/Help/envvar/LANG_FLAGS.txt
share/cmake/Help/envvar/LDFLAGS.rst
share/cmake/Help/envvar/MACOSX_DEPLOYMENT_TARGET.rst
share/cmake/Help/envvar/OBJC.rst
@@ -250,8 +237,6 @@ share/cmake/Help/generator/Ninja Multi-Config.rst
share/cmake/Help/generator/Ninja.rst
share/cmake/Help/generator/Sublime Text 2.rst
share/cmake/Help/generator/Unix Makefiles.rst
-share/cmake/Help/generator/VS_TOOLSET_HOST_ARCH.txt
-share/cmake/Help/generator/VS_TOOLSET_HOST_ARCH_LEGACY.txt
share/cmake/Help/generator/Visual Studio 10 2010.rst
share/cmake/Help/generator/Visual Studio 11 2012.rst
share/cmake/Help/generator/Visual Studio 12 2013.rst
@@ -267,16 +252,9 @@ share/cmake/Help/generator/Visual Studio 9 2008.rst
share/cmake/Help/generator/Watcom WMake.rst
share/cmake/Help/generator/Xcode.rst
share/cmake/Help/include/
-share/cmake/Help/include/COMPILE_DEFINITIONS_DISCLAIMER.txt
-share/cmake/Help/include/INTERFACE_INCLUDE_DIRECTORIES_WARNING.txt
-share/cmake/Help/include/INTERFACE_LINK_LIBRARIES_WARNING.txt
share/cmake/Help/index.rst
share/cmake/Help/manual/
share/cmake/Help/manual/CTEST_EXAMPLE_MAKEFILE_JOB_SERVER.make
-share/cmake/Help/manual/ID_RESERVE.txt
-share/cmake/Help/manual/LINKS.txt
-share/cmake/Help/manual/OPTIONS_BUILD.txt
-share/cmake/Help/manual/OPTIONS_HELP.txt
share/cmake/Help/manual/ccmake.1.rst
share/cmake/Help/manual/cmake-buildsystem.7.rst
share/cmake/Help/manual/cmake-commands.7.rst
@@ -310,13 +288,6 @@ share/cmake/Help/module/
share/cmake/Help/module/AddFileDependencies.rst
share/cmake/Help/module/AndroidTestUtilities.rst
share/cmake/Help/module/BundleUtilities.rst
-share/cmake/Help/module/CMAKE_REQUIRED_DEFINITIONS.txt
-share/cmake/Help/module/CMAKE_REQUIRED_FLAGS.txt
-share/cmake/Help/module/CMAKE_REQUIRED_INCLUDES.txt
-share/cmake/Help/module/CMAKE_REQUIRED_LIBRARIES.txt
-share/cmake/Help/module/CMAKE_REQUIRED_LINK_DIRECTORIES.txt
-share/cmake/Help/module/CMAKE_REQUIRED_LINK_OPTIONS.txt
-share/cmake/Help/module/CMAKE_REQUIRED_QUIET.txt
share/cmake/Help/module/CMakeAddFortranSubdirectory.rst
share/cmake/Help/module/CMakeBackwardCompatibilityCXX.rst
share/cmake/Help/module/CMakeDependentOption.rst
@@ -765,9 +736,6 @@ share/cmake/Help/policy/CMP0177.rst
share/cmake/Help/policy/CMP0178.rst
share/cmake/Help/policy/CMP0179.rst
share/cmake/Help/policy/CMP0180.rst
-share/cmake/Help/policy/DEPRECATED.txt
-share/cmake/Help/policy/DISALLOWED_COMMAND.txt
-share/cmake/Help/policy/STANDARD_ADVICE.txt
share/cmake/Help/prop_cache/
share/cmake/Help/prop_cache/ADVANCED.rst
share/cmake/Help/prop_cache/HELPSTRING.rst
@@ -825,7 +793,6 @@ share/cmake/Help/prop_gbl/CMAKE_CUDA_KNOWN_FEATURES.rst
share/cmake/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
share/cmake/Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst
share/cmake/Help/prop_gbl/CMAKE_HIP_KNOWN_FEATURES.rst
-share/cmake/Help/prop_gbl/CMAKE_LANG_STD_FLAGS.txt
share/cmake/Help/prop_gbl/CMAKE_ROLE.rst
share/cmake/Help/prop_gbl/DEBUG_CONFIGURATIONS.rst
share/cmake/Help/prop_gbl/DISABLED_FEATURES.rst
@@ -1016,7 +983,6 @@ share/cmake/Help/prop_tgt/COMPILE_FLAGS.rst
share/cmake/Help/prop_tgt/COMPILE_OPTIONS.rst
share/cmake/Help/prop_tgt/COMPILE_PDB_NAME.rst
share/cmake/Help/prop_tgt/COMPILE_PDB_NAME_CONFIG.rst
-share/cmake/Help/prop_tgt/COMPILE_PDB_NOTE.txt
share/cmake/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY.rst
share/cmake/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
share/cmake/Help/prop_tgt/COMPILE_WARNING_AS_ERROR.rst
@@ -1030,7 +996,6 @@ share/cmake/Help/prop_tgt/CUDA_FATBIN_COMPILATION.rst
share/cmake/Help/prop_tgt/CUDA_OPTIX_COMPILATION.rst
share/cmake/Help/prop_tgt/CUDA_PTX_COMPILATION.rst
share/cmake/Help/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.rst
-share/cmake/Help/prop_tgt/CUDA_RUNTIME_LIBRARY-VALUES.txt
share/cmake/Help/prop_tgt/CUDA_RUNTIME_LIBRARY.rst
share/cmake/Help/prop_tgt/CUDA_SEPARABLE_COMPILATION.rst
share/cmake/Help/prop_tgt/CUDA_STANDARD.rst
@@ -1131,7 +1096,6 @@ share/cmake/Help/prop_tgt/INSTALL_RPATH.rst
share/cmake/Help/prop_tgt/INSTALL_RPATH_USE_LINK_PATH.rst
share/cmake/Help/prop_tgt/INTERFACE_AUTOMOC_MACRO_NAMES.rst
share/cmake/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
-share/cmake/Help/prop_tgt/INTERFACE_BUILD_PROPERTY.txt
share/cmake/Help/prop_tgt/INTERFACE_COMPILE_DEFINITIONS.rst
share/cmake/Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst
share/cmake/Help/prop_tgt/INTERFACE_COMPILE_OPTIONS.rst
@@ -1143,7 +1107,6 @@ share/cmake/Help/prop_tgt/INTERFACE_LINK_DEPENDS.rst
share/cmake/Help/prop_tgt/INTERFACE_LINK_DIRECTORIES.rst
share/cmake/Help/prop_tgt/INTERFACE_LINK_LIBRARIES.rst
share/cmake/Help/prop_tgt/INTERFACE_LINK_LIBRARIES_DIRECT.rst
-share/cmake/Help/prop_tgt/INTERFACE_LINK_LIBRARIES_DIRECT.txt
share/cmake/Help/prop_tgt/INTERFACE_LINK_LIBRARIES_DIRECT_EXCLUDE.rst
share/cmake/Help/prop_tgt/INTERFACE_LINK_OPTIONS.rst
share/cmake/Help/prop_tgt/INTERFACE_POSITION_INDEPENDENT_CODE.rst
@@ -1187,7 +1150,6 @@ share/cmake/Help/prop_tgt/LINK_INTERFACE_LIBRARIES_CONFIG.rst
share/cmake/Help/prop_tgt/LINK_INTERFACE_MULTIPLICITY.rst
share/cmake/Help/prop_tgt/LINK_INTERFACE_MULTIPLICITY_CONFIG.rst
share/cmake/Help/prop_tgt/LINK_LIBRARIES.rst
-share/cmake/Help/prop_tgt/LINK_LIBRARIES_INDIRECTION.txt
share/cmake/Help/prop_tgt/LINK_LIBRARIES_ONLY_TARGETS.rst
share/cmake/Help/prop_tgt/LINK_LIBRARIES_STRATEGY.rst
share/cmake/Help/prop_tgt/LINK_LIBRARY_OVERRIDE.rst
@@ -1204,12 +1166,9 @@ share/cmake/Help/prop_tgt/MACOSX_BUNDLE.rst
share/cmake/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst
share/cmake/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst
share/cmake/Help/prop_tgt/MACOSX_RPATH.rst
-share/cmake/Help/prop_tgt/MACOS_IMPORT_FILES.txt
share/cmake/Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst
share/cmake/Help/prop_tgt/MAP_IMPORTED_CONFIG_CONFIG.rst
-share/cmake/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT-VALUES.txt
share/cmake/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst
-share/cmake/Help/prop_tgt/MSVC_RUNTIME_LIBRARY-VALUES.txt
share/cmake/Help/prop_tgt/MSVC_RUNTIME_LIBRARY.rst
share/cmake/Help/prop_tgt/NAME.rst
share/cmake/Help/prop_tgt/NO_SONAME.rst
@@ -1229,7 +1188,6 @@ share/cmake/Help/prop_tgt/PCH_INSTANTIATE_TEMPLATES.rst
share/cmake/Help/prop_tgt/PCH_WARN_INVALID.rst
share/cmake/Help/prop_tgt/PDB_NAME.rst
share/cmake/Help/prop_tgt/PDB_NAME_CONFIG.rst
-share/cmake/Help/prop_tgt/PDB_NOTE.txt
share/cmake/Help/prop_tgt/PDB_OUTPUT_DIRECTORY.rst
share/cmake/Help/prop_tgt/PDB_OUTPUT_DIRECTORY_CONFIG.rst
share/cmake/Help/prop_tgt/POSITION_INDEPENDENT_CODE.rst
@@ -1258,7 +1216,6 @@ share/cmake/Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst
share/cmake/Help/prop_tgt/STATIC_LIBRARY_OPTIONS.rst
share/cmake/Help/prop_tgt/SUFFIX.rst
share/cmake/Help/prop_tgt/SYSTEM.rst
-share/cmake/Help/prop_tgt/Swift_COMPILATION_MODE-VALUES.txt
share/cmake/Help/prop_tgt/Swift_COMPILATION_MODE.rst
share/cmake/Help/prop_tgt/Swift_DEPENDENCIES_FILE.rst
share/cmake/Help/prop_tgt/Swift_LANGUAGE_VERSION.rst
@@ -1276,7 +1233,6 @@ share/cmake/Help/prop_tgt/UNITY_BUILD_MODE.rst
share/cmake/Help/prop_tgt/UNITY_BUILD_UNIQUE_ID.rst
share/cmake/Help/prop_tgt/VERIFY_INTERFACE_HEADER_SETS.rst
share/cmake/Help/prop_tgt/VERSION.rst
-share/cmake/Help/prop_tgt/VERSION_SOVERSION_EXAMPLE.txt
share/cmake/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
share/cmake/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst
share/cmake/Help/prop_tgt/VS_DEBUGGER_COMMAND.rst
@@ -1316,13 +1272,11 @@ share/cmake/Help/prop_tgt/VS_SDK_REFERENCES.rst
share/cmake/Help/prop_tgt/VS_SOLUTION_DEPLOY.rst
share/cmake/Help/prop_tgt/VS_SOURCE_SETTINGS_tool.rst
share/cmake/Help/prop_tgt/VS_USER_PROPS.rst
-share/cmake/Help/prop_tgt/VS_USE_DEBUG_LIBRARIES-PURPOSE.txt
share/cmake/Help/prop_tgt/VS_USE_DEBUG_LIBRARIES.rst
share/cmake/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
share/cmake/Help/prop_tgt/VS_WINRT_COMPONENT.rst
share/cmake/Help/prop_tgt/VS_WINRT_EXTENSIONS.rst
share/cmake/Help/prop_tgt/VS_WINRT_REFERENCES.rst
-share/cmake/Help/prop_tgt/WATCOM_RUNTIME_LIBRARY-VALUES.txt
share/cmake/Help/prop_tgt/WATCOM_RUNTIME_LIBRARY.rst
share/cmake/Help/prop_tgt/WIN32_EXECUTABLE.rst
share/cmake/Help/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS.rst
@@ -1365,8 +1319,6 @@ share/cmake/Help/prop_tgt/XCODE_SCHEME_WORKING_DIRECTORY.rst
share/cmake/Help/prop_tgt/XCODE_SCHEME_ZOMBIE_OBJECTS.rst
share/cmake/Help/prop_tgt/XCODE_XCCONFIG.rst
share/cmake/Help/prop_tgt/XCTEST.rst
-share/cmake/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
-share/cmake/Help/prop_tgt/XXX_OUTPUT_NAME.txt
share/cmake/Help/release/
share/cmake/Help/release/3.0.rst
share/cmake/Help/release/3.1.rst
@@ -1596,7 +1548,6 @@ share/cmake/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_INCLUDE.rst
share/cmake/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_LIBRARY.rst
share/cmake/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_PACKAGE.rst
share/cmake/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_PROGRAM.rst
-share/cmake/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_XXX.txt
share/cmake/Help/variable/CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH.rst
share/cmake/Help/variable/CMAKE_FIND_USE_CMAKE_PATH.rst
share/cmake/Help/variable/CMAKE_FIND_USE_CMAKE_SYSTEM_PATH.rst
@@ -1775,7 +1726,6 @@ share/cmake/Help/variable/CMAKE_LINK_DEPENDS_NO_SHARED.rst
share/cmake/Help/variable/CMAKE_LINK_DEPENDS_USE_LINKER.rst
share/cmake/Help/variable/CMAKE_LINK_DIRECTORIES_BEFORE.rst
share/cmake/Help/variable/CMAKE_LINK_GROUP_USING_FEATURE.rst
-share/cmake/Help/variable/CMAKE_LINK_GROUP_USING_FEATURE.txt
share/cmake/Help/variable/CMAKE_LINK_GROUP_USING_FEATURE_SUPPORTED.rst
share/cmake/Help/variable/CMAKE_LINK_INTERFACE_LIBRARIES.rst
share/cmake/Help/variable/CMAKE_LINK_LIBRARIES_ONLY_TARGETS.rst
@@ -1785,7 +1735,6 @@ share/cmake/Help/variable/CMAKE_LINK_LIBRARY_FILE_FLAG.rst
share/cmake/Help/variable/CMAKE_LINK_LIBRARY_FLAG.rst
share/cmake/Help/variable/CMAKE_LINK_LIBRARY_SUFFIX.rst
share/cmake/Help/variable/CMAKE_LINK_LIBRARY_USING_FEATURE.rst
-share/cmake/Help/variable/CMAKE_LINK_LIBRARY_USING_FEATURE.txt
share/cmake/Help/variable/CMAKE_LINK_LIBRARY_USING_FEATURE_SUPPORTED.rst
share/cmake/Help/variable/CMAKE_LINK_SEARCH_END_STATIC.rst
share/cmake/Help/variable/CMAKE_LINK_SEARCH_START_STATIC.rst
@@ -1831,7 +1780,6 @@ share/cmake/Help/variable/CMAKE_OPTIMIZE_DEPENDENCIES.rst
share/cmake/Help/variable/CMAKE_OSX_ARCHITECTURES.rst
share/cmake/Help/variable/CMAKE_OSX_DEPLOYMENT_TARGET.rst
share/cmake/Help/variable/CMAKE_OSX_SYSROOT.rst
-share/cmake/Help/variable/CMAKE_OSX_VARIABLE.txt
share/cmake/Help/variable/CMAKE_PARENT_LIST_FILE.rst
share/cmake/Help/variable/CMAKE_PATCH_VERSION.rst
share/cmake/Help/variable/CMAKE_PCH_INSTANTIATE_TEMPLATES.rst
@@ -1915,7 +1863,6 @@ share/cmake/Help/variable/CMAKE_TASKING_TOOLSET.rst
share/cmake/Help/variable/CMAKE_TEST_LAUNCHER.rst
share/cmake/Help/variable/CMAKE_TLS_CAINFO.rst
share/cmake/Help/variable/CMAKE_TLS_VERIFY.rst
-share/cmake/Help/variable/CMAKE_TLS_VERSION-VALUES.txt
share/cmake/Help/variable/CMAKE_TLS_VERSION.rst
share/cmake/Help/variable/CMAKE_TOOLCHAIN_FILE.rst
share/cmake/Help/variable/CMAKE_TRY_COMPILE_CONFIGURATION.rst
@@ -1967,7 +1914,6 @@ share/cmake/Help/variable/CMAKE_VS_TARGET_FRAMEWORK_TARGETS_VERSION.rst
share/cmake/Help/variable/CMAKE_VS_TARGET_FRAMEWORK_VERSION.rst
share/cmake/Help/variable/CMAKE_VS_USE_DEBUG_LIBRARIES.rst
share/cmake/Help/variable/CMAKE_VS_VERSION_BUILD_NUMBER.rst
-share/cmake/Help/variable/CMAKE_VS_VERSION_BUILD_NUMBER_COMPONENTS.txt
share/cmake/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
share/cmake/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
share/cmake/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM.rst
@@ -2047,7 +1993,6 @@ share/cmake/Help/variable/CTEST_CUSTOM_TESTS_IGNORE.rst
share/cmake/Help/variable/CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION.rst
share/cmake/Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst
share/cmake/Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst
-share/cmake/Help/variable/CTEST_CUSTOM_XXX.txt
share/cmake/Help/variable/CTEST_CVS_CHECKOUT.rst
share/cmake/Help/variable/CTEST_CVS_COMMAND.rst
share/cmake/Help/variable/CTEST_CVS_UPDATE_OPTIONS.rst
@@ -2100,16 +2045,8 @@ share/cmake/Help/variable/CYGWIN.rst
share/cmake/Help/variable/ENV.rst
share/cmake/Help/variable/EXECUTABLE_OUTPUT_PATH.rst
share/cmake/Help/variable/GHSMULTI.rst
-share/cmake/Help/variable/IGNORE_SEARCH_LOCATIONS.txt
-share/cmake/Help/variable/IGNORE_SEARCH_NONSYSTEM.txt
-share/cmake/Help/variable/IGNORE_SEARCH_PATH.txt
-share/cmake/Help/variable/IGNORE_SEARCH_PREFIX.txt
-share/cmake/Help/variable/IGNORE_SEARCH_SYSTEM.txt
share/cmake/Help/variable/IOS.rst
share/cmake/Help/variable/LIBRARY_OUTPUT_PATH.rst
-share/cmake/Help/variable/LINKER_PREDEFINED_TYPES.txt
-share/cmake/Help/variable/LINK_GROUP_PREDEFINED_FEATURES.txt
-share/cmake/Help/variable/LINK_LIBRARY_PREDEFINED_FEATURES.txt
share/cmake/Help/variable/LINUX.rst
share/cmake/Help/variable/MINGW.rst
share/cmake/Help/variable/MSVC.rst
diff --git a/devel/cmake/core/pkg/PLIST-main b/devel/cmake/core/pkg/PLIST-main
index 4e6bb59f283..4e1e1c709e7 100644
--- a/devel/cmake/core/pkg/PLIST-main
+++ b/devel/cmake/core/pkg/PLIST-main
@@ -10,6 +10,163 @@ share/bash-completion/completions/cmake
share/bash-completion/completions/cpack
share/bash-completion/completions/ctest
share/cmake/
+share/cmake/Help/command/cmake_instrumentation.rst
+share/cmake/Help/command/include/
+share/cmake/Help/command/include/DEPRECATED_POLICY_VERSIONS.rst
+share/cmake/Help/command/include/DEVICE_LINK_OPTIONS.rst
+share/cmake/Help/command/include/FIND_XXX.rst
+share/cmake/Help/command/include/FIND_XXX_ORDER.rst
+share/cmake/Help/command/include/FIND_XXX_REGISTRY_VIEW.rst
+share/cmake/Help/command/include/FIND_XXX_ROOT.rst
+share/cmake/Help/command/include/GENEX_NOTE.rst
+share/cmake/Help/command/include/LINK_LIBRARIES_LINKER.rst
+share/cmake/Help/command/include/LINK_OPTIONS_LINKER.rst
+share/cmake/Help/command/include/OPTIONS_SHELL.rst
+share/cmake/Help/command/include/POLICY_VERSION.rst
+share/cmake/Help/command/include/SUPPORTED_LANGUAGES.rst
+share/cmake/Help/command/include/UNSET_NOTE.rst
+share/cmake/Help/envvar/CLICOLOR.rst
+share/cmake/Help/envvar/CLICOLOR_FORCE.rst
+share/cmake/Help/envvar/CMAKE_LANG_IMPLICIT_LINK_LIBRARIES_EXCLUDE.rst
+share/cmake/Help/envvar/CMAKE_POLICY_VERSION_MINIMUM.rst
+share/cmake/Help/envvar/CTEST_USE_INSTRUMENTATION.rst
+share/cmake/Help/envvar/CTEST_USE_VERBOSE_INSTRUMENTATION.rst
+share/cmake/Help/envvar/NO_COLOR.rst
+share/cmake/Help/envvar/include/
+share/cmake/Help/envvar/include/ENV_VAR.rst
+share/cmake/Help/envvar/include/LANG_FLAGS.rst
+share/cmake/Help/generator/include/
+share/cmake/Help/generator/include/VS_TOOLSET_HOST_ARCH.rst
+share/cmake/Help/generator/include/VS_TOOLSET_HOST_ARCH_LEGACY.rst
+share/cmake/Help/include/COMPILE_DEFINITIONS_DISCLAIMER.rst
+share/cmake/Help/include/INTERFACE_INCLUDE_DIRECTORIES_WARNING.rst
+share/cmake/Help/include/INTERFACE_LINK_LIBRARIES_WARNING.rst
+share/cmake/Help/manual/cmake-instrumentation.7.rst
+share/cmake/Help/manual/ctest/
+share/cmake/Help/manual/ctest/show-only-schema.json
+share/cmake/Help/manual/include/
+share/cmake/Help/manual/include/ID_RESERVE.rst
+share/cmake/Help/manual/include/LINKS.rst
+share/cmake/Help/manual/include/OPTIONS_BUILD.rst
+share/cmake/Help/manual/include/OPTIONS_HELP.rst
+share/cmake/Help/module/include/
+share/cmake/Help/module/include/CMAKE_REQUIRED_DEFINITIONS.rst
+share/cmake/Help/module/include/CMAKE_REQUIRED_FLAGS.rst
+share/cmake/Help/module/include/CMAKE_REQUIRED_INCLUDES.rst
+share/cmake/Help/module/include/CMAKE_REQUIRED_LIBRARIES.rst
+share/cmake/Help/module/include/CMAKE_REQUIRED_LINK_DIRECTORIES.rst
+share/cmake/Help/module/include/CMAKE_REQUIRED_LINK_OPTIONS.rst
+share/cmake/Help/module/include/CMAKE_REQUIRED_QUIET.rst
+share/cmake/Help/module/include/CMAKE_TRY_COMPILE_TARGET_TYPE.rst
+share/cmake/Help/policy/CMP0181.rst
+share/cmake/Help/policy/CMP0182.rst
+share/cmake/Help/policy/CMP0183.rst
+share/cmake/Help/policy/CMP0184.rst
+share/cmake/Help/policy/CMP0185.rst
+share/cmake/Help/policy/CMP0186.rst
+share/cmake/Help/policy/CMP0187.rst
+share/cmake/Help/policy/CMP0188.rst
+share/cmake/Help/policy/CMP0189.rst
+share/cmake/Help/policy/CMP0190.rst
+share/cmake/Help/policy/CMP0191.rst
+share/cmake/Help/policy/CMP0192.rst
+share/cmake/Help/policy/CMP0193.rst
+share/cmake/Help/policy/CMP0194.rst
+share/cmake/Help/policy/CMP0195.rst
+share/cmake/Help/policy/CMP0196.rst
+share/cmake/Help/policy/CMP0197.rst
+share/cmake/Help/policy/include/
+share/cmake/Help/policy/include/DEPRECATED.rst
+share/cmake/Help/policy/include/DISALLOWED_COMMAND.rst
+share/cmake/Help/policy/include/REMOVED_COMMAND.rst
+share/cmake/Help/policy/include/REMOVED_EPILOGUE.rst
+share/cmake/Help/policy/include/REMOVED_PROLOGUE.rst
+share/cmake/Help/policy/include/STANDARD_ADVICE.rst
+share/cmake/Help/prop_dir/VS_SOLUTION_ITEMS.rst
+share/cmake/Help/prop_gbl/include/
+share/cmake/Help/prop_gbl/include/CMAKE_LANG_STD_FLAGS.rst
+share/cmake/Help/prop_sf/VS_CUSTOM_COMMAND_DISABLE_PARALLEL_BUILD.rst
+share/cmake/Help/prop_tgt/AUTOMOC_INCLUDE_DIRECTORIES.rst
+share/cmake/Help/prop_tgt/DEBUGGER_WORKING_DIRECTORY.rst
+share/cmake/Help/prop_tgt/Fortran_BUILDING_INTRINSIC_MODULES.rst
+share/cmake/Help/prop_tgt/LANG_ICSTAT.rst
+share/cmake/Help/prop_tgt/LINK_WARNING_AS_ERROR.rst
+share/cmake/Help/prop_tgt/MSVC_RUNTIME_CHECKS.rst
+share/cmake/Help/prop_tgt/SPDX_LICENSE.rst
+share/cmake/Help/prop_tgt/UNITY_BUILD_RELOCATABLE.rst
+share/cmake/Help/prop_tgt/XCODE_SCHEME_LLDB_INIT_FILE.rst
+share/cmake/Help/prop_tgt/XCODE_SCHEME_TEST_CONFIGURATION.rst
+share/cmake/Help/prop_tgt/include/
+share/cmake/Help/prop_tgt/include/COMPILE_PDB_NOTE.rst
+share/cmake/Help/prop_tgt/include/CUDA_RUNTIME_LIBRARY-VALUES.rst
+share/cmake/Help/prop_tgt/include/INTERFACE_BUILD_PROPERTY.rst
+share/cmake/Help/prop_tgt/include/INTERFACE_LINK_LIBRARIES_DIRECT.rst
+share/cmake/Help/prop_tgt/include/LINK_LIBRARIES_INDIRECTION.rst
+share/cmake/Help/prop_tgt/include/MACOS_IMPORT_FILES.rst
+share/cmake/Help/prop_tgt/include/MSVC_DEBUG_INFORMATION_FORMAT-VALUES.rst
+share/cmake/Help/prop_tgt/include/MSVC_RUNTIME_CHECKS-VALUES.rst
+share/cmake/Help/prop_tgt/include/MSVC_RUNTIME_LIBRARY-VALUES.rst
+share/cmake/Help/prop_tgt/include/PDB_NOTE.rst
+share/cmake/Help/prop_tgt/include/STATIC_LIBRARY_OPTIONS_ARCHIVER.rst
+share/cmake/Help/prop_tgt/include/Swift_COMPILATION_MODE-VALUES.rst
+share/cmake/Help/prop_tgt/include/VERSION_SOVERSION_EXAMPLE.rst
+share/cmake/Help/prop_tgt/include/VS_USE_DEBUG_LIBRARIES-PURPOSE.rst
+share/cmake/Help/prop_tgt/include/WATCOM_RUNTIME_LIBRARY-VALUES.rst
+share/cmake/Help/prop_tgt/include/XXX_OUTPUT_DIRECTORY.rst
+share/cmake/Help/prop_tgt/include/XXX_OUTPUT_NAME.rst
+share/cmake/Help/release/4.0.rst
+share/cmake/Help/release/4.1.rst
+share/cmake/Help/variable/AIX.rst
+share/cmake/Help/variable/BUILD_TESTING.rst
+share/cmake/Help/variable/CMAKE_AUTOMOC_INCLUDE_DIRECTORIES.rst
+share/cmake/Help/variable/CMAKE_DEBUGGER_WORKING_DIRECTORY.rst
+share/cmake/Help/variable/CMAKE_EXECUTE_PROCESS_COMMAND_ERROR_IS_FATAL.rst
+share/cmake/Help/variable/CMAKE_EXPORT_SARIF.rst
+share/cmake/Help/variable/CMAKE_FIND_DEBUG_MODE_NO_IMPLICIT_CONFIGURE_LOG.rst
+share/cmake/Help/variable/CMAKE_FIND_REQUIRED.rst
+share/cmake/Help/variable/CMAKE_HOST_AIX.rst
+share/cmake/Help/variable/CMAKE_LANG_ARCHIVER_WRAPPER_FLAG.rst
+share/cmake/Help/variable/CMAKE_LANG_ARCHIVER_WRAPPER_FLAG_SEP.rst
+share/cmake/Help/variable/CMAKE_LANG_DEVICE_LINK_MODE.rst
+share/cmake/Help/variable/CMAKE_LANG_ICSTAT.rst
+share/cmake/Help/variable/CMAKE_LANG_LINK_DEF_FILE_FLAG.rst
+share/cmake/Help/variable/CMAKE_LANG_LINK_MODE.rst
+share/cmake/Help/variable/CMAKE_LINK_WARNING_AS_ERROR.rst
+share/cmake/Help/variable/CMAKE_LIST_FILE_NAME.rst
+share/cmake/Help/variable/CMAKE_MSVC_RUNTIME_CHECKS.rst
+share/cmake/Help/variable/CMAKE_OBJDUMP.rst
+share/cmake/Help/variable/CMAKE_PKG_CONFIG_DISABLE_UNINSTALLED.rst
+share/cmake/Help/variable/CMAKE_PKG_CONFIG_PC_LIB_DIRS.rst
+share/cmake/Help/variable/CMAKE_PKG_CONFIG_PC_PATH.rst
+share/cmake/Help/variable/CMAKE_PKG_CONFIG_SYSROOT_DIR.rst
+share/cmake/Help/variable/CMAKE_PKG_CONFIG_TOP_BUILD_DIR.rst
+share/cmake/Help/variable/CMAKE_POLICY_VERSION_MINIMUM.rst
+share/cmake/Help/variable/CMAKE_PROJECT_COMPAT_VERSION.rst
+share/cmake/Help/variable/CMAKE_UNITY_BUILD_RELOCATABLE.rst
+share/cmake/Help/variable/CMAKE_XCODE_SCHEME_LLDB_INIT_FILE.rst
+share/cmake/Help/variable/CMAKE_XCODE_SCHEME_TEST_CONFIGURATION.rst
+share/cmake/Help/variable/CTEST_EXTRA_SUBMIT_FILES.rst
+share/cmake/Help/variable/CTEST_NOTES_FILES.rst
+share/cmake/Help/variable/PROJECT-NAME_COMPAT_VERSION.rst
+share/cmake/Help/variable/PROJECT_COMPAT_VERSION.rst
+share/cmake/Help/variable/include/
+share/cmake/Help/variable/include/CMAKE_FIND_LIBRARY_VAR.rst
+share/cmake/Help/variable/include/CMAKE_FIND_ROOT_PATH_MODE_XXX.rst
+share/cmake/Help/variable/include/CMAKE_LINK_GROUP_USING_FEATURE.rst
+share/cmake/Help/variable/include/CMAKE_LINK_LIBRARY_USING_FEATURE.rst
+share/cmake/Help/variable/include/CMAKE_OSX_VARIABLE.rst
+share/cmake/Help/variable/include/CMAKE_TLS_VERSION-VALUES.rst
+share/cmake/Help/variable/include/CMAKE_VS_VERSION_BUILD_NUMBER_COMPONENTS.rst
+share/cmake/Help/variable/include/CTEST_CUSTOM_XXX.rst
+share/cmake/Help/variable/include/IGNORE_SEARCH_LOCATIONS.rst
+share/cmake/Help/variable/include/IGNORE_SEARCH_NONSYSTEM.rst
+share/cmake/Help/variable/include/IGNORE_SEARCH_PATH.rst
+share/cmake/Help/variable/include/IGNORE_SEARCH_PREFIX.rst
+share/cmake/Help/variable/include/IGNORE_SEARCH_SYSTEM.rst
+share/cmake/Help/variable/include/LINKER_FLAGS.rst
+share/cmake/Help/variable/include/LINKER_PREDEFINED_TYPES.rst
+share/cmake/Help/variable/include/LINK_GROUP_PREDEFINED_FEATURES.rst
+share/cmake/Help/variable/include/LINK_LIBRARY_PREDEFINED_FEATURES.rst
share/cmake/Modules/
share/cmake/Modules/AddFileDependencies.cmake
share/cmake/Modules/AndroidTestUtilities/
@@ -250,6 +407,7 @@ share/cmake/Modules/Compiler/ARMClang-CXX.cmake
share/cmake/Modules/Compiler/ARMClang-DetermineCompiler.cmake
share/cmake/Modules/Compiler/ARMClang.cmake
share/cmake/Modules/Compiler/Absoft-Fortran.cmake
+share/cmake/Modules/Compiler/Apple-Swift.cmake
share/cmake/Modules/Compiler/AppleClang-ASM.cmake
share/cmake/Modules/Compiler/AppleClang-C-FeatureTests.cmake
share/cmake/Modules/Compiler/AppleClang-C.cmake
@@ -293,6 +451,12 @@ share/cmake/Modules/Compiler/CrayPrgEnv-C.cmake
share/cmake/Modules/Compiler/CrayPrgEnv-CXX.cmake
share/cmake/Modules/Compiler/CrayPrgEnv-Fortran.cmake
share/cmake/Modules/Compiler/CrayPrgEnv.cmake
+share/cmake/Modules/Compiler/Diab-ASM.cmake
+share/cmake/Modules/Compiler/Diab-C.cmake
+share/cmake/Modules/Compiler/Diab-CXX.cmake
+share/cmake/Modules/Compiler/Diab-DetermineCompiler.cmake
+share/cmake/Modules/Compiler/Diab-FindBinUtils.cmake
+share/cmake/Modules/Compiler/Diab.cmake
share/cmake/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
share/cmake/Modules/Compiler/Flang-FindBinUtils.cmake
share/cmake/Modules/Compiler/Flang-Fortran.cmake
@@ -342,6 +506,7 @@ share/cmake/Modules/Compiler/IBMClang-C-DetermineCompiler.cmake
share/cmake/Modules/Compiler/IBMClang-C.cmake
share/cmake/Modules/Compiler/IBMClang-CXX-DetermineCompiler.cmake
share/cmake/Modules/Compiler/IBMClang-CXX.cmake
+share/cmake/Modules/Compiler/IBMClang-FindBinUtils.cmake
share/cmake/Modules/Compiler/IBMClang.cmake
share/cmake/Modules/Compiler/Intel-ASM.cmake
share/cmake/Modules/Compiler/Intel-C-FeatureTests.cmake
@@ -413,6 +578,12 @@ share/cmake/Modules/Compiler/QCC-C.cmake
share/cmake/Modules/Compiler/QCC-CXX-FeatureTests.cmake
share/cmake/Modules/Compiler/QCC-CXX.cmake
share/cmake/Modules/Compiler/QCC.cmake
+share/cmake/Modules/Compiler/Renesas-ASM.cmake
+share/cmake/Modules/Compiler/Renesas-C-FeatureTests.cmake
+share/cmake/Modules/Compiler/Renesas-C.cmake
+share/cmake/Modules/Compiler/Renesas-CXX.cmake
+share/cmake/Modules/Compiler/Renesas-DetermineCompiler.cmake
+share/cmake/Modules/Compiler/Renesas.cmake
share/cmake/Modules/Compiler/SCO-C.cmake
share/cmake/Modules/Compiler/SCO-CXX.cmake
share/cmake/Modules/Compiler/SCO-DetermineCompiler.cmake
@@ -757,6 +928,7 @@ share/cmake/Modules/Internal/CMakeNVCCFilterImplicitInfo.cmake
share/cmake/Modules/Internal/CMakeNVCCParseImplicitInfo.cmake
share/cmake/Modules/Internal/CMakeOBJCLinkerInformation.cmake
share/cmake/Modules/Internal/CMakeOBJCXXLinkerInformation.cmake
+share/cmake/Modules/Internal/CMakeParseCompilerArchitectureId.cmake
share/cmake/Modules/Internal/CMakeSwiftLinkerInformation.cmake
share/cmake/Modules/Internal/CMakeTryCompilerOrLinkerFlag.cmake
share/cmake/Modules/Internal/CPack/
@@ -839,6 +1011,14 @@ share/cmake/Modules/Linker/MOLD-Fortran.cmake
share/cmake/Modules/Linker/MOLD-HIP.cmake
share/cmake/Modules/Linker/MOLD-OBJC.cmake
share/cmake/Modules/Linker/MOLD-OBJCXX.cmake
+share/cmake/Modules/Linker/MOLD.cmake
+share/cmake/Modules/Linker/MSVC-ASM.cmake
+share/cmake/Modules/Linker/MSVC-C.cmake
+share/cmake/Modules/Linker/MSVC-CUDA.cmake
+share/cmake/Modules/Linker/MSVC-CXX.cmake
+share/cmake/Modules/Linker/MSVC-Fortran.cmake
+share/cmake/Modules/Linker/MSVC-HIP.cmake
+share/cmake/Modules/Linker/MSVC.cmake
share/cmake/Modules/Linker/Solaris-ASM.cmake
share/cmake/Modules/Linker/Solaris-C.cmake
share/cmake/Modules/Linker/Solaris-CXX.cmake
@@ -915,6 +1095,7 @@ share/cmake/Modules/Platform/Android/abi-mips-Clang.cmake
share/cmake/Modules/Platform/Android/abi-mips-GNU.cmake
share/cmake/Modules/Platform/Android/abi-mips64-Clang.cmake
share/cmake/Modules/Platform/Android/abi-mips64-GNU.cmake
+share/cmake/Modules/Platform/Android/abi-riscv64-Clang.cmake
share/cmake/Modules/Platform/Android/abi-x86-Clang.cmake
share/cmake/Modules/Platform/Android/abi-x86-GNU.cmake
share/cmake/Modules/Platform/Android/abi-x86_64-Clang.cmake
@@ -1042,6 +1223,10 @@ share/cmake/Modules/Platform/Fuchsia-Initialize.cmake
share/cmake/Modules/Platform/Fuchsia.cmake
share/cmake/Modules/Platform/GHS-MULTI-Determine.cmake
share/cmake/Modules/Platform/GHS-MULTI.cmake
+share/cmake/Modules/Platform/GNU-GNU-C.cmake
+share/cmake/Modules/Platform/GNU-GNU-CXX.cmake
+share/cmake/Modules/Platform/GNU-GNU-Fortran.cmake
+share/cmake/Modules/Platform/GNU-GNU.cmake
share/cmake/Modules/Platform/GNU-Initialize.cmake
share/cmake/Modules/Platform/GNU.cmake
share/cmake/Modules/Platform/GNUtoMS_lib.bat.in
@@ -1562,8 +1747,6 @@ share/cmake/Modules/Platform/gas.cmake
share/cmake/Modules/Platform/iOS-Determine-CXX.cmake
share/cmake/Modules/Platform/iOS-Initialize.cmake
share/cmake/Modules/Platform/iOS.cmake
-share/cmake/Modules/Platform/kFreeBSD-Initialize.cmake
-share/cmake/Modules/Platform/kFreeBSD.cmake
share/cmake/Modules/Platform/syllable-Initialize.cmake
share/cmake/Modules/Platform/syllable.cmake
share/cmake/Modules/Platform/tvOS-Determine-CXX.cmake
@@ -1588,7 +1771,7 @@ share/cmake/Modules/SystemInformation.cmake
share/cmake/Modules/SystemInformation.in
share/cmake/Modules/TestBigEndian.cmake
share/cmake/Modules/TestCXXAcceptsFlag.cmake
-share/cmake/Modules/TestEndianess.c.in
+share/cmake/Modules/TestEndianness.c.in
share/cmake/Modules/TestForANSIForScope.cmake
share/cmake/Modules/TestForANSIStreamHeaders.cmake
share/cmake/Modules/TestForANSIStreamHeaders.cxx
@@ -1627,6 +1810,7 @@ share/cmake/Templates/CPack.GenericDescription.txt
share/cmake/Templates/CPack.GenericLicense.txt
share/cmake/Templates/CPack.GenericWelcome.txt
share/cmake/Templates/CPackConfig.cmake.in
+share/cmake/Templates/CTestScript.cmake.in
share/cmake/Templates/MSBuild/
share/cmake/Templates/MSBuild/CustomBuildDepFile.targets
share/cmake/Templates/MSBuild/FlagTables/
@@ -1679,10 +1863,9 @@ share/cmake/Templates/Windows/SmallLogo44x44.png
share/cmake/Templates/Windows/SplashScreen.png
share/cmake/Templates/Windows/StoreLogo.png
share/cmake/Templates/Windows/Windows_TemporaryKey.pfx
-share/cmake/include/
-share/cmake/include/cmCPluginAPI.h
share/doc/cmake/
-share/doc/cmake/Copyright.txt
+share/doc/cmake/CONTRIBUTORS.rst
+share/doc/cmake/LICENSE.rst
share/doc/cmake/cmcppdap/
share/doc/cmake/cmcppdap/NOTICE
share/doc/cmake/cmsys/
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index eb99a541675..a97d2e2845c 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.31.8.tar.gz) = 483jyoPcLTISEFMmuPG1ZRFr6Ag5Q4QAfn7xwlOvbKo=
-SIZE (cmake-3.31.8.tar.gz) = 11713806
+SHA256 (cmake-4.1.2.tar.gz) = ZD8EGCt7oyOrMfUm94UTT7ecujGIqFIgbvBHP+4oKhU=
+SIZE (cmake-4.1.2.tar.gz) = 12048810
diff --git a/devel/cmake/man/pkg/PLIST b/devel/cmake/man/pkg/PLIST
index 33f0d4b3098..467b83a3ceb 100644
--- a/devel/cmake/man/pkg/PLIST
+++ b/devel/cmake/man/pkg/PLIST
@@ -14,6 +14,7 @@
@man man/man7/cmake-file-api.7
@man man/man7/cmake-generator-expressions.7
@man man/man7/cmake-generators.7
+@man man/man7/cmake-instrumentation.7
@man man/man7/cmake-language.7
@man man/man7/cmake-modules.7
@man man/man7/cmake-packages.7
diff --git a/devel/cmake/patches/patch-Modules_CMakeUnixFindMake_cmake b/devel/cmake/patches/patch-Modules_CMakeUnixFindMake_cmake
index f477adb91c1..6b55efab971 100644
--- a/devel/cmake/patches/patch-Modules_CMakeUnixFindMake_cmake
+++ b/devel/cmake/patches/patch-Modules_CMakeUnixFindMake_cmake
@@ -4,12 +4,10 @@ https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6132
Index: Modules/CMakeUnixFindMake.cmake
--- Modules/CMakeUnixFindMake.cmake.orig
+++ Modules/CMakeUnixFindMake.cmake
-@@ -2,7 +2,7 @@
- # file Copyright.txt or https://cmake.org/licensing for details.
+@@ -2,5 +2,5 @@
+ # file LICENSE.rst or https://cmake.org/licensing for details.

-find_program(CMAKE_MAKE_PROGRAM NAMES gmake make smake)
+find_program(CMAKE_MAKE_PROGRAM NAMES make gmake smake)
mark_as_advanced(CMAKE_MAKE_PROGRAM)
-
- # Look for a make tool provided by Xcode
diff --git a/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake b/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake
index ebd793dc29c..3eb2faacbd8 100644
--- a/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake
+++ b/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake
@@ -1,7 +1,7 @@
Index: Modules/Compiler/GNU.cmake
--- Modules/Compiler/GNU.cmake.orig
+++ Modules/Compiler/GNU.cmake
-@@ -53,11 +53,19 @@ macro(__compiler_gnu lang)
+@@ -55,11 +55,19 @@ macro(__compiler_gnu lang)
endif()

# Initial configuration flags.
diff --git a/devel/cmake/patches/patch-Modules_FindMPEG2_cmake b/devel/cmake/patches/patch-Modules_FindMPEG2_cmake
deleted file mode 100644
index d8d7a046d54..00000000000
--- a/devel/cmake/patches/patch-Modules_FindMPEG2_cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: Modules/FindMPEG2.cmake
---- Modules/FindMPEG2.cmake.orig
-+++ Modules/FindMPEG2.cmake
-@@ -47,4 +47,4 @@ if(MPEG2_FOUND)
- endif()
- endif()
-
--mark_as_advanced(MPEG2_INCLUDE_DIR MPEG2_mpeg2_LIBRARY MPEG2_vo_LIBRARY)
-+mark_as_advanced(MPEG2_INCLUDE_DIR MPEG2_mpeg2_LIBRARY)
diff --git a/devel/cmake/patches/patch-Modules_FindMPEG_cmake b/devel/cmake/patches/patch-Modules_FindMPEG_cmake
index aa0894a0f28..86b757bf31b 100644
--- a/devel/cmake/patches/patch-Modules_FindMPEG_cmake
+++ b/devel/cmake/patches/patch-Modules_FindMPEG_cmake
@@ -1,16 +1,7 @@
Index: Modules/FindMPEG.cmake
--- Modules/FindMPEG.cmake.orig
+++ Modules/FindMPEG.cmake
-@@ -28,8 +28,6 @@ find_path(MPEG_INCLUDE_DIR
-
- find_library(MPEG_mpeg2_LIBRARY mpeg2)
-
--find_library(MPEG_vo_LIBRARY vo)
--
- include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_mpeg2_LIBRARY MPEG_INCLUDE_DIR)
-
-@@ -40,4 +38,4 @@ if(MPEG_FOUND)
+@@ -81,4 +81,4 @@ if(MPEG_FOUND)
endif()
endif()

diff --git a/devel/cmake/patches/patch-Modules_FindOpenMP_cmake b/devel/cmake/patches/patch-Modules_FindOpenMP_cmake
index cbb77ee6a50..1875e369f05 100644
--- a/devel/cmake/patches/patch-Modules_FindOpenMP_cmake
+++ b/devel/cmake/patches/patch-Modules_FindOpenMP_cmake
@@ -3,7 +3,7 @@ Add libs and paths. Ensure the lib is used for the C case.
Index: Modules/FindOpenMP.cmake
--- Modules/FindOpenMP.cmake.orig
+++ Modules/FindOpenMP.cmake
-@@ -120,9 +120,9 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
+@@ -117,9 +117,9 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
if(NOT OpenMP_${LANG}_FLAG)
unset(OpenMP_FLAG_CANDIDATES)

diff --git a/devel/cmake/patches/patch-Modules_FindSDL_cmake b/devel/cmake/patches/patch-Modules_FindSDL_cmake
index 611624af094..24d00875b80 100644
--- a/devel/cmake/patches/patch-Modules_FindSDL_cmake
+++ b/devel/cmake/patches/patch-Modules_FindSDL_cmake
@@ -1,7 +1,7 @@
Index: Modules/FindSDL.cmake
--- Modules/FindSDL.cmake.orig
+++ Modules/FindSDL.cmake
-@@ -127,6 +127,11 @@ else()
+@@ -189,6 +189,11 @@ else()
set(VC_LIB_PATH_SUFFIX lib/x86)
endif()

diff --git a/devel/cmake/patches/patch-Modules_FindTCL_cmake b/devel/cmake/patches/patch-Modules_FindTCL_cmake
index ca47d3e16e8..691b7692d35 100644
--- a/devel/cmake/patches/patch-Modules_FindTCL_cmake
+++ b/devel/cmake/patches/patch-Modules_FindTCL_cmake
@@ -1,7 +1,7 @@
Index: Modules/FindTCL.cmake
--- Modules/FindTCL.cmake.orig
+++ Modules/FindTCL.cmake
-@@ -52,19 +52,36 @@ endblock()
+@@ -77,19 +77,36 @@ endblock()
include(${CMAKE_CURRENT_LIST_DIR}/FindTclsh.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/FindWish.cmake)

@@ -42,7 +42,7 @@ Index: Modules/FindTCL.cmake

get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -79,15 +96,35 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
+@@ -104,15 +121,35 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
string(REGEX REPLACE
"^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")

@@ -86,7 +86,7 @@ Index: Modules/FindTCL.cmake
set(TCLTK_POSSIBLE_LIB_PATH_SUFFIXES
lib/tcl/tcl8.7
lib/tcl/tk8.7
-@@ -170,16 +207,6 @@ if(Tk_FRAMEWORKS)
+@@ -195,16 +232,6 @@ if(Tk_FRAMEWORKS)
endif()
endif()

@@ -103,7 +103,7 @@ Index: Modules/FindTCL.cmake

set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES
include/tcl${TK_LIBRARY_VERSION}
-@@ -196,6 +223,36 @@ set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES
+@@ -221,6 +248,36 @@ set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES
include/tcl8.2
include/tcl8.0
)
diff --git a/devel/cmake/patches/patch-Modules_FindTIFF_cmake b/devel/cmake/patches/patch-Modules_FindTIFF_cmake
deleted file mode 100644
index 3e814ca6344..00000000000
--- a/devel/cmake/patches/patch-Modules_FindTIFF_cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-Revert: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9300
-More: https://gitlab.kitware.com/cmake/cmake/-/issues/26038
-Index: Modules/FindTIFF.cmake
---- Modules/FindTIFF.cmake.orig
-+++ Modules/FindTIFF.cmake
-@@ -101,9 +101,9 @@ if (_TIFF_component_opt)
- endif ()
- unset(_TIFF_component_opt)
- # Always find with QUIET to avoid noise when it is not found.
--find_package(Tiff CONFIG QUIET ${_TIFF_args})
-+find_package(tiff CONFIG QUIET ${_TIFF_args})
- unset(_TIFF_args)
--if (Tiff_FOUND)
-+if (tiff_FOUND)
- if (NOT TARGET TIFF::TIFF)
- add_library(TIFF::TIFF IMPORTED INTERFACE)
- set_target_properties(TIFF::TIFF PROPERTIES
-@@ -202,7 +202,7 @@ if (Tiff_FOUND)
- endif ()
- endif ()
- endif ()
-- set(TIFF_VERSION_STRING "${Tiff_VERSION}")
-+ set(TIFF_VERSION_STRING "${tiff_VERSION}")
- foreach (_TIFF_component IN LISTS TIFF_FIND_COMPONENTS)
- set(TIFF_${_TIFF_component}_FOUND "${Tiff_${_TIFF_component}_FOUND}")
- endforeach ()
-@@ -211,7 +211,6 @@ if (Tiff_FOUND)
- include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
- find_package_handle_standard_args(TIFF
- HANDLE_COMPONENTS
-- REQUIRED_VARS Tiff_DIR
- VERSION_VAR TIFF_VERSION_STRING)
-
- cmake_policy(POP)
diff --git a/devel/cmake/patches/patch-Modules_FindTclStub_cmake b/devel/cmake/patches/patch-Modules_FindTclStub_cmake
index 960ec9671da..ec1c6d07af0 100644
--- a/devel/cmake/patches/patch-Modules_FindTclStub_cmake
+++ b/devel/cmake/patches/patch-Modules_FindTclStub_cmake
@@ -1,7 +1,7 @@
Index: Modules/FindTclStub.cmake
--- Modules/FindTclStub.cmake.orig
+++ Modules/FindTclStub.cmake
-@@ -47,15 +47,26 @@ variables were moved or removed. Changes compared to
+@@ -56,15 +56,26 @@ Online references:

include(${CMAKE_CURRENT_LIST_DIR}/FindTCL.cmake)

@@ -32,7 +32,7 @@ Index: Modules/FindTclStub.cmake

get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -70,14 +81,20 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
+@@ -79,14 +90,20 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
string(REGEX REPLACE
"^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")

diff --git a/devel/cmake/patches/patch-Modules_FindTclsh_cmake b/devel/cmake/patches/patch-Modules_FindTclsh_cmake
index a97f7de61db..f41bdd37c4f 100644
--- a/devel/cmake/patches/patch-Modules_FindTclsh_cmake
+++ b/devel/cmake/patches/patch-Modules_FindTclsh_cmake
@@ -1,8 +1,8 @@
Index: Modules/FindTclsh.cmake
--- Modules/FindTclsh.cmake.orig
+++ Modules/FindTclsh.cmake
-@@ -17,18 +17,30 @@ library is. This code sets the following variables:
- TCL_TCLSH = the path to the tclsh executable
+@@ -42,18 +42,30 @@ See Also
+ * The :module:`FindTclStub` module to find the Tcl Stubs Library.
#]=======================================================================]

+set(MODTCL_VERSION $ENV{MODTCL_VERSION})
diff --git a/devel/cmake/patches/patch-Modules_FindWish_cmake b/devel/cmake/patches/patch-Modules_FindWish_cmake
index 5c414c0969f..c65015d4529 100644
--- a/devel/cmake/patches/patch-Modules_FindWish_cmake
+++ b/devel/cmake/patches/patch-Modules_FindWish_cmake
@@ -1,8 +1,8 @@
Index: Modules/FindWish.cmake
--- Modules/FindWish.cmake.orig
+++ Modules/FindWish.cmake
-@@ -20,14 +20,21 @@ library is. This code sets the following variables:
- if UNIX is defined, then it will look for the cygwin version first
+@@ -33,14 +33,21 @@ Finding ``wish``:
+ message(STATUS "Found wish at: ${TK_WISH}")
#]=======================================================================]

+set(MODTCL_VERSION $ENV{MODTCL_VERSION})
@@ -25,7 +25,7 @@ Index: Modules/FindWish.cmake

get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -66,16 +73,22 @@ if(WIN32)
+@@ -79,16 +86,22 @@ if(WIN32)
)
endif()

diff --git a/devel/cmake/patches/patch-Modules_FindXMLRPC_cmake b/devel/cmake/patches/patch-Modules_FindXMLRPC_cmake
index 390500ee35a..8b9db62fcd7 100644
--- a/devel/cmake/patches/patch-Modules_FindXMLRPC_cmake
+++ b/devel/cmake/patches/patch-Modules_FindXMLRPC_cmake
@@ -1,7 +1,7 @@
Index: Modules/FindXMLRPC.cmake
--- Modules/FindXMLRPC.cmake.orig
+++ Modules/FindXMLRPC.cmake
-@@ -98,6 +98,8 @@ if(XMLRPC_C_FOUND)
+@@ -141,6 +141,8 @@ if(XMLRPC_C_FOUND)
endif()
endforeach()

diff --git a/devel/cmake/patches/patch-Source_CTest_cmCTestCurl_h b/devel/cmake/patches/patch-Source_CTest_cmCTestCurl_h
deleted file mode 100644
index bbb22f4a58e..00000000000
--- a/devel/cmake/patches/patch-Source_CTest_cmCTestCurl_h
+++ /dev/null
@@ -1,24 +0,0 @@
-From c8143074cf3954b1e169904eb9d843cfbe14acc3 Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king@kitware.com>
-Date: Tue, 2 Sep 2025 11:41:10 -0400
-Subject: [PATCH] cmCTestCurl: Avoid using undocumented type for
- CURLOPT_PROXYTYPE values
-
-Since upstream curl commit `1a12663d06` (CURLOPT: bump `CURLPROXY_*`
-enums to `long`, drop casts, 2025-07-28), the `CURLPROXY_*` constants
-are integer literals instead of `enum curl_proxytype`. It turns out
-that `curl_easy_setopt` has always expected a `long` anyway, and that
-`curl_proxytype` is not documented for public use.
-
-Index: Source/CTest/cmCTestCurl.h
---- Source/CTest/cmCTestCurl.h.orig
-+++ Source/CTest/cmCTestCurl.h
-@@ -52,7 +52,7 @@ class cmCTestCurl (private)
- std::vector<std::string> HttpHeaders;
- std::string HTTPProxyAuth;
- std::string HTTPProxy;
-- curl_proxytype HTTPProxyType;
-+ long HTTPProxyType;
- bool UseHttp10 = false;
- bool Quiet = false;
- int TimeOutSeconds = 0;
diff --git a/devel/cmake/patches/patch-Source_cmFileCommand_cxx b/devel/cmake/patches/patch-Source_cmFileCommand_cxx
index d9c95047b93..6d80ee86c5b 100644
--- a/devel/cmake/patches/patch-Source_cmFileCommand_cxx
+++ b/devel/cmake/patches/patch-Source_cmFileCommand_cxx
@@ -1,7 +1,7 @@
Index: Source/cmFileCommand.cxx
--- Source/cmFileCommand.cxx.orig
+++ Source/cmFileCommand.cxx
-@@ -1931,6 +1931,13 @@ bool HandleDownloadCommand(std::vector<std::string> co
+@@ -1885,6 +1885,13 @@ bool HandleDownloadCommand(std::vector<std::string> co
++i;
std::string file;

@@ -15,7 +15,7 @@ Index: Source/cmFileCommand.cxx
long timeout = 0;
long inactivity_timeout = 0;
std::string logVar;
-@@ -2412,6 +2419,12 @@ bool HandleUploadCommand(std::vector<std::string> cons
+@@ -2371,6 +2378,12 @@ bool HandleUploadCommand(std::vector<std::string> cons
cmExecutionStatus& status)
{
#if !defined(CMAKE_BOOTSTRAP)
diff --git a/devel/cmake/patches/patch-Source_cmFindPackageCommand_cxx b/devel/cmake/patches/patch-Source_cmFindPackageCommand_cxx
index 0f0f4810a99..b0a8c1abe27 100644
--- a/devel/cmake/patches/patch-Source_cmFindPackageCommand_cxx
+++ b/devel/cmake/patches/patch-Source_cmFindPackageCommand_cxx
@@ -3,7 +3,7 @@ Disable find_package QUIET option in openbsd ports builds.
Index: Source/cmFindPackageCommand.cxx
--- Source/cmFindPackageCommand.cxx.orig
+++ Source/cmFindPackageCommand.cxx
-@@ -712,7 +712,13 @@ bool cmFindPackageCommand::InitialPass(std::vector<std
+@@ -751,7 +751,13 @@ bool cmFindPackageCommand::InitialPass(std::vector<std
std::vector<std::size_t> moduleArgs;
for (std::size_t i = 1u; i < args.size(); ++i) {
if (args[i] == "QUIET") {
@@ -17,4 +17,4 @@ Index: Source/cmFindPackageCommand.cxx
+ this->Quiet = quiet;
doing = DoingNone;
} else if (args[i] == "BYPASS_PROVIDER") {
- bypassProvider = true;
+ this->BypassProvider = true;
diff --git a/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx b/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
index 0282cff4f59..550bea0df1a 100644
--- a/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
+++ b/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
@@ -1,7 +1,7 @@
Index: Source/cmGeneratorTarget.cxx
--- Source/cmGeneratorTarget.cxx.orig
+++ Source/cmGeneratorTarget.cxx
-@@ -3427,6 +3427,50 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
+@@ -3432,6 +3432,50 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
targetNames.Output =
cmStrCat(components.prefix, targetNames.Base, components.suffix);

diff --git a/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx b/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
index d20dc2a424e..ecedd8dbd80 100644
--- a/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
+++ b/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
@@ -1,13 +1,16 @@
Index: Source/cmGlobalGenerator.cxx
--- Source/cmGlobalGenerator.cxx.orig
+++ Source/cmGlobalGenerator.cxx
-@@ -2988,6 +2988,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
+@@ -2856,6 +2856,12 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
+ }
cmCustomCommandLine singleLine;
singleLine.push_back(cmSystemTools::GetCTestCommand());
- singleLine.push_back("--force-new-ctest-process");
-+ // Skip tests requiring internet access
-+ singleLine.push_back("--exclude-regex");
-+ singleLine.push_back("\"CMake.FileDownload|CTestTestUpload|RunCMake.ctest_submit\"");
++ std::string openbsd_build;
++ if ((cmSystemTools::GetEnv("MODCMAKE_PORT_BUILD", openbsd_build))) {
++ // Skip tests requiring internet access
++ singleLine.push_back("--exclude-regex");
++ singleLine.push_back("\"CMake.FileDownload|CTestTestUpload|RunCMake.ctest_submit\"");
++ }
cmList args(mf->GetDefinition("CMAKE_CTEST_ARGUMENTS"));
for (auto const& arg : args) {
singleLine.push_back(arg);
diff --git a/devel/cmake/patches/patch-Source_cmInstallCommand_cxx b/devel/cmake/patches/patch-Source_cmInstallCommand_cxx
index df9c24606b0..d06650e10a1 100644
--- a/devel/cmake/patches/patch-Source_cmInstallCommand_cxx
+++ b/devel/cmake/patches/patch-Source_cmInstallCommand_cxx
@@ -1,7 +1,7 @@
Index: Source/cmInstallCommand.cxx
--- Source/cmInstallCommand.cxx.orig
+++ Source/cmInstallCommand.cxx
-@@ -678,6 +678,9 @@ bool HandleTargetsMode(std::vector<std::string> const&
+@@ -677,6 +677,9 @@ bool HandleTargetsMode(std::vector<std::string> const&
}

// Select the mode for installing symlinks to versioned shared libraries.
@@ -11,7 +11,7 @@ Index: Source/cmInstallCommand.cxx
cmInstallTargetGenerator::NamelinkModeType namelinkMode =
cmInstallTargetGenerator::NamelinkModeNone;
if (libraryArgs.GetNamelinkOnly()) {
-@@ -693,6 +696,12 @@ bool HandleTargetsMode(std::vector<std::string> const&
+@@ -692,6 +695,12 @@ bool HandleTargetsMode(std::vector<std::string> const&
} else if (archiveArgs.GetNamelinkSkip()) {
importlinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
}
diff --git a/devel/cmake/patches/patch-Source_cmQtAutoGenInitializer_cxx b/devel/cmake/patches/patch-Source_cmQtAutoGenInitializer_cxx
deleted file mode 100644
index 539a7c506cf..00000000000
--- a/devel/cmake/patches/patch-Source_cmQtAutoGenInitializer_cxx
+++ /dev/null
@@ -1,26 +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 "::"
-
-Moc should theoretically be able to parse this. [1] Not exactly sure
-why it's failing. Upstream bug report [2]
-
-[1] https://code.qt.io/cgit/qt/qtbase.git/tree/src/tools/moc/moc.cpp?h=6.6.0#n631
-[2] https://bugreports.qt.io/browse/QTBUG-117765
-
-Index: Source/cmQtAutoGenInitializer.cxx
---- Source/cmQtAutoGenInitializer.cxx.orig
-+++ Source/cmQtAutoGenInitializer.cxx
-@@ -1972,6 +1972,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) || defined(__OpenBSD__)
-+ this->Moc.PredefsCmd.insert(this->Moc.PredefsCmd.begin() + 1,
-+ "-D_LIBCPP_HAS_NO_CONCEPTS");
-+

OpenBSD Mail Box

Wednesday, February 11, 2026

HEADS UP UPDATE: devel/cmake from 3.x to 4.x

No comments:

Post a Comment