From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 1 Mar 2017 16:46:41 +0000 (+0100)
Subject: nmap: Build against system liblua
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/6f2bea7ea85c2f4134c0bfe96f075cb44cdf9bb3

nmap: Build against system liblua
---

diff --git a/packages/nmap/build.sh b/packages/nmap/build.sh
index 71e7bf32..0e48f48a 100644
--- a/packages/nmap/build.sh
+++ b/packages/nmap/build.sh
@@ -1,17 +1,16 @@
 TERMUX_PKG_HOMEPAGE=https://nmap.org/
 TERMUX_PKG_DESCRIPTION="Utility for network discovery and security auditing"
 TERMUX_PKG_VERSION=7.40
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://nmap.org/dist/nmap-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188
 # Depend on netcat so that it gets installed automatically when installing
 # nmap, since the ncat program is usually distributed as part of nmap.
-TERMUX_PKG_DEPENDS="libpcap, pcre, openssl, resolv-conf, netcat"
+TERMUX_PKG_DEPENDS="libpcap, pcre, openssl, resolv-conf, netcat, liblua"
 # --without-nmap-update to avoid linking against libsvn_client:
 # --without-zenmap to avoid python scripts for graphical gtk frontend:
-# --with-liblua=included to use internal liblua, since only lua 5.2 supported:
 # --without-ndiff to avoid python2-using ndiff utility:
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-static --with-liblua=included --without-nmap-update --without-zenmap --without-ndiff"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-static --with-liblua=$TERMUX_PREFIX --without-nmap-update --without-zenmap --without-ndiff"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 
 termux_step_post_make_install () {
diff --git a/packages/nmap/netcat.subpackage.sh b/packages/nmap/netcat.subpackage.sh
index 1ff2ce46..70d624bb 100644
--- a/packages/nmap/netcat.subpackage.sh
+++ b/packages/nmap/netcat.subpackage.sh
@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_INCLUDE="bin/ncat bin/netcat bin/nc share/man/man1/ncat.1 share/man/man1/netcat.1 share/man/man1/nc.1"
 TERMUX_SUBPKG_DESCRIPTION="Feature-packed networking utility which reads and writes data across networks from the command line"
-TERMUX_SUBPKG_DEPENDS="libpcap, openssl"
+TERMUX_SUBPKG_DEPENDS="libpcap, openssl, liblua"