diff --git a/devel/muon/Makefile b/devel/muon/Makefile
index b4c2c66cf162..d1a7a374992a 100644
--- a/devel/muon/Makefile
+++ b/devel/muon/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	muon
 DISTVERSION=	0.3.1
 CATEGORIES=	devel
 MASTER_SITES=	https://git.sr.ht/~lattis/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Build system compatible with meson
 WWW=		https://muon.build/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-3.0-only.txt
 
 BUILD_DEPENDS=	scdoc:textproc/scdoc
 
 USES=		ninja pkgconfig:both
 
 BUILD_WRKSRC=	${WRKSRC}/_build
 INSTALL_WRKSRC=	${WRKSRC}/_build
 
 ALL_TARGET=
 PLIST_FILES=	bin/muon \
 		share/man/man1/muon.1.gz \
 		share/man/man5/meson.build.5.gz
 USE_CSTD=	c99
 CFLAGS+=	-D__XSI_VISIBLE=1
 CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
 
-post-patch:
-# this confuses some of the FreeBSD configure targets
-	@${RM} -r ${WRKSRC}/tests/project/common
-
 do-configure:
 	@(cd ${WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${SH} bootstrap.sh . && \
-		./muon setup -Dlibcurl=disabled -Dlibarchive=disabled ${BUILD_WRKSRC})
+		${SETENV} ${CONFIGURE_ENV} ./muon setup \
+			-Dlibcurl=disabled \
+			-Dlibarchive=disabled \
+			-Dtracy=disabled \
+			${BUILD_WRKSRC})
 
 do-install:
 	@(${SETENV} ${MAKE_ENV} ${BUILD_WRKSRC}/muon -C ${BUILD_WRKSRC} install)
 
 .include <bsd.port.mk>
diff --git a/devel/muon/files/patch-tests_project_meson.build b/devel/muon/files/patch-tests_project_meson.build
new file mode 100644
index 000000000000..e64500e59d93
--- /dev/null
+++ b/devel/muon/files/patch-tests_project_meson.build
@@ -0,0 +1,12 @@
+--- tests/project/meson.build.orig	2024-10-07 15:19:19 UTC
++++ tests/project/meson.build
+@@ -401,8 +401,8 @@ endif
+     endif
+ endif
+ 
++meson_tests_dir = meson.current_source_dir() / 'meson-tests'
+ if git.found()
+-    meson_tests_dir = meson.current_source_dir() / 'meson-tests'
+     meson_tests_sha = '1e565931348f15f3f9b654f46ab4bf5fa009ca4f'
+ 
+     if not fs.is_dir(meson_tests_dir)