diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index b656f81d0a7d..b0f9f3699612 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -1,108 +1,110 @@
 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
 PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
 WWW=		https://www.mesa3d.org/
 
 LIB_DEPENDS+=	libglapi.so:graphics/mesa-libs
 
 USES+=		llvm:lib,noexport
 
 OPTIONS_GROUP=			PLATFORM
 OPTIONS_GROUP_PLATFORM=		X11 WAYLAND
 X11_DESC=			Enable X11 support for GBM/EGL
 WAYLAND_DESC=			Enable Wayland support for GBM/EGL and Vulkan
 WAYLAND_BUILD_DEPENDS=		wayland-protocols>=1.8:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=		libwayland-client.so:graphics/wayland
 
 OPTIONS_DEFINE=		ZSTD
 OPTIONS_DEFAULT=	WAYLAND X11 ZSTD
 OPTIONS_SUB=		yes
 
 ZSTD_DESC=		Use ZSTD for shader cache
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_MESON_ENABLED=	zstd
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
 ALL_GALLIUM_DRIVERS=	CROCUS I915 IRIS PANFROST R300 R600 RADEONSI SVGA \
 			SWRAST ZINK
 ALL_VULKAN_DRIVERS=	INTEL AMD SWRAST
 
 GALLIUM_DRIVERS+=	SWRAST \
 			ZINK
 VULKAN_DRIVERS+=	SWRAST	# lavapipe
 
 .if ${ARCH} == aarch64
 GALLIUM_DRIVERS+=	PANFROST
 .endif
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 \
  || ${ARCH:Mpowerpc*} || ${ARCH} == riscv64
 GALLIUM_DRIVERS+=	R300 R600 RADEONSI
 VULKAN_DRIVERS+=	AMD
 BUILD_DEPENDS+=		glslangValidator:graphics/glslang
 .endif
 .if ${ARCH} == amd64 || ${ARCH} == i386
 GALLIUM_DRIVERS+=	CROCUS I915 IRIS SVGA
 VULKAN_DRIVERS+=	INTEL
 .endif
 
 LDFLAGS_i386=		-Wl,-znotext
 
 .if ${PORT_OPTIONS:MX11}
 MESA_PLATFORMS+=	x11
 USE_XORG+=		xcb xorgproto xrandr x11 xdamage xext xfixes xshmfence xv
+.else
+MESON_ARGS+=		-Dxlib-lease=disabled
 .endif
 
 .if ${PORT_OPTIONS:MWAYLAND}
 MESA_PLATFORMS+=	wayland
 .endif
 
 MESON_ARGS+=	-Dgallium-drivers="${GALLIUM_DRIVERS:ts,:tl}" \
 		-Dvulkan-drivers="${VULKAN_DRIVERS:ts,:tl}" \
 		-Dplatforms="${MESA_PLATFORMS:ts,:tl}"
 
 # Vulkan Video extensions (keep in sync with mesa-gallium-va)
 MESON_ARGS+=	-Dvideo-codecs="vc1dec,h264dec,h264enc,h265dec,h265enc,av1dec,av1enc,vp9dec"
 
 # Disable some options
 MESON_ARGS+=	-Dandroid-libbacktrace=disabled \
 		-Dgallium-xa=disabled \
 		-Dgallium-vdpau=disabled \
 		-Dgallium-va=disabled \
 		-Dgles1=enabled \
 		-Dgles2=enabled \
 		-Dglx=disabled \
 		-Degl=enabled \
 		-Dlmsensors=disabled \
 		-Dmicrosoft-clc=disabled \
 		-Dosmesa=false \
 		-Dvalgrind=disabled
 
 .for _gd in ${ALL_GALLIUM_DRIVERS}
 . if defined(GALLIUM_DRIVERS) && ${GALLIUM_DRIVERS:M${_gd}}
 PLIST_SUB+=	${_gd}_GDRIVER=""
 . else
 PLIST_SUB+=	${_gd}_GDRIVER="@comment "
 . endif
 .endfor
 
 PLIST_SUB += ARCH=${ARCH:S/amd/x86_/}
 .for _vd in ${ALL_VULKAN_DRIVERS}
 . if defined(VULKAN_DRIVERS) && ${VULKAN_DRIVERS:M${_vd}}
 PLIST_SUB+=	${_vd}_VDRIVER=""
 . else
 PLIST_SUB+=	${_vd}_VDRIVER="@comment "
 . endif
 .endfor
 
 post-install:
 	@${RM} -r ${STAGEDIR}/etc/OpenCL
 	${INSTALL_DATA} ${FILESDIR}/01-freebsd.conf \
 		${STAGEDIR}${PREFIX}/share/drirc.d
 
 .include <bsd.port.post.mk>
diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
index c1e04551a089..e2d8f3f8e860 100644
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -1,80 +1,80 @@
 PORTNAME=	mesa-libs
 PORTVERSION=	${MESAVERSION}
 PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL libraries that support GLX and EGL clients
 WWW=		https://www.mesa3d.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/docs/license.rst
 
 USES=		llvm:noexport
 
 BUILD_DEPENDS=	libglvnd>=0:graphics/libglvnd
 
 OPTIONS_GROUP=		PLATFORM
 OPTIONS_GROUP_PLATFORM=	X11 WAYLAND
 X11_DESC=		Enable X11 support for GBM/EGL
 WAYLAND_DESC=		Enable Wayland support for GBM/EGL
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.8:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-server.so:graphics/wayland
 
 OPTIONS_DEFINE=		ZSTD
 OPTIONS_DEFAULT=	WAYLAND X11 ZSTD
 OPTIONS_SUB=		yes
 
 ZSTD_DESC=		Use ZSTD for shader cache
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_MESON_ENABLED=	zstd
 
 USE_LDCONFIG=		yes
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
 MESON_ARGS+=	-Dandroid-libbacktrace=disabled \
 		-Dgallium-vdpau=disabled \
 		-Dgallium-omx=disabled \
 		-Dgallium-va=disabled \
 		-Dgallium-xa=disabled \
 		-Dgallium-nine=false \
 		-Dlmsensors=disabled \
 		-Dmicrosoft-clc=disabled \
 		-Dosmesa=false \
 		-Dtools="" \
 		-Dvalgrind=disabled \
 		-Degl=enabled \
 		-Dgbm=enabled \
 		-Dvulkan-drivers="" \
 		-Dglvnd=true
 # Building EGL and GBM requires a driver so add r300
 MESON_ARGS+=	-Dgallium-drivers="r300"
 
 .if ${PORT_OPTIONS:MX11}
 MESA_PLATFORMS+=	x11
 USE_XORG+=		xorgproto x11 xcb xdamage xext \
 			xfixes xshmfence xxf86vm xrandr
 PLIST_SUB+=		GLX=""
 .else
-MESON_ARGS+=	-Dglx=disabled
+MESON_ARGS+=	-Dglx=disabled -Dxlib-lease=disabled
 PLIST_SUB+=	GLX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MWAYLAND}
 MESA_PLATFORMS+=	wayland
 .endif
 
 MESON_ARGS+=	-Dplatforms="${MESA_PLATFORMS:ts,:tl}"
 
 .if ${ARCH} == "i386"
 # PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set
 LDFLAGS+=-Wl,-z,notext
 .endif
 
 post-install:
 # Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist
 	@${ECHO_CMD} "libGLX_indirect.so.0 libGLX_mesa.so.0" \
 		>${STAGEDIR}${PREFIX}/etc/libmap.d/mesa.conf
 
 .include <bsd.port.post.mk>