> tb@ has been helping me with a test bulk build and fixing various things
> which failed; I've been looking for ports using it at runtime and
> either patching or adding a dep. Nonetheless there may be more runtime
> problems found so doing this at the start of a release cycle.is helpful.

Here's the remainder of the diff I built up in my bulk, rebased on all
the churn in -current.

I had revision bumps in borgbackup/2.0, gobject-introspection and
mercurial which I dropped from this diff since the plist changes were
gone after the rebase.

diff --git a/databases/mongodb/44/Makefile b/databases/mongodb/44/Makefile
index 1f65e4d94af..9976e46b2fb 100644
--- a/databases/mongodb/44/Makefile
+++ b/databases/mongodb/44/Makefile
@@ -18,6 +18,7 @@ MODSCONS_FLAGS += --use-system-zstd
 MODSCONS_FLAGS += --use-system-pcre
 
 ALL_TARGET =	install-core
+BUILD_DEPENDS=	sysutils/py-standard-pkg-resources
 LIB_DEPENDS =	archivers/zstd \
 		devel/pcre
 
diff --git a/devel/angr/py-angr/Makefile b/devel/angr/py-angr/Makefile
index 17acbccf209..a5ce676c711 100644
--- a/devel/angr/py-angr/Makefile
+++ b/devel/angr/py-angr/Makefile
@@ -14,7 +14,8 @@ COMPILER =	base-clang ports-gcc
 BUILD_DEPENDS =	devel/angr/py-pyvex>=${MODPY_DISTV} \
 		devel/py-bitstring \
 		devel/py-cffi \
-		devel/py-future
+		devel/py-future \
+		sysutils/py-standard-pkg-resources
 
 # AngrServer could use (unported) rpyc
 RUN_DEPENDS =	devel/angr/py-ailment>=${MODPY_DISTV} \
diff --git a/devel/py-cflow2dot/Makefile b/devel/py-cflow2dot/Makefile
index cefc920fcca..8c4f7216ebe 100644
--- a/devel/py-cflow2dot/Makefile
+++ b/devel/py-cflow2dot/Makefile
@@ -15,6 +15,7 @@ MODULES=	lang/python
 MODPY_PI=	Yes
 MODPY_PYBUILD=	setuptools
 
+BUILD_DEPENDS=	sysutils/py-standard-pkg-resources
 RUN_DEPENDS=	devel/cflow \
 		graphics/py-dot \
 		math/py-networkx
diff --git a/devel/py-html5lib/Makefile b/devel/py-html5lib/Makefile
index e28365753b1..1d941c1f8eb 100644
--- a/devel/py-html5lib/Makefile
+++ b/devel/py-html5lib/Makefile
@@ -16,6 +16,7 @@ MODULES=		lang/python
 MODPY_PI =		Yes
 MODPY_PYBUILD =		setuptools
 
+BUILD_DEPENDS =		sysutils/py-standard-pkg-resources
 RUN_DEPENDS =		devel/py-six \
 			textproc/py-webencodings
 TEST_DEPENDS =		devel/py-mock \
diff --git a/devel/py-uvloop/Makefile b/devel/py-uvloop/Makefile
index a4bda1d9484..c4adeb16ca4 100644
--- a/devel/py-uvloop/Makefile
+++ b/devel/py-uvloop/Makefile
@@ -29,7 +29,8 @@ LDFLAGS =		-L${LOCALBASE}/lib
 # don't override opt level in CFLAGS
 MAKE_ENV =		UVLOOP_OPT_CFLAGS=
 
-BUILD_DEPENDS =		lang/cython
+BUILD_DEPENDS =		lang/cython \
+			sysutils/py-standard-pkg-resources
 
 LIB_DEPENDS =		devel/libuv
 
diff --git a/games/chiaki/Makefile b/games/chiaki/Makefile
index 63cbd1e070a..b4ebd764505 100644
--- a/games/chiaki/Makefile
+++ b/games/chiaki/Makefile
@@ -32,7 +32,7 @@ MODULES =		devel/cmake \
 CONFIGURE_ARGS +=	-DCHIAKI_ENABLE_SETSU=no
 BUILD_DEPENDS =		devel/protobuf-c \
 			devel/py-protobuf \
-			devel/py-setuptools
+			sysutils/py-standard-pkg-resources
 LIB_DEPENDS =		devel/sdl2 \
 			audio/opus \
 			graphics/ffmpeg \
diff --git a/productivity/vdirsyncer/Makefile b/productivity/vdirsyncer/Makefile
index 7911db8ffc7..0fa7ed54aa9 100644
--- a/productivity/vdirsyncer/Makefile
+++ b/productivity/vdirsyncer/Makefile
@@ -17,7 +17,8 @@ MODULES =		lang/python
 MODPY_PI =		Yes
 MODPY_PYBUILD =		setuptools_scm
 
-BUILD_DEPENDS =		textproc/py-sphinx \
+BUILD_DEPENDS =		sysutils/py-standard-pkg-resources \
+			textproc/py-sphinx \
 			${RUN_DEPENDS}
 
 RUN_DEPENDS =		www/py-aiohttp \
diff --git a/sysutils/py-command_runner/Makefile b/sysutils/py-command_runner/Makefile
index b626336c7ac..e131ca428bd 100644
--- a/sysutils/py-command_runner/Makefile
+++ b/sysutils/py-command_runner/Makefile
@@ -15,4 +15,6 @@ MODULES=	lang/python
 MODPY_PYBUILD=	setuptools
 MODPY_PI=	Yes
 
+BUILD_DEPENDS=	sysutils/py-standard-pkg-resources
+
 .include <bsd.port.mk>
diff --git a/sysutils/u-boot/Makefile.inc b/sysutils/u-boot/Makefile.inc
index a8987764baa..5a679fc098d 100644
--- a/sysutils/u-boot/Makefile.inc
+++ b/sysutils/u-boot/Makefile.inc
@@ -21,8 +21,10 @@ BUILD_DEPENDS+=	devel/bison \
 		devel/dtc \
 		devel/swig
 
-# for pkg_resources used in tools/binman/control.py
-BUILD_DEPENDS+=	devel/py-setuptools
+# used in scripts/dtc/pylibfdt
+BUILD_DEPENDS+= devel/py-setuptools
+# used in tools/binman/control.py
+BUILD_DEPENDS+=	sysutils/py-standard-pkg-resources
 # dpb junking can break the build
 BUILD_DEPENDS+= lang/pythran