<!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>[118805] trunk/dports/lang/lua</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/118805">118805</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-04-11 00:02:47 -0700 (Fri, 11 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>lua: update to 5.2.3 (#42892); rework portfile</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangluaPortfile">trunk/dports/lang/lua/Portfile</a></li>
<li><a href="#trunkdportslangluafilespatchMakefilediff">trunk/dports/lang/lua/files/patch-Makefile.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangluafilesCOPYRIGHT">trunk/dports/lang/lua/files/COPYRIGHT</a></li>
<li><a href="#trunkdportslangluafilesluapc">trunk/dports/lang/lua/files/lua.pc</a></li>
<li><a href="#trunkdportslangluafilespatchsrcMakefilediff">trunk/dports/lang/lua/files/patch-src-Makefile.diff</a></li>
<li><a href="#trunkdportslangluafilespatchsrcluaconfhdiff">trunk/dports/lang/lua/files/patch-src-luaconf.h.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangluafilespatchCOPYRIGHTdiff">trunk/dports/lang/lua/files/patch-COPYRIGHT.diff</a></li>
<li><a href="#trunkdportslangluafilespatchlua522pcdiff">trunk/dports/lang/lua/files/patch-lua-5.2.2.pc.diff</a></li>
<li><a href="#trunkdportslangluafilespatchsrc_Makefilediff">trunk/dports/lang/lua/files/patch-src_Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangluaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/lua/Portfile (118804 => 118805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/lua/Portfile 2014-04-11 06:16:12 UTC (rev 118804)
+++ trunk/dports/lang/lua/Portfile 2014-04-11 07:02:47 UTC (rev 118805)
</span><span class="lines">@@ -5,9 +5,8 @@
</span><span class="cx">
</span><span class="cx"> name lua
</span><span class="cx"> conflicts lua50
</span><del>-set compat_version 5.2
-version ${compat_version}.2
-revision 1
</del><ins>+version 5.2.3
+set branch [join [lrange [split ${version} .] 0 1] .]
</ins><span class="cx"> categories lang
</span><span class="cx"> license MIT
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -18,12 +17,11 @@
</span><span class="cx"> extending applications. Lua is also frequently used as a general-purpose, \
</span><span class="cx"> standalone language.
</span><span class="cx">
</span><del>-homepage http://www.lua.org
-master_sites ${homepage}/ftp/
</del><ins>+homepage http://www.lua.org/
+master_sites ${homepage}ftp/
</ins><span class="cx">
</span><del>-checksums ${distfiles} \
- sha1 0857e41e5579726a4cb96732e80d7aa47165eaf5 \
- rmd160 d17967150017e9b25a26c1ad527647cd0b9e598f
</del><ins>+checksums rmd160 b8714669c8c0f8272104effd8a9675921ddb2fa5 \
+ sha256 13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d
</ins><span class="cx">
</span><span class="cx"> depends_lib port:readline
</span><span class="cx"> build.target macosx
</span><span class="lines">@@ -31,43 +29,37 @@
</span><span class="cx"> test.run yes
</span><span class="cx"> test.env DYLD_LIBRARY_PATH=./lib
</span><span class="cx">
</span><del>-patchfiles patch-COPYRIGHT.diff \
- patch-Makefile.diff \
- patch-src_Makefile.diff \
- patch-lua-${version}.pc.diff
</del><ins>+post-extract {
+ xinstall -m 0644 -W ${filespath} COPYRIGHT lua.pc ${worksrcpath}
+}
</ins><span class="cx">
</span><del>-patch.args -f
</del><ins>+patchfiles patch-Makefile.diff \
+ patch-src-Makefile.diff \
+ patch-src-luaconf.h.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/Makefile ${worksrcpath}/src/luaconf.h
- reinplace "s|/man/man1|/share/man/man1|g" ${worksrcpath}/Makefile
-
- # reinplace %VERSION% and %COMPAT_VERSION% after applying patch-dlopen.diff
- reinplace "s|%VERSION%|${version}|g" ${worksrcpath}/Makefile ${worksrcpath}/src/Makefile
- reinplace "s|%COMPAT_VERSION%|${compat_version}|g" ${worksrcpath}/Makefile ${worksrcpath}/src/Makefile
-
- # reinplace %PREFIX% to fix @executable_path, cf. ticket no. 28726
- reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/src/Makefile
</del><ins>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Makefile ${worksrcpath}/lua.pc ${worksrcpath}/src/Makefile ${worksrcpath}/src/luaconf.h
+ reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/Makefile ${worksrcpath}/lua.pc ${worksrcpath}/src/Makefile
+ reinplace "s|@BRANCH@|${branch}|g" ${worksrcpath}/Makefile ${worksrcpath}/lua.pc ${worksrcpath}/src/Makefile
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> configure {
</span><span class="cx"> reinplace -E "/^MYLDFLAGS=/s|\$| ${configure.ldflags} [get_canonical_archflags]|" ${worksrcpath}/src/Makefile
</span><span class="cx"> reinplace -E "/^CFLAGS=/s|\$| ${configure.cflags} ${configure.cppflags} [get_canonical_archflags]|" ${worksrcpath}/src/Makefile
</span><span class="cx"> reinplace "s|CC= .*\$|CC= ${configure.cc}|" ${worksrcpath}/src/Makefile
</span><del>- reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/lua-${version}.pc
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><span class="cx"> destroot.target install INSTALL_TOP=${destroot}${prefix}
</span><span class="cx"> post-destroot {
</span><del>- xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
- xinstall -m 0644 -W ${worksrcpath} COPYRIGHT README ${destroot}${prefix}/share/doc/${name}
- xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}/html
</del><ins>+ set docdir ${prefix}/share/doc/${subport}
+ xinstall -d -m 0755 ${destroot}${docdir}/html
+ xinstall -m 0644 -W ${worksrcpath} COPYRIGHT README ${destroot}${docdir}
</ins><span class="cx"> foreach html [glob ${worksrcpath}/doc/*.html ${worksrcpath}/doc/*.gif] {
</span><del>- xinstall -m 0644 ${html} ${destroot}${prefix}/share/doc/${name}/html
</del><ins>+ xinstall -m 0644 ${html} ${destroot}${docdir}/html
</ins><span class="cx"> }
</span><del>- xinstall -W ${worksrcpath} -m 0644 lua-${version}.pc ${destroot}${prefix}/lib/pkgconfig/lua.pc
</del><ins>+ xinstall -W ${worksrcpath} -m 0644 lua.pc ${destroot}${prefix}/lib/pkgconfig/
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span></span></pre></div>
<a id="trunkdportslangluafilesCOPYRIGHTfromrev118736trunkdportslangluafilespatchCOPYRIGHTdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/lua/files/COPYRIGHT (from rev 118736, trunk/dports/lang/lua/files/patch-COPYRIGHT.diff) (0 => 118805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/lua/files/COPYRIGHT (rev 0)
+++ trunk/dports/lang/lua/files/COPYRIGHT 2014-04-11 07:02:47 UTC (rev 118805)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+Lua License
+-----------
+
+Lua is licensed under the terms of the MIT license reproduced below.
+This means that Lua is free software and can be used for both academic
+and commercial purposes at absolutely no cost.
+
+For details and rationale, see http://www.lua.org/license.html .
+
+===============================================================================
+
+Copyright (C) 1994-2013 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+===============================================================================
</ins></span></pre></div>
<a id="trunkdportslangluafilesluapcfromrev117955trunkdportslangluafilespatchlua522pcdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/lua/files/lua.pc (from rev 117955, trunk/dports/lang/lua/files/patch-lua-5.2.2.pc.diff) (0 => 118805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/lua/files/lua.pc (rev 0)
+++ trunk/dports/lang/lua/files/lua.pc 2014-04-11 07:02:47 UTC (rev 118805)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+# lua.pc -- pkg-config data for Lua
+
+V= @BRANCH@
+R= @VERSION@
+
+# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
+prefix= @PREFIX@
+INSTALL_BIN= ${prefix}/bin
+INSTALL_INC= ${prefix}/include
+INSTALL_LIB= ${prefix}/lib
+INSTALL_MAN= ${prefix}/man/man1
+INSTALL_LMOD= ${prefix}/share/lua/${V}
+INSTALL_CMOD= ${prefix}/lib/lua/${V}
+
+# canonical vars
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${R}
+Requires:
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir}
</ins></span></pre></div>
<a id="trunkdportslangluafilespatchCOPYRIGHTdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/lua/files/patch-COPYRIGHT.diff (118804 => 118805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/lua/files/patch-COPYRIGHT.diff 2014-04-11 06:16:12 UTC (rev 118804)
+++ trunk/dports/lang/lua/files/patch-COPYRIGHT.diff 2014-04-11 07:02:47 UTC (rev 118805)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>---- COPYRIGHT.orig 1970-01-01 10:00:00.000000000 +1000
-+++ COPYRIGHT 2013-04-28 13:00:48.000000000 +1000
-@@ -0,0 +1,34 @@
-+Lua License
-+-----------
-+
-+Lua is licensed under the terms of the MIT license reproduced below.
-+This means that Lua is free software and can be used for both academic
-+and commercial purposes at absolutely no cost.
-+
-+For details and rationale, see http://www.lua.org/license.html .
-+
-+===============================================================================
-+
-+Copyright (C) 1994-2013 Lua.org, PUC-Rio.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.
-+
-+===============================================================================
-+
-+(end of COPYRIGHT)
</del></span></pre></div>
<a id="trunkdportslangluafilespatchMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/lua/files/patch-Makefile.diff (118804 => 118805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/lua/files/patch-Makefile.diff 2014-04-11 06:16:12 UTC (rev 118804)
+++ trunk/dports/lang/lua/files/patch-Makefile.diff 2014-04-11 07:02:47 UTC (rev 118805)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><del>---- Makefile.orig 2013-05-09 08:59:28.000000000 +0200
-+++ Makefile 2013-05-09 09:02:08.000000000 +0200
</del><ins>+--- Makefile.orig 2013-11-09 18:49:35.000000000 -0600
++++ Makefile 2014-03-17 16:17:56.000000000 -0500
+@@ -10,11 +10,11 @@
+ # so take care if INSTALL_TOP is not an absolute path. See the local target.
+ # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
+-INSTALL_TOP= /usr/local
++INSTALL_TOP= @PREFIX@
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+ INSTALL_INC= $(INSTALL_TOP)/include
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+-INSTALL_MAN= $(INSTALL_TOP)/man/man1
++INSTALL_MAN= $(INSTALL_TOP)/share/man/man1
+ INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
+ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
+
</ins><span class="cx"> @@ -41,7 +41,7 @@
</span><span class="cx"> # What to install.
</span><span class="cx"> TO_BIN= lua luac
</span><span class="lines">@@ -13,8 +27,8 @@
</span><span class="cx"> cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
</span><span class="cx"> cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
</span><span class="cx"> cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
</span><del>-+ cd $(INSTALL_LIB) && ln -s liblua.dylib liblua.%VERSION%.dylib
-+ cd $(INSTALL_LIB) && ln -s liblua.dylib liblua.%COMPAT_VERSION%.dylib
</del><ins>++ cd $(INSTALL_LIB) && ln -s liblua.dylib liblua.@VERSION@.dylib
++ cd $(INSTALL_LIB) && ln -s liblua.dylib liblua.@BRANCH@.dylib
</ins><span class="cx">
</span><span class="cx"> uninstall:
</span><span class="cx"> cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN)
</span></span></pre></div>
<a id="trunkdportslangluafilespatchlua522pcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/lua/files/patch-lua-5.2.2.pc.diff (118804 => 118805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/lua/files/patch-lua-5.2.2.pc.diff 2014-04-11 06:16:12 UTC (rev 118804)
+++ trunk/dports/lang/lua/files/patch-lua-5.2.2.pc.diff 2014-04-11 07:02:47 UTC (rev 118805)
</span><span class="lines">@@ -1,34 +0,0 @@
</span><del>---- lua-5.2.2.pc.orig 2012-08-08 07:55:12.000000000 -0700
-+++ lua-5.2.2.pc 2012-08-08 07:55:02.000000000 -0700
-@@ -0,0 +1,31 @@
-+# lua.pc -- pkg-config data for Lua
-+
-+# vars from install Makefile
-+
-+# grep '^V=' ../Makefile
-+V= 5.2
-+# grep '^R=' ../Makefile
-+R= 5.2.2
-+
-+# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
-+prefix= @PREFIX@
-+INSTALL_BIN= ${prefix}/bin
-+INSTALL_INC= ${prefix}/include
-+INSTALL_LIB= ${prefix}/lib
-+INSTALL_MAN= ${prefix}/man/man1
-+INSTALL_LMOD= ${prefix}/share/lua/${V}
-+INSTALL_CMOD= ${prefix}/lib/lua/${V}
-+
-+# canonical vars
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: Lua
-+Description: An Extensible Extension Language
-+Version: ${R}
-+Requires:
-+Libs: -L${libdir} -llua -lm
-+Cflags: -I${includedir}
-+
-+# (end of lua.pc)
</del></span></pre></div>
<a id="trunkdportslangluafilespatchsrcMakefiledifffromrev117955trunkdportslangluafilespatchsrc_Makefilediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/lua/files/patch-src-Makefile.diff (from rev 117955, trunk/dports/lang/lua/files/patch-src_Makefile.diff) (0 => 118805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/lua/files/patch-src-Makefile.diff (rev 0)
+++ trunk/dports/lang/lua/files/patch-src-Makefile.diff 2014-04-11 07:02:47 UTC (rev 118805)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+--- src/Makefile.orig 2013-11-11 05:45:49.000000000 -0600
++++ src/Makefile 2014-03-17 15:22:10.000000000 -0500
+@@ -29,6 +29,7 @@
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+
+ LUA_A= liblua.a
++LUA_DYLIB= liblua.dylib
+ CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+ lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
+ ltm.o lundump.o lvm.o lzio.o
+@@ -43,8 +44,8 @@
+ LUAC_O= luac.o
+
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+-ALL_A= $(LUA_A)
++ALL_T= $(LUA_DYLIB) $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_A= $(LUA_DYLIB) $(LUA_A)
+
+ # Targets start here.
+ default: $(PLAT)
+@@ -56,14 +57,20 @@
+ a: $(ALL_A)
+
+ $(LUA_A): $(BASE_O)
++ @echo "Building static library"
+ $(AR) $@ $(BASE_O)
+ $(RANLIB) $@
+
++$(LUA_DYLIB): $(BASE_O)
++ @echo "Building dynamic library (dylib)"
++ $(CC) -o $@ $(MYLDFLAGS) -dynamiclib -install_name @PREFIX@/lib/liblua.dylib \
++ -compatibility_version @BRANCH@ -current_version @VERSION@ $^
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++ $(CC) -o $@ -L. $(MYLDFLAGS) $(MYCFLAGS) $(LIBS) -llua lua.c
+
+ $(LUAC_T): $(LUAC_O) $(LUA_A)
+- $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
++ $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_DYLIB) $(LIBS)
+
+ clean:
+ $(RM) $(ALL_T) $(ALL_O)
+@@ -106,7 +113,7 @@
+ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline"
+
+ macosx:
+- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc
++ $(MAKE) $(ALL) SYSCFLAGS="-fno-common -DLUA_USE_MACOSX" SYSLIBS="-lreadline"
+
+ mingw:
+ $(MAKE) "LUA_A=lua52.dll" "LUA_T=lua.exe" \
</ins></span></pre></div>
<a id="trunkdportslangluafilespatchsrcluaconfhdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/lua/files/patch-src-luaconf.h.diff (0 => 118805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/lua/files/patch-src-luaconf.h.diff (rev 0)
+++ trunk/dports/lang/lua/files/patch-src-luaconf.h.diff 2014-04-11 07:02:47 UTC (rev 118805)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- src/luaconf.h.orig 2013-04-12 13:48:47.000000000 -0500
++++ src/luaconf.h 2014-03-17 16:16:34.000000000 -0500
+@@ -100,7 +100,7 @@
+ #else /* }{ */
+
+ #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
+-#define LUA_ROOT "/usr/local/"
++#define LUA_ROOT "@PREFIX@/"
+ #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
+ #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
+ #define LUA_PATH_DEFAULT \
</ins></span></pre></div>
<a id="trunkdportslangluafilespatchsrc_Makefilediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/lua/files/patch-src_Makefile.diff (118804 => 118805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/lua/files/patch-src_Makefile.diff 2014-04-11 06:16:12 UTC (rev 118804)
+++ trunk/dports/lang/lua/files/patch-src_Makefile.diff 2014-04-11 07:02:47 UTC (rev 118805)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>---- src/Makefile.orig 2013-05-09 09:04:29.000000000 +0200
-+++ src/Makefile 2013-05-09 09:29:32.000000000 +0200
-@@ -29,6 +29,7 @@
- PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-
- LUA_A= liblua.a
-+LUA_DYLIB= liblua.dylib
- CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
- lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
- ltm.o lundump.o lvm.o lzio.o
-@@ -43,8 +44,8 @@
- LUAC_O= luac.o
-
- ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
--ALL_A= $(LUA_A)
-+ALL_T= $(LUA_DYLIB) $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_A= $(LUA_DYLIB) $(LUA_A)
-
- # Targets start here.
- default: $(PLAT)
-@@ -56,14 +57,20 @@
- a: $(ALL_A)
-
- $(LUA_A): $(BASE_O)
-+ @echo "Building static library"
- $(AR) $@ $(BASE_O)
- $(RANLIB) $@
-
-+$(LUA_DYLIB): $(BASE_O)
-+ @echo "Building dynamic library (dylib)"
-+ $(CC) -o $@ $(MYLDFLAGS) -dynamiclib -install_name %PREFIX%/lib/liblua.dylib \
-+ -compatibility_version %COMPAT_VERSION% -current_version %VERSION% $^
-+
- $(LUA_T): $(LUA_O) $(LUA_A)
-- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-+ $(CC) -o $@ -L. $(MYLDFLAGS) $(MYCFLAGS) $(LIBS) -llua lua.c
-
- $(LUAC_T): $(LUAC_O) $(LUA_A)
-- $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-+ $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_DYLIB) $(LIBS)
-
- clean:
- $(RM) $(ALL_T) $(ALL_O)
-@@ -106,7 +113,7 @@
- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline"
-
- macosx:
-- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline"
-+ $(MAKE) $(ALL) SYSCFLAGS="-fno-common -DLUA_USE_MACOSX" SYSLIBS="-lreadline"
-
- mingw:
- $(MAKE) "LUA_A=lua52.dll" "LUA_T=lua.exe" \
</del></span></pre>
</div>
</div>
</body>
</html>