btop: Update the package and make it run in NetBSD

[Santhosh Raju <fox%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By:	fox
Date:		Sat Jan 6 13:19:44 2024 +0100
Changeset:	5e58cbb886bd6f94ff708e15e5b208080bc9cf22

Modified Files:
	btop/Makefile
	btop/PLIST
	btop/TODO
	btop/distinfo
	btop/patches/patch-Makefile

Log Message:
btop: Update the package and make it run in NetBSD

- Update the Makefile to pull from the latest git commit.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5e58cbb886bd6f94ff708e15e5b208080bc9cf22

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 btop/Makefile               | 13 +++++++++++--
 btop/PLIST                  | 33 +++++++++++++++++++++++++++++++++
 btop/TODO                   |  5 ++++-
 btop/distinfo               | 10 ++++++----
 btop/patches/patch-Makefile | 24 +++++++++++++-----------
 5 files changed, 67 insertions(+), 18 deletions(-)

diffs:
diff --git a/btop/Makefile b/btop/Makefile
index 153b12774a..3df24eed5a 100644
--- a/btop/Makefile
+++ b/btop/Makefile
@@ -1,18 +1,27 @@
 # $NetBSD$
 
-DISTNAME=	btop-1.2.5
+DISTNAME=	btop-1.2.13.20240103
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=aristocratos/}
-GITHUB_TAG=	v${PKGVERSION_NOREV}
+#GITHUB_TAG=	v${PKGVERSION_NOREV}
+GITHUB_TAG=	114a98d813f618ab8ef594eb0de90a2a13dd3a0c
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/aristocratos/btop
 COMMENT=	Colorful TTY resource monitor
 LICENSE=	apache-2.0
 
+# This package points to the latest commit in git.
+# When moving to pkgsrc-current, this section can be removed.
+CONFLICTS=	btop-[0-9]*
+
 DEPENDS+=	coreutils-[0-9]*:../../sysutils/coreutils
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
+GCC_REQD+=	10
+
+MAKE_ARGS=	STRIP=true ADDFLAGS="${CXXFLAGS} ${LDFLAGS}" VERBOSE=true
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/btop/PLIST b/btop/PLIST
index 48d96a5493..075f2616e8 100644
--- a/btop/PLIST
+++ b/btop/PLIST
@@ -1 +1,34 @@
 @comment $NetBSD$
+bin/btop
+share/applications/btop.desktop
+share/btop/README.md
+share/btop/themes/HotPurpleTrafficLight.theme
+share/btop/themes/adapta.theme
+share/btop/themes/adwaita.theme
+share/btop/themes/ayu.theme
+share/btop/themes/dracula.theme
+share/btop/themes/dusklight.theme
+share/btop/themes/elementarish.theme
+share/btop/themes/everforest-dark-hard.theme
+share/btop/themes/flat-remix-light.theme
+share/btop/themes/flat-remix.theme
+share/btop/themes/greyscale.theme
+share/btop/themes/gruvbox_dark.theme
+share/btop/themes/gruvbox_dark_v2.theme
+share/btop/themes/gruvbox_material_dark.theme
+share/btop/themes/horizon.theme
+share/btop/themes/kyli0x.theme
+share/btop/themes/matcha-dark-sea.theme
+share/btop/themes/monokai.theme
+share/btop/themes/night-owl.theme
+share/btop/themes/nord.theme
+share/btop/themes/onedark.theme
+share/btop/themes/paper.theme
+share/btop/themes/solarized_dark.theme
+share/btop/themes/solarized_light.theme
+share/btop/themes/tokyo-night.theme
+share/btop/themes/tokyo-storm.theme
+share/btop/themes/tomorrow-night.theme
+share/btop/themes/whiteout.theme
+share/icons/hicolor/48x48/apps/btop.png
+share/icons/hicolor/scalable/apps/btop.svg
diff --git a/btop/TODO b/btop/TODO
index 70072d81ac..7614ccc0cf 100644
--- a/btop/TODO
+++ b/btop/TODO
@@ -1,3 +1,6 @@
-Does not compile on NetBSD.
+- Compiles and runs on NetBSD.
+- Needs fixes on some of the memory stats shown.
+- Needs some testing and verification done on features / funtions working in NetBSD.
 
 https://github.com/aristocratos/btop/issues/301
+https://github.com/aristocratos/btop/pull/703
\ No newline at end of file
diff --git a/btop/distinfo b/btop/distinfo
index 0c1d668b15..de81d8f6b6 100644
--- a/btop/distinfo
+++ b/btop/distinfo
@@ -1,6 +1,8 @@
 $NetBSD$
 
-BLAKE2s (btop-1.2.5.tar.gz) = 744f8b668fb87010a480388ee2987e85a658ab18f98ec6daf45c6872f6eb7c00
-SHA512 (btop-1.2.5.tar.gz) = f881c2f8e85ccf7609ef443b4bec3c20e4f41c9b45171ddc3110a5484bf39cb2c3e4b7eff0a97930fe550d557526cec58b5867d55ed9d75f4a8976f0c92d5d10
-Size (btop-1.2.5.tar.gz) = 971598 bytes
-SHA1 (patch-Makefile) = f5631b29ed8341d90acdc6638cc5db2a5d87f739
+BLAKE2s (btop-1.2.13.20240103-114a98d813f618ab8ef594eb0de90a2a13dd3a0c.tar.gz) = 5b96897391ec55189abb61705af0c221f8704cf009c41f637f3c21a151a8fcd7
+SHA512 (btop-1.2.13.20240103-114a98d813f618ab8ef594eb0de90a2a13dd3a0c.tar.gz) = 8f1e638b7e49813b17eafbb07b0bb500dd35ad8e3501053846c18cfe14ab13b45b7da522f99ca30cee03207d90d6d7aa3480b95c629448a5427ae62051d4e38b
+Size (btop-1.2.13.20240103-114a98d813f618ab8ef594eb0de90a2a13dd3a0c.tar.gz) = 1142649 bytes
+SHA1 (patch-Makefile) = e106baf05007146c1f38dd190b639844f4743d4e
+SHA1 (patch-src_btop.cpp) = 60c805d6a5343d2e46f8f7cb0b03059426871fe9
+SHA1 (patch-src_netbsd_btop__collect.cpp) = 3d86f131f33c5099233f101f6226a9804c3dd56a
diff --git a/btop/patches/patch-Makefile b/btop/patches/patch-Makefile
index 3dcb064cbe..e65e7b35f5 100644
--- a/btop/patches/patch-Makefile
+++ b/btop/patches/patch-Makefile
@@ -1,17 +1,19 @@
 $NetBSD$
 
---- Makefile.orig	2022-03-05 23:27:23.000000000 +0000
+Add support for NetBSD.
+
+--- Makefile.orig	2024-01-02 15:54:52.000000000 +0000
 +++ Makefile
-@@ -89,6 +89,12 @@ else ifeq ($(PLATFORM_LC),freebsd)
- 	SU_GROUP := wheel
- 	override ADDFLAGS += -lstdc++ -lm -lkvm -ldevstat -Wl,-rpath=/usr/local/lib/gcc11
+@@ -166,6 +166,12 @@ else ifeq ($(PLATFORM_LC),openbsd)
+ 	override ADDFLAGS += -lkvm
  	export MAKE = gmake
+ 	SU_GROUP := wheel
 +else ifeq ($(PLATFORM_LC),netbsd)
-+	PLATFORM_DIR := freebsd
-+	THREADS	:= $(shell getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)
-+	SU_GROUP := wheel
-+	override ADDFLAGS += -lm
++	PLATFORM_DIR := netbsd
++	THREADS	:= $(shell sysctl -n hw.ncpu || echo 1)
++	override ADDFLAGS += -lkvm
 +	export MAKE = gmake
- else ifeq ($(PLATFORM_LC),macos)
- 	PLATFORM_DIR := osx
- 	THREADS	:= $(shell sysctl -n hw.ncpu || echo 1)
++	SU_GROUP := wheel
+ else
+ $(error $(shell printf "\033[1;91mERROR: \033[97mUnsupported platform ($(PLATFORM))\033[0m"))
+ endif