Date: Mon, 12 Apr 2021 18:28:53 GMT From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 979e06028d87 - main - Do not use PYTHON_VER in comparisons Message-ID: <202104121828.13CISrNk017542@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by antoine: URL: https://cgit.FreeBSD.org/ports/commit/?id=979e06028d87425e22c0ba8d817dfcb346f3007d commit 979e06028d87425e22c0ba8d817dfcb346f3007d Author: Antoine Brodin <antoine@FreeBSD.org> AuthorDate: 2021-04-12 18:28:04 +0000 Commit: Antoine Brodin <antoine@FreeBSD.org> CommitDate: 2021-04-12 18:28:30 +0000 Do not use PYTHON_VER in comparisons --- Mk/Uses/python.mk | 12 ++++++------ www/py-aiohttp/Makefile | 3 ++- www/py-uvicorn/Makefile | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 79201987e607..d8ac5c9909fb 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -445,12 +445,6 @@ PYTHON_REL= # empty PYTHON_ABIVER= # empty PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX} -.if ${PYTHON_VER} >= 3.8 -PYTHON_EXT_SUFFIX= .cpython-${PYTHON_SUFFIX} -.else -PYTHON_EXT_SUFFIX= # empty -.endif - # Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env(). .if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR}) .include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version" @@ -472,6 +466,12 @@ PYTHON_ABIVER= m .endif .endif +.if ${PYTHON_REL} >= 3807 +PYTHON_EXT_SUFFIX= .cpython-${PYTHON_SUFFIX} +.else +PYTHON_EXT_SUFFIX= # empty +.endif + .if ${PYTHON_MAJOR_VER} == 2 DEPRECATED?= Uses Python 2.7 which is EOLed upstream EXPIRATION_DATE?= 2020-12-31 diff --git a/www/py-aiohttp/Makefile b/www/py-aiohttp/Makefile index 844db37039d8..4dab563fdec7 100644 --- a/www/py-aiohttp/Makefile +++ b/www/py-aiohttp/Makefile @@ -2,6 +2,7 @@ PORTNAME= aiohttp PORTVERSION= 3.6.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -35,7 +36,7 @@ USE_PYTHON= autoplist distutils cython .include <bsd.port.pre.mk> -.if ${PYTHON_VER} < 3.7 +.if ${PYTHON_REL} < 3700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}idna_ssl>=1.0:dns/py-idna_ssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.5:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/www/py-uvicorn/Makefile b/www/py-uvicorn/Makefile index 0d60a3f95325..3d52f3dc9268 100644 --- a/www/py-uvicorn/Makefile +++ b/www/py-uvicorn/Makefile @@ -2,6 +2,7 @@ PORTNAME= uvicorn PORTVERSION= 0.13.4 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -32,7 +33,7 @@ WATCHGODRELOAD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}watchgod>=0.6:devel/py-watchg .include <bsd.port.pre.mk> -.if ${PYTHON_VER} < 3800 +.if ${PYTHON_REL} < 3800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104121828.13CISrNk017542>