[current tinderbox] failure on i386/i386

TB --- 2004-12-24 20:45:52 - tinderbox 2.3 running on freebsd-current.sentex.ca
TB --- 2004-12-24 20:45:52 - starting CURRENT tinderbox run for i386/i386
TB --- 2004-12-24 20:45:52 - checking out the source tree
TB --- 2004-12-24 20:45:52 - cd /home/tinderbox/CURRENT/i386/i386
TB --- 2004-12-24 20:45:52 - /usr/bin/cvs -f -R -q -d/home/ncvs update -Pd -A src
TB --- 2004-12-24 20:52:03 - building world (CFLAGS=-O2 -pipe)
TB --- 2004-12-24 20:52:03 - cd /home/tinderbox/CURRENT/i386/i386/src
TB --- 2004-12-24 20:52:03 - /usr/bin/make -B buildworld
>>> Rebuilding the temporary build tree
>>> stage 1.1: legacy release compatibility shims
>>> stage 1.2: bootstrap tools
>>> stage 2.1: cleaning up the object tree
>>> stage 2.2: rebuilding the object tree
>>> stage 2.3: build tools
>>> stage 3: cross tools
>>> stage 4.1: building includes
>>> stage 4.2: building libraries
>>> stage 4.3: make dependencies
>>> stage 4.4: building everything
TB --- 2004-12-24 21:58:47 - building generic kernel (COPTFLAGS=-O2 -pipe)
TB --- 2004-12-24 21:58:47 - cd /home/tinderbox/CURRENT/i386/i386/src
TB --- 2004-12-24 21:58:47 - /usr/bin/make buildkernel KERNCONF=GENERIC
>>> Kernel build for GENERIC started on Fri Dec 24 21:58:48 UTC 2004
>>> stage 1: configuring the kernel
>>> stage 2.1: cleaning up the object tree
>>> stage 2.2: rebuilding the object tree
>>> stage 2.3: build tools
>>> stage 3.1: making dependencies
>>> stage 3.2: building everything
[...]
/tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.h:501:1: warning: "PFIL_HOOKS" redefined
<command line>:6:1: warning: this is the location of the previous definition
/tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.c: In function `fr_forgetifp':
/tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.c:922: error: `ipf_mutex' undeclared (first use in this function)
/tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.c:922: error: (Each undeclared identifier is reported only once
/tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.c:922: error: for each function it appears in.)
/tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.c: In function `ipfr_fastroute':
/tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.c:1779: error: `ipf_rw' undeclared (first use in this function)
*** Error code 1

Stop in /tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter.
*** Error code 1

Stop in /tinderbox/CURRENT/i386/i386/src/sys/modules.
*** Error code 1

Stop in /tinderbox/CURRENT/i386/i386/obj/tinderbox/CURRENT/i386/i386/src/sys/GENERIC.
*** Error code 1

Stop in /tinderbox/CURRENT/i386/i386/src.
*** Error code 1

Stop in /tinderbox/CURRENT/i386/i386/src.
TB --- 2004-12-24 22:11:20 - WARNING: /usr/bin/make returned exit code  1 
TB --- 2004-12-24 22:11:20 - ERROR: failed to build generic kernel
TB --- 2004-12-24 22:11:20 - tinderbox aborted