CVS commit: pkgsrc/shells/fish

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 18 07:38:27 UTC 2025

Modified Files:
        pkgsrc/shells/fish: Makefile distinfo
Added Files:
        pkgsrc/shells/fish/patches: patch-cmake_Tests.cmake

Log Message:
fish: fix build with cmake 4


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/shells/fish/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/fish/patches/patch-cmake_Tests.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/fish/Makefile
diff -u pkgsrc/shells/fish/Makefile:1.54 pkgsrc/shells/fish/Makefile:1.55
--- pkgsrc/shells/fish/Makefile:1.54    Thu May  1 12:37:08 2025
+++ pkgsrc/shells/fish/Makefile Mon Aug 18 07:38:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2025/05/01 12:37:08 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2025/08/18 07:38:27 wiz Exp $
 
 DISTNAME=              fish-3.7.1
 CATEGORIES=            shells
@@ -14,9 +14,10 @@ LICENSE=             gnu-gpl-v2
 
 USE_LANGUAGES+=                c c++
 USE_TOOLS+=            msgfmt
-CMAKE_CONFIGURE_ARGS+=         -DIntl_INCLUDE_DIR=${PREFIX}/include
-CMAKE_CONFIGURE_ARGS+=         -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR}
-CMAKE_CONFIGURE_ARGS+=         -DBUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DIntl_INCLUDE_DIR=${PREFIX}/include
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 PKG_SHELL=             bin/fish
 

Index: pkgsrc/shells/fish/distinfo
diff -u pkgsrc/shells/fish/distinfo:1.37 pkgsrc/shells/fish/distinfo:1.38
--- pkgsrc/shells/fish/distinfo:1.37    Tue Apr  2 14:56:47 2024
+++ pkgsrc/shells/fish/distinfo Mon Aug 18 07:38:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2024/04/02 14:56:47 ktnb Exp $
+$NetBSD: distinfo,v 1.38 2025/08/18 07:38:27 wiz Exp $
 
 BLAKE2s (fish-3.7.1.tar.xz) = 0d00f7d6578c45e9f8d4afe2cb5f71cf1ad16c99b365bff442c2b4cc030f8738
 SHA512 (fish-3.7.1.tar.xz) = f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe
@@ -6,3 +6,4 @@ Size (fish-3.7.1.tar.xz) = 2965756 bytes
 SHA1 (patch-build__tools_git__version__gen.sh) = d66abecc900fa411f6da9c5fbb9f70f533025a49
 SHA1 (patch-cmake_ConfigureChecks.cmake) = e8194cd5b927e6f5c42afb8ca953756d223b8d1c
 SHA1 (patch-cmake_Install.cmake) = 1defcb125ab0082649f1b6e592df96a9c5d49c0a
+SHA1 (patch-cmake_Tests.cmake) = cf23eb434e5030801eea8ebbe4e2b7ae33debcd8

Added files:

Index: pkgsrc/shells/fish/patches/patch-cmake_Tests.cmake
diff -u /dev/null pkgsrc/shells/fish/patches/patch-cmake_Tests.cmake:1.1
--- /dev/null   Mon Aug 18 07:38:27 2025
+++ pkgsrc/shells/fish/patches/patch-cmake_Tests.cmake  Mon Aug 18 07:38:27 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-cmake_Tests.cmake,v 1.1 2025/08/18 07:38:27 wiz Exp $
+
+Fix build with cmake 4.
+
+--- cmake/Tests.cmake.orig     2025-08-18 07:37:21.924160132 +0000
++++ cmake/Tests.cmake
+@@ -41,15 +41,6 @@ add_custom_target(fish_run_tests
+   USES_TERMINAL
+ )
+ 
+-# If CMP0037 is available, also make an alias "test" target.
+-# Note that this policy may not be available, in which case definining such a target silently fails.
+-cmake_policy(PUSH)
+-if(POLICY CMP0037)
+-  cmake_policy(SET CMP0037 OLD)
+-  add_custom_target(test DEPENDS fish_run_tests)
+-endif()
+-cmake_policy(POP)
+-
+ # Build the low-level tests code
+ add_executable(fish_tests EXCLUDE_FROM_ALL
+                src/fish_tests.cpp)