Update nVidia drivers to their most recent versions: 375.39 (long lived

branch); legacy versions: 340.102 and 304.135.

PR:	216574, 217341

3 files changed, 14 insertions, 23 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 3550a5d0bda3..949603eac57a 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -10,9 +10,9 @@
 # slave ports instead (`x11/nvidia-driver-340' or `x11/nvidia-driver-304').
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	375.26
+DISTVERSION?=	375.39
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 5d77224ea964..43cfbb3c32da 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,13 +1,13 @@
 TIMESTAMP = 1482026038
-SHA256 (NVIDIA-FreeBSD-x86_64-375.26.tar.gz) = c7d32cb434f9a7e84903a1305d7577705f991fdb6eb4ab3ff79d41b2df82265d
-SIZE (NVIDIA-FreeBSD-x86_64-375.26.tar.gz) = 58287080
-SHA256 (NVIDIA-FreeBSD-x86-375.26.tar.gz) = 5249d01a21bb846a08975c4f3a90935b6dc8fd33ec8e5faa0d624ef15bcf2b88
-SIZE (NVIDIA-FreeBSD-x86-375.26.tar.gz) = 59091851
-SHA256 (NVIDIA-FreeBSD-x86_64-340.101.tar.gz) = aa75da2de6656bf8c4b8cf73b9e330b21ebc5da6de509cf90aed8a571716b111
-SIZE (NVIDIA-FreeBSD-x86_64-340.101.tar.gz) = 60860185
-SHA256 (NVIDIA-FreeBSD-x86-340.101.tar.gz) = f62038819eb4ba074e92ce8d26b6330ed3bc32d1c07bcc95f4e2964fa667e03b
-SIZE (NVIDIA-FreeBSD-x86-340.101.tar.gz) = 59992166
-SHA256 (NVIDIA-FreeBSD-x86_64-304.134.tar.gz) = 3eafced8f8095c7f1135feaadbfcc709bd7ab96bf755da52ed5ca05a473604f8
-SIZE (NVIDIA-FreeBSD-x86_64-304.134.tar.gz) = 36148973
-SHA256 (NVIDIA-FreeBSD-x86-304.134.tar.gz) = e7a164807c83ab0f1be98eb241e76db0ca481d24cd64563c44dfbd73b9067b0f
-SIZE (NVIDIA-FreeBSD-x86-304.134.tar.gz) = 35095790
+SHA256 (NVIDIA-FreeBSD-x86_64-375.39.tar.gz) = 0d58c450b3391cf28655f15505aaca8d011590efe5dd3ebc6a3212a9d7597b17
+SIZE (NVIDIA-FreeBSD-x86_64-375.39.tar.gz) = 58308585
+SHA256 (NVIDIA-FreeBSD-x86-375.39.tar.gz) = ca39ab55716516bbca62fc888ec786745a8df7f346e68703f54e1a42afad733e
+SIZE (NVIDIA-FreeBSD-x86-375.39.tar.gz) = 59111267
+SHA256 (NVIDIA-FreeBSD-x86_64-340.102.tar.gz) = 6d1108c2e8d1b25eb16cd8dc4eb221f2a20d2e4c39a515c0b5809fb407991f94
+SIZE (NVIDIA-FreeBSD-x86_64-340.102.tar.gz) = 60862932
+SHA256 (NVIDIA-FreeBSD-x86-340.102.tar.gz) = 7b4f66260a1ce6ce35b7a463f8e0ff68fec0f47202af9d243931647f3eeb1dc5
+SIZE (NVIDIA-FreeBSD-x86-340.102.tar.gz) = 59991374
+SHA256 (NVIDIA-FreeBSD-x86_64-304.135.tar.gz) = 0e415045b96bb272150d35d72c4a17c3d8e7b593dc7ffc577f6f25cc04f9de95
+SIZE (NVIDIA-FreeBSD-x86_64-304.135.tar.gz) = 36144428
+SHA256 (NVIDIA-FreeBSD-x86-304.135.tar.gz) = 3bcecc26c67588174bcee96b25f4f70265f463e4b3eb85d83363977acf3b6d33
+SIZE (NVIDIA-FreeBSD-x86-304.135.tar.gz) = 35092250
diff --git a/x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c b/x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
index 8f1019c142be..75214a8db0e4 100644
--- a/x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
+++ b/x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
@@ -9,12 +9,3 @@
      if (ref_ptr) {
          mtx_init(&ref_ptr->lock, "nvkms-ref-ptr-lock", NULL, MTX_SPIN);
          // The ref_ptr owner counts as a reference on the ref_ptr itself.
-@@ -792,7 +792,7 @@ static int nvkms_open(
-     nvkms_module.client_counter += 1;
-     sx_xunlock(&nvkms_module.lock);
- 
--    popen = nvkms_alloc(sizeof(*popen), NV_FALSE);
-+    popen = nvkms_alloc(sizeof(*popen), NV_TRUE);
-     if (popen == NULL) {
-         return ENOMEM;
-     }