diff --git a/graphics/egl-wayland/Makefile b/graphics/egl-wayland/Makefile
index 7162b9c88cb5..e0c2cd158f82 100644
--- a/graphics/egl-wayland/Makefile
+++ b/graphics/egl-wayland/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	egl-wayland
-DISTVERSION=	1.1.13
+DISTVERSION=	1.1.18
 CATEGORIES=	graphics
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	EGLStream-based Wayland external platform
 WWW=		https://github.com/NVIDIA/egl-wayland
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	eglexternalplatform>=1.1:graphics/eglexternalplatform \
 		${LOCALBASE}/include/libdrm/drm_fourcc.h:graphics/libdrm \
 		wayland-protocols>=1.8:graphics/wayland-protocols
 LIB_DEPENDS=	libwayland-server.so:graphics/wayland
 
 USES=		gl meson pkgconfig
 USE_GITHUB=	yes
 USE_GL=		egl
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	NVIDIA
 
 post-patch:
 	@${REINPLACE_CMD} -e "/install/s/datadir')/prefix'), 'libdata'/" \
 		${WRKSRC}/meson.build
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/egl/egl_external_platform.d
 	${INSTALL_DATA} ${FILESDIR}/10_nvidia_wayland.json \
 		${STAGEDIR}${PREFIX}/share/egl/egl_external_platform.d
 
 .include <bsd.port.mk>
diff --git a/graphics/egl-wayland/distinfo b/graphics/egl-wayland/distinfo
index 4261366ee1e9..de0ee40aa336 100644
--- a/graphics/egl-wayland/distinfo
+++ b/graphics/egl-wayland/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697652018
-SHA256 (NVIDIA-egl-wayland-1.1.13_GH0.tar.gz) = 667561d794561d55d85b1273b2fe4def3f360e0ad27833d099e4f100f2244e48
-SIZE (NVIDIA-egl-wayland-1.1.13_GH0.tar.gz) = 68153
+TIMESTAMP = 1741109035
+SHA256 (NVIDIA-egl-wayland-1.1.18_GH0.tar.gz) = c561485ee65efb7ffb0dbedd6c7031f0be69c861efa63f831c8b6c3178a0f871
+SIZE (NVIDIA-egl-wayland-1.1.18_GH0.tar.gz) = 75759
diff --git a/graphics/egl-wayland/pkg-plist b/graphics/egl-wayland/pkg-plist
index e22aa7f11108..3f84595de30a 100644
--- a/graphics/egl-wayland/pkg-plist
+++ b/graphics/egl-wayland/pkg-plist
@@ -1,9 +1,9 @@
 lib/libnvidia-egl-wayland.so
 lib/libnvidia-egl-wayland.so.1
-lib/libnvidia-egl-wayland.so.1.1.13
+lib/libnvidia-egl-wayland.so.1.1.18
 libdata/pkgconfig/wayland-eglstream-protocols.pc
 libdata/pkgconfig/wayland-eglstream.pc
 share/egl/egl_external_platform.d/10_nvidia_wayland.json
 share/wayland-eglstream/wayland-drm.xml
 share/wayland-eglstream/wayland-eglstream-controller.xml
 share/wayland-eglstream/wayland-eglstream.xml
diff --git a/graphics/nvidia-drm-510-kmod/distinfo b/graphics/nvidia-drm-510-kmod/distinfo
index acb84ed393aa..c8ed5dc3797c 100644
--- a/graphics/nvidia-drm-510-kmod/distinfo
+++ b/graphics/nvidia-drm-510-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1729779540
-SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3
-SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432
+TIMESTAMP = 1740840763
+SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
+SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
 SHA256 (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = dbdff8ad8cad8152d1c286b058f1f5114b3672f1a936e13933ce52915b77eaaa
 SIZE (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = 20095338
diff --git a/graphics/nvidia-drm-515-kmod/distinfo b/graphics/nvidia-drm-515-kmod/distinfo
index 3c26b66875b2..1a7ac208c82f 100644
--- a/graphics/nvidia-drm-515-kmod/distinfo
+++ b/graphics/nvidia-drm-515-kmod/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1741856037
-SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3
-SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432
+SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
+SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
 SHA256 (freebsd-drm-kmod-drm_v5.15.160_2_GH0.tar.gz) = 85914f9a39c6919d9a725a3252ea541d11394c3051a3600707fa6d865a082728
 SIZE (freebsd-drm-kmod-drm_v5.15.160_2_GH0.tar.gz) = 26098303
diff --git a/graphics/nvidia-drm-61-kmod/distinfo b/graphics/nvidia-drm-61-kmod/distinfo
index e6e029f31a0d..3a7b3344ba50 100644
--- a/graphics/nvidia-drm-61-kmod/distinfo
+++ b/graphics/nvidia-drm-61-kmod/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1741856116
-SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3
-SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432
+SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
+SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
 SHA256 (freebsd-drm-kmod-drm_v6.1.128_1_GH0.tar.gz) = 01febb64aa2c173baef262dc9f2bed6b6fcc6272e4cb6a42fc4914521009c6aa
 SIZE (freebsd-drm-kmod-drm_v6.1.128_1_GH0.tar.gz) = 37107699
diff --git a/graphics/nvidia-drm-66-kmod/distinfo b/graphics/nvidia-drm-66-kmod/distinfo
index 1639ab5889c8..fa7c8b3812ef 100644
--- a/graphics/nvidia-drm-66-kmod/distinfo
+++ b/graphics/nvidia-drm-66-kmod/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1741869175
-SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3
-SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432
+SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
+SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
 SHA256 (freebsd-drm-kmod-drm_v6.6.25_2_GH0.tar.gz) = b0b019849f2191a75512e1a5a266281b3e2835071faa366322f464c80cfa2cb0
 SIZE (freebsd-drm-kmod-drm_v6.6.25_2_GH0.tar.gz) = 38488394
diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common
index 1194e9b396dc..99fe9d8d2e67 100644
--- a/graphics/nvidia-drm-kmod/Makefile.common
+++ b/graphics/nvidia-drm-kmod/Makefile.common
@@ -1,52 +1,65 @@
 # Common rules for nvidia-drm-*-kmod ports
 
 MAINTAINER=	ashafer@badland.io
 COMMENT=	NVIDIA DRM Kernel Module
 WWW=		https://www.nvidia.com/object/unix.html
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${NVIDIA_DISTVERSION}:nvidia \
 				https://codeload.github.com/freebsd/drm-kmod/tar.gz/${DRM_KMOD_GH_TAGNAME}?dummy=/:drm
 DISTVERSION?=   ${NVIDIA_DISTVERSION}
 PORTREVISION=	1
 DISTFILES=		NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}${EXTRACT_SUFX}:nvidia \
 				freebsd-drm-kmod-${DRM_KMOD_GH_TAGNAME}_GH0.tar.gz:drm
 
 ONLY_FOR_ARCHS=	amd64
 USES=		kmod uidfix tar:xz
 
 SUB_FILES=	20-nvidia-drm-outputclass.conf
 
 RUN_DEPENDS+=	${KMODDIR}/nvidia.ko:x11/nvidia-driver
 
 .include "${.CURDIR}/../../x11/nvidia-driver/Makefile.version"
 .include "${.CURDIR}/../../x11/nvidia-driver/Makefile.common"
 
 LICENSE_FILE=	${WRKSRC}/../../doc/license.txt
 
 PLIST_FILES=	${KMODDIR}/nvidia-drm.ko \
 		share/X11/xorg.conf.d/20-nvidia-drm-outputclass.conf
 
 MAKE_ENV+=	DEBUG_FLAGS=${DEBUG_FLAGS} \
 			DRMKMODDIR=${WRKDIR}/drm-kmod-${DRM_KMOD_GH_TAGNAME}/
 WRKSRC=		${WRKDIR}/NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}/
 WRKSRC_SUBDIR=	src/nvidia-drm/
 
 .if ${NVVERSION} < 565.00000
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-conftest.h
 .endif #565.00
 
 .if ${NVVERSION} < 555.04202
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-freebsd-lkpi.c
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d/
 	${INSTALL_DATA} ${WRKDIR}/20-nvidia-drm-outputclass.conf ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d/
 
 post-patch:
 	# Workaround for LLVM/Clang19
 	${REINPLACE_CMD} -e '/DRMKMODDIR.*\/linuxkpi\/dummy\/include/d' \
 		${WRKSRC}/Makefile
+
+	# Workaround for the issue that X11 cannot acquire modesetting
+	# permission by disabling hw.nvidiadrm.fbdev tunable which is
+	# enabled on 570 series and later of the driver.
+	# This is due to the issue lacking proper support for fbdev
+	# (would be simpledrm) in graphics/drm-*-kmod and/or LinuxKPI.
+	# Would be reverted once the issues are sorted and fixed.
+.if ${NVVERSION} >= 570.00000
+	${REINPLACE_CMD} -e 's:\&nv_drm_fbdev_module_param\,  1\,:\&nv_drm_fbdev_module_param\,  0\,:' \
+		${WRKSRC}/nvidia-drm-freebsd-lkpi.c
+	${REINPLACE_CMD} -e 's:bool nv_drm_fbdev_module_param = true;:bool nv_drm_fbdev_module_param = false;:' \
+		${WRKSRC}/nvidia-drm-os-interface.c
+.endif
 	# We should support -CURRENT: kill the check (first #if __FreeBSD_version)
 	linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \
 			${WRKSRC}/../nvidia/nv-freebsd.h) ; ${REINPLACE_CMD} \
 			-e "$$linenum,+2d" ${WRKSRC}/../nvidia/nv-freebsd.h
diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile
index a20dcac257e7..c98573c2222a 100644
--- a/x11/linux-nvidia-libs/Makefile
+++ b/x11/linux-nvidia-libs/Makefile
@@ -1,540 +1,581 @@
 PORTNAME=	nvidia-libs
 DISTVERSION?=	${NVIDIA_DISTVERSION}
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11 linux
 MASTER_SITES=	NVIDIA/XFree86/Linux-${ARCH_SUFX}/${DISTVERSION}/
 DISTNAME=	NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}
 EXTRACT_SUFX=	.run
 PKGNAMEPREFIX=	linux-
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	NVidia graphics libraries and programs (Linux version)
 WWW=		https://www.nvidia.com/object/unix.html
 
 LICENSE_FILE=	${WRKSRC}/LICENSE
 .include "${.CURDIR}/../nvidia-driver/Makefile.version"
 .include "${.CURDIR}/../nvidia-driver/Makefile.common"
 
 .if ${DISTVERSION:R} > 390
 PORTSCOUT=	limit:\.\d+$$		# ignore *-no-compat32 distfiles
 .else
 PORTSCOUT=	limit:^${DISTVERSION:R}\.\d+$$
 .endif
 
 USES=		linux
 USE_LINUX=	xorglibs
 USE_LDCONFIG=	yes
 NO_BUILD=	yes
 
 PLIST_RE=	# empty
 
 LINUX_LIBDIR=	/usr/lib${ARCH:S/i386//:S/amd//}
 
 LINUX_LIBS=	libcuda.so.${PORTVERSION} \
 		libnvcuvid.so.${PORTVERSION} \
 		libnvidia-cfg.so.${PORTVERSION} \
 		libnvidia-glcore.so.${PORTVERSION} \
 		libnvidia-ml.so.${PORTVERSION} \
 		libnvidia-opencl.so.${PORTVERSION} \
 		libnvidia-tls.so.${PORTVERSION} \
 		libvdpau_nvidia.so.${PORTVERSION}
 LINUX_LINKS=	libcuda.so.${PORTVERSION} libcuda.so.1 \
 		libcuda.so.${PORTVERSION} libcuda.so \
 		libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \
 		libnvcuvid.so.${PORTVERSION} libnvcuvid.so \
 		libnvidia-cfg.so.${PORTVERSION} libnvidia-cfg.so.1 \
 		libnvidia-cfg.so.${PORTVERSION} libnvidia-cfg.so \
 		libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so.1 \
 		libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so \
 		libnvidia-opencl.so.${PORTVERSION} libnvidia-opencl.so.1 \
 		libvdpau_nvidia.so.${PORTVERSION} vdpau/libvdpau_nvidia.so.1
 LINUX32_LIBS=	libcuda.so.${PORTVERSION} \
 		libnvidia-glcore.so.${PORTVERSION} \
 		libnvidia-ml.so.${PORTVERSION} \
 		libnvidia-opencl.so.${PORTVERSION} \
 		libnvidia-tls.so.${PORTVERSION} \
 		libvdpau_nvidia.so.${PORTVERSION}
 .if ${NVVERSION} < 415.013
 LINUX_LIBS+=	tls/libnvidia-tls.so.${PORTVERSION}
 LINUX32_LIBS+=	tls/libnvidia-tls.so.${PORTVERSION}
 .endif
 LINUX32_LINKS=	libcuda.so.${PORTVERSION} libcuda.so.1 \
 		libcuda.so.${PORTVERSION} libcuda.so \
 		libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so.1 \
 		libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so \
 		libnvidia-opencl.so.${PORTVERSION} libnvidia-opencl.so.1 \
 		libvdpau_nvidia.so.${PORTVERSION} vdpau/libvdpau_nvidia.so.1
 LINUX_PROGS=	nvidia-debugdump nvidia-settings nvidia-smi nvidia-xconfig
 LINUX_MANS=	nvidia-settings nvidia-smi nvidia-xconfig
 LINUX_DATA=	nvidia.icd /etc/OpenCL/vendors
 .if ${NVVERSION} >= 375.010
 LINUX_DATA+=	10_nvidia.json /usr/share/glvnd/egl_vendor.d
 .else
 PLIST_RE+=	'\,${LINUXBASE}/usr/share/glvnd,d'
 .endif
 .if ${NVVERSION} >= 378.009
 LINUX_DATA+=	10_nvidia_wayland.json /usr/share/egl/egl_external_platform.d
 .else
 PLIST_RE+=	'\,${LINUXBASE}/usr/share/egl,d'
 .endif
+.if ${NVVERSION} >= 570.00000
+LINUX_DATA+=	20_nvidia_xcb.json /usr/share/egl/egl_external_platform.d \
+		20_nvidia_xlib.json /usr/share/egl/egl_external_platform.d
+.else
+PLIST_RE+=	'\,${LINUXBASE}/usr/share/egl/egl_external_platform.d/20_nvidia_xcb.json,d'\
+		'\,${LINUXBASE}/usr/share/egl/egl_external_platform.d/20_nvidia_xlib.json,d'
+.endif
+
 .if ${NVVERSION} >= 361.016
 LINUX_LIBS+=	libEGL_nvidia.so.${PORTVERSION}
 LINUX_LINKS+=	libEGL_nvidia.so.${PORTVERSION} libEGL_nvidia.so.0
 LINUX32_LIBS+=	libEGL_nvidia.so.${PORTVERSION}
 LINUX32_LINKS+=	libEGL_nvidia.so.${PORTVERSION} libEGL_nvidia.so.0
 .elif ${NVVERSION} >= 355.006
 LINUX_LIBS+=	libEGL_nvidia.so.0
 PLIST_RE+=	'\,${LINUXBASE}.*libEGL_nvidia\.so\.${PORTVERSION},d'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libEGL_nvidia\.so,d'
 .endif
 .if ${NVVERSION} >= 361.016 && ${NVVERSION} < 450.051
 LINUX_LIBS+=	libnvidia-fatbinaryloader.so.${PORTVERSION}
 LINUX32_LIBS+=	libnvidia-fatbinaryloader.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-fatbinaryloader\.so,d'
 .endif
 .if ${NVVERSION} >= 361.016
 LINUX_LIBS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} \
 		libGLESv2_nvidia.so.${PORTVERSION} \
 		libGLX_nvidia.so.${PORTVERSION} \
 		libnvidia-ptxjitcompiler.so.${PORTVERSION}
 LINUX_LINKS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \
 		libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \
 		libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \
 		libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \
 		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \
 		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so
 LINUX32_LIBS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} \
 		libGLESv2_nvidia.so.${PORTVERSION} \
 		libGLX_nvidia.so.${PORTVERSION} \
 		libnvidia-ptxjitcompiler.so.${PORTVERSION}
 LINUX32_LINKS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \
 		libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \
 		libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \
 		libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \
 		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \
 		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libGLESv(1_CM|2)_nvidia\.so,d' \
 		'\,${LINUXBASE}.*libGLX_(nvidia|indirect)\.so,d' \
 		'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'
 .endif
 .if ${NVVERSION} >= 535.05403 # 535.54.03
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-compiler\.so,d'
 .else
 LINUX_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
 LINUX32_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
 .endif
 
-
-.if ${NVVERSION} >= 565.00000 # 565.00
+.if ${NVVERSION} >= 570.12400 # 570.124
+LINUX_LIBS+=    libnvidia-egl-wayland.so.1.1.18
+LINUX_LINKS+=   libnvidia-egl-wayland.so.1.1.18 libnvidia-egl-wayland.so.1
+LINUX32_LIBS+=	libnvidia-egl-wayland.so.1.1.18
+LINUX32_LINKS+=	libnvidia-egl-wayland.so.1.1.18 libnvidia-egl-wayland.so.1
+PLIST_RE+=      '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.18/'
+.elif ${NVVERSION} >= 565.00000 # 565.00
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.17
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.17 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.17/'
 .elif ${NVVERSION} >= 550.00000 # 550.00
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.13
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.13 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.13/'
 .elif ${NVVERSION} >= 545.00000 # 545.00
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.12
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.12 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.12/'
 .elif ${NVVERSION} >= 535.05403 # 535.54.03
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.11
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.11 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.11/'
 .elif ${NVVERSION} >= 495.02905 # 495.29.05
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.9
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.9 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.9/'
 .elif ${NVVERSION} >= 470.04201 # 470.42.01
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.7
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.7 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.7/'
 .elif ${NVVERSION} >= 460.02704 # 460.27.04
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.5
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.5 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.5/'
 .elif ${NVVERSION} >= 440.026
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.4
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.4 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.4/'
 .elif ${NVVERSION} >= 435.017
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.3
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.3 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.3/'
 .elif ${NVVERSION} >= 418.030
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.2
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.2 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.2/'
 .elif ${NVVERSION} >= 410.057
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.0
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.0 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.0/'
 .elif ${NVVERSION} >= 396.018
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.3
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.3 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.3/'
 .elif ${NVVERSION} >= 387.012
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.2
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.2 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.2/'
 .elif ${NVVERSION} >= 378.013
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.1
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.1 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.1/'
 .elif ${NVVERSION} >= 378.009
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.0
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.0 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.0/'
 .elif ${NVVERSION} >= 364.012
 LINUX_LIBS+=	libnvidia-egl-wayland.so.${PORTVERSION}
 LINUX_LINKS+=	libnvidia-egl-wayland.so.${PORTVERSION} libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.${PORTVERSION}/'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-egl-wayland\.so,d'
 .endif
 .if ${NVVERSION} >= 331.013 && ${NVVERSION} < 495.02905
 LINUX_LIBS+=	libnvidia-ifr.so.${PORTVERSION}
 LINUX_LINKS+=	libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
 		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
 LINUX32_LIBS+=	libnvidia-ifr.so.${PORTVERSION}
 LINUX32_LINKS+=	libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
 		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-ifr,d'
 .endif
 .if ${NVVERSION} >= 331.013
 LINUX_LIBS+=	libnvidia-eglcore.so.${PORTVERSION} \
 		libnvidia-fbc.so.${PORTVERSION} \
 		libnvidia-glsi.so.${PORTVERSION}
 LINUX_LINKS+=	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
 		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so
 LINUX32_LIBS+=	libnvidia-eglcore.so.${PORTVERSION} \
 		libnvidia-fbc.so.${PORTVERSION} \
 		libnvidia-glsi.so.${PORTVERSION}
 LINUX32_LINKS+=	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
 		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-(eglcore|fbc|glsi),d'
 .endif
 .if ${NVVERSION} >= 310.014
 LINUX_LIBS+=	libnvidia-encode.so.${PORTVERSION}
 LINUX_LINKS+=	libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so.1 \
 		libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so
 LINUX32_LIBS+=	libnvidia-encode.so.${PORTVERSION}
 LINUX32_LINKS+=	libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so.1 \
 		libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so
 PLIST_RE+=	'\,${LINUXBASE}.*libXvMCNVIDIA,d'
 .else
 LINUX_LIBS+=	libXvMCNVIDIA.so.${PORTVERSION}
 LINUX_LINKS+=	libXvMCNVIDIA.so.${PORTVERSION} libXvMCNVIDIA_dynamic.so.1 \
 		libXvMCNVIDIA.so.${PORTVERSION} libXvMCNVIDIA_dynamic.so
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-encode,d'
 .endif
 .if ${NVVERSION} >= 346.016
 LINUX_LIBS+=	libnvidia-gtk2.so.${PORTVERSION} \
 		libnvidia-gtk3.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-gtk(2|3)\.so,d'
 .endif
 .if ${NVVERSION} >= 331.049 && ${NVVERSION} < 352.009
 LINUX_DATA+=	monitoring.conf /usr/share/nvidia \
 		${WRKSRC}/pci.ids /usr/share/nvidia
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*monitoring\.conf,d' \
 		'\,${LINUXBASE}.*pci\.ids,d'
 .endif
 .if ${NVVERSION} >= 334.016
 LINUX_DATA+=	nvidia-application-profiles-${PORTVERSION}-key-documentation /usr/share/nvidia
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*application-profiles-${PORTVERSION}-key-documentation,d'
 .endif
 .if ${NVVERSION} >= 319.012
 LINUX_DATA+=	nvidia-application-profiles-${PORTVERSION}-rc /usr/share/nvidia
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*share/nvidia,d'
 .endif
 .if ${NVVERSION} >= 319.017
 LINUX_PROGS+=	nvidia-cuda-mps-control nvidia-cuda-mps-server \
 		nvidia-persistenced
 LINUX_MANS+=	nvidia-cuda-mps-control nvidia-persistenced
 .else
 LINUX_PROGS+=	nvidia-cuda-proxy-control nvidia-cuda-proxy-server
 LINUX_MANS+=	nvidia-cuda-proxy-control
 PLIST_RE+=	'\,${LINUXBASE},s/cuda-mps/cuda-proxy/' \
 		'\,${LINUXBASE}.*nvidia-persistenced,d'
 .endif
 .if ${NVVERSION} >= 364.012
 LINUX_DATA+=	nvidia_icd.json /etc/vulkan/icd.d
 .else
 PLIST_RE+=	'\,${LINUXBASE}/etc/vulkan,d'
 .endif
 .if ${NVVERSION} >= 410.057 && ${NVVERSION} < 495.02905
 LINUX_LIBS+=	libnvidia-cbl.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-cbl\.so,d'
 .endif
 .if ${NVVERSION} >= 410.057
 LINUX_LIBS+=	libnvidia-rtcore.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-rtcore\.so,d'
 .endif
 .if ${NVVERSION} >= 396.018
 LINUX_LIBS+=	libnvidia-glvkspirv.so.${PORTVERSION}
 LINUX32_LIBS+=	libnvidia-glvkspirv.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-glvkspirv\.so,d'
 .endif
 .if ${NVVERSION} >= 545.00000 # 545.00
 LINUX_LIBS+=	libnvidia-gpucomp.so.${PORTVERSION}
 LINUX32_LIBS+=  libnvidia-gpucomp.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-gpucomp\.so,d'
 .endif # 545.00
-.if ${NVVERSION} >= 565.00000 # 565.00
+
+.if ${NVVERSION} >= 570.00000 #570.00
+LINUX_LIBS+=	libnvidia-egl-xcb.so.1.0.0 \
+		libnvidia-egl-xlib.so.1.0.0
+LINUX_LINKS+=	libnvidia-egl-xcb.so.1.0.0 libnvidia-egl-xcb.so.1 \
+		libnvidia-egl-xcb.so.1.0.0 libnvidia-egl-xcb.so \
+		libnvidia-egl-xlib.so.1.0.0 libnvidia-egl-xlib.so.1 \
+		libnvidia-egl-xlib.so.1.0.0 libnvidia-egl-xlib.so
+LINUX32_LIBS+=  libnvidia-egl-xcb.so.1.0.0 \
+		libnvidia-egl-xlib.so.1.0.0
+LINUX32_LINKS+=	libnvidia-egl-xcb.so.1.0.0 libnvidia-egl-xcb.so.1 \
+		libnvidia-egl-xcb.so.1.0.0 libnvidia-egl-xcb.so \
+		libnvidia-egl-xlib.so.1.0.0 libnvidia-egl-xlib.so.1 \
+		libnvidia-egl-xlib.so.1.0.0 libnvidia-egl-xlib.so
+PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-(egl-xcb|egl-xlib)\.so)\.X/\1.1.0.0/'
+.else
+PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-(egl-xcb|egl-xlib),d'
+.endif
+
+.if ${NVVERSION} >= 570.00000 # 570.00
+LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.2
+LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so.1 \
+		libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so
+LINUX32_LIBS+=	libnvidia-egl-gbm.so.1.1.2
+LINUX32_LINKS+=	libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so.1 \
+		libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so
+PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.2/'
+.elif ${NVVERSION} >= 565.00000 # 565.00
 LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.2
 LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so.1 \
 		libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.2/'
 .elif ${NVVERSION} >= 550.00000 # 550.00
 LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.1
 LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so.1 \
 		libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.1/'
 .elif ${NVVERSION} >= 525.08902 # 525.89.02
 LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.0
 LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so.1 \
 		libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.0/'
 .endif # 565.00
+
 .if ${NVVERSION} >= 525.08902 # 525.89.02
 LINUX_LIBS+=	libnvoptix.so.${PORTVERSION} \
 		libnvidia-nvvm.so.${PORTVERSION} \
 		libnvidia-ngx.so.${PORTVERSION} \
 		libnvidia-allocator.so.${PORTVERSION} \
 		libnvidia-opticalflow.so.${PORTVERSION}
 LINUX_LINKS+=	libnvidia-nvvm.so.${PORTVERSION} libnvidia-nvvm.so.4 \
 		libnvidia-nvvm.so.${PORTVERSION} libnvidia-nvvm.so \
 		libnvidia-opticalflow.so.${PORTVERSION} libnvidia-opticalflow.so.1 \
 		libnvidia-opticalflow.so.${PORTVERSION} libnvidia-opticalflow.so \
 		libnvoptix.so.${PORTVERSION} libnvoptix.so.1 \
 		libnvoptix.so.${PORTVERSION} libnvoptix.so
 LINUX32_LIBS+=  libnvidia-nvvm.so.${PORTVERSION} \
 		libnvidia-allocator.so.${PORTVERSION} \
 		libnvidia-opticalflow.so.${PORTVERSION}
 LINUX32_LINKS+= libnvidia-nvvm.so.${PORTVERSION} libnvidia-nvvm.so.4 \
 		libnvidia-nvvm.so.${PORTVERSION} libnvidia-nvvm.so
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvoptix\.so,d' \
 		'\,${LINUXBASE}.*libnvidia-(allocator|egl-gbm|ngx|nvvm|opticalflow),d'
 .endif
 
 PLIST_SUB+=	LINUXBASE=${LINUXBASE} \
 		LINUX_LIBDIR=${LINUX_LIBDIR} \
 		SHLIB_VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT} != c6
 USE_LINUX+=	libglvnd
 PLIST_RE+=	'\,${LINUXBASE}.*libEGL\.so,d' \
 		'\,${LINUXBASE}.*libGL\.so,d' \
 		'\,${LINUXBASE}.*libGLESv(1_CM|2)\.so,d' \
 		'\,${LINUXBASE}.*libGLX\.so,d' \
 		'\,${LINUXBASE}.*libGLdispatch\.so,d' \
 		'\,${LINUXBASE}.*libOpenGL\.so,d'
 .else
 .if ${NVVERSION} >= 390.042
 LINUX_LIBS+=	libEGL.so.1.1.0
 LINUX_LINKS+=	libEGL.so.1.1.0 libEGL.so.1
 LINUX32_LIBS+=	libEGL.so.1.1.0
 LINUX32_LINKS+=	libEGL.so.1.1.0 libEGL.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libEGL\.so)\.X/\1.1.1.0/'
 .elif ${NVVERSION} >= 355.006
 LINUX_LIBS+=	libEGL.so.1
 LINUX32_LIBS+=	libEGL.so.1
 PLIST_RE+=	'\,${LINUXBASE}.*libEGL\.so\.X,d'
 .elif ${NVVERSION} >= 331.013
 LINUX_LIBS+=	libEGL.so.${PORTVERSION}
 LINUX_LINKS+=	libEGL.so.${PORTVERSION} libEGL.so.1
 LINUX32_LIBS+=	libEGL.so.${PORTVERSION}
 LINUX32_LINKS+=	libEGL.so.${PORTVERSION} libEGL.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libEGL\.so)\.X/\1.${PORTVERSION}/'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libEGL\.so,d'
 .endif
 .if ${NVVERSION} >= 390.042
 LINUX_LIBS+=	libGL.so.1.7.0
 LINUX_LINKS+=	libGL.so.1.7.0 libGL.so.1
 LINUX32_LIBS+=	libGL.so.1.7.0
 LINUX32_LINKS+=	libGL.so.1.7.0 libGL.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libGL\.so)\.X/\1.1.7.0/'
 .elif ${NVVERSION} >= 361.028
 LINUX_LIBS+=	libGL.so.1.0.0
 LINUX_LINKS+=	libGL.so.1.0.0 libGL.so.1
 LINUX32_LIBS+=	libGL.so.1.0.0
 LINUX32_LINKS+=	libGL.so.1.0.0 libGL.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libGL\.so)\.X/\1.1.0.0/'
 .elif ${NVVERSION} >= 361.016
 LINUX_LIBS+=	libGL.so.1
 LINUX32_LIBS+=	libGL.so.1
 PLIST_RE+=	'\,${LINUXBASE}.*libGL\.so\.X,d'
 .else
 LINUX_LIBS+=	libGL.so.${PORTVERSION}
 LINUX_LINKS+=	libGL.so.${PORTVERSION} libGL.so.1
 LINUX32_LIBS+=	libGL.so.${PORTVERSION}
 LINUX32_LINKS+=	libGL.so.${PORTVERSION} libGL.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libGL\.so)\.X/\1.${PORTVERSION}/'
 .endif
 .if ${NVVERSION} >= 390.042
 LINUX_LIBS+=	libGLESv1_CM.so.1.2.0 \
 		libGLESv2.so.2.1.0
 LINUX_LINKS+=	libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1 \
 		libGLESv2.so.2.1.0 libGLESv2.so.2
 LINUX32_LIBS+=	libGLESv1_CM.so.1.2.0 \
 		libGLESv2.so.2.1.0
 LINUX32_LINKS+=	libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1 \
 		libGLESv2.so.2.1.0 libGLESv2.so.2
 PLIST_RE+=	'\,${LINUXBASE},s/(libGLESv1_CM\.so)\.X/\1.1.2.0/' \
 		'\,${LINUXBASE},s/(libGLESv2\.so)\.X/\1.2.1.0/'
 .elif ${NVVERSION} >= 361.016
 LINUX_LIBS+=	libGLESv1_CM.so.1 \
 		libGLESv2.so.2
 LINUX32_LIBS+=	libGLESv1_CM.so.1 \
 		libGLESv2.so.2
 PLIST_RE+=	'\,${LINUXBASE}.*GLESv(1_CM|2)\.so\.X,d'
 .elif ${NVVERSION} >= 331.013
 LINUX_LIBS+=	libGLESv1_CM.so.${PORTVERSION} \
 		libGLESv2.so.${PORTVERSION}
 LINUX_LINKS+=	libGLESv1_CM.so.${PORTVERSION} libGLESv1_CM.so.1 \
 		libGLESv2.so.${PORTVERSION} libGLESv2.so.2
 LINUX32_LIBS+=	libGLESv1_CM.so.${PORTVERSION} \
 		libGLESv2.so.${PORTVERSION}
 LINUX32_LINKS+=	libGLESv1_CM.so.${PORTVERSION} libGLESv1_CM.so.1 \
 		libGLESv2.so.${PORTVERSION} libGLESv2.so.2
 PLIST_RE+=	'\,${LINUXBASE},s/(libGLESv(1_CM|2)\.so)\.X/\1.${PORTVERSION}/'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libGLESv(1_CM|2)\.so,d'
 .endif
 .if ${NVVERSION} >= 361.016
 LINUX_LIBS+=	libGLX.so.0
 LINUX32_LIBS+=	libGLX.so.0
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libGLX\.so,d'
 .endif
 .if ${NVVERSION} >= 355.006
 LINUX_LIBS+=	libGLdispatch.so.0 \
 		libOpenGL.so.0
 LINUX32_LIBS+=	libGLdispatch.so.0 \
 		libOpenGL.so.0
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libGLdispatch\.so,d' \
 		'\,${LINUXBASE}.*libOpenGL\.so,d'
 .endif
 .endif	# ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT} != c6
 
 .if ${ARCH} == amd64
 .if ${NVVERSION} >= 310.014
 LINUX32_LIBS+=	libnvcuvid.so.${PORTVERSION}
 LINUX32_LINKS+=	libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \
 		libnvcuvid.so.${PORTVERSION} libnvcuvid.so
 .else
 PLIST_RE+=	'\,${LINUXBASE}/usr/lib/libnvcuvid\.so,d'
 .endif
 .endif
 
 .if ${ARCH} == amd64
 PLIST_SUB+=	LINUX32=""
 .else
 PLIST_SUB+=	LINUX32="@comment "
 .endif
 
 do-extract:
 	@(cd ${WRKDIR} && ${SH} \
 		${DISTDIR}/NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}.run \
 		--extract-only > /dev/null)
 
 post-patch:
 .if ${NVVERSION} >= 384.047 && ${NVVERSION} < 435.017
 	@${SED} 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' \
 		${WRKSRC}/nvidia_icd.json.template > \
 		${WRKSRC}/nvidia_icd.json
 .endif
 
 do-install:
 # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
 .if ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019 || ${NVVERSION} >= 361.016
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/libvdpau(_trace)?\.so/d;}' \
 		${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 310.019
 	${REINPLACE_CMD} -e '\,${LINUXBASE},!{/libXvMCNVIDIA/d;}' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 331.013 || ${ARCH} == amd64 && ${NVVERSION} < 334.016
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d;}' \
 		${TMPPLIST}
 .endif
 .if ${NVVERSION} < 352.009
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/(lib)?nvidia-(debugdump|smi|ml)/d;}' \
 		${TMPPLIST}
 .endif
 .if ${NVVERSION} < 355.006
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/(libEGL_nvidia|GLdispatch|OpenGL)/d;}' \
 		${TMPPLIST}
 .else
 	${REINPLACE_CMD} '\,${LINUXBASE},!s/libEGL\.so\.${PORTVERSION}/libEGL.so/' \
 		${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 361.028
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/(EGL_nvidia\.so|GLESv[12](_CM)?(\.so\.[0-9]+\.[0-9]+))$$/d;}' \
 		${TMPPLIST}
 .else
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/\/lib\/libGLESv[12](_CM)?(\.so)?(_nvidia.so(\.[0-9]|\.[0-9]+\.[0-9]+)?)?$$/d ; \
 		/libEGL_nvidia\.so\.${PORTVERSION}/d;}' ${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 415.013
 	${REINPLACE_CMD} -e '/tls\/libnvidia-tls\.so/d' ${TMPPLIST}
 .endif
 	${REINPLACE_CMD} -E ${PLIST_RE:S/^/-e /} ${TMPPLIST}
 .for f d in ${LINUX_DATA}
 	${MKDIR} ${STAGEDIR}${LINUXBASE}${d}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${LINUXBASE}${d}
 .endfor
 	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/nvidia-bug-report.sh \
 		${STAGEDIR}${LINUXBASE}/usr/bin
 .for p in ${LINUX_PROGS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${p} ${STAGEDIR}${LINUXBASE}/usr/bin
 .endfor
 	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/share/man/man1
 .for m in ${LINUX_MANS}
 	${INSTALL_MAN} ${WRKSRC}/${m}.1.gz \
 		${STAGEDIR}${LINUXBASE}/usr/share/man/man1
 .endfor
 	${MKDIR} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/tls
 	${MKDIR} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/vdpau
 .for l in ${LINUX_LIBS}
 	${INSTALL_LIB} ${WRKSRC}/${l} \
 		${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${l}
 .endfor
 .for s t in ${LINUX_LINKS}
 	${RLN} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${s} \
 		${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${t}
 .endfor
 .if ${ARCH} == amd64
 	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/tls
 	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/vdpau
 .for l in ${LINUX32_LIBS}
 	${INSTALL_LIB} ${WRKSRC}/32/${l} \
 		${STAGEDIR}${LINUXBASE}/usr/lib/${l}
 .endfor
 .for s t in ${LINUX32_LINKS}
 	${RLN} ${STAGEDIR}${LINUXBASE}/usr/lib/${s} \
 		${STAGEDIR}${LINUXBASE}/usr/lib/${t}
 .endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
index 6141edfc2152..57b7fbdf509b 100644
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,17 +1,17 @@
-TIMESTAMP = 1729779155
-SHA256 (NVIDIA-Linux-x86_64-550.127.05.run) = d384f34f5d2a896bd7536d3deb6a6d973d8094a3ad485a1c2ee3bf5192086ae9
-SIZE (NVIDIA-Linux-x86_64-550.127.05.run) = 307139930
+TIMESTAMP = 1740842371
+SHA256 (NVIDIA-Linux-x86_64-570.124.04.run) = 1b786a4b7122d7c4216c58ae4007688a4f778c196c148d919163815ee10d53c4
+SIZE (NVIDIA-Linux-x86_64-570.124.04.run) = 375582187
 SHA256 (NVIDIA-Linux-x86_64-470.161.03.run) = 5da82a7f8c76e781e7d7f0be7b798db4d344f26bd4facf9abcf3c71c71fe7640
 SIZE (NVIDIA-Linux-x86_64-470.161.03.run) = 272397700
 SHA256 (NVIDIA-Linux-x86_64-390.154.run) = f4420280c55210964c008d5b724f2615845d47ad4c9c05d8ed26a62fc6331f7c
 SIZE (NVIDIA-Linux-x86_64-390.154.run) = 84438529
 SHA256 (NVIDIA-Linux-x86-390.154.run) = 5ee871b84bd9f28e225b7a3e5f1be1f9e2d0067f37b8d6b8d0c251702f06d3e7
 SIZE (NVIDIA-Linux-x86-390.154.run) = 49362860
 SHA256 (NVIDIA-Linux-x86_64-340.108.run) = c671d4f1b7c09bc1af079b98b447adb06d704b04f802f7045a611fa50133b71b
 SIZE (NVIDIA-Linux-x86_64-340.108.run) = 70165522
 SHA256 (NVIDIA-Linux-x86-340.108.run) = 2032aad612d9f3af1aecf979cfdfe423d79aa76929ef8bf8d3a403076f507cca
 SIZE (NVIDIA-Linux-x86-340.108.run) = 38902892
 SHA256 (NVIDIA-Linux-x86_64-304.137.run) = eb1f56db3a2bea13e3ccde7b5ae14abe8cd6c6dbe69af4c71c68a623cc96e3e2
 SIZE (NVIDIA-Linux-x86_64-304.137.run) = 70087133
 SHA256 (NVIDIA-Linux-x86-304.137.run) = ca98379fc2090bdfe8b74113d6ac7bcc7eadbd86a489c3c4ec4cd5ba9f6064f8
 SIZE (NVIDIA-Linux-x86-304.137.run) = 41504115
diff --git a/x11/linux-nvidia-libs/pkg-plist b/x11/linux-nvidia-libs/pkg-plist
index 0461c08ef9eb..f1c15947850f 100644
--- a/x11/linux-nvidia-libs/pkg-plist
+++ b/x11/linux-nvidia-libs/pkg-plist
@@ -1,203 +1,220 @@
 %%LINUXBASE%%/etc/OpenCL/vendors/nvidia.icd
 %%LINUXBASE%%/etc/vulkan/icd.d/nvidia_icd.json
 %%LINUXBASE%%/usr/bin/nvidia-bug-report.sh
 %%LINUXBASE%%/usr/bin/nvidia-cuda-mps-control
 %%LINUXBASE%%/usr/bin/nvidia-cuda-mps-server
 %%LINUXBASE%%/usr/bin/nvidia-debugdump
 %%LINUXBASE%%/usr/bin/nvidia-persistenced
 %%LINUXBASE%%/usr/bin/nvidia-settings
 %%LINUXBASE%%/usr/bin/nvidia-smi
 %%LINUXBASE%%/usr/bin/nvidia-xconfig
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL.so.X
 %%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libEGL.so.1.0.0 ] || ln -sf libEGL.so.1.0.0 %%LINUXBASE%%/usr/lib/libEGL.so.1
 %%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libEGL.so.1.1.0 ] || ln -sf libEGL.so.1.1.0 %%LINUXBASE%%/usr/lib/libEGL.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.0
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGL.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGL.so.X
 %%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGL.so.1.2.0 ] || ln -sf libGL.so.1.2.0 %%LINUXBASE%%/usr/lib/libGL.so.1
 %%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGL.so.1.7.0 ] || ln -sf libGL.so.1.7.0 %%LINUXBASE%%/usr/lib/libGL.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.X
 %%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1.2.0 ] || ln -sf libGLESv1_CM.so.1.2.0 %%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM_nvidia.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM_nvidia.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2.so.2
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2.so.X
 %%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGLESv2.so.2.1.0 ] || ln -sf libGLESv2.so.2.1.0 %%LINUXBASE%%/usr/lib/libGLESv2.so.2
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2_nvidia.so.2
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2_nvidia.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX.so.0
 %%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGLX.so.0.0.0 ] || ln -sf libGLX.so.0.0.0 %%LINUXBASE%%/usr/lib/libGLX.so.0
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX_indirect.so.0
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX_nvidia.so.0
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX_nvidia.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLdispatch.so.0
 %%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGLdispatch.so.0.0.0 ] || ln -sf libGLdispatch.so.0.0.0 %%LINUXBASE%%/usr/lib/libGLdispatch.so.0
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libOpenGL.so.0
 %%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libOpenGL.so.0.0.0 ] || ln -sf libOpenGL.so.0.0.0 %%LINUXBASE%%/usr/lib/libOpenGL.so.0
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libcuda.so
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libcuda.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libcuda.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvcuvid.so
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvcuvid.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvcuvid.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-allocator.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-compiler.so.%%SHLIB_VERSION%%
+%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-gbm.so
+%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-gbm.so.1
+%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-gbm.so.X
+%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xcb.so
+%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xcb.so.1
+%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xcb.so.X
+%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xlib.so
+%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xlib.so.1
+%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xlib.so.X
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-eglcore.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fatbinaryloader.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glsi.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-gpucomp.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ml.so
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ml.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ml.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-opencl.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-opencl.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-opticalflow.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ptxjitcompiler.so
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ptxjitcompiler.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ptxjitcompiler.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-tls.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libvdpau_nvidia.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-nvvm.so
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-nvvm.so.4
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-nvvm.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/tls/libnvidia-tls.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/vdpau/libvdpau_nvidia.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.X
 @postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1.0.0 ] || ln -sf libEGL.so.1.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1
 @postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1.1.0 ] || ln -sf libEGL.so.1.1.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL_nvidia.so.0
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL_nvidia.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.X
 @postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1.2.0 ] || ln -sf libGL.so.1.2.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
 @postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1.7.0 ] || ln -sf libGL.so.1.7.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.X
 @postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.1.2.0 ] || ln -sf libGLESv1_CM.so.1.2.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM_nvidia.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM_nvidia.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.2
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.X
 @postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.2.1.0 ] || ln -sf libGLESv2.so.2.1.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.2
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2_nvidia.so.2
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2_nvidia.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX.so.0
 @postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX.so.0.0.0 ] || ln -sf libGLX.so.0.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX.so.0
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_indirect.so.0
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_nvidia.so.0
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_nvidia.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLdispatch.so.0
 @postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLdispatch.so.0.0.0 ] || ln -sf libGLdispatch.so.0.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLdispatch.so.0
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libOpenGL.so.0
 @postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libOpenGL.so.0.0.0 ] || ln -sf libOpenGL.so.0.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libOpenGL.so.0
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA_dynamic.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA_dynamic.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-allocator.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cbl.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-compiler.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-gbm.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-gbm.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-gbm.so.X
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-wayland.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-wayland.so.X
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-xcb.so
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-xcb.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-xcb.so.X
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-xlib.so
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-xlib.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-xlib.so.X
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-eglcore.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fatbinaryloader.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glcore.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glsi.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gpucomp.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk2.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk3.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opticalflow.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opticalflow.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opticalflow.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-rtcore.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-tls.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libvdpau_nvidia.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvoptix.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvoptix.so.1
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvoptix.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-nvvm.so
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-nvvm.so.4
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-nvvm.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ngx.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/tls/libnvidia-tls.so.%%SHLIB_VERSION%%
 %%LINUXBASE%%%%LINUX_LIBDIR%%/vdpau/libvdpau_nvidia.so.1
 %%LINUXBASE%%/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json
+%%LINUXBASE%%/usr/share/egl/egl_external_platform.d/20_nvidia_xcb.json
+%%LINUXBASE%%/usr/share/egl/egl_external_platform.d/20_nvidia_xlib.json
 %%LINUXBASE%%/usr/share/glvnd/egl_vendor.d/10_nvidia.json
 %%LINUXBASE%%/usr/share/man/man1/nvidia-cuda-mps-control.1.gz
 %%LINUXBASE%%/usr/share/man/man1/nvidia-persistenced.1.gz
 %%LINUXBASE%%/usr/share/man/man1/nvidia-settings.1.gz
 %%LINUXBASE%%/usr/share/man/man1/nvidia-smi.1.gz
 %%LINUXBASE%%/usr/share/man/man1/nvidia-xconfig.1.gz
 %%LINUXBASE%%/usr/share/nvidia/monitoring.conf
 %%LINUXBASE%%/usr/share/nvidia/nvidia-application-profiles-%%SHLIB_VERSION%%-key-documentation
 %%LINUXBASE%%/usr/share/nvidia/nvidia-application-profiles-%%SHLIB_VERSION%%-rc
 %%LINUXBASE%%/usr/share/nvidia/pci.ids
 @postexec %%LINUXBASE%%/sbin/ldconfig
 @postunexec %%LINUXBASE%%/sbin/ldconfig
 @dir %%LINUXBASE%%/etc/OpenCL/vendors
 @dir %%LINUXBASE%%/etc/OpenCL
 @dir %%LINUXBASE%%/etc/vulkan/icd.d
 @dir %%LINUXBASE%%/etc/vulkan
 @dir %%LINUXBASE%%/etc
 @dir %%LINUXBASE%%/usr/bin
 %%LINUX32%%@dir %%LINUXBASE%%/usr/lib/tls
 %%LINUX32%%@dir %%LINUXBASE%%/usr/lib/vdpau
 %%LINUX32%%@dir %%LINUXBASE%%/usr/lib
 @dir %%LINUXBASE%%%%LINUX_LIBDIR%%/tls
 @dir %%LINUXBASE%%%%LINUX_LIBDIR%%/vdpau
 @dir %%LINUXBASE%%%%LINUX_LIBDIR%%
 @dir %%LINUXBASE%%/usr/share/egl/egl_external_platform.d
 @dir %%LINUXBASE%%/usr/share/egl
 @dir %%LINUXBASE%%/usr/share/glvnd/egl_vendor.d
 @dir %%LINUXBASE%%/usr/share/glvnd
 @dir %%LINUXBASE%%/usr/share/man/man1
 @dir %%LINUXBASE%%/usr/share/man
 @dir %%LINUXBASE%%/usr/share/nvidia
 @dir %%LINUXBASE%%/usr/share
 @dir %%LINUXBASE%%/usr
 @dir %%LINUXBASE%%
 @dir /compat
diff --git a/x11/nvidia-driver/Makefile.version b/x11/nvidia-driver/Makefile.version
index 03d4d5525224..19c00c4c29b6 100644
--- a/x11/nvidia-driver/Makefile.version
+++ b/x11/nvidia-driver/Makefile.version
@@ -1,4 +1,4 @@
 # NVIDIA Distversion
 #
 # This will be included from x11/nvidia-driver and the nvidia-drm port
-NVIDIA_DISTVERSION = 550.127.05
+NVIDIA_DISTVERSION = 570.124.04
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 8243d14c80f8..c83dc8161d75 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,17 +1,17 @@
-TIMESTAMP = 1729779540
-SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3
-SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432
+TIMESTAMP = 1740840763
+SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
+SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
 SHA256 (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 54f87e6cadc4aedebc4f862e3d25657fddb867ddc3fe01ad06c9d54bcfa8d607
 SIZE (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 99719576
 SHA256 (NVIDIA-FreeBSD-x86_64-390.154.tar.gz) = 5994c77c3510a4a89076ecf2bf402f1da635b250cca07655efc913f2a94bee84
 SIZE (NVIDIA-FreeBSD-x86_64-390.154.tar.gz) = 65339271
 SHA256 (NVIDIA-FreeBSD-x86-390.154.tar.gz) = 43fdb7ec369b747a2a6311fca6eca11a9ebd121236c6e59590659625dd799cc6
 SIZE (NVIDIA-FreeBSD-x86-390.154.tar.gz) = 65996926
 SHA256 (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = f58fc793995008fd07719e3d001b1ad4b3547cfbc7084aec769098daa02e336f
 SIZE (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = 61500286
 SHA256 (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 87b8523fb29e2bf51c2daf555e6dc46bbc6e5fd76b07a2034d3a5485a7cf99bf
 SIZE (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 60616768
 SHA256 (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 231693189e1bdf5c1dd02315cde5ef9ed6c0854564314438f2f40f9788a34120
 SIZE (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 36474676
 SHA256 (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 5f874133853eacc5b9a10311cec22d3c4898db7f75b92bb6c12d5be5126516fb
 SIZE (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 35399011