btop-git: sync with upstream changes.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: btop-git: sync with upstream changes.
From: Santhosh Raju (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Fri, 10 Jul 2026 07:56:12 +0000
Module Name:	pkgsrc-wip
Committed By:	Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By:	fox
Date:		Fri Jul 10 09:51:51 2026 +0200
Changeset:	9778010611b6d2197b18389ba8069ac1c07b6a1c

Modified Files:
	btop-git/Makefile
	btop-git/distinfo
	btop-git/patches/patch-Makefile
	btop-git/patches/patch-src_btop.cpp
	btop-git/patches/patch-src_netbsd_btop__collect.cpp

Log Message:
btop-git: sync with upstream changes.

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

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

diffstat:
 btop-git/Makefile                                   |  4 +++-
 btop-git/distinfo                                   |  6 +++---
 btop-git/patches/patch-Makefile                     | 20 ++++++++++----------
 btop-git/patches/patch-src_btop.cpp                 | 20 +++++---------------
 btop-git/patches/patch-src_netbsd_btop__collect.cpp |  8 ++++----
 5 files changed, 25 insertions(+), 33 deletions(-)

diffs:
diff --git a/btop-git/Makefile b/btop-git/Makefile
index 6bcbf94c90..8b6f6d7333 100644
--- a/btop-git/Makefile
+++ b/btop-git/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	btop-1.4.7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=aristocratos/}
-GITHUB_TAG=	6e39144aaf5a6bc01b9f795010b0914431067183
+GITHUB_TAG=	9527231dfbcbe697f8eb80849e267377194e6ca8
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/aristocratos/btop
@@ -16,6 +16,8 @@ GIT_REPO=      https://github.com/aristocratos/btop.git
 # https://github.com/aristocratos/btop/pull/1106
 GCC_REQD+=	14
 
+CONFLICTS=      btop-[0-9]*
+
 TOOL_DEPENDS+=	lowdown-[0-9]*:../../textproc/lowdown
 
 USE_LANGUAGES=	c c++
diff --git a/btop-git/distinfo b/btop-git/distinfo
index b7de36e4c2..226f0aa50a 100644
--- a/btop-git/distinfo
+++ b/btop-git/distinfo
@@ -3,6 +3,6 @@ $NetBSD$
 BLAKE2s (btop-1.4.7-6e39144aaf5a6bc01b9f795010b0914431067183.tar.gz) = 7a1d8fea484e969ddde9eed5ff090259683e5a674180b82b98b17574aa7c7652
 SHA512 (btop-1.4.7-6e39144aaf5a6bc01b9f795010b0914431067183.tar.gz) = b90d96cc53bde84637535584af13109f6998d2f5a0be4143829814ff30ad4da71173822a5aa4c96a790a86a7950258197504350c17567ed8a330eca3c24bc1bc
 Size (btop-1.4.7-6e39144aaf5a6bc01b9f795010b0914431067183.tar.gz) = 1280353 bytes
-SHA1 (patch-Makefile) = 7cec0d616dd445ad139f0868141d15d1687bf402
-SHA1 (patch-src_btop.cpp) = d82f33f0f894d2ecfe622116b650ef06dac42666
-SHA1 (patch-src_netbsd_btop__collect.cpp) = bb00b530a53f3993c328020e24853723d5100818
+SHA1 (patch-Makefile) = 8220b2a9b2ff0bbef5b94efa3310144ccf75d07b
+SHA1 (patch-src_btop.cpp) = bd854848d69b3725e23f9af3736c9ae0a8787776
+SHA1 (patch-src_netbsd_btop__collect.cpp) = e097c005ac69be8ba34a9c13f2471036e8f06c93
diff --git a/btop-git/patches/patch-Makefile b/btop-git/patches/patch-Makefile
index b54c274b87..0ec84b968d 100644
--- a/btop-git/patches/patch-Makefile
+++ b/btop-git/patches/patch-Makefile
@@ -1,29 +1,29 @@
-$NetBSD: patch-Makefile,v 1.3 2025/12/28 02:25:17 fox Exp $
+$NetBSD$
 
-Fix the man page path.
+Fix man page path.
 
---- Makefile.orig	2025-12-26 15:53:24.000000000 +0000
+--- Makefile.orig	2026-07-06 08:45:11.525089446 +0000
 +++ Makefile
-@@ -317,9 +317,9 @@ install:
+@@ -378,9 +378,9 @@ install:
  	@mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
  	@cp -p Img/icon.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg
  ifneq ($(wildcard btop.1),)
--	@printf "\033[1;92mInstalling man page to: \033[1;97m$(DESTDIR)$(PREFIX)/share/man/man1/btop.1\033[0m\n"
+-	@$(call green,Installing man page to: ,$(WHITE)$(DESTDIR)$(PREFIX)/share/man/man1/btop.1)
 -	@mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
 -	@cp -p btop.1 $(DESTDIR)$(PREFIX)/share/man/man1/btop.1
-+	@printf "\033[1;92mInstalling man page to: \033[1;97m$(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1/btop.1\033[0m\n"
++	@$(call green,Installing man page to: ,$(WHITE)$(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1/btop.1)
 +	@mkdir -p $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1
 +	@cp -p btop.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1/btop.1
  endif
  
  #? Set SUID bit for btop as $SU_USER in $SU_GROUP
-@@ -348,8 +348,8 @@ uninstall:
+@@ -409,8 +409,8 @@ uninstall:
  	@rm -rfv $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/btop.png
- 	@printf "\033[1;91mRemoving: \033[1;97m$(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg\033[0m\n"
+ 	@$(call red,Removing: ,$(WHITE)$(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg)
  	@rm -rfv $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg
--	@printf "\033[1;91mRemoving: \033[1;97m$(DESTDIR)$(PREFIX)/share/man/man1/btop.1\033[0m\n"
+-	@$(call red,Removing: ,$(WHITE)$(DESTDIR)$(PREFIX)/share/man/man1/btop.1)
 -	@rm -rfv $(DESTDIR)$(PREFIX)/share/man/man1/btop.1
-+	@printf "\033[1;91mRemoving: \033[1;97m$(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1/btop.1\033[0m\n"
++	@$(call red,Removing: ,$(WHITE)$(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1/btop.1)
 +	@rm -rfv $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1/btop.1
  
  #? Pull in dependency info for *existing* .o files
diff --git a/btop-git/patches/patch-src_btop.cpp b/btop-git/patches/patch-src_btop.cpp
index c8151dd156..082d9d9cf6 100644
--- a/btop-git/patches/patch-src_btop.cpp
+++ b/btop-git/patches/patch-src_btop.cpp
@@ -9,7 +9,7 @@ Fix pthread_cancel deadlocks on NetBSD:
    sem_wait doesn't automatically wake on cancellation
 4. Check for cancellation in semaphore acquire loop
 
---- src/btop.cpp.orig	2026-05-06 15:50:33.000000000 +0000
+--- src/btop.cpp.orig	2026-07-06 07:53:49.000000000 +0000
 +++ src/btop.cpp
 @@ -44,6 +44,8 @@ tab-size = 4
  #include <chrono>
@@ -20,7 +20,7 @@ Fix pthread_cancel deadlocks on NetBSD:
  
  #ifdef __APPLE__
  	#include <CoreFoundation/CoreFoundation.h>
-@@ -370,8 +372,21 @@ namespace Runner {
+@@ -364,8 +366,21 @@ namespace Runner {
  	}
  
  	//* Setup semaphore for triggering thread to do work
@@ -44,7 +44,7 @@ Fix pthread_cancel deadlocks on NetBSD:
  	inline void thread_wait() { do_work.acquire(); }
  	inline void thread_trigger() { do_work.release(); }
  
-@@ -458,6 +473,12 @@ namespace Runner {
+@@ -452,6 +467,12 @@ namespace Runner {
  		}
  	}
  
@@ -57,7 +57,7 @@ Fix pthread_cancel deadlocks on NetBSD:
  	//? ------------------------------- Secondary thread: async launcher and drawing ----------------------------------
  	static void * _runner(void *) {
  		//? Block some signals in this thread to avoid deadlock from any signal handlers trying to stop this thread
-@@ -468,8 +489,10 @@ namespace Runner {
+@@ -462,8 +483,10 @@ namespace Runner {
  		sigaddset(&mask, SIGTERM);
  		pthread_sigmask(SIG_BLOCK, &mask, nullptr);
  
@@ -70,7 +70,7 @@ Fix pthread_cancel deadlocks on NetBSD:
  
  		//* ----------------------------------------------- THREAD LOOP -----------------------------------------------
  		while (not Global::quitting) {
-@@ -725,12 +748,22 @@ namespace Runner {
+@@ -719,12 +742,22 @@ namespace Runner {
  
  			//? If overlay isn't empty, print output without color and then print overlay on top
  			const bool term_sync = Config::getB("terminal_sync");
@@ -93,13 +93,3 @@ Fix pthread_cancel deadlocks on NetBSD:
  		return {};
  	}
  	//? ------------------------------------------ Secondary thread end -----------------------------------------------
-@@ -744,6 +777,9 @@ namespace Runner {
- 			// exit(1);
- 			pthread_cancel(Runner::runner_id);
- 
-+			//? Wake thread from sem_wait so it can process the cancellation
-+			thread_trigger();
-+
- 			// Wait for the thread to actually terminate before creating a new one
- 			void* thread_result;
- 			int join_result = pthread_join(Runner::runner_id, &thread_result);
diff --git a/btop-git/patches/patch-src_netbsd_btop__collect.cpp b/btop-git/patches/patch-src_netbsd_btop__collect.cpp
index ae8da3b2a6..c378bb4556 100644
--- a/btop-git/patches/patch-src_netbsd_btop__collect.cpp
+++ b/btop-git/patches/patch-src_netbsd_btop__collect.cpp
@@ -11,18 +11,18 @@ By caching the UID->username mappings, we minimize the number of getpwuid()
 calls, reducing the window where the thread can get stuck in a non-cancellable
 state.
 
---- src/netbsd/btop_collect.cpp.orig	2026-05-06 15:50:33.000000000 +0000
+--- src/netbsd/btop_collect.cpp.orig	2026-07-06 07:53:49.000000000 +0000
 +++ src/netbsd/btop_collect.cpp
-@@ -1091,7 +1091,7 @@
+@@ -1091,7 +1091,7 @@ namespace Net {
  namespace Proc {
-
+ 
  	vector<proc_info> current_procs;
 -	std::unordered_map<string, string> uid_user;
 +	std::unordered_map<uid_t, string> uid_user;
  	string current_sort;
  	string current_filter;
  	bool current_rev = false;
-@@ -1248,9 +1248,22 @@
+@@ -1248,9 +1248,22 @@ namespace Proc {
  					}
  					new_proc.ppid = kproc->p_ppid;
  					new_proc.cpu_s = round(kproc->p_ustart_sec);
Prev by Date: htop-git: sync with upstream changes.
Next by Date: foliate: add CONFLICTS.
Previous by Thread: btop-git: sync with upstream changes.
Next by Thread: btop-git: add the missed out patch.
Indexes:
Home | Main Index | Thread Index | Old Index