<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[152702] trunk/dports/editors/MacVim</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/152702">152702</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-09-14 14:45:54 -0700 (Wed, 14 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>editors/MacVim: update to version 8.0.snapshot110
Regenerate patches for new version.
Remove patches applied upstream.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportseditorsMacVimPortfile">trunk/dports/editors/MacVim/Portfile</a></li>
<li><a href="#trunkdportseditorsMacVimfilespatchpythondiff">trunk/dports/editors/MacVim/files/patch-python.diff</a></li>
<li><a href="#trunkdportseditorsMacVimfilespatchpython3diff">trunk/dports/editors/MacVim/files/patch-python3.diff</a></li>
<li><a href="#trunkdportseditorsMacVimfilespatchtcldiff">trunk/dports/editors/MacVim/files/patch-tcl.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportseditorsMacVimfilespatchcompatsigaltstackdiff">trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportseditorsMacVimPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/MacVim/Portfile (152701 => 152702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/Portfile 2016-09-14 21:45:11 UTC (rev 152701)
+++ trunk/dports/editors/MacVim/Portfile 2016-09-14 21:45:54 UTC (rev 152702)
</span><span class="lines">@@ -4,12 +4,11 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><del>-set vim_version 7.4
-set snapshot 106
</del><ins>+set vim_version 8.0
+set snapshot 110
</ins><span class="cx"> github.setup macvim-dev macvim ${snapshot} snapshot-
</span><span class="cx"> name MacVim
</span><span class="cx"> version ${vim_version}.snapshot${snapshot}
</span><del>-revision 2
</del><span class="cx"> categories editors
</span><span class="cx"> platforms darwin
</span><span class="cx"> license Vim GPL-2+
</span><span class="lines">@@ -21,8 +20,8 @@
</span><span class="cx">
</span><span class="cx"> homepage https://macvim-dev.github.io/macvim/
</span><span class="cx">
</span><del>-checksums rmd160 58b94105a156dc3487208330b9aaecba6b9be9db \
- sha256 320f76e9c3f93184abef5fb1e0fd3da3769af2e2a7318a9d5e1d8055fdac2a7b
</del><ins>+checksums rmd160 08b672b2969c6a41ae3a85ec9a1306bc5d6f6a02 \
+ sha256 d8b67a8bbb0893f6dfdc33d902aeafde4e6dfa4d63e650b3160aa30bf0e3d0c6
</ins><span class="cx">
</span><span class="cx"> depends_build bin:grep:grep
</span><span class="cx"> depends_lib port:ncurses \
</span><span class="lines">@@ -47,8 +46,6 @@
</span><span class="cx"> file mkdir ${workpath}/caches
</span><span class="cx"> }
</span><span class="cx">
</span><del>-patchfiles-append patch-compat-sigaltstack.diff
-
</del><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|^# VIM_APP_DIR=/Applications$|VIM_APP_DIR=${applications_dir}|" \
</span><span class="cx"> ${worksrcpath}/src/MacVim/mvim
</span><span class="lines">@@ -56,7 +53,7 @@
</span><span class="cx"> # recompile patched .nib
</span><span class="cx"> foreach nib {Preferences MainMenu} {
</span><span class="cx"> ui_info "---> Running ibtool for ${nib}.nib"
</span><del>- system -W ${worksrcpath} "time ibtool --compile src/MacVim/English.lproj/${nib}.nib/keyedobjects.nib src/MacVim/English.lproj/${nib}.nib"
</del><ins>+ system -W ${worksrcpath} "ibtool --compile src/MacVim/English.lproj/${nib}.nib/keyedobjects.nib src/MacVim/English.lproj/${nib}.nib"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -198,8 +195,3 @@
</span><span class="cx"> variant cscope description {Enable source code browsing with cscope} {
</span><span class="cx"> configure.args-append --enable-cscope
</span><span class="cx"> }
</span><del>-
-livecheck.type regex
-livecheck.url https://github.com/macvim-dev/macvim/releases
-livecheck.version ${snapshot}
-livecheck.regex snapshot-(\\d+)
</del></span></pre></div>
<a id="trunkdportseditorsMacVimfilespatchcompatsigaltstackdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff (152701 => 152702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff 2016-09-14 21:45:11 UTC (rev 152701)
+++ trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff 2016-09-14 21:45:54 UTC (rev 152702)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- src/os_unix.c 2013-08-02 15:13:48.000000000 -0500
-+++ src/os_unix.c 2013-08-02 15:14:51.000000000 -0500
-@@ -18,6 +18,10 @@
- * changed beyond recognition.
- */
-
-+#if defined(__APPLE__)
-+#include <AvailabilityMacros.h>
-+#endif
-+
- /*
- * Some systems have a prototype for select() that has (int *) instead of
- * (fd_set *), which is wrong. This define removes that prototype. We define
</del></span></pre></div>
<a id="trunkdportseditorsMacVimfilespatchpythondiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/MacVim/files/patch-python.diff (152701 => 152702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/files/patch-python.diff 2016-09-14 21:45:11 UTC (rev 152701)
+++ trunk/dports/editors/MacVim/files/patch-python.diff 2016-09-14 21:45:54 UTC (rev 152702)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- src/configure.in.orig 2015-05-29 22:32:15.000000000 +0200
-+++ src/configure.in 2015-05-29 22:34:23.000000000 +0200
-@@ -1046,7 +1046,11 @@
</del><ins>+--- src/configure.in.orig 2016-09-12 16:31:10.000000000 +0200
++++ src/configure.in 2016-09-12 19:21:34.000000000 +0200
+@@ -1106,7 +1106,11 @@
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> dnl -- find the python executable
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> if test "X$vi_cv_path_python" != "X"; then
</span><span class="cx">
</span><span class="cx"> dnl -- get its version number
</span><del>-@@ -1125,7 +1129,7 @@
</del><ins>+@@ -1185,7 +1189,7 @@
</ins><span class="cx"> @echo "python_SYSLIBS='$(SYSLIBS)'"
</span><span class="cx"> @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
</span><span class="cx"> @echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
</span><span class="lines">@@ -22,11 +22,11 @@
</span><span class="cx"> @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
</span><span class="cx"> @echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
</span><span class="cx"> @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
</span><del>-@@ -1133,13 +1137,6 @@
</del><ins>+@@ -1193,13 +1197,6 @@
</ins><span class="cx"> dnl -- delete the lines from make about Entering/Leaving directory
</span><span class="cx"> eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
</span><span class="cx"> rm -f -- "${tmp_mkf}"
</span><del>-- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
</del><ins>+- if test "x$MACOSX" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
</ins><span class="cx"> - "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
</span><span class="cx"> - vi_cv_path_python_plibs="-framework Python"
</span><span class="cx"> - if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
</span><span class="lines">@@ -36,26 +36,11 @@
</span><span class="cx"> if test "${vi_cv_var_python_version}" = "1.4"; then
</span><span class="cx"> vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
</span><span class="cx"> else
</span><del>-@@ -1167,7 +1164,6 @@
</del><ins>+@@ -1227,7 +1224,6 @@
</ins><span class="cx"> vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
</span><span class="cx"> dnl remove -ltermcap, it can conflict with an earlier -lncurses
</span><span class="cx"> vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
</span><span class="cx"> - fi
</span><span class="cx"> ])
</span><del>- AC_CACHE_VAL(vi_cv_dll_name_python,
</del><ins>+ AC_CACHE_CHECK(Python's dll name,vi_cv_dll_name_python,
</ins><span class="cx"> [
</span><del>---- src/if_python.c.orig 2013-09-06 18:00:40.000000000 +0200
-+++ src/if_python.c 2013-09-22 22:01:06.000000000 +0200
-@@ -55,11 +55,7 @@
-
- #define PY_SSIZE_T_CLEAN
-
--#ifdef FEAT_GUI_MACVIM
--# include <Python/Python.h>
--#else
--# include <Python.h>
--#endif
-+#include <Python.h>
-
- #if !defined(PY_VERSION_HEX) || PY_VERSION_HEX < 0x02050000
- # undef PY_SSIZE_T_CLEAN
</del></span></pre></div>
<a id="trunkdportseditorsMacVimfilespatchpython3diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/MacVim/files/patch-python3.diff (152701 => 152702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/files/patch-python3.diff 2016-09-14 21:45:11 UTC (rev 152701)
+++ trunk/dports/editors/MacVim/files/patch-python3.diff 2016-09-14 21:45:54 UTC (rev 152702)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- src/configure.in.orig 2015-05-29 21:25:49.000000000 +0200
-+++ src/configure.in 2015-05-29 21:30:04.000000000 +0200
-@@ -1277,7 +1277,11 @@
</del><ins>+--- src/configure.in.orig 2016-09-12 16:31:10.000000000 +0200
++++ src/configure.in 2016-09-12 19:26:47.000000000 +0200
+@@ -1337,7 +1337,11 @@
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> dnl -- find the python3 executable
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> if test "X$vi_cv_path_python3" != "X"; then
</span><span class="cx">
</span><span class="cx"> dnl -- get its version number
</span><del>-@@ -1367,7 +1363,7 @@
</del><ins>+@@ -1427,7 +1431,7 @@
</ins><span class="cx"> @echo "python3_LIBS='$(LIBS)'"
</span><span class="cx"> @echo "python3_SYSLIBS='$(SYSLIBS)'"
</span><span class="cx"> @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
</span></span></pre></div>
<a id="trunkdportseditorsMacVimfilespatchtcldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/MacVim/files/patch-tcl.diff (152701 => 152702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/files/patch-tcl.diff 2016-09-14 21:45:11 UTC (rev 152701)
+++ trunk/dports/editors/MacVim/files/patch-tcl.diff 2016-09-14 21:45:54 UTC (rev 152702)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>---- src/configure.in.orig 2010-04-18 00:11:11.000000000 +0200
-+++ src/configure.in 2010-04-18 00:17:10.000000000 +0200
-@@ -1213,12 +1213,7 @@
- tclloc=`echo 'set l [[info library]];set i [[string last lib $l]];incr i -2;puts [[string range $l 0 $i]]' | $vi_cv_path_tcl -`
</del><ins>+--- src/configure.in.orig 2016-09-12 16:31:10.000000000 +0200
++++ src/configure.in 2016-09-12 19:28:57.000000000 +0200
+@@ -1721,12 +1721,7 @@
+ tcldll=`echo 'puts libtcl[[info tclversion]][[info sharedlibextension]]' | $vi_cv_path_tcl -`
</ins><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING(for location of Tcl include)
</span><span class="cx"> - if test "x$MACOSX" != "xyes"; then
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> TCL_INC=
</span><span class="cx"> for try in $tclinc; do
</span><span class="cx"> if test -f "$try/tcl.h"; then
</span><del>-@@ -1233,13 +1233,8 @@
</del><ins>+@@ -1741,13 +1736,8 @@
</ins><span class="cx"> fi
</span><span class="cx"> if test -z "$SKIP_TCL"; then
</span><span class="cx"> AC_MSG_CHECKING(for location of tclConfig.sh script)
</span><span class="lines">@@ -28,5 +28,5 @@
</span><span class="cx"> + tclcnf=`echo $tclinc | sed s/include/lib/g`
</span><span class="cx"> + tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
</span><span class="cx"> for try in $tclcnf; do
</span><del>- if test -f $try/tclConfig.sh; then
</del><ins>+ if test -f "$try/tclConfig.sh"; then
</ins><span class="cx"> AC_MSG_RESULT($try/tclConfig.sh)
</span></span></pre>
</div>
</div>
</body>
</html>