Lack of agpvar.h causing nvidia-driver build to fail

On the latest -current, I'm trying to debug the issue with 
nvidia-driver-100.14.19 not being able to "see" my external monitor that's 
attached to the dock. However, I didn't get very far:

cc -O2 -fno-strict-aliasing -pipe -ggdb -ggdb 
-DNV_VERSION_STRING=\"100.14.19\" -D__KERNEL__ -DNVRM -UDEBUG -U_DEBUG 
-DNDEBUG -O -Werror -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc  -I/src -I. 
-I_at_ -I_at_/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 
--param large-function-growth=1000 -fno-common -ggdb 
-mno-align-long-strings -mpreferred-stack-boundary=2  -mno-mmx -mno-3dnow 
-mno-sse -mno-sse2 -mno-sse3 -ffreestanding -Wall -Wredundant-decls 
-Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith 
-Winline -Wcast-qual  -Wundef -Wno-pointer-sign -fformat-extensions -c 
nvidia_ctl.c
In file included from nvidia_ctl.c:14:
nv-freebsd.h:75:24: error: pci/agpvar.h: No such file or directory
*** Error code 1

This seems to be related to the removal of that header by jhb on 12 
November.

Doug

-- 

     This .signature sanitized for your protection