<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/17330f3b45df09e81bda100c99f91a1393a27a39">https://github.com/macports/macports-ports/commit/17330f3b45df09e81bda100c99f91a1393a27a39</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 17330f3 vim, MacVim: Do not link with -framework Python
</span>17330f3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 17330f3b45df09e81bda100c99f91a1393a27a39
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Tue Jun 12 18:30:05 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> vim, MacVim: Do not link with -framework Python
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Using -framework for linking is not correct, as MacPorts provides
</span><span style='display:block; white-space:pre;color:#404040;'> multiple versions of Python. This would always pick up the 'port select'
</span><span style='display:block; white-space:pre;color:#404040;'> version and not the one request by variants. Restore parts of the patch
</span><span style='display:block; white-space:pre;color:#404040;'> for python that were errorneously removed in 00f3dc13b8 and 0dbff7850a.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Incrementing the revision as this change means that the ports might have
</span><span style='display:block; white-space:pre;color:#404040;'> linked against the wrong version of python, for example against the
</span><span style='display:block; white-space:pre;color:#404040;'> macOS system framework instead of a version provided by MacPorts.
</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/56652
</span>---
editors/MacVim/Portfile | 1 +
editors/MacVim/files/patch-python.diff | 26 ++++++++++++++++++++++++--
editors/vim/Portfile | 1 +
editors/vim/files/patch-python.diff | 28 +++++++++++++++++++++++++---
4 files changed, 51 insertions(+), 5 deletions(-)
<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 6bcaeb4..a12e31d 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.1
set snapshot 147
<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;color:#808080;'>diff --git a/editors/MacVim/files/patch-python.diff b/editors/MacVim/files/patch-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f45f16..7d0fcce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/configure.ac.orig 2017-11-05 21:24:23.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/configure.ac 2017-11-09 15:29:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/configure.ac.orig 2018-05-24 06:33:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/configure.ac 2018-06-12 18:46:20.000000000 +0200
</span> @@ -1267,7 +1267,7 @@
@echo "python_SYSLIBS='$(SYSLIBS)'"
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,3 +9,25 @@
</span> @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
@echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
@echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1275,13 +1275,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl -- delete the lines from make about Entering/Leaving directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f -- "${tmp_mkf}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vi_cv_path_python_plibs="-framework Python"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl -- Check if the path contained in python_LINKFORSHARED is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl usable for vim build. If not, make and try other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1305,7 +1298,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl remove -ltermcap, it can conflict with an earlier -lncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CACHE_CHECK(Python's dll name,vi_cv_dll_name_python,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [
</span><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 d3b53e7..2da525b 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;'>@@ -5,6 +5,7 @@ name vim
</span> set vim_version 8.1
set vim_patchlevel 0022
github.setup vim vim ${vim_version}.${vim_patchlevel} v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories editors
platforms darwin freebsd
license Vim GPL-2+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/files/patch-python.diff b/editors/vim/files/patch-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f45f16..2e224ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vim/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vim/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/configure.ac.orig 2017-11-05 21:24:23.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/configure.ac 2017-11-09 15:29:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1267,7 +1267,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/configure.ac.orig 2018-05-23 21:53:52.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/configure.ac 2018-06-12 18:37:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1237,7 +1237,7 @@
</span> @echo "python_SYSLIBS='$(SYSLIBS)'"
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
@echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,3 +9,25 @@
</span> @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
@echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
@echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1245,13 +1245,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl -- delete the lines from make about Entering/Leaving directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f -- "${tmp_mkf}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vi_cv_path_python_plibs="-framework Python"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl -- Check if the path contained in python_LINKFORSHARED is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl usable for vim build. If not, make and try other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1275,7 +1268,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl remove -ltermcap, it can conflict with an earlier -lncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CACHE_CHECK(Python's dll name,vi_cv_dll_name_python,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [
</span></pre><pre style='margin:0'>
</pre>