From 0024a40b26cc048701ff379625ec5152c1a04b92 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Mon, 23 Jan 2017 22:29:07 +0700
Subject: network/zmap: Updated for version 2.1.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/zmap/zmap.SlackBuild | 29 ++++++++++++++---------------
 network/zmap/zmap.info       |  6 +++---
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/network/zmap/zmap.SlackBuild b/network/zmap/zmap.SlackBuild
index a5f21f2777..dfb4dd75c1 100644
--- a/network/zmap/zmap.SlackBuild
+++ b/network/zmap/zmap.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for zmap
 
-# Copyright 2015-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zmap
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -71,17 +71,15 @@ find -L . \
 
 sed -i "s|install(SCRIPT InstallConfFiles.cmake)|#install(SCRIPT InstallConfFiles.cmake)|" CMakeLists.txt
 
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_DEVELOPMENT=OFF \
-    -DWITH_JSON=ON \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
+cmake \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DENABLE_DEVELOPMENT=OFF \
+  -DWITH_JSON=ON \
+  -DCMAKE_BUILD_TYPE=Release .
+make
+make install DESTDIR=$PKG
+
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -96,7 +94,8 @@ cp conf/zmap.conf $PKG/etc/zmap/zmap.conf.new
 cp conf/blacklist.conf $PKG/etc/zmap/blacklist.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGELOG INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -rf examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/zmap/zmap.info b/network/zmap/zmap.info
index f221596093..f0e1a5bfe1 100644
--- a/network/zmap/zmap.info
+++ b/network/zmap/zmap.info
@@ -1,8 +1,8 @@
 PRGNAM="zmap"
-VERSION="2.1.0"
+VERSION="2.1.1"
 HOMEPAGE="https://zmap.io"
-DOWNLOAD="https://github.com/zmap/zmap/archive/v2.1.0.tar.gz"
-MD5SUM="0e6b9b0628eb1d3360fbd9ea56e36693"
+DOWNLOAD="https://github.com/zmap/zmap/archive/v2.1.1/zmap-2.1.1.tar.gz"
+MD5SUM="a37555ac2beda1dc6f3754b411be545e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="byacc gengetopt"
-- 
cgit v1.2.3