Wed Jan 22 16:20:51 2014 UTC ()
Don't hardcode lua '5.2' everywhere, use the appropriate variables.

Fixes build with lua 5.1.  Bump PKGREVISION.


(jperkin)
diff -r1.5 -r1.6 pkgsrc/net/lua-socket/Makefile
diff -r1.2 -r1.3 pkgsrc/net/lua-socket/PLIST
cvs diff -r1.5 -r1.6 pkgsrc/net/lua-socket/Makefile (expand / switch to unified diff)

--- pkgsrc/net/lua-socket/Makefile 2013/09/13 14:24:28 1.5
+++ pkgsrc/net/lua-socket/Makefile 2014/01/22 16:20:51 1.6
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: Makefile,v 1.5 2013/09/13 14:24:28 fhajny Exp $ 1# $NetBSD: Makefile,v 1.6 2014/01/22 16:20:51 jperkin Exp $
2# 2#
3 3
4DISTNAME= luasocket-3.0-rc1 4DISTNAME= luasocket-3.0-rc1
5PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/lua//:S/-rc/rc/} 5PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/lua//:S/-rc/rc/}
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= -https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz 8MASTER_SITES= -https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://w3.impa.br/~diego/software/luasocket/ 11HOMEPAGE= http://w3.impa.br/~diego/software/luasocket/
12COMMENT= Network support for the Lua language 12COMMENT= Network support for the Lua language
13LICENSE= mit 13LICENSE= mit
14 14
15FETCH_USING= curl 15FETCH_USING= curl
16 16
17MAKE_FILE= makefile 17MAKE_FILE= makefile
18 18
19LDFLAGS.SunOS= -lrt -lresolv 19LDFLAGS.SunOS= -lrt -lresolv
20 20
21MAKE_FLAGS+= LUAV=5.2 21MAKE_FLAGS+= LUAV=${_LUA_DOT_VERSION}
22MAKE_FLAGS+= LUAINC_linux_base=${PREFIX}/include 22MAKE_FLAGS+= LUAINC_linux_base=${PREFIX}/include
23MAKE_FLAGS+= LUAPREFIX_linux=${PREFIX} 23MAKE_FLAGS+= LUAPREFIX_linux=${PREFIX}
24 24
25.include "../../lang/lua/module.mk" 25.include "../../lang/lua/module.mk"
26.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/net/lua-socket/PLIST (expand / switch to unified diff)

--- pkgsrc/net/lua-socket/PLIST 2013/09/01 04:45:58 1.2
+++ pkgsrc/net/lua-socket/PLIST 2014/01/22 16:20:51 1.3
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1@comment $NetBSD: PLIST,v 1.2 2013/09/01 04:45:58 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.3 2014/01/22 16:20:51 jperkin Exp $
2lib/lua/5.2/mime/core.so 2${LUA_CDIR}/mime/core.so
3lib/lua/5.2/socket/core.so 3${LUA_CDIR}/socket/core.so
4share/lua/5.2/ltn12.lua 4${LUA_LDIR}/ltn12.lua
5share/lua/5.2/mime.lua 5${LUA_LDIR}/mime.lua
6share/lua/5.2/socket.lua 6${LUA_LDIR}/socket.lua
7share/lua/5.2/socket/ftp.lua 7${LUA_LDIR}/socket/ftp.lua
8share/lua/5.2/socket/headers.lua 8${LUA_LDIR}/socket/headers.lua
9share/lua/5.2/socket/http.lua 9${LUA_LDIR}/socket/http.lua
10share/lua/5.2/socket/smtp.lua 10${LUA_LDIR}/socket/smtp.lua
11share/lua/5.2/socket/tp.lua 11${LUA_LDIR}/socket/tp.lua
12share/lua/5.2/socket/url.lua 12${LUA_LDIR}/socket/url.lua