<!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>[118232] trunk/dports/shells/luash</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/118232">118232</a></dd>
<dt>Author</dt> <dd>and.damore@macports.org</dd>
<dt>Date</dt> <dd>2014-03-26 13:24:06 -0700 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>port luash: fix linking, move all patching to patchfiles, build universal, nomaintainer</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsshellsluashPortfile">trunk/dports/shells/luash/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsshellsluashfilespatchluash_cppdiff">trunk/dports/shells/luash/files/patch-luash_cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsshellsluashPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/shells/luash/Portfile (118231 => 118232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/shells/luash/Portfile 2014-03-26 20:17:31 UTC (rev 118231)
+++ trunk/dports/shells/luash/Portfile 2014-03-26 20:24:06 UTC (rev 118232)
</span><span class="lines">@@ -24,24 +24,25 @@
</span><span class="cx"> # patch for luash.lua addresses a change in API for os.execute() in 5.2
</span><span class="cx"> # remove it if a lua51 port is introduced and used to compile luash
</span><span class="cx"> patchfiles patch-makefile.diff \
</span><ins>+ patch-luash_cpp.diff \
</ins><span class="cx"> patch-luash_lua.diff
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> use_configure no
</span><ins>+universal_variant yes
</ins><span class="cx">
</span><del>-variant universal {}
</del><span class="cx">
</span><span class="cx"> depends_lib port:lua \
</span><span class="cx"> port:lua-luafilesystem
</span><span class="cx">
</span><del>-post-patch {
- reinplace "s|lua_open|luaL_newstate|" ${worksrcpath}/luash.cpp
</del><ins>+pre-build {
+ build.args CXX=${configure.cxx} \
+ CXX_FLAGS="${configure.cppflags} ${configure.cxxflags} \
+ [get_canonical_archflags cxx] ${configure.ldflags}"
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-build.args-append CXX=${configure.cxx} \
- CXX_FLAGS="${configure.cxxflags} [get_canonical_archflags cxx]"
</del><ins>+destroot.destdir PREFIX=${destroot}${prefix}
</ins><span class="cx">
</span><del>-destroot.args PREFIX=${prefix}
</del><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> xinstall -d -m 755 ${destroot}$prefix/share/doc/${name}
</span></span></pre></div>
<a id="trunkdportsshellsluashfilespatchluash_cppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/shells/luash/files/patch-luash_cpp.diff (0 => 118232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/shells/luash/files/patch-luash_cpp.diff (rev 0)
+++ trunk/dports/shells/luash/files/patch-luash_cpp.diff 2014-03-26 20:24:06 UTC (rev 118232)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+--- luash.cpp.orig 2014-03-26 20:57:07.000000000 +0100
++++ luash.cpp 2014-03-26 20:59:16.000000000 +0100
+@@ -18,6 +18,7 @@
+ #include <sstream>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <unistd.h>
+ #include <readline/readline.h>
+ #include <readline/history.h>
+ #include <lua.hpp>
+@@ -200,7 +201,7 @@
+
+ while(true)
+ {
+- L = lua_open();
++ L = luaL_newstate();
+ luaL_openlibs(L);
+
+ lua_register(L, "readline", lua_readline);
+@@ -238,4 +239,4 @@
+ }
+
+ return 0;
+-}
+\ No newline at end of file
++}
</ins></span></pre>
</div>
</div>
</body>
</html>