5 files changed, 52 insertions, 16 deletions

diff --git a/x11/nvidia-driver-340/Makefile b/x11/nvidia-driver-340/Makefile
index 745d846c5db5..1ac6fc4dd6d7 100644
--- a/x11/nvidia-driver-340/Makefile
+++ b/x11/nvidia-driver-340/Makefile
@@ -1,9 +1,9 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION=	340.107
+DISTVERSION=	340.108
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	6
+PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-340
diff --git a/x11/nvidia-driver-390/Makefile b/x11/nvidia-driver-390/Makefile
index c18b4e893b4a..67c9a5faebaa 100644
--- a/x11/nvidia-driver-390/Makefile
+++ b/x11/nvidia-driver-390/Makefile
@@ -1,9 +1,9 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION=	390.129
+DISTVERSION=	390.132
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	1
+PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-390
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 97937a1ca5f3..338fd0a72043 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?=	440.31
+DISTVERSION?=	440.59
 # 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}
@@ -250,6 +250,9 @@ post-install: .SILENT
 	${REINPLACE_CMD} -e '/libnvidia-egl-wayland\.so/d ; \
 		/10_nvidia_wayland\.json/d' ${TMPPLIST}
 .endif
+.if ${NVVERSION} < 440.036
+	${REINPLACE_CMD} -e '/lib32\//d' ${TMPPLIST}
+.endif
 # Rename some libraries and install a libmap file to resolve conflict with
 # Mesa libraries.
 	${LN} -sf libGL-NVIDIA.so.1 \
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 8d1099eb3297..756dddb48adf 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,14 +1,14 @@
 TIMESTAMP = 1482026038
-SHA256 (NVIDIA-FreeBSD-x86_64-440.31.tar.gz) = 6b47958be52d35ec344c920969b59965fd7e84bf1b831cb7e4a75347c59f8bc8
-SIZE (NVIDIA-FreeBSD-x86_64-440.31.tar.gz) = 65011247
-SHA256 (NVIDIA-FreeBSD-x86_64-390.129.tar.gz) = fa109c9737a529c87efe66c3bc0a47bffa49278d6361aebc1bf6b784eb5d6968
-SIZE (NVIDIA-FreeBSD-x86_64-390.129.tar.gz) = 63905694
-SHA256 (NVIDIA-FreeBSD-x86-390.129.tar.gz) = 58e537c1a016e4fd362590e32c6f874ccdd90ce265839eb30cf370afcdc22bae
-SIZE (NVIDIA-FreeBSD-x86-390.129.tar.gz) = 64565178
-SHA256 (NVIDIA-FreeBSD-x86_64-340.107.tar.gz) = 047efae28cc81e4d56c64d2a0c15d9b7ff07f09bba22696464de8276334a4df7
-SIZE (NVIDIA-FreeBSD-x86_64-340.107.tar.gz) = 61179967
-SHA256 (NVIDIA-FreeBSD-x86-340.107.tar.gz) = 1978ae48512d8a693979b153463c76954d2aec91a6b2a568b3aa1198e5b3d199
-SIZE (NVIDIA-FreeBSD-x86-340.107.tar.gz) = 60305952
+SHA256 (NVIDIA-FreeBSD-x86_64-440.59.tar.gz) = a62f4f15ef8a40db3fac834bb2df3b699bf614c7081797665501cebfa29e62f0
+SIZE (NVIDIA-FreeBSD-x86_64-440.59.tar.gz) = 82197680
+SHA256 (NVIDIA-FreeBSD-x86_64-390.132.tar.gz) = 5f7d05c39d9000bd284a34a3278f224a6c49909a6c945667e7dff1abd7541584
+SIZE (NVIDIA-FreeBSD-x86_64-390.132.tar.gz) = 64206643
+SHA256 (NVIDIA-FreeBSD-x86-390.132.tar.gz) = da09a7db4531f54572a7aa8282626a79214bddabfa5695423321d856749015e4
+SIZE (NVIDIA-FreeBSD-x86-390.132.tar.gz) = 64863740
+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
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 4004774a278c..13b98221601f 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -45,6 +45,39 @@ lib/libnvidia-tls.so
 lib/libnvidia-tls.so.1
 lib/libvdpau_nvidia.so
 lib/vdpau/libvdpau_nvidia.so.1
+lib32/libEGL.so
+lib32/libEGL.so.1
+lib32/libEGL_nvidia.so
+lib32/libEGL_nvidia.so.0
+lib32/libGL.so
+lib32/libGL.so.1
+lib32/libGLESv1_CM.so
+lib32/libGLESv1_CM.so.1
+lib32/libGLESv1_CM_nvidia.so
+lib32/libGLESv1_CM_nvidia.so.1
+lib32/libGLESv2.so
+lib32/libGLESv2.so.2
+lib32/libGLESv2_nvidia.so
+lib32/libGLESv2_nvidia.so.2
+lib32/libGLX.so
+lib32/libGLX.so.0
+lib32/libGLX_nvidia.so
+lib32/libGLX_nvidia.so.0
+lib32/libGLdispatch.so
+lib32/libGLdispatch.so.0
+lib32/libOpenGL.so
+lib32/libOpenGL.so.0
+lib32/libnvidia-cfg.so
+lib32/libnvidia-cfg.so.1
+lib32/libnvidia-eglcore.so
+lib32/libnvidia-eglcore.so.1
+lib32/libnvidia-glcore.so
+lib32/libnvidia-glcore.so.1
+lib32/libnvidia-glsi.so
+lib32/libnvidia-glsi.so.1
+lib32/libnvidia-tls.so
+lib32/libnvidia-tls.so.1
+lib32/vdpau/libvdpau_nvidia.so.1
 man/man1/nvidia-smi.1.gz
 share/egl/egl_external_platform.d/10_nvidia_wayland.json
 share/glvnd/egl_vendor.d/10_nvidia.json