x11/sfwbar: upgrade to 1.0.b13

ChangeLog: https://github.com/LBCrion/sfwbar/releases

 * Implement bluez module
 * Add WidgetId() expression function, assign id's to all widgets
 * Add Eval action
 * Add SwitcherEvent action. Support backwards switching.
 * Allow config to modify widgets. Implement ClearWidget action.

PR:		274664
Reported by:	tino.engel@mail.de (maintainer)

3 files changed, 83 insertions, 79 deletions

diff --git a/x11/sfwbar/Makefile b/x11/sfwbar/Makefile
index 00d7e6ccb806..4b75f3718887 100644
--- a/x11/sfwbar/Makefile
+++ b/x11/sfwbar/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sfwbar
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0_beta12
+DISTVERSION=	1.0_beta13
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	tino.engel@mail.de
@@ -22,15 +22,16 @@ GH_ACCOUNT=	LBCrion
 
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 
+MESON_ARGS=		-Dbsdctl=enabled -Dnetwork=enabled -Dbluez=enabled -Didleinhibit=enabled
+
 SUB_FILES=		pkg-message
 
-OPTIONS_DEFINE=		MPD NETWORK PULSEAUDIO XKB ALSA
-OPTIONS_DEFAULT=	MPD NETWORK PULSEAUDIO XKB ALSA
+OPTIONS_DEFINE=		MPD PULSEAUDIO XKB ALSA
+OPTIONS_DEFAULT=	MPD PULSEAUDIO XKB ALSA
 OPTIONS_SUB=		yes
 
 ALSA_DESC=		ALSA audio volume control
 MPD_DESC=		Music player daemon control
-NETWORK_DESC=		Network interface monitor support
 PULSEAUDIO_DESC=	Pulse audio volume control
 XKB_DESC=		XkbCommon keyboard layout conversion support
 
@@ -40,13 +41,10 @@ ALSA_MESON_ENABLED=	alsa
 MPD_LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient
 MPD_MESON_ENABLED=	mpd
 
-NETWORK_MESON_ENABLED=	network
-
 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>
diff --git a/x11/sfwbar/distinfo b/x11/sfwbar/distinfo
index 919d748e6d53..f5d1462ccd97 100644
--- a/x11/sfwbar/distinfo
+++ b/x11/sfwbar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691478313
-SHA256 (LBCrion-sfwbar-v1.0_beta12_GH0.tar.gz) = 98dfdc9915d57c17588e71a8c50964891e8aa6fcda8077ef390924fe28445eda
-SIZE (LBCrion-sfwbar-v1.0_beta12_GH0.tar.gz) = 362373
+TIMESTAMP = 1697810555
+SHA256 (LBCrion-sfwbar-v1.0_beta13_GH0.tar.gz) = 06abcfbdf1c0d1e547cdf5110a8b58f2997bbc243d350c2a3e02f70120ee0c5a
+SIZE (LBCrion-sfwbar-v1.0_beta13_GH0.tar.gz) = 370717
diff --git a/x11/sfwbar/pkg-plist b/x11/sfwbar/pkg-plist
index 95bec4500f4e..4336efb12e1c 100644
--- a/x11/sfwbar/pkg-plist
+++ b/x11/sfwbar/pkg-plist
@@ -1,39 +1,58 @@
 bin/sfwbar
-%%ALSA%%lib/sfwbar/alsactl.so
-lib/sfwbar/idleinhibit.so
-%%MPD%%lib/sfwbar/mpd.so
-%%NETWORK%%lib/sfwbar/network.so
-%%PULSEAUDIO%%lib/sfwbar/pulsectl.so
-%%XKB%%lib/sfwbar/xkbmap.so
-%%ALSA%%man/man1/sfwbar-idleinhibit.1.gz
-%%MPD%%man/man1/sfwbar-mpd.1.gz
-%%NETWORK%%man/man1/sfwbar-network.1.gz
-%%PULSEAUDIO%%man/man1/sfwbar-pulse.1.gz
-%%XKB%%man/man1/sfwbar-xkbmap.1.gz
 man/man1/sfwbar.1.gz
-share/icons/hicolor/scalable/apps/sfwbar.svg
 %%DATADIR%%/alsa-module.widget
 %%DATADIR%%/alsa.widget
 %%DATADIR%%/battery-svg.widget
 %%DATADIR%%/battery.widget
 %%DATADIR%%/clock.widget
+%%DATADIR%%/cpu.source
 %%DATADIR%%/cpu-temp.source
 %%DATADIR%%/cpu-temp.widget
-%%DATADIR%%/cpu.source
 %%DATADIR%%/cpu.widget
 %%DATADIR%%/fan-rpm.widget
-%%DATADIR%%/icons/misc/comp.svg
-%%DATADIR%%/icons/misc/cpu.svg
-%%DATADIR%%/icons/misc/fan.svg
-%%DATADIR%%/icons/misc/fforward.svg
-%%DATADIR%%/icons/misc/lan.svg
-%%DATADIR%%/icons/misc/lock.svg
-%%DATADIR%%/icons/misc/missing.svg
-%%DATADIR%%/icons/misc/music-player-symbolic.svg
-%%DATADIR%%/icons/misc/play.svg
-%%DATADIR%%/icons/misc/rewind.svg
-%%DATADIR%%/icons/misc/stop.svg
-%%DATADIR%%/icons/misc/unlock.svg
+%%DATADIR%%/idle.widget
+%%DATADIR%%/lan-bps.widget
+%%DATADIR%%/mb-temp.widget
+%%DATADIR%%/memory.source
+%%DATADIR%%/memory.widget
+%%DATADIR%%/mpd-intmod.widget
+%%DATADIR%%/mpd-mini.widget
+%%DATADIR%%/mpd-module.widget
+%%DATADIR%%/mpd.source
+%%DATADIR%%/mpd.widget
+%%DATADIR%%/network-module.widget
+%%DATADIR%%/oneline.config
+%%DATADIR%%/pulse-module.widget
+%%DATADIR%%/rfkill-bt.widget
+%%DATADIR%%/rfkill.source
+%%DATADIR%%/rfkill-wifi.widget
+%%DATADIR%%/sfwbar.config
+%%DATADIR%%/showdesktop.widget
+%%DATADIR%%/startmenu.widget
+%%DATADIR%%/swap.source
+%%DATADIR%%/sway-lang.widget
+%%DATADIR%%/t2.config
+%%DATADIR%%/test.config
+%%DATADIR%%/test.widget
+%%DATADIR%%/test2.config
+%%DATADIR%%/twoline.config
+%%DATADIR%%/usage.widget
+%%DATADIR%%/vertical.config
+%%DATADIR%%/w10.config
+%%DATADIR%%/wbar-backlight.widget
+%%DATADIR%%/wbar-battery.widget
+%%DATADIR%%/wbar-bluetooth.widget
+%%DATADIR%%/wbar.config
+%%DATADIR%%/wbar-cpu.widget
+%%DATADIR%%/wbar-idleinhibit.widget
+%%DATADIR%%/wbar-memory.widget
+%%DATADIR%%/wbar-mpd.widget
+%%DATADIR%%/wbar-net.widget
+%%DATADIR%%/wbar-pulse.widget
+%%DATADIR%%/wbar-sway-lang.widget
+%%DATADIR%%/wbar-temp.widget
+%%DATADIR%%/weather.widget
+%%DATADIR%%/winops.widget
 %%DATADIR%%/icons/weather/LICENSE
 %%DATADIR%%/icons/weather/clearsky_day.svg
 %%DATADIR%%/icons/weather/clearsky_night.svg
@@ -101,8 +120,8 @@ share/icons/hicolor/scalable/apps/sfwbar.svg
 %%DATADIR%%/icons/weather/rainshowers_polartwilight.svg
 %%DATADIR%%/icons/weather/rainshowersandthunder_day.svg
 %%DATADIR%%/icons/weather/rainshowersandthunder_night.svg
-%%DATADIR%%/icons/weather/rainshowersandthunder_polartwilight.svg
 %%DATADIR%%/icons/weather/sleet.svg
+%%DATADIR%%/icons/weather/rainshowersandthunder_polartwilight.svg
 %%DATADIR%%/icons/weather/sleetandthunder.svg
 %%DATADIR%%/icons/weather/sleetshowers_day.svg
 %%DATADIR%%/icons/weather/sleetshowers_night.svg
@@ -118,46 +137,33 @@ share/icons/hicolor/scalable/apps/sfwbar.svg
 %%DATADIR%%/icons/weather/snowshowersandthunder_day.svg
 %%DATADIR%%/icons/weather/snowshowersandthunder_night.svg
 %%DATADIR%%/icons/weather/snowshowersandthunder_polartwilight.svg
-%%DATADIR%%/idle.widget
-%%DATADIR%%/lan-bps.widget
-%%DATADIR%%/mb-temp.widget
-%%DATADIR%%/memory.source
-%%DATADIR%%/memory.widget
-%%DATADIR%%/mpd-intmod.widget
-%%DATADIR%%/mpd-mini.widget
-%%DATADIR%%/mpd-module.widget
-%%DATADIR%%/mpd.source
-%%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
-%%DATADIR%%/sfwbar.config
-%%DATADIR%%/showdesktop.widget
-%%DATADIR%%/startmenu.widget
-%%DATADIR%%/swap.source
-%%DATADIR%%/sway-lang.widget
-%%DATADIR%%/t2.config
-%%DATADIR%%/test.config
-%%DATADIR%%/test.widget
-%%DATADIR%%/test2.config
-%%DATADIR%%/twoline.config
-%%DATADIR%%/usage.widget
-%%DATADIR%%/vertical.config
-%%DATADIR%%/w10.config
-%%DATADIR%%/wbar-backlight.widget
-%%DATADIR%%/wbar-battery.widget
-%%DATADIR%%/wbar-bluetooth.widget
-%%DATADIR%%/wbar-cpu.widget
-%%DATADIR%%/wbar-idleinhibit.widget
-%%DATADIR%%/wbar-memory.widget
-%%DATADIR%%/wbar-mpd.widget
-%%DATADIR%%/wbar-net.widget
-%%DATADIR%%/wbar-pulse.widget
-%%DATADIR%%/wbar-sway-lang.widget
-%%DATADIR%%/wbar-temp.widget
-%%DATADIR%%/wbar.config
-%%DATADIR%%/weather.widget
-%%DATADIR%%/winops.widget
+%%DATADIR%%/icons/misc/comp.svg
+%%DATADIR%%/icons/misc/cpu.svg
+%%DATADIR%%/icons/misc/fan.svg
+%%DATADIR%%/icons/misc/fforward.svg
+%%DATADIR%%/icons/misc/lan.svg
+%%DATADIR%%/icons/misc/lock.svg
+%%DATADIR%%/icons/misc/missing.svg
+%%DATADIR%%/icons/misc/music-player-symbolic.svg
+%%DATADIR%%/icons/misc/play.svg
+%%DATADIR%%/icons/misc/rewind.svg
+%%DATADIR%%/icons/misc/stop.svg
+%%DATADIR%%/icons/misc/unlock.svg
+%%DATADIR%%/bluez.widget
+share/icons/hicolor/scalable/apps/sfwbar.svg
+lib/sfwbar/network.so
+man/man1/sfwbar-alsa.1.gz
+man/man1/sfwbar-network.1.gz
+%%PULSEAUDIO%%lib/sfwbar/pulsectl.so
+%%PULSEAUDIO%%man/man1/sfwbar-pulse.1.gz
+%%MPD%%lib/sfwbar/mpd.so
+%%MPD%%man/man1/sfwbar-mpd.1.gz
+%%XKB%%lib/sfwbar/xkbmap.so
+%%XKB%%man/man1/sfwbar-xkbmap.1.gz
+%%ALSA%%lib/sfwbar/alsactl.so
+lib/sfwbar/bsdctl.so
+man/man1/sfwbar-bsdctl.1.gz
+lib/sfwbar/idleinhibit.so
+man/man1/sfwbar-idleinhibit.1.gz
+lib/sfwbar/bluez.so
+man/man1/sfwbar-bluez.1.gz