Hi ports@
update for sysutils/btop (TUI resources monitor) to the latest version 1.4.1.
Changelog: https://github.com/aristocratos/btop/releases/tag/v1.4.1
- update Makefile and distinfo (make makesum)
- update patch for Makefile: fix warnings and path to install manpage
- regen pkg/PLIST
Build and tests OK on current/amd64.
Tests welcome and please commit if OK.
Laurent
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/btop/Makefile,v
diff -u -p -r1.2 Makefile
--- Makefile 23 Feb 2025 16:07:39 -0000 1.2
+++ Makefile 1 May 2025 08:48:37 -0000
@@ -2,7 +2,7 @@ COMMENT= resource monitor
GH_ACCOUNT= aristocratos
GH_PROJECT= btop
-GH_TAGNAME= v1.4.0
+GH_TAGNAME= v1.4.1
CATEGORIES= sysutils
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/btop/distinfo,v
diff -u -p -r1.2 distinfo
--- distinfo 23 Feb 2025 16:07:39 -0000 1.2
+++ distinfo 1 May 2025 08:48:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (btop-1.4.0.tar.gz) = rA0jcb9p1RNt5+lHDG+yhsvuLha0x6bSzUihR5boZlA=
-SIZE (btop-1.4.0.tar.gz) = 1239400
+SHA256 (btop-1.4.1.tar.gz) = QPbFTRvJUsZ0tnfYHdJfVbYenABIg8J5UNwweAyG84E=
+SIZE (btop-1.4.1.tar.gz) = 1245448
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/sysutils/btop/patches/patch-Makefile,v
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 23 Feb 2025 16:07:39 -0000 1.2
+++ patches/patch-Makefile 1 May 2025 08:48:37 -0000
@@ -1,43 +1,43 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -63,7 +63,7 @@ endif
- override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
- override CXX_VERSION_MAJOR := $(shell echo $(CXX_VERSION) | cut -d '.' -f 1)
-
--CLANG_WORKS = false
-+CLANG_WORKS = true
- GCC_WORKS = false
- MIN_CLANG_VERSION = 16
-
-@@ -149,7 +149,7 @@ else ifeq ($(PLATFORM_LC),macos)
+@@ -63,7 +63,7 @@ ifeq ($(DEBUG),true)
+ endif
+
+ #? Any flags added to TESTFLAGS must not contain whitespace for the testing to work
+-override TESTFLAGS := -fexceptions -fstack-clash-protection -fcf-protection
++override TESTFLAGS := -fexceptions -fcf-protection
+ ifneq ($(PLATFORM) $(ARCH),macos arm64)
+ override TESTFLAGS += -fstack-protector
+ endif
+@@ -120,7 +120,7 @@ else ifeq ($(PLATFORM_LC),macos)
else ifeq ($(PLATFORM_LC),openbsd)
PLATFORM_DIR := openbsd
THREADS := $(shell sysctl -n hw.ncpu || echo 1)
- override ADDFLAGS += -lkvm -static-libstdc++
-+ override ADDFLAGS += -lkvm
++ override LDFLAGS += -lkvm
export MAKE = gmake
SU_GROUP := wheel
else ifeq ($(PLATFORM_LC),netbsd)
-@@ -164,9 +164,6 @@ endif
-
+@@ -135,9 +135,6 @@ endif
+
#? Use all CPU cores (will only be set if using Make 4.3+)
MAKEFLAGS := --jobs=$(THREADS)
-ifeq ($(THREADS),1)
- override THREADS := auto
-endif
-
+
#? LTO command line
- ifeq ($(CLANG_WORKS),true)
-@@ -272,7 +269,6 @@ info:
+ ifeq ($(BUILD_TYPE),Release)
+@@ -245,7 +242,6 @@ info:
endif
-
+
info-quiet: | info rocm_smi
- @printf "\n\033[1;92mBuilding btop++ \033[91m(\033[97mv$(BTOP_VERSION)\033[91m) \033[93m$(PLATFORM) \033[96m$(ARCH)\033[0m\n"
-
+
help:
@printf " $(BANNER)\n"
-@@ -305,7 +301,6 @@ $(BUILDDIR)/config.h: $(SRCDIR)/config.h.in | director
+@@ -278,7 +274,6 @@ $(BUILDDIR)/config.h: $(SRCDIR)/config.h.in | director
#? Man page
btop.1: manpage.md | directories
ifeq ($(shell command -v lowdown >/dev/null; echo $$?),0)
@@ -45,9 +45,9 @@ Index: Makefile
lowdown -s -Tman -o $@ $<
else
@printf "\n\033[1;93mCommand 'lowdown' not found: skipping generating man page $@\033[0m\n"
-@@ -324,26 +319,19 @@ distclean: clean
+@@ -297,28 +292,21 @@ distclean: clean
@test -e lib/rocm_smi_lib/build && rm -rf lib/rocm_smi_lib/build || true
-
+
install:
- @printf "\033[1;92mInstalling binary to: \033[1;97m$(DESTDIR)$(PREFIX)/bin/btop\n"
@mkdir -p $(DESTDIR)$(PREFIX)/bin
@@ -69,10 +69,14 @@ Index: Makefile
@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\n"
- @mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
- @cp -p btop.1 $(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
++ @mkdir -p $(DESTDIR)$(PREFIX)/man/man1
++ @cp -p btop.1 $(DESTDIR)$(PREFIX)/man/man1/btop.1
endif
-@@ -409,33 +397,23 @@ endif
+
+ #? Set SUID bit for btop as $SU_USER in $SU_GROUP
+@@ -382,33 +370,23 @@ endif
#? Link
.ONESHELL:
btop: $(OBJECTS) | rocm_smi directories
@@ -83,7 +87,7 @@ Index: Makefile
@$(CXX) -o $(TARGETDIR)/btop $^ $(LDFLAGS) || exit 1
- @printf "\033[1;92m100$(P) -> \033[1;37m$(TARGETDIR)/btop \033[100D\033[38C\033[1;93m(\033[1;97m$$(du -ah $(TARGETDIR)/btop | cut -f1)iB\033[1;93m) \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$(date +%s 2>/dev/null || echo "0") - $${TSTAMP} 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo '')\033[92m)\033[0m\n"
- @printf "\n\033[1;92mBuild complete in \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$(date +%s 2>/dev/null || echo "0") - $(TIMESTAMP) 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo "unknown")\033[92m)\033[0m\n"
-
+
#? Compile
.ONESHELL:
$(BUILDDIR)/%.$(OBJEXT): $(SRCDIR)/%.$(SRCEXT) | rocm_smi directories config.h
@@ -93,7 +97,7 @@ Index: Makefile
@$(VERBOSE) || printf "$(CXX) $(CXXFLAGS) $(INC) -MMD -c -o $@ $<\n"
@$(CXX) $(CXXFLAGS) $(INC) -MMD -c -o $@ $< || exit 1
- @printf "\033[1;92m$$($(PROGRESS))$(P)\033[10D\033[5C-> \033[1;37m$@ \033[100D\033[38C\033[1;93m(\033[1;97m$$(du -ah $@ | cut -f1)iB\033[1;93m) \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$($(DATE_CMD) +%s 2>/dev/null || echo "0") - $${TSTAMP} 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo '')\033[92m)\033[0m\n"
-
+
#? Compile intel_gpu_top C sources for Intel GPU support
.ONESHELL:
$(BUILDDIR)/%.c.o: $(SRCDIR)/$(PLATFORM_DIR)/intel_gpu_top/%.c | directories
@@ -103,6 +107,6 @@ Index: Makefile
@$(VERBOSE) || printf "$(CC) $(INC) -c -o $@ $<\n"
@$(CC) $(INC) -w -c -o $@ $< || exit 1
- @printf "\033[1;92m$$($(PROGRESS))$(P)\033[10D\033[5C-> \033[1;37m$@ \033[100D\033[38C\033[1;93m(\033[1;97m$$(du -ah $@ | cut -f1)iB\033[1;93m) \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$($(DATE_CMD) +%s 2>/dev/null || echo "0") - $${TSTAMP} 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo '')\033[92m)\033[0m\n"
-
-
+
+
#? Non-File Targets
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/btop/pkg/PLIST,v
diff -u -p -r1.2 PLIST
--- pkg/PLIST 23 Feb 2025 16:07:39 -0000 1.2
+++ pkg/PLIST 1 May 2025 08:48:37 -0000
@@ -1,10 +1,12 @@
@bin bin/btop
+@man man/man1/btop.1
share/applications/btop.desktop
share/btop/
share/btop/README.md
share/btop/themes/
share/btop/themes/HotPurpleTrafficLight.theme
share/btop/themes/adapta.theme
+share/btop/themes/adwaita-dark.theme
share/btop/themes/adwaita.theme
share/btop/themes/ayu.theme
share/btop/themes/dracula.theme
@@ -12,6 +14,7 @@ share/btop/themes/dusklight.theme
share/btop/themes/elementarish.theme
share/btop/themes/everforest-dark-hard.theme
share/btop/themes/everforest-dark-medium.theme
+share/btop/themes/everforest-light-medium.theme
share/btop/themes/flat-remix-light.theme
share/btop/themes/flat-remix.theme
share/btop/themes/greyscale.theme
@@ -20,6 +23,8 @@ share/btop/themes/gruvbox_dark_v2.theme
share/btop/themes/gruvbox_light.theme
share/btop/themes/gruvbox_material_dark.theme
share/btop/themes/horizon.theme
+share/btop/themes/kanagawa-lotus.theme
+share/btop/themes/kanagawa-wave.theme
share/btop/themes/kyli0x.theme
share/btop/themes/matcha-dark-sea.theme
share/btop/themes/monokai.theme
@@ -38,6 +43,3 @@ share/icons/hicolor/48x48/apps/btop.png
share/icons/hicolor/scalable/apps/btop.svg
@tag gtk-update-icon-cache %D/share/icons/hicolor
@tag update-desktop-database
-@mandir share/man/
-share/man/man1/
-@man share/man/man1/btop.1
