<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/760cfe85cfdfe7b88ee9b92a8e15695a79d6af0b">https://github.com/macports/macports-ports/commit/760cfe85cfdfe7b88ee9b92a8e15695a79d6af0b</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 760cfe85cfd vim: Fix +python3 variant, follow-up to #18475
</span>760cfe85cfd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 760cfe85cfdfe7b88ee9b92a8e15695a79d6af0b
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Fri Jun 2 11:55:27 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> vim: Fix +python3 variant, follow-up to #18475
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - It seems upstream now has a patch that separately tracks
</span><span style='display:block; white-space:pre;color:#404040;'> PYTHONFRAMEWORKPREFIX and adds it as necessary. I tested this by
</span><span style='display:block; white-space:pre;color:#404040;'> checking the output of otool -L on the vim binary and running
</span><span style='display:block; white-space:pre;color:#404040;'> :py3 print(sys.version_info)
</span><span style='display:block; white-space:pre;color:#404040;'> in the resulting binary.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - The python 2 variants may also have been broken by the recent changes,
</span><span style='display:block; white-space:pre;color:#404040;'> but I don't use those and python 2 is deprecated anyway. We should
</span><span style='display:block; white-space:pre;color:#404040;'> probably just remove the python 2 variants from vim.
</span>---
editors/vim/Portfile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/Portfile b/editors/vim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aae0a3e4f08..32b9e6522cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +146,12 @@ foreach s ${pythons_suffixes} {
</span> patchfiles-append patch-python.diff
} else {
configure.args-append --enable-python3interp --with-python3-command=${prefix}/bin/python${v}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp \"${vim_version}.${vim_patchlevel}\" 9.0.1441] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info \"Vim patchlevel < 1441, python3 patch needed\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info \"Vim patchlevel >= 1441, no python3 patch needed\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
depends_lib-append port:${p}
use_autoconf yes
</pre><pre style='margin:0'>
</pre>