git: 94f74fda1f58 - main - devel/py-pyyaml: Remove obsoleted CONFLICTS

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Li-Wen Hsu <lwhsu_at_FreeBSD.org>
Date: Mon, 22 Jul 2024 07:24:59 UTC

The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=94f74fda1f58a0a4a7564c1c7fa7f8fc74d24ad9

commit 94f74fda1f58a0a4a7564c1c7fa7f8fc74d24ad9
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2024-07-22 07:23:55 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2024-07-22 07:23:55 +0000

    devel/py-pyyaml: Remove obsoleted CONFLICTS
---
 devel/py-pyyaml/Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/devel/py-pyyaml/Makefile b/devel/py-pyyaml/Makefile
index eafcac314d7c..1047b7c98e63 100644
--- a/devel/py-pyyaml/Makefile
+++ b/devel/py-pyyaml/Makefile
@@ -15,8 +15,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		python
 USE_PYTHON=	autoplist concurrent cython distutils
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pyyaml5
-
 OPTIONS_DEFINE=	LIBYAML EXAMPLES
 OPTIONS_DEFAULT=LIBYAML
 LIBYAML_DESC=	Use textproc/libyaml for faster parsing