<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/fcb70fe8374b7f7d2b2c6ffe0feff6e7c33124ca">https://github.com/macports/macports-ports/commit/fcb70fe8374b7f7d2b2c6ffe0feff6e7c33124ca</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 fcb70fe vim, MacVim: Fix patch for +python27 variant
</span>fcb70fe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fcb70fe8374b7f7d2b2c6ffe0feff6e7c33124ca
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Thu Nov 9 15:32:24 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> vim, MacVim: Fix patch for +python27 variant
</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/55277
</span>---
editors/MacVim/files/patch-python.diff | 14 +++++++-------
editors/vim/files/patch-python.diff | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
<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 83a0912..3764649 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/configure.ac.orig 2016-09-12 16:31:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/configure.ac 2016-09-12 19:21:34.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1106,7 +1106,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/configure.ac.orig 2017-11-05 21:24:23.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/configure.ac 2017-11-09 15:29:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1116,7 +1116,11 @@
</span> fi
dnl -- find the python executable
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@
</span> if test "X$vi_cv_path_python" != "X"; then
dnl -- get its version number
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1185,7 +1189,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1195,7 +1199,7 @@
</span> @echo "python_SYSLIBS='$(SYSLIBS)'"
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
@echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,11 +22,11 @@
</span> @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
@echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
@echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1193,13 +1197,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1203,13 +1207,6 @@
</span> dnl -- delete the lines from make about Entering/Leaving directory
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
rm -f -- "${tmp_mkf}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$MACOSX" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
</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> - "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
- vi_cv_path_python_plibs="-framework Python"
- if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span> if test "${vi_cv_var_python_version}" = "1.4"; then
vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1227,7 +1224,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1237,7 +1234,6 @@
</span> vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
dnl remove -ltermcap, it can conflict with an earlier -lncurses
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
<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 83a0912..3764649 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 2016-09-12 16:31:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/configure.ac 2016-09-12 19:21:34.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1106,7 +1106,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/configure.ac.orig 2017-11-05 21:24:23.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/configure.ac 2017-11-09 15:29:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1116,7 +1116,11 @@
</span> fi
dnl -- find the python executable
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@
</span> if test "X$vi_cv_path_python" != "X"; then
dnl -- get its version number
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1185,7 +1189,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1195,7 +1199,7 @@
</span> @echo "python_SYSLIBS='$(SYSLIBS)'"
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
@echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,11 +22,11 @@
</span> @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
@echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
@echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1193,13 +1197,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1203,13 +1207,6 @@
</span> dnl -- delete the lines from make about Entering/Leaving directory
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
rm -f -- "${tmp_mkf}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$MACOSX" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
</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> - "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
- vi_cv_path_python_plibs="-framework Python"
- if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span> if test "${vi_cv_var_python_version}" = "1.4"; then
vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1227,7 +1224,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1237,7 +1234,6 @@
</span> vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
dnl remove -ltermcap, it can conflict with an earlier -lncurses
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
</pre><pre style='margin:0'>
</pre>