Requires Lua 5.1.
-p.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/luasocket/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 12 Apr 2006 18:41:36 -0000 1.8
+++ Makefile 21 May 2006 21:36:55 -0000
@@ -3,11 +3,10 @@
SHARED_ONLY= Yes
COMMENT= "network support for the lua language"
-DISTNAME= luasocket-2.0
-PKGNAME= ${DISTNAME}p2
+DISTNAME= luasocket-2.0.1
CATEGORIES= net
-MASTER_SITES= http://luaforge.net/frs/download.php/1097/
+MASTER_SITES= http://luaforge.net/frs/download.php/1589/
HOMEPAGE= http://www.cs.princeton.edu/~diego/professional/luasocket/
MAINTAINER= Pedro Martelletto <[EMAIL PROTECTED]>
@@ -22,35 +21,28 @@
WANTLIB= m
-LIB_DEPENDS= lua,lualib::lang/lua \
- luacompat::devel/luacompat
+BUILD_DEPENDS= :lua->=5.1:lang/lua
+RUN_DEPENDS= ${BUILD_DEPENDS}
MAKE_FILE= makefile
-
-post-extract:
- @sed -e "s:@socketpath@:${PREFIX}/lua/luasocket/?.lua:g" \
- -e "s:@socketcpath@:${PREFIX}/lua/luasocket/?.so:g" \
- ${FILESDIR}/init.lua > ${WRKSRC}/init.lua
-
-LUASOCKETDIR= ${PREFIX}/lua/luasocket
+SHAREDIR= ${PREFIX}/share/lua/5.1
+LIBDIR= ${PREFIX}/lib/lua/5.1
do-install:
- ${INSTALL_DATA_DIR} ${LUASOCKETDIR}
- ${INSTALL_DATA_DIR} ${LUASOCKETDIR}/socket
- ${INSTALL_DATA_DIR} ${LUASOCKETDIR}/mime
+ ${INSTALL_DATA_DIR} ${SHAREDIR}/socket ${SHAREDIR}/mime
+ ${INSTALL_DATA_DIR} ${LIBDIR}/socket ${LIBDIR}/mime
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/luasocket
${INSTALL_DATA_DIR} ${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}/src/socket.so ${LIBDIR}/socket/core.so
+ ${INSTALL_DATA} ${WRKSRC}/src/mime.so ${LIBDIR}/mime/core.so
+ ${INSTALL_DATA} ${WRKSRC}/src/socket.lua ${SHAREDIR}
+ ${INSTALL_DATA} ${WRKSRC}/src/ltn12.lua ${SHAREDIR}
+ ${INSTALL_DATA} ${WRKSRC}/src/mime.lua ${SHAREDIR}
+ ${INSTALL_DATA} ${WRKSRC}/src/ftp.lua ${SHAREDIR}/socket
+ ${INSTALL_DATA} ${WRKSRC}/src/http.lua ${SHAREDIR}/socket
+ ${INSTALL_DATA} ${WRKSRC}/src/smtp.lua ${SHAREDIR}/socket
+ ${INSTALL_DATA} ${WRKSRC}/src/tp.lua ${SHAREDIR}/socket
+ ${INSTALL_DATA} ${WRKSRC}/src/url.lua ${SHAREDIR}/socket
${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/luasocket
${INSTALL_DATA} ${WRKSRC}/samples/* ${PREFIX}/share/examples/luasocket
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/luasocket/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 26 Nov 2005 13:46:56 -0000 1.5
+++ distinfo 21 May 2006 21:36:55 -0000
@@ -1,4 +1,4 @@
-MD5 (luasocket-2.0.tar.gz) = 64bddf8bbab296d1c1da7f34f3c2b5b5
-RMD160 (luasocket-2.0.tar.gz) = 81da6ae36a4937ab39cb20e258aabc8c38e16dd8
-SHA1 (luasocket-2.0.tar.gz) = 064ac65773716e759518f2c9539a7ef7bb96409d
-SIZE (luasocket-2.0.tar.gz) = 120394
+MD5 (luasocket-2.0.1.tar.gz) = 9ca22fd9f9413b54802d3d40b38c4e5c
+RMD160 (luasocket-2.0.1.tar.gz) = d4f0d3edccbaf35a68b7f6598af3cec8b21037d1
+SHA1 (luasocket-2.0.1.tar.gz) = a7da573ce3acbd4b0d846627abd1df43dba72f3c
+SIZE (luasocket-2.0.1.tar.gz) = 117529
Index: files/init.lua
===================================================================
RCS file: files/init.lua
diff -N files/init.lua
--- files/init.lua 19 Apr 2005 15:14:38 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
--- $OpenBSD: init.lua,v 1.3 2005/04/19 15:14:38 pedro Exp $
--- luasocket's initialization steps
-lua_addpath("@socketpath@")
-lua_addcpath("@socketcpath@")
Index: patches/patch-config
===================================================================
RCS file: /cvs/ports/net/luasocket/patches/patch-config,v
retrieving revision 1.1
diff -u -r1.1 patch-config
--- patches/patch-config 25 Nov 2005 15:09:44 -0000 1.1
+++ patches/patch-config 21 May 2006 21:36:55 -0000
@@ -1,64 +1,48 @@
$OpenBSD: patch-config,v 1.1 2005/11/25 15:09:44 pedro Exp $
---- config.orig Tue Nov 22 19:19:38 2005
-+++ config Thu Nov 24 15:08:17 2005
+--- config.orig Thu Apr 27 00:23:21 2006
++++ config Sun May 21 17:43:13 2006
@@ -6,22 +6,22 @@
# Output file names
#
EXT=so
--SOCKET_V=2.0.0
--MIME_V=1.0.0
+-SOCKET_V=2.0.1
+-MIME_V=1.0.1
-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
++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
+-LUAINC=-I/usr/local/include/lua50
++LUAINC=-I$(LOCALBASE)/include
++LUALIB=-L$(LOCALBASE)/lib
+ #LUAINC=-I/usr/local/include/lua5.1
#------
# Compat-5.1 directory
#
--COMPAT=compat-5.1r4
-+#COMPAT=compat-5.1r4
+-COMPAT=compat-5.1r5
#------
# 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
-
+@@ -48,11 +48,10 @@ INSTALL_EXEC=cp
#------
# 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
+ # for Linux
+-CC=gcc
+-DEF=-DLUASOCKET_DEBUG
+-CFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fpic
+-LDFLAGS=-O -shared -fpic
+-LD=gcc
+CC=cc
+CFLAGS+= $(LUAINC) -fPIC -DPIC
-+LDFLAGS+= -O -shared $(LUALIB) -lluacompat -llualib -llua -lm
-+LD=cc
++LDFLAGS=-O -shared $(LUALIB) -llua -lm
++LD=cc
#------
# End of makefile configuration
Index: patches/patch-src_makefile
===================================================================
RCS file: /cvs/ports/net/luasocket/patches/patch-src_makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-src_makefile
--- patches/patch-src_makefile 25 Nov 2005 15:09:44 -0000 1.1
+++ patches/patch-src_makefile 21 May 2006 21:36:55 -0000
@@ -1,10 +1,10 @@
$OpenBSD: patch-src_makefile,v 1.1 2005/11/25 15:09:44 pedro Exp $
---- 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
- #------
+--- src/makefile.orig Thu Apr 27 00:23:21 2006
++++ src/makefile Sun May 21 17:45:13 2006
+@@ -11,27 +11,13 @@ include ../config
# Modules belonging to socket-core
#
+
-SOCKET_OBJS:= \
- $(COMPAT)/compat-5.1.o \
- luasocket.o \
@@ -19,8 +19,8 @@
- 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
++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
@@ -28,24 +28,7 @@
-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 $@
++MIME_OBJS:= mime.o
- $(UNIX_SO): $(UNIX_OBJS)
-- $(LD) $(LDFLAGS) -o $@ $^
-+ $(LD) $(LDFLAGS) $(UNIX_OBJS) -o $@
#------
- # List of dependencies
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/net/luasocket/pkg/PFRAG.shared,v
retrieving revision 1.3
diff -u -r1.3 PFRAG.shared
--- pkg/PFRAG.shared 25 Nov 2005 15:09:44 -0000 1.3
+++ pkg/PFRAG.shared 21 May 2006 21:36:55 -0000
@@ -1,3 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/11/25 15:09:44 pedro Exp $
-lua/luasocket/mime/core.so
-lua/luasocket/socket/core.so
+lib/lua/5.1/mime/
+lib/lua/5.1/mime/core.so
+lib/lua/5.1/socket/
+lib/lua/5.1/socket/core.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/luasocket/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 25 Nov 2005 15:09:44 -0000 1.3
+++ pkg/PLIST 21 May 2006 21:36:55 -0000
@@ -1,17 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2005/11/25 15:09:44 pedro Exp $
[EMAIL PROTECTED] lua ${SYSCONFDIR}/lua/luapkg.lua del luasocket
-lua/luasocket/
-lua/luasocket/init.lua
-lua/luasocket/ltn12.lua
-lua/luasocket/mime/
-lua/luasocket/mime.lua
-lua/luasocket/socket/
-lua/luasocket/socket.lua
-lua/luasocket/socket/ftp.lua
-lua/luasocket/socket/http.lua
-lua/luasocket/socket/smtp.lua
-lua/luasocket/socket/tp.lua
-lua/luasocket/socket/url.lua
share/doc/luasocket/
share/doc/luasocket/dns.html
share/doc/luasocket/ftp.html
@@ -39,5 +26,14 @@
share/examples/luasocket/lpr.lua
share/examples/luasocket/talker.lua
share/examples/luasocket/tinyirc.lua
[EMAIL PROTECTED] lua ${SYSCONFDIR}/lua/luapkg.lua add luasocket
${PREFIX}/lua/luasocket/init.lua
%%SHARED%%
+share/lua/5.1/ltn12.lua
+share/lua/5.1/mime/
+share/lua/5.1/mime.lua
+share/lua/5.1/socket/
+share/lua/5.1/socket.lua
+share/lua/5.1/socket/ftp.lua
+share/lua/5.1/socket/http.lua
+share/lua/5.1/socket/smtp.lua
+share/lua/5.1/socket/tp.lua
+share/lua/5.1/socket/url.lua
