diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index b9d6ad23214..244092c6be6 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.86 2020/03/17 08:38:10 jasper Exp $
+# $OpenBSD: Makefile,v 1.87 2020/04/25 10:07:41 ajacoutot Exp $
 
 COMMENT=	user interface builder for the gtk+3 toolkit
 
@@ -32,13 +32,13 @@ MODULES=	lang/python \
 
 MODPY_VERSION =	${MODPY_DEFAULT_VERSION_3}
 
-BUILD_DEPENDS=	devel/py-gobject3,python3
+BUILD_DEPENDS=	devel/py-gobject3${MODPY_FLAVOR}
 
 LIB_DEPENDS=	x11/gtk+3 \
 		devel/libffi
 
 RUN_DEPENDS=	x11/gnome/devhelp \
-		devel/py-gobject3,python3
+		devel/py-gobject3${MODPY_FLAVOR}
 
 MODGNOME_TOOLS += desktop-file-utils docbook gtk-update-icon-cache
 MODGNOME_TOOLS += gobject-introspection yelp
diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index e3420aea700..eb913e10727 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2019/11/20 13:43:35 edd Exp $
+# $OpenBSD: Makefile,v 1.20 2020/04/25 10:07:41 ajacoutot Exp $
 
 COMMENT =	continuation and extension of Vim
 
@@ -58,9 +58,13 @@ CONFIGURE_ARGS +=	-DLUA_PRG=${MODLUA_BIN} \
 # Tests need gmake
 USE_GMAKE = Yes
 # `test_startup_utf8.vim' requires either bash or zsh
+MODULES +=	lang/python
+MODPY_VERSION =	${MODPY_DEFAULT_VERSION_3}
+MODPY_RUNDEP =	No
+MODPY_BUILDDEP =	No
 TEST_DEPENDS =	shells/bash \
 		editors/py-neovim \
-		editors/py-neovim,python3
+		editors/py-neovim${MODPY_FLAVOR}
 
 # Build libluv first as a static library. We opted not to create a libluv
 # port because it must be built for a specific Lua version and we don't know
diff --git a/math/bcal/Makefile b/math/bcal/Makefile
index 9a702ae3a03..7672929f3ff 100644
--- a/math/bcal/Makefile
+++ b/math/bcal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2020/01/10 15:03:23 bcallah Exp $
+# $OpenBSD: Makefile,v 1.6 2020/04/25 10:07:42 ajacoutot Exp $
 
 # Upstream says 64-bit only.
 # https://github.com/jarun/bcal/issues/4
@@ -23,8 +23,11 @@ MASTER_SITES =	https://github.com/jarun/bcal/releases/download/v${V}/
 DEBUG_PACKAGES =	${BUILD_PACKAGES}
 
 # Test script is a Python 3 script.
-# It is not worth invoking the python MODULE for this.
-TEST_DEPENDS =	devel/py-test,python3
+MODULES +=	lang/python
+MODPY_VERSION =	${MODPY_DEFAULT_VERSION_3}
+MODPY_RUNDEP =	No
+MODPY_BUILDDEP =	No
+TEST_DEPENDS =	devel/py-test${MODPY_FLAVOR}
 
 USE_GMAKE =	Yes
 
diff --git a/net/hpodder/Makefile b/net/hpodder/Makefile
index 7fada1e3fb6..b57a914b612 100644
--- a/net/hpodder/Makefile
+++ b/net/hpodder/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.42 2019/11/19 21:21:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.43 2020/04/25 10:07:42 ajacoutot Exp $
 
 COMMENT =		command line podcast aggregator
 
 DISTNAME =		hpodder-1.1.6
-REVISION =		18
+REVISION =		19
 CATEGORIES =		net
 HOMEPAGE =		https://github.com/jgoerzen/hpodder/wiki
 
@@ -12,7 +12,11 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		c charset ffi gmp iconv m pthread sqlite3 util
 
-MODULES =		lang/ghc
+MODULES =		lang/ghc \
+			lang/python
+
+MODPY_VERSION =		${MODPY_DEFAULT_VERSION_3}
+MODPY_BUILDDEP =	No
 
 MODGHC_BUILD =		cabal hackage nort
 
@@ -26,7 +30,7 @@ BUILD_DEPENDS =		devel/hs-ConfigFile \
 			textproc/hs-HaXml>=1.22 \
 			databases/hs-HDBC-sqlite3>=1.1.0
 RUN_DEPENDS =		net/curl>=7.15.5 \
-			audio/py-mutagen,python3
+			audio/py-mutagen${MODPY_FLAVOR}
 
 post-install:
 	${INSTALL_MAN} ${FILESDIR}/hpodder.1 ${PREFIX}/man/man1
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index 9ea6fda1b08..4f8edeb9ce4 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2020/02/18 08:05:16 gonzalo Exp $
+# $OpenBSD: Makefile,v 1.30 2020/04/25 10:07:42 ajacoutot Exp $
 
 COMMENT =	high performance network IDS, IPS and security monitoring
 
@@ -27,11 +27,11 @@ WANTLIB +=	ssl3 yaml-0 z
 MODULES =	lang/python
 MODPY_VERSION =	${MODPY_DEFAULT_VERSION_3}
 
-BUILD_DEPENDS =	textproc/py-sphinx,python3 \
-		textproc/py-yaml,python3 \
+BUILD_DEPENDS =	textproc/py-sphinx${MODPY_FLAVOR} \
+		textproc/py-yaml${MODPY_FLAVOR} \
 		lang/rust
 
-RUN_DEPENDS =	textproc/py-yaml,python3
+RUN_DEPENDS =	textproc/py-yaml${MODPY_FLAVOR}
 
 LIB_DEPENDS =	archivers/lz4 \
 		archivers/xz \
diff --git a/x11/gnome/shell/Makefile b/x11/gnome/shell/Makefile
index 2af61b9cf43..6fcf1a0964c 100644
--- a/x11/gnome/shell/Makefile
+++ b/x11/gnome/shell/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.186 2020/03/31 10:48:37 jasper Exp $
+# $OpenBSD: Makefile,v 1.187 2020/04/25 10:07:42 ajacoutot Exp $
 
 USE_WXNEEDED=		Yes
 
@@ -62,7 +62,7 @@ RUN_DEPENDS +=		x11/gnome/caribou
 RUN_DEPENDS +=		sysutils/consolekit
 
 # gnome-shell-extension-tool, gnome-shell-perf-tool
-RUN_DEPENDS +=		devel/py-gobject3,python3
+RUN_DEPENDS +=		devel/py-gobject3${MODPY_FLAVOR}
 
 # Don't depend on evolution to lower down the amount of dependencies and
 # because most users want to be able to choose their PIM. Evolution can