Import of pkgsrc-2014Q1

net/lua-socket/Makefile

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2012/10/23 17:18:36 asau Exp $
-#
+# $NetBSD: Makefile,v 1.7 2014/01/27 18:41:14 wiz Exp $
 
-DISTNAME=		luasocket-2.0.2
-PKGNAME=		${LUA_PKGPREFIX}-${DISTNAME:S/lua//}
+DISTNAME=		luasocket-3.0-rc1
+PKGNAME=		${LUA_PKGPREFIX}-${DISTNAME:S/lua//:S/-rc/rc/}
+PKGREVISION=		2
 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/
@@ -12,12 +12,12 @@ COMMENT=		Network support for the Lua language
 LICENSE=		mit
 
 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=${_LUA_DOT_VERSION}
+MAKE_FLAGS+=		LUAINC_linux_base=${PREFIX}/include
+MAKE_FLAGS+=		LUAPREFIX_linux=${PREFIX}
 
 .include "../../lang/lua/module.mk"
 .include "../../mk/bsd.pkg.mk"

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.3 2014/01/22 16:20:51 jperkin Exp $
+${LUA_CDIR}/mime/core.so
+${LUA_CDIR}/socket/core.so
+${LUA_LDIR}/ltn12.lua
+${LUA_LDIR}/mime.lua
+${LUA_LDIR}/socket.lua
+${LUA_LDIR}/socket/ftp.lua
+${LUA_LDIR}/socket/headers.lua
+${LUA_LDIR}/socket/http.lua
+${LUA_LDIR}/socket/smtp.lua
+${LUA_LDIR}/socket/tp.lua
+${LUA_LDIR}/socket/url.lua

net/lua-socket/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/09/21 10:08:48 fhajny Exp $
+$NetBSD: distinfo,v 1.3 2013/09/13 14:24:28 fhajny 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
+SHA1 (patch-makefile) = 2a6380adfa8f7ef63e70e0de9ef4eb4e76eff334
+SHA1 (patch-src_makefile) = e62f5f133a5c17e6563aefe8de335b93899b2f64

net/lua-socket/patches/patch-aa

@@ -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 
- 
- #------

net/lua-socket/patches/patch-makefile

@@ -0,0 +1,14 @@
+$NetBSD: patch-makefile,v 1.1 2013/09/13 14:24:28 fhajny Exp $
+
+Pass our LDFLAGS.
+--- makefile.orig	2013-06-14 11:27:32.000000000 +0000
++++ makefile
+@@ -15,7 +15,7 @@ PLATS= macosx linux win32 mingw
+ all: $(PLAT)
+ 
+ $(PLATS) none install install-unix local clean:
+-	$(MAKE) -C src $@
++	$(MAKE) -C src $@ MYLDFLAGS="$(LDFLAGS)"
+ 
+ print:
+ 	$(MAKE) -C src $@

net/lua-socket/patches/patch-src_makefile

@@ -0,0 +1,14 @@
+$NetBSD: patch-src_makefile,v 1.1 2013/09/13 14:24:28 fhajny Exp $
+
+Pass our LDFLAGS.
+--- src/makefile.orig	2013-06-14 11:27:32.000000000 +0000
++++ src/makefile
+@@ -151,7 +151,7 @@ DEF_linux=-DLUASOCKET_$(DEBUG) -DLUA_$(C
+ 	-DMIME_API='__attribute__((visibility("default")))'
+ CFLAGS_linux= -I$(LUAINC) $(DEF) -pedantic -Wall -Wshadow -Wextra \
+ 	-Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden
+-LDFLAGS_linux=-O -shared -fpic -o 
++LDFLAGS_linux=-O -shared -fpic $(MYLDFLAGS) -o  
+ LD_linux=gcc
+ SOCKET_linux=usocket.o
+