Index: CHANGES =================================================================== --- CHANGES +++ CHANGES @@ -10,6 +10,14 @@ All ports committers are allowed to commit to this file. +20210409: +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 Index: Mk/Uses/python.mk =================================================================== --- Mk/Uses/python.mk +++ Mk/Uses/python.mk @@ -168,13 +168,13 @@ # PYTHONBASE - The installation prefix of the chosen Python # interpreter, e.g. /usr/local # -# PYTHON_PORTVERSION -# - Version number suitable for ${PORTVERSION}. +# PYTHON_DISTVERSION +# - Version number suitable for ${DISTVERSION}. # # 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, ... @@ -337,23 +337,28 @@ .endif # Validate Python version whether it meets the version restriction. -_PYTHON_VERSION_CHECK:= ${_PYTHON_ARGS:C/^([1-9]\.[0-9])$/\1-\1/} -_PYTHON_VERSION_MINIMUM_TMP:= ${_PYTHON_VERSION_CHECK:C/([1-9]\.[0-9])[-+].*/\1/} -_PYTHON_VERSION_MINIMUM:= ${_PYTHON_VERSION_MINIMUM_TMP:M[1-9].[0-9]} -_PYTHON_VERSION_MAXIMUM_TMP:= ${_PYTHON_VERSION_CHECK:C/.*-([1-9]\.[0-9])/\1/} -_PYTHON_VERSION_MAXIMUM:= ${_PYTHON_VERSION_MAXIMUM_TMP:M[1-9].[0-9]} +_PYTHON_VERSION_CHECK:= ${_PYTHON_ARGS:C/^([1-9]\.[1-9]?[0-9])$/\1-\1/} +_PYTHON_VERSION_MINIMUM_TMP:= ${_PYTHON_VERSION_CHECK:C/([1-9]\.[1-9]?[0-9])[-+].*/\1/} +_PYTHON_VERSION_MINIMUM:= ${_PYTHON_VERSION_MINIMUM_TMP:M[1-9].[0-9]}${_PYTHON_VERSION_MINIMUM_TMP:M[1-9].[1-9][0-9]} +_PYTHON_VERSION_MAXIMUM_TMP:= ${_PYTHON_VERSION_CHECK:C/.*-([1-9]\.[1-9]?[0-9])/\1/} +_PYTHON_VERSION_MAXIMUM:= ${_PYTHON_VERSION_MAXIMUM_TMP:M[1-9].[0-9]}${_PYTHON_VERSION_MAXIMUM_TMP:M[1-9].[1-9][0-9]} # At this point we should have no argument left in ${_PYTHON_ARGS} # except a version spec -_PYTHON_ARGS:= ${_PYTHON_ARGS:N[1-9].[0-9]-[1-9].[0-9]:N[1-9].[0-9]:N[1-9].[0-9]+:N-[1-9].[0-9]} +_V1= [1-9].[0-9] +_V2= [1-9].[1-9][0-9] +_PYTHON_ARGS:= ${_PYTHON_ARGS:N${_V1}-${_V1}:N${_V1}-${_V2}:N${_V2}-${_V2}:N${_V1}:N${_V2}:N${_V1}+:N${_V2}+:N-${_V1}:N-${_V2}} .if !empty(_PYTHON_ARGS) IGNORE= uses unknown USES=python arguments: ${_PYTHON_ARGS} .endif +# Pattern to convert python versions (X.Y or X.YY) to comparable format X.YY +_VC= C/^([1-9]\.)([0-9])$$/\10\2/ + .undef _PYTHON_VERSION_NONSUPPORTED -.if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION} < ${_PYTHON_VERSION_MINIMUM}) +.if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}}) _PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MINIMUM} at least -.elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION} > ${_PYTHON_VERSION_MAXIMUM}) +.elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}) _PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most .endif @@ -364,9 +369,9 @@ __VER= ${ver} .if !defined(_PYTHON_VERSION) && \ !(!empty(_PYTHON_VERSION_MINIMUM) && ( \ - ${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \ + ${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \ !(!empty(_PYTHON_VERSION_MAXIMUM) && ( \ - ${__VER} > ${_PYTHON_VERSION_MAXIMUM})) + ${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}})) _PYTHON_VERSION= ${ver} .endif .endfor @@ -381,9 +386,9 @@ . for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS} __VER= ${ver} . if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \ - ${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \ + ${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \ !(!empty(_PYTHON_VERSION_MAXIMUM) && ( \ - ${__VER} > ${_PYTHON_VERSION_MAXIMUM})) + ${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}})) . if empty(_VALID_PYTHON_VERSIONS:M${ver}) _VALID_PYTHON_VERSIONS+= ${ver} . endif @@ -416,7 +421,7 @@ . endif .endif -.if ${FLAVOR:Mpy[23][0-9]} +.if ${FLAVOR:Mpy[23][0-9]}${FLAVOR:Mpy[23][1-9][0-9]} _PYTHON_VERSION= ${FLAVOR:S/py//:C/(.)/\1./} .endif @@ -455,18 +460,18 @@ .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_DISTVERSION: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 @@ -607,7 +612,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 +628,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,14 +643,14 @@ 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} PY_PYGMENTS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.1<3:textproc/py-pygments@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 3400 +.if ${PYTHON_REL} < 30400 PY_ENUM34= ${PYTHON_PKGNAMEPREFIX}enum34>=1.1<2.0:devel/py-enum34@${PY_FLAVOR} .else PY_ENUM34= @@ -684,7 +689,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="" Index: astro/py-metpy/Makefile =================================================================== --- astro/py-metpy/Makefile +++ 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 Index: databases/py-gdbm/Makefile =================================================================== --- databases/py-gdbm/Makefile +++ databases/py-gdbm/Makefile @@ -1,12 +1,12 @@ # Created by: Thomas Gellekum PORTNAME= gdbm -PORTVERSION= ${PYTHON_PORTVERSION} +DISTVERSION= ${PYTHON_DISTVERSION} PORTREVISION= 6 CATEGORIES= databases python -MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} +MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= Python-${PORTVERSION} +DISTNAME= Python-${DISTVERSION} MAINTAINER= python@FreeBSD.org COMMENT= Python bindings to the GNU dbm library (Python ${PYTHON_VER}) @@ -24,7 +24,7 @@ DIST_SUBDIR= python DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo -WRKSRC= ${WRKDIR}/Python-${PORTVERSION}/Modules +WRKSRC= ${WRKDIR}/Python-${DISTVERSION}/Modules post-extract: @${CP} ${FILESDIR}/setup3.py ${WRKSRC}/setup.py Index: databases/py-sqlalchemy14/Makefile =================================================================== --- databases/py-sqlalchemy14/Makefile +++ 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 Index: databases/py-sqlite3/Makefile =================================================================== --- databases/py-sqlite3/Makefile +++ databases/py-sqlite3/Makefile @@ -1,19 +1,19 @@ # Created by: Hye-Shik Chang PORTNAME= sqlite3 -PORTVERSION= ${PYTHON_PORTVERSION} +DISTVERSION= ${PYTHON_DISTVERSION} PORTREVISION= 7 CATEGORIES= databases python -MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} +MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= Python-${PORTVERSION} +DISTNAME= Python-${DISTVERSION} DIST_SUBDIR= python MAINTAINER= python@FreeBSD.org COMMENT= Standard Python binding to the SQLite3 library (Python ${PYTHON_VER}) LICENSE= PSFL -LICENSE_FILE= ${WRKDIR}/Python-${PORTVERSION}/LICENSE +LICENSE_FILE= ${WRKDIR}/Python-${DISTVERSION}/LICENSE LIB_DEPENDS= libsqlite3.so:databases/sqlite3 @@ -23,14 +23,14 @@ USE_PYTHON= autoplist distutils allflavors DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo -WRKSRC= ${WRKDIR}/Python-${PORTVERSION}/Modules +WRKSRC= ${WRKDIR}/Python-${DISTVERSION}/Modules PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload .include post-extract: -.if ${PYTHON_REL} < 3000 +.if ${PYTHON_REL} < 30000 @${CP} ${FILESDIR}/setup.py ${WRKSRC} .else @${CP} ${FILESDIR}/setup3.py ${WRKSRC}/setup.py Index: deskutils/dosage/Makefile =================================================================== --- deskutils/dosage/Makefile +++ 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 Index: devel/py-Jinja2/Makefile =================================================================== --- devel/py-Jinja2/Makefile +++ 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 ; \ Index: devel/py-aiortc/Makefile =================================================================== --- devel/py-aiortc/Makefile +++ 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 Index: devel/py-anyio/Makefile =================================================================== --- devel/py-anyio/Makefile +++ devel/py-anyio/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 Index: devel/py-argcomplete/Makefile =================================================================== --- devel/py-argcomplete/Makefile +++ 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<4:devel/py-importlib-metadata@${PY_FLAVOR} .endif Index: devel/py-astroid/Makefile =================================================================== --- devel/py-astroid/Makefile +++ 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 Index: devel/py-black/Makefile =================================================================== --- devel/py-black/Makefile +++ devel/py-black/Makefile @@ -37,7 +37,7 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0.6:devel/py-dataclasses@${PY_FLAVOR} .endif Index: devel/py-build/Makefile =================================================================== --- devel/py-build/Makefile +++ devel/py-build/Makefile @@ -23,7 +23,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} .endif Index: devel/py-catalogue/Makefile =================================================================== --- devel/py-catalogue/Makefile +++ devel/py-catalogue/Makefile @@ -19,7 +19,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.20:devel/py-importlib-metadata@${PY_FLAVOR} .endif Index: devel/py-cmd2/Makefile =================================================================== --- devel/py-cmd2/Makefile +++ 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 Index: devel/py-flake8/Makefile =================================================================== --- devel/py-flake8/Makefile +++ 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 Index: devel/py-fsspec/Makefile =================================================================== --- devel/py-fsspec/Makefile +++ 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 Index: devel/py-graphql-relay/Makefile =================================================================== --- devel/py-graphql-relay/Makefile +++ 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 Index: devel/py-importlib-metadata/Makefile =================================================================== --- devel/py-importlib-metadata/Makefile +++ 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 Index: devel/py-importlib-resources/Makefile =================================================================== --- devel/py-importlib-resources/Makefile +++ 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 Index: devel/py-jsonpickle/Makefile =================================================================== --- devel/py-jsonpickle/Makefile +++ 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 Index: devel/py-libcst/Makefile =================================================================== --- devel/py-libcst/Makefile +++ 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 Index: devel/py-openstacksdk/Makefile =================================================================== --- devel/py-openstacksdk/Makefile +++ 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 Index: devel/py-oslo.config/Makefile =================================================================== --- devel/py-oslo.config/Makefile +++ 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 Index: devel/py-osprofiler/Makefile =================================================================== --- devel/py-osprofiler/Makefile +++ 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 Index: devel/py-pep517/Makefile =================================================================== --- devel/py-pep517/Makefile +++ 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 Index: devel/py-pint/Makefile =================================================================== --- devel/py-pint/Makefile +++ 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 Index: devel/py-pip-run/Makefile =================================================================== --- devel/py-pip-run/Makefile +++ 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 Index: devel/py-pipx/Makefile =================================================================== --- devel/py-pipx/Makefile +++ 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 Index: devel/py-pluggy/Makefile =================================================================== --- devel/py-pluggy/Makefile +++ 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 Index: devel/py-poetry-core/Makefile =================================================================== --- devel/py-poetry-core/Makefile +++ 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 Index: devel/py-ptpython/Makefile =================================================================== --- devel/py-ptpython/Makefile +++ 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 Index: devel/py-pyvisa-py/Makefile =================================================================== --- devel/py-pyvisa-py/Makefile +++ 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 Index: devel/py-pyvisa/Makefile =================================================================== --- devel/py-pyvisa/Makefile +++ devel/py-pyvisa/Makefile @@ -23,11 +23,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 Index: devel/py-setuptools/Makefile =================================================================== --- devel/py-setuptools/Makefile +++ devel/py-setuptools/Makefile @@ -35,7 +35,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 Index: devel/py-twine/Makefile =================================================================== --- devel/py-twine/Makefile +++ 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 Index: devel/py-watermark/Makefile =================================================================== --- devel/py-watermark/Makefile +++ 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 Index: games/adonthell/Makefile =================================================================== --- games/adonthell/Makefile +++ 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 Index: games/anki/Makefile =================================================================== --- games/anki/Makefile +++ 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} Index: graphics/py-python-poppler-qt5/Makefile =================================================================== --- graphics/py-python-poppler-qt5/Makefile +++ 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} Index: lang/pypy/bsd.pypy.cffi.mk =================================================================== --- lang/pypy/bsd.pypy.cffi.mk +++ lang/pypy/bsd.pypy.cffi.mk @@ -12,7 +12,7 @@ FLAVOR?= ${FLAVORS:[1]} PYTHON_IMPL= ${FLAVOR} -PYTHON_PORTVERSION= ${DISTVERSION} +PYTHON_DISTVERSION= ${DISTVERSION} PYTHON_PKGNAMEPREFIX= ${PYTHON_IMPL}- PYTHON_CMD= ${LOCALBASE}/bin/${PYTHON_IMPL} Index: lang/python-doc-html/Makefile =================================================================== --- lang/python-doc-html/Makefile +++ lang/python-doc-html/Makefile @@ -1,11 +1,11 @@ # Created by: Thomas Gellekum PORTNAME= python-doc-${DOCFORMAT} -PORTVERSION= ${PYTHON_PORTVERSION} +DISTVERSION= ${PYTHON_DISTVERSION} CATEGORIES= lang python -MASTER_SITES= PYTHON/ftp/python/doc/${PORTVERSION} \ +MASTER_SITES= PYTHON/ftp/python/doc/${DISTVERSION} \ PYTHON/ftp/python/doc/current -DISTNAME= python-${PORTVERSION}-docs-${DOCFORMAT} +DISTNAME= python-${DISTVERSION}-docs-${DOCFORMAT} DIST_SUBDIR= python MAINTAINER= python@FreeBSD.org @@ -38,7 +38,7 @@ all_python_versions: .for v in ${_VERS} - @${MAKE} -V PYTHON_PORTVERSION DEFAULT_VERSIONS=python=${v} + @${MAKE} -V PYTHON_DISTVERSION DEFAULT_VERSIONS=python=${v} .endfor .if make(makesum) Index: lang/python-tools/Makefile =================================================================== --- lang/python-tools/Makefile +++ lang/python-tools/Makefile @@ -1,10 +1,10 @@ PORTNAME= python-tools -PORTVERSION= ${PYTHON_PORTVERSION} +DISTVERSION= ${PYTHON_DISTVERSION} PORTREVISION= 1 CATEGORIES= lang python devel -MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} +MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= Python-${PORTVERSION} +DISTNAME= Python-${DISTVERSION} MAINTAINER= python@FreeBSD.org COMMENT= Supplementary tools for the Python language Index: lang/python27/Makefile =================================================================== --- lang/python27/Makefile +++ lang/python27/Makefile @@ -1,10 +1,10 @@ PORTNAME= python -PORTVERSION= ${PYTHON_PORTVERSION} +DISTVERSION= ${PYTHON_DISTVERSION} PORTREVISION= 1 CATEGORIES= lang python -MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} +MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMESUFFIX= 27 -DISTNAME= Python-${PORTVERSION} +DISTNAME= Python-${DISTVERSION} DIST_SUBDIR= python MAINTAINER= python@FreeBSD.org @@ -19,7 +19,7 @@ PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes -python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R} +python_CMD= ${PREFIX}/bin/python${PYTHON_DISTVERSION:R} SHEBANG_FILES= Lib/lib2to3/pgen2/*.py Lib/lib2to3/tests/*.py Lib/lib2to3/tests/data/*.py \ Lib/idlelib/*.py Lib/encodings/*.py Lib/test/*.py Lib/UserString.py \ Lib/base64.py Lib/cProfile.py Lib/keyword.py Lib/mimify.py Lib/pdb.py \ @@ -38,7 +38,7 @@ MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library PLIST_SUB= ABI=${ABIFLAGS} \ - PORTVERSION=${PORTVERSION} \ + DISTVERSION=${DISTVERSION} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554 OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS Index: lang/python27/Makefile.version =================================================================== --- lang/python27/Makefile.version +++ lang/python27/Makefile.version @@ -2,4 +2,4 @@ # Do not forget to update python documentation (lang/python-doc-*) # Run "make -C lang/python-doc-html makesum" -PYTHON_PORTVERSION= 2.7.18 +PYTHON_DISTVERSION= 2.7.18 Index: lang/python27/pkg-plist =================================================================== --- lang/python27/pkg-plist +++ lang/python27/pkg-plist @@ -1892,7 +1892,7 @@ lib/python2.7/keyword.py lib/python2.7/keyword.pyc lib/python2.7/keyword.pyo -lib/python2.7/lib-dynload/Python-%%PORTVERSION%%-py2.7.egg-info +lib/python2.7/lib-dynload/Python-%%DISTVERSION%%-py2.7.egg-info lib/python2.7/lib-dynload/_bisect.so lib/python2.7/lib-dynload/_codecs_cn.so lib/python2.7/lib-dynload/_codecs_hk.so @@ -2065,9 +2065,9 @@ lib/python2.7/lib-tk/turtle.py lib/python2.7/lib-tk/turtle.pyc lib/python2.7/lib-tk/turtle.pyo -lib/python2.7/lib2to3/Grammar%%PORTVERSION%%.final.0.pickle +lib/python2.7/lib2to3/Grammar%%DISTVERSION%%.final.0.pickle lib/python2.7/lib2to3/Grammar.txt -lib/python2.7/lib2to3/PatternGrammar%%PORTVERSION%%.final.0.pickle +lib/python2.7/lib2to3/PatternGrammar%%DISTVERSION%%.final.0.pickle lib/python2.7/lib2to3/PatternGrammar.txt lib/python2.7/lib2to3/__init__.py lib/python2.7/lib2to3/__init__.pyc Index: lang/python36/Makefile =================================================================== --- lang/python36/Makefile +++ lang/python36/Makefile @@ -1,11 +1,11 @@ # Created by: Kubilay Kocak PORTNAME= python -PORTVERSION= ${PYTHON_PORTVERSION} +DISTVERSION= ${PYTHON_DISTVERSION} CATEGORIES= lang python -MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} +MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} -DISTNAME= Python-${PORTVERSION} +DISTNAME= Python-${DISTVERSION} DIST_SUBDIR= python # Resolve sinpi name clash with libm (IEEE-754 violation) @@ -22,11 +22,11 @@ PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes -python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R} +python_CMD= ${PREFIX}/bin/python${PYTHON_DISTVERSION:R} SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits. -PYTHON_VER= ${PYTHON_PORTVERSION:R} +PYTHON_VER= ${PYTHON_DISTVERSION:R} PYTHON_VERSION= python${PYTHON_VER} PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} @@ -47,7 +47,7 @@ PLIST_SUB= ABI=${ABIFLAGS} \ XY=${PYTHON_SUFFIX} \ XYDOT=${PYTHON_VER} \ - XYZDOT=${PORTVERSION} \ + XYZDOT=${DISTVERSION} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554 OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS Index: lang/python36/Makefile.version =================================================================== --- lang/python36/Makefile.version +++ lang/python36/Makefile.version @@ -2,4 +2,4 @@ # Do not forget to update python documentation (lang/python-doc-*) # Run "make -C lang/python-doc-html makesum" -PYTHON_PORTVERSION= 3.6.13 +PYTHON_DISTVERSION= 3.6.13 Index: lang/python37/Makefile =================================================================== --- lang/python37/Makefile +++ lang/python37/Makefile @@ -1,11 +1,11 @@ # Created by: Kubilay Kocak PORTNAME= python -PORTVERSION= ${PYTHON_PORTVERSION} +DISTVERSION= ${PYTHON_DISTVERSION} CATEGORIES= lang python -MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} +MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} -DISTNAME= Python-${PORTVERSION} +DISTNAME= Python-${DISTVERSION} DIST_SUBDIR= python MAINTAINER= python@FreeBSD.org @@ -19,11 +19,11 @@ PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes -python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R} +python_CMD= ${PREFIX}/bin/python${PYTHON_DISTVERSION:R} SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits. -PYTHON_VER= ${PYTHON_PORTVERSION:R} +PYTHON_VER= ${PYTHON_DISTVERSION:R} PYTHON_VERSION= python${PYTHON_VER} PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} @@ -45,7 +45,7 @@ PLIST_SUB= ABI=${ABIFLAGS} \ XY=${PYTHON_SUFFIX} \ XYDOT=${PYTHON_VER} \ - XYZDOT=${PORTVERSION} \ + XYZDOT=${DISTVERSION} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554 OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC Index: lang/python37/Makefile.version =================================================================== --- lang/python37/Makefile.version +++ lang/python37/Makefile.version @@ -2,4 +2,4 @@ # Do not forget to update python documentation (lang/python-doc-*) # Run "make -C lang/python-doc-html makesum" -PYTHON_PORTVERSION= 3.7.10 +PYTHON_DISTVERSION= 3.7.10 Index: lang/python38/Makefile =================================================================== --- lang/python38/Makefile +++ lang/python38/Makefile @@ -1,11 +1,11 @@ # Created by: Kubilay Kocak PORTNAME= python -PORTVERSION= ${PYTHON_PORTVERSION} +DISTVERSION= ${PYTHON_DISTVERSION} CATEGORIES= lang python -MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} +MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} -DISTNAME= Python-${PORTVERSION} +DISTNAME= Python-${DISTVERSION} DIST_SUBDIR= python MAINTAINER= python@FreeBSD.org @@ -17,14 +17,14 @@ PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes -python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R} +python_CMD= ${PREFIX}/bin/python${PYTHON_DISTVERSION:R} SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py SHEBANG_FILES+= Lib/test/ziptestdata/exe_with_z64 \ Lib/test/ziptestdata/exe_with_zip \ Lib/test/ziptestdata/header.sh # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits. -PYTHON_VER= ${PYTHON_PORTVERSION:R} +PYTHON_VER= ${PYTHON_DISTVERSION:R} PYTHON_VERSION= python${PYTHON_VER} PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} @@ -45,7 +45,7 @@ PLIST_SUB= ABI=${ABIFLAGS} \ XY=${PYTHON_SUFFIX} \ XYDOT=${PYTHON_VER} \ - XYZDOT=${PORTVERSION} \ + XYZDOT=${DISTVERSION} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554 OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC Index: lang/python38/Makefile.version =================================================================== --- lang/python38/Makefile.version +++ lang/python38/Makefile.version @@ -2,4 +2,4 @@ # Do not forget to update python documentation (lang/python-doc-*) # Run "make -C lang/python-doc-html makesum" -PYTHON_PORTVERSION= 3.8.9 +PYTHON_DISTVERSION= 3.8.9 Index: lang/python39/Makefile =================================================================== --- lang/python39/Makefile +++ lang/python39/Makefile @@ -1,11 +1,11 @@ # Created by: Kubilay Kocak PORTNAME= python -PORTVERSION= ${PYTHON_PORTVERSION} +DISTVERSION= ${PYTHON_DISTVERSION} CATEGORIES= lang python -MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} +MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} -DISTNAME= Python-${PORTVERSION} +DISTNAME= Python-${DISTVERSION} DIST_SUBDIR= python MAINTAINER= python@FreeBSD.org @@ -18,14 +18,14 @@ PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes -python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R} +python_CMD= ${PREFIX}/bin/python${PYTHON_DISTVERSION:R} SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py SHEBANG_FILES+= Lib/test/ziptestdata/exe_with_z64 \ Lib/test/ziptestdata/exe_with_zip \ Lib/test/ziptestdata/header.sh # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits. -PYTHON_VER= ${PYTHON_PORTVERSION:R} +PYTHON_VER= ${PYTHON_DISTVERSION:R} PYTHON_VERSION= python${PYTHON_VER} PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} @@ -46,7 +46,7 @@ PLIST_SUB= ABI=${ABIFLAGS} \ XY=${PYTHON_SUFFIX} \ XYDOT=${PYTHON_VER} \ - XYZDOT=${PORTVERSION} \ + XYZDOT=${DISTVERSION} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554 OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC Index: lang/python39/Makefile.version =================================================================== --- lang/python39/Makefile.version +++ lang/python39/Makefile.version @@ -2,4 +2,4 @@ # Do not forget to update python documentation (lang/python-doc-*) # Run "make -C lang/python-doc-html makesum" -PYTHON_PORTVERSION= 3.9.4 +PYTHON_DISTVERSION= 3.9.4 Index: lang/tauthon/Makefile =================================================================== --- lang/tauthon/Makefile +++ lang/tauthon/Makefile @@ -98,7 +98,7 @@ UCS2_CONFIGURE_ENABLE= unicode=ucs2 UCS4_CONFIGURE_ENABLE= unicode=ucs4 -PYTHON_PORTVERSION= ${DISTVERSION} +PYTHON_DISTVERSION= ${DISTVERSION} VERSION_NOMICRO= ${DISTVERSION:R} NAME_VERSION= tauthon${VERSION_NOMICRO} Index: math/cadabra2/Makefile =================================================================== --- math/cadabra2/Makefile +++ 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} Index: net/irrd/Makefile =================================================================== --- net/irrd/Makefile +++ 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 Index: net/py-kombu/Makefile =================================================================== --- net/py-kombu/Makefile +++ 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 Index: net/py-netaddr/Makefile =================================================================== --- net/py-netaddr/Makefile +++ 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 Index: net/py-tweepy/Makefile =================================================================== --- net/py-tweepy/Makefile +++ 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 Index: net/py-wsproto/Makefile =================================================================== --- net/py-wsproto/Makefile +++ 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 Index: print/py-fonttools3/Makefile =================================================================== --- print/py-fonttools3/Makefile +++ 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 Index: print/py-ufolib2/Makefile =================================================================== --- print/py-ufolib2/Makefile +++ 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 Index: science/py-h5py/Makefile =================================================================== --- science/py-h5py/Makefile +++ 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 Index: science/scidavis/Makefile =================================================================== --- science/scidavis/Makefile +++ science/scidavis/Makefile @@ -56,7 +56,7 @@ .include .if ${PORT_OPTIONS:MPYTHON} -.if ${PYTHON_REL} < 3200 +.if ${PYTHON_REL} < 30200 PYCACHE_DIR= # none PYCACHE_FILE= scidavisUtil.pyc .else Index: security/py-flask-saml/Makefile =================================================================== --- security/py-flask-saml/Makefile +++ 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} Index: security/py-signedjson/Makefile =================================================================== --- security/py-signedjson/Makefile +++ 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 Index: sysutils/py-python-crontab/Makefile =================================================================== --- sysutils/py-python-crontab/Makefile +++ 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 Index: textproc/py-fingerprints/Makefile =================================================================== --- textproc/py-fingerprints/Makefile +++ 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 Index: textproc/py-normality/Makefile =================================================================== --- textproc/py-normality/Makefile +++ 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 Index: www/py-aioquic/Makefile =================================================================== --- www/py-aioquic/Makefile +++ 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 Index: www/py-cherrypy/Makefile =================================================================== --- www/py-cherrypy/Makefile +++ www/py-cherrypy/Makefile @@ -46,7 +46,7 @@ .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR} .endif Index: www/py-django-bootstrap3/Makefile =================================================================== --- www/py-django-bootstrap3/Makefile +++ 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 Index: www/py-django-markdownx/Makefile =================================================================== --- www/py-django-markdownx/Makefile +++ 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. Index: www/py-django-treebeard/Makefile =================================================================== --- www/py-django-treebeard/Makefile +++ 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 Index: www/py-fqdn/Makefile =================================================================== --- www/py-fqdn/Makefile +++ 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 Index: www/py-hypercorn/Makefile =================================================================== --- www/py-hypercorn/Makefile +++ 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 Index: www/py-sentinelhub/Makefile =================================================================== --- www/py-sentinelhub/Makefile +++ www/py-sentinelhub/Makefile @@ -35,7 +35,7 @@ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR} .endif Index: www/py-yarl/Makefile =================================================================== --- www/py-yarl/Makefile +++ 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 Index: www/qutebrowser/Makefile =================================================================== --- www/qutebrowser/Makefile +++ 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 Index: x11-fonts/py-opentype-sanitizer/Makefile =================================================================== --- x11-fonts/py-opentype-sanitizer/Makefile +++ x11-fonts/py-opentype-sanitizer/Makefile @@ -22,7 +22,7 @@ .include -.if ${PYTHON_REL} >= 3800 +.if ${PYTHON_REL} >= 30800 LDFLAGS+= -lpython${PYTHON_VER} .endif Index: x11-toolkits/py-tkinter/Makefile =================================================================== --- x11-toolkits/py-tkinter/Makefile +++ x11-toolkits/py-tkinter/Makefile @@ -1,12 +1,12 @@ # Created by: Thomas Gellekum PORTNAME= tkinter -PORTVERSION= ${PYTHON_PORTVERSION} +DISTVERSION= ${PYTHON_DISTVERSION} PORTREVISION= 6 CATEGORIES= x11-toolkits python -MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} +MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= Python-${PORTVERSION} +DISTNAME= Python-${DISTVERSION} MAINTAINER= python@FreeBSD.org COMMENT= Python bindings to the Tk widget set (Python ${PYTHON_VER}) @@ -20,14 +20,14 @@ DIST_SUBDIR= python DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo -WRKSRC= ${WRKDIR}/Python-${PORTVERSION}/Modules +WRKSRC= ${WRKDIR}/Python-${DISTVERSION}/Modules PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload .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 Index: x11-wm/chamfer/Makefile =================================================================== --- x11-wm/chamfer/Makefile +++ 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