Attachment 224060 Details for Bug 255013 – Patch 1: switch to 5 digit PYTHON_REL

[patch] Patch 1: switch to 5 digit PYTHON_REL

01-5-digit-PYTHON_REL.patch (text/plain), 32.38 KB, created by Dmitry Marakasov on 2021-04-12 17:58:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2021-04-12 17:58:11 UTC

Size: 32.38 KB

patch

obsolete

>commit 8785ed02251c2eae686f7867ffab1fd419a745a1
>Author: Dmitry Marakasov <amdmi3@FreeBSD.org>
>Date:   Sat Apr 10 02:15:37 2021 +0300
>
>    Mk: switch PYTHON_REL to 5 digits to support python 3.10.x
>
>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 79201987e607..bd97d2f18bda 100644
>--- Mk/Uses/python.mk
>+++ Mk/Uses/python.mk
>@@ -174,7 +174,7 @@
> # PYTHON_PORTSDIR	- The port directory of the chosen Python interpreter
> #
> # PYTHON_REL		- The release number of the chosen Python interpreter
>-#			  without dots, e.g. 2706, 3401, ...
>+#			  without dots, e.g. 20706, 30401, ...
> #
> # PYTHON_SUFFIX		- The major-minor release number of the chosen Python
> #			  interpreter without dots, e.g. 27, 36, ...
>@@ -455,18 +455,18 @@ PYTHON_EXT_SUFFIX=	# empty
> .if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR})
> .include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version"
> .endif
>-# Create a 4 integer version string, prefixing 0 to the last token if
>-# it's a single character. Only use the the first 3 tokens of
>+# Create a 5 integer version string, prefixing 0 to the minor and patch
>+# tokens if it's a single character. Only use the the first 3 tokens of
> # PORTVERSION to support pre-release versions (rc3, alpha4, etc) of
> # any Python port (lang/pythonXY)
>-PYTHON_REL=	${PYTHON_PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9]+)$/.0\1/:C/\.0?([0-9][0-9])$/.\1/:S/.//g}
>+PYTHON_REL=	${PYTHON_PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9])$/.0\1/:C/\.([0-9]\.[0-9]+)/.0\1/:S/.//g}
> 
> # Might be overridden by calling ports
> PYTHON_CMD?=		${_PYTHON_BASECMD}${_PYTHON_VERSION}
> .if ${PYTHON_VER} != 2.7
> .if exists(${PYTHON_CMD}-config)
> PYTHON_ABIVER!=		${PYTHON_CMD}-config --abiflags
>-.elif ${PYTHON_REL} < 3800
>+.elif ${PYTHON_REL} < 30800
> # Default ABI flags for lang/python3[67] ports
> PYTHON_ABIVER=		m
> .endif
>@@ -607,7 +607,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 +623,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,14 +638,14 @@ 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}
> 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 +684,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 <bsd.port.pre.mk>
> 
>-.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-sqlalchemy14/Makefile databases/py-sqlalchemy14/Makefile
>index 53d2afd1c0ab..42dc6ce6f2b2 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 <bsd.port.pre.mk>
> 
>-.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..1941d0609ef4 100644
>--- databases/py-sqlite3/Makefile
>+++ databases/py-sqlite3/Makefile
>@@ -30,7 +30,7 @@ PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
> .include <bsd.port.pre.mk>
> 
> 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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 ed8e42c5efa7..cd5f8f398b95 100644
>--- devel/py-astroid/Makefile
>+++ devel/py-astroid/Makefile
>@@ -21,7 +21,7 @@ NO_ARCH=	yes
> 
> .include <bsd.port.pre.mk>
> 
>-.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-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 <bsd.port.pre.mk>
> 
>-.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 d648f90b3dcc..e05d7514c2a4 100644
>--- devel/py-build/Makefile
>+++ devel/py-build/Makefile
>@@ -23,7 +23,7 @@ NO_ARCH=	yes
> 
> .include <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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-flake8/Makefile devel/py-flake8/Makefile
>index 07f9bf78c9d5..22ee962d7802 100644
>--- devel/py-flake8/Makefile
>+++ devel/py-flake8/Makefile
>@@ -26,7 +26,7 @@ TEST_ENV=	PYTHONPATH="${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}"
> 
> .include <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 cedc6bd3e019..a3b69229d084 100644
>--- devel/py-libcst/Makefile
>+++ devel/py-libcst/Makefile
>@@ -23,7 +23,7 @@ NO_ARCH=	yes
> 
> .include <bsd.port.pre.mk>
> 
>-.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 2c84810d5d8d..1abbadf74b32 100644
>--- devel/py-openstacksdk/Makefile
>+++ devel/py-openstacksdk/Makefile
>@@ -37,7 +37,7 @@ SHEBANG_GLOB=	*.sh
> 
> .include <bsd.port.pre.mk>
> 
>-.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 cd71737404bf..fd1254983f3b 100644
>--- devel/py-oslo.config/Makefile
>+++ devel/py-oslo.config/Makefile
>@@ -27,7 +27,7 @@ NO_ARCH=	yes
> 
> .include <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 b765fed0ac5d..88b962aa3eca 100644
>--- devel/py-pep517/Makefile
>+++ devel/py-pep517/Makefile
>@@ -21,7 +21,7 @@ NO_ARCH=	yes
> 
> .include <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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-ptpython/Makefile devel/py-ptpython/Makefile
>index 493106beba6e..b0d8a0508faf 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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.if ${PYTHON_REL} < 3800
>+.if ${PYTHON_REL} < 30800
> _PY_SONAME=	.cpython-${PYTHON_SUFFIX}m
> .else
> _PY_SONAME=	${PYTHON_EXT_SUFFIX}
>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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
> .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 <bsd.port.pre.mk>
> 
>-.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 d9d823f6ecf5..8e9d9a22f5af 100644
>--- science/py-h5py/Makefile
>+++ science/py-h5py/Makefile
>@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
> 
> .include <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
> .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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
> # 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 <bsd.port.pre.mk>
> # 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 <bsd.port.pre.mk>
> # 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-aioquic/Makefile www/py-aioquic/Makefile
>index 616058e58528..129f8ecc7043 100644
>--- www/py-aioquic/Makefile
>+++ www/py-aioquic/Makefile
>@@ -21,7 +21,7 @@ USE_PYTHON=	autoplist concurrent distutils
> 
> .include <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.if ${PYTHON_REL} < 3800
>+.if ${PYTHON_REL} < 30800
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR}
> .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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> # 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 <bsd.port.pre.mk>
> 
>-.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 <bsd.port.pre.mk>
> 
>-.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 e66047305223..6dba3d603a4f 100644
>--- www/py-sentinelhub/Makefile
>+++ www/py-sentinelhub/Makefile
>@@ -35,7 +35,7 @@ NO_ARCH=	yes
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${PYTHON_REL} < 3700
>+.if ${PYTHON_REL} < 30700
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${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 <bsd.port.pre.mk>
> 
>-.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 f9149707d7e1..fff87f786dca 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-fonts/py-opentype-sanitizer/Makefile x11-fonts/py-opentype-sanitizer/Makefile
>index 9101949da7f4..633fe09066d1 100644
>--- x11-fonts/py-opentype-sanitizer/Makefile
>+++ x11-fonts/py-opentype-sanitizer/Makefile
>@@ -22,7 +22,7 @@ USE_PYTHON=	autoplist concurrent distutils
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${PYTHON_REL} >= 3800
>+.if ${PYTHON_REL} >= 30800
> LDFLAGS+=	-lpython${PYTHON_VER}
> .endif
> 
>diff --git x11-toolkits/py-tkinter/Makefile x11-toolkits/py-tkinter/Makefile
>index 80acab7a4b73..7be65a54bfbb 100644
>--- x11-toolkits/py-tkinter/Makefile
>+++ x11-toolkits/py-tkinter/Makefile
>@@ -27,7 +27,7 @@ PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
> .include <bsd.port.pre.mk>
> 
> 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

Actions: View | Diff

Attachments on bug 255013: 224060 | 224061 | 224062 | 224403