Update to 3.0rc1

* Fix build with lua 5.2.

Changelog:

Main changes for LuaSocket 3.0-rc1 are IPv6 support and Lua 5.2 compatibility.

    * Added: Compatible with Lua 5.2
        - Note that unless you define LUA_COMPAT_MODULE, package
          tables will not be exported as globals!
    * Added: IPv6 support;
        - Socket.connect and socket.bind support IPv6 addresses;
        - Getpeername and getsockname support IPv6 addresses, and
          return the socket family as a third value;
        - URL module updated to support IPv6 host names;
        - New socket.tcp6 and socket.udp6 functions;
        - New socket.dns.getaddrinfo and socket.dns.getnameinfo functions;
    * Added: getoption method;
    * Fixed: url.unescape was returning additional values;
    * Fixed: mime.qp, mime.unqp, mime.b64, and mime.unb64 could
      mistaking their own stack slots for functions arguments;
    * Fixed: Receiving zero-length datagram is now possible;
    * Improved: Hidden all internal library symbols;
    * Improved: Better error messages;
    * Improved: Better documentation of socket options.
    * Fixed: manual sample of HTTP authentication now uses correct
      "authorization" header (Alexandre Ittner);
    * Fixed: failure on bind() was destroying the socket (Sam Roberts);
    * Fixed: receive() returns immediatelly if prefix can satisfy
      bytes requested (M Joonas Pihlaja);
    * Fixed: multicast didn't work on Windows, or anywhere
      else for that matter (Herbert Leuwer, Adrian Sietsma);
    * Fixed: select() now reports an error when called with more
      sockets than FD_SETSIZE (Lorenzo Leonini);
    * Fixed: manual links to home.html changed to index.html (Robert Hahn);
    * Fixed: mime.unb64() would return an empty string on results that started
      with a null character (Robert Raschke);
    * Fixed: HTTP now automatically redirects on 303 and 307 (Jonathan Gray);
    * Fixed: calling sleep() with negative numbers could
      block forever, wasting CPU. Now it returns immediately (MPB);
    * Improved: FTP commands are now sent in upper case to
      help buggy servers (Anders Eurenius);
    * Improved: known headers now sent in canonic
      capitalization to help buggy servers (Joseph Stewart);
    * Improved: Clarified tcp:receive() in the manual (MPB);
    * Improved: Decent makefiles (LHF).
    * Fixed: RFC links in documentation now point to IETF (Cosmin Apreutesei).

4 files changed, 25 insertions, 44 deletions

diff --git a/net/lua-socket/Makefile b/net/lua-socket/Makefile
index f86ab265174..f9ad117dc44 100644
--- a/net/lua-socket/Makefile
+++ b/net/lua-socket/Makefile
@@ -1,24 +1,25 @@
-# $NetBSD: Makefile,v 1.3 2013/08/15 06:32:06 obache Exp $
+# $NetBSD: Makefile,v 1.4 2013/09/01 04:45:58 ryoon Exp $
 #
 
-DISTNAME=		luasocket-2.0.2
-PKGNAME=		${LUA_PKGPREFIX}-${DISTNAME:S/lua//}
-PKGREVISION=		1
+DISTNAME=		luasocket-3.0-rc1
+PKGNAME=		${LUA_PKGPREFIX}-${DISTNAME:S/lua//:S/-rc/rc/}
 CATEGORIES=		net
-MASTER_SITES=		http://luaforge.net/frs/download.php/2664/
+MASTER_SITES=		-https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://w3.impa.br/~diego/software/luasocket/
 COMMENT=		Network support for the Lua language
 LICENSE=		mit
 
+FETCH_USING=		curl
+
 MAKE_FILE=		makefile
-USE_TOOLS+=		gmake
 
 LDFLAGS.SunOS=		-lrt -lresolv
 
-INSTALL_MAKE_FLAGS+=	INSTALL_TOP_SHARE=${DESTDIR}${PREFIX}/${LUA_LDIR}
-INSTALL_MAKE_FLAGS+=	INSTALL_TOP_LIB=${DESTDIR}${PREFIX}/${LUA_CDIR}
+MAKE_FLAGS+=		LUAV=5.2
+MAKE_FLAGS+=		LUAINC_linux_base=${PREFIX}/include
+MAKE_FLAGS+=		LUAPREFIX_linux=${PREFIX}
 
 .include "../../lang/lua/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/lua-socket/PLIST b/net/lua-socket/PLIST
index e8e67fb8e5a..6d12e1a8427 100644
--- a/net/lua-socket/PLIST
+++ b/net/lua-socket/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/21 10:08:48 fhajny Exp $
-lib/lua/5.1/mime/core.so
-lib/lua/5.1/socket/core.so
-share/lua/5.1/ltn12.lua
-share/lua/5.1/mime.lua
-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
+@comment $NetBSD: PLIST,v 1.2 2013/09/01 04:45:58 ryoon Exp $
+lib/lua/5.2/mime/core.so
+lib/lua/5.2/socket/core.so
+share/lua/5.2/ltn12.lua
+share/lua/5.2/mime.lua
+share/lua/5.2/socket.lua
+share/lua/5.2/socket/ftp.lua
+share/lua/5.2/socket/headers.lua
+share/lua/5.2/socket/http.lua
+share/lua/5.2/socket/smtp.lua
+share/lua/5.2/socket/tp.lua
+share/lua/5.2/socket/url.lua
diff --git a/net/lua-socket/distinfo b/net/lua-socket/distinfo
index 02ea6772f3c..2cf04cb6405 100644
--- a/net/lua-socket/distinfo
+++ b/net/lua-socket/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/09/21 10:08:48 fhajny Exp $
+$NetBSD: distinfo,v 1.2 2013/09/01 04:45:58 ryoon Exp $
 
-SHA1 (luasocket-2.0.2.tar.gz) = 5ce521fc5c6efb7c1eba7f36dfeafa9e4d745464
-RMD160 (luasocket-2.0.2.tar.gz) = 24d7e4fb1c9cf0c3d94f8b36e82d494ae922e268
-Size (luasocket-2.0.2.tar.gz) = 115443 bytes
-SHA1 (patch-aa) = f4e4af32fea1b12f39aba9fe92989cfe57f8d039
+SHA1 (luasocket-3.0-rc1.tar.gz) = aff9122b26c01487c06a32133df78c1506af350f
+RMD160 (luasocket-3.0-rc1.tar.gz) = 27357eee7e52f091609f45a0b0fb7e04e9ea2bd8
+Size (luasocket-3.0-rc1.tar.gz) = 328598 bytes
diff --git a/net/lua-socket/patches/patch-aa b/net/lua-socket/patches/patch-aa
deleted file mode 100644
index a313bd6dca4..00000000000
--- a/net/lua-socket/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/09/21 10:08:48 fhajny Exp $
-
-Let CFLAGS/LDFLAGS merge with pkgsrc's ones
-
---- config.orig	2007-10-15 04:21:05.000000000 +0000
-+++ config
-@@ -49,10 +49,10 @@ INSTALL_EXEC=cp
- #------
- # Compiler and linker settings
- # for Linux
--CC=gcc
-+CC?=gcc
- DEF=-DLUASOCKET_DEBUG 
--CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fpic
--LDFLAGS=-O -shared -fpic
-+CFLAGS+= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fpic
-+LDFLAGS+=-O -shared -fpic
- LD=gcc 
- 
- #------