Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Apr 2021 15:20:39 GMT
From:      Neel Chauhan <nc@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 59a193142b5a - main - textproc/py-markdown conflicts with textproc/py-markdown3, not itself
Message-ID:  <202104201520.13KFKdxS001185@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=59a193142b5a074356191425aa296aefb98013ae

commit 59a193142b5a074356191425aa296aefb98013ae
Author:     Neel Chauhan <nc@FreeBSD.org>
AuthorDate: 2021-04-20 15:20:39 +0000
Commit:     Neel Chauhan <nc@FreeBSD.org>
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104201520.13KFKdxS001185>