<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/00f3dc13b8ee0067b027f1fc6fd7b372a566618c">https://github.com/macports/macports-ports/commit/00f3dc13b8ee0067b027f1fc6fd7b372a566618c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 00f3dc13b8ee0067b027f1fc6fd7b372a566618c
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Wed Jun 6 17:32:41 2018 +0200

<span style='display:block; white-space:pre;color:#404040;'>    MacVim: Update to version 8.1.snapshot147
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Use --with-python-command/--with-python3-command configure options and
</span><span style='display:block; white-space:pre;color:#404040;'>    remove custom patches for the same functionality.
</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/56569
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/37727
</span>---
 editors/MacVim/Portfile                 | 22 ++++++++++----------
 editors/MacVim/files/patch-python.diff  | 37 +--------------------------------
 editors/MacVim/files/patch-python3.diff | 15 +------------
 3 files changed, 13 insertions(+), 61 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 4722592..6bcaeb4 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;'>@@ -2,8 +2,8 @@ PortSystem          1.0
</span> PortGroup           github 1.0
 PortGroup           compiler_blacklist_versions 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set vim_version     8.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set snapshot        146
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set vim_version     8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set snapshot        147
</span> github.setup        macvim-dev macvim ${snapshot} snapshot-
 name                MacVim
 version             ${vim_version}.snapshot${snapshot}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,9 @@ long_description \
</span> 
 homepage            https://macvim-dev.github.io/macvim/
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  5de1b95ec8b0cc02eb4e75b02d9e0d8700e9e6ce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  5771dd1e65ea1c322c3383d03fa30661478f712d4dcdaa8a68e1fe3bab3ed2e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    19874204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  7db2c08a47ea1351d1b8dbb5d1d273e69e5cf24e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  a304382a24d7cc0cb9e5e00dc24474705e4da915e3f670857aa825491dcdbf39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    19992333
</span> 
 depends_build       bin:grep:grep
 depends_lib         port:ncurses \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,7 +114,7 @@ variant perl description {Enable Perl scripting} {
</span> }
 
 variant python26 conflicts python27 description {Enable Python scripting} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   --enable-pythoninterp --with-python-command=${prefix}/bin/python2.6
</span>     patchfiles-append       patch-python.diff
     depends_lib-append      port:python26
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +123,7 @@ variant python26 conflicts python27 description {Enable Python scripting} {
</span>     depends_build-append port:autoconf
 }
 variant python27 conflicts python26 description {Enable Python scripting} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   --enable-pythoninterp --with-python-command=${prefix}/bin/python2.7
</span>     patchfiles-append       patch-python.diff
     depends_lib-append      port:python27
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,7 +132,7 @@ variant python27 conflicts python26 description {Enable Python scripting} {
</span>     depends_build-append port:autoconf
 }
 variant python33 conflicts python34 python35 python36 description {Enable Python scripting} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   --enable-python3interp --with-python3-command=${prefix}/bin/python3.3
</span>     patchfiles-append       patch-python3.diff
     depends_lib-append      port:python33
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +141,7 @@ variant python33 conflicts python34 python35 python36 description {Enable Python
</span>     depends_build-append port:autoconf
 }
 variant python34 conflicts python33 python35 python36 description {Enable Python scripting} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   --enable-python3interp --with-python3-command=${prefix}/bin/python3.4
</span>     patchfiles-append       patch-python3.diff
     depends_lib-append      port:python34
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,7 +150,7 @@ variant python34 conflicts python33 python35 python36 description {Enable Python
</span>     depends_build-append port:autoconf
 }
 variant python35 conflicts python33 python34 python36 description {Enable Python scripting} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   --enable-python3interp --with-python3-command=${prefix}/bin/python3.5
</span>     patchfiles-append       patch-python3.diff
     depends_lib-append      port:python35
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,7 +159,7 @@ variant python35 conflicts python33 python34 python36 description {Enable Python
</span>     depends_build-append port:autoconf
 }
 variant python36 conflicts python33 python34 python35 description {Enable Python scripting} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   --enable-python3interp --with-python3-command=${prefix}/bin/python3.6
</span>     patchfiles-append       patch-python3.diff
     depends_lib-append      port:python36
 
<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 3764649..4f45f16 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,19 +1,6 @@
</span> --- src/configure.ac.orig 2017-11-05 21:24:23.000000000 +0100
 +++ src/configure.ac   2017-11-09 15:29:12.000000000 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1116,7 +1116,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   dnl -- find the python executable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  AC_PATH_PROGS(vi_cv_path_python, python2 python)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  AC_MSG_CHECKING(--with-python argument)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  AC_ARG_WITH(python, [  --with-python=PATH       which python to use (default: python)],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        python_name="$withval"; AC_MSG_RESULT($python_name),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        python_name="python"; AC_MSG_RESULT(no))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  AC_SUBST(vi_cv_path_python, $python_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   if test "X$vi_cv_path_python" != "X"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     dnl -- get its version number
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1195,7 +1199,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1267,7 +1267,7 @@
</span>   @echo "python_SYSLIBS='$(SYSLIBS)'"
        @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
        @echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,25 +9,3 @@
</span>   @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
        @echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
        @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1203,13 +1207,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       dnl -- delete the lines from make about Entering/Leaving directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       rm -f -- "${tmp_mkf}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--      if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--          "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        vi_cv_path_python_plibs="-framework Python"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        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:#ffe0e0;'>--            vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--      else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if test "${vi_cv_var_python_version}" = "1.4"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1237,7 +1234,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         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:#ffe0e0;'>-         dnl remove -ltermcap, it can conflict with an earlier -lncurses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--      fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   AC_CACHE_CHECK(Python's dll name,vi_cv_dll_name_python,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   [
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-python3.diff b/editors/MacVim/files/patch-python3.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f3c6ddd..41242d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,6 @@
</span> --- src/configure.ac.orig 2016-09-12 16:31:10.000000000 +0200
 +++ src/configure.ac   2016-09-12 19:26:47.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1337,7 +1337,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   dnl -- find the python3 executable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  AC_PATH_PROGS(vi_cv_path_python3, python3 python)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  AC_MSG_CHECKING(--with-python3 argument)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  AC_ARG_WITH(python3, [  --with-python3=PATH       which python to use (default: python3)],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        python_name="$withval"; AC_MSG_RESULT($python_name),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        python_name="python3"; AC_MSG_RESULT(no))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  AC_SUBST(vi_cv_path_python3, $python_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   if test "X$vi_cv_path_python3" != "X"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     dnl -- get its version number
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1427,7 +1431,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1522,7 +1522,7 @@
</span>   @echo "python3_LIBS='$(LIBS)'"
        @echo "python3_SYSLIBS='$(SYSLIBS)'"
        @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
</pre><pre style='margin:0'>

</pre>