Date: Tue, 11 Feb 2014 20:04:43 +0000 (UTC) From: David Thiel <lx@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343809 - in head/net/luasocket: . files Message-ID: <201402112004.s1BK4hNb061561@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lx Date: Tue Feb 11 20:04:43 2014 New Revision: 343809 URL: http://svnweb.freebsd.org/changeset/ports/343809 QAT: https://qat.redports.org/buildarchive/r343809/ Log: Update to 3.0-rc1. Add stage support, LICENSE, USE_GITHUB, etc. Take maintainership, as apache@ doesn't need/want it. Added: head/net/luasocket/files/patch-fnames (contents, props changed) Deleted: head/net/luasocket/files/patch-config head/net/luasocket/files/patch-src_buffer_c Modified: head/net/luasocket/Makefile head/net/luasocket/distinfo head/net/luasocket/pkg-descr head/net/luasocket/pkg-plist Modified: head/net/luasocket/Makefile ============================================================================== --- head/net/luasocket/Makefile Tue Feb 11 20:02:25 2014 (r343808) +++ head/net/luasocket/Makefile Tue Feb 11 20:04:43 2014 (r343809) @@ -2,36 +2,40 @@ # $FreeBSD$ PORTNAME= luasocket -PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTVERSION= 3.0r1 CATEGORIES= net -MASTER_SITES= http://luaforge.net/frs/download.php/2664/ PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} -MAINTAINER= apache@FreeBSD.org -COMMENT= IPv4 Sockets support for the Lua language +MAINTAINER= lx@FreeBSD.org +COMMENT= IPv4 and IPv6 socket support for the Lua language + +LICENSE= MIT + +USE_GITHUB= yes +GH_ACCOUNT= diegonehab +GH_PROJECT= ${PORTNAME} +GH_TAGNAME= v3.0-rc1 +GH_COMMIT= 22cd583 USE_GMAKE= yes USE_LUA?= 5.1 LUA_COMPS= lua -.if ${USE_LUA} == 5.0 -LUA_COMPS+= compat51 - -BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/lua50-compat51:build -COMPAT_SRC= `(cd ${PORTSDIR}/devel/lua50-compat51 && ${MAKE} -V WRKSRC)` -MAKE_ENV= COMPATDIR="${COMPAT_SRC}" \ - COMPAT_OBJ="${COMPAT_SRC}/compat-5.1.o" -.endif +CFLAGS+= `pkgconf --cflags lua-${LUA_VER}` -I${LUA_INCDIR} +LDFLAGS+= -shared -L${LOCALBASE}/lib -L${LUA_LIBDIR} -NO_STAGE= yes post-extract: @${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile + @${MV} ${WRKSRC}/src/makefile ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} -e 's/gcc/${CC}/g' ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} -e 's/CFLAGS=/CFLAGS\+=/g' ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} -e 's/LDFLAGS=/LDFLAGS\+=/g' ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} -e 's/prefix/PREFIX/g' ${WRKSRC}/src/Makefile post-install: .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} + @${MKDIR} ${STAGEDIR}/${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}/${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/net/luasocket/distinfo ============================================================================== --- head/net/luasocket/distinfo Tue Feb 11 20:02:25 2014 (r343808) +++ head/net/luasocket/distinfo Tue Feb 11 20:04:43 2014 (r343809) @@ -1,2 +1,2 @@ -SHA256 (luasocket-2.0.2.tar.gz) = 4fd9c775cfd98841299851e29b30176caf289370fea1ff1e00bb67c2d6842ca6 -SIZE (luasocket-2.0.2.tar.gz) = 115443 +SHA256 (luasocket-3.0r1.tar.gz) = 4eeac3e526069dd8fec625364b7a0c83f80de776d53f58d7bbc73d190a5b2d07 +SIZE (luasocket-3.0r1.tar.gz) = 328632 Added: head/net/luasocket/files/patch-fnames ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/luasocket/files/patch-fnames Tue Feb 11 20:04:43 2014 (r343809) @@ -0,0 +1,283 @@ +--- src/buffer.c.orig 2014-02-11 11:38:27.000000000 -0800 ++++ src/buffer.c 2014-02-11 11:42:32.000000000 -0800 +@@ -31,7 +31,7 @@ + /*-------------------------------------------------------------------------*\ + * Initializes module + \*-------------------------------------------------------------------------*/ +-int buffer_open(lua_State *L) { ++int ls_buffer_open(lua_State *L) { + (void) L; + return 0; + } +@@ -39,7 +39,7 @@ + /*-------------------------------------------------------------------------*\ + * Initializes C structure + \*-------------------------------------------------------------------------*/ +-void buffer_init(p_buffer buf, p_io io, p_timeout tm) { ++void ls_buffer_init(p_buffer buf, p_io io, p_timeout tm) { + buf->first = buf->last = 0; + buf->io = io; + buf->tm = tm; +@@ -50,7 +50,7 @@ + /*-------------------------------------------------------------------------*\ + * object:getstats() interface + \*-------------------------------------------------------------------------*/ +-int buffer_meth_getstats(lua_State *L, p_buffer buf) { ++int ls_buffer_meth_getstats(lua_State *L, p_buffer buf) { + lua_pushnumber(L, (lua_Number) buf->received); + lua_pushnumber(L, (lua_Number) buf->sent); + lua_pushnumber(L, timeout_gettime() - buf->birthday); +@@ -60,7 +60,7 @@ + /*-------------------------------------------------------------------------*\ + * object:setstats() interface + \*-------------------------------------------------------------------------*/ +-int buffer_meth_setstats(lua_State *L, p_buffer buf) { ++int ls_buffer_meth_setstats(lua_State *L, p_buffer buf) { + buf->received = (long) luaL_optnumber(L, 2, (lua_Number) buf->received); + buf->sent = (long) luaL_optnumber(L, 3, (lua_Number) buf->sent); + if (lua_isnumber(L, 4)) buf->birthday = timeout_gettime() - lua_tonumber(L, 4); +@@ -71,7 +71,7 @@ + /*-------------------------------------------------------------------------*\ + * object:send() interface + \*-------------------------------------------------------------------------*/ +-int buffer_meth_send(lua_State *L, p_buffer buf) { ++int ls_buffer_meth_send(lua_State *L, p_buffer buf) { + int top = lua_gettop(L); + int err = IO_DONE; + size_t size = 0, sent = 0; +@@ -106,7 +106,7 @@ + /*-------------------------------------------------------------------------*\ + * object:receive() interface + \*-------------------------------------------------------------------------*/ +-int buffer_meth_receive(lua_State *L, p_buffer buf) { ++int ls_buffer_meth_receive(lua_State *L, p_buffer buf) { + int err = IO_DONE, top = lua_gettop(L); + luaL_Buffer b; + size_t size; +@@ -157,7 +157,7 @@ + /*-------------------------------------------------------------------------*\ + * Determines if there is any data in the read buffer + \*-------------------------------------------------------------------------*/ +-int buffer_isempty(p_buffer buf) { ++int ls_buffer_isempty(p_buffer buf) { + return buf->first >= buf->last; + } + +@@ -252,7 +252,7 @@ + static void buffer_skip(p_buffer buf, size_t count) { + buf->received += count; + buf->first += count; +- if (buffer_isempty(buf)) ++ if (ls_buffer_isempty(buf)) + buf->first = buf->last = 0; + } + +@@ -264,7 +264,7 @@ + int err = IO_DONE; + p_io io = buf->io; + p_timeout tm = buf->tm; +- if (buffer_isempty(buf)) { ++ if (ls_buffer_isempty(buf)) { + size_t got; + err = io->recv(io->ctx, buf->data, BUF_SIZE, &got, tm); + buf->first = 0; +--- src/buffer.h.orig 2014-02-11 11:43:12.000000000 -0800 ++++ src/buffer.h 2014-02-11 11:43:46.000000000 -0800 +@@ -34,12 +34,12 @@ + } t_buffer; + typedef t_buffer *p_buffer; + +-int buffer_open(lua_State *L); +-void buffer_init(p_buffer buf, p_io io, p_timeout tm); +-int buffer_meth_send(lua_State *L, p_buffer buf); +-int buffer_meth_receive(lua_State *L, p_buffer buf); +-int buffer_meth_getstats(lua_State *L, p_buffer buf); +-int buffer_meth_setstats(lua_State *L, p_buffer buf); +-int buffer_isempty(p_buffer buf); ++int ls_buffer_open(lua_State *L); ++void ls_buffer_init(p_buffer buf, p_io io, p_timeout tm); ++int ls_buffer_meth_send(lua_State *L, p_buffer buf); ++int ls_buffer_meth_receive(lua_State *L, p_buffer buf); ++int ls_buffer_meth_getstats(lua_State *L, p_buffer buf); ++int ls_buffer_meth_setstats(lua_State *L, p_buffer buf); ++int ls_buffer_isempty(p_buffer buf); + + #endif /* BUF_H */ +--- src/luasocket.c.orig 2014-02-11 11:44:11.000000000 -0800 ++++ src/luasocket.c 2014-02-11 11:44:37.000000000 -0800 +@@ -46,7 +46,7 @@ + {"auxiliar", auxiliar_open}, + {"except", except_open}, + {"timeout", timeout_open}, +- {"buffer", buffer_open}, ++ {"buffer", ls_buffer_open}, + {"inet", inet_open}, + {"tcp", tcp_open}, + {"udp", udp_open}, +--- src/tcp.c.orig 2014-02-11 11:45:12.000000000 -0800 ++++ src/tcp.c 2014-02-11 11:46:27.000000000 -0800 +@@ -124,22 +124,22 @@ + \*-------------------------------------------------------------------------*/ + static int meth_send(lua_State *L) { + p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1); +- return buffer_meth_send(L, &tcp->buf); ++ return ls_buffer_meth_send(L, &tcp->buf); + } + + static int meth_receive(lua_State *L) { + p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1); +- return buffer_meth_receive(L, &tcp->buf); ++ return ls_buffer_meth_receive(L, &tcp->buf); + } + + static int meth_getstats(lua_State *L) { + p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1); +- return buffer_meth_getstats(L, &tcp->buf); ++ return ls_buffer_meth_getstats(L, &tcp->buf); + } + + static int meth_setstats(lua_State *L) { + p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1); +- return buffer_meth_setstats(L, &tcp->buf); ++ return ls_buffer_meth_setstats(L, &tcp->buf); + } + + /*-------------------------------------------------------------------------*\ +@@ -178,7 +178,7 @@ + static int meth_dirty(lua_State *L) + { + p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1); +- lua_pushboolean(L, !buffer_isempty(&tcp->buf)); ++ lua_pushboolean(L, !ls_buffer_isempty(&tcp->buf)); + return 1; + } + +@@ -203,7 +203,7 @@ + io_init(&clnt->io, (p_send) socket_send, (p_recv) socket_recv, + (p_error) socket_ioerror, &clnt->sock); + timeout_init(&clnt->tm, -1, -1); +- buffer_init(&clnt->buf, &clnt->io, &clnt->tm); ++ ls_buffer_init(&clnt->buf, &clnt->io, &clnt->tm); + clnt->family = server->family; + return 1; + } else { +@@ -375,7 +375,7 @@ + io_init(&tcp->io, (p_send) socket_send, (p_recv) socket_recv, + (p_error) socket_ioerror, &tcp->sock); + timeout_init(&tcp->tm, -1, -1); +- buffer_init(&tcp->buf, &tcp->io, &tcp->tm); ++ ls_buffer_init(&tcp->buf, &tcp->io, &tcp->tm); + tcp->family = family; + return 1; + } else { +@@ -454,7 +454,7 @@ + io_init(&tcp->io, (p_send) socket_send, (p_recv) socket_recv, + (p_error) socket_ioerror, &tcp->sock); + timeout_init(&tcp->tm, -1, -1); +- buffer_init(&tcp->buf, &tcp->io, &tcp->tm); ++ ls_buffer_init(&tcp->buf, &tcp->io, &tcp->tm); + tcp->sock = SOCKET_INVALID; + tcp->family = PF_UNSPEC; + /* allow user to pick local address and port */ +--- src/unix.c.orig 2014-02-11 11:46:51.000000000 -0800 ++++ src/unix.c 2014-02-11 11:47:38.000000000 -0800 +@@ -109,22 +109,22 @@ + \*-------------------------------------------------------------------------*/ + static int meth_send(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "unix{client}", 1); +- return buffer_meth_send(L, &un->buf); ++ return ls_buffer_meth_send(L, &un->buf); + } + + static int meth_receive(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "unix{client}", 1); +- return buffer_meth_receive(L, &un->buf); ++ return ls_buffer_meth_receive(L, &un->buf); + } + + static int meth_getstats(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "unix{client}", 1); +- return buffer_meth_getstats(L, &un->buf); ++ return ls_buffer_meth_getstats(L, &un->buf); + } + + static int meth_setstats(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "unix{client}", 1); +- return buffer_meth_setstats(L, &un->buf); ++ return ls_buffer_meth_setstats(L, &un->buf); + } + + /*-------------------------------------------------------------------------*\ +@@ -153,7 +153,7 @@ + + static int meth_dirty(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkgroup(L, "unix{any}", 1); +- lua_pushboolean(L, !buffer_isempty(&un->buf)); ++ lua_pushboolean(L, !ls_buffer_isempty(&un->buf)); + return 1; + } + +@@ -176,7 +176,7 @@ + io_init(&clnt->io, (p_send)socket_send, (p_recv)socket_recv, + (p_error) socket_ioerror, &clnt->sock); + timeout_init(&clnt->tm, -1, -1); +- buffer_init(&clnt->buf, &clnt->io, &clnt->tm); ++ ls_buffer_init(&clnt->buf, &clnt->io, &clnt->tm); + return 1; + } else { + lua_pushnil(L); +@@ -336,7 +336,7 @@ + io_init(&un->io, (p_send) socket_send, (p_recv) socket_recv, + (p_error) socket_ioerror, &un->sock); + timeout_init(&un->tm, -1, -1); +- buffer_init(&un->buf, &un->io, &un->tm); ++ ls_buffer_init(&un->buf, &un->io, &un->tm); + return 1; + } else { + lua_pushnil(L); +--- src/serial.c.orig 2014-02-11 11:53:16.000000000 -0800 ++++ src/serial.c 2014-02-11 11:54:45.000000000 -0800 +@@ -90,22 +90,22 @@ + \*-------------------------------------------------------------------------*/ + static int meth_send(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "serial{client}", 1); +- return buffer_meth_send(L, &un->buf); ++ return ls_buffer_meth_send(L, &un->buf); + } + + static int meth_receive(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "serial{client}", 1); +- return buffer_meth_receive(L, &un->buf); ++ return ls_buffer_meth_receive(L, &un->buf); + } + + static int meth_getstats(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "serial{client}", 1); +- return buffer_meth_getstats(L, &un->buf); ++ return ls_buffer_meth_getstats(L, &un->buf); + } + + static int meth_setstats(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkclass(L, "serial{client}", 1); +- return buffer_meth_setstats(L, &un->buf); ++ return ls_buffer_meth_setstats(L, &un->buf); + } + + /*-------------------------------------------------------------------------*\ +@@ -126,7 +126,7 @@ + + static int meth_dirty(lua_State *L) { + p_unix un = (p_unix) auxiliar_checkgroup(L, "serial{any}", 1); +- lua_pushboolean(L, !buffer_isempty(&un->buf)); ++ lua_pushboolean(L, !ls_buffer_isempty(&un->buf)); + return 1; + } + +@@ -183,6 +183,6 @@ + io_init(&un->io, (p_send) socket_write, (p_recv) socket_read, + (p_error) socket_ioerror, &un->sock); + timeout_init(&un->tm, -1, -1); +- buffer_init(&un->buf, &un->io, &un->tm); ++ ls_buffer_init(&un->buf, &un->io, &un->tm); + return 1; + } Modified: head/net/luasocket/pkg-descr ============================================================================== --- head/net/luasocket/pkg-descr Tue Feb 11 20:02:25 2014 (r343808) +++ head/net/luasocket/pkg-descr Tue Feb 11 20:04:43 2014 (r343809) @@ -4,6 +4,4 @@ transport layers. Extra Lua modules implementing SMTP, HTTP and FTP protocols are installed to /usr/local/lib/lua/luasocket. -Note that this port requires Lua v4 and does not compile with Lua v5. - -WWW: http://www.cs.princeton.edu/~diego/professional/luasocket/ +WWW: https://github.com/diegonehab/luasocket Modified: head/net/luasocket/pkg-plist ============================================================================== --- head/net/luasocket/pkg-plist Tue Feb 11 20:02:25 2014 (r343808) +++ head/net/luasocket/pkg-plist Tue Feb 11 20:04:43 2014 (r343809) @@ -1,13 +1,14 @@ +%%LUA_MODLIBDIR%%/mime/core.so +%%LUA_MODLIBDIR%%/socket/core.so +%%LUA_MODSHAREDIR%%/ltn12.lua %%LUA_MODSHAREDIR%%/mime.lua %%LUA_MODSHAREDIR%%/socket.lua -%%LUA_MODSHAREDIR%%/ltn12.lua -%%LUA_MODSHAREDIR%%/socket/smtp.lua %%LUA_MODSHAREDIR%%/socket/ftp.lua +%%LUA_MODSHAREDIR%%/socket/headers.lua +%%LUA_MODSHAREDIR%%/socket/http.lua +%%LUA_MODSHAREDIR%%/socket/smtp.lua %%LUA_MODSHAREDIR%%/socket/tp.lua %%LUA_MODSHAREDIR%%/socket/url.lua -%%LUA_MODSHAREDIR%%/socket/http.lua -%%LUA_MODLIBDIR%%/socket/core.so -%%LUA_MODLIBDIR%%/mime/core.so %%PORTDOCS%%%%DOCSDIR%%/dns.html %%PORTDOCS%%%%DOCSDIR%%/ftp.html %%PORTDOCS%%%%DOCSDIR%%/http.html @@ -15,6 +16,7 @@ %%PORTDOCS%%%%DOCSDIR%%/installation.html %%PORTDOCS%%%%DOCSDIR%%/introduction.html %%PORTDOCS%%%%DOCSDIR%%/ltn12.html +%%PORTDOCS%%%%DOCSDIR%%/lua05.ppt %%PORTDOCS%%%%DOCSDIR%%/luasocket.png %%PORTDOCS%%%%DOCSDIR%%/mime.html %%PORTDOCS%%%%DOCSDIR%%/reference.css @@ -25,6 +27,6 @@ %%PORTDOCS%%%%DOCSDIR%%/udp.html %%PORTDOCS%%%%DOCSDIR%%/url.html %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%LUA_MODSHAREDIR%%/socket -@dirrm %%LUA_MODLIBDIR%%/socket @dirrm %%LUA_MODLIBDIR%%/mime +@dirrm %%LUA_MODLIBDIR%%/socket +@dirrm %%LUA_MODSHAREDIR%%/socket
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402112004.s1BK4hNb061561>