git: 491bc332df33 - main - archivers/nevada-toolset: unbreak the port's build against CMake 4.x.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 30 Sep 2026 17:13:47 UTC
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=491bc332df33a60082a9a26a5c009217cd7ca5a6
commit 491bc332df33a60082a9a26a5c009217cd7ca5a6
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2026-09-30 17:12:24 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2026-09-30 17:12:24 +0000
archivers/nevada-toolset: unbreak the port's build against CMake 4.x.
---
archivers/nevada-toolset/files/patch-CMakeLists.txt | 14 ++++++++++----
.../files/patch-libs_baseconfig_CMakeLists.txt | 10 ++++++++--
.../files/patch-libs_captainslog_CMakeLists.txt | 8 +++++++-
3 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/archivers/nevada-toolset/files/patch-CMakeLists.txt b/archivers/nevada-toolset/files/patch-CMakeLists.txt
index b8e8ecd2408b..ed450e75881a 100644
--- a/archivers/nevada-toolset/files/patch-CMakeLists.txt
+++ b/archivers/nevada-toolset/files/patch-CMakeLists.txt
@@ -1,13 +1,19 @@
--- CMakeLists.txt.orig 2020-08-15 22:06:32 UTC
+++ CMakeLists.txt
-@@ -15,10 +15,6 @@ option(BUILD_GUI_TOOLS "Build GUI versions of tools wh
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1.0)
++cmake_minimum_required(VERSION 3.1.0...9.9.9)
- option(BUILD_GUI_TOOLS "Build GUI versions of tools where available (Requires wxWidgets)." OFF)
+ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ message(STATUS "No build type selected, default to Debug")
+@@ -14,10 +14,6 @@ else()
+ endif()
+ option(BUILD_GUI_TOOLS "Build GUI versions of tools where available (Requires wxWidgets)." OFF)
+-
-if(USE_ICU)
- find_package(ICU REQUIRED data i18n io tu uc)
-endif()
--
+
if(BUILD_GUI_TOOLS)
find_package(wxWidgets REQUIRED core base xrc xml adv)
- endif()
diff --git a/archivers/nevada-toolset/files/patch-libs_baseconfig_CMakeLists.txt b/archivers/nevada-toolset/files/patch-libs_baseconfig_CMakeLists.txt
index 6f1d10e4bbc0..fac0081ce1b5 100644
--- a/archivers/nevada-toolset/files/patch-libs_baseconfig_CMakeLists.txt
+++ b/archivers/nevada-toolset/files/patch-libs_baseconfig_CMakeLists.txt
@@ -1,6 +1,12 @@
--- libs/baseconfig/CMakeLists.txt.orig 2020-01-23 13:00:42 UTC
+++ libs/baseconfig/CMakeLists.txt
-@@ -18,7 +18,7 @@ find_package(Git)
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1.0)
++cmake_minimum_required(VERSION 3.1.0...9.9.9)
+
+ if(POLICY CMP0074)
+ cmake_policy(SET CMP0074 NEW)
+@@ -18,7 +18,7 @@ include(CheckIncludeFile)
# Locate git binary to provide information to the build environment
find_package(Git)
@@ -9,7 +15,7 @@
# Define current git branch.
if(NOT GITINFO_BRANCH)
execute_process(
-@@ -90,15 +90,15 @@ else()
+@@ -90,15 +90,15 @@ if(GIT_FOUND)
list(GET GITINFO_DATE_AND_TIME 2 GITINFO_COMMIT_TZONE)
else()
# Fallback information if git isn't found. This should never be present in official builds.
diff --git a/archivers/nevada-toolset/files/patch-libs_captainslog_CMakeLists.txt b/archivers/nevada-toolset/files/patch-libs_captainslog_CMakeLists.txt
index e48d95378c78..5e3c00f61765 100644
--- a/archivers/nevada-toolset/files/patch-libs_captainslog_CMakeLists.txt
+++ b/archivers/nevada-toolset/files/patch-libs_captainslog_CMakeLists.txt
@@ -1,6 +1,12 @@
--- libs/captainslog/CMakeLists.txt.orig 2020-02-14 15:15:30 UTC
+++ libs/captainslog/CMakeLists.txt
-@@ -31,13 +31,6 @@ elseif("${CMAKE_SYSTEM}" MATCHES "Darwin")
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1.0)
++cmake_minimum_required(VERSION 3.1.0...9.9.9)
+
+ if(POLICY CMP0074)
+ cmake_policy(SET CMP0074 NEW)
+@@ -31,13 +31,6 @@ if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
list(APPEND CAPTN_SRC src/captnmessage_win32.c)
elseif("${CMAKE_SYSTEM}" MATCHES "Darwin")
list(APPEND CAPTN_SRC src/captnmessage_macos.m)