Update net/iftop to 1.0pre4

From Changelog:
* Remove blinking cursor from UI
    Gerrit Renker <renker@ualberta.ca>

* Treat multicast packets as incoming, rather than incoming (IPv4) or not at
  all (IPv6).
    Andreas Schwab <schwab@linux-m68k.org>

* Minor fixes to the man page
* Man page documentation of -t mode.
* Compile time warning fixes.
    Markus Koschany <apo@gambaru.de>

* Added text output mode (-t option)
    Roman Hoog Antink <rha@open.ch> (originally by Patrik Bless)

* Fix for memory leak when DNS resolution is turned off
  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677141
    Olivier Allard-Jacquin <olivieraj@free.fr>

* Various typos in the UI
    Gerben Roest <g.roest@grepit.nl>

* Documentation fixes
    A. Costa <agcosta@gis.net> (via Debian)

* Fix for armeb specific bug
    Lennert Buytenhek <buytenh+debian@wantstofly.org> (via Debian)

* Fix frozen order drives line totals crazy.
    Max Alekseyev <relf@os2.ru> (via Debian)

* Fix for crash on arm.
    Joey Hess <joeyh@debian.org> (via Debian)

* Fixed behaviour of "-b" option.
    Eric Cooper <ecc@cmu.edu> (via Debian)

* Support for PFLOG Interfaces
    Richard Tóth <risko@iklub.sk>

* Support for IPv6
* Fix for performance issue with address hashing
* Fix for failing link address detection for GNU/kfreebsd
* Multiple portability fixes
    Mats Erik Andersson <mats.andersson@gisladisker.se>

* Improved behaviour of sort in sent/recv only mode
    Damián Viano <des@debian.org>

* FreeBSD compilation fix
* IPv6 reverse resolution
    Frédéric Perrin <frederic.perrin@resel.fr>

* Improved IPv6 code (removed s6_addr32 dependency)
* Fixed support for DLT_NULL
    Scott Bertilson <ssb@umn.edu>

* Typo in usage message
* Workaround for PuTTY issue (https://bugzilla.redhat.com/show_bug.cgi?id=546032)
* Updates to licence text (change in FSF address)
* Avoid an assertion failure if an "invalid" (as in outside of IPv4 or IPv6)
  address family is encountered (Red Hat bugs #839750, #847124, #868065, #961236
  and #1007434)
* enable building iftop with more recent versions of autoconf/automake
* patch to remove compile time warnings
* Fix to avoid system call in text mode wherever possible.
    Robert Scheck <robert@fedoraproject.org>

* Attempt to detect if interface is actually up when doing autodetection.
* Fixed segfault when selecting interfaces with empty MAC address (e.g. gprs
  interface on Nokia N900)
    Graham Inggs <graham@nerve.org.za>

* Avoid autodetecting wmaster interfaces
* Experimental support for IEEE802_11 radiotap interfaces (DLT 127)
* Fixed segfault / hang when supplying multiple -i options
* Added missing docs for -m option.

5 files changed, 59 insertions, 13 deletions

diff --git a/net/iftop/Makefile b/net/iftop/Makefile
index eefa50cd4c7..0a2b902ad24 100644
--- a/net/iftop/Makefile
+++ b/net/iftop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2017/04/24 12:15:27 sborrill Exp $
+# $NetBSD: Makefile,v 1.20 2017/12/11 10:44:16 manu Exp $
 #
 
-DISTNAME=	iftop-0.17
-PKGREVISION=	5
+DISTNAME=	iftop-1.0pre4
+#PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.ex-parrot.com/~pdw/iftop/download/
 
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.ex-parrot.com/~pdw/iftop/download/
 COMMENT=	Display bandwidth usage on an interface
 
 USE_CURSES=		chgat
+FAKE_NCURSES=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-resolver=netdb_1thread
 
diff --git a/net/iftop/distinfo b/net/iftop/distinfo
index b2c11614e9a..d3f5a729c57 100644
--- a/net/iftop/distinfo
+++ b/net/iftop/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 00:35:05 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/12/11 10:44:16 manu Exp $
 
-SHA1 (iftop-0.17.tar.gz) = 75ce6afc8c0bf851278b0a15e66f523af90cfda9
-RMD160 (iftop-0.17.tar.gz) = 0111fdd3d2ba068acd41d9279c987d6699840736
-SHA512 (iftop-0.17.tar.gz) = 41e3bc5feac5927f67356f491fcab7a28f7a32102cc33c67d81c1dc755273c42e32b540b14b6254a540f1b6c1b1ad6c50e3095c3b5282db2ea12dd0049ce2ebd
-Size (iftop-0.17.tar.gz) = 160381 bytes
-SHA1 (patch-aa) = 1c0c12967ba01d18f2826f874a8f5a076d88c31b
+SHA1 (iftop-1.0pre4.tar.gz) = 7f8e16ea26a0dee37ec9d1cbcef7b27692036572
+RMD160 (iftop-1.0pre4.tar.gz) = 10730f5deccbc090ed0d5b91de009a1af9e0c90d
+SHA512 (iftop-1.0pre4.tar.gz) = abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22
+Size (iftop-1.0pre4.tar.gz) = 204665 bytes
+SHA1 (patch-addrs_ioctl.c) = 3b7907efd321409038217eb2476814b9adbb5114
 SHA1 (patch-dlcommon.h) = 787296f9d337a6b6a5ef080452cd14a3580a5fc3
+SHA1 (patch-iftop.c) = 1f840b7446b839443279b3f2fa52a060401cdc88
+SHA1 (patch-iftop.h) = 4a0760bc69e821e43d41da46ab44dfd35ddfb5dd
diff --git a/net/iftop/patches/patch-addrs_ioctl.c b/net/iftop/patches/patch-addrs_ioctl.c
new file mode 100644
index 00000000000..2e75cfbc197
--- /dev/null
+++ b/net/iftop/patches/patch-addrs_ioctl.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-addrs_ioctl.c,v 1.1 2017/12/11 10:44:17 manu Exp $
+
+Enable BSD features for NetBSD  
+From <Jean-Jacques.Puig@espci.fr>
+
+--- addrs_ioctl.c
++++ addrs_ioctl.c
+@@ -18,7 +18,7 @@
+ #include <net/if.h>
+ #include <netinet/in.h>
+ 
+-#if defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ \
++#if defined __NetBSD__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ \
+       || ( defined __GLIBC__ && ! defined __linux__ )
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+@@ -80,7 +80,7 @@ get_addrs_ioctl(char *interface, u_int8_t if_hw_addr[], struct in_addr *if_ip_ad
+     got_hw_addr = 1;
+   }
+ #else
+-#if defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ \
++#if defined __NetBSD__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ \
+       || ( defined __GLIBC__ && ! defined __linux__ )
+   {
+     int sysctlparam[6] = {CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0};
diff --git a/net/iftop/patches/patch-aa b/net/iftop/patches/patch-iftop.c
index 3385b797f09..7e1e9eb3dd4 100644
--- a/net/iftop/patches/patch-aa
+++ b/net/iftop/patches/patch-iftop.c
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.1 2009/07/07 21:20:37 joerg Exp $
+$NetBSD: patch-iftop.c,v 1.1 2017/12/11 10:44:17 manu Exp $
 
---- iftop.c.orig	2009-07-05 17:30:23.000000000 +0200
-+++ iftop.c
-@@ -528,6 +528,12 @@ void packet_init() {
+--- iftop.c.orig	2014-01-19 21:21:19.000000000 +0100
++++ iftop.c	2017-12-11 11:22:55.000000000 +0100
+@@ -756,8 +756,14 @@
+     }
      else if(dlt == DLT_PPP) {
          packet_handler = handle_ppp_packet;
      }
@@ -15,3 +16,4 @@ $NetBSD: patch-aa,v 1.1 2009/07/07 21:20:37 joerg Exp $
  /* 
   * SLL support not available in older libpcaps
   */
+ #ifdef DLT_LINUX_SLL
diff --git a/net/iftop/patches/patch-iftop.h b/net/iftop/patches/patch-iftop.h
new file mode 100644
index 00000000000..3d77b872939
--- /dev/null
+++ b/net/iftop/patches/patch-iftop.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-iftop.h,v 1.1 2017/12/11 10:44:17 manu Exp $
+
+Enable BSD features for NetBSD
+From <Jean-Jacques.Puig@espci.fr>
+
+--- iftop.h
++++ iftop.h
+@@ -19,7 +19,7 @@
+ #if !defined s6_addr32 && defined __sun__
+ #	define s6_addr32 _S6_un._S6_u32
+ #elif !defined s6_addr32 && \
+-		( defined __OpenBSD__ || defined __FreeBSD__ )
++		( defined __OpenBSD__ || defined __FreeBSD__ || defined __NetBSD__ )
+ #	define s6_addr32 __u6_addr.__u6_addr32
+ #endif	/* !defined s6_addr32 */
+