I committed a tweaked version (with the change to using 'call' and vars, the changes can be restricted to a small block).
On 2026/10/27 11:50, Laurent Cheylus wrote: > Hi ports@ > > update for sysutils/btop to the latest version 1.4.8 > > Changelog: https://github.com/aristocratos/btop/releases/tag/v1.4.8 > > Update patch for Makefile (remove logs formatting during build) > > Build 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.10 Makefile > --- Makefile 7 May 2026 14:27:22 -0000 1.10 > +++ Makefile 25 Oct 2026 11:43:25 -0000 > @@ -2,7 +2,7 @@ COMMENT= resource monitor > > GH_ACCOUNT= aristocratos > GH_PROJECT= btop > -GH_TAGNAME= v1.4.7 > +GH_TAGNAME= v1.4.8 > > CATEGORIES= sysutils > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/sysutils/btop/distinfo,v > diff -u -p -r1.9 distinfo > --- distinfo 7 May 2026 14:27:22 -0000 1.9 > +++ distinfo 25 Oct 2026 11:43:25 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (btop-1.4.7.tar.gz) = kz3i5NGyIRpji+Rj626GFokb+6c67104BgvYMZuu78Y= > -SIZE (btop-1.4.7.tar.gz) = 1280005 > +SHA256 (btop-1.4.8.tar.gz) = Z+B8IbdwptiExeULodLPyQcy6ldFk2fYcy7H7L6zvl8= > +SIZE (btop-1.4.8.tar.gz) = 1284612 > Index: patches/patch-Makefile > =================================================================== > RCS file: /cvs/ports/sysutils/btop/patches/patch-Makefile,v > diff -u -p -r1.6 patch-Makefile > --- patches/patch-Makefile 7 May 2026 14:27:22 -0000 1.6 > +++ patches/patch-Makefile 25 Oct 2026 11:43:25 -0000 > @@ -1,16 +1,16 @@ > Index: Makefile > --- Makefile.orig > +++ Makefile > -@@ -66,7 +66,7 @@ ifeq ($(DEBUG),true) > +@@ -125,7 +125,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 > -@@ -123,7 +123,7 @@ else ifeq ($(PLATFORM_LC),macos) > +@@ -185,7 +185,7 @@ else ifeq ($(PLATFORM_LC),macos) > else ifeq ($(PLATFORM_LC),openbsd) > PLATFORM_DIR := openbsd > THREADS := $(shell sysctl -n hw.ncpu || echo 1) > @@ -19,95 +19,95 @@ Index: Makefile > export MAKE = gmake > SU_GROUP := wheel > else ifeq ($(PLATFORM_LC),netbsd) > -@@ -138,9 +138,6 @@ endif > - > +@@ -200,9 +200,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 ($(BUILD_TYPE),Release) > -@@ -248,7 +245,6 @@ info: > +@@ -309,7 +306,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" > - > +- @$(call green,Building btop++ $(RED)($(WHITE)v$(BTOP_VERSION)$(RED)) > $(YELLOW)$(PLATFORM) $(CYAN)$(ARCH),,\n) > + > help: > @printf " $(BANNER)\n" > -@@ -281,7 +277,6 @@ $(BUILDDIR)/config.h: $(SRCDIR)/config.h.in | director > +@@ -342,7 +338,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) > -- @printf "\n\033[1;92mGenerating man page $@\033[37m...\033[0m\n" > +- @$(call green,Generating man page $@,...,\n) > lowdown -s -Tman -o $@ $< > else > - @printf "\n\033[1;93mCommand 'lowdown' not found: skipping generating > man page $@\033[0m\n" > -@@ -300,29 +295,22 @@ distclean: clean > + @$(call yellow,Command 'lowdown' not found: skipping generating man > page $@,,\n) > +@@ -361,29 +356,22 @@ 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\033[0m\n" > +- @$(call green,Installing binary to: > $(WHITE)$(DESTDIR)$(PREFIX)/bin/btop) > @mkdir -p $(DESTDIR)$(PREFIX)/bin > @cp -p $(TARGETDIR)/btop $(DESTDIR)$(PREFIX)/bin/btop > @chmod 755 $(DESTDIR)$(PREFIX)/bin/btop > -- @printf "\033[1;92mInstalling doc to: > \033[1;97m$(DESTDIR)$(PREFIX)/share/doc/btop\033[0m\n" > +- @$(call green,Installing doc to: > $(WHITE)$(DESTDIR)$(PREFIX)/share/doc/btop) > @mkdir -p $(DESTDIR)$(PREFIX)/share/doc/btop > @cp -p README.md $(DESTDIR)$(PREFIX)/share/doc/btop > @mkdir -p $(DESTDIR)$(PREFIX)/share/btop > -- @printf "\033[1;92mInstalling themes to: > \033[1;97m$(DESTDIR)$(PREFIX)/share/btop/themes\033[0m\n" > +- @$(call green,Installing themes to: > $(WHITE)$(DESTDIR)$(PREFIX)/share/btop/themes) > @cp -pr themes $(DESTDIR)$(PREFIX)/share/btop > -- @printf "\033[1;92mInstalling desktop entry to: > \033[1;97m$(DESTDIR)$(PREFIX)/share/applications/btop.desktop\033[0m\n" > +- @$(call green,Installing desktop entry to: > ,$(WHITE)$(DESTDIR)$(PREFIX)/share/applications/btop.desktop) > @mkdir -p $(DESTDIR)$(PREFIX)/share/applications/ > @cp -p btop.desktop $(DESTDIR)$(PREFIX)/share/applications/btop.desktop > -- @printf "\033[1;92mInstalling PNG icon to: > \033[1;97m$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/btop.png\033[0m\n" > +- @$(call green,Installing PNG icon to: > ,$(WHITE)$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/btop.png) > @mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps > @cp -p Img/icon.png > $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/btop.png > -- @printf "\033[1;92mInstalling SVG icon to: > \033[1;97m$(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg\033[0m\n" > +- @$(call green,Installing SVG icon to: > ,$(WHITE)$(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg) > @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 > + @mkdir -p $(DESTDIR)$(PREFIX)/man/man1 > + @cp -p btop.1 $(DESTDIR)$(PREFIX)/man/man1/btop.1 > endif > - > + > #? Set SUID bit for btop as $SU_USER in $SU_GROUP > -@@ -386,33 +374,23 @@ endif > +@@ -452,33 +440,23 @@ endif > #? Link > .ONESHELL: > btop: $(OBJECTS) | rocm_smi directories > - @sleep 0.2 2>/dev/null || true > - @TSTAMP=$$(date +%s 2>/dev/null || echo "0") > - @$(QUIET) || printf "\n\033[1;92mLinking and optimizing > binary\033[37m...\033[0m\n" > + @$(QUIET) || $(call green,Linking and optimizing binary,...,\n) > @$(VERBOSE) || printf "$(CXX) -o $(TARGETDIR)/btop $^ $(LDFLAGS)\n" > @$(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" > - > +- @$(call green,100% -> $(call file_with_size,$(TARGETDIR)/btop,$(call > CUR_LEFT,100)$(call CUR_RIGHT,38)) $(GREEN)($(WHITE)$(call > step_duration,$$TSTAMP)$(GREEN))) > +- @$(call green,Build complete in $(GREEN)($(WHITE)$(call > step_duration,$(TIMESTAMP))$(GREEN)),,\n) > + > #? Compile > .ONESHELL: > $(BUILDDIR)/%.$(OBJEXT): $(SRCDIR)/%.$(SRCEXT) | rocm_smi directories > config.h > - @sleep 0.3 2>/dev/null || true > - @TSTAMP=$$(date +%s 2>/dev/null || echo "0") > - @$(QUIET) || printf "\033[1;97mCompiling $<\033[0m\n" > + @$(QUIET) || $(call white,Compiling $<) > @$(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" > - > +- @$(call green,$$($(PROGRESS))%$(call CUR_LEFT,10)$(call CUR_RIGHT,5)-> > $(call file_with_size,$@,$(call CUR_LEFT,100)$(call CUR_RIGHT,38)) > $(GREEN)($(WHITE)$(call step_duration,$$TSTAMP)$(GREEN))) > + > #? Compile intel_gpu_top C sources for Intel GPU support > .ONESHELL: > $(BUILDDIR)/%.c.o: $(SRCDIR)/$(PLATFORM_DIR)/intel_gpu_top/%.c | directories > - @sleep 0.3 2>/dev/null || true > - @TSTAMP=$$(date +%s 2>/dev/null || echo "0") > - @$(QUIET) || printf "\033[1;97mCompiling $<\033[0m\n" > + @$(QUIET) || $(call white,Compiling $<) > @$(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" > - > - > +- @$(call green,$$($(PROGRESS))%$(call CUR_LEFT,10)$(call CUR_RIGHT,5)-> > $(call file_with_size,$@,$(call CUR_LEFT,100)$(call CUR_RIGHT,38)) > $(GREEN)($(WHITE)$(call step_duration,$$TSTAMP)$(GREEN))) > + > + > #? Non-File Targets
