pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

btop-git: pkglint fixes.



Module Name:	pkgsrc-wip
Committed By:	Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By:	fox
Date:		Fri Mar 1 15:16:43 2024 +0100
Changeset:	7c411e5f8775ad57395ef8139694b2fc0278298c

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

Log Message:
btop-git: pkglint fixes.

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

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

diffstat:
 btop-git/Makefile                                   | 6 +++---
 btop-git/distinfo                                   | 2 +-
 btop-git/patches/patch-src_netbsd_btop__collect.cpp | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs:
diff --git a/btop-git/Makefile b/btop-git/Makefile
index b3b6e75bfb..6980ccb9b6 100644
--- a/btop-git/Makefile
+++ b/btop-git/Makefile
@@ -13,10 +13,10 @@ LICENSE=	apache-2.0
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
-GCC_REQD+=	10
-CXXFLAGS+=	-DNDEBUG
+GCC_REQD+=	10 # needs --std=c++20
 
-MAKE_ARGS=	STRIP=true VERBOSE=true
+CXXFLAGS+=	-DNDEBUG
+MAKE_ENV+=	STATIC=true STRIP=true VERBOSE=true
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/btop-git/distinfo b/btop-git/distinfo
index 531fddc7ec..de5b5f657a 100644
--- a/btop-git/distinfo
+++ b/btop-git/distinfo
@@ -5,4 +5,4 @@ SHA512 (btop-1.2.13.20240301-c6fbfd1e27c27cfe89b2e272c0419e57193ea8c5.tar.gz) =
 Size (btop-1.2.13.20240301-c6fbfd1e27c27cfe89b2e272c0419e57193ea8c5.tar.gz) = 1145548 bytes
 SHA1 (patch-Makefile) = 851febd30b48556be117091f806c2939af23ce38
 SHA1 (patch-src_btop.cpp) = 60c805d6a5343d2e46f8f7cb0b03059426871fe9
-SHA1 (patch-src_netbsd_btop__collect.cpp) = f95b91cf43975acc2f1889cc2e151f944732bd53
+SHA1 (patch-src_netbsd_btop__collect.cpp) = 9d7924f00345c28187e1eb5e75bf85ddb31d7baa
diff --git a/btop-git/patches/patch-src_netbsd_btop__collect.cpp b/btop-git/patches/patch-src_netbsd_btop__collect.cpp
index 9455a0c686..0d3a4c86a0 100644
--- a/btop-git/patches/patch-src_netbsd_btop__collect.cpp
+++ b/btop-git/patches/patch-src_netbsd_btop__collect.cpp
@@ -2,7 +2,7 @@ $NetBSD$
 
 Add support for NetBSD.
 
---- src/netbsd/btop_collect.cpp.orig	2024-02-29 19:36:45.450039416 +0000
+--- src/netbsd/btop_collect.cpp.orig	2024-03-01 12:39:33.067157726 +0000
 +++ src/netbsd/btop_collect.cpp
 @@ -0,0 +1,1416 @@
 +/* Copyright 2021 Aristocratos (jakob%qvantnet.com@localhost)
@@ -359,7 +359,7 @@ Add support for NetBSD.
 +			if (props != NULL) continue;
 +
 +			prop_object_t cur_value = prop_dictionary_get(fields, "cur-value");
-+			prop_object_t max_value = prop_dictionary_get(fields, "max-value");
++			prop_object_t max_value = prop_dictionary_get(fields, "critical-max");
 +			prop_object_t description = prop_dictionary_get(fields, "description");
 +
 +			if (description == NULL || cur_value == NULL) {


Home | Main Index | Thread Index | Old Index