Buildworld error

[walt <wa1ter@xxxxxxxxxxxxx>]

===> usr.sbin/setkey
cc -O -pipe  -g -I/usr/src/usr.sbin/setkey
-I/usr/src/usr.sbin/setkey/../../lib/libipsec
-I/usr/src/usr.sbin/setkey/../../lib/libipsec
-I/usr/src/usr.sbin/setkey/../../sys/netkey -DIPSEC_DEBUG -DINET6 -DYY_NO_UNPUT
-I.    -c /usr/src/usr.sbin/setkey/setkey.c
cc -O -pipe  -g -I/usr/src/usr.sbin/setkey
-I/usr/src/usr.sbin/setkey/../../lib/libipsec
-I/usr/src/usr.sbin/setkey/../../lib/libipsec
-I/usr/src/usr.sbin/setkey/../../sys/netkey -DIPSEC_DEBUG -DINET6 -DYY_NO_UNPUT
-I.    -c parse.c
cc -O -pipe  -g -I/usr/src/usr.sbin/setkey
-I/usr/src/usr.sbin/setkey/../../lib/libipsec
-I/usr/src/usr.sbin/setkey/../../lib/libipsec
-I/usr/src/usr.sbin/setkey/../../sys/netkey -DIPSEC_DEBUG -DINET6 -DYY_NO_UNPUT
-I.    -c token.c
/usr/src/usr.sbin/setkey/token.l: In function `yylex':
/usr/src/usr.sbin/setkey/token.l:127: `ADD' undeclared (first use in this
function)
/usr/src/usr.sbin/setkey/token.l:128: `DELETE' undeclared <snippage>

The setkey code hasn't changed in months, so something else is wrong.  The
problem started yesterday when libc didn't compile -- so I tried a 'make
libraries' which finished okay, but then the setkey problem started.
(I think I picked the wrong moment to cvsup.)

Probably the libraries are not consistent with the rest of userland at this
point, I would guess.  Any ideas how to fix it?