3 files changed, 30 insertions, 23 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 820074d87912..5468a6564681 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	195.22
+DISTVERSION?=	195.36.15
 PORTREVISION?=	0			# As a reminder it can be overridden
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
 ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
-.if ${DISTVERSION} == 195.22
 MASTER_SITE_SUBDIR=	XFree86/FreeBSD-x86${ARCH_SUFX}/${DISTVERSION}
-ONLY_FOR_ARCHS=	i386 amd64
-.else
-MASTER_SITE_SUBDIR=	freebsd/${DISTVERSION}
-ONLY_FOR_ARCHS=	i386
-.endif
 DISTNAME=	NVIDIA-FreeBSD-x86${ARCH_SUFX}-${DISTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -31,13 +25,6 @@ DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
 MODULESDIR=	lib/xorg/modules
 PORTDOCS=	*
 
-OPTIONS=	FREEBSD_AGP	"Use FreeBSD AGP GART driver" off \
-		ACPI_PM		"Enable support for ACPI Power Management" off \
-		LINUX		"Build with support for Linux compatibility" on
-.if ${DISTVERSION} == 195.22	# XXX should check against NVVERSION XXX
-OPTIONS+=	WBINVD		"Enable heavy-weight cache-flush logic" off
-.endif
-
 # Starting with version 1.0-7667, NVidia has dropped support for numerous
 # "legacy" GPUs.  Consult NVidia README (the Appendix) to find out whether
 # you need to use legacy driver version and install one of corresponding
@@ -53,6 +40,19 @@ NVVERSION=	${DISTVERSION:S/.//g}
 NVVERSION=	${DISTVERSION:S/.//g}00
 .endif
 
+.if ${NVVERSION} >= 1952200
+ONLY_FOR_ARCHS=	i386 amd64
+.else
+ONLY_FOR_ARCHS=	i386
+.endif
+
+OPTIONS=	FREEBSD_AGP	"Use FreeBSD AGP GART driver" off \
+		ACPI_PM		"Enable support for ACPI Power Management" off \
+		LINUX		"Build with support for Linux compatibility" on
+.if ${NVVERSION} >= 1952200
+OPTIONS+=	WBINVD		"Enable heavy-weight cache-flush logic" off
+.endif
+
 .include <bsd.port.pre.mk>
 
 # XXX Should use ${PKG_INFO} but it does not expand for some reason XXX
@@ -79,7 +79,7 @@ PLIST_SUB+=	LINUX="@comment "
 MAKE_ENV+=	WITHOUT_LINUX=yes
 .endif
 
-.if ${OSVERSION} < 702106 && ${NVVERSION} == 1952200
+.if ${OSVERSION} < 702106 && ${NVVERSION} >= 1952200
 IGNORE=		requires fairly recent FreeBSD-STABLE, or FreeBSD-CURRENT
 .endif
 
@@ -114,7 +114,7 @@ post-patch: .SILENT
 		${WRKSRC}/src/nv-freebsd.h
 .endif
 # Don't build any binaries (nvidia-settings and nvidia-xconfig) and manuals
-.if ${NVVERSION} < 974600 || ${NVVERSION} == 1952200
+.if ${NVVERSION} < 974600 || ${NVVERSION} >= 1952200
 	${REINPLACE_CMD} -E 's/(extension).*/\1/' ${WRKSRC}/x11/Makefile
 .else
 	${REINPLACE_CMD} -E 's/(lib).*/\1/' ${WRKSRC}/x11/Makefile
@@ -136,11 +136,14 @@ post-install:
 .if ${NVVERSION} < 817400
 	@${REINPLACE_CMD} '/libnvidia-cfg/d' ${TMPPLIST}
 .endif
-.if ${NVVERSION} < 974600 || ${NVVERSION} == 1952200
+.if ${NVVERSION} < 974600 || ${NVVERSION} >= 1952200
 	@${REINPLACE_CMD} '/wfb/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 1802900
 	@${REINPLACE_CMD} '/vdpau/d' ${TMPPLIST}
+.else
+	@${MKDIR} ${PREFIX}/include/vdpau
+	@${LN} -sf ${DOCSDIR}/vdpau*.h ${PREFIX}/include/vdpau
 .endif
 .if ${NVVERSION} < 1851829
 	@${REINPLACE_CMD} '/libcuda/d' ${TMPPLIST}
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 1e1ed1532d0b..db4e92e0e256 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,9 +1,9 @@
-MD5 (NVIDIA-FreeBSD-x86-195.22.tar.gz) = 2c7faa5baa155693be978c446c5d44a3
-SHA256 (NVIDIA-FreeBSD-x86-195.22.tar.gz) = 2299aeadeec81a1210d65529c17c2829fdc4d5586c46b1ae6f8b20089a2122e8
-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-195.36.15.tar.gz) = 2537ca726240344c7eaa44857e2b134e
+SHA256 (NVIDIA-FreeBSD-x86-195.36.15.tar.gz) = 21fc89fa59e2cc96e560af856a3fa583ce4bfb7975465c71170c64962201e7a1
+SIZE (NVIDIA-FreeBSD-x86-195.36.15.tar.gz) = 25614326
+MD5 (NVIDIA-FreeBSD-x86_64-195.36.15.tar.gz) = 95af03aedc818a3dfd8ae9f289746ba4
+SHA256 (NVIDIA-FreeBSD-x86_64-195.36.15.tar.gz) = d64c664398cb4dade24af6b108e03607614f1f7584c71449230c646c313d0e7e
+SIZE (NVIDIA-FreeBSD-x86_64-195.36.15.tar.gz) = 26449559
 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
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index a3a9990c4a0e..60b344d26cb0 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -10,6 +10,9 @@
 @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so
 @exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
 @unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1
+include/vdpau/vdpau.h
+include/vdpau/vdpau_x11.h
+@dirrm include/vdpau
 lib/libnvidia-tls.so.1
 lib/libnvidia-tls.so
 lib/libnvidia-cfg.so.1
@@ -30,6 +33,7 @@ lib/libXvMCNVIDIA_dynamic.so.1
 %%MODULESDIR%%/libnvidia-wfb.so.1
 %%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