- Update to version 9746, the latest from nVidia, which adds support for

  GeForce 8800 GTS and GeForce 8800 GTX boards [1]
- More proper WITHOUT_LINUX knob handling [1] [2]
- Update an old patch to be more consistent with current way of doing
  Linux-compat things (should be no-op change though)

PR:		ports/107307 [1]
Submitted by:	Eygene Ryabinkin [1]
Reported by:	Rostislav Krasny [2]

4 files changed, 17 insertions, 12 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index d3b29b7b59a3..46b7534d4ef7 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -64,8 +64,7 @@ OSVERSION!=	/usr/sbin/sysctl -n kern.osreldate
 NVVERSION=	7184
 EXTRA_PATCHES+=	${FILESDIR}/6113-patch-lib::Makefile
 .else
-NVVERSION=	9631
-PORTREVISION=	1
+NVVERSION=	9746
 EXTRA_PATCHES+=	${FILESDIR}/7667-*
 .endif
 .if ${OSVERSION} >= 600033
@@ -90,6 +89,8 @@ USE_LINUX=	yes
 PLIST_SUB+=	LINUX=""
 .else
 PLIST_SUB+=	LINUX="@comment "
+# Propagate WITHOUT_LINUX variable down to inner Makefiles
+MAKE_ENV+=	WITHOUT_LINUX=yes
 .endif
 
 .if ${OSVERSION} < 503000
@@ -120,7 +121,7 @@ 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 ; /man/d' \
+	${REINPLACE_CMD} -E 's/(lib).*/\1/ ; /bin/d ; /man/d' \
 		${WRKSRC}/x11/Makefile
 
 post-install:
@@ -130,6 +131,9 @@ post-install:
 .else
 	@${REINPLACE_CMD} '/README\.Linux/d ; /nvidia_drv\.o/d' ${TMPPLIST}
 .endif
+.if ${NVVERSION} < 9746
+	@${REINPLACE_CMD} '/wfb/d' ${TMPPLIST}
+.endif
 	${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index fe930e618058..1690778d25a5 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,6 +1,6 @@
 MD5 (NVIDIA-FreeBSD-x86-1.0-7184.tar.gz) = ee5907345b9f25527c3ec41f5ac269e3
 SHA256 (NVIDIA-FreeBSD-x86-1.0-7184.tar.gz) = f6de6961b540b852e79fb7aa5a95714a13c6984429968448432106d89493e02d
 SIZE (NVIDIA-FreeBSD-x86-1.0-7184.tar.gz) = 8441698
-MD5 (NVIDIA-FreeBSD-x86-1.0-9631.tar.gz) = d560b1e7d5b0209da7aa32526cdda921
-SHA256 (NVIDIA-FreeBSD-x86-1.0-9631.tar.gz) = 2b467da57bc3bb8e2216ce3d02909cf077da045ebcf294474b784cb521a5d550
-SIZE (NVIDIA-FreeBSD-x86-1.0-9631.tar.gz) = 9667093
+MD5 (NVIDIA-FreeBSD-x86-1.0-9746.tar.gz) = d6dd2fad4f6e05980c2fbb591b06fb99
+SHA256 (NVIDIA-FreeBSD-x86-1.0-9746.tar.gz) = cf8be89d537423c0acc294e57cb659dae94463f6347f63c32b1de39c8051a5a7
+SIZE (NVIDIA-FreeBSD-x86-1.0-9746.tar.gz) = 11152524
diff --git a/x11/nvidia-driver/files/6113-patch-lib::Makefile b/x11/nvidia-driver/files/6113-patch-lib::Makefile
index a13784cc0c8a..14490afe19a6 100644
--- a/x11/nvidia-driver/files/6113-patch-lib::Makefile
+++ b/x11/nvidia-driver/files/6113-patch-lib::Makefile
@@ -1,6 +1,6 @@
 --- lib/Makefile.orig	Mon Aug 16 17:05:30 2004
 +++ lib/Makefile	Mon Aug 16 17:07:47 2004
-@@ -1,13 +1,19 @@
+@@ -1,13 +1,16 @@
  SUBDIR= libGL		\
  	libnvidia-tls	\
  	libGLcore	\
@@ -10,13 +10,10 @@
  
 -FIND_DIRS=	/usr/lib ${X11BASE}/lib \
 -		/compat/linux/lib \
-+.if !defined(WITHOUT_LINUX)
-+SUBDIR+=	compat
-+.endif
-+
 +FIND_DIRS=	/usr/lib ${X11BASE}/lib
 +
-+.if !defined(WITHOUT_LINUX)
++.if exists(/compat/linux) && !defined(WITHOUT_LINUX)
++SUBDIR+=	compat
 +FIND_DIRS+=	/compat/linux/lib \
  		/compat/linux/usr/lib \
  		/compat/linux/usr/X11R6/lib
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index ba65748f77a9..876dae49fb4a 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -27,6 +27,9 @@ 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
 lib/libXvMCNVIDIA.a
+lib/modules/libnvidia-wfb.so.1
+@exec ln -sf %D/lib/modules/libnvidia-wfb.so.1 %D/lib/modules/libwfb.so
+@unexec rm -f %D/lib/modules/libwfb.so
 lib/modules/drivers/nvidia_drv.o
 lib/modules/drivers/nvidia_drv.so
 lib/modules/extensions/libglx.so.1
@@ -65,6 +68,7 @@ lib/modules/extensions/libglx.so.1
 %%PORTDOCS%%%%DOCSDIR%%/html/chapter-07.html
 %%PORTDOCS%%%%DOCSDIR%%/html/chapter-08.html
 %%PORTDOCS%%%%DOCSDIR%%/html/chapter-09.html
+%%PORTDOCS%%%%DOCSDIR%%/html/chapter-10.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/part-01.html
 %%PORTDOCS%%%%DOCSDIR%%/html/part-02.html