<!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>[119354] trunk/dports/devel/lua-luasocket</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/119354">119354</a></dd>
<dt>Author</dt> <dd>snc@macports.org</dd>
<dt>Date</dt> <dd>2014-04-23 08:45:48 -0700 (Wed, 23 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>lua-luasocket: update to 3.0-rc1, #43462</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellualuasocketPortfile">trunk/dports/devel/lua-luasocket/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevellualuasocketfilespatchMakefilesdiff">trunk/dports/devel/lua-luasocket/files/patch-Makefiles.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevellualuasocketfilespatchconfigdiff">trunk/dports/devel/lua-luasocket/files/patch-config.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellualuasocketPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/lua-luasocket/Portfile (119353 => 119354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/lua-luasocket/Portfile 2014-04-23 13:01:59 UTC (rev 119353)
+++ trunk/dports/devel/lua-luasocket/Portfile 2014-04-23 15:45:48 UTC (rev 119354)
</span><span class="lines">@@ -4,8 +4,8 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name lua-luasocket
</span><del>-version 2.0.2
-revision 1
</del><ins>+version 3.0_rc1
+revision 0
</ins><span class="cx"> categories devel
</span><span class="cx"> license MIT
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -19,30 +19,44 @@
</span><span class="cx">
</span><span class="cx"> homepage http://www.cs.princeton.edu/~diego/professional/luasocket/
</span><span class="cx">
</span><del>-master_sites http://luaforge.net/frs/download.php/2664/
-checksums md5 41445b138deb7bcfe97bff957503da8e \
- sha1 5ce521fc5c6efb7c1eba7f36dfeafa9e4d745464 \
- rmd160 24d7e4fb1c9cf0c3d94f8b36e82d494ae922e268
-distname luasocket-${version}
</del><ins>+master_sites https://github.com/diegonehab/luasocket/archive/
+checksums md5 08bd2f265b244eb4bf5c2c36bf89b759 \
+ sha1 aff9122b26c01487c06a32133df78c1506af350f \
+ rmd160 27357eee7e52f091609f45a0b0fb7e04e9ea2bd8
+distname "v[regsub {_} $version {-}]"
+worksrcdir "luasocket-[regsub {_} $version {-}]"
</ins><span class="cx">
</span><span class="cx"> depends_lib port:lua
</span><ins>+depends_build path:bin/pkg-config:pkgconfig
</ins><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://luaforge.net/frs/?group_id=23
</span><span class="cx"> livecheck.regex {luasocket-([0-9.]+)\.tar\.gz}
</span><span class="cx">
</span><del>-patchfiles patch-config.diff
</del><ins>+patchfiles patch-Makefiles.diff
</ins><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/config
</del><ins>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/makefile
+ reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/src/makefile
+ reinplace "s|@CFLAGS@|${configure.cppflags} ${configure.cflags}|g" ${worksrcpath}/src/makefile
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+build {
+ set lua_version "[exec -- ${prefix}/bin/pkg-config --variable V lua]"
+ system "cd ${worksrcpath} && make DEBUG=DEBUG macosx LUAV=${lua_version}"
+}
+
+destroot {
+ set lua_version "[exec -- ${prefix}/bin/pkg-config --variable V lua]"
+ system "cd ${worksrcpath} && make DEBUG=DEBUG LUAV=${lua_version} DESTDIR=${destroot} PREFIX=${prefix} PLAT=macosx install-unix"
+}
+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> xinstall -m 755 -d ${destroot}${prefix}/share/examples/${name}
</span><del>-
</del><ins>+
</ins><span class="cx"> eval xinstall -m 644 [glob ${worksrcpath}/doc/*] ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> xinstall -m 644 ${worksrcpath}/LICENSE ${worksrcpath}/NEW \
</span><span class="cx"> ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
</span></span></pre></div>
<a id="trunkdportsdevellualuasocketfilespatchMakefilesdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/lua-luasocket/files/patch-Makefiles.diff (0 => 119354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/lua-luasocket/files/patch-Makefiles.diff (rev 0)
+++ trunk/dports/devel/lua-luasocket/files/patch-Makefiles.diff 2014-04-23 15:45:48 UTC (rev 119354)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+diff -ur src/makefile.old src/makefile
+--- src/makefile.old 2014-04-22 22:37:30.000000000 +0200
++++ src/makefile 2014-04-23 00:09:31.000000000 +0200
+@@ -32,11 +32,11 @@
+ # where lua headers are found for macosx builds
+ # LUAINC_macosx:
+ # /opt/local/include
+-LUAINC_macosx_base?=/opt/local/include
+-LUAINC_macosx?=$(LUAINC_macosx_base)/lua/$(LUAV)
++LUAINC_macosx_base?=@PREFIX@/include
++LUAINC_macosx?=$(LUAINC_macosx_base)
+ # FIXME default should this default to fink or to macports?
+ # What happens when more than one Lua version is installed?
+-LUAPREFIX_macosx?=/opt/local
++LUAPREFIX_macosx?=@PREFIX@
+ CDIR_macosx?=lib/lua/$(LUAV)
+ LDIR_macosx?=share/lua/$(LUAV)
+
+@@ -128,15 +128,15 @@
+ # for Mac OS X
+ SO_macosx=so
+ O_macosx=o
+-CC_macosx=gcc
++CC_macosx=@CC@
+ DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN -DLUA_$(COMPAT)_MODULE \
+ -DLUASOCKET_API='__attribute__((visibility("default")))' \
+ -DUNIX_API='__attribute__((visibility("default")))' \
+ -DMIME_API='__attribute__((visibility("default")))'
+ CFLAGS_macosx= -I$(LUAINC) $(DEF) -pedantic -Wall -O2 -fno-common \
+- -fvisibility=hidden
++ -fvisibility=hidden @CFLAGS@
+ LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o
+-LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc
++LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; @CC@
+ SOCKET_macosx=usocket.o
+
+ #------
</ins></span></pre></div>
<a id="trunkdportsdevellualuasocketfilespatchconfigdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/lua-luasocket/files/patch-config.diff (119353 => 119354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/lua-luasocket/files/patch-config.diff 2014-04-23 13:01:59 UTC (rev 119353)
+++ trunk/dports/devel/lua-luasocket/files/patch-config.diff 2014-04-23 15:45:48 UTC (rev 119354)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>---- config.old 2009-09-16 10:42:22.000000000 +0200
-+++ config 2009-09-16 10:44:04.000000000 +0200
-@@ -15,9 +15,7 @@
- #------
- # Lua includes and libraries
- #
--#LUAINC=-I/usr/local/include/lua50
--#LUAINC=-I/usr/local/include/lua5.1
--#LUAINC=-Ilua-5.1.1/src
-+LUAINC=-I@PREFIX@/include
-
- #------
- # Compat-5.1 directory
-@@ -28,10 +26,8 @@
- # Top of your Lua installation
- # Relative paths will be inside the src tree
- #
--#INSTALL_TOP_SHARE=/usr/local/share/lua/5.0
--#INSTALL_TOP_LIB=/usr/local/lib/lua/5.0
--INSTALL_TOP_SHARE=/usr/local/share/lua/5.1
--INSTALL_TOP_LIB=/usr/local/lib/lua/5.1
-+INSTALL_TOP_SHARE=$(DESTDIR)@PREFIX@/share/lua/5.1
-+INSTALL_TOP_LIB=$(DESTDIR)@PREFIX@/lib/lua/5.1
-
- INSTALL_DATA=cp
- INSTALL_EXEC=cp
-@@ -40,20 +36,20 @@
- # Compiler and linker settings
- # for Mac OS X
- #
--#CC=gcc
--#DEF= -DLUASOCKET_DEBUG -DUNIX_HAS_SUN_LEN
--#CFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fno-common
--#LDFLAGS=-bundle -undefined dynamic_lookup
--#LD=export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc
-+CC=gcc
-+DEF= -DLUASOCKET_DEBUG -DUNIX_HAS_SUN_LEN
-+CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fno-common
-+LDFLAGS=-bundle -undefined dynamic_lookup
-+LD=export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc
-
- #------
- # Compiler and linker settings
- # for Linux
--CC=gcc
--DEF=-DLUASOCKET_DEBUG
--CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fpic
--LDFLAGS=-O -shared -fpic
--LD=gcc
-+#CC=gcc
-+#DEF=-DLUASOCKET_DEBUG
-+#CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fpic
-+#LDFLAGS=-O -shared -fpic
-+#LD=gcc
-
- #------
- # End of makefile configuration
</del></span></pre>
</div>
</div>
</body>
</html>