Index: devel/py-setuptools/Makefile
===================================================================
--- devel/py-setuptools/Makefile
+++ devel/py-setuptools/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	setuptools
 PORTVERSION=	63.1.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,9 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cpe python:3.7+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+
+USES=		cpe python
 USE_PYTHON=	allflavors autoplist concurrent distutils
 
 CPE_VENDOR=	python
Index: devel/py-setuptools58/Makefile
===================================================================
--- devel/py-setuptools58/Makefile
+++ devel/py-setuptools58/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	setuptools
 PORTVERSION=	58.5.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,9 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cpe python:3.7+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+
+USES=		cpe python
 USE_PYTHON=	allflavors autoplist concurrent distutils
 
 CPE_VENDOR=	python
Index: devel/py-wheel/Makefile
===================================================================
--- devel/py-wheel/Makefile
+++ devel/py-wheel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wheel
-PORTVERSION=	0.38.4
+PORTVERSION=	0.40.0
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,22 +10,13 @@
 
 LICENSE=	MIT
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=3.8:devel/py-flit-core@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	allflavors autoplist concurrent pep517
 
 # see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268500
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	PIP SIGNATURE
-
-PIP_DESC=	Use pip to install wheels
-SIGNATURE_DESC=	Enable digital signature of wheels
-
-PIP_RUN_DEPENDS=	pip-${PYTHON_VER}:devel/py-pip@${PY_FLAVOR}
-SIGNATURE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:devel/py-dirspec@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}ed25519ll>=0.6_1:security/py-ed25519ll@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${PY_FLAVOR}
-
 .include <bsd.port.mk>
Index: devel/py-wheel/distinfo
===================================================================
--- devel/py-wheel/distinfo
+++ devel/py-wheel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1668765655
-SHA256 (wheel-0.38.4.tar.gz) = 965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac
-SIZE (wheel-0.38.4.tar.gz) = 67193
+TIMESTAMP = 1678889146
+SHA256 (wheel-0.40.0.tar.gz) = cd1196f3faee2b31968d626e1731c94f99cbdb67cf5a46e4f5656cbee7738873
+SIZE (wheel-0.40.0.tar.gz) = 96226