From nobody Thu Nov 25 22:37:14 2021 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 29A9F18B8C73; Thu, 25 Nov 2021 22:37:15 +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 4J0Xn653fxz3K13; Thu, 25 Nov 2021 22:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 881EC258AC; Thu, 25 Nov 2021 22:37:14 +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 1APMbEie036948; Thu, 25 Nov 2021 22:37:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1APMbEZH036947; Thu, 25 Nov 2021 22:37:14 GMT (envelope-from git) Date: Thu, 25 Nov 2021 22:37:14 GMT Message-Id: <202111252237.1APMbEZH036947@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 0ba766789e08 - main - astro/celestia: Fix 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ba766789e08b6c43d95dd23af1476fe7648fa94 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637879834; 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=w6r3QrVgnikhAnpW6Tji+CirpERHfiv/RjFLhlGJdxs=; b=ZFRorY4YGuSpPlw+4CG576TltgeMn6R/947qjw7LXsDOtyqzXVyWUtVR+RZKzjlv0HW4L+ 03z5eApaNnx1Erc8SxGN2lSdcVbaRvOJhFFjtjw3huMXDZgZ8asRWwJOPHfAsrDjqPHCdV vu+G8maS+Exo30jDBvXg2uQIxt0KuC6EemuDxD616ILIn5AjV63ZYNTU86he6IBs4AZ/fO olCxbEFJLYCO1pwyGXA2x1kmnlnhAoCW5fyj8YISG8+FUbZ4XttmaJ4DAoU9U6X/gZDXSK U3nMoSRndRw79ctN8FCX/2ZA9QC4KIjDeGvX2oEc9CeNfuWTDJKp0A5Rvwqq4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637879834; a=rsa-sha256; cv=none; b=DnMI+Jy0wImTT2QYfb/8hml7cn7OPuHq3bSeqlax7SIWofgOTUaD3h9Hx5pzQUVqGtFskx 0Ln2lLeQwaeAMhZnYVOVi5BvSkJcAxKG6NiTyeODsEnKm5t6PWzDFSfM251JlXt59JUnwH iGoN35epqSYeqAUYj41lpvqF1jBIIq+RPh5z1cIrBc0Mpqw7z59u2bT57IWNHZCv0fq5rK bv6xn9LafJ1iADe2rZktHkfSXs0NcoIllPzianf+yJqmJ5HR9TcX+PZH8V0Yk0/spbk0WU 1ItINc6w9w7KeHt22M7O27jwywE4AedQ8X3tsyZrhH89j0SE9dTzAzbN3Z4t5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ba766789e08b6c43d95dd23af1476fe7648fa94 commit 0ba766789e08b6c43d95dd23af1476fe7648fa94 Author: Stefan Eßer AuthorDate: 2021-11-25 22:26:24 +0000 Commit: Stefan Eßer CommitDate: 2021-11-25 22:36:59 +0000 astro/celestia: Fix CONFLICTS Remove redundant -[0-9]* from the end of the CONFLICTS pattern. Approved by: portmgr (blanket) --- astro/celestia/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile index e62cec3d3c48..1032e58c7ca8 100644 --- a/astro/celestia/Makefile +++ b/astro/celestia/Makefile @@ -28,7 +28,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -pthread UI_LIST= glut gtk gnome CELESTIA_UI?= glut -CONFLICTS= ${UI_LIST:S|${CELESTIA_UI}||:S|^|celestia-|:S|$|-[0-9]*|} +CONFLICTS= ${UI_LIST:S|${CELESTIA_UI}||:S|^|celestia-|} # Celestia provides different UI frontends; you should pick one that suits # you best by setting CELESTIA_UI variable. Possible values are: