Date: Wed, 5 Apr 2023 14:25:25 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 30840c2819e3 - main - x11/waybar: simplify CONFLICTS Message-ID: <202304051425.335EPPCb066320@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=30840c2819e395d66a8bdc6eb3c0583bd42f5dda commit 30840c2819e395d66a8bdc6eb3c0583bd42f5dda Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-04-05 13:55:35 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-04-05 14:25:20 +0000 x11/waybar: simplify CONFLICTS --- x11/waybar/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile index 4dd5632c26a2..74cbbd6f03b4 100644 --- a/x11/waybar/Makefile +++ b/x11/waybar/Makefile @@ -2,6 +2,7 @@ PORTNAME= waybar DISTVERSION= 0.9.17 PORTREVISION= 1 CATEGORIES= x11 wayland +PKGNAMESUFFIX= ${FLAVOR:N${FLAVORS:[1]}:C/.+/-${FLAVOR}/} MAINTAINER= jbeich@FreeBSD.org COMMENT= Highly customizable Wayland bar for Sway and wlroots-based compositors @@ -20,9 +21,7 @@ LIB_DEPENDS= libdate-tz.so:devel/date \ TEST_DEPENDS= catch>0:devel/catch FLAVORS= default nopulse -default_CONFLICTS_INSTALL= ${PORTNAME}-nopulse -nopulse_CONFLICTS_INSTALL= ${PORTNAME} -nopulse_PKGNAMESUFFIX= -nopulse +CONFLICTS_INSTALL= ${PORTNAME}* USES= compiler:c++17-lang gnome meson pkgconfig USE_GITHUB= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304051425.335EPPCb066320>