From cdd83d42b0eacc711c0abbb2fc03b7385e4ef99b Mon Sep 17 00:00:00 2001
From: nia <nia@pkgsrc.org>
Date: Tue, 19 Oct 2021 07:37:36 +0000
Subject: htop: update to 3.1.1

What's new in version 3.1.1

* Update license headers to explicitly say GPLv2+
* Document minimum version for libcap (thanks to James Brown)
* Fix mouse wheel collision with autogroups nice adjustment
* Adjust Makefile.am macro definitions for older automake versions
* Ensure consistent reporting of MemoryMeter 'used' memory
* Report hugepage memory as real and used memory (as before)
* Handle procExeDeleted, usesDeletedLib without mergedCommandline mode
* Validate meter configuration before proceeding beyond htoprc parsing
* Properly release memory on partially read configuration
* Handle interrupted sampling from within libpcp PDU transfers
* On Linux, provide O_PATH value if not defined
* On Linux, always compute procExeDeleted if already set
* Workaround for Rosetta 2 on Darwin (thanks to Alexander Momchilov)
* Fix FreeBSD cmdline memory leak in Process_updateCmdline, and
* Plug a Disk I/O meter memory leak on FreeBSD (thanks to Ximalas)
---
 sysutils/htop/Makefile                  |  5 ++---
 sysutils/htop/distinfo                  |  8 ++++----
 sysutils/htop/patches/patch-MainPanel.c | 25 -------------------------
 3 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 sysutils/htop/patches/patch-MainPanel.c

diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index b251c3e0a35..d05027b5b6e 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2021/09/28 17:57:38 fox Exp $
+# $NetBSD: Makefile,v 1.23 2021/10/19 07:37:36 nia Exp $
 
-DISTNAME=	htop-3.1.0
+DISTNAME=	htop-3.1.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=htop-dev/}
-GITHUB_TAG=	3.1.0
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://htop.dev/
diff --git a/sysutils/htop/distinfo b/sysutils/htop/distinfo
index 3a43ad94610..00b7c401173 100644
--- a/sysutils/htop/distinfo
+++ b/sysutils/htop/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2021/10/07 14:57:56 nia Exp $
+$NetBSD: distinfo,v 1.16 2021/10/19 07:37:36 nia Exp $
 
-RMD160 (htop-3.1.0.tar.gz) = eb64c52e19df747bfe5b03ebc607b950e5084bf3
-SHA512 (htop-3.1.0.tar.gz) = bb4422591a61978d1cc5b423413820c14cc571c4660087387949f1071609da38e42be2be8485863cb19b0b957d1fdeb5b2df46212d9ddd3891871b1c9d276c6e
-Size (htop-3.1.0.tar.gz) = 378838 bytes
+RMD160 (htop-3.1.1.tar.gz) = 3ba49c8793d461037c5787d1b02f21d72241751b
+SHA512 (htop-3.1.1.tar.gz) = 5e4ec9b5fdf4583c8a345dcc2fe9395737e3a6e8dd8e6547800b959be084b9d57ae30bf891f79a25f6bf99ec0b6eb7eaba8bc851072c5a550de70df4178dc07d
+Size (htop-3.1.1.tar.gz) = 381277 bytes
 SHA1 (patch-MainPanel.c) = da63da783a1df784ec31ac4cbdacb0fbbfeb9ef6
diff --git a/sysutils/htop/patches/patch-MainPanel.c b/sysutils/htop/patches/patch-MainPanel.c
deleted file mode 100644
index 3322d948e08..00000000000
--- a/sysutils/htop/patches/patch-MainPanel.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-MainPanel.c,v 1.1 2021/09/28 17:57:39 fox Exp $
-
-Check for mouse events only if HAVE_GETMOUSE is defined.
-
-NOTE: This has been fixed upstream and the patch will be removed in the next release.
-https://github.com/htop-dev/htop/pull/820
-
---- MainPanel.c.orig	2021-09-28 02:18:18.760961460 +0000
-+++ MainPanel.c
-@@ -61,9 +61,15 @@ static HandlerResult MainPanel_eventHand
-    if (ch == KEY_RESIZE)
-       return IGNORED;
- 
-+   #ifdef HAVE_GETMOUSE
-    /* reset on every normal key, except mouse events while mouse support is disabled */
-    if (ch != ERR && (ch != KEY_MOUSE || this->state->settings->enableMouse))
-       this->state->hideProcessSelection = false;
-+   #else
-+   /* reset on every normal key */
-+   if (ch != ERR)
-+      this->state->hideProcessSelection = false;
-+   #endif
- 
-    if (EVENT_IS_HEADER_CLICK(ch)) {
-       int x = EVENT_HEADER_CLICK_GET_X(ch);
-- 
cgit v1.2.3