diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 8c0e2c9f9de5..0a609a5af596 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -1,145 +1,146 @@
 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
 WWW=		https://www.mesa3d.org/
 
 BUILD_DEPENDS+=	glslangValidator:graphics/glslang \
 		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
 		libva>=0:multimedia/libva
 LIB_DEPENDS+=	libgallium-${MESAVERSION}.so:graphics/mesa-libs \
 		libgbm.so:graphics/mesa-libs
 
 USES+=		llvm:lib,noexport
 
+GALLIUM_DRIVERS=	zink
+
 OPTIONS_DEFINE=		ZSTD
 OPTIONS_GROUP=		GALLIUM PLATFORM VULKAN
 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
 
 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_GROUP_GALLIUM=	crocus i915 iris llvmpipe panfrost r300 r600 radeonsi svga zink
+OPTIONS_GROUP_GALLIUM=	crocus i915 iris llvmpipe panfrost r300 r600 radeonsi svga
 GALLIUM_DESC=		Unified OpenGL drivers
 crocus_DESC=		Intel GPU Gen4 (Broadwater) to Gen7 (Haswell)
 crocus_BUILD_DEPENDS=	libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T}
 i915_DESC=		Intel GPU Gen3 (Grantsdale to Pineview)
 iris_DESC=		Intel GPU Gen8 (Broadwell) and newer
 iris_BUILD_DEPENDS=	libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} \
 			spirv-tools>0:graphics/spirv-tools \
 			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
 iris_RUN_DEPENDS=	spirv-tools>0:graphics/spirv-tools \
 			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
 iris_IMPLIES=		SPIRV
 llvmpipe_DESC=		Software Rasterizer
 panfrost_DESC=		ARM Midgard and Bifrost
 panfrost_BUILD_DEPENDS=	libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T}
 r300_DESC=		AMD/ATI R300, R400 and R500
 r600_DESC=		AMD/ATI R600, R700, Evergreen, Northern Islands
 radeonsi_DESC=		AMD/ATI Southern Islands and newer
 svga_DESC=		VMWare Virtual GPU
-zink_DESC=		OpenGL on top of Khronos’ Vulkan API
 
-OPTIONS_EXCLUDE+=	${ARCH:Marmv7:C/.+/crocus i915 iris panfrost r300 r600 radeonsi svga zink/}
+OPTIONS_EXCLUDE+=	${ARCH:Marmv7:C/.+/crocus i915 iris panfrost r300 r600 radeonsi svga/}
 OPTIONS_EXCLUDE+=	${ARCH:Naarch64:C/.+/panfrost/}
 OPTIONS_EXCLUDE+=	${ARCH:Namd64:Ni386:Nx86_64:C/.+/crocus i915 iris svga/}
 MESON_ARGS+=		-Dgallium-drivers=${GALLIUM_DRIVERS:ts,}
 . for _gd in ${OPTIONS_GROUP_GALLIUM}
 OPTIONS_DEFAULT+=	${_gd}
 ${_gd}_VARS+=		GALLIUM_DRIVERS+=${_gd}
 . endfor
 
 OPTIONS_GROUP_VULKAN=	anv radv swrast_vk
 VULKAN_DESC=		Vulkan drivers
 anv_DESC=		Intel GPU Gen9 and newer Vulkan support
 anv_BUILD_DEPENDS=	libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} \
 			spirv-tools>0:graphics/spirv-tools \
 			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
 anv_RUN_DEPENDS=	spirv-tools>0:graphics/spirv-tools \
 			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
 radv_DESC=		AMD/ATI Southern Islands and newer Vulkan support
 swrast_vk_DESC=		Software Rasterizer Vulkan support
 
 OPTIONS_EXCLUDE+=	${ARCH:Marmv7:C/.+/anv radv/}
 OPTIONS_EXCLUDE+=	${ARCH:Namd64:Ni386:Nx86_64:C/.+/anv/}
 MESON_ARGS+=		-Dvulkan-drivers=${VULKAN_DRIVERS:ts,}
 . for _vd in ${OPTIONS_GROUP_VULKAN}
 OPTIONS_DEFAULT+=	${_vd}
 ${_vd}_VARS+=		VULKAN_DRIVERS+=${_vd:S/anv/intel/:S/radv/amd/:S/swrast_vk/swrast/}
 . endfor
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
 LDFLAGS_i386=		-Wl,-znotext
 
 .if ${PORT_OPTIONS:MX11}
 MESA_PLATFORMS+=	x11
 USE_XORG+=		x11 xcb xdamage xext xfixes xorgproto xrandr xshmfence \
 			xv xxf86vm
 .else
 MESON_ARGS+=		-Dxlib-lease=disabled
 .endif
 
 .if ${PORT_OPTIONS:MWAYLAND}
 MESA_PLATFORMS+=	wayland
 .endif
 
 MESON_ARGS+=	-Dplatforms="${MESA_PLATFORMS:ts,:tl}"
 
 # Disable some options
 MESON_ARGS+=	-Dandroid-libbacktrace=disabled \
 		-Dgles1=enabled \
 		-Dgles2=enabled \
 		-Dglvnd=disabled \
 		-Dglx=disabled \
 		-Degl=enabled \
 		-Dlmsensors=disabled \
 		-Dmicrosoft-clc=disabled \
 		-Dvalgrind=disabled
 
 .if !${PORT_OPTIONS:Mr600} && !${PORT_OPTIONS:Mradeonsi}
 MESON_ARGS+=	-Dgallium-va=disabled
 .endif
 
 .if ${ARCH} != amd64
 MESON_ARGS+=	-Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629
 .endif
 
 .for _gd in ${OPTIONS_GROUP_GALLIUM}
 . if defined(GALLIUM_DRIVERS) && ${GALLIUM_DRIVERS:M${_gd}}
 PLIST_SUB+=	${_gd}=""
 . else
 PLIST_SUB+=	${_gd}="@comment "
 . endif
 .endfor
 
 PLIST_SUB+= ARCH=${ARCH:S/amd/x86_/}
 .for _vd in ${OPTIONS_GROUP_VULKAN}
 . if defined(VULKAN_DRIVERS) && ${VULKAN_DRIVERS:M${_vd}}
 PLIST_SUB+=	${_vd}=""
 . else
 PLIST_SUB+=	${_vd}="@comment "
 . endif
 .endfor
 
 post-install:
 # Mesa 25: libgallium-${MESAVERSION}.so and the gbm/GL/dri.pc/drirc bits
 # all belong to graphics/mesa-libs. Strip them from this port's stage tree.
 	${RM} -r ${STAGEDIR}${PREFIX}/include
 	${RM} ${STAGEDIR}${PREFIX}/lib/libgallium-${MESAVERSION}.so
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/gbm
 	${RM} -r ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 	${INSTALL_DATA} ${FILESDIR}/01-freebsd.conf \
 		${STAGEDIR}${PREFIX}/share/drirc.d
 
 .include <bsd.port.post.mk>
diff --git a/graphics/mesa-dri/pkg-plist b/graphics/mesa-dri/pkg-plist
index 49db8c12716e..0e374f2f9a33 100644
--- a/graphics/mesa-dri/pkg-plist
+++ b/graphics/mesa-dri/pkg-plist
@@ -1,77 +1,77 @@
 lib/dri/apple_dri.so
 lib/dri/armada-drm_dri.so
 %%crocus%%lib/dri/crocus_dri.so
 lib/dri/exynos_dri.so
 lib/dri/gm12u320_dri.so
 lib/dri/hdlcd_dri.so
 lib/dri/hx8357d_dri.so
 %%i915%%lib/dri/i915_dri.so
 lib/dri/ili9163_dri.so
 lib/dri/ili9225_dri.so
 lib/dri/ili9341_dri.so
 lib/dri/ili9486_dri.so
 lib/dri/imx-dcss_dri.so
 lib/dri/imx-drm_dri.so
 lib/dri/imx-lcdif_dri.so
 lib/dri/ingenic-drm_dri.so
 %%iris%%lib/dri/iris_dri.so
 lib/dri/kirin_dri.so
 %%llvmpipe%%lib/dri/kms_swrast_dri.so
 lib/dri/komeda_dri.so
 lib/dri/libdril_dri.so
 lib/dri/mali-dp_dri.so
 lib/dri/mcde_dri.so
 lib/dri/mediatek_dri.so
 lib/dri/meson_dri.so
 lib/dri/mi0283qt_dri.so
 lib/dri/mxsfb-drm_dri.so
 lib/dri/panel-mipi-dbi_dri.so
 %%panfrost%%lib/dri/panfrost_dri.so
 lib/dri/pl111_dri.so
 %%r300%%lib/dri/r300_dri.so
 %%r600%%lib/dri/r600_dri.so
 %%r600%%lib/dri/r600_drv_video.so
 %%radeonsi%%lib/dri/radeonsi_dri.so
 %%radeonsi%%lib/dri/radeonsi_drv_video.so
 lib/dri/rcar-du_dri.so
 lib/dri/repaper_dri.so
 %%panfrost%%lib/dri/rockchip_dri.so
 lib/dri/rzg2l-du_dri.so
 lib/dri/ssd130x_dri.so
 lib/dri/st7586_dri.so
 lib/dri/st7735r_dri.so
 lib/dri/sti_dri.so
 lib/dri/stm_dri.so
 lib/dri/sun4i-drm_dri.so
 %%llvmpipe%%lib/dri/swrast_dri.so
 lib/dri/udl_dri.so
 lib/dri/vkms_dri.so
 %%svga%%lib/dri/vmwgfx_dri.so
-%%zink%%lib/dri/zink_dri.so
+lib/dri/zink_dri.so
 lib/dri/zynqmp-dpsub_dri.so
 @comment lib/gbm/dri_gbm.so
 @comment lib/libEGL.so
 @comment lib/libEGL.so.1
 @comment lib/libEGL.so.1.0.0
 @comment lib/libEGL_mesa.so
 @comment lib/libEGL_mesa.so.0
 @comment lib/libEGL_mesa.so.0.0.0
 @comment lib/libGLESv1_CM.so
 @comment lib/libGLESv1_CM.so.1
 @comment lib/libGLESv1_CM.so.1.1.0
 @comment lib/libGLESv2.so
 @comment lib/libGLESv2.so.2
 @comment lib/libGLESv2.so.2.0.0
 @comment lib/libgallium-%%MESAVERSION%%.so
 @comment lib/libgbm.so
 @comment lib/libgbm.so.1
 @comment lib/libgbm.so.1.0.0
 %%anv%%lib/libvulkan_intel.so
 %%swrast_vk%%lib/libvulkan_lvp.so
 %%radv%%lib/libvulkan_radeon.so
 share/drirc.d/00-mesa-defaults.conf
 %%radv%%share/drirc.d/00-radv-defaults.conf
 share/drirc.d/01-freebsd.conf
 %%anv%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json
 %%swrast_vk%%share/vulkan/icd.d/lvp_icd.%%ARCH%%.json
 %%radv%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json