diff --git a/devel/py-automat/Makefile b/devel/py-automat/Makefile
index 80d05b3837b..03ebc34ac1f 100644
--- a/devel/py-automat/Makefile
+++ b/devel/py-automat/Makefile
@@ -15,12 +15,10 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_PYBUILD =		setuptools
+MODPY_PYBUILD =		setuptools_scm
 MODPY_PYTEST_ARGS =	lib/automat/_test/
 
-BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR} \
-			textproc/py-m2r${MODPY_FLAVOR}
-
+BUILD_DEPENDS =		textproc/py-m2r${MODPY_FLAVOR}
 RUN_DEPENDS =		devel/py-attrs${MODPY_FLAVOR} \
 			devel/py-six${MODPY_FLAVOR}
 
diff --git a/devel/py-pluggy/Makefile b/devel/py-pluggy/Makefile
index 908a2f4ae6f..19e2966cf80 100644
--- a/devel/py-pluggy/Makefile
+++ b/devel/py-pluggy/Makefile
@@ -16,9 +16,7 @@ FLAVORS =		python3
 FLAVOR =		python3
 
 MODPY_PI =		Yes
-MODPY_PYBUILD =		setuptools
-
-BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}
+MODPY_PYBUILD =		setuptools_scm
 
 TEST_DEPENDS =		devel/py-atomicwrites${MODPY_FLAVOR} \
 			devel/py-test-benchmark${MODPY_FLAVOR}
diff --git a/devel/py-setuptools_scm_git_archive/Makefile b/devel/py-setuptools_scm_git_archive/Makefile
index 4829c7ee301..96218965251 100644
--- a/devel/py-setuptools_scm_git_archive/Makefile
+++ b/devel/py-setuptools_scm_git_archive/Makefile
@@ -15,9 +15,8 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 MODPY_PI =		Yes
 MODPY_PYTEST_ARGS =	tests.py
-MODPY_PYBUILD =		setuptools
+MODPY_PYBUILD =		setuptools_scm
 
-BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}
 RUN_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}
 
 FLAVORS =		python3
diff --git a/devel/py-tenacity/Makefile b/devel/py-tenacity/Makefile
index c0e6c494d6a..60a702eddcf 100644
--- a/devel/py-tenacity/Makefile
+++ b/devel/py-tenacity/Makefile
@@ -15,11 +15,9 @@ HOMEPAGE =		https://github.com/jd/tenacity
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_PYBUILD =		setuptools
+MODPY_PYBUILD =		setuptools_scm
 MODPY_PI =		Yes
 
-BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}
-
 # one test fails if typeguard is missing (currently not in ports)
 TEST_DEPENDS =		www/py-tornado${MODPY_FLAVOR}
 
diff --git a/devel/py-test-runner/Makefile b/devel/py-test-runner/Makefile
index 0966ca239d0..68b12b6ec1e 100644
--- a/devel/py-test-runner/Makefile
+++ b/devel/py-test-runner/Makefile
@@ -11,7 +11,6 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =	lang/python
 
-BUILD_DEPENDS =	devel/py-setuptools_scm${MODPY_FLAVOR}
 RUN_DEPENDS =	devel/py-test${MODPY_FLAVOR}
 
 MODPY_PI =	Yes
diff --git a/math/py-mpmath/Makefile b/math/py-mpmath/Makefile
index ab421a7ff7d..2c25d7fa6f5 100644
--- a/math/py-mpmath/Makefile
+++ b/math/py-mpmath/Makefile
@@ -14,12 +14,10 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_PYBUILD =	setuptools
+MODPY_PYBUILD =		setuptools_scm
 MODPY_PYTEST_ARGS =	mpmath
 
 FLAVORS =		python3
 FLAVOR =		python3
 
-BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}
-
 .include <bsd.port.mk>
diff --git a/security/letsencrypt/acme-tiny/Makefile b/security/letsencrypt/acme-tiny/Makefile
index 15d10415c27..0d8aae430d3 100644
--- a/security/letsencrypt/acme-tiny/Makefile
+++ b/security/letsencrypt/acme-tiny/Makefile
@@ -13,8 +13,7 @@ PERMIT_PACKAGE=	Yes
 
 MODPY_PI=	Yes
 MODPY_PI_DIR=	a/acme_tiny
-
-BUILD_DEPENDS=	devel/py-setuptools_scm${MODPY_FLAVOR}
+MODPY_PYBUILD=	setuptools_scm
 
 # there are tests, but they need to run Pebble as a local CA (separate go-lang
 # software)
diff --git a/sysutils/py-pynetbox/Makefile b/sysutils/py-pynetbox/Makefile
index 8377c3604e7..036c77da7a7 100644
--- a/sysutils/py-pynetbox/Makefile
+++ b/sysutils/py-pynetbox/Makefile
@@ -14,14 +14,13 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 
-MODPY_PYBUILD =		setuptools
+MODPY_PYBUILD =		setuptools_scm
 MODPY_PI =		Yes
 MODPY_PYTEST_ARGS =	--ignore=tests/integration tests
 
 FLAVORS =		python3
 FLAVOR =		python3
 
-BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}
 RUN_DEPENDS =		devel/py-six${MODPY_FLAVOR} \
 			www/py-requests${MODPY_FLAVOR}
 
diff --git a/x11/py-xlib/Makefile b/x11/py-xlib/Makefile
index 4eb06d9e3f5..8a79ce0fdda 100644
--- a/x11/py-xlib/Makefile
+++ b/x11/py-xlib/Makefile
@@ -1,4 +1,4 @@
-COMMENT =	 	X11 library for Python
+COMMENT =		X11 library for Python
 
 GH_ACCOUNT =		python-xlib
 GH_PROJECT =		python-xlib
@@ -13,14 +13,13 @@ PERMIT_PACKAGE =	Yes
 
 MODULES=		lang/python
 
-BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR} \
-			devel/py-six${MODPY_FLAVOR}
+BUILD_DEPENDS =		devel/py-six${MODPY_FLAVOR}
 RUN_DEPENDS =		devel/py-six${MODPY_FLAVOR}
 TEST_DEPENDS =		devel/py-mock${MODPY_FLAVOR}
 
 TEST_IS_INTERACTIVE =	x11
 
-MODPY_PYBUILD =		setuptools
+MODPY_PYBUILD =		setuptools_scm
 
 FLAVORS =		python3
 FLAVOR =		python3