From 4f240759bdd75002f1c642d37b65dabe735a8b22 Mon Sep 17 00:00:00 2001
From: Leonardo Arena <rnalrd@alpinelinux.org>
Date: Wed, 2 Aug 2017 14:53:07 +0000
Subject: main/nmap: upgrade to 7.60

Modernize APKBUILD, add check()
---
 main/nmap/APKBUILD | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index a80296dd91..c13958193e 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=nmap
-pkgver=7.50
+pkgver=7.60
 pkgrel=0
 pkgdesc="A network exploration tool and security/port scanner"
 url="http://nmap.org"
@@ -17,10 +17,15 @@ subpackages="
 	$pkgname-ncat"
 source="http://nmap.org/dist/$pkgname-$pkgver.tar.bz2
 	fortify-source.patch"
+builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
-_builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,16 +35,20 @@ build() {
 		--infodir=/usr/share/info \
 		--without-zenmap \
 		--with-liblua=/usr/include \
-		--with-openssl=/usr/lib \
-		|| return 1
+		--with-openssl=/usr/lib
 
 	# fix LUA libs linking order
-	make "LUA_LIBS=../liblua/liblua.a -ldl -lm" || return 1
+	make "LUA_LIBS=../liblua/liblua.a -ldl -lm"
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
@@ -49,7 +58,7 @@ scripts() {
 
 	mkdir -p "$subpkgdir"/usr/share/nmap/
 	mv "$pkgdir"/usr/share/nmap/scripts \
-		"$subpkgdir"/usr/share/nmap/ || return 1
+		"$subpkgdir"/usr/share/nmap/
 }
 
 nselibs() {
@@ -58,20 +67,20 @@ nselibs() {
 	mkdir -p "$subpkgdir"/usr/share/nmap/
 	mv "$pkgdir"/usr/share/nmap/nse_main.lua \
 		"$pkgdir"/usr/share/nmap/nselib \
-		"$subpkgdir"/usr/share/nmap/ || return 1
+		"$subpkgdir"/usr/share/nmap/
 }
 
 ncat() {
 	pkgdesc="$pkgdesc (ncat tool)"
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/ncat "$subpkgdir"/usr/bin || return 1
+	mv "$pkgdir"/usr/bin/ncat "$subpkgdir"/usr/bin
 }
 
 nping() {
 	pkgdesc="$pkgdesc (nping tool)"
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/nping "$subpkgdir"/usr/bin || return 1
+	mv "$pkgdir"/usr/bin/nping "$subpkgdir"/usr/bin
 }
 
-sha512sums="b74c5711f03bae363164cdb7e62923ab938c81c7bbcd080eaa2d1acc89f09eb0a7e0f5deb9628b81057c7a35ecd487a2d09dfe3b58b0db6c84cf0b39f526e5f2  nmap-7.50.tar.bz2
+sha512sums="74ba8f6de026ade9ee6bb2252bee18a57210f8207977df7f1c04556629dcdc1e6127f33febc8a52ef88a1dac876116d590564dee4f1c23798c3ac37529991aa4  nmap-7.60.tar.bz2
 2d1f6e290723ac643f456a0e1ac95c4c966106cf2ab743839d25c835bf0141dc2d6bfee19285c3518d4c5f553b0505dabe5a496b769ba47b7adb03e791f05b8d  fortify-source.patch"
-- 
cgit v1.2.3