From 4e525f0b6928f65c1b34cee2f51b39566fcc3aae Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 17 Aug 2014 09:33:56 +0200
Subject: [PATCH] nmap: update to 6.46.

---
 srcpkgs/nmap/patches/nolua.patch | 58 --------------------------------
 srcpkgs/nmap/template            | 35 +++++++------------
 2 files changed, 13 insertions(+), 80 deletions(-)
 delete mode 100644 srcpkgs/nmap/patches/nolua.patch

diff --git a/srcpkgs/nmap/patches/nolua.patch b/srcpkgs/nmap/patches/nolua.patch
deleted file mode 100644
index ea31bef12af..00000000000
--- a/srcpkgs/nmap/patches/nolua.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- output.h.orig	2013-06-12 15:19:09.516990135 +0200
-+++ output.h	2013-06-12 15:19:21.020928401 +0200
-@@ -255,6 +255,8 @@ void printdatafilepaths();
- 
- /*This is a helper function to determine the ordering of the script results
-   based on their id */
-+#ifndef NOLUA
- bool comparescriptids(ScriptResult first, ScriptResult second);
-+#endif
- 
- #endif /* OUTPUT_H */
---- output.cc.orig	2013-06-12 15:19:48.660779884 +0200
-+++ output.cc	2013-06-12 15:20:03.436700386 +0200
-@@ -2615,6 +2615,7 @@ void printdatafilepaths() {
- 
- /*This is a helper function to determine the ordering of the script results
-   based on their id */
-+#ifndef NOLUA
- bool comparescriptids(ScriptResult first, ScriptResult second){
-     //Pull the two id fields out for comparison
-     std::string firstid(first.get_id());
-@@ -2625,5 +2626,5 @@ bool comparescriptids(ScriptResult first
-     else
-         return false;
- }
--
-+#endif
- 
---- Target.cc.orig	2013-06-12 15:21:41.517183480 +0200
-+++ Target.cc	2013-06-12 15:21:56.925107771 +0200
-@@ -162,10 +162,12 @@ void Target::Recycle() {
- 
- Target::~Target() {
-   FreeInternal();
-+#ifndef NOLUA
-   while (!scriptResults.empty()) {
-     scriptResults.front().clear();
-     scriptResults.pop_front();
-   }
-+#endif
- }
- 
- void Target::FreeInternal() {
---- portlist.cc.orig	2013-06-12 15:22:14.637019645 +0200
-+++ portlist.cc	2013-06-12 15:22:27.268956160 +0200
-@@ -146,10 +146,12 @@ void Port::freeService(bool del_service)
- 
- void Port::freeScriptResults(void)
- {
-+#ifndef NOLUA
-     while (!scriptResults.empty()) {
-         scriptResults.front().clear();
-         scriptResults.pop_front();
-     }
-+#endif
- }
- 
- /* Fills in namebuf (as long as there is space in buflen) with the
diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 55de61f72f5..5d01cc39703 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -1,21 +1,20 @@
 # Template file for 'nmap'
 pkgname=nmap
-version=6.25
-revision=4
+version=6.46
+revision=1
 build_style=gnu-configure
-configure_args="--without-ndiff"
-makedepends="libpcap-devel pcre-devel>=8.30"
+configure_args="--without-ndiff --with-openssl"
+makedepends="libpcap-devel pcre-devel>=8.30 libressl-devel"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://nmap.org"
 distfiles="http://nmap.org/dist/nmap-$version.tar.bz2"
-checksum=3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5
+checksum=3f89d9053c69507fe9533c40188a6561d49607a37b1db6380aed9039d4883137
 
 # Package build options
-build_options="lua ssl"
-# Enable ssl option by default.
-build_options_default="ssl"
+build_options="lua"
+build_options_default="lua"
 
 if [ "$build_option_lua" ]; then
 	configure_args+=" --with-liblua"
@@ -24,26 +23,20 @@ else
 	configure_args+=" --without-liblua"
 fi
 
-if [ "$build_option_ssl" ]; then
-	configure_args+=" --with-openssl=$XBPS_CROSS_BASE/usr"
-	makedepends+=" libressl-devel"
+if [ -z "$CROSS_BUILD" ]; then
+	subpackages="nmapfe"
+	makedepends+=" pygtk-devel"
+	configure_args+=" --with-zenmap"
 else
-	configure_args+=" --without-openssl"
-fi
-
-if [ "$CROSS_BUILD" ]; then
+	subpackages=""
 	configure_args+=" --without-zenmap"
 fi
 
-# XXX disable nmapfe in cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	makedepends+=" pygtk-devel"
-
 nmapfe_package() {
 	noarch=yes
 	depends="nmap>=$version desktop-file-utils pygtk"
 	pycompile_module="radialnet zenmapCore zenmapGUI"
-	short_desc="${short_desc} - GTK Frontend"
+	short_desc+=" - GTK Frontend"
 	pkg_install() {
 		vmove usr/bin/nmapfe
 		vmove usr/bin/xnmap
@@ -55,5 +48,3 @@ nmapfe_package() {
 		rm -f ${DESTDIR}/usr/bin/uninstall_zenmap
 	}
 }
-
-fi #!CROSS_BUILD