5 files changed, 17 insertions, 8 deletions
diff --git a/x11/nvidia-driver-devel/Makefile b/x11/nvidia-driver-devel/Makefile
index d3e7258c8852..71f2eab631d2 100644
--- a/x11/nvidia-driver-devel/Makefile
+++ b/x11/nvidia-driver-devel/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION=	575.64
+DISTVERSION?=	580.82.07
 # Explicitly set PORTREVISION as it can be overridden by the master port
 PORTREVISION=	0
 
diff --git a/x11/nvidia-driver-devel/distinfo b/x11/nvidia-driver-devel/distinfo
index 28b3f5dc73eb..de3dcef82703 100644
--- a/x11/nvidia-driver-devel/distinfo
+++ b/x11/nvidia-driver-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1750495890
-SHA256 (NVIDIA-FreeBSD-x86_64-575.64.tar.xz) = 8b1392a796ac04738b11d8f74713d1c8be3ecbd1af8363ba8ba3599204b56057
-SIZE (NVIDIA-FreeBSD-x86_64-575.64.tar.xz) = 287791452
+TIMESTAMP = 1756835740
+SHA256 (NVIDIA-FreeBSD-x86_64-580.82.07.tar.xz) = 76b6f0b8eeea20b878da7abb3eef5dd9515e6df83e4377cfa9380ac152614977
+SIZE (NVIDIA-FreeBSD-x86_64-580.82.07.tar.xz) = 288619796
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index dcc5da991172..ad87c00eb3fd 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -321,6 +321,15 @@ post-patch: .SILENT
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile
 .endif
+# DMAP_MIN_ADDRESS and DMAP_MAX_ADDRESS is deleted from src at commit
+# 4dd828c80828637452a8a4e07a64e294c82e5d8b on main branch.
+# Note that there are about 10 days of broken window, as the commit
+# does not have corresponding version bump.
+.if ${OSVERSION} >= 1500051
+	${REINPLACE_CMD} -e 's/DMAP_MIN_ADDRESS/kva_layout.dmap_low/' \
+		-e 's/DMAP_MAX_ADDRESS/kva_layout.dmap_high/' \
+		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
+.endif
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${MODULESDIR}/drivers \
diff --git a/x11/nvidia-driver/Makefile.version b/x11/nvidia-driver/Makefile.version
index bcc6945ffc97..8ee3aa0f5229 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?= 570.169
+NVIDIA_DISTVERSION?= 580.82.07
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 1763322181a0..6a75d81814df 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1750203781
-SHA256 (NVIDIA-FreeBSD-x86_64-570.169.tar.xz) = 1d132020452851b3122dd38ae96eb578a510755c73c417db788611ede51e76ce
-SIZE (NVIDIA-FreeBSD-x86_64-570.169.tar.xz) = 261338796
+TIMESTAMP = 1756835672
+SHA256 (NVIDIA-FreeBSD-x86_64-580.82.07.tar.xz) = 76b6f0b8eeea20b878da7abb3eef5dd9515e6df83e4377cfa9380ac152614977
+SIZE (NVIDIA-FreeBSD-x86_64-580.82.07.tar.xz) = 288619796