<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a5e1a536dfcaa09d2a61ba18b3bf0171bb641bfb">https://github.com/macports/macports-ports/commit/a5e1a536dfcaa09d2a61ba18b3bf0171bb641bfb</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 a5e1a536dfc fish: update to 3.4.0
</span>a5e1a536dfc is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a5e1a536dfcaa09d2a61ba18b3bf0171bb641bfb
</span>Author: Tair Sabyrgaliyev <tair.sabirgaliev@gmail.com>
AuthorDate: Mon Mar 21 01:28:22 2022 +0300

<span style='display:block; white-space:pre;color:#404040;'>    fish: update to 3.4.0
</span>---
 shells/fish/Portfile                               | 24 ++++++----------
 .../patch-tests-checks-tmux-complete-fish.diff     | 11 --------
 .../files/patch-tests-checks-tmux-prompt-fish.diff | 11 --------
 .../fish/files/patch-tests-interactive-fish.diff   | 32 ----------------------
 4 files changed, 9 insertions(+), 69 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 d39e46f3edc..69ba68fded1 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,11 +5,11 @@ 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.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup            fish-shell fish-shell 3.4.0
</span> revision                0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums               rmd160  9ec5b3ee590427a9e7d7b4691da13970385ded0f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  b5b4ee1a5269762cbbe993a4bd6507e675e4100ce9bbe84214a5eeb2b19fae89 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    3489152
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums               rmd160  1029ca2be430520f6919b6e91bbe21d52d053fb7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  b5b48ab8486b19ef716a32f7f46b88b9ea5356155f0e967ee99f4093645413c5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    3292216
</span> use_xz                  yes
 
 name                    fish
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,14 +25,13 @@ homepage                https://fishshell.com/
</span> github.tarball_from     releases
 distname                ${name}-${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append    port:gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append      port:libiconv \
</span>                         port:ncurses \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:gettext-runtime
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles              patch-share_config_fish.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-tests-checks-tmux-complete-fish.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-tests-checks-tmux-prompt-fish.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-tests-interactive-fish.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles              patch-share_config_fish.diff
</span> 
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}/bin|g"     "${worksrcpath}/share/config.fish"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,11 +48,6 @@ configure.args-append   -DBUILD_DOCS=OFF
</span> 
 configure.args-append   -DMAC_CODESIGN_ID=OFF
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # https://github.com/fish-shell/fish-shell/issues/5822
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    delete ${destroot}${prefix}/share/fish/completions/rg.fish
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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-tests-checks-tmux-complete-fish.diff b/shells/fish/files/patch-tests-checks-tmux-complete-fish.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f12f8554927..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/files/patch-tests-checks-tmux-complete-fish.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/checks/tmux-complete.fish.orig   2021-07-10 01:02:28.000000000 +0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/checks/tmux-complete.fish        2021-07-10 01:02:56.000000000 +0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Isolated tmux.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -g tmpdir (mktemp -d)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set -g tmux tmux -S $tmpdir/.tmux-socket -f /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set -g tmux tmux -S .tmux-socket -f /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -g sleep sleep .1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -q CI && set sleep sleep 1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/files/patch-tests-checks-tmux-prompt-fish.diff b/shells/fish/files/patch-tests-checks-tmux-prompt-fish.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a68a8f18931..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/files/patch-tests-checks-tmux-prompt-fish.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/checks/tmux-prompt.fish.orig     2021-07-10 01:03:17.000000000 +0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/checks/tmux-prompt.fish  2021-07-10 01:03:29.000000000 +0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -g tmpdir (mktemp -d)/inner1/inner2/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $tmpdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set -g tmux tmux -S $tmpdir/.tmux-socket -f /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set -g tmux tmux -S .tmux-socket -f /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -g sleep sleep .1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -q CI && set sleep sleep 1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/files/patch-tests-interactive-fish.diff b/shells/fish/files/patch-tests-interactive-fish.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 57ea575b4d0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/files/patch-tests-interactive-fish.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/interactive.fish.orig    2021-03-18 09:05:28.000000000 +0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/interactive.fish 2021-04-06 23:34:06.000000000 +0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat interactive.config >>$XDG_CONFIG_HOME/fish/config.fish
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- say -o cyan "Testing interactive functionality"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set python3 python3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function test_pexpect_file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     set -l file $argv[1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     echo -n "Testing file $file ... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         set -lx fish_test_helper ../test/root/bin/fish_test_helper
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         # Note we require Python3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        python3 $file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        $python3 $file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     set -l exit_status $status
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,8 +62,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set failed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if not python3 -c 'import pexpect'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    say red "pexpect tests disabled: `python3 -c 'import pexpect'` failed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if not $python3 -c 'import pexpect'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    say red "pexpect tests disabled: `$python3 -c 'import pexpect'` failed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     set pexpect_files_to_test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for i in $pexpect_files_to_test
</span></pre><pre style='margin:0'>

</pre>