CVS commit: pkgsrc/shells/fish

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Jun 14 22:52:10 UTC 2020

Modified Files:
        pkgsrc/shells/fish: Makefile distinfo
Added Files:
        pkgsrc/shells/fish/patches: patch-CMakeLists.txt

Log Message:
Fix shells/fish on macOS


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/shells/fish/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/fish/patches/patch-CMakeLists.txt

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.24 pkgsrc/shells/fish/Makefile:1.25
--- pkgsrc/shells/fish/Makefile:1.24    Sun May 17 14:25:47 2020
+++ pkgsrc/shells/fish/Makefile Sun Jun 14 22:52:10 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2020/05/17 14:25:47 nia Exp $
+# $NetBSD: Makefile,v 1.25 2020/06/14 22:52:10 js Exp $
 
 DISTNAME=              fish-3.1.2
+PKGREVISION=           1
 CATEGORIES=            shells
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=fish-shell/}
 GITHUB_PROJECT=                fish-shell

Index: pkgsrc/shells/fish/distinfo
diff -u pkgsrc/shells/fish/distinfo:1.18 pkgsrc/shells/fish/distinfo:1.19
--- pkgsrc/shells/fish/distinfo:1.18    Sun May 17 14:25:47 2020
+++ pkgsrc/shells/fish/distinfo Sun Jun 14 22:52:10 2020
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.18 2020/05/17 14:25:47 nia Exp $
+$NetBSD: distinfo,v 1.19 2020/06/14 22:52:10 js Exp $
 
 SHA1 (fish-3.1.2.tar.gz) = a50886c71ddfe188b63322a557fcbeb5c768930d
 RMD160 (fish-3.1.2.tar.gz) = 57cf48d43a8627eb4c7a18e738dc7a68f5e9dd44
 SHA512 (fish-3.1.2.tar.gz) = b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563
 Size (fish-3.1.2.tar.gz) = 6816214 bytes
+SHA1 (patch-CMakeLists.txt) = 755c4c79a5a717323046816a7ed36d91ee2552d6
 SHA1 (patch-cmake_ConfigureChecks.cmake) = f673d726b42a60adff60b7e53783a1a2d0e76394
 SHA1 (patch-config__cmake.h.in) = 0d522168dceebb60a0e759df3e2b39595f64d156
 SHA1 (patch-src_common.cpp) = 130e632f41db5974aeec657f0830079b8d9c28ef

Added files:

Index: pkgsrc/shells/fish/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/shells/fish/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sun Jun 14 22:52:10 2020
+++ pkgsrc/shells/fish/patches/patch-CMakeLists.txt     Sun Jun 14 22:52:10 2020
@@ -0,0 +1,35 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2020/06/14 22:52:10 js Exp $
+
+Disable code-signing on macOS.
+
+If fish is code-signed, it fails to load libintl as pkgsrc does not codesign
+libintl.
+
+--- CMakeLists.txt.orig        2020-04-29 02:54:40.000000000 +0000
++++ CMakeLists.txt
+@@ -165,25 +165,9 @@ ADD_DEFINITIONS(-D_REENTRANT)
+ # Set up PCRE2
+ INCLUDE(cmake/PCRE2.cmake)
+ 
+-# Code signing ID on Mac. A default '-' is ad-hoc codesign.
+-SET(MAC_CODESIGN_ID "-" CACHE STRING "Mac code-signing identity")
+-
+-FUNCTION(CODESIGN_ON_MAC target)
+-  IF(APPLE)
+-    ADD_CUSTOM_COMMAND(
+-      TARGET ${target}
+-      POST_BUILD
+-      COMMAND codesign --force --deep --options runtime --sign "${MAC_CODESIGN_ID}" $<TARGET_FILE:${target}>
+-      VERBATIM
+-    )
+-  ENDIF()
+-ENDFUNCTION(CODESIGN_ON_MAC target)
+-
+-
+ # Define a function to link dependencies.
+ FUNCTION(FISH_LINK_DEPS_AND_SIGN target)
+   TARGET_LINK_LIBRARIES(${target} fishlib)
+-  CODESIGN_ON_MAC(${target})
+ ENDFUNCTION(FISH_LINK_DEPS_AND_SIGN)
+ 
+ # Define libfish.a.