<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8e0c21c860bb4d10ed32b1a1abf7e7adb28bc27c">https://github.com/macports/macports-ports/commit/8e0c21c860bb4d10ed32b1a1abf7e7adb28bc27c</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 8e0c21c fish: update to 3.1.0
</span>8e0c21c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8e0c21c860bb4d10ed32b1a1abf7e7adb28bc27c
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Thu Feb 27 12:12:11 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> fish: update to 3.1.0
</span>---
shells/fish/Portfile | 22 ++++++++++++----------
.../files/patch-remove-unguarded-availability.diff | 14 --------------
shells/fish/files/patch-share_config_fish.diff | 13 +++++++------
shells/fish/files/patch-tests-bash-check.diff | 13 -------------
4 files changed, 19 insertions(+), 43 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 825cc6d..458a104 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,8 @@ 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.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup fish-shell fish-shell 3.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> name fish
license GPL-2
categories shells
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,19 +20,16 @@ homepage https://fishshell.com/
</span> github.tarball_from releases
distname ${name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3c89a5ae33514390a3acda559ffa7fe6becceaf5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 14728ccc6b8e053d01526ebbd0822ca4eb0235e6487e832ec1d0d22f1395430e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6477869
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 75fbb9270035b6f172d3b1d7781430eb1e638c83 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e5db1e6839685c56f172e1000c138e290add4aa521f187df4cd79d4eab294368 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6810953
</span>
depends_lib port:libiconv \
port:ncurses \
port:gettext
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove unguarded-availability flag, accepted only on new clangs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# set pipefail only if the bash version is sufficiently new to accept it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-remove-unguarded-availability.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-share_config_fish.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tests-bash-check.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-share_config_fish.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@@PREFIX@@|${prefix}/bin|g" "${worksrcpath}/share/config.fish"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +39,11 @@ compiler.cxx_standard 2011
</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;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/fish-shell/fish-shell/issues/5822
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/share/fish/completions/rg.fish
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin 8 {
#/opt/local/var/macports/build/_opt_myports_shells_fish/fish/work/fish-3.0.2/src/env.cpp:436:31: error: invalid conversion from 'char*' to 'int'
configure.cxxflags-append -D__DARWIN_UNIX03
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/files/patch-remove-unguarded-availability.diff b/shells/fish/files/patch-remove-unguarded-availability.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0c8a5be..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/files/patch-remove-unguarded-availability.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/ConfigureChecks.cmake.orig 2019-03-03 11:43:32.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/ConfigureChecks.cmake 2019-03-03 11:43:46.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,11 +9,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_PACKAGE(Threads REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IF(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # 10.7+ only.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-Werror=unguarded-availability")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Detect WSL. Does not match against native Windows/WIN32.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CMAKE_HOST_SYSTEM_VERSION MATCHES ".*-Microsoft")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(WSL 1)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/files/patch-share_config_fish.diff b/shells/fish/files/patch-share_config_fish.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d05b5cc..0ccfce8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/files/patch-share_config_fish.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/fish/files/patch-share_config_fish.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- share/config.fish.orig 2017-11-23 05:45:49.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ share/config.fish 2017-11-23 16:24:52.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -172,6 +172,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- functions -e __fish_load_manpath_helper_manpaths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- share/config.fish.orig 2020-02-12 14:04:07.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ share/config.fish 2020-02-27 11:44:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -128,6 +128,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and set PATH /usr/xpg4/bin $PATH
</span> end
+# MacPorts specific PATH setting, move ${prefix}/bin at PATH's head
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,6 +18,7 @@
</span> + set -e MP_PATH
+end
+set -e MP_PREFIX
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> # Add a handler for when fish_user_path changes, so we can apply the same changes to PATH
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Invoke it immediately to apply the current value of fish_user_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ function __fish_reconstruct_path -d "Update PATH when fish_user_paths changes" --on-variable fish_user_paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set -l local_path $PATH
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/files/patch-tests-bash-check.diff b/shells/fish/files/patch-tests-bash-check.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7fe2583..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/files/patch-tests-bash-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/invocation.sh.orig 2019-03-03 15:53:20.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/invocation.sh 2019-03-03 15:54:49.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If any command in the pipeline fails report the rc of the first fail.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set -o pipefail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if [ "${BASH_VERSINFO[0]}" -ge 3 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set -o pipefail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If nothing matches a glob expansion, return nothing (not the glob
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # itself)
</span></pre><pre style='margin:0'>
</pre>