<!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>[116417] 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/116417">116417</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2014-01-24 09:42:58 -0800 (Fri, 24 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>editors/vim, editors/vim-app, editors/MacVim:
Always include the patch to fix "conflicting types for 'sigaltstack'", as
apparently it's now required on older versions of OS X as well, see #41774.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportseditorsMacVimPortfile">trunk/dports/editors/MacVim/Portfile</a></li>
<li><a href="#trunkdportseditorsvimPortfile">trunk/dports/editors/vim/Portfile</a></li>
<li><a href="#trunkdportseditorsvimappPortfile">trunk/dports/editors/vim-app/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportseditorsMacVimfilespatchcompatsigaltstackdiff">trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff</a></li>
<li><a href="#trunkdportseditorsvimfilespatchcompatsigaltstackdiff">trunk/dports/editors/vim/files/patch-compat-sigaltstack.diff</a></li>
<li><a href="#trunkdportseditorsvimappfilespatchcompatsigaltstackdiff">trunk/dports/editors/vim-app/files/patch-compat-sigaltstack.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportseditorsMacVimfilespatchcompatdarwin13diff">trunk/dports/editors/MacVim/files/patch-compat-darwin13.diff</a></li>
<li><a href="#trunkdportseditorsvimfilespatchcompatdarwin13diff">trunk/dports/editors/vim/files/patch-compat-darwin13.diff</a></li>
<li><a href="#trunkdportseditorsvimappfilespatchcompatdarwin13diff">trunk/dports/editors/vim-app/files/patch-compat-darwin13.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 (116416 => 116417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/Portfile 2014-01-24 15:09:48 UTC (rev 116416)
+++ trunk/dports/editors/MacVim/Portfile 2014-01-24 17:42:58 UTC (rev 116417)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx"> file mkdir ${workpath}/caches
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+patchfiles-append patch-compat-sigaltstack.diff
+
</ins><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">@@ -203,9 +205,6 @@
</span><span class="cx"> configure.args-append --enable-cscope
</span><span class="cx"> }
</span><span class="cx">
</span><del>-platform darwin 13 {
- patchfiles-append patch-compat-darwin13.diff
-}
</del><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url https://github.com/b4winckler/macvim/releases
</span></span></pre></div>
<a id="trunkdportseditorsMacVimfilespatchcompatdarwin13diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/editors/MacVim/files/patch-compat-darwin13.diff (116416 => 116417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/files/patch-compat-darwin13.diff 2014-01-24 15:09:48 UTC (rev 116416)
+++ trunk/dports/editors/MacVim/files/patch-compat-darwin13.diff 2014-01-24 17:42:58 UTC (rev 116417)
</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="trunkdportseditorsMacVimfilespatchcompatsigaltstackdifffromrev116416trunkdportseditorsMacVimfilespatchcompatdarwin13diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff (from rev 116416, trunk/dports/editors/MacVim/files/patch-compat-darwin13.diff) (0 => 116417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff (rev 0)
+++ trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff 2014-01-24 17:42:58 UTC (rev 116417)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- 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
</ins></span></pre></div>
<a id="trunkdportseditorsvimPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/vim/Portfile (116416 => 116417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/vim/Portfile 2014-01-24 15:09:48 UTC (rev 116416)
+++ trunk/dports/editors/vim/Portfile 2014-01-24 17:42:58 UTC (rev 116417)
</span><span class="lines">@@ -99,10 +99,7 @@
</span><span class="cx"> port:gettext \
</span><span class="cx"> port:libiconv
</span><span class="cx">
</span><del>-autoconf.cmd make autoconf
-autoconf.pre_args
-autoconf.args
-autoconf.dir ${worksrcpath}/src
</del><ins>+patchfiles-append patch-compat-sigaltstack.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> set features [open ${worksrcpath}/src/feature.h a+]
</span><span class="lines">@@ -116,6 +113,11 @@
</span><span class="cx"> file mtime ${worksrcpath}/src/auto/config.mk [clock seconds]
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+autoconf.cmd make autoconf
+autoconf.pre_args
+autoconf.args
+autoconf.dir ${worksrcpath}/src
+
</ins><span class="cx"> configure.args --disable-gui \
</span><span class="cx"> --without-x \
</span><span class="cx"> --disable-gpm \
</span><span class="lines">@@ -296,10 +298,6 @@
</span><span class="cx"> configure.args-append --disable-darwin
</span><span class="cx"> }
</span><span class="cx">
</span><del>-platform darwin 13 {
- patchfiles-append patch-compat-darwin13.diff
-}
-
</del><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://ftp.vim.org/pub/${name}/patches/${vim_version}/?O=D
</span><span class="cx"> livecheck.version [format "%s.%03d" $vim_version $vim_patchlevel]
</span></span></pre></div>
<a id="trunkdportseditorsvimfilespatchcompatdarwin13diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/editors/vim/files/patch-compat-darwin13.diff (116416 => 116417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/vim/files/patch-compat-darwin13.diff 2014-01-24 15:09:48 UTC (rev 116416)
+++ trunk/dports/editors/vim/files/patch-compat-darwin13.diff 2014-01-24 17:42:58 UTC (rev 116417)
</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="trunkdportseditorsvimfilespatchcompatsigaltstackdifffromrev116416trunkdportseditorsvimfilespatchcompatdarwin13diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/editors/vim/files/patch-compat-sigaltstack.diff (from rev 116416, trunk/dports/editors/vim/files/patch-compat-darwin13.diff) (0 => 116417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/vim/files/patch-compat-sigaltstack.diff (rev 0)
+++ trunk/dports/editors/vim/files/patch-compat-sigaltstack.diff 2014-01-24 17:42:58 UTC (rev 116417)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- 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
</ins></span></pre></div>
<a id="trunkdportseditorsvimappPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/vim-app/Portfile (116416 => 116417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/vim-app/Portfile 2014-01-24 15:09:48 UTC (rev 116416)
+++ trunk/dports/editors/vim-app/Portfile 2014-01-24 17:42:58 UTC (rev 116417)
</span><span class="lines">@@ -121,10 +121,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-autoconf.cmd make autoconf
-autoconf.pre_args
-autoconf.args
-autoconf.dir ${worksrcpath}/src
</del><ins>+patchfiles-append patch-compat-sigaltstack.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> set features [open ${worksrcpath}/src/feature.h a+]
</span><span class="lines">@@ -138,6 +135,11 @@
</span><span class="cx"> file mtime ${worksrcpath}/src/auto/config.mk [clock seconds]
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+autoconf.cmd make autoconf
+autoconf.pre_args
+autoconf.args
+autoconf.dir ${worksrcpath}/src
+
</ins><span class="cx"> configure.pre_args --prefix=${applications_dir}
</span><span class="cx"> configure.args --enable-gui=carbon \
</span><span class="cx"> --without-x \
</span><span class="lines">@@ -319,10 +321,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-platform darwin 13 {
- patchfiles-append patch-compat-darwin13.diff
-}
-
</del><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://ftp.vim.org/pub/${realname}/patches/${vim_version}/?O=D
</span><span class="cx"> livecheck.version [format "%s.%03d" $vim_version $vim_patchlevel]
</span></span></pre></div>
<a id="trunkdportseditorsvimappfilespatchcompatdarwin13diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/editors/vim-app/files/patch-compat-darwin13.diff (116416 => 116417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/vim-app/files/patch-compat-darwin13.diff 2014-01-24 15:09:48 UTC (rev 116416)
+++ trunk/dports/editors/vim-app/files/patch-compat-darwin13.diff 2014-01-24 17:42:58 UTC (rev 116417)
</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="trunkdportseditorsvimappfilespatchcompatsigaltstackdifffromrev116416trunkdportseditorsvimappfilespatchcompatdarwin13diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/editors/vim-app/files/patch-compat-sigaltstack.diff (from rev 116416, trunk/dports/editors/vim-app/files/patch-compat-darwin13.diff) (0 => 116417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/vim-app/files/patch-compat-sigaltstack.diff (rev 0)
+++ trunk/dports/editors/vim-app/files/patch-compat-sigaltstack.diff 2014-01-24 17:42:58 UTC (rev 116417)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- 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
</ins></span></pre>
</div>
</div>
</body>
</html>