From owner-dev-commits-ports-all@freebsd.org Tue Apr 20 15:20:40 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 238605DB216; Tue, 20 Apr 2021 15:20:40 +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 4FPnSS0GCcz4s0f; Tue, 20 Apr 2021 15:20:40 +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 F04541513D; Tue, 20 Apr 2021 15:20:39 +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 13KFKd9T001186; Tue, 20 Apr 2021 15:20:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KFKdxS001185; Tue, 20 Apr 2021 15:20:39 GMT (envelope-from git) Date: Tue, 20 Apr 2021 15:20:39 GMT Message-Id: <202104201520.13KFKdxS001185@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 59a193142b5a - main - textproc/py-markdown conflicts with textproc/py-markdown3, not itself MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59a193142b5a074356191425aa296aefb98013ae Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 15:20:40 -0000 The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=59a193142b5a074356191425aa296aefb98013ae commit 59a193142b5a074356191425aa296aefb98013ae Author: Neel Chauhan AuthorDate: 2021-04-20 15:20:39 +0000 Commit: Neel Chauhan CommitDate: 2021-04-20 15:20:39 +0000 textproc/py-markdown conflicts with textproc/py-markdown3, not itself --- textproc/py-markdown/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile index 09c15a57682d..36416fbae641 100644 --- a/textproc/py-markdown/Makefile +++ b/textproc/py-markdown/Makefile @@ -23,7 +23,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ USES= python:3.6+ USE_PYTHON= distutils concurrent autoplist -CONFLICTS= ${PYTHON_PKGNAMEPREFIX}markdown +CONFLICTS= ${PYTHON_PKGNAMEPREFIX}markdown3 NO_ARCH= yes