ports/117168: Maintainer Update of net/luasocket
Andrew Turner
andrew+ports at fubar.geek.nz
Sun Oct 14 02:10:07 UTC 2007
>Number: 117168
>Category: ports
>Synopsis: Maintainer Update of net/luasocket
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 14 02:10:02 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Andrew Turner
>Release: FreeBSD 5.5-RELEASE-p12 i386
>Organization:
>Environment:
System: FreeBSD serv.int.fubar.geek.nz 5.5-RELEASE-p12 FreeBSD 5.5-RELEASE-p12 #1: Tue May 8 10:47:33 NZST 2007 root at serv.int.fubar.geek.nz:/usr/obj/usr/src/sys/GENERIC i386
>Description:
The attached patch:
* Updates net/luasocket to 2.0.2
* Makes net/luasocket a Master port
* Sets the Lua version for net/luasocket to 5.1
* Adds a slave port for Lua 5.0
* Updates bsd.lua.mk for the new port locations
>How-To-Repeat:
1. Apply the patch
2. Remove net/luasocket/patch-Makefile
3. Copy the attached Makefile to net/lua50-luasocket
>Fix:
--- luasocket-2.0.2.diff begins here ---
Index: Mk/bsd.lua.mk
===================================================================
RCS file: /cvsroot/ports/Mk/bsd.lua.mk,v
retrieving revision 1.13
diff -u -r1.13 bsd.lua.mk
--- Mk/bsd.lua.mk 11 Apr 2007 03:22:34 -0000 1.13
+++ Mk/bsd.lua.mk 14 Oct 2007 01:12:34 -0000
@@ -38,7 +38,7 @@
# Other components (modules):
# 5.0 - app, compat51, dfui, filename, gettext,
# posix, pty, socket.
-# 5.1 - filename, gettext, posix, pty.
+# 5.1 - filename, gettext, posix, pty, socket.
# The available dependency types are:
# build - Requires component for building.
# lib - Requires component for building and running.
@@ -159,7 +159,7 @@
_LUA_PORT_gettext_5.0= devel/lua50-gettext
_LUA_PORT_posix_5.0= devel/lua50-posix
_LUA_PORT_pty_5.0= devel/lua50-pty
-_LUA_PORT_socket_5.0= net/luasocket
+_LUA_PORT_socket_5.0= net/lua50-luasocket
_LUA_PORT_lua_5.1= lang/lua
_LUA_DEPTYPE_lua_5.1= build
@@ -168,6 +168,7 @@
_LUA_PORT_gettext_5.1= devel/lua-gettext
_LUA_PORT_posix_5.1= devel/lua-posix
_LUA_PORT_pty_5.1= devel/lua-pty
+_LUA_PORT_socket_5.1= net/luasocket
. for comp in ${_LUA_COMPS_ALL}
_LUA_COMP= ${comp}
Index: net/luasocket/Makefile
===================================================================
RCS file: /cvsroot/ports/net/luasocket/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- net/luasocket/Makefile 15 Sep 2006 10:58:52 -0000 1.8
+++ net/luasocket/Makefile 14 Oct 2007 01:20:52 -0000
@@ -6,22 +6,26 @@
#
PORTNAME= luasocket
-PORTVERSION= 2.0
-PORTREVISION= 1
+PORTVERSION= 2.0.2
CATEGORIES= net
-MASTER_SITES= http://luaforge.net/frs/download.php/1097/
+MASTER_SITES= http://luaforge.net/frs/download.php/2657/
+PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
MAINTAINER= andrew+ports at fubar.geek.nz
COMMENT= IPv4 Sockets support for the Lua language
-BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/lua50-compat51:extract
-
USE_GMAKE= yes
-USE_LUA= 5.0
-LUA_COMPS= lua compat51
+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}"
+MAKE_ENV= COMPATDIR="${COMPAT_SRC}" \
+ COMPAT_OBJ="${COMPAT_SRC}/compat-5.1.o"
+.endif
post-extract:
@${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
Index: net/luasocket/distinfo
===================================================================
RCS file: /cvsroot/ports/net/luasocket/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- net/luasocket/distinfo 26 Mar 2006 13:43:34 -0000 1.4
+++ net/luasocket/distinfo 14 Oct 2007 00:13:51 -0000
@@ -1,3 +1,3 @@
-MD5 (luasocket-2.0.tar.gz) = 64bddf8bbab296d1c1da7f34f3c2b5b5
-SHA256 (luasocket-2.0.tar.gz) = f626ad8df249791d3ad2bd2efcd1411aaa5d1f35c61812d18d2f70b51b098752
-SIZE (luasocket-2.0.tar.gz) = 120394
+MD5 (luasocket-2.0.2.tar.gz) = f253be3b94287a6cba8df5a0affdb7d1
+SHA256 (luasocket-2.0.2.tar.gz) = ed6a153e95e1728775f04a5003ffd345c971b86f4d20550bb82351a79d8fe511
+SIZE (luasocket-2.0.2.tar.gz) = 115480
Index: net/luasocket/pkg-plist
===================================================================
RCS file: /cvsroot/ports/net/luasocket/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- net/luasocket/pkg-plist 15 Sep 2006 10:58:52 -0000 1.4
+++ net/luasocket/pkg-plist 14 Oct 2007 01:14:38 -0000
@@ -10,8 +10,8 @@
%%LUA_MODLIBDIR%%/mime/core.so
%%PORTDOCS%%%%DOCSDIR%%/dns.html
%%PORTDOCS%%%%DOCSDIR%%/ftp.html
-%%PORTDOCS%%%%DOCSDIR%%/home.html
%%PORTDOCS%%%%DOCSDIR%%/http.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/installation.html
%%PORTDOCS%%%%DOCSDIR%%/introduction.html
%%PORTDOCS%%%%DOCSDIR%%/ltn12.html
Index: net/luasocket/files/patch-config
===================================================================
RCS file: /cvsroot/ports/net/luasocket/files/patch-config,v
retrieving revision 1.2
diff -u -r1.2 patch-config
--- net/luasocket/files/patch-config 15 Sep 2006 10:58:52 -0000 1.2
+++ net/luasocket/files/patch-config 14 Oct 2007 00:55:08 -0000
@@ -1,26 +1,25 @@
---- config.orig Thu Nov 24 17:29:38 2005
-+++ config Mon Aug 7 13:36:23 2006
-@@ -15,42 +15,42 @@
- #------
- # Lua includes and libraries
- #
--LUAINC=-Ilua-5.0.2/include
--LUALIB=-Llua-5.0.2/lib
+--- config.orig Sun Oct 14 12:44:03 2007
++++ config Sun Oct 14 13:54:39 2007
+@@ -18,11 +18,13 @@
+ #LUAINC=-I/usr/local/include/lua50
+ #LUAINC=-I/usr/local/include/lua5.1
+ #LUAINC=-Ilua-5.1.1/src
+LUAINC=-I$(LUA_INCDIR)
-+LUALIB=-L$(LUA_LIBDIR)
#------
# Compat-5.1 directory
#
--COMPAT=compat-5.1r4
+ #COMPAT=compat-5.1r5
+COMPAT=${COMPATDIR}
#------
# Top of your Lua installation
- # Relative paths will be inside the src tree
+@@ -30,11 +32,11 @@
#
--INSTALL_TOP_SHARE=share
--INSTALL_TOP_LIB=lib
+ #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=${LUA_MODSHAREDIR}
+INSTALL_TOP_LIB=${LUA_MODLIBDIR}
@@ -31,30 +30,18 @@
#------
# 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
-
+@@ -49,11 +51,11 @@
#------
# Compiler and linker settings
# for Linux
--#CC=gcc
+-CC=gcc
+CC?=gcc
- #DEF=-DLUASOCKET_DEBUG
--#CFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fpic
--#LDFLAGS=-O -shared
--#LD=gcc
-+CFLAGS+= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -fpic
-+LDFLAGS=-O -shared
+ DEF=-DLUASOCKET_DEBUG
+-CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fpic
+-LDFLAGS=-O -shared -fpic
+-LD=gcc
++CFLAGS+= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fpic
++LDFLAGS+=-O -shared -fpic
+LD=${CC}
#------
--- luasocket-2.0.2.diff ends here ---
--- Makefile begins here ---
# New ports collection makefile for: lua50-socket
# Date created: 14 October 2007
# Whom: Andrew Turner <andrew+ports at fubar.geek.nz>
#
# $FreeBSD$
#
USE_LUA= 5.0
MASTERDIR= ${.CURDIR}/../luasocket
.include "${MASTERDIR}/Makefile"
--- Makefile ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list