diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index 17239233dee6..b7ea7a64370d 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -1,94 +1,95 @@
 PORTNAME=	libdrm
 PORTVERSION=	2.4.112
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics x11
 MASTER_SITES=	https://dri.freedesktop.org/libdrm/
 
 PATCH_SITES=	https://gitlab.freedesktop.org/mesa/${PORTNAME:S/lib//}/-/commit/
 PATCHFILES+=	7207431e466a.patch:-p1 # https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/193
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Userspace interface to kernel Direct Rendering Module services
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess
 
 USES=		gnome meson pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	MANPAGES TESTS
 OPTIONS_SUB=	yes
 
-TESTS_DESC=	Install test programs (which are always built)
+TESTS_DESC=	Build and install test programs
 
 .if defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	MANPAGES
 .endif
 
 MANPAGES_BUILD_DEPENDS=	rst2man:textproc/py-docutils
 MANPAGES_MESON_TRUE=	man-pages
 
 TESTS_MESON_TRUE=	install-test-programs
 
 # avoid circular dependency in case cairo supports OpenGL (cairo->mesa-libs->libdrm->cairo)
 CONFIGURE_ARGS+=	-Dcairo-tests=false
 
 # Disable some targets known to not work on FreeBSD
 MESON_ARGS+=	-Domap=false \
 		-Dexynos=false \
 		-Dfreedreno=false \
 		-Dfreedreno-kgsl=false \
 		-Dvc4=false \
 		-Detnaviv=false \
 		-Dnouveau=false
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 MESON_ARGS+=	-Dvmwgfx=true \
 		-Dintel=true
 .else
 MESON_ARGS+=	-Dvmwgfx=false \
 		-Dintel=false
 .endif
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	ARM_DRIVERS="@comment "
 PLIST_SUB+=	INTEL_DRIVER=""
 PLIST_SUB+=	NOUVEAU_DRIVER=""
 PLIST_SUB+=	RADEON_DRIVERS=""
 PLIST_SUB+=	VMWGFX_DRIVERS=""
 .elif ${ARCH:Mpowerpc*}
 PLIST_SUB+=	ARM_DRIVERS="@comment "
 PLIST_SUB+=	INTEL_DRIVER="@comment "
 PLIST_SUB+=	NOUVEAU_DRIVER=""
 PLIST_SUB+=	RADEON_DRIVERS=""
 PLIST_SUB+=	VMWGFX_DRIVERS="@comment "
 .elif ${ARCH} == aarch64
 PLIST_SUB+=	ARM_DRIVERS=""
 PLIST_SUB+=	INTEL_DRIVER="@comment "
 PLIST_SUB+=	NOUVEAU_DRIVER=""
 PLIST_SUB+=	RADEON_DRIVERS=""
 PLIST_SUB+=	VMWGFX_DRIVERS="@comment "
 .elif ${ARCH:Marm*}
 PLIST_SUB+=	ARM_DRIVERS=""
 PLIST_SUB+=	INTEL_DRIVER="@comment "
 PLIST_SUB+=	NOUVEAU_DRIVER="@comment "
 PLIST_SUB+=	RADEON_DRIVERS=""
 PLIST_SUB+=	VMWGFX_DRIVERS="@comment "
 .elif ${ARCH} == riscv64
 PLIST_SUB+=	ARM_DRIVERS="@comment "
 PLIST_SUB+=	INTEL_DRIVER="@comment "
 PLIST_SUB+=	NOUVEAU_DRIVER="@comment "
 PLIST_SUB+=	RADEON_DRIVERS=""
 PLIST_SUB+=	VMWGFX_DRIVERS="@comment "
 .else
 PLIST_SUB+=	ARM_DRIVERS="@comment "
 PLIST_SUB+=	INTEL_DRIVER="@comment "
 PLIST_SUB+=	NOUVEAU_DRIVER="@comment "
 PLIST_SUB+=	RADEON_DRIVERS="@comment "
 PLIST_SUB+=	VMWGFX_DRIVERS="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
index 8bd293ff9648..0ab0f7a403ec 100644
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@@ -1,66 +1,64 @@
+%%TESTS%%bin/amdgpu_stress
 %%TESTS%%bin/drmdevice
-%%TESTS%%bin/kms-steal-crtc
-%%TESTS%%bin/kms-universal-planes
-%%TESTS%%bin/kmstest
 %%TESTS%%bin/modeprint
 %%TESTS%%bin/modetest
 %%TESTS%%bin/proptest
 %%TESTS%%bin/vbltest
 %%RADEON_DRIVERS%%include/libdrm/amdgpu.h
 %%RADEON_DRIVERS%%include/libdrm/amdgpu_drm.h
 include/libdrm/drm.h
 include/libdrm/drm_fourcc.h
 include/libdrm/drm_mode.h
 include/libdrm/drm_sarea.h
 include/libdrm/i915_drm.h
 %%INTEL_DRIVER%%include/libdrm/intel_aub.h
 %%INTEL_DRIVER%%include/libdrm/intel_bufmgr.h
 %%INTEL_DRIVER%%include/libdrm/intel_debug.h
 include/libdrm/mach64_drm.h
 include/libdrm/mga_drm.h
 include/libdrm/msm_drm.h
 include/libdrm/nouveau_drm.h
 include/libdrm/qxl_drm.h
 include/libdrm/r128_drm.h
 %%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h
 %%RADEON_DRIVERS%%include/libdrm/radeon_bo.h
 %%RADEON_DRIVERS%%include/libdrm/radeon_bo_gem.h
 %%RADEON_DRIVERS%%include/libdrm/radeon_bo_int.h
 %%RADEON_DRIVERS%%include/libdrm/radeon_cs.h
 %%RADEON_DRIVERS%%include/libdrm/radeon_cs_gem.h
 %%RADEON_DRIVERS%%include/libdrm/radeon_cs_int.h
 include/libdrm/radeon_drm.h
 %%RADEON_DRIVERS%%include/libdrm/radeon_surface.h
 include/libdrm/savage_drm.h
 include/libdrm/sis_drm.h
 include/libdrm/tegra_drm.h
 include/libdrm/vc4_drm.h
 include/libdrm/via_drm.h
 include/libdrm/virtgpu_drm.h
 %%VMWGFX_DRIVERS%%include/libdrm/vmwgfx_drm.h
 include/libsync.h
 include/xf86drm.h
 include/xf86drmMode.h
 lib/libdrm.so
 lib/libdrm.so.2
 lib/libdrm.so.2.4.0
 %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so
 %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so.1
 %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so.1.0.0
 %%INTEL_DRIVER%%lib/libdrm_intel.so
 %%INTEL_DRIVER%%lib/libdrm_intel.so.1
 %%INTEL_DRIVER%%lib/libdrm_intel.so.1.0.0
 %%RADEON_DRIVERS%%lib/libdrm_radeon.so
 %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1
 %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1.0.1
 libdata/pkgconfig/libdrm.pc
 %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_amdgpu.pc
 %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc
 %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc
 %%MANPAGES%%man/man3/drmAvailable.3.gz
 %%MANPAGES%%man/man3/drmHandleEvent.3.gz
 %%MANPAGES%%man/man3/drmModeGetResources.3.gz
 %%MANPAGES%%man/man7/drm-kms.7.gz
 %%MANPAGES%%man/man7/drm-memory.7.gz
 %%MANPAGES%%man/man7/drm.7.gz
 %%RADEON_DRIVERS%%%%DATADIR%%/amdgpu.ids