Attachment 230831 Details for Bug 261046 – Patch file

[patch] Patch file

lang_python36_cleanup.patch (text/plain), 23.57 KB, created by Yasuhiro Kimura on 2022-01-08 21:02:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2022-01-08 21:02:23 UTC

Size: 23.57 KB

patch

obsolete

>From b76a306baca968e193547d3dad2f2649ad2f4d58 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Sun, 9 Jan 2022 05:42:49 +0900
>Subject: [PATCH] */*: Cleanup after the removal of lang/python36
>
>* Remove codes that isn't necessary after the removal of lang/python36
>* Mark ports that isn't necessary with Python 3.7 or later as
>  DEPRECATED and set EXPIRATION_DATE.
>---
> databases/py-databases/Makefile           |  8 +-------
> devel/bpython/Makefile                    |  4 ----
> devel/py-aiortc/Makefile                  |  8 +-------
> devel/py-black/Makefile                   |  4 ----
> devel/py-cfn-lint/Makefile                |  2 --
> devel/py-contextvars/Makefile             |  3 +++
> devel/py-dataclasses-json/Makefile        |  8 +-------
> devel/py-dataclasses/Makefile             |  3 +++
> devel/py-ddtrace/Makefile                 |  8 +-------
> devel/py-future-annotations/Makefile      |  3 +++
> devel/py-installer/Makefile               |  8 +-------
> devel/py-libcst/Makefile                  |  8 +-------
> devel/py-moto/Makefile                    |  4 ----
> devel/py-nbclient/Makefile                |  8 +-------
> devel/py-pip/Makefile                     |  9 +--------
> devel/py-pip/files/extra-patch-python36   | 11 -----------
> devel/py-pydantic/Makefile                |  1 -
> devel/py-pyvisa/Makefile                  |  4 ----
> devel/py-yaspin/Makefile                  |  8 +-------
> devel/pytype/Makefile                     |  8 +-------
> net/irrd/Makefile                         |  8 +-------
> net/py-netaddr/Makefile                   |  8 +-------
> net/py-wsproto/Makefile                   |  8 +-------
> security/py-pyspnego/Makefile             |  8 +-------
> sysutils/py-python-crontab/Makefile       |  9 +--------
> textproc/py-duecredit/Makefile            |  1 -
> textproc/py-fingerprints/Makefile         |  9 +--------
> textproc/py-gensim/Makefile               |  1 -
> textproc/py-normality/Makefile            |  9 +--------
> textproc/py-sphinxcontrib-bibtex/Makefile |  8 +-------
> www/py-aiohttp/Makefile                   |  8 +-------
> www/py-dj32-django-treebeard/Makefile     |  9 +--------
> www/py-django-markdownx/Makefile          | 11 +----------
> www/py-django-treebeard/Makefile          |  9 +--------
> www/py-werkzeug/Makefile                  |  8 +-------
> www/qutebrowser/Makefile                  |  4 ----
> 36 files changed, 32 insertions(+), 206 deletions(-)
> delete mode 100644 devel/py-pip/files/extra-patch-python36
>
>diff --git a/databases/py-databases/Makefile b/databases/py-databases/Makefile
>index 376f5dbac05a..0803aef8255d 100644
>--- a/databases/py-databases/Makefile
>+++ b/databases/py-databases/Makefile
>@@ -42,10 +42,4 @@ SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiosqlite>0:databases/py-aiosqlite@${
> # do-test:
> # 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} TEST_DATABASE_URLS="sqlite:///testsuite" ${PYTHON_CMD} -m pytest -v -rs -o addopts=
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}aiocontextvars>=0:devel/py-aiocontextvars@${PY_FLAVOR}
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile
>index 849932c38872..ce6187eca549 100644
>--- a/devel/bpython/Makefile
>+++ b/devel/bpython/Makefile
>@@ -34,10 +34,6 @@ NLS_USES=	gettext
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
> .if ${PYTHON_REL} < 30800
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.cached-property>=0:devel/py-backports.cached-property@${PY_FLAVOR}
> .endif
>diff --git a/devel/py-aiortc/Makefile b/devel/py-aiortc/Makefile
>index 892c2f63ca5e..75ca757e8759 100644
>--- a/devel/py-aiortc/Makefile
>+++ b/devel/py-aiortc/Makefile
>@@ -26,10 +26,4 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aioice>=0.7.5:devel/py-aioice@${PY_FLAVOR} \
> USES=		localbase python:3.5+
> USE_PYTHON=	autoplist concurrent distutils
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/devel/py-black/Makefile b/devel/py-black/Makefile
>index fbe3ae3507f5..0368baa4137a 100644
>--- a/devel/py-black/Makefile
>+++ b/devel/py-black/Makefile
>@@ -36,10 +36,6 @@ UVLOOP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}uvloop>=0.15.2:devel/py-uvloop@${PY_F
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0.6:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
> .if ${PYTHON_REL} < 30800
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typed-ast>=1.4.2:devel/py-typed-ast@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR}
>diff --git a/devel/py-cfn-lint/Makefile b/devel/py-cfn-lint/Makefile
>index d58b50e51cf9..63f578e43cb2 100644
>--- a/devel/py-cfn-lint/Makefile
>+++ b/devel/py-cfn-lint/Makefile
>@@ -18,8 +18,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aws-sam-translator>=1.38.0:devel/py-aws-sam-
> 		${PYTHON_PKGNAMEPREFIX}six>=1.11:devel/py-six@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}yaml>5.4:devel/py-yaml@${PY_FLAVOR}
> 
>-py36_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}importlib-resources>=1.4:devel/py-importlib-resources@${PY_FLAVOR}
>-
> USES=		python:3.6-3.9
> USE_PYTHON=	autoplist concurrent distutils
> 
>diff --git a/devel/py-contextvars/Makefile b/devel/py-contextvars/Makefile
>index a90fe59cba14..f15e629c2811 100644
>--- a/devel/py-contextvars/Makefile
>+++ b/devel/py-contextvars/Makefile
>@@ -12,6 +12,9 @@ COMMENT=	PEP 567 backport
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+DEPRECATED=	Included in Python 3.7 or later
>+EXPIRATION_DATE=	2022-02-31
>+
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}immutables>=0.9:devel/py-immutables@${PY_FLAVOR}
> 
> USES=		python:3.6+
>diff --git a/devel/py-dataclasses-json/Makefile b/devel/py-dataclasses-json/Makefile
>index 0b18c070ea38..b2e7636d3535 100644
>--- a/devel/py-dataclasses-json/Makefile
>+++ b/devel/py-dataclasses-json/Makefile
>@@ -20,10 +20,4 @@ USE_PYTHON=	autoplist concurrent distutils
> 
> NO_ARCH=	yes
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/devel/py-dataclasses/Makefile b/devel/py-dataclasses/Makefile
>index fdd23968bd32..e872842ce0f3 100644
>--- a/devel/py-dataclasses/Makefile
>+++ b/devel/py-dataclasses/Makefile
>@@ -10,6 +10,9 @@ COMMENT=	Backport of the dataclasses module for Python 3.6
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
>+DEPRECATED=	Included in Python 3.7 or later
>+EXPIRATION_DATE=	2022-02-31
>+
> USES=		python:3.6
> USE_PYTHON=	distutils autoplist
> 
>diff --git a/devel/py-ddtrace/Makefile b/devel/py-ddtrace/Makefile
>index 9039158d4aef..e5538effd88e 100644
>--- a/devel/py-ddtrace/Makefile
>+++ b/devel/py-ddtrace/Makefile
>@@ -27,16 +27,10 @@ OPENTRACING_DESC=	OpenTracing support
> 
> OPENTRACING_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}opentracing>=2.0.0:devel/py-opentracing@${PY_FLAVOR}
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pep562>=0:devel/py-pep562@${PY_FLAVOR}
>-.endif
>-
> post-patch:
> 	@${RM} ${WRKSRC}/ddtrace/profiling/collector/stack.c
> 
> post-install:
> 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/devel/py-future-annotations/Makefile b/devel/py-future-annotations/Makefile
>index a4f7d6589940..339428273651 100644
>--- a/devel/py-future-annotations/Makefile
>+++ b/devel/py-future-annotations/Makefile
>@@ -13,6 +13,9 @@ COMMENT=	Backport of __future__ annotations to python < 3.7
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+DEPRECATED=	Included in Python 3.7 or later
>+EXPIRATION_DATE=	2022-02-31
>+
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tokenize-rt>=3:devel/py-tokenize-rt@${PY_FLAVOR}
> 
> USES=		python:3.6+
>diff --git a/devel/py-installer/Makefile b/devel/py-installer/Makefile
>index d172ba2bf015..c502de439650 100644
>--- a/devel/py-installer/Makefile
>+++ b/devel/py-installer/Makefile
>@@ -17,10 +17,4 @@ USE_PYTHON=	autoplist concurrent distutils
> 
> NO_ARCH=	yes
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-resources>=0:devel/py-importlib-resources@${PY_FLAVOR}
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/devel/py-libcst/Makefile b/devel/py-libcst/Makefile
>index 0480c897d578..2e7de584b5ae 100644
>--- a/devel/py-libcst/Makefile
>+++ b/devel/py-libcst/Makefile
>@@ -22,10 +22,4 @@ USE_PYTHON=	autoplist concurrent distutils
> 
> NO_ARCH=	yes
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0.6.0:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/devel/py-moto/Makefile b/devel/py-moto/Makefile
>index 1b7286fe62cc..838649b6bd20 100644
>--- a/devel/py-moto/Makefile
>+++ b/devel/py-moto/Makefile
>@@ -42,10 +42,6 @@ NO_ARCH=	yes
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
> .if ${PYTHON_REL} < 30800
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR}
> .endif
>diff --git a/devel/py-nbclient/Makefile b/devel/py-nbclient/Makefile
>index 7785b31f8034..c89a66dc6e3b 100644
>--- a/devel/py-nbclient/Makefile
>+++ b/devel/py-nbclient/Makefile
>@@ -22,10 +22,4 @@ USE_PYTHON=	autoplist concurrent distutils
> 
> NO_ARCH=	yes
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}async_generator>=0:devel/py-async_generator@${PY_FLAVOR}
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
>index 494563f86c74..cb0c4a8855a7 100644
>--- a/devel/py-pip/Makefile
>+++ b/devel/py-pip/Makefile
>@@ -60,13 +60,6 @@ DOCS_PORTDOCS=		*
> DOCS_VARS=		PYDISTUTILS_BUILD_TARGET=build_sphinx \
> 			PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700 && ${PORT_OPTIONS:MDOCS}
>-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}future-annotations>=0:devel/py-future-annotations@${PY_FLAVOR}
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-python36
>-.endif
>-
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	(cd ${WRKSRC}/build/sphinx/html && \
>@@ -80,4 +73,4 @@ do-test:
> 	${LN} -sf ${LOCALBASE}/bin/pip ${LOCALBASE}/bin/pip3
> 	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/devel/py-pip/files/extra-patch-python36 b/devel/py-pip/files/extra-patch-python36
>deleted file mode 100644
>index 2e8a97bca88b..000000000000
>--- a/devel/py-pip/files/extra-patch-python36
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- docs/docs_feedback_sphinxext.py.orig	2021-01-23 11:51:53 UTC
>-+++ docs/docs_feedback_sphinxext.py
>-@@ -1,6 +1,7 @@
>-+# -*- coding: future_annotations -*-
>- """A sphinx extension for collecting per doc feedback."""
>- 
>--from __future__ import annotations
>-+import future_annotations
>- 
>- from itertools import chain
>- from typing import TYPE_CHECKING
>diff --git a/devel/py-pydantic/Makefile b/devel/py-pydantic/Makefile
>index 8c0a1bf1a004..b34d77f1558f 100644
>--- a/devel/py-pydantic/Makefile
>+++ b/devel/py-pydantic/Makefile
>@@ -11,7 +11,6 @@ LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4.3:devel/py-typing-extensions@${PY_FLAVOR}
>-py36_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0.6:devel/py-dataclasses@${PY_FLAVOR}
> 
> USES=		cpe python:3.7+
> USE_PYTHON=	distutils cython autoplist
>diff --git a/devel/py-pyvisa/Makefile b/devel/py-pyvisa/Makefile
>index af2570b88900..395dc744ea98 100644
>--- a/devel/py-pyvisa/Makefile
>+++ b/devel/py-pyvisa/Makefile
>@@ -22,10 +22,6 @@ NO_ARCH=	yes
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
> .if ${PYTHON_REL} < 30800
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR}
> .endif
>diff --git a/devel/py-yaspin/Makefile b/devel/py-yaspin/Makefile
>index a6b605ea9e89..6c41564256e6 100644
>--- a/devel/py-yaspin/Makefile
>+++ b/devel/py-yaspin/Makefile
>@@ -20,13 +20,7 @@ USE_PYTHON=	autoplist concurrent distutils
> 
> NO_ARCH=	yes
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0.8<0.9:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
> do-test:
> 	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/devel/pytype/Makefile b/devel/pytype/Makefile
>index f76f676c9bf7..1e74ffef93e5 100644
>--- a/devel/pytype/Makefile
>+++ b/devel/pytype/Makefile
>@@ -27,13 +27,7 @@ RUN_DEPENDS=	ninja>=1.10.2:devel/ninja \
> USES=		compiler:c++11-lang python:3.6+
> USE_PYTHON=	autoplist concurrent distutils
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
> post-install:
> 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/net/irrd/Makefile b/net/irrd/Makefile
>index 971ccb9e490a..c8fbe5bd01bb 100644
>--- a/net/irrd/Makefile
>+++ b/net/irrd/Makefile
>@@ -56,12 +56,6 @@ SUB_LIST=	PYTHON_CMD="${PYTHON_CMD}" \
> 		USERS=${USERS} \
> 		GROUPS=${GROUPS}
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0.6:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
> post-install:
> 	${INSTALL_DATA} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/conf/default_config.yaml \
> 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX}.yaml.sample
>@@ -69,4 +63,4 @@ post-install:
> do-test:
> 	@(cd ${TEST_WRKSRC} && ${SETENV} pytest ${PORTNAME})
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile
>index a71918f04646..7459ad4eed27 100644
>--- a/net/py-netaddr/Makefile
>+++ b/net/py-netaddr/Makefile
>@@ -23,12 +23,6 @@ PORTDOCS=	AUTHORS CHANGELOG README.rst
> 
> OPTIONS_DEFINE=	DOCS
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-resources>0:devel/py-importlib-resources@${PY_FLAVOR}
>-.endif
>-
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
>@@ -36,4 +30,4 @@ post-install-DOCS-on:
> do-test:
> 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/net/py-wsproto/Makefile b/net/py-wsproto/Makefile
>index df222608d6c1..252b53891768 100644
>--- a/net/py-wsproto/Makefile
>+++ b/net/py-wsproto/Makefile
>@@ -19,13 +19,7 @@ USE_PYTHON=	autoplist distutils
> 
> NO_ARCH=	yes
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>0:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
> do-test:
> 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/security/py-pyspnego/Makefile b/security/py-pyspnego/Makefile
>index c39daec20738..154acd6fccbe 100644
>--- a/security/py-pyspnego/Makefile
>+++ b/security/py-pyspnego/Makefile
>@@ -27,10 +27,4 @@ KERBEROS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gssapi>=1.5.0:security/py-gssapi@${
> 			${PYTHON_PKGNAMEPREFIX}krb5>=0:security/py-krb5@${PY_FLAVOR}
> YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0:devel/py-ruamel.yaml@${PY_FLAVOR}
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/sysutils/py-python-crontab/Makefile b/sysutils/py-python-crontab/Makefile
>index b740eda4650a..6a92faeafb2b 100644
>--- a/sysutils/py-python-crontab/Makefile
>+++ b/sysutils/py-python-crontab/Makefile
>@@ -23,14 +23,7 @@ USE_GITLAB=	yes
> GL_ACCOUNT=	doctormo
> 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} < 30700
>-TEST_ENV+=	LC_ALL=C.UTF-8
>-.endif
>-
> do-test:
> 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/textproc/py-duecredit/Makefile b/textproc/py-duecredit/Makefile
>index 9013cf01686d..4558a006076f 100644
>--- a/textproc/py-duecredit/Makefile
>+++ b/textproc/py-duecredit/Makefile
>@@ -13,7 +13,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}citeproc-py>=0.4:textproc/py-citeproc-py@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
>-py36_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR}
> 
> USES=		python:3.6+
> USE_PYTHON=	distutils concurrent autoplist
>diff --git a/textproc/py-fingerprints/Makefile b/textproc/py-fingerprints/Makefile
>index a86d600fe4bf..a4fbf17ab602 100644
>--- a/textproc/py-fingerprints/Makefile
>+++ b/textproc/py-fingerprints/Makefile
>@@ -19,14 +19,7 @@ USE_PYTHON=	distutils autoplist
> 
> 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} < 30700
>-USE_LOCALE=	en_US.UTF-8
>-.endif
>-
> do-test:
> 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/textproc/py-gensim/Makefile b/textproc/py-gensim/Makefile
>index 946578ed81ca..3a9508b930cf 100644
>--- a/textproc/py-gensim/Makefile
>+++ b/textproc/py-gensim/Makefile
>@@ -14,7 +14,6 @@ BUILD_DEPENDS=	${PYNUMPY}
> RUN_DEPENDS=	${PYNUMPY} \
> 		${PYTHON_PKGNAMEPREFIX}scipy>=0.18.1:science/py-scipy@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}smart-open>=1.8.1:net/py-smart-open@${PY_FLAVOR}
>-py36_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR}
> 
> USES=		compiler:c++11-lang python:3.6+
> USE_PYTHON=	distutils cython autoplist
>diff --git a/textproc/py-normality/Makefile b/textproc/py-normality/Makefile
>index ba2501660589..1465d2d33abd 100644
>--- a/textproc/py-normality/Makefile
>+++ b/textproc/py-normality/Makefile
>@@ -26,14 +26,7 @@ OPTIONS_DEFAULT=	ICU
> 
> 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} < 30700
>-USE_LOCALE=	en_US.UTF-8
>-.endif
>-
> do-test:
> 	@cd ${WRKSRC} && ${SET_ENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/textproc/py-sphinxcontrib-bibtex/Makefile b/textproc/py-sphinxcontrib-bibtex/Makefile
>index 8b9f6ee8af36..0b24604e0275 100644
>--- a/textproc/py-sphinxcontrib-bibtex/Makefile
>+++ b/textproc/py-sphinxcontrib-bibtex/Makefile
>@@ -22,10 +22,4 @@ USE_PYTHON=	autoplist concurrent distutils
> 
> NO_ARCH=	yes
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/www/py-aiohttp/Makefile b/www/py-aiohttp/Makefile
>index 7d8f1286355b..1ffbd08d7e5f 100644
>--- a/www/py-aiohttp/Makefile
>+++ b/www/py-aiohttp/Makefile
>@@ -34,12 +34,6 @@ USES=		cpe python:3.6+
> CPE_VENDOR=	${PORTNAME}_project
> USE_PYTHON=	autoplist distutils cython
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}idna_ssl>=1.0:dns/py-idna_ssl@${PY_FLAVOR}
>-.endif
>-
> pre-configure:
> .for file in _frozenlist _helpers _http_parser _http_writer _websocket
> 	@${RM} ${WRKSRC}/aiohttp/${file}.c
>@@ -52,4 +46,4 @@ post-install:
> do-test:
> 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/www/py-dj32-django-treebeard/Makefile b/www/py-dj32-django-treebeard/Makefile
>index 723f50155474..05c071a83f1c 100644
>--- a/www/py-dj32-django-treebeard/Makefile
>+++ b/www/py-dj32-django-treebeard/Makefile
>@@ -25,13 +25,6 @@ DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FL
> 			${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
> 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} < 30700
>-USE_LOCALE=	en_US.UTF-8
>-.endif
>-
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	@(cd ${WRKSRC}/build/sphinx/html && \
>@@ -41,4 +34,4 @@ post-install-DOCS-on:
> do-test:
> 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/www/py-django-markdownx/Makefile b/www/py-django-markdownx/Makefile
>index ef2b5aceb7d4..8baa24801fdb 100644
>--- a/www/py-django-markdownx/Makefile
>+++ b/www/py-django-markdownx/Makefile
>@@ -21,13 +21,4 @@ USE_PYTHON=	autoplist distutils
> 
> NO_ARCH=	yes
> 
>-.include <bsd.port.pre.mk>
>-
>-.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.
>-USE_LOCALE=	en_US.UTF-8
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/www/py-django-treebeard/Makefile b/www/py-django-treebeard/Makefile
>index 1a9605c1495f..49adb2be8380 100644
>--- a/www/py-django-treebeard/Makefile
>+++ b/www/py-django-treebeard/Makefile
>@@ -25,13 +25,6 @@ DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FL
> 			${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
> 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} < 30700
>-USE_LOCALE=	en_US.UTF-8
>-.endif
>-
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	@(cd ${WRKSRC}/build/sphinx/html && \
>@@ -41,4 +34,4 @@ post-install-DOCS-on:
> do-test:
> 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/www/py-werkzeug/Makefile b/www/py-werkzeug/Makefile
>index 857fe7da732b..3d49391c01cb 100644
>--- a/www/py-werkzeug/Makefile
>+++ b/www/py-werkzeug/Makefile
>@@ -27,14 +27,8 @@ WATCHDOG_DESC=	Monitor filesystem events
> 
> WATCHDOG_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}watchdog>=0:devel/py-watchdog@${PY_FLAVOR}
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>=0:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
> post-install-EXAMPLES-on:
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/www/qutebrowser/Makefile b/www/qutebrowser/Makefile
>index b3080ebbc94e..4c31ae1436d0 100644
>--- a/www/qutebrowser/Makefile
>+++ b/www/qutebrowser/Makefile
>@@ -48,10 +48,6 @@ DEPRECATED=	Uses EOL Python 2.7 via www/qt5-webengine
> EXPIRATION_DATE=2021-06-23
> .endif
> 
>-.if ${PYTHON_REL} < 30700
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>0:devel/py-dataclasses@${PY_FLAVOR}
>-.endif
>-
> .if ${PYTHON_REL} < 30900
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-resources>0:devel/py-importlib-resources@${PY_FLAVOR}
> .endif
>-- 
>2.34.1
>

Actions: View | Diff

Attachments on bug 261046: 230831