<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/c00a870bc4e96011a0529623e88a589cc03b5898">https://github.com/macports/macports-ports/commit/c00a870bc4e96011a0529623e88a589cc03b5898</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 c00a870 MacVim: Fix invalid patch
</span>c00a870 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c00a870bc4e96011a0529623e88a589cc03b5898
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Sat Dec 29 20:07:00 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> MacVim: Fix invalid patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In the last update, this patch was accidentally garbled. The patch was
</span><span style='display:block; white-space:pre;color:#404040;'> now rerolled to fix the issue. No rev-bump as the build failed.
</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/57826
</span>---
editors/MacVim/files/patch-remove-Homebrew-python.diff | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
<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><span style='display:block; white-space:pre;color:#808080;'>index 2c4631b..df0447b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-remove-Homebrew-python.diff
</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;'>@@ -8,7 +8,9 @@ Upstream: https://github.com/macvim-dev/macvim/pull/423 (reverting partly)
</span> set langmenu=none
-
-" Python2
<span style='display:block; white-space:pre;background:#ffe0e0;'>--" MacVim uses Homebrew python2 if installed, otherwise configured one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" MacVim is configured by default to use the pre-installed System python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" version. However, following code tries to find a Homebrew, MacPorts or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" an installation from python.org:
</span> -if exists("&pythondll") && exists("&pythonhome")
- if filereadable("/usr/local/Frameworks/Python.framework/Versions/2.7/Python")
- " Homebrew python 2.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,13 +28,19 @@ Upstream: https://github.com/macvim-dev/macvim/pull/423 (reverting partly)
</span> -endif
-
-" Python3
<span style='display:block; white-space:pre;background:#ffe0e0;'>--" MacVim uses Homebrew python3 if installed, next try to use python.org binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" MacVim is configured by default to use Homebrew python3 version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" If this cannot be found, following code tries to find a MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" or an installation from python.org:
</span> -if exists("&pythonthreedll") && exists("&pythonthreehome") &&
- \ !filereadable(&pythonthreedll)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if filereadable("/Library/Frameworks/Python.framework/Versions/3.6/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.7/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " MacPorts python 3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.7/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreehome=/opt/local/Library/Frameworks/Python.framework/Versions/3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.7/Python")
</span> - " https://www.python.org/downloads/mac-osx/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.6/Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set pythonthreehome=/Library/Frameworks/Python.framework/Versions/3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.7/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreehome=/Library/Frameworks/Python.framework/Versions/3.7
</span> - endif
-endif
-
</pre><pre style='margin:0'>
</pre>