Update to LuaSocket 2.0.1
This commit is contained in:
pedro
parent
c7e0ce2f43
commit
6bc6d05748
@ -1,13 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2006/07/30 04:42:52 pedro Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2006/09/23 18:05:31 pedro Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= "network support for the lua language"
|
||||
DISTNAME= luasocket-2.0
|
||||
PKGNAME= ${DISTNAME}p3
|
||||
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 <pedro@openbsd.org>
|
||||
@ -20,8 +19,6 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
WANTLIB= m
|
||||
|
||||
BUILD_DEPENDS= :lua->=5.1:lang/lua
|
||||
RUN_DEPENDS= ${BUILD_DEPENDS}
|
||||
|
||||
@ -35,6 +32,7 @@ do-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/luasocket
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/luasocket
|
||||
${INSTALL_DATA} ${WRKSRC}/src/socket.so ${LIBDIR}/socket/core.so
|
||||
${INSTALL_DATA} ${WRKSRC}/src/unix.so ${LIBDIR}/socket/unix.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}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,64 +1,49 @@
|
||||
$OpenBSD: patch-config,v 1.2 2006/07/30 04:42:52 pedro Exp $
|
||||
--- config.orig Thu Nov 24 18:29:38 2005
|
||||
+++ config Fri May 19 14:27:00 2006
|
||||
$OpenBSD: patch-config,v 1.3 2006/09/23 18:05:31 pedro Exp $
|
||||
--- config.orig Thu Apr 27 00:23:21 2006
|
||||
+++ config Sat Sep 23 14:14:27 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)
|
||||
-UNIX_SO=unix.$(EXT)
|
||||
+SOCKET_V=2.0
|
||||
+MIME_V=1.0
|
||||
+SOCKET_SO= socket.so
|
||||
+MIME_SO= mime.so
|
||||
UNIX_SO=unix.$(EXT)
|
||||
+UNIX_SO= unix.so
|
||||
|
||||
#------
|
||||
# Lua includes and libraries
|
||||
#
|
||||
-LUAINC=-Ilua-5.0.2/include
|
||||
-LUALIB=-Llua-5.0.2/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
|
||||
+#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,11 @@ 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
|
||||
+CC=cc
|
||||
DEF=-DLUASOCKET_DEBUG
|
||||
-CFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fpic
|
||||
-LDFLAGS=-O -shared -fpic
|
||||
-LD=gcc
|
||||
+CFLAGS+= $(LUAINC) -fPIC -DPIC
|
||||
+LDFLAGS+= -O -shared $(LUALIB) -llua -lm
|
||||
+LD=cc
|
||||
+LDFLAGS=-O -shared -fPIC
|
||||
+LD=cc
|
||||
|
||||
#------
|
||||
# End of makefile configuration
|
||||
|
||||
@ -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
|
||||
#------
|
||||
$OpenBSD: patch-src_makefile,v 1.2 2006/09/23 18:05:31 pedro Exp $
|
||||
--- src/makefile.orig Thu Apr 27 00:23:21 2006
|
||||
+++ src/makefile Sat Sep 23 14:14:11 2006
|
||||
@@ -11,42 +11,21 @@ include ../config
|
||||
# Modules belonging to socket-core
|
||||
#
|
||||
|
||||
-SOCKET_OBJS:= \
|
||||
- $(COMPAT)/compat-5.1.o \
|
||||
- luasocket.o \
|
||||
@ -19,8 +19,8 @@ $OpenBSD: patch-src_makefile,v 1.1 2005/11/25 15:09:44 pedro Exp $
|
||||
- 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,24 @@ $OpenBSD: patch-src_makefile,v 1.1 2005/11/25 15:09:44 pedro Exp $
|
||||
-MIME_OBJS:=\
|
||||
- $(COMPAT)/compat-5.1.o \
|
||||
- mime.o
|
||||
+MIME_OBJS:= mime.o
|
||||
+MIME_OBJS:= mime.o
|
||||
|
||||
|
||||
#------
|
||||
@@ -48,13 +34,13 @@ UNIX_OBJS:=\
|
||||
all: $(SOCKET_SO) $(MIME_SO)
|
||||
# Modules belonging unix (local domain sockets)
|
||||
#
|
||||
-UNIX_OBJS:=\
|
||||
- buffer.o \
|
||||
- auxiliar.o \
|
||||
- options.o \
|
||||
- timeout.o \
|
||||
- io.o \
|
||||
- usocket.o \
|
||||
- unix.o
|
||||
+UNIX_OBJS:= buffer.o auxiliar.o options.o timeout.o io.o usocket.o unix.o
|
||||
|
||||
-all: $(SOCKET_SO) $(MIME_SO)
|
||||
+all: $(SOCKET_SO) $(MIME_SO) $(UNIX_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
|
||||
$(LD) $(LDFLAGS) -o $@ $(SOCKET_OBJS)
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.4 2006/07/30 04:42:52 pedro Exp $
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.5 2006/09/23 18:05:31 pedro Exp $
|
||||
lib/lua/5.1/mime/
|
||||
lib/lua/5.1/mime/core.so
|
||||
lib/lua/5.1/socket/
|
||||
lib/lua/5.1/socket/core.so
|
||||
lib/lua/5.1/socket/unix.so
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user