4 files changed, 12 insertions, 138 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index c9ee0b71092d..23445478ffdb 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	169.07
+DISTVERSION?=	169.12
 PORTREVISION?=	0			# For consistency with slave ports
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
@@ -42,11 +42,7 @@ OPTIONS=	FREEBSD_AGP	"Use FreeBSD AGP GART driver" off \
 #
 NVVERSION?=	${DISTVERSION:S/.//g}00
 
-EXTRA_PATCHES=	${PATCHDIR}/7667-patch-lib::Makefile \
-# Legacy versions still need the locking patch
-.if ${NVVERSION} < 1000000
-EXTRA_PATCHES+=	${PATCHDIR}/${NVVERSION:C/....$//}xx-patch-*
-.endif
+EXTRA_PATCHES=	${PATCHDIR}/7667-patch-lib::Makefile
 
 .include <bsd.port.pre.mk>
 
@@ -107,7 +103,7 @@ post-patch: .SILENT
 		${WRKSRC}/src/nvidia_os.c
 .endif
 # Correct prototypes to fix the build with FreeBSD AGP support
-.if ${NVVERSION} == 1690700
+.if ${NVVERSION} >= 1690700
 	${REINPLACE_CMD} -e '337,338s/(/(nv_stack_t *, /' \
 		${WRKSRC}/src/nv-freebsd.h
 .endif
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index abf08dd081d0..2f7b39f6c917 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,9 +1,9 @@
-MD5 (NVIDIA-FreeBSD-x86-71.86.01.tar.gz) = 787e26df5818987f5189d5d75648f105
-SHA256 (NVIDIA-FreeBSD-x86-71.86.01.tar.gz) = 61f33f5735c91d7f700eaf12a586bd0ddfe12506869819e42a95c2dd2fd2b259
-SIZE (NVIDIA-FreeBSD-x86-71.86.01.tar.gz) = 8437426
-MD5 (NVIDIA-FreeBSD-x86-96.43.01.tar.gz) = 443f6e392d2cb557c6bb8e1e9890a2f6
-SHA256 (NVIDIA-FreeBSD-x86-96.43.01.tar.gz) = 75b43958ba3331dec15cb3ca72d073c428bf58e6fe766852a1b98a0cd0a74908
-SIZE (NVIDIA-FreeBSD-x86-96.43.01.tar.gz) = 9675336
-MD5 (NVIDIA-FreeBSD-x86-169.07.tar.gz) = 80223c74f7a024b30e9550bf52963a4f
-SHA256 (NVIDIA-FreeBSD-x86-169.07.tar.gz) = 9eb417d164bfa6ee53f10227b23e6fae8270bd9890b9777495460c2bbe8e332d
-SIZE (NVIDIA-FreeBSD-x86-169.07.tar.gz) = 13751526
+MD5 (NVIDIA-FreeBSD-x86-71.86.04.tar.gz) = 7401897a552506869fc64455e70e4b74
+SHA256 (NVIDIA-FreeBSD-x86-71.86.04.tar.gz) = 4a96dbeb735b326f23637bc80532d64648855dbe7733fd9ed4cb3a9e1db0caf4
+SIZE (NVIDIA-FreeBSD-x86-71.86.04.tar.gz) = 5515902
+MD5 (NVIDIA-FreeBSD-x86-96.43.05.tar.gz) = 93e8560b9e2dfd555a75e64edce7353e
+SHA256 (NVIDIA-FreeBSD-x86-96.43.05.tar.gz) = 6421d98445b7a952525af89d6c4e27d213909a8090f290789eda4698347f91ec
+SIZE (NVIDIA-FreeBSD-x86-96.43.05.tar.gz) = 6793001
+MD5 (NVIDIA-FreeBSD-x86-169.12.tar.gz) = 1e81dce17cdd2474e5492b43d0aaf804
+SHA256 (NVIDIA-FreeBSD-x86-169.12.tar.gz) = a237da7664ddcfd2f68336765734ac84de2a2ce0f6535063534b3e6f32f0ac3b
+SIZE (NVIDIA-FreeBSD-x86-169.12.tar.gz) = 13862817
diff --git a/x11/nvidia-driver/files/71xx-patch-src::nvidia.os b/x11/nvidia-driver/files/71xx-patch-src::nvidia.os
deleted file mode 100644
index ba4c497b24b3..000000000000
--- a/x11/nvidia-driver/files/71xx-patch-src::nvidia.os
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/nvidia_os.c.orig	2007-10-30 14:06:34.000000000 +0600
-+++ src/nvidia_os.c	2007-10-30 14:09:02.000000000 +0600
-@@ -550,7 +550,7 @@
-         return status;
- 
- #if __FreeBSD_version >= 500000
--    mtx_init(&mtx->mutex_mtx, "rm.mutex_mtx", NULL, MTX_SPIN | MTX_RECURSE);
-+    mtx_init(&mtx->mutex_mtx, "rm.mutex_mtx", NULL, MTX_DEF | MTX_RECURSE);
-     cv_init(&mtx->mutex_wait, "rm.mutex_wait");
- #else
-     /*
-@@ -587,13 +587,13 @@
-     struct os_mutex *mtx = semaphore;
- 
- #if __FreeBSD_version >= 500000
--    mtx_lock_spin(&mtx->mutex_mtx);
-+    mtx_lock(&mtx->mutex_mtx);
-     if (mtx->refcnt > 0)
-         rm_disable_interrupts();
-     mtx->refcnt--;
-     if (mtx->refcnt < 0)
-         cv_wait(&mtx->mutex_wait, &mtx->mutex_mtx);
--    mtx_unlock_spin(&mtx->mutex_mtx);
-+    mtx_unlock(&mtx->mutex_mtx);
- #else
-     int spl = splhigh();
-     if (mtx->refcnt > 0)
-@@ -611,14 +611,14 @@
-     struct os_mutex *mtx = semaphore;
- 
- #if __FreeBSD_version >= 500000
--    mtx_lock_spin(&mtx->mutex_mtx);
-+    mtx_lock(&mtx->mutex_mtx);
-     if (mtx->refcnt < 1) {
--        mtx_unlock_spin(&mtx->mutex_mtx);
-+        mtx_unlock(&mtx->mutex_mtx);
-         return FALSE;
-     } else {
-         rm_disable_interrupts();
-         mtx->refcnt--;
--        mtx_unlock_spin(&mtx->mutex_mtx);
-+        mtx_unlock(&mtx->mutex_mtx);
-     }
- #else
-     int spl = splhigh();
-@@ -641,13 +641,13 @@
-     struct os_mutex *mtx = semaphore;
- 
- #if __FreeBSD_version >= 500000
--    mtx_lock_spin(&mtx->mutex_mtx);
-+    mtx_lock(&mtx->mutex_mtx);
-     if (mtx->refcnt < 0)
-         cv_signal(&mtx->mutex_wait);
-     if (!mtx->refcnt)
-         rm_enable_interrupts();
-     mtx->refcnt++;
--    mtx_unlock_spin(&mtx->mutex_mtx);
-+    mtx_unlock(&mtx->mutex_mtx);
- #else
-     int spl = splhigh();
-     if (!mtx->refcnt)
diff --git a/x11/nvidia-driver/files/96xx-patch-src::nvidia.os b/x11/nvidia-driver/files/96xx-patch-src::nvidia.os
deleted file mode 100644
index eb717322c068..000000000000
--- a/x11/nvidia-driver/files/96xx-patch-src::nvidia.os
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/nvidia_os.c.orig	2007-07-24 21:06:12.000000000 +0200
-+++ src/nvidia_os.c	2007-07-24 21:17:09.000000000 +0200
-@@ -598,7 +598,7 @@
-             != RM_OK))
-         return status;
- 
--    mtx_init(&mtx->mutex_mtx, "rm.mutex_mtx", NULL, MTX_SPIN | MTX_RECURSE);
-+    mtx_init(&mtx->mutex_mtx, "rm.mutex_mtx", NULL, MTX_DEF | MTX_RECURSE);
-     cv_init(&mtx->mutex_wait, "rm.mutex_wait");
- 
-     mtx->refcnt = 1;
-@@ -624,13 +624,13 @@
- {
-     struct os_mutex *mtx = semaphore;
- 
--    mtx_lock_spin(&mtx->mutex_mtx);
-+    mtx_lock(&mtx->mutex_mtx);
-     if (mtx->refcnt > 0)
-         rm_disable_interrupts();
-     mtx->refcnt--;
-     if (mtx->refcnt < 0)
-         cv_wait(&mtx->mutex_wait, &mtx->mutex_mtx);
--    mtx_unlock_spin(&mtx->mutex_mtx);
-+    mtx_unlock(&mtx->mutex_mtx);
- 
-     return RM_OK;
- }
-@@ -639,14 +639,14 @@
- {
-     struct os_mutex *mtx = semaphore;
- 
--    mtx_lock_spin(&mtx->mutex_mtx);
-+    mtx_lock(&mtx->mutex_mtx);
-     if (mtx->refcnt < 1) {
--        mtx_unlock_spin(&mtx->mutex_mtx);
-+        mtx_unlock(&mtx->mutex_mtx);
-         return FALSE;
-     } else {
-         rm_disable_interrupts();
-         mtx->refcnt--;
--        mtx_unlock_spin(&mtx->mutex_mtx);
-+        mtx_unlock(&mtx->mutex_mtx);
-     }
- 
-     return TRUE;
-@@ -656,13 +656,13 @@
- {
-     struct os_mutex *mtx = semaphore;
- 
--    mtx_lock_spin(&mtx->mutex_mtx);
-+    mtx_lock(&mtx->mutex_mtx);
-     if (mtx->refcnt < 0)
-         cv_signal(&mtx->mutex_wait);
-     if (!mtx->refcnt)
-         rm_enable_interrupts();
-     mtx->refcnt++;
--    mtx_unlock_spin(&mtx->mutex_mtx);
-+    mtx_unlock(&mtx->mutex_mtx);
- 
-     return RM_OK;
- }