summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorjperkin <jperkin>2014-01-22 16:20:51 +0000
committerjperkin <jperkin>2014-01-22 16:20:51 +0000
commit8591c725c76678df34e49a8bef77a1555f3f7c1f (patch)
tree9a9d20bb384549dee2a13e21cba380ca451805eb /net
parentab18d782a3c9e9af7154ecac87b8a5deda919deb (diff)
downloadpkgsrc-8591c725c76678df34e49a8bef77a1555f3f7c1f.tar.gz
Don't hardcode lua '5.2' everywhere, use the appropriate variables.
Fixes build with lua 5.1. Bump PKGREVISION.
Diffstat (limited to 'net')
-rw-r--r--net/lua-socket/Makefile6
-rw-r--r--net/lua-socket/PLIST24
2 files changed, 15 insertions, 15 deletions
diff --git a/net/lua-socket/Makefile b/net/lua-socket/Makefile
index 7d75bd94abb..f20154530cc 100644
--- a/net/lua-socket/Makefile
+++ b/net/lua-socket/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2013/09/13 14:24:28 fhajny Exp $
+# $NetBSD: Makefile,v 1.6 2014/01/22 16:20:51 jperkin Exp $
#
DISTNAME= luasocket-3.0-rc1
PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/lua//:S/-rc/rc/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= -https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz
@@ -18,7 +18,7 @@ MAKE_FILE= makefile
LDFLAGS.SunOS= -lrt -lresolv
-MAKE_FLAGS+= LUAV=5.2
+MAKE_FLAGS+= LUAV=${_LUA_DOT_VERSION}
MAKE_FLAGS+= LUAINC_linux_base=${PREFIX}/include
MAKE_FLAGS+= LUAPREFIX_linux=${PREFIX}
diff --git a/net/lua-socket/PLIST b/net/lua-socket/PLIST
index 6d12e1a8427..4ed3526ea07 100644
--- a/net/lua-socket/PLIST
+++ b/net/lua-socket/PLIST
@@ -1,12 +1,12 @@
-@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
+@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