From nobody Wed Apr 5 14:25:25 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ps6Nj74YBz43Y4t; Wed, 5 Apr 2023 14:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ps6Nj6bHnz3kGW; Wed, 5 Apr 2023 14:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680704725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hRr2p6r+MhhIu55F0d3XSW35/liBkcSZvLPPLOj9eCg=; b=KuteTxGwOunQVmPgUd3NInMjHGGQl1EqHUU0GX+x9bXxNoT7FrNpd+PZJPlxloaST0lb/B OXe9+BjHLR0UM0aUnKR7Iot9hEBT561a3jO9OktyIFfpwkM6epovCw6fdd6YewYu+CPhZF 9lGKtwLP+vIP1ZSM/Bcn38Tesi1X2qGL9qBH3Qvr9fEIsDvLPxgyxECW5eDe2mXeu1yvyH l515s43EugN4nYa8lNFlL8o/DOb75ZHok+Dfgjinf+fZ94uxqDKrLwMx9aW6djutT5xUGJ smtDkxlLYL/3iOI6u8CIZlKdZFDNMPodFIWqT7/3221qEXXE0X1CgFFvdJEMtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680704725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hRr2p6r+MhhIu55F0d3XSW35/liBkcSZvLPPLOj9eCg=; b=c54pLQszmVufYj1SXsmdkRFjyfJEuSfrQdVzhPGjKcZ/K0X14nV73hONSTknKkOuCsm7be PY7OuGdDE9YePsnGVbvyRyZiLwS/yro+Ruy70rHb1bvP9nxm+sI2wDd8yz5hMK7NkbLSFk r5SNTVRR3gKdkyQ4UFnk36+BMZNJYmyJapx3mydCAEBNS7ulAIEIKlXP5QAvBdd5PkzB2a 9M/1ppSu4GUMmTSG6mmVCGBRBkN6O6d8K+spcbSBQtA84nahYrE3h0rg+r1LdbuDAL81Cj +3FVNDKRLRxVYMCSW9h383G9dvzDl1NyJl09Gp+Oulc10Mf2hNA70hU7VopNbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680704725; a=rsa-sha256; cv=none; b=ss49nY576QF/g3TU5v2yg18wZAGEeSp8COBpi/uI7vZrEY3eWPnUkyZFueltBmE647Z+kB l7NQsKubE8YC+zcmJgjDetBQXfZiwYCecrW5SWGaBiise+kKSKSkufSr/oGUVRXq/b3Kqg SrhnxeEbeciaZ2HsKQtDWX27faKPUmsbx5pC1rldvrhHOSTVzV6CVpZI7ThK6MA6Zju6Ct R+oXR+iGFB7dzPDu8zCcDMOIkSDBT3Pybnx1UTzV8dnA8xqTPsKGrMuHzkKb9i7GMWzCuR 0pTbM4GzXztNxNB6hHK7RHOFLEnO1RVXTuL/t0ROi9ZR712FTDEvP3lC27K12w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ps6Nj5fgwzQhF; Wed, 5 Apr 2023 14:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 335EPPTM066321; Wed, 5 Apr 2023 14:25:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335EPPCb066320; Wed, 5 Apr 2023 14:25:25 GMT (envelope-from git) Date: Wed, 5 Apr 2023 14:25:25 GMT Message-Id: <202304051425.335EPPCb066320@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 30840c2819e3 - main - x11/waybar: simplify CONFLICTS List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30840c2819e395d66a8bdc6eb3c0583bd42f5dda Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=30840c2819e395d66a8bdc6eb3c0583bd42f5dda commit 30840c2819e395d66a8bdc6eb3c0583bd42f5dda Author: Jan Beich AuthorDate: 2023-04-05 13:55:35 +0000 Commit: Jan Beich 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