In this email, I have attached a diff to update sysutils/btop from
version 1.3.2 to version 1.4.0 [1].
I fixed a problem that prevented the manual page for this program from
being generated due to the lack of textproc/lowdown at build time, and I
updated and simplified the patch for the Makefile, leaving only the
necessary parts and removing the aesthetic changes.
Tested on amd64 and it builds and runs fine.
OKs? Comments?
References:
[1]: https://github.com/aristocratos/btop/releases/tag/v1.4.0
Index: ports/sysutils/btop/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/btop/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 Makefile
--- ports/sysutils/btop/Makefile 16 Apr 2024 15:09:07 -0000 1.1.1.1
+++ ports/sysutils/btop/Makefile 16 Feb 2025 23:36:26 -0000
@@ -2,7 +2,7 @@ COMMENT= resource monitor
GH_ACCOUNT= aristocratos
GH_PROJECT= btop
-GH_TAGNAME= v1.3.2
+GH_TAGNAME= v1.4.0
CATEGORIES= sysutils
@@ -16,6 +16,7 @@ COMPILER = base-clang
RUN_DEPENDS= devel/desktop-file-utils \
x11/gtk+4,-guic
+BUILD_DEPENDS= textproc/lowdown
NO_TEST= Yes
USE_GMAKE= Yes
Index: ports/sysutils/btop/distinfo
===================================================================
RCS file: /cvs/ports/sysutils/btop/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- ports/sysutils/btop/distinfo 16 Apr 2024 15:09:07 -0000 1.1.1.1
+++ ports/sysutils/btop/distinfo 16 Feb 2025 23:36:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (btop-1.3.2.tar.gz) = Mx0YSIsdx/Bs+hLP+QkjCBaiTFd5C6PoIksRfj8K4D4=
-SIZE (btop-1.3.2.tar.gz) = 1144620
+SHA256 (btop-1.4.0.tar.gz) = rA0jcb9p1RNt5+lHDG+yhsvuLha0x6bSzUihR5boZlA=
+SIZE (btop-1.4.0.tar.gz) = 1239400
Index: ports/sysutils/btop/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/btop/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- ports/sysutils/btop/pkg/PLIST 16 Apr 2024 15:09:07 -0000 1.1.1.1
+++ ports/sysutils/btop/pkg/PLIST 16 Feb 2025 23:36:46 -0000
@@ -17,6 +17,7 @@ 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_light.theme
share/btop/themes/gruvbox_material_dark.theme
share/btop/themes/horizon.theme
share/btop/themes/kyli0x.theme
@@ -26,6 +27,7 @@ share/btop/themes/night-owl.theme
share/btop/themes/nord.theme
share/btop/themes/onedark.theme
share/btop/themes/paper.theme
+share/btop/themes/phoenix-night.theme
share/btop/themes/solarized_dark.theme
share/btop/themes/solarized_light.theme
share/btop/themes/tokyo-night.theme
@@ -36,3 +38,6 @@ 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
Index: ports/sysutils/btop/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/sysutils/btop/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-Makefile
--- ports/sysutils/btop/patches/patch-Makefile 16 Apr 2024 15:09:07 -0000 1.1.1.1
+++ ports/sysutils/btop/patches/patch-Makefile 16 Feb 2025 23:36:57 -0000
@@ -1,7 +1,7 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -62,7 +62,7 @@ endif
+@@ -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)
@@ -10,7 +10,7 @@ Index: Makefile
GCC_WORKS = false
MIN_CLANG_VERSION = 16
-@@ -143,7 +143,7 @@ else ifeq ($(PLATFORM_LC),macos)
+@@ -149,7 +149,7 @@ else ifeq ($(PLATFORM_LC),macos)
else ifeq ($(PLATFORM_LC),openbsd)
PLATFORM_DIR := openbsd
THREADS := $(shell sysctl -n hw.ncpu || echo 1)
@@ -18,8 +18,8 @@ Index: Makefile
+ override ADDFLAGS += -lkvm
export MAKE = gmake
SU_GROUP := wheel
- else
-@@ -152,9 +152,6 @@ endif
+ else ifeq ($(PLATFORM_LC),netbsd)
+@@ -164,9 +164,6 @@ endif
#? Use all CPU cores (will only be set if using Make 4.3+)
MAKEFLAGS := --jobs=$(THREADS)
@@ -29,50 +29,3 @@ Index: Makefile
#? LTO command line
ifeq ($(CLANG_WORKS),true)
-@@ -280,22 +277,16 @@ 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
- @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/btop\n"
- @mkdir -p $(DESTDIR)$(PREFIX)/share/btop
- @cp -p README.md $(DESTDIR)$(PREFIX)/share/btop
-- @printf "\033[1;92mInstalling themes to: \033[1;97m$(DESTDIR)$(PREFIX)/share/btop/themes\033[0m\n"
- @cp -pr themes $(DESTDIR)$(PREFIX)/share/btop
-- @printf "\033[1;92mInstalling desktop entry to: \033[1;97m$(DESTDIR)$(PREFIX)/share/applications/btop.desktop\n"
- @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\n"
- @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\n"
- @mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
- @cp -p Img/icon.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg
-
-@@ -352,23 +343,16 @@ 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"
- @$(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"
-
- #? Compile
- .ONESHELL:
- $(BUILDDIR)/%.$(OBJEXT): $(SRCDIR)/%.$(SRCEXT) | rocm_smi directories
-- @sleep 0.3 2>/dev/null || true
-- @TSTAMP=$$(date +%s 2>/dev/null || echo "0")
- @$(QUIET) || printf "\033[1;97mCompiling $<\033[0m\n"
- @$(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"
-
- #? Non-File Targets
- .PHONY: all msg help pre
