<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b2d4ca110c96d624e679eb862d0f96b417e941ba">https://github.com/macports/macports-ports/commit/b2d4ca110c96d624e679eb862d0f96b417e941ba</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b2d4ca1 fish: Update to 3.1.2
</span>b2d4ca1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b2d4ca110c96d624e679eb862d0f96b417e941ba
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue May 19 23:52:41 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> fish: Update to 3.1.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60519
</span>---
shells/fish/Portfile | 16 ++++++++--------
shells/fish/files/codesign.patch | 15 +++++++++++++++
shells/fish/files/patch-src-expand-sys-time.diff | 10 ----------
3 files changed, 23 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/Portfile b/shells/fish/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fb77efc..1eae8d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/fish/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,12 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
PortGroup legacysupport 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup fish-shell fish-shell 3.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup fish-shell fish-shell 3.1.2
</span> revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 57cf48d43a8627eb4c7a18e738dc7a68f5e9dd44 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d5b927203b5ca95da16f514969e2a91a537b2f75bec9b21a584c4cd1c7aa74ed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6816214
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name fish
license GPL-2
categories shells
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,18 +24,12 @@ homepage https://fishshell.com/
</span> github.tarball_from releases
distname ${name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 75fbb9270035b6f172d3b1d7781430eb1e638c83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e5db1e6839685c56f172e1000c138e290add4aa521f187df4cd79d4eab294368 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6810953
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib port:libiconv \
port:ncurses \
port:gettext
patchfiles patch-share_config_fish.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# on older systems, <sys/time.h> is not automatically included by proc.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-src-expand-sys-time.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append codesign.patch
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}/bin|g" "${worksrcpath}/share/config.fish"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +41,8 @@ compiler.thread_local_storage yes
</span> # doxygen appears to only regenerate html files and is not needed to install man pages
configure.args-append -DBUILD_DOCS=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DMAC_CODESIGN_ID=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# https://github.com/fish-shell/fish-shell/issues/5822
delete ${destroot}${prefix}/share/fish/completions/rg.fish
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/files/codesign.patch b/shells/fish/files/codesign.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..93417b0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/fish/files/codesign.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Disable Mac codesigning if MAC_CODESIGN_ID is falsey
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/fish-shell/fish-shell/issues/6952
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/fish-shell/fish-shell/commit/3a47db74b068d9b26eb8b8942923257ebc15c366
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2020-04-28 21:54:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-05-19 23:49:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -169,7 +169,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(MAC_CODESIGN_ID "-" CACHE STRING "Mac code-signing identity")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FUNCTION(CODESIGN_ON_MAC target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IF(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if((APPLE) AND (MAC_CODESIGN_ID))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_CUSTOM_COMMAND(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET ${target}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POST_BUILD
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/files/patch-src-expand-sys-time.diff b/shells/fish/files/patch-src-expand-sys-time.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5068558..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/files/patch-src-expand-sys-time.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/expand.cpp.orig 2020-03-04 09:58:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/expand.cpp 2020-03-04 09:58:31.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <procfs.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/proc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <dirent.h>
</span></pre><pre style='margin:0'>
</pre>