Rough go moving from 5.4-RELEASE to 6.X

[Lane]

I'm trying to upgrade from 5.4 to ANYTHING and I'm confounded by buildworld 
failures that don't seem to have been reported.  Please offer any guidance.

First I delete everything in /usr/src (save Makefile and Makefile.inc1) then I

make update

to get the source current.  (/etc/make.conf includes SUP* variables)

then I try

make buildworld 

from /usr/src, and the errors below occur.  Next I try

env -i make buildworld

and I get the same errors.

I've tried to cvsup an entire new source try (after wiping out /usr/src 
and /usr/obj) but STILL get this error.

I've tried with (in /etc/cvsupfile)  "tag=" each of RELENG_5, RELENG_5_5, 
RELENG_6, and several others.  It even fails when I try to just get the 
source to RELENG_5_4.

Of course the actual failure line(s) are different with each release I've 
tried to build.  The errors listed below are from my latest try for RELENG_6

An example from last year when I tried this for rebuilding 5.4 is at  
http://groups.google.com/group/lucky.freebsd.i386/browse_thread/thread/da9d1d558d607a09/aab6d1588bb93bc1?lnk=st&q=undefined+reference+to+%60add_new_float%27&rnum=1#aab6d1588bb93bc1

Even after a YEAR I cannot get this system upgraded to 6.x!  In the interim 
I've installed fresh copies of 6.1, 6.2, and -CURRENT on other systems, but 
this one system will not update!  Argh!

I'm not new to this, but I can't seem to find a pr or any information 
in /usr/src/UPDATING which might account for these consistent failures.

Any pointers, no matter HOW OBVIOUS, will be appreciated.  I'm just about LOST 
on this!

Thanks for reading me vent :)

Lane

===> lib/csu/i386-elf (all)
===> lib/libbsm (all)
cc -O2 -fno-strict-aliasing -pipe  -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm  -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_audit.c
cc -O2 -fno-strict-aliasing -pipe  -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm  -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_class.c
cc -O2 -fno-strict-aliasing -pipe  -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm  -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_control.c
cc -O2 -fno-strict-aliasing -pipe  -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm  -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_event.c
cc -O2 -fno-strict-aliasing -pipe  -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm  -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_flags.c
cc -O2 -fno-strict-aliasing -pipe  -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm  -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c
/usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c: In function 
`close_tag':
/usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c:396: error: 
`AUT_ZONENAME' undeclared (first use in this function)
/usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c:396: error: (Each 
undeclared identifier is reported only once
/usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c:396: error: for each 
function it appears in.)
/usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c: In function 
`print_tok_type':
/usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c:567: error: 
`AUT_ZONENAME' undeclared (first use in this function)
/usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c: In function 
`au_fetch_tok':
/usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c:4040: error: 
`AUT_ZONENAME' undeclared (first use in this function)
/usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c: In function 
`au_print_tok':
/usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c:4212: error: 
`AUT_ZONENAME' undeclared (first use in this function)
/usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c: In function 
`au_print_tok_xml':
/usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c:4386: error: 
`AUT_ZONENAME' undeclared (first use in this function)
*** Error code 1

Stop in /usr/src/lib/libbsm.
*** Error code 1

Stop in /usr/src/lib.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.