- Update to catch up with latest releases from NVidia

- Drop `agpvar.h' location fix as it was integrated upstream
- Add missing libvdpau entries and cleanup pkg-plist

6 files changed, 44 insertions, 52 deletions

diff --git a/x11/nvidia-driver-173/Makefile b/x11/nvidia-driver-173/Makefile
index 7c3d2c485e0a..6c2db1bc35d2 100644
--- a/x11/nvidia-driver-173/Makefile
+++ b/x11/nvidia-driver-173/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-DISTVERSION=	173.14.12
+DISTVERSION=	173.14.18
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 
diff --git a/x11/nvidia-driver-71/Makefile b/x11/nvidia-driver-71/Makefile
index 0aa7fc308596..595063f95e34 100644
--- a/x11/nvidia-driver-71/Makefile
+++ b/x11/nvidia-driver-71/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-DISTVERSION=	71.86.06
+DISTVERSION=	71.86.09
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 
diff --git a/x11/nvidia-driver-96/Makefile b/x11/nvidia-driver-96/Makefile
index ce485e6ea203..68fd277b8e0d 100644
--- a/x11/nvidia-driver-96/Makefile
+++ b/x11/nvidia-driver-96/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-DISTVERSION=	96.43.07
+DISTVERSION=	96.43.11
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 00b4dac38adc..2530f48440a8 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	180.29
+DISTVERSION?=	180.44
 PORTREVISION?=	0			# As a reminder it can be overridden
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
@@ -74,11 +74,6 @@ 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
-# Fix `agpvar.h' location on recent -CURRENT
-.if ${OSVERSION} >= 800004
-	${REINPLACE_CMD} -e 's,pci/agpvar\.h,dev/agp/agpvar.h,' \
-		${WRKSRC}/src/nv-freebsd.h
-.endif
 # Switch from suser() to priv_check() API on recent -CURRENT
 .if ${OSVERSION} >= 800049
 	${REINPLACE_CMD} -e \
@@ -130,6 +125,10 @@ post-install:
 .if ${NVVERSION} < 974600
 	@${REINPLACE_CMD} '/wfb/d' ${TMPPLIST}
 .endif
+.if ${NVVERSION} < 1802900
+	@${REINPLACE_CMD} '/libvdpau/d' ${TMPPLIST}
+.endif
+# Some applications need this symlink (see PR ports/72877)
 	@${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 9c88c2330f28..4b12bd991c95 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,12 +1,12 @@
-MD5 (NVIDIA-FreeBSD-x86-180.29.tar.gz) = 6c8dda7fffeed7f7aaca50049f6be6ba
-SHA256 (NVIDIA-FreeBSD-x86-180.29.tar.gz) = b80d21b147c15b72ff55be2ed7d21353ab386724d4df441c6268400e3139ea66
-SIZE (NVIDIA-FreeBSD-x86-180.29.tar.gz) = 18030564
-MD5 (NVIDIA-FreeBSD-x86-173.14.12.tar.gz) = d3a622573ed0e2ef14013c51daa3c326
-SHA256 (NVIDIA-FreeBSD-x86-173.14.12.tar.gz) = 0b9849d0f2b09533c384227370c94469a45384adc216a8b716a02bfc9a7340be
-SIZE (NVIDIA-FreeBSD-x86-173.14.12.tar.gz) = 15856061
-MD5 (NVIDIA-FreeBSD-x86-96.43.07.tar.gz) = d2d32b450fdb1ac1502ee4085a9af8eb
-SHA256 (NVIDIA-FreeBSD-x86-96.43.07.tar.gz) = 99bf43c6226b6e6986e98e34bae846b270209088b1c4e8cffb7088dcf08d8126
-SIZE (NVIDIA-FreeBSD-x86-96.43.07.tar.gz) = 29368320
-MD5 (NVIDIA-FreeBSD-x86-71.86.06.tar.gz) = cc69784a5aa6dd124f15864768f67a2f
-SHA256 (NVIDIA-FreeBSD-x86-71.86.06.tar.gz) = cab7f506dc4aeb4c6f0b7ad1f4c287b753ef8f203dbabc17fd3d1f0622ec8ad4
-SIZE (NVIDIA-FreeBSD-x86-71.86.06.tar.gz) = 8021247
+MD5 (NVIDIA-FreeBSD-x86-180.44.tar.gz) = b904ffa8d50e204b7b89eee15e1e6e8e
+SHA256 (NVIDIA-FreeBSD-x86-180.44.tar.gz) = 29b996aad27f7aa2407ff33af15eac28d10a629d98021d0baa843fad5b8d8f20
+SIZE (NVIDIA-FreeBSD-x86-180.44.tar.gz) = 18591139
+MD5 (NVIDIA-FreeBSD-x86-173.14.18.tar.gz) = ad9a421ef5a29782a263facce985f00b
+SHA256 (NVIDIA-FreeBSD-x86-173.14.18.tar.gz) = 7c77dd3e442351a5e782888db93a4e2f3832396adb85f65c086ed1f1c906700a
+SIZE (NVIDIA-FreeBSD-x86-173.14.18.tar.gz) = 16203001
+MD5 (NVIDIA-FreeBSD-x86-96.43.11.tar.gz) = fe5ee7c4ae37b91c4d7d1641295af4ea
+SHA256 (NVIDIA-FreeBSD-x86-96.43.11.tar.gz) = 5e17d537ae8ef4c56cb1b95c17672865a49f3aa504775e96d61a6795f6d9c26f
+SIZE (NVIDIA-FreeBSD-x86-96.43.11.tar.gz) = 11051460
+MD5 (NVIDIA-FreeBSD-x86-71.86.09.tar.gz) = bdef215b8a56bd95a54beb8ac63bddf4
+SHA256 (NVIDIA-FreeBSD-x86-71.86.09.tar.gz) = 778f9fedf37ad08f68224b84ef366966021312417e5ec90f71a968a68a775da1
+SIZE (NVIDIA-FreeBSD-x86-71.86.09.tar.gz) = 8020966
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 29566abeb075..38903657fd2b 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -1,58 +1,51 @@
 @comment I can't add the below files to the package because pkg_delete
 @comment will complain when removing this package:
+@comment     %%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
 @comment     %%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
-@comment     %%MODULESDIR%%/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%%
-@comment     %%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%%
-@comment     lib/XXX-libGL.a.%%%%.%%LIBGLVERSION%%
 @comment     lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
 @comment They are however restored when this package is removed:
 @exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
 @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.la
 @exec mv -f %D/%%MODULESDIR%%/extensions/libglx.so %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
 @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so
-@exec mv -f %D/%%MODULESDIR%%/extensions/libGLcore.la %D/%%MODULESDIR%%/extensions/XXX-libGLcore.la.%%%%.%%XSERVVERSION%%
-@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libGLcore.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libGLcore.la
-@exec mv -f %D/%%MODULESDIR%%/extensions/libGLcore.so %D/%%MODULESDIR%%/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%%
-@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libGLcore.so
 @exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
-lib/libGL.so.1
 @unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1
-@exec ln -sf libGL.so.1 %D/lib/libGL.so
-@comment No rm -f %D/lib/libGL.so because X needs this also
+lib/libnvidia-tls.so.1
+lib/libnvidia-tls.so
+lib/libnvidia-cfg.so.1
+lib/libnvidia-cfg.so
 lib/libGLcore.so.1
-@exec ln -sf libGLcore.so.1 %D/lib/libGLcore.so
-@unexec rm -f %D/lib/libGLcore.so
+lib/libGLcore.so
+lib/libvdpau.so.1
+lib/libvdpau.so
+lib/libvdpau_nvidia.so.1
+lib/libvdpau_nvidia.so
+lib/libvdpau_trace.so.1
+lib/libvdpau_trace.so
 lib/libXvMCNVIDIA.so.1
-@exec ln -sf libXvMCNVIDIA.so.1 %D/lib/libXvMCNVIDIA.so
-@unexec rm -f %D/lib/libXvMCNVIDIA.so
-@exec ln -sf libXvMCNVIDIA.so.1 %D/lib/libXvMCNVIDIA_dynamic.so.1
-@unexec rm -f %D/lib/libXvMCNVIDIA_dynamic.so.1
-lib/libnvidia-cfg.so.1
-@exec ln -sf libnvidia-cfg.so.1 %D/lib/libnvidia-cfg.so
-@unexec rm -f %D/lib/libnvidia-cfg.so
-lib/libnvidia-tls.so.1
-@exec ln -sf libnvidia-tls.so.1 %D/lib/libnvidia-tls.so
-@unexec rm -f %D/lib/libnvidia-tls.so
+lib/libXvMCNVIDIA.so
 lib/libXvMCNVIDIA.a
+lib/libXvMCNVIDIA_dynamic.so.1
 %%MODULESDIR%%/libnvidia-wfb.so.1
-@exec mv -f %D/%%MODULESDIR%%/libwfb.so %D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%% && ln -sf libnvidia-wfb.so.1 %D/%%MODULESDIR%%/libwfb.so
-@unexec mv -f %D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/libwfb.so
 %%MODULESDIR%%/drivers/nvidia_drv.o
 %%MODULESDIR%%/drivers/nvidia_drv.so
 %%MODULESDIR%%/extensions/libglx.so.1
-@exec ln -sf libglx.so.1 %D/%%MODULESDIR%%/extensions/libglx.so
+@dirrmtry %%MODULESDIR%%/drivers
 @cwd /boot/modules
 nvidia.ko
 @unexec kldxref %D
 %%LINUX%%@cwd %%LINUXBASE%%
 %%LINUX%%usr/lib/libGL.so.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/libGL.so.1
 %%LINUX%%usr/lib/libGLcore.so.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/libGLcore.so.1
 %%LINUX%%usr/lib/libnvidia-tls.so.%%SHLIB_VERSION%%
-%%LINUX%%@exec ln -sf libGL.so.%%SHLIB_VERSION%% %D/usr/lib/libGL.so.1
-%%LINUX%%@exec ln -sf libGLcore.so.%%SHLIB_VERSION%% %D/usr/lib/libGLcore.so.1
-%%LINUX%%@exec ln -sf libnvidia-tls.so.%%SHLIB_VERSION%% %D/usr/lib/libnvidia-tls.so.1
-%%LINUX%%@unexec rm -f %D/usr/lib/libGL.so.1
-%%LINUX%%@unexec rm -f %D/usr/lib/libGLcore.so.1
-%%LINUX%%@unexec rm -f %D/usr/lib/libnvidia-tls.so.1
+%%LINUX%%usr/lib/libnvidia-tls.so.1
+%%LINUX%%usr/lib/libvdpau.so.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/libvdpau.so.1
+%%LINUX%%usr/lib/libvdpau_nvidia.so.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/libvdpau_nvidia.so
+%%LINUX%%usr/lib/libvdpau_trace.so.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/libvdpau_trace.so
 %%LINUX%%@exec %D/sbin/ldconfig -r %D
 %%LINUX%%@unexec %D/sbin/ldconfig -r %D