aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason E. Hale <jhale@FreeBSD.org>2025-05-01 05:43:22 +0000
committerJason E. Hale <jhale@FreeBSD.org>2025-05-01 06:15:23 +0000
commit2250b9fbaa84ab6985224562d91f6e01b988732c (patch)
tree0e455f86c5702a2dd3ec9ec1fe6b7c2c76a152d9
parentdc661e376816d8efbaeb1a2a6aaa8d5e2404b8aa (diff)
devel/cmake*: Update to 3.31.7
kde@ is aware that CMake 4.0.x is out, but an update at this time would likely entail fallout from 500+ ports, which we'd rather let upstream projects deal with until fixing problems ourselves reaches a manageable level. Most of these are easily fixable, but it's still a lot to clear for a very small team with other projects to consider. See, for example: https://build.opensuse.org/project/show/home:simotek:cmake4 https://www.kitware.com/cmake-3-31-7-available-for-download/
-rw-r--r--Mk/Uses/cmake.mk2
-rw-r--r--devel/cmake-core/Makefile3
-rw-r--r--devel/cmake-core/distinfo8
-rw-r--r--devel/cmake-core/pkg-plist13
-rw-r--r--devel/cmake-gui/Makefile3
5 files changed, 17 insertions, 12 deletions
diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk
index ed80dad46e3e..6d8978c49672 100644
--- a/Mk/Uses/cmake.mk
+++ b/Mk/Uses/cmake.mk
@@ -68,7 +68,7 @@ _valid_ARGS= indirect insource noninja run testing _internal
# Reminder: devel/cmake-core, devel/cmake-doc, devel/cmake-gui, and devel/cmake-man
# are all affected by changing _CMAKE_VERSION. Please check each of these ports.
-_CMAKE_VERSION= 3.31.6
+_CMAKE_VERSION= 3.31.7
CMAKE_BIN= ${LOCALBASE}/bin/cmake
# Sanity check
diff --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile
index 338edd768112..f6dead9a0794 100644
--- a/devel/cmake-core/Makefile
+++ b/devel/cmake-core/Makefile
@@ -7,9 +7,6 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Cross-platform Makefile generator
WWW= https://www.cmake.org/
-PATCH_SITES= https://gitlab.kitware.com/cmake/cmake/-/commit/
-PATCHFILES+= 1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd.patch:-p1 # Fix build with curl >= 8.13.0
-
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/Copyright.txt
diff --git a/devel/cmake-core/distinfo b/devel/cmake-core/distinfo
index 56232db4f9e2..38d638c4dcd0 100644
--- a/devel/cmake-core/distinfo
+++ b/devel/cmake-core/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1745845681
-SHA256 (cmake-3.31.6.tar.gz) = 653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0
-SIZE (cmake-3.31.6.tar.gz) = 11710589
-SHA256 (1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd.patch) = fab4f6c4dfbdea777a5ccad3db97fd5f3336fcb48a30847c94c0a5636757c2ef
-SIZE (1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd.patch) = 1142
+TIMESTAMP = 1746076226
+SHA256 (cmake-3.31.7.tar.gz) = a6d2eb1ebeb99130dfe63ef5a340c3fdb11431cce3d7ca148524c125924cea68
+SIZE (cmake-3.31.7.tar.gz) = 11711975
diff --git a/devel/cmake-core/pkg-plist b/devel/cmake-core/pkg-plist
index 628510190742..3da13fe26cf2 100644
--- a/devel/cmake-core/pkg-plist
+++ b/devel/cmake-core/pkg-plist
@@ -2856,6 +2856,19 @@ share/bash-completion/completions/ctest
%%DATADIR%%/Modules/Internal/CMakeDetermineLinkerId.cmake
%%DATADIR%%/Modules/Internal/CMakeFortranLinkerInformation.cmake
%%DATADIR%%/Modules/Internal/CMakeHIPLinkerInformation.cmake
+%%DATADIR%%/Modules/Internal/CMakeInspectASM-ATTLinker.cmake
+%%DATADIR%%/Modules/Internal/CMakeInspectASMLinker.cmake
+%%DATADIR%%/Modules/Internal/CMakeInspectASM_MARMASMLinker.cmake
+%%DATADIR%%/Modules/Internal/CMakeInspectASM_MASMLinker.cmake
+%%DATADIR%%/Modules/Internal/CMakeInspectASM_NASMLinker.cmake
+%%DATADIR%%/Modules/Internal/CMakeInspectCLinker.cmake
+%%DATADIR%%/Modules/Internal/CMakeInspectCUDALinker.cmake
+%%DATADIR%%/Modules/Internal/CMakeInspectCXXLinker.cmake
+%%DATADIR%%/Modules/Internal/CMakeInspectFortranLinker.cmake
+%%DATADIR%%/Modules/Internal/CMakeInspectHIPLinker.cmake
+%%DATADIR%%/Modules/Internal/CMakeInspectOBJCLinker.cmake
+%%DATADIR%%/Modules/Internal/CMakeInspectOBJCXXLinker.cmake
+%%DATADIR%%/Modules/Internal/CMakeInspectSwiftLinker.cmake
%%DATADIR%%/Modules/Internal/CMakeNVCCFilterImplicitInfo.cmake
%%DATADIR%%/Modules/Internal/CMakeNVCCParseImplicitInfo.cmake
%%DATADIR%%/Modules/Internal/CMakeOBJCLinkerInformation.cmake
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index 553d5450c13a..6edef08c384c 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -7,9 +7,6 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt-based GUI for CMake
WWW= https://www.cmake.org
-PATCH_SITES= https://gitlab.kitware.com/cmake/cmake/-/commit/
-PATCHFILES+= 1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd.patch:-p1 # Fix build with curl >= 8.13.0
-
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/Copyright.txt