diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile
index 977b873c3d32..f5cb4d50f9ff 100644
--- a/devel/py-flake8/Makefile
+++ b/devel/py-flake8/Makefile
@@ -1,33 +1,23 @@
 PORTNAME=	flake8
-PORTVERSION=	4.0.1
+PORTVERSION=	5.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Code checking using pep8 and pyflakes
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mccabe>=0:devel/py-mccabe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycodestyle>=0:devel/py-pycodestyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyflakes>=0:devel/py-pyflakes@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python:3.8+ pytest
 USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
-TEST_ENV=	PYTHONPATH="${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}"
+PYTEST_BROKEN_TESTS=	test_up_to_date test_all_pyflakes_messages_have_flake8_codes_assigned
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 30800
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}
-.endif
-
-do-test:
-	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-flake8/distinfo b/devel/py-flake8/distinfo
index a2575a6603e7..033bc5aca028 100644
--- a/devel/py-flake8/distinfo
+++ b/devel/py-flake8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634056728
-SHA256 (flake8-4.0.1.tar.gz) = 806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d
-SIZE (flake8-4.0.1.tar.gz) = 154905
+TIMESTAMP = 1659362496
+SHA256 (flake8-5.0.0.tar.gz) = 503b06b6795189e55298a70b695b1eb4f6b8d479fae81352fc97c72ca242509e
+SIZE (flake8-5.0.0.tar.gz) = 145300
diff --git a/devel/py-flake8/files/patch-setup.cfg b/devel/py-flake8/files/patch-setup.cfg
index 566388ecca5e..3f5cf5f1a124 100644
--- a/devel/py-flake8/files/patch-setup.cfg
+++ b/devel/py-flake8/files/patch-setup.cfg
@@ -1,17 +1,17 @@
---- setup.cfg.orig	2021-10-11 02:07:36 UTC
+--- setup.cfg.orig	2022-07-30 21:01:31 UTC
 +++ setup.cfg
 @@ -35,10 +35,10 @@ packages = find:
  package_dir = 
  	=src
  install_requires = 
--	mccabe>=0.6.0,<0.7.0
--	pycodestyle>=2.8.0,<2.9.0
--	pyflakes>=2.4.0,<2.5.0
+-	mccabe>=0.7.0,<0.8.0
+-	pycodestyle>=2.9.0,<2.10.0
+-	pyflakes>=2.5.0,<2.6.0
 -	importlib-metadata<4.3;python_version<"3.8"
 +	mccabe
 +	pycodestyle
 +	pyflakes
 +	importlib-metadata;python_version<"3.8"
- python_requires = >=3.6
+ python_requires = >=3.6.1
  
  [options.packages.find]