summaryrefslogtreecommitdiff
path: root/net/nmap
diff options
context:
space:
mode:
authorleot <leot@pkgsrc.org>2017-10-19 21:43:25 +0000
committerleot <leot@pkgsrc.org>2017-10-19 21:43:25 +0000
commit1d1fe4f7d3bb6af3722a6b88d35a6569582fcb93 (patch)
treeec7611443a0ac1b00ba979f178ab25482a2fdfcf /net/nmap
parent3f07eb15d8065c0e015cb86a56f15a41ddd596ac (diff)
downloadpkgsrc-1d1fe4f7d3bb6af3722a6b88d35a6569582fcb93.tar.gz
nmap: set LUA_VERSIONS_ACCEPTED to avoid using internal Lua provided by nmap
Without that change the nmap configure script checks for `lua_isyield' symbol (appeared on Lua 5.3), and for LUA_VERSION_DEFAULT != 53 (pkgsrc by default set LUA_VERSION_DEFAULT to 52) it will just silently use its internal version. Set LUA_VERSIONS_ACCEPTED to 53 to avoid that. Fix PR pkg/52624 reported by Patrick Mackey. Bump PKGREVISION.
Diffstat (limited to 'net/nmap')
-rw-r--r--net/nmap/Makefile3
-rw-r--r--net/nmap/options.mk3
2 files changed, 4 insertions, 2 deletions
diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 5466aee0d31..f45d86a261d 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.136 2017/08/03 13:52:00 adam Exp $
+# $NetBSD: Makefile,v 1.137 2017/10/19 21:43:25 leot Exp $
DISTNAME= nmap-7.60
+PKGREVISION= 1
CATEGORIES= net security
MASTER_SITES= http://nmap.org/dist/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/nmap/options.mk b/net/nmap/options.mk
index 14f80c15658..e9ccc97d83a 100644
--- a/net/nmap/options.mk
+++ b/net/nmap/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2017/01/01 14:43:50 wiz Exp $
+# $NetBSD: options.mk,v 1.19 2017/10/19 21:43:25 leot Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.nmap
@@ -37,6 +37,7 @@ CONFIGURE_ARGS+= --without-zenmap
.endif
.if !empty(PKG_OPTIONS:Mlua)
+LUA_VERSIONS_ACCEPTED= 53 # needs lua_isyieldable, introduced in Lua 5.3
.include "../../lang/lua/buildlink3.mk"
CONFIGURE_ARGS+= --with-liblua=${BUILDLINK_PREFIX.lua}
PLIST.lua= yes