<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/337a1782046b9bdb394730e5074aa173227a7e0d">https://github.com/macports/macports-ports/commit/337a1782046b9bdb394730e5074aa173227a7e0d</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 337a178 MacVim: Remove preference for python from Homebrew
</span>337a178 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 337a1782046b9bdb394730e5074aa173227a7e0d
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Wed Sep 20 01:43:51 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> MacVim: Remove preference for python from Homebrew
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> MacVim preferred python from /usr/local at runtime, if it existed.
</span><span style='display:block; white-space:pre;color:#404040;'> Always use the python version it was configured with.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream: https://github.com/macvim-dev/macvim/pull/423 (reverting partly)
</span>---
editors/MacVim/Portfile | 4 ++-
.../MacVim/files/patch-remove-Homebrew-python.diff | 30 ++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/Portfile b/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fe016ef..d759dea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
set vim_version 8.0
set snapshot 137
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> github.setup macvim-dev macvim ${snapshot} snapshot-
name MacVim
version ${vim_version}.snapshot${snapshot}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +32,8 @@ depends_lib port:ncurses \
</span> supported_archs x86_64
patchfiles patch-MacVim-GCC-VERSION.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-remove-sparkle.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-remove-sparkle.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-remove-Homebrew-python.diff
</span>
pre-fetch {
if {${os.platform} eq "darwin" && ${os.major} < 12} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-remove-Homebrew-python.diff b/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0993587
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream: https://github.com/macvim-dev/macvim/pull/423 (reverting partly)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/MacVim/vimrc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/MacVim/vimrc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,25 +13,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " the entire MacVim menu is set up in a nib file which currently only is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " translated to English).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set langmenu=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" Python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" MacVim uses Homebrew python2 if installed, otherwise configured one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if exists("&pythondll") && exists("&pythonhome")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if filereadable("/usr/local/Frameworks/Python.framework/Versions/2.7/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " Homebrew python 2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythondll=/usr/local/Frameworks/Python.framework/Versions/2.7/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonhome=/usr/local/Frameworks/Python.framework/Versions/2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" Python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" MacVim uses Homebrew python3 if installed, next try to use python.org binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if exists("&pythonthreedll") && exists("&pythonthreehome") &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- \ !filereadable(&pythonthreedll)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if filereadable("/Library/Frameworks/Python.framework/Versions/3.5/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " https://www.python.org/downloads/mac-osx/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.5/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreehome=/Library/Frameworks/Python.framework/Versions/3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span></pre><pre style='margin:0'>
</pre>