Tested on i386, macppc and sparc64. -p.
Index: Makefile =================================================================== RCS file: /cvs/ports/net/luasocket/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 10 Sep 2005 17:32:15 -0000 1.3 +++ Makefile 24 Nov 2005 17:35:38 -0000 @@ -3,11 +3,10 @@ NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} COMMENT= "network support for the lua language" -DISTNAME= luasocket-2.0-beta3 -PKGNAME= ${DISTNAME:S/0-b/0b/}p0 +DISTNAME= luasocket-2.0 CATEGORIES= net -MASTER_SITES= ${HOMEPAGE} +MASTER_SITES= http://luaforge.net/frs/download.php/1095/ HOMEPAGE= http://www.cs.princeton.edu/~diego/professional/luasocket/ MAINTAINER= Pedro Martelletto <[EMAIL PROTECTED]> @@ -24,30 +23,33 @@ RUN_DEPENDS= ${BUILD_DEPENDS} LIB_DEPENDS= luacompat::devel/luacompat -MAKE_FILE= makefile.Linux # heh, yeah, linux, sure... +MAKE_FILE= makefile post-extract: @sed -e "s:@socketpath@:${PREFIX}/lua/luasocket/?.lua:g" \ - -e "s:@socketcpath@:${PREFIX}/lib/?.so:g" \ + -e "s:@socketcpath@:${PREFIX}/lua/luasocket/?.so:g" \ ${FILESDIR}/init.lua > ${WRKSRC}/init.lua +LUASOCKETDIR= ${PREFIX}/lua/luasocket + do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lua/luasocket - ${INSTALL_DATA_DIR} ${PREFIX}/lua/luasocket/socket + ${INSTALL_DATA_DIR} ${LUASOCKETDIR} + ${INSTALL_DATA_DIR} ${LUASOCKETDIR}/socket + ${INSTALL_DATA_DIR} ${LUASOCKETDIR}/mime ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/luasocket ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/luasocket - ${INSTALL_DATA} ${WRKSRC}/luasocket*.so.*.* ${PREFIX}/lib/luasocket.so - ${INSTALL_DATA} ${WRKSRC}/luamime*.so* ${PREFIX}/lib/luamime.so - ${INSTALL_DATA} ${WRKSRC}/init.lua ${PREFIX}/lua/luasocket - ${INSTALL_DATA} ${WRKSRC}/lua/socket.lua ${PREFIX}/lua/luasocket - ${INSTALL_DATA} ${WRKSRC}/lua/ltn12.lua ${PREFIX}/lua/luasocket - ${INSTALL_DATA} ${WRKSRC}/lua/mime.lua ${PREFIX}/lua/luasocket - ${INSTALL_DATA} ${WRKSRC}/lua/ftp.lua ${PREFIX}/lua/luasocket/socket - ${INSTALL_DATA} ${WRKSRC}/lua/http.lua ${PREFIX}/lua/luasocket/socket - ${INSTALL_DATA} ${WRKSRC}/lua/smtp.lua ${PREFIX}/lua/luasocket/socket - ${INSTALL_DATA} ${WRKSRC}/lua/tp.lua ${PREFIX}/lua/luasocket/socket - ${INSTALL_DATA} ${WRKSRC}/lua/url.lua ${PREFIX}/lua/luasocket/socket - ${INSTALL_DATA} ${WRKSRC}/manual/* ${PREFIX}/share/doc/luasocket - ${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/luasocket + ${INSTALL_DATA} ${WRKSRC}/src/socket.so ${LUASOCKETDIR}/socket/core.so + ${INSTALL_DATA} ${WRKSRC}/src/mime.so ${LUASOCKETDIR}/mime/core.so + ${INSTALL_DATA} ${WRKSRC}/init.lua ${LUASOCKETDIR} + ${INSTALL_DATA} ${WRKSRC}/src/socket.lua ${LUASOCKETDIR} + ${INSTALL_DATA} ${WRKSRC}/src/ltn12.lua ${LUASOCKETDIR} + ${INSTALL_DATA} ${WRKSRC}/src/mime.lua ${LUASOCKETDIR} + ${INSTALL_DATA} ${WRKSRC}/src/ftp.lua ${LUASOCKETDIR}/socket + ${INSTALL_DATA} ${WRKSRC}/src/http.lua ${LUASOCKETDIR}/socket + ${INSTALL_DATA} ${WRKSRC}/src/smtp.lua ${LUASOCKETDIR}/socket + ${INSTALL_DATA} ${WRKSRC}/src/tp.lua ${LUASOCKETDIR}/socket + ${INSTALL_DATA} ${WRKSRC}/src/url.lua ${LUASOCKETDIR}/socket + ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/luasocket + ${INSTALL_DATA} ${WRKSRC}/samples/* ${PREFIX}/share/examples/luasocket .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/luasocket/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 19 Apr 2005 15:14:38 -0000 1.3 +++ distinfo 24 Nov 2005 17:35:38 -0000 @@ -1,4 +1,4 @@ -MD5 (luasocket-2.0-beta3.tar.gz) = ba32118746205cb088ce7fed06d8d1b7 -RMD160 (luasocket-2.0-beta3.tar.gz) = 49deb7b7050f831717b7e34852cf044745f0e62a -SHA1 (luasocket-2.0-beta3.tar.gz) = e49638ea4dee174dba26af58d9bb37b93a12bd14 -SIZE (luasocket-2.0-beta3.tar.gz) = 115472 +MD5 (luasocket-2.0.tar.gz) = 8416fed2eb2fc223439d7f8ffd90eb85 +RMD160 (luasocket-2.0.tar.gz) = abede8f3618130781567157bcd6b42f69d180dde +SHA1 (luasocket-2.0.tar.gz) = ffef5b9faf9f802101d3121a60c77f912deb38aa +SIZE (luasocket-2.0.tar.gz) = 118540 Index: patches/patch-buffer_c =================================================================== RCS file: patches/patch-buffer_c diff -N patches/patch-buffer_c --- patches/patch-buffer_c 16 Dec 2004 13:38:12 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-buffer_c,v 1.1.1.1 2004/12/16 13:38:12 pedro Exp $ ---- buffer.c.orig Mon Jul 26 17:17:35 2004 -+++ buffer.c Tue Aug 10 21:11:45 2004 -@@ -75,7 +75,9 @@ int buf_meth_setstats(lua_State *L, p_bu - \*-------------------------------------------------------------------------*/ - int buf_meth_send(lua_State *L, p_buf buf) { - int top = lua_gettop(L); -+#ifdef LUASOCKET_DEBUG - p_tm tm = tm_markstart(buf->tm); -+#endif - int err = IO_DONE; - size_t size, sent; - const char *data = luaL_checklstring(L, 2, &size); -@@ -108,7 +110,9 @@ int buf_meth_send(lua_State *L, p_buf bu - \*-------------------------------------------------------------------------*/ - int buf_meth_receive(lua_State *L, p_buf buf) { - int err = IO_DONE, top = lua_gettop(L); -+#ifdef LUASOCKET_DEBUG - p_tm tm = tm_markstart(buf->tm); -+#endif - luaL_Buffer b; - size_t size; - const char *part = luaL_optlstring(L, 3, "", &size); Index: patches/patch-config =================================================================== RCS file: patches/patch-config diff -N patches/patch-config --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-config 24 Nov 2005 17:35:38 -0000 @@ -0,0 +1,64 @@ +$OpenBSD$ +--- config.orig Tue Nov 22 19:19:38 2005 ++++ config Thu Nov 24 15:08:17 2005 +@@ -6,22 +6,22 @@ + # Output file names + # + EXT=so +-SOCKET_V=2.0.0 +-MIME_V=1.0.0 +-SOCKET_SO=socket.$(EXT).$(SOCKET_V) +-MIME_SO=mime.$(EXT).$(MIME_V) ++SOCKET_V=2.0 ++MIME_V=1.0 ++SOCKET_SO= socket.so ++MIME_SO= mime.so + UNIX_SO=unix.$(EXT) + + #------ + # Lua includes and libraries + # +-LUAINC=-Ilua-5.0.2/include +-LUALIB=-Llua-5.0.2/lib ++LUAINC= -I$(LOCALBASE)/include ++LUALIB= -L$(LOCALBASE)/lib + + #------ + # Compat-5.1 directory + # +-COMPAT=compat-5.1r4 ++#COMPAT=compat-5.1r4 + + #------ + # Top of your Lua installation +@@ -37,20 +37,19 @@ INSTALL_EXEC=cp + # 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) -I$(COMPAT) $(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) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fpic +-#LDFLAGS=-O -shared +-#LD=gcc ++# for Unix ++CC=cc ++CFLAGS+= $(LUAINC) -fPIC -DPIC ++LDFLAGS+= -O -shared $(LUALIB) -lluacompat -llualib -llua -lm ++LD=cc + + #------ + # End of makefile configuration Index: patches/patch-lua_mime_lua =================================================================== RCS file: patches/patch-lua_mime_lua diff -N patches/patch-lua_mime_lua --- patches/patch-lua_mime_lua 19 Apr 2005 15:14:38 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-lua_mime_lua,v 1.1 2005/04/19 15:14:38 pedro Exp $ ---- lua/mime.lua.orig Sat Apr 16 18:09:59 2005 -+++ lua/mime.lua Sat Apr 16 18:10:05 2005 -@@ -10,7 +10,7 @@ - ----------------------------------------------------------------------------- - local base = require("base") - local ltn12 = require("ltn12") --local mime = require("lmime") -+local mime = require("luamime") - module("mime") - - -- encode, decode and wrap algorithm tables Index: patches/patch-lua_socket_lua =================================================================== RCS file: patches/patch-lua_socket_lua diff -N patches/patch-lua_socket_lua --- patches/patch-lua_socket_lua 19 Apr 2005 15:14:38 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-lua_socket_lua,v 1.1 2005/04/19 15:14:38 pedro Exp $ ---- lua/socket.lua.orig Sat Apr 16 17:37:22 2005 -+++ lua/socket.lua Sat Apr 16 17:37:31 2005 -@@ -10,7 +10,7 @@ - local base = require("base") - local string = require("string") - local math = require("math") --local socket = require("lsocket") -+local socket = require("luasocket") - module("socket") - - ----------------------------------------------------------------------------- Index: patches/patch-luasocket_c =================================================================== RCS file: patches/patch-luasocket_c diff -N patches/patch-luasocket_c --- patches/patch-luasocket_c 19 Apr 2005 15:14:38 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-luasocket_c,v 1.1 2005/04/19 15:14:38 pedro Exp $ ---- luasocket.c.orig Sat Jan 15 20:52:38 2005 -+++ luasocket.c Sat Apr 16 17:40:26 2005 -@@ -19,7 +19,7 @@ - \*=========================================================================*/ - #include <lua.h> - #include <lauxlib.h> --#include "compat-5.1.h" -+#include <luacompat.h> - #include "luasocket.h" - - /*=========================================================================*\ -@@ -108,7 +108,7 @@ static int base_open(lua_State *L) { - /*-------------------------------------------------------------------------*\ - * Initializes all library modules. - \*-------------------------------------------------------------------------*/ --LUASOCKET_API int luaopen_lsocket(lua_State *L) { -+LUASOCKET_API int luaopen_luasocket(lua_State *L) { - int i; - base_open(L); - for (i = 0; mod[i].name; i++) mod[i].func(L); Index: patches/patch-mime_c =================================================================== RCS file: patches/patch-mime_c diff -N patches/patch-mime_c --- patches/patch-mime_c 19 Apr 2005 15:14:38 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-mime_c,v 1.1 2005/04/19 15:14:38 pedro Exp $ ---- mime.c.orig Sat Jan 15 20:52:38 2005 -+++ mime.c Sat Apr 16 18:06:59 2005 -@@ -8,8 +8,7 @@ - - #include <lua.h> - #include <lauxlib.h> -- --#include "compat-5.1.h" -+#include <luacompat.h> - #include "mime.h" - - /*=========================================================================*\ -@@ -78,7 +77,7 @@ static UC b64unbase[256]; - /*-------------------------------------------------------------------------*\ - * Initializes module - \*-------------------------------------------------------------------------*/ --MIME_API int luaopen_lmime(lua_State *L) -+MIME_API int luaopen_luamime(lua_State *L) - { - luaL_module(L, "mime", func, 0); - /* initialize lookup tables */ Index: patches/patch-makefile_Linux =================================================================== RCS file: patches/patch-makefile_Linux diff -N patches/patch-makefile_Linux --- patches/patch-makefile_Linux 19 Apr 2005 15:14:38 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,55 +0,0 @@ -$OpenBSD: patch-makefile_Linux,v 1.3 2005/04/19 15:14:38 pedro Exp $ ---- makefile.Linux.orig Sat Jan 15 20:52:38 2005 -+++ makefile.Linux Sat Apr 16 17:23:40 2005 -@@ -5,42 +5,26 @@ COMPAT=compat-5.1r2 - - LUAC=luac - BIN2C=bin2c --CC=gcc --OPT=-O2 $(INC) --DEF = -DLUASOCKET_DEBUG #-Dsocklen_t=int - --LOBJS= \ -- luasocket.o \ -- timeout.o \ -- buffer.o \ -- io.o \ -- auxiliar.o \ -- except.o \ -- select.o \ -- options.o \ -- inet.o \ -- tcp.o \ -- udp.o \ -- usocket.o \ -- $(COMPAT)/compat-5.1.o -+LOBJS= luasocket.o timeout.o buffer.o io.o auxiliar.o except.o select.o\ -+ options.o inet.o tcp.o udp.o usocket.o - --MOBJS= \ -- mime.o \ -- $(COMPAT)/compat-5.1.o -+MOBJS= mime.o - --CFLAGS=-I../../include -I$(COMPAT) $(PROF) $(OPT) $(DBG) $(DEF) -pedantic -W -Wall -+CFLAGS+= -I$(LOCALBASE)/include -fPIC -DPIC -+LDFLAGS+= -L$(LOCALBASE)/lib -lluacompat - --LDYN=lsocket.so -+LDYN=luasocket.so.$(LV) - --MDYN=lmime.so -+MDYN=luamime.so.$(LV) - - all: $(LDYN) $(MDYN) - - $(LDYN): $(LOBJS) -- gcc -shared -o $(LDYN) $(LOBJS) -+ $(CC) -shared $(LDFLAGS) -fPIC -o $(LDYN) $(LOBJS) - - $(MDYN): $(MOBJS) -- gcc -shared -o $(MDYN) $(MOBJS) -+ $(CC) -shared $(LDFLAGS) -fPIC -o $(MDYN) $(MOBJS) - - auxiliar.o: auxiliar.c auxiliar.h - buffer.o: buffer.c buffer.h io.h timeout.h Index: patches/patch-src_buffer_c =================================================================== RCS file: patches/patch-src_buffer_c diff -N patches/patch-src_buffer_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_buffer_c 24 Nov 2005 17:35:38 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ +--- src/buffer.c.orig Tue Nov 22 19:19:38 2005 ++++ src/buffer.c Wed Nov 23 21:50:51 2005 +@@ -75,7 +75,9 @@ int buffer_meth_setstats(lua_State *L, p + \*-------------------------------------------------------------------------*/ + int buffer_meth_send(lua_State *L, p_buffer buf) { + int top = lua_gettop(L); ++#ifdef LUASOCKET_DEBUG + p_timeout tm = timeout_markstart(buf->tm); ++#endif + int err = IO_DONE; + size_t size = 0, sent = 0; + const char *data = luaL_checklstring(L, 2, &size); +@@ -108,7 +110,9 @@ int buffer_meth_send(lua_State *L, p_buf + \*-------------------------------------------------------------------------*/ + int buffer_meth_receive(lua_State *L, p_buffer buf) { + int err = IO_DONE, top = lua_gettop(L); ++#ifdef LUASOCKET_DEBUG + p_timeout tm = timeout_markstart(buf->tm); ++#endif + luaL_Buffer b; + size_t size; + const char *part = luaL_optlstring(L, 3, "", &size); Index: patches/patch-src_luasocket_c =================================================================== RCS file: patches/patch-src_luasocket_c diff -N patches/patch-src_luasocket_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_luasocket_c 24 Nov 2005 17:35:38 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/luasocket.c.orig Wed Nov 23 21:41:03 2005 ++++ src/luasocket.c Wed Nov 23 21:41:40 2005 +@@ -21,7 +21,7 @@ + #include "lauxlib.h" + + #if !defined(LUA_VERSION_NUM) || (LUA_VERSION_NUM < 501) +-#include "compat-5.1.h" ++#include <luacompat.h> + #endif + + /*=========================================================================*\ Index: patches/patch-src_makefile =================================================================== RCS file: patches/patch-src_makefile diff -N patches/patch-src_makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_makefile 24 Nov 2005 17:35:38 -0000 @@ -0,0 +1,51 @@ +$OpenBSD$ +--- src/makefile.orig Tue Nov 22 19:19:38 2005 ++++ src/makefile Wed Nov 23 21:53:20 2005 +@@ -10,27 +10,13 @@ include ../config + #------ + # Modules belonging to socket-core + # +-SOCKET_OBJS:= \ +- $(COMPAT)/compat-5.1.o \ +- luasocket.o \ +- timeout.o \ +- buffer.o \ +- io.o \ +- auxiliar.o \ +- options.o \ +- inet.o \ +- tcp.o \ +- udp.o \ +- except.o \ +- select.o \ +- usocket.o ++SOCKET_OBJS:= luasocket.o timeout.o buffer.o io.o auxiliar.o options.o inet.o\ ++ tcp.o udp.o except.o select.o usocket.o + + #------ + # Modules belonging mime-core + # +-MIME_OBJS:=\ +- $(COMPAT)/compat-5.1.o \ +- mime.o ++MIME_OBJS:= mime.o + + + #------ +@@ -48,13 +34,13 @@ UNIX_OBJS:=\ + all: $(SOCKET_SO) $(MIME_SO) + + $(SOCKET_SO): $(SOCKET_OBJS) +- $(LD) $(LDFLAGS) -o $@ $^ ++ $(LD) $(LDFLAGS) $(SOCKET_OBJS) -o $@ + + $(MIME_SO): $(MIME_OBJS) +- $(LD) $(LDFLAGS) -o $@ $^ ++ $(LD) $(LDFLAGS) $(MIME_OBJS) -o $@ + + $(UNIX_SO): $(UNIX_OBJS) +- $(LD) $(LDFLAGS) -o $@ $^ ++ $(LD) $(LDFLAGS) $(UNIX_OBJS) -o $@ + + #------ + # List of dependencies Index: patches/patch-src_mime_c =================================================================== RCS file: patches/patch-src_mime_c diff -N patches/patch-src_mime_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_mime_c 24 Nov 2005 17:35:38 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/mime.c.orig Wed Nov 23 21:40:59 2005 ++++ src/mime.c Wed Nov 23 21:41:54 2005 +@@ -10,7 +10,7 @@ + #include "lauxlib.h" + + #if !defined(LUA_VERSION_NUM) || (LUA_VERSION_NUM < 501) +-#include "compat-5.1.h" ++#include <luacompat.h> + #endif + + #include "mime.h" Index: pkg/PFRAG.shared =================================================================== RCS file: /cvs/ports/net/luasocket/pkg/PFRAG.shared,v retrieving revision 1.2 diff -u -r1.2 PFRAG.shared --- pkg/PFRAG.shared 19 Apr 2005 15:14:38 -0000 1.2 +++ pkg/PFRAG.shared 24 Nov 2005 17:35:38 -0000 @@ -1,3 +1,3 @@ @comment $OpenBSD: PFRAG.shared,v 1.2 2005/04/19 15:14:38 pedro Exp $ -lib/luamime.so -lib/luasocket.so +lua/luasocket/mime/core.so +lua/luasocket/socket/core.so Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/luasocket/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- pkg/PLIST 19 Apr 2005 15:14:38 -0000 1.2 +++ pkg/PLIST 24 Nov 2005 17:35:38 -0000 @@ -1,9 +1,9 @@ @comment $OpenBSD: PLIST,v 1.2 2005/04/19 15:14:38 pedro Exp $ @unexec lua ${SYSCONFDIR}/lua/luapkg.lua del luasocket -lua/ lua/luasocket/ lua/luasocket/init.lua lua/luasocket/ltn12.lua +lua/luasocket/mime/ lua/luasocket/mime.lua lua/luasocket/socket/ lua/luasocket/socket.lua @@ -31,16 +31,12 @@ share/doc/luasocket/url.html share/examples/luasocket/ share/examples/luasocket/README -share/examples/luasocket/b64.lua share/examples/luasocket/cddb.lua -share/examples/luasocket/check-memory.lua share/examples/luasocket/daytimeclnt.lua share/examples/luasocket/echoclnt.lua share/examples/luasocket/echosrvr.lua -share/examples/luasocket/eol.lua share/examples/luasocket/listener.lua share/examples/luasocket/lpr.lua -share/examples/luasocket/qp.lua share/examples/luasocket/talker.lua share/examples/luasocket/tinyirc.lua @exec lua ${SYSCONFDIR}/lua/luapkg.lua add luasocket ${PREFIX}/lua/luasocket/init.lua