git: d8e7e2cdb2b9 - main - x11/waybar: add hyprland_nopulse flavor

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Fri, 28 Apr 2023 20:14:04 UTC
The branch main has been updated by jbeich:

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

commit d8e7e2cdb2b9a7ef277a3baebdedaac084b30359
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-04-28 20:03:23 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-04-28 20:13:55 +0000

    x11/waybar: add hyprland_nopulse flavor
    
    PR:             271089
---
 x11/waybar/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile
index 6c04d4770499..db5b07e2dcdb 100644
--- a/x11/waybar/Makefile
+++ b/x11/waybar/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libdate-tz.so:devel/date \
 		libxkbregistry.so:x11/libxkbcommon
 TEST_DEPENDS=	catch>0:devel/catch
 
-FLAVORS=	default hyprland nopulse
+FLAVORS=	default hyprland hyprland_nopulse nopulse
 CONFLICTS_INSTALL=	${PORTNAME}*
 
 USES=		compiler:c++17-lang gnome meson pkgconfig
@@ -33,7 +33,7 @@ PLIST_FILES=	bin/${PORTNAME} \
 		etc/xdg/${PORTNAME}/config \
 		etc/xdg/${PORTNAME}/style.css
 
-.if ${FLAVOR:U} == hyprland
+.if ${FLAVOR:U:Mhyprland*}
 # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/40
 MESON_ARGS+=	-Dexperimental=true
 .endif
@@ -46,7 +46,7 @@ SUB_FILES+=	date.pc
 
 OPTIONS_DEFINE=	DBUS EVDEV GLS ICONSFONT JACK MANPAGES MPD MPRIS PULSEAUDIO SNDIO UDEV UPOWER
 OPTIONS_DEFAULT=DBUS EVDEV GLS ICONSFONT JACK MANPAGES MPD MPRIS PULSEAUDIO SNDIO UDEV UPOWER
-.if ${FLAVOR:U} == nopulse
+.if ${FLAVOR:U:M*nopulse}
 OPTIONS_EXCLUDE=PULSEAUDIO
 .endif
 
@@ -144,7 +144,7 @@ post-patch:
 # Respect PREFIX for icons
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/src/modules/wlr/taskbar.cpp
-.if ${FLAVOR:U} == hyprland
+.if ${FLAVOR:U:Mhyprland*}
 # Use hyprctl to switch workspaces
 	@${REINPLACE_CMD} 's/zext_workspace_handle_v1_activate(workspace_handle_);/const std::string command = "hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());/g' \
 		${WRKSRC}/src/modules/wlr/workspace_manager.cpp