Revision: 118232 https://trac.macports.org/changeset/118232 Author: and.damore@macports.org Date: 2014-03-26 13:24:06 -0700 (Wed, 26 Mar 2014) Log Message: ----------- port luash: fix linking, move all patching to patchfiles, build universal, nomaintainer Modified Paths: -------------- trunk/dports/shells/luash/Portfile Added Paths: ----------- trunk/dports/shells/luash/files/patch-luash_cpp.diff Modified: trunk/dports/shells/luash/Portfile =================================================================== --- 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) @@ -24,24 +24,25 @@ # patch for luash.lua addresses a change in API for os.execute() in 5.2 # remove it if a lua51 port is introduced and used to compile luash patchfiles patch-makefile.diff \ + patch-luash_cpp.diff \ patch-luash_lua.diff use_configure no +universal_variant yes -variant universal {} depends_lib port:lua \ port:lua-luafilesystem -post-patch { - reinplace "s|lua_open|luaL_newstate|" ${worksrcpath}/luash.cpp +pre-build { + build.args CXX=${configure.cxx} \ + CXX_FLAGS="${configure.cppflags} ${configure.cxxflags} \ + [get_canonical_archflags cxx] ${configure.ldflags}" } -build.args-append CXX=${configure.cxx} \ - CXX_FLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" +destroot.destdir PREFIX=${destroot}${prefix} -destroot.args PREFIX=${prefix} post-destroot { xinstall -d -m 755 ${destroot}$prefix/share/doc/${name} Added: trunk/dports/shells/luash/files/patch-luash_cpp.diff =================================================================== --- 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) @@ -0,0 +1,26 @@ +--- 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 ++}