<pre style='margin:0'>
Lawrence Velázquez (larryv) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3d7f4e2d815d8236d5060de4d0dedd2112fe1d08">https://github.com/macports/macports-ports/commit/3d7f4e2d815d8236d5060de4d0dedd2112fe1d08</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 3d7f4e2 fish: Update to 2.4.0, remove $Id$
</span>3d7f4e2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3d7f4e2d815d8236d5060de4d0dedd2112fe1d08
</span>Author: David Bariod <davidriod@googlemail.com>
AuthorDate: Sun Nov 13 16:45:09 2016 +0100
<span style='display:block; white-space:pre;color:#404040;'> fish: Update to 2.4.0, remove $Id$
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The following patches, which are now unneeded, have also been removed
</span><span style='display:block; white-space:pre;color:#404040;'> * patch-ambiguous-overload.diff: unneeded since commit a8af9748954
</span><span style='display:block; white-space:pre;color:#404040;'> 2013-08-25
</span><span style='display:block; white-space:pre;color:#404040;'> * patch-c++11-tr1.diff: This patch has been commited in the main repo
</span><span style='display:block; white-space:pre;color:#404040;'> in 7541fac2
</span><span style='display:block; white-space:pre;color:#404040;'> * patch-proc_c.diff: This patch is in mainstream since e9d1a54
</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/52872
</span>---
shells/fish/Portfile | 8 +++-----
shells/fish/files/patch-ambiguous-overload.diff | 12 ------------
shells/fish/files/patch-c++11-tr1.diff | 24 ------------------------
shells/fish/files/patch-proc_c.diff | 11 -----------
4 files changed, 3 insertions(+), 52 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 0577891..9a9bcb6 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;'>@@ -1,11 +1,9 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup fish-shell fish-shell 2.3.1
</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 2.4.0
</span> name fish
license GPL-2
categories shells
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +17,8 @@ homepage http://fishshell.com/
</span> github.tarball_from releases
distname ${name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2809d9fd03ebf38961eedcdf37eee658549688aa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 328acad35d131c94118c1e187ff3689300ba757c4469c8cc1eaa994789b98664
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3b559f656695a0856d3dc53f60b2f8943f9e077b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 06bbb2323360439c4044da762d114ec1aa1aba265cec71c0543e6a0095c9efc5
</span>
depends_lib port:libiconv \
port:ncurses \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/files/patch-ambiguous-overload.diff b/shells/fish/files/patch-ambiguous-overload.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8b8f1fb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/files/patch-ambiguous-overload.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: https://github.com/fish-shell/fish-shell/commit/a8af97489549ef737b1518888545c9fedcf380ef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- exec.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ exec.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -376,7 +376,7 @@ static void launch_process_nofork(process_t *p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int has_fd(const io_chain_t &d, int fd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return io_chain_get(d, fd) != NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return io_chain_get(d, fd).get() != NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/files/patch-c++11-tr1.diff b/shells/fish/files/patch-c++11-tr1.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3f632f8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/files/patch-c++11-tr1.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: https://github.com/fish-shell/fish-shell/issues/968
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: https://github.com/fish-shell/fish-shell/commit/7541fac245b47cce023ba4b12b4216e671508780
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- io.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ io.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,12 +2,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FISH_IO_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vector>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __cplusplus > 199711L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// C++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Note that we have to include something to get any _LIBCPP_VERSION defined so we can detect libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// So it's key that vector go above. If we didn't need vector for other reasons, we might include ciso646, which does nothing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(_LIBCPP_VERSION) || __cplusplus > 199711L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// C++11 or libc++ (which is a C++11-only library, but the memory header works OK in C++03)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using std::shared_ptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// C++03
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// C++03 or libstdc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <tr1/memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using std::tr1::shared_ptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/files/patch-proc_c.diff b/shells/fish/files/patch-proc_c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e186f36..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/files/patch-proc_c.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;'>---- proc.c.orig 2012-11-07 17:28:40.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ proc.c 2012-11-07 17:29:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -931,7 +931,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int terminal_return_from_job( job_t *j)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( tcsetpgrp (0, getpid()) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( tcsetpgrp (0, getpgrp()) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debug( 1, _( L"Could not return shell to foreground" ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wperror( L"tcsetpgrp" );
</span></pre><pre style='margin:0'>
</pre>