From f16e9da3a05cffb2e40e3af946e288d03dfeecc4 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu Date: Mon, 19 Feb 2018 07:46:26 +0000 Subject: [PATCH] Register CONFLICTS PR: 224593 Submitted by: Shane Approved by: koobs (maintainer, py-python-magic) MFH: 2018Q1 --- devel/py-magic/Makefile | 3 +++ devel/py-python-magic/Makefile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/devel/py-magic/Makefile b/devel/py-magic/Makefile index 9037d8c36e62..9bb4c8611c49 100644 --- a/devel/py-magic/Makefile +++ b/devel/py-magic/Makefile @@ -15,6 +15,9 @@ COMMENT= Python module for determining file type LICENSE= BSD2CLAUSE +# both install module as magic.py +CONFLICTS= ${PYTHON_PKGNAMEPREFIX}python-magic-* + USES= python USE_PYTHON= distutils autoplist diff --git a/devel/py-python-magic/Makefile b/devel/py-python-magic/Makefile index d68a8f1984c0..ca226b4c7649 100644 --- a/devel/py-python-magic/Makefile +++ b/devel/py-python-magic/Makefile @@ -12,6 +12,9 @@ COMMENT= File type identification using libmagic LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +# both install module as magic.py +CONFLICTS= ${PYTHON_PKGNAMEPREFIX}magic-* + USES= python USE_GITHUB= yes USE_PYTHON= autoplist distutils