3 files changed, 56 insertions, 6 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 3cba6720d50f..dd5613d18757 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -82,8 +82,7 @@ NVVERSION=	7174
 PORTREVISION=	2
 EXTRA_PATCHES+=	${FILESDIR}/6113-patch-lib::Makefile
 .else
-NVVERSION=	7676
-PORTREVISION=	1
+NVVERSION=	8174
 EXTRA_PATCHES+=	${FILESDIR}/7667-*
 .endif
 .if ${OSVERSION} >= 600033
@@ -144,9 +143,16 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \
 		${WRKSRC}/src/nv-freebsd.h
 .endif
-	${REINPLACE_CMD} -E 's/(extension).*/\1/ ; /bin/d' ${WRKSRC}/x11/Makefile
+	${REINPLACE_CMD} -E 's/(extension).*/\1/ ; /bin/d ; /man/d' \
+		${WRKSRC}/x11/Makefile
 
 post-install:
+# pkg-plist is already overbloated, so use this hack instead of PLIST_SUB's
+.if ${NVVERSION} < 8174
+	@${REINPLACE_CMD} '/libnvidia-cfg/d ; /html/d' ${TMPPLIST}
+.else
+	@${REINPLACE_CMD} '/README\.Linux/d' ${TMPPLIST}
+.endif
 	${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
 .if ${OSVERSION} < 500000
 .for dev in 0 1 2 3
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 7b3cb9c4acdb..96440d987db1 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -4,6 +4,6 @@ SIZE (NVIDIA-FreeBSD-x86-1.0-6113.tar.gz) = 6215565
 MD5 (NVIDIA-FreeBSD-x86-1.0-7174.tar.gz) = b57a03e0325617092016144229ae6114
 SHA256 (NVIDIA-FreeBSD-x86-1.0-7174.tar.gz) = 926dfca6078bcaed486e0e27637faacd6a9eda7a3252d0d7779256e674776532
 SIZE (NVIDIA-FreeBSD-x86-1.0-7174.tar.gz) = 8433799
-MD5 (NVIDIA-FreeBSD-x86-1.0-7676.tar.gz) = 6a5b99cfb2cca7b424cefc27fb6a30ce
-SHA256 (NVIDIA-FreeBSD-x86-1.0-7676.tar.gz) = c92a2c021c31853cd739a1b915d9d86f21ccc8a46ef87e009d10820f4ca52088
-SIZE (NVIDIA-FreeBSD-x86-1.0-7676.tar.gz) = 8455397
+MD5 (NVIDIA-FreeBSD-x86-1.0-8174.tar.gz) = d5c2acc94d67ddb88ee0980cd53f37e8
+SHA256 (NVIDIA-FreeBSD-x86-1.0-8174.tar.gz) = 956d033ca2458d723aee039b32112a42bc8ce2110014e91184783aa2e8dc3c42
+SIZE (NVIDIA-FreeBSD-x86-1.0-8174.tar.gz) = 9054912
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 096abd4f2613..09d39ab25bb5 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -20,6 +20,9 @@ lib/libXvMCNVIDIA.so.1
 @unexec rm -f %D/lib/libXvMCNVIDIA.so
 @exec ln -sf %D/lib/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 %D/lib/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 %D/lib/libnvidia-tls.so.1 %D/lib/libnvidia-tls.so
 @unexec rm -f %D/lib/libnvidia-tls.so
@@ -29,6 +32,47 @@ lib/modules/drivers/nvidia_drv.o
 lib/modules/extensions/libglx.so.1
 @exec ln -sf %D/lib/modules/extensions/libglx.so.1 %D/lib/modules/extensions/libglx.so
 @unexec rm -f %D/lib/modules/extensions/libglx.so
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-a.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-b.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-c.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-d.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-e.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-f.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-g.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-h.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-i.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-j.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-k.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-l.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-m.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-n.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-o.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-p.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-q.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-r.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-s.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-t.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-u.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-v.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-w.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/appendix-x.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/chapter-01.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/chapter-02.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/chapter-03-section-02.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/chapter-03.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/chapter-04.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/chapter-05.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/chapter-06.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/chapter-07.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/chapter-08.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/chapter-09.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/index.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/part-01.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/part-02.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/part-03.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/preface-01.html
+%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/html/preface-02.html
+%%PORTDOCS%%@dirrm share/doc/NVIDIA_GLX-1.0/html
 %%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/README
 %%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/README.Linux
 %%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/XF86Config.sample