CVS commit: pkgsrc/shells/fish

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue May 16 16:54:50 UTC 2023

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

Log Message:
fish: fix build on NetBSD-current

fish uses symbols from libterminfo, so it needs to link against it.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/shells/fish/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/shells/fish/patches/patch-cmake_ConfigureChecks.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/distinfo
diff -u pkgsrc/shells/fish/distinfo:1.31 pkgsrc/shells/fish/distinfo:1.32
--- pkgsrc/shells/fish/distinfo:1.31    Wed Mar 29 09:39:02 2023
+++ pkgsrc/shells/fish/distinfo Tue May 16 16:54:50 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.31 2023/03/29 09:39:02 wiz Exp $
+$NetBSD: distinfo,v 1.32 2023/05/16 16:54:50 wiz Exp $
 
 BLAKE2s (fish-3.6.1.tar.xz) = 5b007915483fc83345adbda7f531352019ba44c7122dbcded5cb7b949dd4252b
 SHA512 (fish-3.6.1.tar.xz) = ee6f5c7699307d515f111c8c4f1633d9eb9703e045a93cfc2fcec722a03cca4ab25e4e09f6fd94ff2d07180d8b37c6ab733323bb2645065fdeb4e94771347597
 Size (fish-3.6.1.tar.xz) = 2866100 bytes
 SHA1 (patch-build__tools_git__version__gen.sh) = d66abecc900fa411f6da9c5fbb9f70f533025a49
+SHA1 (patch-cmake_ConfigureChecks.cmake) = de8c8daae00c1cdc012116ebbb9b0d7aa5833faf
 SHA1 (patch-cmake_Install.cmake) = 1defcb125ab0082649f1b6e592df96a9c5d49c0a

Added files:

Index: pkgsrc/shells/fish/patches/patch-cmake_ConfigureChecks.cmake
diff -u /dev/null pkgsrc/shells/fish/patches/patch-cmake_ConfigureChecks.cmake:1.3
--- /dev/null   Tue May 16 16:54:50 2023
+++ pkgsrc/shells/fish/patches/patch-cmake_ConfigureChecks.cmake        Tue May 16 16:54:50 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-cmake_ConfigureChecks.cmake,v 1.3 2023/05/16 16:54:50 wiz Exp $
+
+On some systems, libterminfo has a longer name.
+
+--- cmake/ConfigureChecks.cmake.orig   2023-03-25 06:50:41.000000000 +0000
++++ cmake/ConfigureChecks.cmake
+@@ -80,6 +80,11 @@ find_library(CURSES_TINFO tinfo)
+ if (CURSES_TINFO)
+     set(CURSES_LIBRARY ${CURSES_LIBRARY} ${CURSES_TINFO})
+ endif()
++# on some systems, libterminfo has a longer name
++find_library(CURSES_TINFO terminfo)
++if (CURSES_TINFO)
++    set(CURSES_LIBRARY ${CURSES_LIBRARY} ${CURSES_TINFO})
++endif()
+ 
+ # Get threads.
+ set(THREADS_PREFER_PTHREAD_FLAG ON)