From nobody Thu Nov 25 22:37:17 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 ABAD918B8F78; Thu, 25 Nov 2021 22:37:19 +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 4J0XnB615wz3KbX; Thu, 25 Nov 2021 22:37:18 +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 0835425654; Thu, 25 Nov 2021 22:37:18 +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 1APMbH8H037032; Thu, 25 Nov 2021 22:37:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1APMbHMP037031; Thu, 25 Nov 2021 22:37:17 GMT (envelope-from git) Date: Thu, 25 Nov 2021 22:37:17 GMT Message-Id: <202111252237.1APMbHMP037031@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: 9e703966e84a - main - net/tigervnc-server: 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: 9e703966e84a1c78709c91a16a18177d2fe9d73c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637879839; 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=alnh6X+UTqSsBXMFXgEV9QNYWBY5B8f0+TCSX8V3nt8=; b=n2l1tBVowF4t5eSaP8lrx/wFzc7fF4CLH4453PfyfAKv/6f8/Z2Dw7k/VgoB2kLE8qfxfu 142mXwZf5MTbqd0smQyWvnkHwQ5Pgb9JIddLQHxZc8VsYnAxDfmnM28Q//vlhl/klv9Y/O A4EeRBzqh54ooeJuLlNyHd7fLYJwYQvoYqa5tB++VqGrzeZmy+clBQMpGNS18lcnFN61X+ TosZziEy1sIyv7KtdfBn1+4o6vx4Wx+Pp21j4+n1il/dfG8cm4axuPrAPE4Cd/T7QZ/PLW qx4PjP3MSLOlQEpMNKskp+5pEHd5cpyl4222wZEPcS49SBPA8p/WHG+vgIBAGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637879839; a=rsa-sha256; cv=none; b=sPqA+RUM8qB1uC4wbv0ztBygdKolOtgcmKVVSu68WN0etpN4tdPh9THb4cfsUSfvyiBDY2 fjTZEF1Q/DPCwv0IpP3tTjFIne680M9Iwbmsqswc3LT2y3Y1nAF0/Fn61WnSA4s/sB5WXf 5dFPv5MiBNn/Z7YF1LDCj9KaAWf8Bk15fm2eYQ2y4cV4+DBzkulFVyUryHlKVWsmjNYhyY LgZqQFkFQHipSKDFsTAjn8a3Ke5uJWmI+r5S+FDTloCxO88B0e6CAL7n3DIjLuMXJD8B9Z zi5mMt+sPJzjEjZV8sqt3XEJQXbyIPIm/VrIXRBkVHduhZtf8Q7+ZJC4s+2b/w== 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=9e703966e84a1c78709c91a16a18177d2fe9d73c commit 9e703966e84a1c78709c91a16a18177d2fe9d73c Author: Stefan Eßer AuthorDate: 2021-11-25 22:35:20 +0000 Commit: Stefan Eßer CommitDate: 2021-11-25 22:36:59 +0000 net/tigervnc-server: Fix CONFLICTS Remove redundant version wildcard. Approved by: portmgr (blanket) --- net/tigervnc-server/Makefile.common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/tigervnc-server/Makefile.common.mk b/net/tigervnc-server/Makefile.common.mk index 1df1ac5dffbf..2b311ac13d73 100644 --- a/net/tigervnc-server/Makefile.common.mk +++ b/net/tigervnc-server/Makefile.common.mk @@ -12,7 +12,7 @@ USES+= cmake:insource,noninja cpe USE_GITHUB= yes GH_ACCOUNT= TigerVNC -CONFLICTS= tightvnc-[0-9]* +CONFLICTS= tightvnc PLIST_SUB+= TIGERVNC_COMPONENT=${PORTNAME}${PKGNAMESUFFIX}- CMAKE_ARGS+= -G "Unix Makefiles" -DINSTALL_SYSTEMD_UNITS:BOOL=false