git: 1d79839756ef - main - x11/sfwbar: Update 1.0_beta14 → 1.0_beta15

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Sun, 03 Nov 2024 18:04:56 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1d79839756efee86c6d807a684f97f7b0b01f335

commit 1d79839756efee86c6d807a684f97f7b0b01f335
Author:     Tino Engel <tino.engel@mail.de>
AuthorDate: 2024-11-03 17:59:30 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-11-03 18:04:40 +0000

    x11/sfwbar: Update 1.0_beta14 → 1.0_beta15
    
    Changelog:
    https://github.com/LBCrion/sfwbar/releases/tag/v1.0_beta15
    
    PR:     282519
---
 x11/sfwbar/Makefile  | 30 ++++++++++++++++++++++--------
 x11/sfwbar/distinfo  |  6 +++---
 x11/sfwbar/pkg-plist | 13 +++++++------
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/x11/sfwbar/Makefile b/x11/sfwbar/Makefile
index e9e981ed9599..ea003fc4c84f 100644
--- a/x11/sfwbar/Makefile
+++ b/x11/sfwbar/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	sfwbar
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0_beta14
-PORTREVISION=	1
+DISTVERSION=	1.0_beta15
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	tino.engel@mail.de
@@ -11,7 +10,8 @@ WWW=		https://github.com/LBCrion/sfwbar
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
+BUILD_DEPENDS=	rst2man:textproc/py-docutils@${PY_FLAVOR} \
+		wayland-protocols>0:graphics/wayland-protocols
 LIB_DEPENDS=	libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell \
 		libjson-c.so:devel/json-c \
 		libwayland-client.so:graphics/wayland
@@ -23,17 +23,21 @@ GH_ACCOUNT=	LBCrion
 
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 
-MESON_ARGS=		-Dbluez=enabled -Dbsdctl=enabled -Didleinhibit=enabled \
-			-Diwd=enabled -Dnetwork=enabled
+MESON_ARGS=	-Dbluez=enabled \
+		-Dbsdctl=enabled \
+		-Didleinhibit=enabled \
+		-Diwd=enabled \
+		-Dnetwork=enabled
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		ALSA MPD PULSEAUDIO XKB
-OPTIONS_DEFAULT=	ALSA MPD PULSEAUDIO XKB
+OPTIONS_DEFINE=		ALSA MPD NM PULSEAUDIO XKB
+OPTIONS_DEFAULT=	ALSA MPD NM PULSEAUDIO XKB
 OPTIONS_SUB=		yes
 
 ALSA_DESC=		ALSA audio volume control
 MPD_DESC=		Music player daemon control
+NM_DESC=		Network manager module
 PULSEAUDIO_DESC=	Pulse audio volume control
 XKB_DESC=		XkbCommon keyboard layout conversion support
 
@@ -43,10 +47,20 @@ ALSA_MESON_ENABLED=	alsa
 MPD_LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient
 MPD_MESON_ENABLED=	mpd
 
+NM_MESON_ENABLED=	nm
+
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_MESON_ENABLED=	pulse
 
 XKB_LIB_DEPENDS=	libxkbregistry.so:x11/libxkbcommon
 XKB_MESON_ENABLED=	xkb
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MALSA} || ${PORT_OPTIONS:MPULSEAUDIO}
+PLIST_SUB+=	VOLUME=""
+.else
+PLIST_SUB+=	VOLUME="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11/sfwbar/distinfo b/x11/sfwbar/distinfo
index 080440e1b9a3..3a6b9b1ab92b 100644
--- a/x11/sfwbar/distinfo
+++ b/x11/sfwbar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704306918
-SHA256 (LBCrion-sfwbar-v1.0_beta14_GH0.tar.gz) = e5fa6147e3a58e9440b24b8f1ef2378ae088631b8013ecf7770e984f97c5eeb4
-SIZE (LBCrion-sfwbar-v1.0_beta14_GH0.tar.gz) = 386347
+TIMESTAMP = 1730625550
+SHA256 (LBCrion-sfwbar-v1.0_beta15_GH0.tar.gz) = e7b45b810659ddb4c1877c486e6c2e40830473ff2e562a9176b149eae1fa8b5f
+SIZE (LBCrion-sfwbar-v1.0_beta15_GH0.tar.gz) = 405881
diff --git a/x11/sfwbar/pkg-plist b/x11/sfwbar/pkg-plist
index ab062e2ea03e..91236aac1626 100644
--- a/x11/sfwbar/pkg-plist
+++ b/x11/sfwbar/pkg-plist
@@ -1,23 +1,23 @@
 bin/sfwbar
-lib/libsfwbar.so
 %%ALSA%%lib/sfwbar/alsactl.so
 lib/sfwbar/bluez.so
 lib/sfwbar/bsdctl.so
 lib/sfwbar/idleinhibit.so
+lib/sfwbar/libsfwbar.so
 %%MPD%%lib/sfwbar/mpd.so
 lib/sfwbar/network.so
 %%PULSEAUDIO%%lib/sfwbar/pulsectl.so
 lib/sfwbar/wifi-iwd.so
 %%XKB%%lib/sfwbar/xkbmap.so
+%%NM%%lib/sfwbar/wifi-nm.so
 share/icons/hicolor/scalable/apps/sfwbar.svg
-%%ALSA%%share/man/man1/sfwbar-alsa.1.gz
 share/man/man1/sfwbar-bluez.1.gz
 share/man/man1/sfwbar-bsdctl.1.gz
 share/man/man1/sfwbar-idleinhibit.1.gz
 %%MPD%%share/man/man1/sfwbar-mpd.1.gz
 share/man/man1/sfwbar-network.1.gz
-%%PULSEAUDIO%%share/man/man1/sfwbar-pulse.1.gz
-share/man/man1/sfwbar-wifi-iwd.1.gz
+%%VOLUME%%share/man/man1/sfwbar-volume.1.gz
+share/man/man1/sfwbar-wifi.1.gz
 %%XKB%%share/man/man1/sfwbar-xkbmap.1.gz
 share/man/man1/sfwbar.1.gz
 %%DATADIR%%/alsa-module.widget
@@ -141,7 +141,6 @@ share/man/man1/sfwbar.1.gz
 %%DATADIR%%/mpd.widget
 %%DATADIR%%/network-module.widget
 %%DATADIR%%/oneline.config
-%%DATADIR%%/pulse-module.widget
 %%DATADIR%%/rfkill-bt.widget
 %%DATADIR%%/rfkill-wifi.widget
 %%DATADIR%%/rfkill.source
@@ -150,6 +149,7 @@ share/man/man1/sfwbar.1.gz
 %%DATADIR%%/startmenu.widget
 %%DATADIR%%/swap.source
 %%DATADIR%%/sway-lang.widget
+%%DATADIR%%/switcher.config
 %%DATADIR%%/t2.config
 %%DATADIR%%/test.config
 %%DATADIR%%/test.widget
@@ -157,6 +157,7 @@ share/man/man1/sfwbar.1.gz
 %%DATADIR%%/twoline.config
 %%DATADIR%%/usage.widget
 %%DATADIR%%/vertical.config
+%%DATADIR%%/volume.widget
 %%DATADIR%%/w10.config
 %%DATADIR%%/wbar-backlight.widget
 %%DATADIR%%/wbar-battery.widget
@@ -171,5 +172,5 @@ share/man/man1/sfwbar.1.gz
 %%DATADIR%%/wbar-temp.widget
 %%DATADIR%%/wbar.config
 %%DATADIR%%/weather.widget
-%%DATADIR%%/wifi-iwd.widget
+%%DATADIR%%/wifi.widget
 %%DATADIR%%/winops.widget