htop: Update to 2.2.0.

What's new in htop 2.2.0:

  * Solaris/Illumos/OpenIndiana support (thanks to Guy M. Broome)
  * -t/--tree flag for starting in tree-view mode (thanks to Daniel Flanagan)
  * macOS: detects High Sierra version to avoid OS bug (thanks to Pierre
    Malhaire)
  * OpenBSD: read battery data (thanks to @nerd972)
  * Various automake and build improvements (thanks to Kang-Che Sung)
  * Check for pkg-config when building with --enable-delayacct (thanks to
    @florian2833z for the report)
  * Avoid some bashisms in configure script (thanks to Jesin)
  * Use CFLAGS from ncurses*-config if present (thanks to Michael Klein)
  * Header generator supports non-UTF-8 environments (thanks to @volkov-am)
  * Linux: changed detection of kernel threads
  * Collapse current subtree pressing Backspace
  * BUGFIX: fix behavior of SYSCR column (thanks to Marc Kleine-Budde)
  * BUGFIX: obtain exit code of lsof correctly (thanks to @wangqr)
  * BUGFIX: fix crash with particular keycodes (thanks to Wellington Torrejais
    da Silva for the report)
  * BUGFIX: fix issue with small terminals (thanks to Daniel Elf for the report)
  * BUGFIX: fix terminal color issues (thanks to Kang-Che Sung for the report)
  * BUGFIX: preserve LDFLAGS when building (thanks to Lance Frederickson for
    the report)
  * BUGFIX: fixed overflow for systems with >= 100 signals

What's new in htop 2.1.0:

 * Linux: Delay accounting metrics (thanks to André Carvalho)
 * DragonFly BSD support (thanks to Diederik de Groot)
 * Support for real-time signals (thanks to Kang-Che Sung)
 * 'c' key now works with threads as well
 * Session column renamed from SESN to SID (thanks to Kamyar Rasta)
 * Improved UI for meter style selection (thanks to Kang-Che Sung)
 * Improved code for constructing process tree (thanks to wangqr)
 * Compile-time option to disable setuid
 * Error checking of various standard library operations
 * Replacement of sprintf with snprintf (thanks to Tomasz Kramkowski)
 * Linux: performance improvements in battery meter
 * Linux: update process TTY device
 * Linux: add support for sorting TASK_IDLE (thanks to Vladimir Panteleev)
 * Linux: add upper-bound to running process counter (thanks to Lucas Correia
   Villa Real)
 * BUGFIX: avoid crash when battery is removed (thanks to Jan Chren)
 * BUGFIX: macOS: fix infinite loop in tree view (thanks to Wataru Ashihara)

5 files changed, 26 insertions, 65 deletions

diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index 42d6d85f54c..e9994fb91c2 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -1,36 +1,21 @@
-# $NetBSD: Makefile,v 1.16 2017/11/24 02:06:13 maya Exp $
+# $NetBSD: Makefile,v 1.17 2018/11/05 12:19:23 jperkin Exp $
 
-DISTNAME=	htop-2.0.2
+DISTNAME=	htop-2.2.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hisham.hm/htop/releases/${PKGVERSION_NOREV}/
-PKGREVISION=	1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 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
-
-pre-configure:
-	set -e; cd ${WRKSRC}; \
-	aclocal; \
-	autoconf; \
-	automake
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS" && exists(/system/lxproc)
-ONLY_FOR_PLATFORM+=	SunOS-*-*
-CONFIGURE_ARGS+=	--with-proc=/system/lxproc
-.endif
+USE_NCURSES=	yes # uses ncurses mouse definitions
 
 REPLACE_PYTHON+=	scripts/MakeHeader.py
-CONFIGURE_ENV+=		ac_cv_file__proc_stat=yes ac_cv_file__proc_meminfo=yes
+CONFIGURE_ENV+=		ac_cv_file__proc_meminfo=yes
+CONFIGURE_ENV+=		ac_cv_file__proc_stat=yes
 
 .include "../../lang/python/application.mk"
 .include "../../devel/ncursesw/buildlink3.mk"
diff --git a/sysutils/htop/distinfo b/sysutils/htop/distinfo
index 6619e9e6782..8cc7136d039 100644
--- a/sysutils/htop/distinfo
+++ b/sysutils/htop/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.11 2017/11/24 02:06:13 maya Exp $
+$NetBSD: distinfo,v 1.12 2018/11/05 12:19:23 jperkin Exp $
 
-SHA1 (htop-2.0.2.tar.gz) = 201f793f13dce2448e36047079875b9bd5bba75a
-RMD160 (htop-2.0.2.tar.gz) = af17b9f7e1744e2db4d6a28c95cdfb9536343786
-SHA512 (htop-2.0.2.tar.gz) = 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
-Size (htop-2.0.2.tar.gz) = 476364 bytes
-SHA1 (patch-TraceScreen.c) = 85f9e26c9a2ddf1e1b4df7010194a43bf622b2ea
-SHA1 (patch-configure.ac) = 87557f0b0027462f244cd0c9e14739d10bbfc010
+SHA1 (htop-2.2.0.tar.gz) = 5da790e6addf495edc4d8ed7d69d1f0de085c7ad
+RMD160 (htop-2.2.0.tar.gz) = 4d89c35c22c5e6377d374af0e0ff68610b22c79f
+SHA512 (htop-2.2.0.tar.gz) = ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
+Size (htop-2.2.0.tar.gz) = 308109 bytes
+SHA1 (patch-configure) = b7205e0d3466d89be4ab4fb29676091c05b599b1
 SHA1 (patch-linux_Platform.c) = d37f4f5116023fa8d8f58f6b925e4f86e9748cea
diff --git a/sysutils/htop/patches/patch-TraceScreen.c b/sysutils/htop/patches/patch-TraceScreen.c
deleted file mode 100644
index 5fb778a7e3b..00000000000
--- a/sysutils/htop/patches/patch-TraceScreen.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-TraceScreen.c,v 1.1 2017/03/25 10:53:59 maya Exp $
-
-Add missing include
-
---- TraceScreen.c.orig	2016-05-26 00:37:01.000000000 +0000
-+++ TraceScreen.c
-@@ -22,6 +22,7 @@ in the source distribution for its full 
- #include <stdbool.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <sys/time.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <signal.h>
diff --git a/sysutils/htop/patches/patch-configure b/sysutils/htop/patches/patch-configure
new file mode 100644
index 00000000000..162474496c5
--- /dev/null
+++ b/sysutils/htop/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2018/11/05 12:19:23 jperkin Exp $
+
+Pretend NetBSD is Linux.
+
+--- configure.orig	2018-04-10 13:43:15.000000000 +0000
++++ configure
+@@ -4523,7 +4523,7 @@ $as_echo "$ac_cv_safe_to_define___extens
+ # Checks for platform.
+ # ----------------------------------------------------------------------
+ case "$target_os" in
+-linux*|gnu*)
++linux*|gnu*|*netbsd*)
+    my_htop_platform=linux
+    ;;
+ freebsd*|kfreebsd*)
diff --git a/sysutils/htop/patches/patch-configure.ac b/sysutils/htop/patches/patch-configure.ac
deleted file mode 100644
index 75bbea15d73..00000000000
--- a/sysutils/htop/patches/patch-configure.ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.5 2016/07/22 05:30:58 maya Exp $
-
-Add minimal NetBSD support.
-
---- configure.ac.orig	2016-07-21 19:54:31.000000000 +0000
-+++ configure.ac
-@@ -31,7 +31,7 @@ LT_INIT([disable-shared static])
- # Checks for platform.
- # ----------------------------------------------------------------------
- case "$target_os" in
--linux*|gnu*)
-+linux*|gnu*|*solaris*|*netbsd*)
-    my_htop_platform=linux
-    ;;
- freebsd*|kfreebsd*)
-@@ -266,6 +266,8 @@ 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_SOLARIS], [test "$my_htop_platform" = solaris])
- AM_CONDITIONAL([HTOP_UNSUPPORTED], [test "$my_htop_platform" = unsupported])
- AC_SUBST(my_htop_platform)
- AC_CONFIG_FILES([Makefile htop.1])