Problems building today's world

I've just cvsupped the latest -CURRENT, and it dies on me in
gnu/usr.bin/gperf/doc:

===> gnu/usr.bin/gperf/doc
c++ -O -pipe   -std=iso9899:1999  -I/usr/obj/src/FreeBSD/5-CURRENT-ZAPHOD/src/i386/legacy/usr/include -I/src/FreeBSD/5-CURRENT-ZAPHOD/src/gnu/usr.bin/gperf/../../../contrib/gperf/lib -I/src/FreeBSD/5-CURRENT-ZAPHOD/src/gnu/usr.bin/gperf -c /src/FreeBSD/5-CURRENT-ZAPHOD/src/contrib/gperf/src/bool-array.cc
In file included from /src/FreeBSD/5-CURRENT-ZAPHOD/src/contrib/gperf/src/options.h:154,
                 from /src/FreeBSD/5-CURRENT-ZAPHOD/src/contrib/gperf/src/bool-array.h:59,
                 from /src/FreeBSD/5-CURRENT-ZAPHOD/src/contrib/gperf/src/bool-array.cc:21:
/src/FreeBSD/5-CURRENT-ZAPHOD/src/contrib/gperf/src/options.icc:27: syntax 
   error before `:' token
In file included from /src/FreeBSD/5-CURRENT-ZAPHOD/src/contrib/gperf/src/bool-array.h:59,
                 from /src/FreeBSD/5-CURRENT-ZAPHOD/src/contrib/gperf/src/bool-array.cc:21:
/src/FreeBSD/5-CURRENT-ZAPHOD/src/contrib/gperf/src/options.h:150:1: unterminated #ifdef
/src/FreeBSD/5-CURRENT-ZAPHOD/src/contrib/gperf/src/options.h:32:1: unterminated #ifndef
In file included from /src/FreeBSD/5-CURRENT-ZAPHOD/src/contrib/gperf/src/bool-array.cc:21:
/src/FreeBSD/5-CURRENT-ZAPHOD/src/contrib/gperf/src/bool-array.h:55:1: unterminated #ifdef
/src/FreeBSD/5-CURRENT-ZAPHOD/src/contrib/gperf/src/bool-array.h:27:1: unterminated #ifndef
*** Error code 1

Stop in /src/FreeBSD/5-CURRENT-ZAPHOD/src/gnu/usr.bin/gperf.
*** Error code 1

Stop in /src/FreeBSD/5-CURRENT-ZAPHOD/src.
*** Error code 1

Stop in /src/FreeBSD/5-CURRENT-ZAPHOD/src.
*** Error code 1

Stop in /src/FreeBSD/5-CURRENT-ZAPHOD/src.

The funny thing is that there's nothing obviously wrong with the
source files.  I suspect c++, which dates from:

-r-xr-xr-x  3 root  wheel  78708 May 22 17:38 /usr/bin/c++

Is there something I should be doing first?

Greg
--
See complete headers for address and phone numbers