Index: devel/meson-python/Makefile
===================================================================
--- devel/meson-python/Makefile
+++ devel/meson-python/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	meson-python
 DISTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,9 +13,9 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	meson:devel/meson@${PY_FLAVOR} \
+BUILD_DEPENDS=	meson-${PYTHON_VER}:devel/meson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproject-metadata>=0.6.1:devel/py-pyproject-metadata@${PY_FLAVOR}
-RUN_DEPENDS=	meson:devel/meson@${PY_FLAVOR} \
+RUN_DEPENDS=	meson-${PYTHON_VER}:devel/meson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproject-metadata>=0.6.1:devel/py-pyproject-metadata@${PY_FLAVOR}
 
 USES=		python
@@ -33,4 +34,10 @@
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR}
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e "s|'meson'|'meson-${PYTHON_VER}'|g" \
+		${WRKSRC}/mesonpy/__init__.py \
+		${WRKSRC}/tests/test_project.py \
+		${WRKSRC}/tests/test_wheel.py
+
 .include <bsd.port.post.mk>
Index: devel/meson/Makefile
===================================================================
--- devel/meson/Makefile
+++ devel/meson/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	meson
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/
 
@@ -13,7 +14,7 @@
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR}
 
 USES=		ninja:run python:3.6+ shebangfix
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
 SHEBANG_FILES=	mesonbuild/rewriter.py \
 		mesonbuild/scripts/cmake_run_ctgt.py
 NO_ARCH=	yes
Index: devel/meson/files/patch-setup.py
===================================================================
--- devel/meson/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2021-04-27 06:49:45 UTC
-+++ setup.py
-@@ -25,7 +25,7 @@ from setuptools import setup
- data_files = []
- if sys.platform != 'win32':
-     # Only useful on UNIX-like systems
--    data_files = [('share/man/man1', ['man/meson.1']),
-+    data_files = [('man/man1', ['man/meson.1']),
-                   ('share/polkit-1/actions', ['data/com.mesonbuild.install.policy'])]
- 
- setup(data_files=data_files,)