<!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>[136908] 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/136908">136908</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2015-05-29 13:11:30 -0700 (Fri, 29 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>editors/MacVim:
Update to version 7.4.snapshot76
Sync with vim port:
Remove +breakindent variant, merged upstream in 7.4.338
Add --without-local-dir to remove -L/usr/local/lib from LDFLAGS</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportseditorsMacVimPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/MacVim/Portfile (136907 => 136908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/Portfile 2015-05-29 20:04:42 UTC (rev 136907)
+++ trunk/dports/editors/MacVim/Portfile 2015-05-29 20:11:30 UTC (rev 136908)
</span><span class="lines">@@ -5,10 +5,8 @@
</span><span class="cx">
</span><span class="cx"> name MacVim
</span><span class="cx"> set vim_version 7.4
</span><del>-set snapshot 73
-set gitcommit snapshot-${snapshot}
</del><ins>+set snapshot 76
</ins><span class="cx"> version ${vim_version}.snapshot${snapshot}
</span><del>-revision 1
</del><span class="cx"> categories editors
</span><span class="cx"> platforms darwin
</span><span class="cx"> license Vim GPL-2+
</span><span class="lines">@@ -19,13 +17,13 @@
</span><span class="cx"> better and integrate more seamlessly with the Mac than vim-app.
</span><span class="cx"> homepage http://code.google.com/p/macvim
</span><span class="cx">
</span><del>-master_sites http://github.com/b4winckler/macvim/zipball/${gitcommit}
-checksums ${name}-${version}.zip \
- rmd160 457b0eea2d7d86629d67683125df994e11e680dd \
- sha256 ed008a0d31f3c38f7fd018586aaa8c0bccda97c911f1be9f12c7120312f66976
-use_zip yes
-worksrcdir ${name}
-extract.only ${name}-${version}.zip
</del><ins>+master_sites https://github.com/macvim-dev/macvim/archive/
+distfiles Snapshot-${snapshot}.tar.gz
+checksums Snapshot-${snapshot}.tar.gz \
+ rmd160 139125f8fe454cf20c311a36004ba1df09dfd131 \
+ sha256 865425eaebd279816a9a997cb406ff45da1d390baf4fed21a2d80ec75fb3ca12
+worksrcdir ${name}-Snapshot-${snapshot}
+extract.only Snapshot-${snapshot}.tar.gz
</ins><span class="cx">
</span><span class="cx"> depends_build bin:gnutar:gnutar \
</span><span class="cx"> bin:grep:grep \
</span><span class="lines">@@ -54,9 +52,6 @@
</span><span class="cx"> compiler.blacklist macports-clang-2.9 macports-clang-3.0 {clang < 400}
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><del>- # github zipball has root folder including commitish, renaming for ease of use
- file rename [glob ${workpath}/b4winckler-*] ${worksrcpath}
-
</del><span class="cx"> # create cache directory
</span><span class="cx"> file mkdir ${workpath}/caches
</span><span class="cx"> }
</span><span class="lines">@@ -68,10 +63,11 @@
</span><span class="cx"> ${worksrcpath}/src/MacVim/mvim
</span><span class="cx"> }
</span><span class="cx">
</span><del>-autoconf.dir ${worksrcpath}/src
</del><ins>+autoconf.dir ${worksrcpath}/src
</ins><span class="cx">
</span><span class="cx"> configure.args --enable-gui=macvim \
</span><span class="cx"> --without-x \
</span><ins>+ --without-local-dir \
</ins><span class="cx"> --disable-gpm \
</span><span class="cx"> --with-tlib=ncurses \
</span><span class="cx"> --enable-multibyte \
</span><span class="lines">@@ -105,22 +101,9 @@
</span><span class="cx"> configure.args-append --with-features=huge
</span><span class="cx"> }
</span><span class="cx"> variant xim description {Build with support for X Input Method} {
</span><del>- configure.args-append --with-xim
</del><ins>+ configure.args-append --enable-xim
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant breakindent description {Apply the breakindent patch} {
- # Upstream: https://retracile.net/wiki/VimBreakIndent
- master_sites-append https://retracile.net/raw-attachment/blog/2013/09/12/23.00/:breakindent
- distfiles-append vim-7.4.16-fc19-breakindent.patch:breakindent
- checksums-append vim-7.4.16-fc19-breakindent.patch \
- rmd160 a03d102166b7fa4d699b621c6a9c54dae05017c6 \
- sha256 8374b1fa505797761fd4480adb1f636d5cdebc1c943c9af70db8f7431b761548
-
- post-patch {
- system -W ${worksrcpath} "patch -p1 < ${distpath}/vim-7.4.16-fc19-breakindent.patch"
- }
-}
-
</del><span class="cx"> variant perl description {Enable Perl scripting} {
</span><span class="cx"> configure.args-append --enable-perlinterp
</span><span class="cx"> depends_lib-append path:bin/perl:perl5
</span><span class="lines">@@ -187,6 +170,7 @@
</span><span class="cx">
</span><span class="cx"> use_autoconf yes
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> variant lua description {Enable Lua scripting} {
</span><span class="cx"> configure.args-append --enable-luainterp \
</span><span class="cx"> --with-lua-prefix=${prefix}
</span><span class="lines">@@ -197,8 +181,7 @@
</span><span class="cx"> configure.args-append --enable-cscope
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> livecheck.type regex
</span><del>-livecheck.url https://github.com/b4winckler/macvim/releases
</del><ins>+livecheck.url https://github.com/macvim-dev/macvim/releases
</ins><span class="cx"> livecheck.version ${snapshot}
</span><del>-livecheck.regex snapshot-(\\d+)
</del><ins>+livecheck.regex Snapshot-(\\d+)
</ins></span></pre></div>
<a id="trunkdportseditorsMacVimfilespatchpythondiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/MacVim/files/patch-python.diff (136907 => 136908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/files/patch-python.diff 2015-05-29 20:04:42 UTC (rev 136907)
+++ trunk/dports/editors/MacVim/files/patch-python.diff 2015-05-29 20:11:30 UTC (rev 136908)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>---- src/configure.in.orig 2013-08-04 20:00:50.000000000 +0200
-+++ src/configure.in 2013-09-22 20:28:50.000000000 +0200
-@@ -965,7 +965,11 @@
- AC_MSG_RESULT($enable_pythoninterp)
- if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
</del><ins>+--- src/configure.in.orig 2015-05-29 20:42:01.000000000 +0200
++++ src/configure.in 2015-05-29 20:53:32.000000000 +0200
+@@ -1046,7 +1046,11 @@
+ fi
+
</ins><span class="cx"> dnl -- find the python executable
</span><span class="cx"> - AC_PATH_PROGS(vi_cv_path_python, python2 python)
</span><span class="cx"> + AC_MSG_CHECKING(--with-python argument)
</span><span class="lines">@@ -13,41 +13,28 @@
</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>-@@ -1049,30 +1053,16 @@
</del><ins>+@@ -1133,13 +1137,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><span class="cx"> - if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
</span><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><del>-- else
-- 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
-- vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
</del><ins>+- if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
+- vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
</ins><span class="cx"> - fi
</span><del>-- 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//`
</del><ins>+- else
+ 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
+@@ -1167,7 +1164,6 @@
+ 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//`
</ins><span class="cx"> - fi
</span><del>-+ vi_cv_path_python_plibs="`${vi_cv_path_python}-config --ldflags`"
-+ dnl remove -ltermcap, it can conflict with an earlier -lncurses
-+ vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
</del><span class="cx"> ])
</span><del>-
- if test "X$python_DLLLIBRARY" != "X"; then
- python_INSTSONAME="$python_DLLLIBRARY"
- fi
- PYTHON_LIBS="${vi_cv_path_python_plibs}"
-- if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
-- PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
-- else
-- PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
-- fi
-+ PYTHON_CFLAGS="`${vi_cv_path_python}-config --includes` -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
- PYTHON_SRC="if_python.c"
- PYTHON_OBJ="objects/if_python.o"
- if test "${vi_cv_var_python_version}" = "1.4"; then
</del><ins>+ AC_CACHE_VAL(vi_cv_dll_name_python,
+ [
</ins><span class="cx"> --- src/if_python.c.orig 2013-09-06 18:00:40.000000000 +0200
</span><span class="cx"> +++ src/if_python.c 2013-09-22 22:01:06.000000000 +0200
</span><span class="cx"> @@ -55,11 +55,7 @@
</span></span></pre></div>
<a id="trunkdportseditorsMacVimfilespatchpython3diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/MacVim/files/patch-python3.diff (136907 => 136908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/files/patch-python3.diff 2015-05-29 20:04:42 UTC (rev 136907)
+++ trunk/dports/editors/MacVim/files/patch-python3.diff 2015-05-29 20:11:30 UTC (rev 136908)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>---- src/configure.in.orig 2013-08-04 20:00:50.000000000 +0200
-+++ src/configure.in 2013-09-22 20:35:45.000000000 +0200
-@@ -1162,7 +1162,11 @@
- AC_MSG_RESULT($enable_python3interp)
- if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
</del><ins>+--- 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 @@
+ fi
+
</ins><span class="cx"> dnl -- find the python3 executable
</span><span class="cx"> - AC_PATH_PROGS(vi_cv_path_python3, python3 python)
</span><span class="cx"> + AC_MSG_CHECKING(--with-python3 argument)
</span><span class="lines">@@ -13,26 +13,3 @@
</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>-@@ -1257,8 +1261,7 @@
- dnl -- delete the lines from make about Entering/Leaving directory
- eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
- rm -f -- "${tmp_mkf}"
-- vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
-- vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
-+ vi_cv_path_python3_plibs="`${vi_cv_path_python3}-config --ldflags`"
- dnl remove -ltermcap, it can conflict with an earlier -lncurses
- vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
- vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
-@@ -1268,11 +1271,7 @@
- python3_INSTSONAME="$python3_DLLLIBRARY"
- fi
- PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
-- if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
-- PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
-- else
-- PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
-- fi
-+ PYTHON3_CFLAGS="`${vi_cv_path_python3}-config --includes` -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
- PYTHON3_SRC="if_python3.c"
- PYTHON3_OBJ="objects/if_python3.o"
-
</del></span></pre>
</div>
</div>
</body>
</html>