pkgsrc build from source issue?

["Justin C. Sherrill" <justin@xxxxxxxxxxxxxxxxxx>]

I downloaded the current pkgsrc tarball, built the bootstrap (with
'--pkgdbdir /var/db/pkgsrc --prefix /usr/pkg' so I can clean out the
existing ports on this machine), and any port I've tried to bmake so far
results in something like this:

bmake:
"../../mk/tools/../../mk/tools/../../mk/tools/../../mk/tools/make.mk" line
50: Malformed conditional (!empty(_USE_TOOLS:Mgmake))
bmake:
"../../mk/tools/../../mk/tools/../../mk/tools/../../mk/tools/make.mk" line
52: Malformed conditional (!empty(_USE_TOOLS:Mimake) &&
defined(IMAKE_MAKE))
bmake: "../../mk/tools/../../mk/tools/bsd.tools.mk" line 218: if-less endif
bmake: "../../mk/tools/../../mk/tools/bsd.tools.mk" line 218: Need an
operator
bmake: Fatal errors encountered -- cannot continue

I'm surprised that it could be so broken, but I don't think I missed any
steps.  Has anyone else installed this week's pkgsrc tarball?