<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/df45e14addaccdd1ffb11bc2bef7ee60295d9abc">https://github.com/macports/macports-ports/commit/df45e14addaccdd1ffb11bc2bef7ee60295d9abc</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 df45e14 fish: update to 2.7.0, fix hardcoded PREFIX in patch
</span>df45e14 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit df45e14addaccdd1ffb11bc2bef7ee60295d9abc
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Thu Nov 23 16:33:25 2017 +0000
<span style='display:block; white-space:pre;color:#404040;'> fish: update to 2.7.0, fix hardcoded PREFIX in patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * remove DEF_VER reinplace because the version file is used
</span><span style='display:block; white-space:pre;color:#404040;'> * remove integrated patch
</span>---
shells/fish/Portfile | 13 +++----------
shells/fish/files/patch-share_config_fish.diff | 18 +++++++++---------
shells/fish/files/patch-src-wutil-leopard.diff | 15 ---------------
3 files changed, 12 insertions(+), 34 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 1d913df..03ad7e3 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;'>@@ -4,9 +4,8 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup fish-shell fish-shell 2.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup fish-shell fish-shell 2.7.0
</span> name fish
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> license GPL-2
categories shells
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +18,8 @@ homepage http://fishshell.com/
</span> github.tarball_from releases
distname ${name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f12093fef235487b7c02c245cbbd600750fff874 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e45942b53f06415783272f51bb780d2ab3cb4b18 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3a76b7cae92f9f88863c35c832d2427fb66082f98e92a02203dc900b8fa87bcb
</span>
depends_lib port:libiconv \
port:ncurses \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,11 +27,6 @@ depends_lib port:libiconv \
</span>
patchfiles patch-share_config_fish.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix error on Leopard and earlier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" && ${os.major} < 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-src-wutil-leopard.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # fix build on Tiger
if { ${os.platform} eq "darwin" && ${os.major} == 8 } {
configure.cxxflags-append -D__DARWIN_UNIX03=1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +34,6 @@ if { ${os.platform} eq "darwin" && ${os.major} == 8 } {
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}/bin|g" "${worksrcpath}/share/config.fish"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|DEF_VER=2.0.GIT|DEF_VER=${version}|" ${worksrcpath}/build_tools/git_version_gen.sh
</span> }
# doxygen appears to only regenerate html files and not install man pages
<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 d43191f..d05b5cc 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,15 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- share/config.fish.orig 2013-07-03 12:24:07.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ share/config.fish 2013-07-03 12:24:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,6 +91,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for pathfile in /etc/paths.d/* ; __fish_load_path_helper_paths < $pathfile ; end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- functions -e __fish_load_path_helper_paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- share/config.fish.orig 2017-11-23 05:45:49.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ share/config.fish 2017-11-23 16:24:52.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,6 +172,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ functions -e __fish_load_manpath_helper_manpaths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span>
+# MacPorts specific PATH setting, move ${prefix}/bin at PATH's head
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+set MP_PREFIX /opt/local/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set MP_PREFIX @@PREFIX@@
</span> +if contains $MP_PREFIX $PATH
+ set -e MP_PATH
+ for path_component in $PATH
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test $path_component != /opt/local/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test $path_component != @@PREFIX@@
</span> + set MP_PATH $MP_PATH $path_component
+ end
+ end
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,5 +19,5 @@
</span> +end
+set -e MP_PREFIX
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Launch debugger on SIGTRAP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add a handler for when fish_user_path changes, so we can apply the same changes to PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Invoke it immediately to apply the current value of fish_user_path
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/files/patch-src-wutil-leopard.diff b/shells/fish/files/patch-src-wutil-leopard.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2b59fc6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/files/patch-src-wutil-leopard.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/wutil.cpp b/src/wutil.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a65a7648..06b144be 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/wutil.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/wutil.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -349,8 +349,8 @@ wchar_t *wrealpath(const wcstring &pathname, wchar_t *resolved_path) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (narrow_path.size() > 1 && narrow_path.at(narrow_path.size() - 1) == '/') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- narrow_path.erase(narrow_path.size() - 1, 1);
</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;'>-- char *narrow_res = realpath(narrow_path.c_str(), NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char tmpbuf[PATH_MAX];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *narrow_res = realpath(narrow_path.c_str(), tmpbuf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (narrow_res) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- real_path.append(narrow_res);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span></pre><pre style='margin:0'>
</pre>