diff --git CHANGES CHANGES index 05c514e9cc1a..4b0ba5fc7e0a 100644 --- CHANGES +++ CHANGES @@ -10,6 +10,14 @@ in the release notes and/or placed into UPDATING. 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 diff --git Mk/Uses/python.mk Mk/Uses/python.mk index ca7be88139af..1d8af4159969 100644 --- 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 @@ _PYTHON_ARGS= 3.6+ .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 @@ _PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most __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 @@ IGNORE= needs an unsupported version of Python . 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 @@ FLAVOR= ${FLAVORS:[1]} . 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 @@ -449,24 +454,24 @@ PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX} .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 .endif -.if ${PYTHON_REL} >= 3807 +.if ${PYTHON_REL} >= 30807 PYTHON_EXT_SUFFIX= .cpython-${PYTHON_SUFFIX} .else PYTHON_EXT_SUFFIX= # empty @@ -607,7 +612,7 @@ add-plist-pymod: ${_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 @@ add-plist-python: 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 +643,7 @@ PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} 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 +683,7 @@ PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \ 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 astro/py-metpy/Makefile astro/py-metpy/Makefile index 6c54f3963178..1fb0116abcca 100644 --- astro/py-metpy/Makefile +++ astro/py-metpy/Makefile @@ -31,11 +31,11 @@ NO_ARCH= yes .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 databases/py-gdbm/Makefile databases/py-gdbm/Makefile index 5d53725c9a1e..bd024726a8ff 100644 --- 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 @@ PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHONPREFIX_LIBDIR}/lib-dynload 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 diff --git databases/py-sqlalchemy14/Makefile databases/py-sqlalchemy14/Makefile index 52cae53a4496..00931a57376e 100644 --- databases/py-sqlalchemy14/Makefile +++ databases/py-sqlalchemy14/Makefile @@ -37,7 +37,7 @@ SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_ .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 databases/py-sqlite3/Makefile databases/py-sqlite3/Makefile index 935562290de3..1f6125d10b0b 100644 --- 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 @@ USES= compiler:c11 python:2.7+ tar:xz 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 diff --git deskutils/dosage/Makefile deskutils/dosage/Makefile index c11771d39888..3bb25dbcc350 100644 --- deskutils/dosage/Makefile +++ deskutils/dosage/Makefile @@ -24,7 +24,7 @@ NO_ARCH= yes .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 devel/py-Jinja2/Makefile devel/py-Jinja2/Makefile index 469e40bd4a23..1e8e78bd62aa 100644 --- devel/py-Jinja2/Makefile +++ devel/py-Jinja2/Makefile @@ -62,7 +62,7 @@ do-install: .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 devel/py-aiortc/Makefile devel/py-aiortc/Makefile index 97a7eb2e3504..22e9409fefd7 100644 --- devel/py-aiortc/Makefile +++ devel/py-aiortc/Makefile @@ -28,7 +28,7 @@ USE_PYTHON= autoplist concurrent distutils .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git devel/py-anyio/Makefile devel/py-anyio/Makefile index 85c363201cc7..a073c9e27dcf 100644 --- devel/py-anyio/Makefile +++ devel/py-anyio/Makefile @@ -30,7 +30,7 @@ TRIO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}trio>=0.16:net/py-trio@${PY_FLAVOR} .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 devel/py-argcomplete/Makefile devel/py-argcomplete/Makefile index 50c48ec546bb..e0d489d38a69 100644 --- devel/py-argcomplete/Makefile +++ devel/py-argcomplete/Makefile @@ -24,7 +24,7 @@ NO_ARCH= yes .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 diff --git devel/py-astroid/Makefile devel/py-astroid/Makefile index f5acf76c292d..08057896b527 100644 --- devel/py-astroid/Makefile +++ devel/py-astroid/Makefile @@ -21,7 +21,7 @@ NO_ARCH= yes .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 devel/py-b2sdk/Makefile devel/py-b2sdk/Makefile index 1e130676b4bc..18ebeba67ad6 100644 --- devel/py-b2sdk/Makefile +++ devel/py-b2sdk/Makefile @@ -28,7 +28,7 @@ NO_ARCH= yes .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 devel/py-black/Makefile devel/py-black/Makefile index f8aa5f8c8736..34671440f088 100644 --- devel/py-black/Makefile +++ devel/py-black/Makefile @@ -37,7 +37,7 @@ D_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=3.3.2:www/py-aiohttp@${PY_FLAVOR .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0.6:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git devel/py-build/Makefile devel/py-build/Makefile index 1a191e51d175..47d2b2bd9084 100644 --- devel/py-build/Makefile +++ devel/py-build/Makefile @@ -23,7 +23,7 @@ NO_ARCH= yes .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 devel/py-catalogue/Makefile devel/py-catalogue/Makefile index 590cb2317faa..ac4177be4c24 100644 --- devel/py-catalogue/Makefile +++ devel/py-catalogue/Makefile @@ -19,7 +19,7 @@ NO_ARCH= yes .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.20:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git devel/py-cmd2/Makefile devel/py-cmd2/Makefile index 1bf75670ac01..114f029c0eaf 100644 --- devel/py-cmd2/Makefile +++ devel/py-cmd2/Makefile @@ -25,7 +25,7 @@ NO_ARCH= yes .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 devel/py-dataclasses-json/Makefile devel/py-dataclasses-json/Makefile index f9eed63528f3..a29eb49cdd64 100644 --- devel/py-dataclasses-json/Makefile +++ devel/py-dataclasses-json/Makefile @@ -23,7 +23,7 @@ NO_ARCH= yes .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git devel/py-flake8/Makefile devel/py-flake8/Makefile index c526acf9a5b2..3f4768e22d81 100644 --- devel/py-flake8/Makefile +++ devel/py-flake8/Makefile @@ -26,7 +26,7 @@ TEST_ENV= PYTHONPATH="${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}" .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 devel/py-fsspec/Makefile devel/py-fsspec/Makefile index 2ffbf27cecd4..17377e6f60ba 100644 --- devel/py-fsspec/Makefile +++ devel/py-fsspec/Makefile @@ -19,7 +19,7 @@ NO_ARCH= yes .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 devel/py-graphql-relay/Makefile devel/py-graphql-relay/Makefile index d069d577de10..46b8ef539093 100644 --- devel/py-graphql-relay/Makefile +++ devel/py-graphql-relay/Makefile @@ -21,7 +21,7 @@ NO_ARCH= yes .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 devel/py-importlib-metadata/Makefile devel/py-importlib-metadata/Makefile index ec8716cd25ef..01253255f441 100644 --- devel/py-importlib-metadata/Makefile +++ devel/py-importlib-metadata/Makefile @@ -20,7 +20,7 @@ USE_PYTHON= autoplist distutils .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 devel/py-importlib-resources/Makefile devel/py-importlib-resources/Makefile index df3dbefec6a5..4ee1d296e354 100644 --- devel/py-importlib-resources/Makefile +++ devel/py-importlib-resources/Makefile @@ -19,7 +19,7 @@ USE_PYTHON= autoplist distutils .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zipp>=0:devel/py-zipp@${PY_FLAVOR} .endif diff --git devel/py-jsonpickle/Makefile devel/py-jsonpickle/Makefile index 9ffda404e296..6c188e2a450f 100644 --- devel/py-jsonpickle/Makefile +++ devel/py-jsonpickle/Makefile @@ -18,7 +18,7 @@ NO_ARCH= yes .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 devel/py-libcst/Makefile devel/py-libcst/Makefile index ed15ed0c2613..5a22bf50203f 100644 --- devel/py-libcst/Makefile +++ devel/py-libcst/Makefile @@ -23,7 +23,7 @@ NO_ARCH= yes .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 devel/py-openstacksdk/Makefile devel/py-openstacksdk/Makefile index 25058b32eefa..e10824c648b8 100644 --- devel/py-openstacksdk/Makefile +++ devel/py-openstacksdk/Makefile @@ -37,7 +37,7 @@ SHEBANG_GLOB= *.sh .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 devel/py-oslo.config/Makefile devel/py-oslo.config/Makefile index a9bbb43aecda..5e16d900bbed 100644 --- devel/py-oslo.config/Makefile +++ devel/py-oslo.config/Makefile @@ -27,7 +27,7 @@ NO_ARCH= yes .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 devel/py-osprofiler/Makefile devel/py-osprofiler/Makefile index e0a8a25895aa..df0d1b0ad2f1 100644 --- devel/py-osprofiler/Makefile +++ devel/py-osprofiler/Makefile @@ -30,7 +30,7 @@ NO_ARCH= yes .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 devel/py-pep517/Makefile devel/py-pep517/Makefile index f9567daa7d96..6a1518b917f4 100644 --- devel/py-pep517/Makefile +++ devel/py-pep517/Makefile @@ -21,7 +21,7 @@ NO_ARCH= yes .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 devel/py-pint/Makefile devel/py-pint/Makefile index 76e9af41da51..b3e7381e0887 100644 --- devel/py-pint/Makefile +++ devel/py-pint/Makefile @@ -25,11 +25,11 @@ SHEBANG_FILES= pint/pint-convert .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 devel/py-pip-run/Makefile devel/py-pip-run/Makefile index 8d7c9a46e449..b8adc7c18c1e 100644 --- devel/py-pip-run/Makefile +++ devel/py-pip-run/Makefile @@ -25,7 +25,7 @@ NO_ARCH= yes .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 devel/py-pipx/Makefile devel/py-pipx/Makefile index e09dcfac9bf4..89dad27f9ab1 100644 --- devel/py-pipx/Makefile +++ devel/py-pipx/Makefile @@ -24,7 +24,7 @@ NO_ARCH= yes .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 devel/py-pluggy/Makefile devel/py-pluggy/Makefile index fd73bbdbfcf9..cbbe52d5b534 100644 --- devel/py-pluggy/Makefile +++ devel/py-pluggy/Makefile @@ -22,7 +22,7 @@ NO_ARCH= yes .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 devel/py-poetry-core/Makefile devel/py-poetry-core/Makefile index c95b692adf3a..516f65020fa5 100644 --- devel/py-poetry-core/Makefile +++ devel/py-poetry-core/Makefile @@ -19,7 +19,7 @@ NO_ARCH= yes .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 devel/py-prettytable/Makefile devel/py-prettytable/Makefile index d614651be6c2..d8714bf5afe7 100644 --- devel/py-prettytable/Makefile +++ devel/py-prettytable/Makefile @@ -22,7 +22,7 @@ NO_ARCH= yes .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 devel/py-ptpython/Makefile devel/py-ptpython/Makefile index fce6a820f668..090e89cc9964 100644 --- devel/py-ptpython/Makefile +++ devel/py-ptpython/Makefile @@ -30,7 +30,7 @@ PTIPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${PY_FLAV .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 devel/py-pyvisa-py/Makefile devel/py-pyvisa-py/Makefile index 5eb58179fd16..c65828ac6273 100644 --- devel/py-pyvisa-py/Makefile +++ devel/py-pyvisa-py/Makefile @@ -29,7 +29,7 @@ USB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR} .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 devel/py-pyvisa/Makefile devel/py-pyvisa/Makefile index 6244b440616d..a79983f88691 100644 --- devel/py-pyvisa/Makefile +++ devel/py-pyvisa/Makefile @@ -23,11 +23,11 @@ USE_LOCALE= en_US.UTF-8 .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 devel/py-setuptools/Makefile devel/py-setuptools/Makefile index 203522b68201..2fa67f5077fe 100644 --- devel/py-setuptools/Makefile +++ devel/py-setuptools/Makefile @@ -35,7 +35,7 @@ SUB_LIST+= PYTHON_VER=${PYTHON_VER} # 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 devel/py-twine/Makefile devel/py-twine/Makefile index 2c057d3d8b64..3355b2097d7b 100644 --- devel/py-twine/Makefile +++ devel/py-twine/Makefile @@ -29,7 +29,7 @@ NO_ARCH= yes .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 devel/py-watermark/Makefile devel/py-watermark/Makefile index 9444a6faf870..06a5c9ebb660 100644 --- devel/py-watermark/Makefile +++ devel/py-watermark/Makefile @@ -21,7 +21,7 @@ NO_ARCH= yes .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 games/adonthell/Makefile games/adonthell/Makefile index 123f6373d849..837d8ac637e4 100644 --- games/adonthell/Makefile +++ games/adonthell/Makefile @@ -38,7 +38,7 @@ PLIST_FILES= bin/adonthell \ # 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 games/anki/Makefile games/anki/Makefile index decbb1a2fbcf..9ccce508db50 100644 --- games/anki/Makefile +++ games/anki/Makefile @@ -359,7 +359,7 @@ _MY_BUILDHASH= 84dcaa86 .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 _PY_SONAME= .cpython-${PYTHON_SUFFIX}m .else _PY_SONAME= ${PYTHON_EXT_SUFFIX} diff --git graphics/py-python-poppler-qt5/Makefile graphics/py-python-poppler-qt5/Makefile index d78821adfa2c..3460e58409d4 100644 --- graphics/py-python-poppler-qt5/Makefile +++ graphics/py-python-poppler-qt5/Makefile @@ -25,7 +25,7 @@ PLIST_SUB= _PY_SONAME=${_PY_SONAME} .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 _PY_SONAME= .cpython-${PYTHON_SUFFIX}m .else _PY_SONAME= ${PYTHON_EXT_SUFFIX} diff --git lang/pypy/bsd.pypy.cffi.mk lang/pypy/bsd.pypy.cffi.mk index 1243f8fbd972..ee0b50f74355 100644 --- lang/pypy/bsd.pypy.cffi.mk +++ lang/pypy/bsd.pypy.cffi.mk @@ -12,7 +12,7 @@ FLAVORS= pypy pypy3 FLAVOR?= ${FLAVORS:[1]} PYTHON_IMPL= ${FLAVOR} -PYTHON_PORTVERSION= ${DISTVERSION} +PYTHON_DISTVERSION= ${DISTVERSION} PYTHON_PKGNAMEPREFIX= ${PYTHON_IMPL}- PYTHON_CMD= ${LOCALBASE}/bin/${PYTHON_IMPL} diff --git lang/python-doc-html/Makefile lang/python-doc-html/Makefile index 48c696c08995..0f3c3b3c63b4 100644 --- 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 @@ _VERS!= ${MAKE} -V _PYTHON_VERSIONS:O 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) diff --git lang/python-tools/Makefile lang/python-tools/Makefile index 4215cf5411bc..6670a6dc75e8 100644 --- 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 diff --git lang/python27/Makefile lang/python27/Makefile index a492ba198698..8cb11c33faab 100644 --- 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 @@ USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz 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 @@ TEST_ARGS= TESTOPTS=-j${MAKE_JOBS_NUMBER} 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 diff --git lang/python27/Makefile.version lang/python27/Makefile.version index 60f9e65f900e..0a0288063c49 100644 --- 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 diff --git lang/python27/pkg-plist lang/python27/pkg-plist index 550a0e13a43c..10392a5be988 100644 --- lang/python27/pkg-plist +++ lang/python27/pkg-plist @@ -1892,7 +1892,7 @@ lib/python2.7/json/tool.pyo 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/ttk.pyo 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 diff --git lang/python36/Makefile lang/python36/Makefile index 7769c1855501..859a6a443064 100644 --- 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 @@ USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz 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 @@ SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX} 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 diff --git lang/python36/Makefile.version lang/python36/Makefile.version index 6b04ea99a6cd..1e403b3d87d7 100644 --- 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 diff --git lang/python37/Makefile lang/python37/Makefile index ffec753c7ff0..c8269a49e37f 100644 --- 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 @@ USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz 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 @@ SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX} 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 diff --git lang/python37/Makefile.version lang/python37/Makefile.version index 0e41fc76aacc..043fc889c483 100644 --- 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 diff --git lang/python38/Makefile lang/python38/Makefile index b0d976496459..4852cc7aee4e 100644 --- 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 @@ USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz 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 @@ SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX} 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 diff --git lang/python38/Makefile.version lang/python38/Makefile.version index 5587d0177cf9..7b2a6925c8a3 100644 --- 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 diff --git lang/python39/Makefile lang/python39/Makefile index 5836df0d3b61..fe0d6ff04b39 100644 --- 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 @@ USES= compiler:c11 cpe ncurses pathfix pkgconfig readline:port \ 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 @@ SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX} 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 diff --git lang/python39/Makefile.version lang/python39/Makefile.version index e0cb1ff6f35c..6922d23f500b 100644 --- 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 diff --git lang/tauthon/Makefile lang/tauthon/Makefile index 438f570cf435..44181b0b0f2e 100644 --- lang/tauthon/Makefile +++ lang/tauthon/Makefile @@ -98,7 +98,7 @@ THREADS_LDFLAGS= -lpthread 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} diff --git math/cadabra2/Makefile math/cadabra2/Makefile index e0630ede2675..81317b3b2e42 100644 --- math/cadabra2/Makefile +++ math/cadabra2/Makefile @@ -43,7 +43,7 @@ GUI_VARS= INSTALLS_ICONS=yes .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 _PY_SONAME= .cpython-${PYTHON_SUFFIX}m .else _PY_SONAME= ${PYTHON_EXT_SUFFIX} diff --git net/irrd/Makefile net/irrd/Makefile index f8225e89c3cc..451af0b06c80 100644 --- net/irrd/Makefile +++ net/irrd/Makefile @@ -58,7 +58,7 @@ SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" \ .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0.6:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git net/py-kombu/Makefile net/py-kombu/Makefile index 7ee19f167157..c58f8b3c6984 100644 --- net/py-kombu/Makefile +++ net/py-kombu/Makefile @@ -35,7 +35,7 @@ ZMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=13.1.0:net/py-pyzmq@${PY_FLAVOR} .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 net/py-netaddr/Makefile net/py-netaddr/Makefile index 1b8ce6ad4051..a71918f04646 100644 --- net/py-netaddr/Makefile +++ net/py-netaddr/Makefile @@ -25,7 +25,7 @@ OPTIONS_DEFINE= DOCS .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 net/py-tweepy/Makefile net/py-tweepy/Makefile index 87ae5ecbd00e..78c006f4441c 100644 --- net/py-tweepy/Makefile +++ net/py-tweepy/Makefile @@ -29,7 +29,7 @@ TEST_ENV= USE_REPLAY=1 .include -.if ${PYTHON_REL} < 3000 +.if ${PYTHON_REL} < 30000 TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2@${PY_FLAVOR} .endif diff --git net/py-wsproto/Makefile net/py-wsproto/Makefile index e9176c4a2743..df222608d6c1 100644 --- net/py-wsproto/Makefile +++ net/py-wsproto/Makefile @@ -21,7 +21,7 @@ NO_ARCH= yes .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>0:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git print/py-fonttools3/Makefile print/py-fonttools3/Makefile index 89d6aaafe99a..cd058feef9c1 100644 --- print/py-fonttools3/Makefile +++ print/py-fonttools3/Makefile @@ -46,7 +46,7 @@ WOFF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}brotli>=1.0.1:archivers/py-brotli@${PY_ .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 print/py-ufolib2/Makefile print/py-ufolib2/Makefile index 3dfdaa4c5a90..5e99d77aebb2 100644 --- print/py-ufolib2/Makefile +++ print/py-ufolib2/Makefile @@ -30,7 +30,7 @@ LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} .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 science/py-h5py/Makefile science/py-h5py/Makefile index bd4084af7d1d..91c8988acba1 100644 --- science/py-h5py/Makefile +++ science/py-h5py/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES .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 science/scidavis/Makefile science/scidavis/Makefile index ce3598f8f431..2271fa01b7c0 100644 --- science/scidavis/Makefile +++ science/scidavis/Makefile @@ -56,7 +56,7 @@ post-install-NLS-on: .include .if ${PORT_OPTIONS:MPYTHON} -.if ${PYTHON_REL} < 3200 +.if ${PYTHON_REL} < 30200 PYCACHE_DIR= # none PYCACHE_FILE= scidavisUtil.pyc .else diff --git security/py-flask-saml/Makefile security/py-flask-saml/Makefile index 52ffe8185ead..06139297c507 100644 --- security/py-flask-saml/Makefile +++ security/py-flask-saml/Makefile @@ -19,7 +19,7 @@ NO_ARCH= yes .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 security/py-signedjson/Makefile security/py-signedjson/Makefile index c106b01e7c1e..9d93f25a0a48 100644 --- security/py-signedjson/Makefile +++ security/py-signedjson/Makefile @@ -27,7 +27,7 @@ NO_ARCH= yes .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 sysutils/py-python-crontab/Makefile sysutils/py-python-crontab/Makefile index b7463544b587..b740eda4650a 100644 --- sysutils/py-python-crontab/Makefile +++ sysutils/py-python-crontab/Makefile @@ -26,7 +26,7 @@ GL_COMMIT= ba23056ddf1a00ecfd14b0a31c2e0cdad132f8d0 .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 textproc/py-fingerprints/Makefile textproc/py-fingerprints/Makefile index b5fbce6631b3..a86d600fe4bf 100644 --- textproc/py-fingerprints/Makefile +++ textproc/py-fingerprints/Makefile @@ -22,7 +22,7 @@ NO_ARCH= yes .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 textproc/py-normality/Makefile textproc/py-normality/Makefile index fcd073d6d3ac..ba2501660589 100644 --- textproc/py-normality/Makefile +++ textproc/py-normality/Makefile @@ -29,7 +29,7 @@ ICU_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyicu>=1.9.3:devel/py-pyicu@${PY_FLAVOR} .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 www/py-aiohttp/Makefile www/py-aiohttp/Makefile index 4dab563fdec7..57cffc5e946d 100644 --- www/py-aiohttp/Makefile +++ www/py-aiohttp/Makefile @@ -36,7 +36,7 @@ USE_PYTHON= autoplist distutils cython .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 www/py-aioquic/Makefile www/py-aioquic/Makefile index 6dab02342227..0ea40aa93b64 100644 --- www/py-aioquic/Makefile +++ www/py-aioquic/Makefile @@ -21,7 +21,7 @@ USE_PYTHON= autoplist concurrent distutils .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git www/py-cherrypy/Makefile www/py-cherrypy/Makefile index 9e9c1b357292..56170ded491a 100644 --- www/py-cherrypy/Makefile +++ www/py-cherrypy/Makefile @@ -46,7 +46,7 @@ post-install: .include -.if ${PYTHON_REL} < 3800 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR} .endif diff --git www/py-cssutils/Makefile www/py-cssutils/Makefile index c8f3de2b280f..4f5a718ce96b 100644 --- www/py-cssutils/Makefile +++ www/py-cssutils/Makefile @@ -28,7 +28,7 @@ OPTIONS_DEFINE= EXAMPLES .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 www/py-dj31-django-auth-ldap/Makefile www/py-dj31-django-auth-ldap/Makefile index 75c78e02e9e8..89f95ffdf63a 100644 --- www/py-dj31-django-auth-ldap/Makefile +++ www/py-dj31-django-auth-ldap/Makefile @@ -32,7 +32,7 @@ DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" # 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 www/py-django-auth-ldap/Makefile www/py-django-auth-ldap/Makefile index 9238e1306d2b..b5298ec86374 100644 --- www/py-django-auth-ldap/Makefile +++ www/py-django-auth-ldap/Makefile @@ -32,7 +32,7 @@ DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" # 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 www/py-django-bootstrap3/Makefile www/py-django-bootstrap3/Makefile index 446765905a97..324fd5393ade 100644 --- www/py-django-bootstrap3/Makefile +++ www/py-django-bootstrap3/Makefile @@ -19,7 +19,7 @@ NO_ARCH= yes .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 www/py-django-markdownx/Makefile www/py-django-markdownx/Makefile index 157e4ce4c38a..ef2b5aceb7d4 100644 --- www/py-django-markdownx/Makefile +++ www/py-django-markdownx/Makefile @@ -23,7 +23,7 @@ NO_ARCH= yes .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 www/py-django-treebeard/Makefile www/py-django-treebeard/Makefile index a1d4ef0f533b..1a9605c1495f 100644 --- www/py-django-treebeard/Makefile +++ www/py-django-treebeard/Makefile @@ -28,7 +28,7 @@ DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" .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 www/py-fqdn/Makefile www/py-fqdn/Makefile index ed5786fd6627..91c535519b31 100644 --- www/py-fqdn/Makefile +++ www/py-fqdn/Makefile @@ -15,7 +15,7 @@ NO_ARCH= yes .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 www/py-hypercorn/Makefile www/py-hypercorn/Makefile index f3d58c350d70..df7cdf7b7a38 100644 --- www/py-hypercorn/Makefile +++ www/py-hypercorn/Makefile @@ -42,7 +42,7 @@ UVLOOP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}uvloop>=0:devel/py-uvloop@${PY_FLAVOR .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 www/py-sentinelhub/Makefile www/py-sentinelhub/Makefile index 7c0e1d93a1fd..641f414196bd 100644 --- www/py-sentinelhub/Makefile +++ www/py-sentinelhub/Makefile @@ -36,7 +36,7 @@ NO_ARCH= yes .include -.if ${PYTHON_REL} < 3700 +.if ${PYTHON_REL} < 30700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR} .endif diff --git www/py-uvicorn/Makefile www/py-uvicorn/Makefile index 3d52f3dc9268..55e49416a9ea 100644 --- www/py-uvicorn/Makefile +++ www/py-uvicorn/Makefile @@ -33,7 +33,7 @@ WATCHGODRELOAD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}watchgod>=0.6:devel/py-watchg .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 www/py-yarl/Makefile www/py-yarl/Makefile index ee0aa6b3b137..f26876204499 100644 --- www/py-yarl/Makefile +++ www/py-yarl/Makefile @@ -33,7 +33,7 @@ do-test: .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 www/qutebrowser/Makefile www/qutebrowser/Makefile index a2a708fd7eae..d73ce88cd1ac 100644 --- www/qutebrowser/Makefile +++ www/qutebrowser/Makefile @@ -48,11 +48,11 @@ DEPRECATED= Uses EOL Python 2.7 via www/qt5-webengine 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 x11-toolkits/py-tkinter/Makefile x11-toolkits/py-tkinter/Makefile index 80acab7a4b73..2d11f6a341f6 100644 --- 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 @@ USE_PYTHON= distutils autoplist allflavors 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 diff --git x11-wm/chamfer/Makefile x11-wm/chamfer/Makefile index b10fbee9560c..b5bccd7f5c52 100644 --- x11-wm/chamfer/Makefile +++ x11-wm/chamfer/Makefile @@ -39,7 +39,7 @@ post-patch: # 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