nvidia-driver broken by recent commit - 248084

[AN]

FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #36 r248127: Sun Mar 10 
00:13:59 CST 2013     root at FBSD10:/usr/obj/usr/src/sys/MYKERNEL  amd64

/usr/ports/x11/nvidia-driver is broken, probably by this commit:
http://svnweb.freebsd.org/base?view=revision&revision=248084

>From commit log:"The KPI results heavilly broken by this commit.  Thirdy 
part ports must be updated accordingly (I can think off-hand of 
VirtualBox, for example)."



root at FBSD10 /usr/ports/x11/nvidia-driver]# make clean
===>  Cleaning for nvidia-driver-310.32
[root at FBSD10 /usr/ports/x11/nvidia-driver]# make install clean
===>  License NVIDIA accepted by the user
===>  Found saved configuration for nvidia-driver-304.64
===>   nvidia-driver-310.32 depends on file: /usr/local/sbin/pkg - found
===>  Extracting for nvidia-driver-310.32
=> SHA256 Checksum OK for NVIDIA-FreeBSD-x86_64-310.32.tar.gz.
===>  Patching for nvidia-driver-310.32
===>  Applying extra patch 
/usr/ports/x11/nvidia-driver/files/r246085-patch-src-nvidia_linux.c
===>   nvidia-driver-310.32 depends on file: 
/usr/local/libdata/pkgconfig/xorg-server.pc - found
===>   nvidia-driver-310.32 depends on shared library: GL.1 - found
===>  Configuring for nvidia-driver-310.32
===>  Building for nvidia-driver-310.32
===> src (all)
@ -> /usr/src/sys
machine -> /usr/src/sys/amd64/include
x86 -> /usr/src/sys/x86/include
awk -f @/tools/makeobjops.awk @/kern/device_if.m -h
awk -f @/tools/makeobjops.awk @/kern/bus_if.m -h
awk -f @/tools/makeobjops.awk @/dev/pci/pci_if.m -h
awk -f @/tools/vnode_if.awk @/kern/vnode_if.src -p
awk -f @/tools/vnode_if.awk @/kern/vnode_if.src -q
awk -f @/tools/vnode_if.awk @/kern/vnode_if.src -h
cc -O2 -pipe -fno-strict-aliasing -DNV_VERSION_STRING=\"310.32\" 
-D__KERNEL__ -DNVRM -Wno-unused-function -Wuninitialized -O -mno-red-zone 
-mcmodel=kernel -UDEBUG -U_DEBUG -DNDEBUG -Werror -D_KERNEL -DKLD_MODULE 
-nostdinc  -I. -I. -I@ -I@/contrib/altq -fno-common 
-fno-omit-frame-pointer  -mno-aes -mno-avx -mcmodel=kernel -mno-red-zone 
-mno-mmx -mno-sse -msoft-float  -fno-asynchronous-unwind-tables 
-ffreestanding -fstack-protector -std=iso9899:1999 -Qunused-arguments 
-fstack-protector -Wall -Wredundant-decls -Wnested-externs 
-Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline 
-Wcast-qual  -Wundef -Wno-pointer-sign -fformat-extensions 
-Wmissing-include-dirs -fdiagnostics-show-option 
-Wno-error-tautological-compare -Wno-error-empty-body 
-Wno-error-parentheses-equality -c nvidia_ctl.c
In file included from nvidia_ctl.c:14:
In file included from ./nv-freebsd.h:77:
@/vm/vm_pager.h:127:2: error: implicit declaration of function 'rw_assert' 
is invalid in C99 [-Werror,-Wimplicit-function-declaration]
         VM_OBJECT_ASSERT_WLOCKED(object);
         ^
@/vm/vm_object.h:212:2: note: expanded from macro 
'VM_OBJECT_ASSERT_WLOCKED'
         rw_assert(&(object)->lock, RA_WLOCKED)
         ^
In file included from nvidia_ctl.c:14:
In file included from ./nv-freebsd.h:77:
@/vm/vm_pager.h:127:2: error: use of undeclared identifier 'RA_WLOCKED'
         VM_OBJECT_ASSERT_WLOCKED(object);
         ^
@/vm/vm_object.h:212:29: note: expanded from macro 
'VM_OBJECT_ASSERT_WLOCKED'
         rw_assert(&(object)->lock, RA_WLOCKED)
                                    ^
In file included from nvidia_ctl.c:14:
In file included from ./nv-freebsd.h:77:
@/vm/vm_pager.h:144:2: error: use of undeclared identifier 'RA_WLOCKED'
         VM_OBJECT_ASSERT_WLOCKED(object);
         ^
@/vm/vm_object.h:212:29: note: expanded from macro 
'VM_OBJECT_ASSERT_WLOCKED'
         rw_assert(&(object)->lock, RA_WLOCKED)
                                    ^
In file included from nvidia_ctl.c:14:
In file included from ./nv-freebsd.h:77:
@/vm/vm_pager.h:168:2: error: use of undeclared identifier 'RA_WLOCKED'
         VM_OBJECT_ASSERT_WLOCKED(object);
         ^
@/vm/vm_object.h:212:29: note: expanded from macro 
'VM_OBJECT_ASSERT_WLOCKED'
         rw_assert(&(object)->lock, RA_WLOCKED)
                                    ^
In file included from nvidia_ctl.c:14:
In file included from ./nv-freebsd.h:77:
@/vm/vm_pager.h:191:2: error: use of undeclared identifier 'RA_WLOCKED'
         VM_OBJECT_ASSERT_WLOCKED(m->object);
         ^
@/vm/vm_object.h:212:29: note: expanded from macro 
'VM_OBJECT_ASSERT_WLOCKED'
         rw_assert(&(object)->lock, RA_WLOCKED)
                                    ^
5 errors generated.
*** [nvidia_ctl.o] Error code 1

Stop in 
/usr/ports/x11/nvidia-driver/work/NVIDIA-FreeBSD-x86_64-310.32/src.
*** [all] Error code 1

Stop in /usr/ports/x11/nvidia-driver/work/NVIDIA-FreeBSD-x86_64-310.32.
*** [do-build] Error code 1

Stop in /usr/ports/x11/nvidia-driver.
*** [install] Error code 1

Stop in /usr/ports/x11/nvidia-driver.
[root at FBSD10 /usr/ports/x11/nvidia-driver]#