From nobody Tue Nov 16 20:41:37 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 27C62188D3C3; Tue, 16 Nov 2021 20:41:38 +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 4Htydt0Y14z3k8r; Tue, 16 Nov 2021 20:41:38 +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 E6A9D1429E; Tue, 16 Nov 2021 20:41:37 +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 1AGKfbIH064033; Tue, 16 Nov 2021 20:41:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AGKfbrD064032; Tue, 16 Nov 2021 20:41:37 GMT (envelope-from git) Date: Tue, 16 Nov 2021 20:41:37 GMT Message-Id: <202111162041.1AGKfbrD064032@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dries Michiels Subject: git: 18510dda5f37 - main - lang/mono6.8: Fix version in CONFLICTS_INSTALL 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: driesm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18510dda5f3729f2b12bfdf8934dca6389b24d83 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=18510dda5f3729f2b12bfdf8934dca6389b24d83 commit 18510dda5f3729f2b12bfdf8934dca6389b24d83 Author: Dries Michiels AuthorDate: 2021-11-15 19:43:38 +0000 Commit: Dries Michiels CommitDate: 2021-11-16 19:41:21 +0000 lang/mono6.8: Fix version in CONFLICTS_INSTALL PR: 254222 Approved by: 0mp (mentor), portmgr (blanket) Differential Revision: https://reviews.freebsd.org/D32998 --- lang/mono6.8/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lang/mono6.8/Makefile b/lang/mono6.8/Makefile index b0eda708849b..760cacd54b34 100644 --- a/lang/mono6.8/Makefile +++ b/lang/mono6.8/Makefile @@ -2,6 +2,7 @@ PORTNAME= mono PORTVERSION= 6.8.0.123 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= https://download.mono-project.com/sources/mono/ PKGNAMESUFFIX= 6.8 @@ -25,7 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ zip>=0:archivers/zip CONFLICTS_BUILD= brotli -CONFLICTS_INSTALL= czmq-3* mono5.10 mono6.8 +CONFLICTS_INSTALL= czmq-3* mono5.10 mono5.20 USES= autoreconf bison compiler:c11 cpe gmake iconv libtool \ pathfix perl5 python:3.6+ shebangfix tar:xz