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 @@ -1,20 +1,20 @@ PORTNAME= resolvelib DISTVERSION= 0.8.1 PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= 0mp@FreeBSD.org COMMENT= Resolve abstract dependencies into concrete ones 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 .include 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 @@ -1,23 +1,23 @@ PORTNAME= resolvelib DISTVERSION= 0.5.5 PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= 05 MAINTAINER= 0mp@FreeBSD.org COMMENT= Resolve abstract dependencies into concrete ones 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 PORTSCOUT= limit:^0\.5\. .include 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 @@ -1,22 +1,22 @@ PORTNAME= resolvelib DISTVERSION= 0.7.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= 07 MAINTAINER= 0mp@FreeBSD.org COMMENT= Resolve abstract dependencies into concrete ones 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 PORTSCOUT= limit:^0\.7\. .include