<!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>[118488] trunk/dports/devel/lua-luaexpat</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/118488">118488</a></dd>
<dt>Author</dt> <dd>and.damore@macports.org</dd>
<dt>Date</dt> <dd>2014-04-03 02:42:52 -0700 (Thu, 03 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>port lua-expat: upgrade to 1.3.0 version compatible with lua 5.2, fix #41119, nomaintainer</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellualuaexpatPortfile">trunk/dports/devel/lua-luaexpat/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevellualuaexpatfilespatchMakefilediff">trunk/dports/devel/lua-luaexpat/files/patch-Makefile.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevellualuaexpatfilesconfigpatchdiff">trunk/dports/devel/lua-luaexpat/files/config-patch.diff</a></li>
<li><a href="#trunkdportsdevellualuaexpatfilesmakefilepatchdiff">trunk/dports/devel/lua-luaexpat/files/makefile-patch.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellualuaexpatPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/lua-luaexpat/Portfile (118487 => 118488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/lua-luaexpat/Portfile 2014-04-03 09:10:05 UTC (rev 118487)
+++ trunk/dports/devel/lua-luaexpat/Portfile 2014-04-03 09:42:52 UTC (rev 118488)
</span><span class="lines">@@ -4,8 +4,10 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name lua-luaexpat
</span><del>-version 1.2.0
-set buildhash 30c2491fe44a
</del><ins>+version 1.3.0
+set hash 1adb0c435b54
+# this binds lua-expat to 5.2 since this is the current port:lua version in dports tree
+set lua_version 5.2
</ins><span class="cx"> categories devel
</span><span class="cx"> license MIT
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -15,17 +17,37 @@
</span><span class="cx"> LuaExpat is free software and uses the same license as Lua 5.1.
</span><span class="cx"> homepage http://www.keplerproject.org/luaexpat/index.html
</span><span class="cx"> master_sites http://code.matthewwild.co.uk/lua-expat/archive
</span><del>-distname ${buildhash}
</del><ins>+distname ${hash}
</ins><span class="cx"> use_configure no
</span><del>-checksums sha1 c8de19c12f9d0899c3ecf5bf3c679910ea5d1c32 \
- rmd160 d1b6c8de59cfe1de814fb28f753ff850298ac735
-worksrcdir lua-expat-${buildhash}
-patchfiles config-patch.diff \
- makefile-patch.diff
-post-patch {
- reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/config
- reinplace s|luaL_reg|luaL_Reg|g ${worksrcpath}/src/lxplib.c
-}
</del><ins>+checksums sha1 794426889ddfdfe08d552495012b1d6a05826c6b \
+ rmd160 113e88216cfd9d379ba76c11fb6fc6902478d888
+worksrcdir lua-expat-${hash}
</ins><span class="cx"> depends_build port:lua
</span><span class="cx"> depends_lib port:expat
</span><span class="cx"> build.target
</span><ins>+build.args CC=${configure.cc} \
+ CFLAGS="${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
+ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld] -llua" \
+ LUA_INC="" \
+ EXPAT_INC="" \
+ COMMON_LDFLAGS="-bundle -undefined dynamic_lookup"
+
+destroot.args LUA_LDIR=${prefix}/share/lua/${lua_version} \
+ LUA_CDIR=${prefix}/lib/lua/${lua_version}
+
+patchfiles patch-Makefile.diff
+
+post-destroot {
+ # install docs
+ xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
+ xinstall -m 0644 -W ${worksrcpath} README \
+ ${destroot}${prefix}/share/doc/${name}
+ foreach f [glob ${worksrcpath}/doc/us/*] {
+ xinstall -m 0644 $f ${destroot}${prefix}/share/doc/${name}
+ }
+
+ # install tests
+ xinstall -d -m 0755 ${destroot}${prefix}/share/examples
+ copy ${worksrcpath}/tests ${destroot}${prefix}/share/examples/${name}
+}
+
</ins></span></pre></div>
<a id="trunkdportsdevellualuaexpatfilesconfigpatchdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/lua-luaexpat/files/config-patch.diff (118487 => 118488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/lua-luaexpat/files/config-patch.diff 2014-04-03 09:10:05 UTC (rev 118487)
+++ trunk/dports/devel/lua-luaexpat/files/config-patch.diff 2014-04-03 09:42:52 UTC (rev 118488)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>---- config.orig 2006-06-08 22:41:48.000000000 +0200
-+++ config 2008-05-14 23:27:14.000000000 +0200
-@@ -1,23 +1,23 @@
- # Installation directories
- # System's libraries directory (where binary libraries are installed)
--LUA_LIBDIR= /usr/local/lib/lua/5.0
-+LUA_LIBDIR= %PREFIX%/lib/lua/5.2
- # System's lua directory (where Lua libraries are installed)
--LUA_DIR= /usr/local/share/lua/5.0
-+LUA_DIR= %PREFIX%/share/lua/5.2
- # Lua includes directory
--LUA_INC= /usr/local/include
-+LUA_INC= %PREFIX%/include
- # Expat includes directory
--EXPAT_INC= /usr/local/include
-+EXPAT_INC= %PREFIX%/include
-
- # OS dependent
--LIB_OPTION= -shared #for Linux
--#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
-+#LIB_OPTION= -shared #for Linux
-+LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
-
- LIBNAME= $T.so.$V
- # Lua version number
- # (according to Lua 5.1 definition:
- # first version digit * 100 + second version digit
- # e.g. Lua 5.0.2 => 500, Lua 5.1 => 501, Lua 5.1.1 => 501)
--LUA_VERSION_NUM= 500
-+LUA_VERSION_NUM= 502
- COMPAT_DIR= ../compat/src
-
- # Compilation parameters
</del></span></pre></div>
<a id="trunkdportsdevellualuaexpatfilesmakefilepatchdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/lua-luaexpat/files/makefile-patch.diff (118487 => 118488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/lua-luaexpat/files/makefile-patch.diff 2014-04-03 09:10:05 UTC (rev 118487)
+++ trunk/dports/devel/lua-luaexpat/files/makefile-patch.diff 2014-04-03 09:42:52 UTC (rev 118488)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>---- makefile.orig 2009-10-11 11:19:55.000000000 +0200
-+++ makefile 2009-10-11 11:20:43.000000000 +0200
-@@ -18,11 +18,11 @@
- $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
-
- install:
-- mkdir -p $(LUA_LIBDIR)
-- cp src/$(LIBNAME) $(LUA_LIBDIR)
-- cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
-- mkdir -p $(LUA_DIR)/$T
-- cp src/$T/lom.lua $(LUA_DIR)/$T
-+ mkdir -p $(DESTDIR)/$(LUA_LIBDIR)
-+ cp src/$(LIBNAME) $(DESTDIR)/$(LUA_LIBDIR)
-+ cd $(DESTDIR)/$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
-+ mkdir -p $(DESTDIR)/$(LUA_DIR)/$T
-+ cp src/$T/lom.lua $(DESTDIR)/$(LUA_DIR)/$T
-
- clean:
- rm -f src/$(LIBNAME) $(OBJS)
</del></span></pre></div>
<a id="trunkdportsdevellualuaexpatfilespatchMakefilediff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/lua-luaexpat/files/patch-Makefile.diff (0 => 118488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/lua-luaexpat/files/patch-Makefile.diff (rev 0)
+++ trunk/dports/devel/lua-luaexpat/files/patch-Makefile.diff 2014-04-03 09:42:52 UTC (rev 118488)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- Makefile.orig 2014-04-03 11:32:44.000000000 +0200
++++ Makefile 2014-04-03 11:33:27.000000000 +0200
+@@ -27,8 +27,10 @@
+ $(CC) $(CF) -o $@ src/$(T)lib.c $(LF)
+
+ install:
+- $(INSTALL_PROGRAM) -D src/$(LIBNAME) $(DESTDIR)$(LUA_CDIR)/$(LIBNAME)
+- $(INSTALL_PROGRAM) -D src/$T/lom.lua $(DESTDIR)$(LUA_LDIR)/$T/lom.lua
++ $(INSTALL_PROGRAM) -d $(DESTDIR)$(LUA_CDIR)/
++ $(INSTALL_PROGRAM) -d $(DESTDIR)$(LUA_LDIR)/$T
++ $(INSTALL_DATA) src/$(LIBNAME) $(DESTDIR)$(LUA_CDIR)/$(LIBNAME)
++ $(INSTALL_DATA) src/$T/lom.lua $(DESTDIR)$(LUA_LDIR)/$T/lom.lua
+
+ clean:
+ $(RM) src/$(LIBNAME) $(OBJS)
</ins></span></pre>
</div>
</div>
</body>
</html>