- Update legacy drivers to their most recent versions

- Patch for updated d_mmap() in recent -CURRENT where applicable
- Adjust FreeBSD version requirement (legacy drivers work on older releases,
  contrary to 195.22 beta)

Feature safe:	yes

5 files changed, 20 insertions, 13 deletions

diff --git a/x11/nvidia-driver-173/Makefile b/x11/nvidia-driver-173/Makefile
index 60fabbb8864f..bb08904f4208 100644
--- a/x11/nvidia-driver-173/Makefile
+++ b/x11/nvidia-driver-173/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-DISTVERSION=	173.14.20
+DISTVERSION=	173.14.25
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 NO_LATEST_LINK=	yes
diff --git a/x11/nvidia-driver-71/Makefile b/x11/nvidia-driver-71/Makefile
index 20c73bdd448e..b985ceff2450 100644
--- a/x11/nvidia-driver-71/Makefile
+++ b/x11/nvidia-driver-71/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-DISTVERSION=	71.86.11
+DISTVERSION=	71.86.13
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 NO_LATEST_LINK=	yes
diff --git a/x11/nvidia-driver-96/Makefile b/x11/nvidia-driver-96/Makefile
index 13cee339bf5e..36782f16d510 100644
--- a/x11/nvidia-driver-96/Makefile
+++ b/x11/nvidia-driver-96/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-DISTVERSION=	96.43.13
+DISTVERSION=	96.43.16
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 NO_LATEST_LINK=	yes
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 8f0df4105048..91fe5b42172a 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -79,7 +79,7 @@ PLIST_SUB+=	LINUX="@comment "
 MAKE_ENV+=	WITHOUT_LINUX=yes
 .endif
 
-.if ${OSVERSION} < 702106
+.if ${OSVERSION} < 702106 && ${NVVERSION} == 1952200
 IGNORE=		requires fairly recent FreeBSD-STABLE, or FreeBSD-CURRENT
 .endif
 
@@ -90,6 +90,13 @@ LIB_DEPENDS+=	m.3:${PORTSDIR}/misc/compat5x
 post-patch: .SILENT
 # We should support -CURRENT: kill the check
 	${REINPLACE_CMD} '24,26d' ${WRKSRC}/src/nv-freebsd.h
+# Adjust for updated d_mmap() in recent -CURRENT
+.if ${NVVERSION} < 1952200
+	${REINPLACE_CMD} 's/vm_offset_t offset/vm_ooffset_t offset/ ; \
+		s/vm_offset_t \*address/vm_paddr_t *address/ ; \
+		s/int nprot/&, vm_memattr_t *memattr/' \
+			${WRKSRC}/src/nvidia_dev.c
+.endif
 .if defined(WITH_FREEBSD_AGP)
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
 		${WRKSRC}/src/nv-freebsd.h
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 242b877ea77b..1e1ed1532d0b 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -4,12 +4,12 @@ SIZE (NVIDIA-FreeBSD-x86-195.22.tar.gz) = 24784839
 MD5 (NVIDIA-FreeBSD-x86_64-195.22.tar.gz) = c9b0cdeb68d573556a38e16c02ffed55
 SHA256 (NVIDIA-FreeBSD-x86_64-195.22.tar.gz) = 3a6a0fc3003615c07090c04f2d5b41fa86cf8493309bf48eff8bcaa37126508c
 SIZE (NVIDIA-FreeBSD-x86_64-195.22.tar.gz) = 25503618
-MD5 (NVIDIA-FreeBSD-x86-173.14.20.tar.gz) = 54869428baee8878c04c19751a2a8047
-SHA256 (NVIDIA-FreeBSD-x86-173.14.20.tar.gz) = c5a27324d96391ada41b4ccbbf2a321c3d86693e54d1e9d1139d97c3132530f3
-SIZE (NVIDIA-FreeBSD-x86-173.14.20.tar.gz) = 16211218
-MD5 (NVIDIA-FreeBSD-x86-96.43.13.tar.gz) = a9bbcc7d0bab6fa3fd64dd7952b14e54
-SHA256 (NVIDIA-FreeBSD-x86-96.43.13.tar.gz) = 614396a11ab8b304c51721cd4b47fb82a5f75884ff77d3d414e0e5739835c738
-SIZE (NVIDIA-FreeBSD-x86-96.43.13.tar.gz) = 11057193
-MD5 (NVIDIA-FreeBSD-x86-71.86.11.tar.gz) = 5f414ee297bff0d9e70e3ce437efdbeb
-SHA256 (NVIDIA-FreeBSD-x86-71.86.11.tar.gz) = 9f7dfbb8acdc46bee3c9dd8a6ca3399946f96120e196bf49b484bacb3796aedd
-SIZE (NVIDIA-FreeBSD-x86-71.86.11.tar.gz) = 8023461
+MD5 (NVIDIA-FreeBSD-x86-173.14.25.tar.gz) = 1eca3916a9ae86b953f54405e1881774
+SHA256 (NVIDIA-FreeBSD-x86-173.14.25.tar.gz) = c432ed94ce71e297b2d9304d9f34f906b58e2c7c4bc13d8dbac264ed52fd6261
+SIZE (NVIDIA-FreeBSD-x86-173.14.25.tar.gz) = 16682722
+MD5 (NVIDIA-FreeBSD-x86-96.43.16.tar.gz) = 3fc5c2bb537d4a7664d84a7a0df09c7c
+SHA256 (NVIDIA-FreeBSD-x86-96.43.16.tar.gz) = 38bf334284dc600d92d8436333c98d5577e34d69456ed71f1cccc75caa6dffcd
+SIZE (NVIDIA-FreeBSD-x86-96.43.16.tar.gz) = 11842453
+MD5 (NVIDIA-FreeBSD-x86-71.86.13.tar.gz) = 19000b906225ebd39ca3edc1b0c3c7a5
+SHA256 (NVIDIA-FreeBSD-x86-71.86.13.tar.gz) = 27ae01cd6fe050871f7785c2146b18e74ea882f6262e46dc965bf26061238447
+SIZE (NVIDIA-FreeBSD-x86-71.86.13.tar.gz) = 8066159