Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/nvidia-driver/Makefile,v
retrieving revision 1.98
diff -u -r1.98 Makefile
--- Makefile	24 May 2010 03:01:56 -0000	1.98
+++ Makefile	11 Jul 2010 20:02:47 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	195.36.15
+DISTVERSION?=	256.35
 PORTREVISION?=	0			# As a reminder it can be overridden
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
@@ -143,9 +143,6 @@
 .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}
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/x11/nvidia-driver/distinfo,v
retrieving revision 1.36
diff -u -r1.36 distinfo
--- distinfo	10 Apr 2010 13:40:07 -0000	1.36
+++ distinfo	11 Jul 2010 20:02:47 -0000
@@ -1,15 +1,3 @@
-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
-MD5 (NVIDIA-FreeBSD-x86-96.43.16.tar.gz) = 3fc5c2bb537d4a7664d84a7a0df09c7c
-SHA256 (NVIDIA-FreeBSD-x86-96.43.16.tar.gz) = 38bf334284dc600d92d8436333c98d5577e34d69456ed71f1cccc75caa6dffcd
-SIZE (NVIDIA-FreeBSD-x86-96.43.16.tar.gz) = 11842453
-MD5 (NVIDIA-FreeBSD-x86-71.86.13.tar.gz) = 19000b906225ebd39ca3edc1b0c3c7a5
-SHA256 (NVIDIA-FreeBSD-x86-71.86.13.tar.gz) = 27ae01cd6fe050871f7785c2146b18e74ea882f6262e46dc965bf26061238447
-SIZE (NVIDIA-FreeBSD-x86-71.86.13.tar.gz) = 8066159
+MD5 (NVIDIA-FreeBSD-x86-256.35.tar.gz) = 599908c9ffd8999ab0333cab34ea15a0
+SHA256 (NVIDIA-FreeBSD-x86-256.35.tar.gz) = 897c711acdca188da26868aec510c732d34f415ae621c35e5556ed8de493f26e
+SIZE (NVIDIA-FreeBSD-x86-256.35.tar.gz) = 26047458
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11/nvidia-driver/pkg-plist,v
retrieving revision 1.27
diff -u -r1.27 pkg-plist
--- pkg-plist	10 Apr 2010 13:40:07 -0000	1.27
+++ pkg-plist	11 Jul 2010 20:02:47 -0000
@@ -10,15 +10,13 @@
 @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/libGL.so
+lib/libnvidia-glcore.so.1
+lib/libnvidia-glcore.so
 lib/libnvidia-tls.so.1
 lib/libnvidia-tls.so
 lib/libnvidia-cfg.so.1
 lib/libnvidia-cfg.so
-lib/libGLcore.so.1
-lib/libGLcore.so
 lib/libvdpau.so.1
 lib/libvdpau.so
 lib/vdpau/libvdpau_nvidia.so.1
@@ -41,12 +39,10 @@
 %%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/libcuda.so.%%SHLIB_VERSION%%
 %%LINUX%%usr/lib/libcuda.so.1
+%%LINUX%%usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%%
 %%LINUX%%usr/lib/libnvidia-tls.so.%%SHLIB_VERSION%%
-%%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
Index: files/patch-nvidia-locking-256-35
===================================================================
RCS file: files/patch-nvidia-locking-256-35
diff -N files/patch-nvidia-locking-256-35
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-nvidia-locking-256-35	11 Jul 2010 20:02:47 -0000
@@ -0,0 +1,100 @@
+diff -ur NVIDIA-FreeBSD-x86-256.35-port-patched/src/nvidia_ctl.c src/nvidia_ctl.c
+--- NVIDIA-FreeBSD-x86-256.35-port-patched/src/nvidia_ctl.c	2010-06-16 18:36:40.000000000 -0700
++++ src/nvidia_ctl.c	2010-07-11 01:22:55.000000000 -0700
+@@ -53,7 +53,7 @@
+     }
+ 
+     filep->nv = nv;
+-    mtx_init(&filep->event_mtx, "event_mtx", NULL, (MTX_SPIN | MTX_RECURSE));
++    mtx_init(&filep->event_mtx, "event_mtx", NULL, (MTX_DEF | MTX_RECURSE));
+     STAILQ_INIT(&filep->event_queue);
+ 
+     nv_lock_api(nv);
+@@ -123,7 +123,7 @@
+     if (status != 0)
+         return status;
+ 
+-    mtx_lock_spin(&filep->event_mtx);
++    mtx_lock(&filep->event_mtx);
+     et = STAILQ_FIRST(&filep->event_queue);
+ 
+     if (et == NULL)
+@@ -131,7 +131,7 @@
+     else
+         mask = (events & (POLLIN | POLLPRI | POLLRDNORM));
+ 
+-    mtx_unlock_spin(&filep->event_mtx);
++    mtx_unlock(&filep->event_mtx);
+ 
+     return mask;
+ }
+diff -ur NVIDIA-FreeBSD-x86-256.35-port-patched/src/nvidia_dev.c src/nvidia_dev.c
+--- NVIDIA-FreeBSD-x86-256.35-port-patched/src/nvidia_dev.c	2010-06-16 18:36:40.000000000 -0700
++++ src/nvidia_dev.c	2010-07-11 01:22:55.000000000 -0700
+@@ -52,7 +52,7 @@
+     }
+ 
+     filep->nv = nv;
+-    mtx_init(&filep->event_mtx, "event_mtx", NULL, (MTX_SPIN | MTX_RECURSE));
++    mtx_init(&filep->event_mtx, "event_mtx", NULL, (MTX_DEF | MTX_RECURSE));
+     STAILQ_INIT(&filep->event_queue);
+ 
+     nv_lock_api(nv);
+@@ -123,7 +123,7 @@
+     if (status != 0)
+         return status;
+ 
+-    mtx_lock_spin(&filep->event_mtx);
++    mtx_lock(&filep->event_mtx);
+     et = STAILQ_FIRST(&filep->event_queue);
+ 
+     if (et == NULL)
+@@ -131,7 +131,7 @@
+     else
+         mask = (events & (POLLIN | POLLPRI | POLLRDNORM));
+ 
+-    mtx_unlock_spin(&filep->event_mtx);
++    mtx_unlock(&filep->event_mtx);
+ 
+     return mask;
+ }
+diff -ur NVIDIA-FreeBSD-x86-256.35-port-patched/src/nvidia_subr.c src/nvidia_subr.c
+--- NVIDIA-FreeBSD-x86-256.35-port-patched/src/nvidia_subr.c	2010-06-16 18:36:40.000000000 -0700
++++ src/nvidia_subr.c	2010-07-11 01:22:55.000000000 -0700
+@@ -987,9 +987,9 @@
+     et->event.hObject = hObject;
+     et->event.index = index;
+ 
+-    mtx_lock_spin(&filep->event_mtx);
++    mtx_lock(&filep->event_mtx);
+     STAILQ_INSERT_TAIL(&filep->event_queue, et, queue);
+-    mtx_unlock_spin(&filep->event_mtx);
++    mtx_unlock(&filep->event_mtx);
+ 
+     selwakeup(&filep->event_rsel);
+ }
+@@ -1004,7 +1004,7 @@
+     struct nvidia_filep *filep = file;
+     struct nvidia_event *et;
+ 
+-    mtx_lock_spin(&filep->event_mtx);
++    mtx_lock(&filep->event_mtx);
+     et = STAILQ_FIRST(&filep->event_queue);
+ 
+     if (et != NULL) {
+@@ -1013,13 +1013,13 @@
+         STAILQ_REMOVE(&filep->event_queue, et, nvidia_event, queue);
+         *pending = !STAILQ_EMPTY(&filep->event_queue);
+ 
+-        mtx_unlock_spin(&filep->event_mtx);
++        mtx_unlock(&filep->event_mtx);
+         free(et, M_NVIDIA);
+ 
+         return RM_OK;
+     }
+ 
+-    mtx_unlock_spin(&filep->event_mtx);
++    mtx_unlock(&filep->event_mtx);
+     return RM_ERROR;
+ }
+