diff --git a/devel/py-setuptools58/Makefile b/devel/py-setuptools58/Makefile
index d77bf56bbec7..40db9bdef42b 100644
--- a/devel/py-setuptools58/Makefile
+++ b/devel/py-setuptools58/Makefile
@@ -1,48 +1,32 @@
 PORTNAME=	setuptools
 PORTVERSION=	58.5.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	58
 DIST_SUBDIR=	python
 
 # note: before committing to this port, contact portmgr to arrange for an
 # experimental ports run.  Untested commits may be backed out at portmgr's
 # discretion.
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python packages installer
 WWW=		https://pypi.org/project/setuptools/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cpe python:3.7+
-USE_PYTHON=	allflavors autoplist concurrent distutils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+
+USES=		cpe python
+USE_PYTHON=	allflavors autoplist concurrent pep517 pytest
 
 CPE_VENDOR=	python
 
-MAKE_ENV+=	SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
 NO_ARCH=	yes
-PYDISTUTILS_SETUP=	${PYSETUP}
-
-PLIST_FILES=	"@sample %%PYTHON_SITELIBDIR%%/easy-install.pth.dist %%PYTHON_SITELIBDIR%%/easy-install.pth"
-
-.include <bsd.port.pre.mk>
 
-.if ${FLAVOR} != ${FLAVORS:[1]}
-SUB_FILES+=	pkg-message
-SUB_LIST+=	PYTHON_VER=${PYTHON_VER}
-.endif
-
-# 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}
 # pkg install -y py38-pytest py38-mock py38-pytest-fixture-config py38-pytest-virtualenv py38-paver
 
-post-install:
-	${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/
-
-do-test:
-	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-setuptools58/files/easy-install.pth.dist b/devel/py-setuptools58/files/easy-install.pth.dist
deleted file mode 100644
index e7ab88be464d..000000000000
--- a/devel/py-setuptools58/files/easy-install.pth.dist
+++ /dev/null
@@ -1,2 +0,0 @@
-import sys; sys.__plen = len(sys.path)
-import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new)
diff --git a/devel/py-setuptools58/files/pkg-message.in b/devel/py-setuptools58/files/pkg-message.in
deleted file mode 100644
index 2c33be99f2e5..000000000000
--- a/devel/py-setuptools58/files/pkg-message.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-  Only %%PREFIX%%/bin/easy_install-%%PYTHON_VER%% script has been installed
-  since Python %%PYTHON_VER%% is not the default Python version.
-EOM
-}
-]