Date: Wed, 13 Oct 2021 06:38:10 GMT From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 822b5bff5077 - main - devel/py-resolvelib*: Improve CONFLICTS_INSTALL Message-ID: <202110130638.19D6cA9C042991@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=822b5bff50773c9fdb4d99b2934e7d44cd407bd1 commit 822b5bff50773c9fdb4d99b2934e7d44cd407bd1 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-10-13 06:34:44 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-10-13 06:37:56 +0000 devel/py-resolvelib*: Improve CONFLICTS_INSTALL Use ${PYTHON_PKGNAMEPREFIX} instead of py-${PYTHON_SUFFIX}. It's more idiomatic. Reported by: sunpoet --- devel/py-resolvelib/Makefile | 2 +- devel/py-resolvelib05/Makefile | 2 +- devel/py-resolvelib07/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devel/py-resolvelib/Makefile b/devel/py-resolvelib/Makefile index f09322dd8a4d..3a0fcea7698f 100644 --- a/devel/py-resolvelib/Makefile +++ b/devel/py-resolvelib/Makefile @@ -13,7 +13,7 @@ LICENSE= ISCL USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils -CONFLICTS_INSTALL= py${PYTHON_SUFFIX}-${PORTNAME}05 py${PYTHON_SUFFIX}-${PORTNAME}07 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}-${PORTNAME}05 ${PYTHON_PKGNAMEPREFIX}-${PORTNAME}07 NO_ARCH= yes diff --git a/devel/py-resolvelib05/Makefile b/devel/py-resolvelib05/Makefile index 588fb22c4f03..4fb9feafed4a 100644 --- a/devel/py-resolvelib05/Makefile +++ b/devel/py-resolvelib05/Makefile @@ -14,7 +14,7 @@ LICENSE= ISCL USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils -CONFLICTS_INSTALL= py${PYTHON_SUFFIX}-${PORTNAME} py${PYTHON_SUFFIX}-${PORTNAME}07 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}-${PORTNAME} ${PYTHON_PKGNAMEPREFIX}-${PORTNAME}07 NO_ARCH= yes diff --git a/devel/py-resolvelib07/Makefile b/devel/py-resolvelib07/Makefile index c6402ac4f02a..d83623c5c595 100644 --- a/devel/py-resolvelib07/Makefile +++ b/devel/py-resolvelib07/Makefile @@ -13,7 +13,7 @@ LICENSE= ISCL USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils -CONFLICTS_INSTALL= py${PYTHON_SUFFIX}-${PORTNAME} py${PYTHON_SUFFIX}-${PORTNAME}05 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}-${PORTNAME} ${PYTHON_PKGNAMEPREFIX}-${PORTNAME}05 NO_ARCH= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110130638.19D6cA9C042991>