1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00

Do not use PYTHON_VER in comparisons

This commit is contained in:
Antoine Brodin 2021-04-12 18:28:04 +00:00
parent 006592a773
commit 979e06028d
3 changed files with 10 additions and 8 deletions

View File

@ -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

View File

@ -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

View File

@ -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