diff --git a/audio/ffmpeg-normalize/Makefile b/audio/ffmpeg-normalize/Makefile
index eb60f0f8476..777ffc548a0 100644
--- a/audio/ffmpeg-normalize/Makefile
+++ b/audio/ffmpeg-normalize/Makefile
@@ -23,7 +23,4 @@ RUN_DEPENDS =		devel/py-colorama \
 			devel/py-tqdm \
 			graphics/ffmpeg
 
-pre-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/devel/automake/Makefile.inc b/devel/automake/Makefile.inc
index ceef3ec04a8..b50ac2f27ed 100644
--- a/devel/automake/Makefile.inc
+++ b/devel/automake/Makefile.inc
@@ -49,9 +49,6 @@ TEST_DEPENDS +=		${BASE_PKGPATH} \
 			devel/bison \
 			emacs->=24:editors/emacs \
 			devel/dejagnu
-
-pre-test:
-	@ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 .endif
 
 do-test:
diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 13dc461d306..b0c472c6707 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -37,9 +37,6 @@ MODPY_RUNDEP =		No
 
 USE_GMAKE =		Yes
 
-pre-configure:
-	ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
-
 post-build:
 	cd ${WRKSRC} && \
 	${PREFIX}/bin/xsltproc --novalid --nonet --param man.charmap.use.subset "0" \
diff --git a/devel/git-cola/Makefile b/devel/git-cola/Makefile
index 054f3f7660a..31741f82ed4 100644
--- a/devel/git-cola/Makefile
+++ b/devel/git-cola/Makefile
@@ -29,7 +29,4 @@ TEST_DEPENDS=	devel/py-mock
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/cola/app.py
 
-pre-test:
-	ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/devel/gyp/Makefile b/devel/gyp/Makefile
index 13a34fdcee0..7e7bf893ae8 100644
--- a/devel/gyp/Makefile
+++ b/devel/gyp/Makefile
@@ -22,7 +22,6 @@ pre-configure:
 	${SUBST_CMD} ${WRKSRC}/gyp
 
 pre-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
 	# tests temporarily toggle write permissions, but this disrupts `make clean'.
 	# avoid toggling altogether.
 .for l in default all
diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index 097a25ef3f5..5592f94b2fb 100644
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@@ -59,7 +59,4 @@ pre-build:
 	${SUBST_CMD} ${WRKBUILD}/tests/test_interactiveshell.py
 	${SUBST_CMD} ${WRKBUILD}/examples/IPython\ Kernel/ipython.desktop
 
-pre-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/devel/meson/Makefile b/devel/meson/Makefile
index a3ea9078d62..4a766c16ee3 100644
--- a/devel/meson/Makefile
+++ b/devel/meson/Makefile
@@ -65,13 +65,11 @@ pre-configure:
 # gfortran: test_fortran_compiler; XXX hardcoded
 # XXX test_fortran_compiler ... skipped 'No alternate Fortran implementation.'
 # javac: test_java_compiler; XXX hardcoded
-# python: test cases/unit/46 native file binary
 do-test:
 	ln -sf ${LOCALBASE}/jdk-11/bin/javac ${WRKDIR}/bin/javac
 	ln -sf ${LOCALBASE}/bin/egfortran ${WRKDIR}/bin/gfortran
-	ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 	ln -sf ${LOCALBASE}/bin/clang-format-${MODCLANG_VERSION} ${WRKDIR}/bin/clang-format
-	cd ${WRKSRC} && PATH=${PORTPATH} LC_CTYPE="en_US.UTF-8" \
+	cd ${WRKSRC} && PATH=${PORTPATH} LC_CTYPE="en_US.UTF-8" ${MODPY_BIN} \
 		./run_tests.py --failfast
 
 post-install:
diff --git a/devel/py-argcomplete/Makefile b/devel/py-argcomplete/Makefile
index 46ec65310cf..41785d9414f 100644
--- a/devel/py-argcomplete/Makefile
+++ b/devel/py-argcomplete/Makefile
@@ -24,7 +24,6 @@ TEST_DEPENDS=	${FULLPKGNAME}:${BUILD_PKGPATH} \
 		shells/zsh
 
 do-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
 	cd ${WRKSRC}; ${SETENV} ${ALL_TEST_ENV} make test
 
 .include <bsd.port.mk>
diff --git a/devel/py-flit/Makefile b/devel/py-flit/Makefile
index 9d51f6e5dde..30cc6eacab3 100644
--- a/devel/py-flit/Makefile
+++ b/devel/py-flit/Makefile
@@ -33,7 +33,4 @@ MODPY_PYTEST_ARGS= -k 'not test_install_data_dir \
 		and not test_symlink_data_dir \
 		and not test_symlink_module_pep621'
 
-pre-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/devel/py-multiprocess/Makefile b/devel/py-multiprocess/Makefile
index 45c305c370b..6cd54388eaa 100644
--- a/devel/py-multiprocess/Makefile
+++ b/devel/py-multiprocess/Makefile
@@ -1,29 +1,28 @@
-COMMENT =		better multiprocessing and multithreading in python
+COMMENT=	better multiprocessing and multithreading in python
 
-MODPY_DISTV =	0.70.13
-DISTNAME =		multiprocess-${MODPY_DISTV}
-PKGNAME =		py-${DISTNAME}
-CATEGORIES =		devel
-REVISION =		3
+MODPY_DISTV=	0.70.13
+DISTNAME=	multiprocess-${MODPY_DISTV}
+PKGNAME=	py-${DISTNAME}
+CATEGORIES=	devel
+REVISION=	3
 
-HOMEPAGE =		https://github.com/uqfoundation/multiprocess
+HOMEPAGE=	https://github.com/uqfoundation/multiprocess
 
-MAINTAINER =		Paul Irofti <paul@irofti.net>
+MAINTAINER=	Paul Irofti <paul@irofti.net>
 
 # Apache v2
-PERMIT_PACKAGE =	Yes
+PERMIT_PACKAGE=	Yes
 
-MODULES =		lang/python
+MODULES=	lang/python
 
-RUN_DEPENDS =		devel/py-dill
+RUN_DEPENDS=	devel/py-dill
 
-MODPY_PI =		Yes
-MODPY_PYBUILD =		setuptools
+MODPY_PI=	Yes
+MODPY_PYBUILD=	setuptools
 
-TEST_DEPENDS =		${MODPY_RUN_DEPENDS},-tests
+TEST_DEPENDS=	${MODPY_RUN_DEPENDS},-tests
 
 do-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
 	cd ${WRKSRC}; ${SETENV} ${ALL_TEST_ENV} ${MODPY_BIN} -m multiprocess.tests
 
 .include <bsd.port.mk>
diff --git a/devel/py-pexpect/Makefile b/devel/py-pexpect/Makefile
index c8f6d50298e..6086d7cdd34 100644
--- a/devel/py-pexpect/Makefile
+++ b/devel/py-pexpect/Makefile
@@ -21,13 +21,8 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	shells/bash \
 		sysutils/coreutils
 
-#MODPY_ADJ_FILES= tests/fakessh/ssh
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-pexpect
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/py-pexpect
 
-pre-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/devel/py-setuptools_scm/Makefile b/devel/py-setuptools_scm/Makefile
index adf2acbfd24..f7cf3752597 100644
--- a/devel/py-setuptools_scm/Makefile
+++ b/devel/py-setuptools_scm/Makefile
@@ -26,7 +26,4 @@ TEST_DEPENDS=	${FULLPKGNAME}:${FULLPKGPATH} \
 		devel/py-pip \
 		devel/py-test-timeout
 
-pre-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/devel/shrinkray/Makefile b/devel/shrinkray/Makefile
index 2e8c42d4068..c4056a5492f 100644
--- a/devel/shrinkray/Makefile
+++ b/devel/shrinkray/Makefile
@@ -35,11 +35,4 @@ TEST_DEPENDS=	devel/py-hypothesis \
 		math/minisat \
 		textproc/py-black
 
-# Tests expect the python interpreter to be `python`.
-#
-# PR raised upstream, so hopefully this can go next time we update the port:
-# https://github.com/DRMacIver/shrinkray/pull/17
-pre-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index d8ac97324da..d43b0e7b570 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -185,9 +185,6 @@ TEST_DEPENDS=${MODPY_RUN_DEPENDS}
 TEST_DEPENDS+=	${FULLPKGNAME-gnome-keyring}:${BUILD_PKGPATH},-gnome-keyring
 SUBST_VARS+=	LOCALBASE SO_VERSION MODRUBY_BINREV
 
-pre-patch:
-	@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
-
 post-patch:
 	@${SUBST_CMD} ${WRKSRC}/Makefile.in \
 		${WRKSRC}/subversion/libsvn_subr/auth.c
diff --git a/games/0ad/base/Makefile b/games/0ad/base/Makefile
index e5dda3ca796..387ce7e2e14 100644
--- a/games/0ad/base/Makefile
+++ b/games/0ad/base/Makefile
@@ -69,8 +69,6 @@ CONFIGURE_ARGS +=	-j${MAKE_JOBS} \
 WRKSRC =		${WRKDIST}/build/workspaces/gcc
 
 do-build:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python3 # ensure correct version binary is used
-
 	cd ${WRKDIST}/libraries && \
 		${SETENV} CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
 		CXXFLAGS="${CXXFLAGS}" SO_VERSION="${SO_VERSION}" \
diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index aadd35a2e65..d99fc017c2e 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -34,9 +34,6 @@ RUN_DEPENDS =		${MODPY_TKINTER_DEPENDS} \
 			games/pysol-cards \
 			graphics/py-Pillow
 
-pre-test:
-	ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
-
 post-install:
 	mv ${PREFIX}/bin/pysol{.py,}
 	mv ${WRKDIR}/PySolFC-Cardsets-${V_CARDSETS}/* ${PREFIX}/share/PySolFC/
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 7d41157de79..f5855510209 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -85,10 +85,8 @@ pre-configure:
 	sed -i -e 's,/usr/bin/env python3,${MODPY_BIN},g' \
 		${WRKSRC}/mono/tests/gc-descriptors/gen-descriptor-tests.py
 
-
 	@ln -fs /usr/local/bin/bash ${WRKDIR}/bin/bash
 	@ln -fs /usr/local/bin/gawk ${WRKDIR}/bin/gawk
-	@ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
 
 # Force using the internal mcs compiler
 pre-build:
diff --git a/mail/kopano/core/Makefile b/mail/kopano/core/Makefile
index 907f6e84d40..17b406f17ca 100644
--- a/mail/kopano/core/Makefile
+++ b/mail/kopano/core/Makefile
@@ -150,7 +150,6 @@ SUB_SCRIPTS=	createcompany.d/00createpublic groups_common.sh \
 SUBST_VARS+=	V
 
 post-patch:
-	ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 	ln -sf ${LOCALBASE}/bin/gcp ${WRKDIR}/bin/cp
 	ln -sf ${LOCALBASE}/bin/gmv ${WRKDIR}/bin/mv
 
diff --git a/net/libpsl/Makefile b/net/libpsl/Makefile
index 430e6d7fe26..f92bc651bb5 100644
--- a/net/libpsl/Makefile
+++ b/net/libpsl/Makefile
@@ -36,7 +36,4 @@ CONFIGURE_ARGS +=	--enable-builtin=libidn2 \
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
 
-pre-configure:
-	@ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index adf8492e7d6..f23b3792c03 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -45,9 +45,6 @@ CONFIGURE_ARGS+=	--without-glib \
 			--without-gtk
 .endif
 
-pre-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
-
 post-extract:
 	printf '#!/bin/sh\necho -n ${GH_TAGNAME:S/v//}\n' > ${WRKSRC}/build-aux/git-version-gen
 
diff --git a/security/botan2/Makefile b/security/botan2/Makefile
index 28effe1a635..85d555cfba4 100644
--- a/security/botan2/Makefile
+++ b/security/botan2/Makefile
@@ -59,7 +59,6 @@ SUBST_VARS =		CXX CXXFLAGS LIBbotan-2_VERSION
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/src/build-data/os/openbsd.txt
 	${SUBST_CMD} ${WRKSRC}/src/tests/main.cpp
-	ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 
 do-test:
 	LD_LIBRARY_PATH=${WRKBUILD} ${WRKBUILD}/botan-test \
diff --git a/security/py-in-toto/Makefile b/security/py-in-toto/Makefile
index 2224f311934..73a8cd82e32 100644
--- a/security/py-in-toto/Makefile
+++ b/security/py-in-toto/Makefile
@@ -26,7 +26,4 @@ RUN_DEPENDS =		devel/py-attrs \
 			security/py-securesystemslib \
 			textproc/py-iso8601
 
-pre-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/security/py-securesystemslib/Makefile b/security/py-securesystemslib/Makefile
index e6cd638e229..82ad23a19d2 100644
--- a/security/py-securesystemslib/Makefile
+++ b/security/py-securesystemslib/Makefile
@@ -25,7 +25,4 @@ RUN_DEPENDS =		devel/py-colorama \
 			security/py-cryptography \
 			security/py-PyNaCl
 
-pre-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/sysutils/borgmatic/Makefile b/sysutils/borgmatic/Makefile
index 9e6a068ba12..81d916984b8 100644
--- a/sysutils/borgmatic/Makefile
+++ b/sysutils/borgmatic/Makefile
@@ -39,7 +39,4 @@ post-install:
 	    ${PREFIX}/bin/borgmatic config generate \
 	    --destination ${PREFIX}/share/examples/borgmatic/config.yaml.dist
 
-pre-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/sysutils/librelp/Makefile b/sysutils/librelp/Makefile
index 0ab9a077e0a..75af49dec09 100644
--- a/sysutils/librelp/Makefile
+++ b/sysutils/librelp/Makefile
@@ -35,7 +35,6 @@ post-extract:
 	sed -i s,#!/bin/bash,#!${LOCALBASE}/bin/bash, ${WRKSRC}/tests/*.sh
 
 pre-test:
-	ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 	ln -sf ${LOCALBASE}/bin/gtimeout ${WRKDIR}/bin/timeout
 	ln -sf ${LOCALBASE}/bin/ggrep ${WRKDIR}/bin/grep
 	ln -sf ${LOCALBASE}/bin/ghead ${WRKDIR}/bin/head
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 37b05aad160..61b9b3cf370 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -127,7 +127,6 @@ NO_TEST=		Yes
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/conf/upssched.conf.sample.in
-	-ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nut
diff --git a/sysutils/py-ansible-compat/Makefile b/sysutils/py-ansible-compat/Makefile
index dc27fb2dcec..e6bc4319733 100644
--- a/sysutils/py-ansible-compat/Makefile
+++ b/sysutils/py-ansible-compat/Makefile
@@ -26,7 +26,4 @@ TEST_DEPENDS=	${FULLPKGNAME}:${BUILD_PKGPATH} \
 		devel/py-test-instafail \
 		devel/py-test-mock
 
-pre-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/telephony/pjsua/Makefile b/telephony/pjsua/Makefile
index 2ec606a0a57..70ed36f5a22 100644
--- a/telephony/pjsua/Makefile
+++ b/telephony/pjsua/Makefile
@@ -103,7 +103,4 @@ post-install:
 	rm ${PREFIX}/lib/*.so ${PREFIX}/lib/*-openbsd.a
 	${INSTALL_PROGRAM} ${WRKSRC}/pjsip-apps/bin/pjsua* ${PREFIX}/bin/pjsua
 
-pre-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/textproc/cdiff/Makefile b/textproc/cdiff/Makefile
index 321220159b6..ac60d78c60c 100644
--- a/textproc/cdiff/Makefile
+++ b/textproc/cdiff/Makefile
@@ -30,7 +30,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.rst ${PREFIX}/share/doc/ydiff/
 
 pre-test:
-	ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 	ln -sf ${LOCALBASE}/bin/rst2html ${WRKDIR}/bin/rst2html.py
 	ln -sf ${LOCALBASE}/bin/pycodestyle ${WRKDIR}/bin/pep8
 	ln -sf ${LOCALBASE}/bin/coverage-${MODPY_VERSION} ${WRKDIR}/bin/coverage
diff --git a/textproc/py-smartypants/Makefile b/textproc/py-smartypants/Makefile
index 001429622e1..fe7ac5deeda 100644
--- a/textproc/py-smartypants/Makefile
+++ b/textproc/py-smartypants/Makefile
@@ -16,7 +16,4 @@ MODPY_PYBUILD=	setuptools
 
 TEST_DEPENDS=	textproc/py-docutils
 
-pre-test:
-	ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/textproc/txt2tags/Makefile b/textproc/txt2tags/Makefile
index 9a338222572..21a0136fedb 100644
--- a/textproc/txt2tags/Makefile
+++ b/textproc/txt2tags/Makefile
@@ -36,7 +36,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/samples/module/* ${EXAMPLESDIR}/module
 
 do-test:
-	ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
 	cd ${WRKSRC}; PATH=${WRKSRC}:${PORTPATH} ./test/run.py
 
 .include <bsd.port.mk>
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 9edc0147af0..47aba53855a 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -273,7 +273,6 @@ pre-patch:
 		pax -rw -s '/^.*${PATCHORIG}$$//' . ${WRKSRC}/third_party/libvpx/source/libvpx
 
 post-patch:
-	@ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 	@ln -sf ${LOCALBASE}/bin/llvm-ar-${MODCLANG_VERSION} ${WRKDIR}/bin/ar
 	@mkdir -p ${WRKSRC}/third_party/node/openbsd/node-openbsd/bin \
 		${WRKSRC}/third_party/rust-toolchain/bin
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index 4618c1fd3d2..507ba3d0598 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -251,7 +251,6 @@ pre-patch:
 		pax -rw -s '/^.*${PATCHORIG}$$//' . ${WRKSRC}/third_party/libvpx/source/libvpx
 
 post-patch:
-	@ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 	@ln -sf ${LOCALBASE}/bin/llvm-ar-${MODCLANG_VERSION} ${WRKDIR}/bin/ar
 	@mkdir -p ${WRKSRC}/third_party/node/openbsd/node-openbsd/bin \
 		${WRKSRC}/third_party/rust-toolchain/bin
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 64180a31f6d..a4a06cc63a2 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -280,7 +280,6 @@ pre-patch:
 		pax -rw -s '/^.*${PATCHORIG}$$//' . ${WRKSRC}/third_party/libvpx/source/libvpx 
 
 post-patch:
-	@ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 	@ln -sf ${LOCALBASE}/bin/llvm-ar-${MODCLANG_VERSION} ${WRKDIR}/bin/ar
 	@mkdir -p ${WRKSRC}/third_party/node/openbsd/node-openbsd/bin \
 		${WRKSRC}/third_party/rust-toolchain/bin \
diff --git a/x11/gnome/keyring/Makefile b/x11/gnome/keyring/Makefile
index e2ad6ca5276..e86f922a074 100644
--- a/x11/gnome/keyring/Makefile
+++ b/x11/gnome/keyring/Makefile
@@ -1,7 +1,7 @@
 # XXX should be a RUN_DEPENDS of x11/gnome/libsecret but that would create
-# dependency loops:                                                
-# libsecret -> gnome-keyring -> pinentry -> libsecret                           
-# libsecret -> gnome-keyring -> gcr -> gnupg -> pinentry -> gcr                
+# dependency loops:
+# libsecret -> gnome-keyring -> pinentry -> libsecret
+# libsecret -> gnome-keyring -> gcr -> gnupg -> pinentry -> gcr
 
 COMMENT=		password agent for the GNOME project
 
@@ -55,7 +55,4 @@ MODPY_ADJ_FILES=	build/tap-driver
 # couldn't connect to dbus session bus: Cannot autolaunch D-Bus without X11 $DISPLAY
 TEST_IS_INTERACTIVE=	x11
 
-pre-test:
-	ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/x11/qt5/qtdeclarative/Makefile b/x11/qt5/qtdeclarative/Makefile
index ac55429b814..d153d14e4b7 100644
--- a/x11/qt5/qtdeclarative/Makefile
+++ b/x11/qt5/qtdeclarative/Makefile
@@ -56,8 +56,6 @@ MODQT5_DEPS =		No
 MODQMAKE_RECURSIVE =	No
 
 pre-configure:
-# Python is used for building, this path does not get into final packages.
-	ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 	${QT5_GEN_INCLUDES}
 
 .include <bsd.port.mk>
diff --git a/x11/qt5/qtwebengine/Makefile b/x11/qt5/qtwebengine/Makefile
index c34ec288a13..69cd97797b1 100644
--- a/x11/qt5/qtwebengine/Makefile
+++ b/x11/qt5/qtwebengine/Makefile
@@ -105,7 +105,6 @@ CHROMESRC =	${WRKDIST}/src/3rdparty/chromium
 # most of these would fit better in post-extract, but between
 # DIST_TUPLE and ../Makefile.inc that's complicated
 pre-configure:
-	ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 .for _arch in x64 ia32 arm64
 	mkdir -p ${CHROMESRC}/third_party/ffmpeg/chromium/config/Chrome/openbsd/${_arch}
 .  for _dir in avcodec avformat avutil
diff --git a/x11/qt6/qtdeclarative/Makefile b/x11/qt6/qtdeclarative/Makefile
index b2a47d7f6fb..a4a847a3182 100644
--- a/x11/qt6/qtdeclarative/Makefile
+++ b/x11/qt6/qtdeclarative/Makefile
@@ -80,8 +80,4 @@ PROGRAMS6 =	qml qmldom qmleasing qmlformat qmllint qmlls qmlplugindump \
 		qmlpreview qmlprofiler qmlscene qmltc qmltestrunner qmltime \
 		svgtoqml
 
-pre-configure:
-# Python is used for building, this path does not get into final packages.
-	ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
-
 .include <bsd.port.mk>
diff --git a/x11/qt6/qtwebengine/Makefile b/x11/qt6/qtwebengine/Makefile
index 130c221754d..21d25fb664b 100644
--- a/x11/qt6/qtwebengine/Makefile
+++ b/x11/qt6/qtwebengine/Makefile
@@ -152,7 +152,6 @@ FFMPEG_BDIR=	${CHROMESRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.openbsd/${FF
 FFMPEG_CDIR=	${CHROMESRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/openbsd/${FFMPEG_TARGET}
 
 post-patch:
-	@ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 	@mkdir -p ${CHROMESRC}/third_party/node/openbsd/node-openbsd/bin
 	@ln -sf ${TRUEPREFIX}/bin/node ${CHROMESRC}/third_party/node/openbsd/node-openbsd/bin/node
 	${SUBST_CMD} ${CHROMESRC}/build/gn_run_binary.py \