Cannot build base X from source

[Benny Siegert <bsiegert%gmail.com@localhost>]

Hi,

I am trying to update my NetBSD-6.1_RC2 system to 6.1-STABLE (amd64).
I successfully installed a new GENERIC kernel, rebooted and installed
the userland. Now I would also like to upgrade the installed X. I
checked out xsrc into /usr/xsrc and ran

# ./build.sh -u -x distribution

This results in the following error. Any ideas?

--Benny.

dependall ===> external/mit/xorg/tools/bdftopcf
#   compile  bdftopcf/bdftopcf.lo
cc -O -I/usr/src/obj/destdir.amd64/usr/X11R7/include
-I/usr/src/obj/destdir.amd64/usr/X11R7/include
-I/usr/src/obj/destdir.amd64/usr/X11R7/include/X11/fonts
-I/usr/src/obj/destdir.amd64/usr/X11R7/include/freetype2
-I/usr/xsrc/external/mit/libXfont/dist/src/stubs  -DBDFFORMAT
-DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION
-DFONT_ENCODINGS_DIRECTORY=\"/usr/X11R7/lib/X11/fonts/encodings/encodings.dir\"
-c -o bdftopcf.lo.o    /usr/xsrc/external/mit/bdftopcf/dist/bdftopcf.c
/usr/xsrc/external/mit/bdftopcf/dist/bdftopcf.c: In function 'main':
/usr/xsrc/external/mit/bdftopcf/dist/bdftopcf.c:138:32: error:
'PACKAGE_STRING' undeclared (first use in this function)
/usr/xsrc/external/mit/bdftopcf/dist/bdftopcf.c:138:32: note: each
undeclared identifier is reported only once for each function it
appears in

*** Failed target:  bdftopcf.lo
*** Failed command: cc -O
-I/usr/src/obj/destdir.amd64/usr/X11R7/include
-I/usr/src/obj/destdir.amd64/usr/X11R7/include
-I/usr/src/obj/destdir.amd64/usr/X11R7/include/X11/fonts
-I/usr/src/obj/destdir.amd64/usr/X11R7/include/freetype2
-I/usr/xsrc/external/mit/libXfont/dist/src/stubs -DBDFFORMAT
-DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION
-DFONT_ENCODINGS_DIRECTORY=\"/usr/X11R7/lib/X11/fonts/encodings/encodings.dir\"
-c -o bdftopcf.lo.o /usr/xsrc/external/mit/bdftopcf/dist/bdftopcf.c
*** Error code 1

Stop.
nbmake: stopped in /usr/src/external/mit/xorg/tools/bdftopcf

*** Failed target:  dependall
*** Failed command: cd "/usr/src/external/mit/xorg/tools/bdftopcf";
/usr/src/obj/tooldir.NetBSD-6.1_STABLE-amd64/bin/nbmake realall
*** Error code 1