Updated htop to 2.0.1.

Update to 2.0.0 from coypu in wip, updated by myself to 2.0.1.

What's new in version 2.0.1

* OpenBSD: Various fixes and improvements
  (thanks to Michael McConville and Juan Francisco Cantero Hurtado)
* FreeBSD: fix CPU and memory readings
  (thanks to Tim Creech, Hung-Yi Chen, Bernard Spil, Greg V)
* FreeBSD: add battery support
  (thanks to Greg V)
* Linux: Retain last-obtained name of a zombie process
* Mac OS X: Improve portability for OS X versions
  (thanks to Michael Klein)
* Mac OS X: Fix reading command-line arguments and basename
* Mac OS X: Fix process state information
* Mac OS X: Fix tree view collapsing/expanding
* Mac OS X: Fix tree organization
* Mac OS X: Fix memory accounting
* Fix crash when emptying a column of meters
* Make Esc key more responsive
* Plus assorted fixes

What's new in version 2.0.0

* Platform abstraction layer
* Initial FreeBSD support
* Initial Mac OS X support
  (thanks to David Hunt)
* Swap meter for Mac OSX
  (thanks to Ștefan Rusu)
* OpenBSD port
  (thanks to Michael McConville)
* FreeBSD support improvements
  (thanks to Martin Misuth)
* Support for NCurses 6 ABI, including mouse wheel support
* Much improved mouse responsiveness
* Process environment variables screen
  (thanks to Michael Klein)
* Higher-resolution UTF-8 based Graph mode
  (Thanks to James Hall from vtop for the idea!)
* Show program path settings
  (thanks to Tobias Geerinckx-Rice)
* BUGFIX: Fix crash when scrolling an empty filtered list.
* Use dynamic units for text display, and several fixes
  (thanks to Christian Hesse)
* BUGFIX: fix error caused by overflow in usertime calculation.
  (thanks to Patrick Marlier)
* Catch all memory allocation errors
  (thanks to Michael McConville for the push)
* Several tweaks and bugfixes
  (See the Git log for details and contributors!)

8 files changed, 55 insertions, 91 deletions

diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index 6bdded436c5..e40598a9b14 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -1,22 +1,27 @@
-# $NetBSD: Makefile,v 1.10 2015/08/20 13:38:25 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.11 2016/05/06 09:04:17 wiz Exp $
 
-DISTNAME=	htop-1.0.1
-PKGREVISION=	1
+DISTNAME=	htop-2.0.1
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=htop/}
+MASTER_SITES=	http://hisham.hm/htop/releases/2.0.1/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://htop.sourceforge.net/
+HOMEPAGE=	http://hisham.hm/htop/
 COMMENT=	Enhanced version of top utility
 LICENSE=	gnu-gpl-v2
 
+USE_TOOLS+=	automake aclocal autoheader autoconf
 GNU_CONFIGURE=	yes
 USE_NCURSES=	yes # uses ncurses mouse definitions
 
 USE_LIBTOOL=	yes
 
-ONLY_FOR_PLATFORM=     Linux-*-* FreeBSD-*-* NetBSD-*-*
+#ONLY_FOR_PLATFORM=     Linux-*-* FreeBSD-*-* NetBSD-*-*
+
+pre-configure:
+	set -e; cd ${WRKSRC}; \
+	aclocal; \
+	autoconf; \
+	automake
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -25,8 +30,10 @@ ONLY_FOR_PLATFORM+=	SunOS-*-*
 CONFIGURE_ARGS+=	--with-proc=/system/lxproc
 .endif
 
+REPLACE_PYTHON+=	scripts/MakeHeader.py
 CONFIGURE_ENV+=		ac_cv_file__proc_stat=yes ac_cv_file__proc_meminfo=yes
 
+.include "../../lang/python/application.mk"
 .include "../../devel/ncursesw/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/htop/distinfo b/sysutils/htop/distinfo
index 4064650d70c..52bb76492a2 100644
--- a/sysutils/htop/distinfo
+++ b/sysutils/htop/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 01:32:17 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/05/06 09:04:17 wiz Exp $
 
-SHA1 (htop-1.0.1.tar.gz) = bad226ec887a2b7ea5042879ed18e067812d030e
-RMD160 (htop-1.0.1.tar.gz) = c13d438438c5ab8c15c056f7064ae6edb26ec8d9
-SHA512 (htop-1.0.1.tar.gz) = 9cc442fd63fb3270929e489f645d1a63fdcba2bee4ea0e606a86257badb55fa02794b7a97de4070c951f5558b7d40a677e10801a1c42c0832521a453f956997c
-Size (htop-1.0.1.tar.gz) = 384683 bytes
-SHA1 (patch-AvailableColumnsPanel.c) = 0aa40dd4f126a81ff6ad869362486eeb256a2163
-SHA1 (patch-CRT.c) = 6e139b71c64b8ef9b7ef53a08863cd814eb0657e
-SHA1 (patch-ColumnsPanel.c) = 7b7c569aacab0e667b6435f980d0daedbd914e34
-SHA1 (patch-Makefile.am) = eec58f8097488b6aeafabdba5bbc4bb478ffacc8
-SHA1 (patch-Panel.c) = b19e324d5e1bda07d8cd609a5d584637102ca465
+SHA1 (htop-2.0.1.tar.gz) = ef9adab68b0218a16936c306f635e7fce227b7e6
+RMD160 (htop-2.0.1.tar.gz) = e9dbf292c7edd7eb67f694c0df281c2c4d27a003
+SHA512 (htop-2.0.1.tar.gz) = 57991a55b69028c01549b067ec749099466df5b08a0ed9a65dd779e6d2c8ee0a5d9c330bb6c727b04a349146ad441b7115718e433d1f8232f74b28903fb351ff
+Size (htop-2.0.1.tar.gz) = 477196 bytes
+SHA1 (patch-configure.ac) = 169bb4b46fc3e419f8e4bb3faee33ec706724908
diff --git a/sysutils/htop/patches/patch-AvailableColumnsPanel.c b/sysutils/htop/patches/patch-AvailableColumnsPanel.c
deleted file mode 100644
index 7a2253b82f3..00000000000
--- a/sysutils/htop/patches/patch-AvailableColumnsPanel.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-AvailableColumnsPanel.c,v 1.1 2015/08/20 13:38:25 jperkin Exp $
-
-Restrict to ASCII characters.
-
---- AvailableColumnsPanel.c.orig	2011-12-26 21:51:00.000000000 +0000
-+++ AvailableColumnsPanel.c
-@@ -55,7 +55,7 @@ static HandlerResult AvailableColumnsPan
-       }
-       default:
-       {
--         if (isalpha(ch))
-+         if (isascii(ch) && isalpha(ch))
-             result = Panel_selectByTyping(super, ch);
-          break;
-       }
diff --git a/sysutils/htop/patches/patch-CRT.c b/sysutils/htop/patches/patch-CRT.c
deleted file mode 100644
index 736b0988639..00000000000
--- a/sysutils/htop/patches/patch-CRT.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-CRT.c,v 1.2 2012/03/21 18:28:40 drochner Exp $
-
---- CRT.c.orig	2011-12-26 21:52:55.000000000 +0000
-+++ CRT.c
-@@ -120,7 +120,9 @@ int CRT_cursorX = 0;
- 
- char* CRT_termType;
- 
-+#ifdef HAVE_EXECINFO_H
- void *backtraceArray[128];
-+#endif
- 
- static void CRT_handleSIGSEGV(int sgn) {
-    (void) sgn;
diff --git a/sysutils/htop/patches/patch-ColumnsPanel.c b/sysutils/htop/patches/patch-ColumnsPanel.c
deleted file mode 100644
index 964c808a5f7..00000000000
--- a/sysutils/htop/patches/patch-ColumnsPanel.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ColumnsPanel.c,v 1.1 2015/08/20 13:38:25 jperkin Exp $
-
-Restrict to ASCII characters.
-
---- ColumnsPanel.c.orig	2011-12-26 21:53:10.000000000 +0000
-+++ ColumnsPanel.c
-@@ -70,7 +70,7 @@ static HandlerResult ColumnsPanel_eventH
-       }
-       default:
-       {
--         if (isalpha(ch))
-+         if (isascii(ch) && isalpha(ch))
-             result = Panel_selectByTyping(super, ch);
-          if (result == BREAK_LOOP)
-             result = IGNORED;
diff --git a/sysutils/htop/patches/patch-Makefile.am b/sysutils/htop/patches/patch-Makefile.am
deleted file mode 100644
index 1f7631cd28c..00000000000
--- a/sysutils/htop/patches/patch-Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile.am,v 1.2 2012/03/21 18:28:40 drochner Exp $
-
---- Makefile.in.orig	2011-12-26 22:11:41.000000000 +0000
-+++ Makefile.in
-@@ -42,8 +42,8 @@ profile:
- debug:
- 	$(MAKE) all CFLAGS="" AM_CPPFLAGS="-ggdb -DDEBUG"
- 
--.c.h:
--	scripts/MakeHeader.py $<
-+#.c.h:
-+#	scripts/MakeHeader.py $<
- 
- cppcheck:
- 	cppcheck -q -v . --enable=all -DHAVE_CGROUP -DHAVE_OPENVZ -DHAVE_TASKSTATS
diff --git a/sysutils/htop/patches/patch-Panel.c b/sysutils/htop/patches/patch-Panel.c
deleted file mode 100644
index 64df3fff10f..00000000000
--- a/sysutils/htop/patches/patch-Panel.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Panel.c,v 1.1 2015/08/20 13:38:25 jperkin Exp $
-
-Restrict to ASCII characters.
-
---- Panel.c.orig	2012-02-02 23:45:01.000000000 +0000
-+++ Panel.c
-@@ -417,7 +417,7 @@ HandlerResult Panel_selectByTyping(Panel
-    if (!this->eventHandlerBuffer)
-       this->eventHandlerBuffer = calloc(100, 1);
- 
--   if (isalnum(ch)) {
-+   if (isascii(ch) && isalnum(ch)) {
-       int len = strlen(this->eventHandlerBuffer);
-       if (len < 99) {
-          this->eventHandlerBuffer[len] = ch;
diff --git a/sysutils/htop/patches/patch-configure.ac b/sysutils/htop/patches/patch-configure.ac
new file mode 100644
index 00000000000..6e4908ed166
--- /dev/null
+++ b/sysutils/htop/patches/patch-configure.ac
@@ -0,0 +1,35 @@
+$NetBSD: patch-configure.ac,v 1.3 2016/05/06 09:04:17 wiz Exp $
+
+Add minimal NetBSD support.
+
+--- configure.ac.orig	2016-03-07 21:12:25.000000000 +0000
++++ configure.ac
+@@ -39,6 +39,9 @@ case "$target" in
+ *darwin*)
+    my_htop_platform=darwin
+    ;;
++*netbsd*)
++   my_htop_platform=linux
++   ;;
+ *)
+    my_htop_platform=unsupported
+    ;;
+@@ -211,6 +214,10 @@ if test "$my_htop_platform" = "openbsd";
+    AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"])
+ fi
+ 
++if test "$my_htop_platform" = "netbsd"; then
++   AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"])
++fi
++
+ AC_ARG_ENABLE(linux_affinity, [AC_HELP_STRING([--enable-linux-affinity], [enable Linux sched_setaffinity and sched_getaffinity for affinity support, disables hwloc])], ,enable_linux_affinity="yes")
+ if test "x$enable_linux_affinity" = xyes -a "x$cross_compiling" = xno; then
+    AC_MSG_CHECKING([for usable sched_setaffinity])
+@@ -256,6 +263,7 @@ AM_CONDITIONAL([HTOP_LINUX], [test "$my_
+ AM_CONDITIONAL([HTOP_FREEBSD], [test "$my_htop_platform" = freebsd])
+ AM_CONDITIONAL([HTOP_OPENBSD], [test "$my_htop_platform" = openbsd])
+ AM_CONDITIONAL([HTOP_DARWIN], [test "$my_htop_platform" = darwin])
++AM_CONDITIONAL([HTOP_NETBSD], [test "$my_htop_platform" = netbsd])
+ AM_CONDITIONAL([HTOP_UNSUPPORTED], [test "$my_htop_platform" = unsupported])
+ AC_SUBST(my_htop_platform)
+ AC_CONFIG_FILES([Makefile htop.1])