diff --git a/CHANGES b/CHANGES --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,14 @@ All ports committers are allowed to commit to this file. +20210525: +AUTHOR: amdmi3@FreeBSD.org + + PYTHON_REL has been switched from a 4 digits number to a 5 digits number to + handle python 3.10.0. Ports checking for python 3.7.10 should compare + PYTHON_REL against 30710 and ports checking for python 3.10.0 should compare + PYTHON_REL against 31000. + 20201120: AUTHOR: gnome@FreeBSD.org diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -174,7 +174,7 @@ # PYTHON_PORTSDIR - The port directory of the chosen Python interpreter # # PYTHON_REL - The release number of the chosen Python interpreter -# without dots, e.g. 2706, 3401, ... +# without dots, e.g. 20706, 30401, ... # # PYTHON_SUFFIX - The major-minor release number of the chosen Python # interpreter without dots, e.g. 27, 36, ... @@ -449,24 +449,24 @@ .if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR}) .include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version" .endif -# Create a 4 integer version string, prefixing 0 to the last token if -# it's a single character. Only use the the first 3 tokens of +# Create a 5 integer version string, prefixing 0 to the minor and patch +# tokens if it's a single character. Only use the the first 3 tokens of # PORTVERSION to support pre-release versions (rc3, alpha4, etc) of # any Python port (lang/pythonXY) -PYTHON_REL= ${PYTHON_PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9]+)$/.0\1/:C/\.0?([0-9][0-9])$/.\1/:S/.//g} +PYTHON_REL= ${PYTHON_PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9])$/.0\1/:C/\.([0-9]\.[0-9]+)/.0\1/:S/.//g} # Might be overridden by calling ports PYTHON_CMD?= ${_PYTHON_BASECMD}${_PYTHON_VERSION} .if ${PYTHON_VER} != 2.7 .if exists(${PYTHON_CMD}-config) PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags -.elif ${PYTHON_REL} < 3800 +.elif ${PYTHON_REL} < 30800 # Default ABI flags for lang/python3[67] ports PYTHON_ABIVER= m .endif .endif -.if ${PYTHON_REL} >= 3807 +.if ${PYTHON_REL} >= 30807 PYTHON_EXT_SUFFIX= .cpython-${PYTHON_SUFFIX} .else PYTHON_EXT_SUFFIX= # empty @@ -607,7 +607,7 @@ ${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST} .else -.if ${PYTHON_REL} >= 3200 && defined(_PYTHON_FEATURE_PY3KPLIST) +.if ${PYTHON_REL} >= 30200 && defined(_PYTHON_FEATURE_PY3KPLIST) # When Python version is 3.2+ we rewrite all the filenames # of TMPPLIST that end with .py[co], so that they conform # to PEP 3147 (see https://www.python.org/dev/peps/pep-3147/) @@ -623,7 +623,7 @@ pc="__pycache__" mt="$$(${PYMAGICTAG})" pyo="opt-1.pyc" \ ${TMPPLIST} > ${TMPPLIST}.pyc_tmp @${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST} -.endif # ${PYTHON_REL} >= 3200 && defined(_PYTHON_FEATURE_PY3KPLIST) +.endif # ${PYTHON_REL} >= 30200 && defined(_PYTHON_FEATURE_PY3KPLIST) .endif # defined(_PYTHON_FEATURE_AUTOPLIST) && defined(_PYTHON_FEATURE_DISTUTILS) # Fix for programs that build python from a GNU auto* environment @@ -638,7 +638,7 @@ PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.20,1:math/py-numpy@${PY_FLAVOR} # Common Python modules that can be needed but only for some versions of Python. -.if ${PYTHON_REL} < 3500 +.if ${PYTHON_REL} < 30500 PY_PYGMENTS= ${PYTHON_PKGNAMEPREFIX}pygments-25>=2.5.1<3:textproc/py-pygments-25@${PY_FLAVOR} .else PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} @@ -678,7 +678,7 @@ PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \ PYTHON_VER=${PYTHON_VER} \ PYTHON_VERSION=${PYTHON_VERSION} -.if ${PYTHON_REL} < 3000 +.if ${PYTHON_REL} < 30000 PLIST_SUB+= PYTHON2="" PYTHON3="@comment " .else PLIST_SUB+= PYTHON2="@comment " PYTHON3="" diff --git a/astro/py-metpy/Makefile b/astro/py-metpy/Makefile --- a/astro/py-metpy/Makefile +++ b/astro/py-metpy/Makefile @@ -31,11 +31,11 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=1.0.0:devel/py-importlib-metadata@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 3900 +.if ${PYTHON_REL} < 30900 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=1.3.0:devel/py-importlib-resources@${PY_FLAVOR} .endif diff --git a/databases/py-sqlalchemy14/Makefile b/databases/py-sqlalchemy14/Makefile --- a/databases/py-sqlalchemy14/Makefile +++ b/databases/py-sqlalchemy14/Makefile @@ -37,7 +37,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile --- a/databases/py-sqlite3/Makefile +++ b/databases/py-sqlite3/Makefile @@ -30,7 +30,7 @@ .include post-extract: -.if ${PYTHON_REL} < 3000 +.if ${PYTHON_REL} < 30000 @${CP} ${FILESDIR}/setup.py ${WRKSRC} .else @${CP} ${FILESDIR}/setup3.py ${WRKSRC}/setup.py diff --git a/deskutils/dosage/Makefile b/deskutils/dosage/Makefile --- a/deskutils/dosage/Makefile +++ b/deskutils/dosage/Makefile @@ -24,7 +24,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cached-property>0:devel/py-cached-property@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-Jinja2/Makefile b/devel/py-Jinja2/Makefile --- a/devel/py-Jinja2/Makefile +++ b/devel/py-Jinja2/Makefile @@ -62,7 +62,7 @@ .if ${PORT_OPTIONS:MEXAMPLES} PORTEXAMPLES= * post-build: -. if ${PYTHON_REL} >= 3000 +. if ${PYTHON_REL} >= 30000 ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples . endif ${PYTHON_CMD} -m compileall ${WRKSRC}/examples ; \ diff --git a/devel/py-aiortc/Makefile b/devel/py-aiortc/Makefile --- a/devel/py-aiortc/Makefile +++ b/devel/py-aiortc/Makefile @@ -28,7 +28,7 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git a/devel/py-anyio/Makefile b/devel/py-anyio/Makefile --- a/devel/py-anyio/Makefile +++ b/devel/py-anyio/Makefile @@ -28,7 +28,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/devel/py-argcomplete/Makefile b/devel/py-argcomplete/Makefile --- a/devel/py-argcomplete/Makefile +++ b/devel/py-argcomplete/Makefile @@ -24,7 +24,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.23<5:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-arrow/Makefile b/devel/py-arrow/Makefile --- a/devel/py-arrow/Makefile +++ b/devel/py-arrow/Makefile @@ -20,7 +20,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/devel/py-astroid/Makefile b/devel/py-astroid/Makefile --- a/devel/py-astroid/Makefile +++ b/devel/py-astroid/Makefile @@ -21,7 +21,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typed-ast>=1.4.0<1.5:devel/py-typed-ast@${PY_FLAVOR} .endif diff --git a/devel/py-b2sdk/Makefile b/devel/py-b2sdk/Makefile --- a/devel/py-b2sdk/Makefile +++ b/devel/py-b2sdk/Makefile @@ -28,7 +28,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-black/Makefile b/devel/py-black/Makefile --- a/devel/py-black/Makefile +++ b/devel/py-black/Makefile @@ -34,11 +34,11 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0.6:devel/py-dataclasses@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typed-ast>=1.4.2:devel/py-typed-ast@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/devel/py-build/Makefile b/devel/py-build/Makefile --- a/devel/py-build/Makefile +++ b/devel/py-build/Makefile @@ -25,7 +25,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-catalogue/Makefile b/devel/py-catalogue/Makefile --- a/devel/py-catalogue/Makefile +++ b/devel/py-catalogue/Makefile @@ -19,7 +19,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.4:devel/py-typing-extensions@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zipp>=0.5:devel/py-zipp@${PY_FLAVOR} .endif diff --git a/devel/py-cmd2/Makefile b/devel/py-cmd2/Makefile --- a/devel/py-cmd2/Makefile +++ b/devel/py-cmd2/Makefile @@ -25,7 +25,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=1.6.0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-dataclasses-json/Makefile b/devel/py-dataclasses-json/Makefile --- a/devel/py-dataclasses-json/Makefile +++ b/devel/py-dataclasses-json/Makefile @@ -23,7 +23,7 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile --- a/devel/py-flake8/Makefile +++ b/devel/py-flake8/Makefile @@ -26,7 +26,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-fsspec/Makefile b/devel/py-fsspec/Makefile --- a/devel/py-fsspec/Makefile +++ b/devel/py-fsspec/Makefile @@ -19,7 +19,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-future-annotations/Makefile b/devel/py-future-annotations/Makefile --- a/devel/py-future-annotations/Makefile +++ b/devel/py-future-annotations/Makefile @@ -22,7 +22,7 @@ .include -.if ${PYTHON_REL} >= 3700 +.if ${PYTHON_REL} >= 30700 IGNORE= included in python ${PYTHON_VER} .endif diff --git a/devel/py-graphql-relay/Makefile b/devel/py-graphql-relay/Makefile --- a/devel/py-graphql-relay/Makefile +++ b/devel/py-graphql-relay/Makefile @@ -21,7 +21,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7<4:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/devel/py-importlib-metadata/Makefile b/devel/py-importlib-metadata/Makefile --- a/devel/py-importlib-metadata/Makefile +++ b/devel/py-importlib-metadata/Makefile @@ -20,7 +20,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.4:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/devel/py-importlib-resources/Makefile b/devel/py-importlib-resources/Makefile --- a/devel/py-importlib-resources/Makefile +++ b/devel/py-importlib-resources/Makefile @@ -19,7 +19,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zipp>=0:devel/py-zipp@${PY_FLAVOR} .endif diff --git a/devel/py-jsonpickle/Makefile b/devel/py-jsonpickle/Makefile --- a/devel/py-jsonpickle/Makefile +++ b/devel/py-jsonpickle/Makefile @@ -18,7 +18,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-libcst/Makefile b/devel/py-libcst/Makefile --- a/devel/py-libcst/Makefile +++ b/devel/py-libcst/Makefile @@ -23,7 +23,7 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0.6.0:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git a/devel/py-openstacksdk/Makefile b/devel/py-openstacksdk/Makefile --- a/devel/py-openstacksdk/Makefile +++ b/devel/py-openstacksdk/Makefile @@ -37,7 +37,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=1.7.0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-oslo.config/Makefile b/devel/py-oslo.config/Makefile --- a/devel/py-oslo.config/Makefile +++ b/devel/py-oslo.config/Makefile @@ -27,7 +27,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=1.7.0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-osprofiler/Makefile b/devel/py-osprofiler/Makefile --- a/devel/py-osprofiler/Makefile +++ b/devel/py-osprofiler/Makefile @@ -30,7 +30,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=1.7.0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-pep517/Makefile b/devel/py-pep517/Makefile --- a/devel/py-pep517/Makefile +++ b/devel/py-pep517/Makefile @@ -21,7 +21,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zipp>=0:devel/py-zipp@${PY_FLAVOR} .endif diff --git a/devel/py-pint/Makefile b/devel/py-pint/Makefile --- a/devel/py-pint/Makefile +++ b/devel/py-pint/Makefile @@ -25,11 +25,11 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=0:devel/py-importlib-resources@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-pip-run/Makefile b/devel/py-pip-run/Makefile --- a/devel/py-pip-run/Makefile +++ b/devel/py-pip-run/Makefile @@ -25,7 +25,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile --- a/devel/py-pip/Makefile +++ b/devel/py-pip/Makefile @@ -61,7 +61,7 @@ .include -.if ${PYTHON_REL} < 3700 && ${PORT_OPTIONS:MDOCS} +.if ${PYTHON_REL} < 30700 && ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}future-annotations>=0:devel/py-future-annotations@${PY_FLAVOR} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-python36 .endif diff --git a/devel/py-pipx/Makefile b/devel/py-pipx/Makefile --- a/devel/py-pipx/Makefile +++ b/devel/py-pipx/Makefile @@ -24,7 +24,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=3.3.0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-pluggy/Makefile b/devel/py-pluggy/Makefile --- a/devel/py-pluggy/Makefile +++ b/devel/py-pluggy/Makefile @@ -22,7 +22,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-poetry-core/Makefile b/devel/py-poetry-core/Makefile --- a/devel/py-poetry-core/Makefile +++ b/devel/py-poetry-core/Makefile @@ -19,7 +19,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=1.7.0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-prettytable/Makefile b/devel/py-prettytable/Makefile --- a/devel/py-prettytable/Makefile +++ b/devel/py-prettytable/Makefile @@ -22,7 +22,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-ptpython/Makefile b/devel/py-ptpython/Makefile --- a/devel/py-ptpython/Makefile +++ b/devel/py-ptpython/Makefile @@ -30,7 +30,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-pytest/Makefile b/devel/py-pytest/Makefile --- a/devel/py-pytest/Makefile +++ b/devel/py-pytest/Makefile @@ -42,7 +42,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-pyvisa-py/Makefile b/devel/py-pyvisa-py/Makefile --- a/devel/py-pyvisa-py/Makefile +++ b/devel/py-pyvisa-py/Makefile @@ -29,7 +29,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-pyvisa/Makefile b/devel/py-pyvisa/Makefile --- a/devel/py-pyvisa/Makefile +++ b/devel/py-pyvisa/Makefile @@ -22,11 +22,11 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile --- a/devel/py-setuptools/Makefile +++ b/devel/py-setuptools/Makefile @@ -34,7 +34,7 @@ # These create dependency loops in redports/poudriere, because setuptools # is currently an explicit BUILD & RUN dependency in Uses/python.mk. #TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} -#.if ${PYTHON_REL} < 3300 +#.if ${PYTHON_REL} < 30300 #TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} #.endif # pkg install -y py36-pytest py36-mock py36-pytest-fixture-config py36-pytest-virtualenv py36-paver diff --git a/devel/py-twine/Makefile b/devel/py-twine/Makefile --- a/devel/py-twine/Makefile +++ b/devel/py-twine/Makefile @@ -29,7 +29,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-watermark/Makefile b/devel/py-watermark/Makefile --- a/devel/py-watermark/Makefile +++ b/devel/py-watermark/Makefile @@ -21,7 +21,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile --- a/games/adonthell/Makefile +++ b/games/adonthell/Makefile @@ -38,7 +38,7 @@ # C extensions are no longer linked to libpython since Python 3.8 and onwards. # # See also https://bugs.python.org/issue36721 for reference. -.if ${PYTHON_REL} >= 3800 +.if ${PYTHON_REL} >= 30800 _PY_EMBED= --embed .endif diff --git a/games/anki/Makefile b/games/anki/Makefile --- a/games/anki/Makefile +++ b/games/anki/Makefile @@ -359,7 +359,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 _PY_SONAME= .cpython-${PYTHON_SUFFIX}m .else _PY_SONAME= ${PYTHON_EXT_SUFFIX} diff --git a/graphics/py-python-poppler-qt5/Makefile b/graphics/py-python-poppler-qt5/Makefile --- a/graphics/py-python-poppler-qt5/Makefile +++ b/graphics/py-python-poppler-qt5/Makefile @@ -25,7 +25,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 _PY_SONAME= .cpython-${PYTHON_SUFFIX}m .else _PY_SONAME= ${PYTHON_EXT_SUFFIX} diff --git a/math/cadabra2/Makefile b/math/cadabra2/Makefile --- a/math/cadabra2/Makefile +++ b/math/cadabra2/Makefile @@ -43,7 +43,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 _PY_SONAME= .cpython-${PYTHON_SUFFIX}m .else _PY_SONAME= ${PYTHON_EXT_SUFFIX} diff --git a/net/irrd/Makefile b/net/irrd/Makefile --- a/net/irrd/Makefile +++ b/net/irrd/Makefile @@ -58,7 +58,7 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0.6:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile --- a/net/py-kombu/Makefile +++ b/net/py-kombu/Makefile @@ -35,7 +35,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.18:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile --- a/net/py-netaddr/Makefile +++ b/net/py-netaddr/Makefile @@ -25,7 +25,7 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>0:devel/py-importlib-resources@${PY_FLAVOR} .endif diff --git a/net/py-tweepy/Makefile b/net/py-tweepy/Makefile --- a/net/py-tweepy/Makefile +++ b/net/py-tweepy/Makefile @@ -29,7 +29,7 @@ .include -.if ${PYTHON_REL} < 3000 +.if ${PYTHON_REL} < 30000 TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2@${PY_FLAVOR} .endif diff --git a/net/py-wsproto/Makefile b/net/py-wsproto/Makefile --- a/net/py-wsproto/Makefile +++ b/net/py-wsproto/Makefile @@ -21,7 +21,7 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>0:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git a/print/py-fonttools3/Makefile b/print/py-fonttools3/Makefile --- a/print/py-fonttools3/Makefile +++ b/print/py-fonttools3/Makefile @@ -46,7 +46,7 @@ .include .if ${PORT_OPTIONS:MUNICODE} -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unicodedata2>=12.0.0:devel/py-unicodedata2@${PY_FLAVOR} .endif .endif diff --git a/print/py-ufolib2/Makefile b/print/py-ufolib2/Makefile --- a/print/py-ufolib2/Makefile +++ b/print/py-ufolib2/Makefile @@ -30,7 +30,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/science/py-asdf/Makefile b/science/py-asdf/Makefile --- a/science/py-asdf/Makefile +++ b/science/py-asdf/Makefile @@ -31,7 +31,7 @@ .include -.if ${PYTHON_REL} < 3900 +.if ${PYTHON_REL} < 30900 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=3:devel/py-importlib-resources@${PY_FLAVOR} .endif diff --git a/science/py-h5py/Makefile b/science/py-h5py/Makefile --- a/science/py-h5py/Makefile +++ b/science/py-h5py/Makefile @@ -26,7 +26,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cached-property>=0:devel/py-cached-property@${PY_FLAVOR} .endif diff --git a/security/py-flask-saml/Makefile b/security/py-flask-saml/Makefile --- a/security/py-flask-saml/Makefile +++ b/security/py-flask-saml/Makefile @@ -19,7 +19,7 @@ .include -.if ${PYTHON_REL} < 3900 +.if ${PYTHON_REL} < 30900 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pysaml24>=4.0.0<5:security/py-pysaml24@${PY_FLAVOR} .else RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pysaml2>=5.1.0<6.20:security/py-pysaml2@${PY_FLAVOR} diff --git a/security/py-signedjson/Makefile b/security/py-signedjson/Makefile --- a/security/py-signedjson/Makefile +++ b/security/py-signedjson/Makefile @@ -27,7 +27,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/sysutils/py-python-crontab/Makefile b/sysutils/py-python-crontab/Makefile --- a/sysutils/py-python-crontab/Makefile +++ b/sysutils/py-python-crontab/Makefile @@ -26,7 +26,7 @@ .include # The UTF-8 mode is enabled by default when the locale is C since Python 3.7. -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 TEST_ENV+= LC_ALL=C.UTF-8 .endif diff --git a/textproc/py-fingerprints/Makefile b/textproc/py-fingerprints/Makefile --- a/textproc/py-fingerprints/Makefile +++ b/textproc/py-fingerprints/Makefile @@ -22,7 +22,7 @@ .include # Set a locale to avoid build/configure errors. The UTF-8 mode is enabled by # default when the locale is C since Python 3.7. -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 USE_LOCALE= en_US.UTF-8 .endif diff --git a/textproc/py-markdown-it-py/Makefile b/textproc/py-markdown-it-py/Makefile --- a/textproc/py-markdown-it-py/Makefile +++ b/textproc/py-markdown-it-py/Makefile @@ -22,7 +22,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/textproc/py-normality/Makefile b/textproc/py-normality/Makefile --- a/textproc/py-normality/Makefile +++ b/textproc/py-normality/Makefile @@ -29,7 +29,7 @@ .include # Set a locale to avoid build/configure errors. The UTF-8 mode is enabled by # default when the locale is C since Python 3.7. -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 USE_LOCALE= en_US.UTF-8 .endif diff --git a/textproc/py-sphinx-inline-tabs/Makefile b/textproc/py-sphinx-inline-tabs/Makefile --- a/textproc/py-sphinx-inline-tabs/Makefile +++ b/textproc/py-sphinx-inline-tabs/Makefile @@ -23,7 +23,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/www/py-aiohttp/Makefile b/www/py-aiohttp/Makefile --- a/www/py-aiohttp/Makefile +++ b/www/py-aiohttp/Makefile @@ -36,7 +36,7 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 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-aioquic/Makefile b/www/py-aioquic/Makefile --- a/www/py-aioquic/Makefile +++ b/www/py-aioquic/Makefile @@ -21,7 +21,7 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git a/www/py-cssutils/Makefile b/www/py-cssutils/Makefile --- a/www/py-cssutils/Makefile +++ b/www/py-cssutils/Makefile @@ -28,7 +28,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/www/py-dj31-django-auth-ldap/Makefile b/www/py-dj31-django-auth-ldap/Makefile --- a/www/py-dj31-django-auth-ldap/Makefile +++ b/www/py-dj31-django-auth-ldap/Makefile @@ -32,7 +32,7 @@ # Set a locale to avoid build/configure errors. The UTF-8 mode is enabled by # default when the locale is C since Python 3.7. -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 USE_LOCALE= en_US.UTF-8 .endif diff --git a/www/py-django-auth-ldap/Makefile b/www/py-django-auth-ldap/Makefile --- a/www/py-django-auth-ldap/Makefile +++ b/www/py-django-auth-ldap/Makefile @@ -32,7 +32,7 @@ # Set a locale to avoid build/configure errors. The UTF-8 mode is enabled by # default when the locale is C since Python 3.7. -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 USE_LOCALE= en_US.UTF-8 .endif diff --git a/www/py-django-bootstrap3/Makefile b/www/py-django-bootstrap3/Makefile --- a/www/py-django-bootstrap3/Makefile +++ b/www/py-django-bootstrap3/Makefile @@ -19,7 +19,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=1.5.0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/www/py-django-markdownx/Makefile b/www/py-django-markdownx/Makefile --- a/www/py-django-markdownx/Makefile +++ b/www/py-django-markdownx/Makefile @@ -23,7 +23,7 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 # Force an UTF-8 environment to avoid failures in the configuration phase for # Python versions <= 3.6. Since Python 3.7 the UTF-8 mode is enabled by # default when the locale is C. diff --git a/www/py-django-treebeard/Makefile b/www/py-django-treebeard/Makefile --- a/www/py-django-treebeard/Makefile +++ b/www/py-django-treebeard/Makefile @@ -28,7 +28,7 @@ .include # Set a locale to avoid build/configure errors. The UTF-8 mode is enabled by # default when the locale is C since Python 3.7. -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 USE_LOCALE= en_US.UTF-8 .endif diff --git a/www/py-fqdn/Makefile b/www/py-fqdn/Makefile --- a/www/py-fqdn/Makefile +++ b/www/py-fqdn/Makefile @@ -15,7 +15,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cached-property>=1.3.0:devel/py-cached-property@${PY_FLAVOR} .endif diff --git a/www/py-hypercorn/Makefile b/www/py-hypercorn/Makefile --- a/www/py-hypercorn/Makefile +++ b/www/py-hypercorn/Makefile @@ -42,7 +42,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/www/py-uvicorn/Makefile b/www/py-uvicorn/Makefile --- a/www/py-uvicorn/Makefile +++ b/www/py-uvicorn/Makefile @@ -33,7 +33,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/www/py-werkzeug/Makefile b/www/py-werkzeug/Makefile --- a/www/py-werkzeug/Makefile +++ b/www/py-werkzeug/Makefile @@ -27,7 +27,7 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git a/www/py-yarl/Makefile b/www/py-yarl/Makefile --- a/www/py-yarl/Makefile +++ b/www/py-yarl/Makefile @@ -33,7 +33,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/www/qutebrowser/Makefile b/www/qutebrowser/Makefile --- a/www/qutebrowser/Makefile +++ b/www/qutebrowser/Makefile @@ -48,11 +48,11 @@ EXPIRATION_DATE=2021-06-23 .endif -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>0:devel/py-dataclasses@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 3900 +.if ${PYTHON_REL} < 30900 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>0:devel/py-importlib-resources@${PY_FLAVOR} .endif diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile --- a/x11-toolkits/py-tkinter/Makefile +++ b/x11-toolkits/py-tkinter/Makefile @@ -27,7 +27,7 @@ .include post-extract: -.if ${PYTHON_REL} < 3000 +.if ${PYTHON_REL} < 30000 @${SED} -e "s|%%TK_VER%%|${TK_VER}|" ${FILESDIR}/setup.py > ${WRKSRC}/setup.py .else @${SED} -e "s|%%TK_VER%%|${TK_VER}|" ${FILESDIR}/setup3.py > ${WRKSRC}/setup.py diff --git a/x11-wm/chamfer/Makefile b/x11-wm/chamfer/Makefile --- a/x11-wm/chamfer/Makefile +++ b/x11-wm/chamfer/Makefile @@ -39,7 +39,7 @@ # XXX https://github.com/mesonbuild/meson/issues/4788 @${REINPLACE_CMD} -e '/boost/!s/python3/python-${PYTHON_VER}/' \ -e '/boost/s/python3/python${PYTHON_SUFFIX}/' \ - `if [ ${PYTHON_REL} -lt 3800 ]; then \ + `if [ ${PYTHON_REL} -lt 30800 ]; then \ printf "%s %s" -e '/python.*embed/d'; \ fi` \ ${WRKSRC}/meson.build