<!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>[136909] trunk/dports/editors</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/136909">136909</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2015-05-29 13:48:45 -0700 (Fri, 29 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>editors/vim, editors/vim-app, editors/MacVim:
Link correct python library when using +python2x and +python3y at the same time, see #41344</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="#trunkdportseditorsvimPortfile">trunk/dports/editors/vim/Portfile</a></li>
<li><a href="#trunkdportseditorsvimfilespatchpythondiff">trunk/dports/editors/vim/files/patch-python.diff</a></li>
<li><a href="#trunkdportseditorsvimfilespatchpython3diff">trunk/dports/editors/vim/files/patch-python3.diff</a></li>
<li><a href="#trunkdportseditorsvimappPortfile">trunk/dports/editors/vim-app/Portfile</a></li>
<li><a href="#trunkdportseditorsvimappfilespatchpythondiff">trunk/dports/editors/vim-app/files/patch-python.diff</a></li>
<li><a href="#trunkdportseditorsvimappfilespatchpython3diff">trunk/dports/editors/vim-app/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 (136908 => 136909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/Portfile 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/MacVim/Portfile 2015-05-29 20:48:45 UTC (rev 136909)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> set vim_version 7.4
</span><span class="cx"> set snapshot 76
</span><span class="cx"> version ${vim_version}.snapshot${snapshot}
</span><ins>+revision 1
</ins><span class="cx"> categories editors
</span><span class="cx"> platforms darwin
</span><span class="cx"> license Vim GPL-2+
</span></span></pre></div>
<a id="trunkdportseditorsMacVimfilespatchpythondiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/MacVim/files/patch-python.diff (136908 => 136909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/files/patch-python.diff 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/MacVim/files/patch-python.diff 2015-05-29 20:48:45 UTC (rev 136909)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- src/configure.in.orig 2015-05-29 20:42:01.000000000 +0200
-+++ src/configure.in 2015-05-29 20:53:32.000000000 +0200
</del><ins>+--- configure.in.orig 2015-05-29 22:32:15.000000000 +0200
++++ /opt/local/var/macports/build/_Users_raimue_src_macports_trunk_dports_editors_vim/vim/work/vim74/src/configure.in 2015-05-29 22:34:23.000000000 +0200
</ins><span class="cx"> @@ -1046,7 +1046,11 @@
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="lines">@@ -13,6 +13,15 @@
</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><ins>+@@ -1125,7 +1129,7 @@
+ @echo "python_SYSLIBS='$(SYSLIBS)'"
+ @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
+ @echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
+- @echo "python_INSTSONAME='$(INSTSONAME)'"
++ @echo "python_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
+ @echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
+ @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
</ins><span class="cx"> @@ -1133,13 +1137,6 @@
</span><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></pre></div>
<a id="trunkdportseditorsMacVimfilespatchpython3diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/MacVim/files/patch-python3.diff (136908 => 136909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/files/patch-python3.diff 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/MacVim/files/patch-python3.diff 2015-05-29 20:48:45 UTC (rev 136909)
</span><span class="lines">@@ -13,3 +13,12 @@
</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><ins>+@@ -1367,7 +1363,7 @@
+ @echo "python3_LIBS='$(LIBS)'"
+ @echo "python3_SYSLIBS='$(SYSLIBS)'"
+ @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
+- @echo "python3_INSTSONAME='$(INSTSONAME)'"
++ @echo "python3_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ eof
+ dnl -- delete the lines from make about Entering/Leaving directory
+ eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
</ins></span></pre></div>
<a id="trunkdportseditorsvimPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/vim/Portfile (136908 => 136909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/vim/Portfile 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/vim/Portfile 2015-05-29 20:48:45 UTC (rev 136909)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> set vim_version 7.4
</span><span class="cx"> set vim_patchlevel 729
</span><span class="cx"> version ${vim_version}.${vim_patchlevel}
</span><ins>+revision 1
</ins><span class="cx"> categories editors
</span><span class="cx"> platforms darwin freebsd
</span><span class="cx"> license Vim GPL-2+
</span></span></pre></div>
<a id="trunkdportseditorsvimfilespatchpythondiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/vim/files/patch-python.diff (136908 => 136909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/vim/files/patch-python.diff 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/vim/files/patch-python.diff 2015-05-29 20:48:45 UTC (rev 136909)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- src/configure.in.orig 2015-05-29 20:42:01.000000000 +0200
-+++ src/configure.in 2015-05-29 20:53:32.000000000 +0200
</del><ins>+--- configure.in.orig 2015-05-29 22:32:15.000000000 +0200
++++ /opt/local/var/macports/build/_Users_raimue_src_macports_trunk_dports_editors_vim/vim/work/vim74/src/configure.in 2015-05-29 22:34:23.000000000 +0200
</ins><span class="cx"> @@ -1046,7 +1046,11 @@
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="lines">@@ -13,6 +13,15 @@
</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><ins>+@@ -1125,7 +1129,7 @@
+ @echo "python_SYSLIBS='$(SYSLIBS)'"
+ @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
+ @echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
+- @echo "python_INSTSONAME='$(INSTSONAME)'"
++ @echo "python_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
+ @echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
+ @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
</ins><span class="cx"> @@ -1133,13 +1137,6 @@
</span><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></pre></div>
<a id="trunkdportseditorsvimfilespatchpython3diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/vim/files/patch-python3.diff (136908 => 136909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/vim/files/patch-python3.diff 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/vim/files/patch-python3.diff 2015-05-29 20:48:45 UTC (rev 136909)
</span><span class="lines">@@ -13,3 +13,12 @@
</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><ins>+@@ -1367,7 +1363,7 @@
+ @echo "python3_LIBS='$(LIBS)'"
+ @echo "python3_SYSLIBS='$(SYSLIBS)'"
+ @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
+- @echo "python3_INSTSONAME='$(INSTSONAME)'"
++ @echo "python3_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ eof
+ dnl -- delete the lines from make about Entering/Leaving directory
+ eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
</ins></span></pre></div>
<a id="trunkdportseditorsvimappPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/vim-app/Portfile (136908 => 136909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/vim-app/Portfile 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/vim-app/Portfile 2015-05-29 20:48:45 UTC (rev 136909)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> set vim_version 7.4
</span><span class="cx"> set vim_patchlevel 729
</span><span class="cx"> version ${vim_version}.${vim_patchlevel}
</span><ins>+revision 1
</ins><span class="cx"> categories editors
</span><span class="cx"> platforms darwin
</span><span class="cx"> license Vim GPL-2+
</span></span></pre></div>
<a id="trunkdportseditorsvimappfilespatchpythondiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/vim-app/files/patch-python.diff (136908 => 136909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/vim-app/files/patch-python.diff 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/vim-app/files/patch-python.diff 2015-05-29 20:48:45 UTC (rev 136909)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- src/configure.in.orig 2015-05-29 20:42:01.000000000 +0200
-+++ src/configure.in 2015-05-29 20:53:32.000000000 +0200
</del><ins>+--- configure.in.orig 2015-05-29 22:32:15.000000000 +0200
++++ /opt/local/var/macports/build/_Users_raimue_src_macports_trunk_dports_editors_vim/vim/work/vim74/src/configure.in 2015-05-29 22:34:23.000000000 +0200
</ins><span class="cx"> @@ -1046,7 +1046,11 @@
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="lines">@@ -13,6 +13,15 @@
</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><ins>+@@ -1125,7 +1129,7 @@
+ @echo "python_SYSLIBS='$(SYSLIBS)'"
+ @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
+ @echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
+- @echo "python_INSTSONAME='$(INSTSONAME)'"
++ @echo "python_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
+ @echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
+ @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
</ins><span class="cx"> @@ -1133,13 +1137,6 @@
</span><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></pre></div>
<a id="trunkdportseditorsvimappfilespatchpython3diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/vim-app/files/patch-python3.diff (136908 => 136909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/vim-app/files/patch-python3.diff 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/vim-app/files/patch-python3.diff 2015-05-29 20:48:45 UTC (rev 136909)
</span><span class="lines">@@ -13,3 +13,12 @@
</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><ins>+@@ -1367,7 +1363,7 @@
+ @echo "python3_LIBS='$(LIBS)'"
+ @echo "python3_SYSLIBS='$(SYSLIBS)'"
+ @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
+- @echo "python3_INSTSONAME='$(INSTSONAME)'"
++ @echo "python3_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ eof
+ dnl -- delete the lines from make about Entering/Leaving directory
+ eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
</ins></span></pre>
</div>
</div>
</body>
</html>