compilation error w/ latest freetype

[bch <brad.harder%gmail.com@localhost>]

all ===> external/mit/xorg/tools
all ===> external/mit/xorg/tools/bdftopcf
all ===> external/mit/xorg/tools/fc-cache
#   compile  fc-cache/fcfreetype.lo
cc -O -DFONTCONFIG_PATH='"/usr/src/obj/destdir.amd64/etc/X11/fonts"'
-DFC_DEFAULT_FONTS='"/usr/X11R7/lib/X11/fonts/Type1"'
-DFC_CACHEDIR='"/usr/src/obj/destdir.amd64/var/cache/fontconfig"'
-DHAVE_FT_BITMAP_SIZE_Y_PPEM  -DHAVE_FT_GET_BDF_PROPERTY
-DHAVE_FT_GET_NEXT_CHAR  -DHAVE_FT_GET_PS_FONT_INFO
-DHAVE_FT_GET_X11_FONT_FORMAT  -DHAVE_FT_HAS_PS_GLYPH_NAMES
-DHAVE_EXPAT -DXFREE86_FT2 -DHAVE_INTTYPES_H  -DFT2_BUILD_LIBRARY
-DXML_BYTE_ORDER=0 -DHAVE_MEMMOVE=1  -DHAVE_STDINT_H -DHAVE_RANDOM
-DDARWIN_NO_CARBON  -DHAVE_SYS_TYPES_H -DHAVE_FCNTL_H
-DHAVE_SYS_STAT_H  -DHAVE_MKSTEMP  -DHAVE_SCANDIR
-DFLEXIBLE_ARRAY_MEMBER="/**/" -DFT_CONFIG_OPTION_DISABLE_BZIP2
-I/usr/xsrc/external/mit/fontconfig/dist
-I/usr/xsrc/external/mit/freetype/dist
-I/usr/xsrc/external/mit/freetype/dist/include
-I/usr/src/external/mit/expat/dist/lib
-I/usr/xsrc/external/mit/fontconfig/dist/../include
-I/usr/src/obj/destdir.amd64/usr/X11R7/include -I. -c -o
fcfreetype.lo.o
/usr/xsrc/external/mit/fontconfig/dist/src/fcfreetype.c
In file included from
/usr/xsrc/external/mit/fontconfig/dist/fontconfig/fcfreetype.h:27:0,
                 from /usr/xsrc/external/mit/fontconfig/dist/src/fcftint.h:26,
                 from
/usr/xsrc/external/mit/fontconfig/dist/src/fcfreetype.c:48:
/usr/xsrc/external/mit/freetype/dist/include/ft2build.h:37:38: fatal
error: freetype/config/ftheader.h: No such file or directory
compilation terminated.

*** Failed target:  fcfreetype.lo
*** Failed command: cc -O
-DFONTCONFIG_PATH='"/usr/src/obj/destdir.amd64/etc/X11/fonts"'
-DFC_DEFAULT_FONTS='"/usr/X11R7/lib/X11/fonts/Type1"'
-DFC_CACHEDIR='"/usr/src/obj/destdir.amd64/var/cache/fontconfig"'
-DHAVE_FT_BITMAP_SIZE_Y_PPEM -DHAVE_FT_GET_BDF_PROPERTY
-DHAVE_FT_GET_NEXT_CHAR -DHAVE_FT_GET_PS_FONT_INFO
-DHAVE_FT_GET_X11_FONT_FORMAT -DHAVE_FT_HAS_PS_GLYPH_NAMES
-DHAVE_EXPAT -DXFREE86_FT2 -DHAVE_INTTYPES_H -DFT2_BUILD_LIBRARY
-DXML_BYTE_ORDER=0 -DHAVE_MEMMOVE=1 -DHAVE_STDINT_H -DHAVE_RANDOM
-DDARWIN_NO_CARBON -DHAVE_SYS_TYPES_H -DHAVE_FCNTL_H -DHAVE_SYS_STAT_H
-DHAVE_MKSTEMP -DHAVE_SCANDIR -DFLEXIBLE_ARRAY_MEMBER="/**/"
-DFT_CONFIG_OPTION_DISABLE_BZIP2
-I/usr/xsrc/external/mit/fontconfig/dist
-I/usr/xsrc/external/mit/freetype/dist
-I/usr/xsrc/external/mit/freetype/dist/include
-I/usr/src/external/mit/expat/dist/lib
-I/usr/xsrc/external/mit/fontconfig/dist/../include
-I/usr/src/obj/destdir.amd64/usr/X11R7/include -I. -c -o
fcfreetype.lo.o
/usr/xsrc/external/mit/fontconfig/dist/src/fcfreetype.c
*** Error code 1

Stop.
nbmake[4]: stopped in /usr/src/external/mit/xorg/tools/fc-cache

*** Failed target:  all-fc-cache
*** Failed command: _makedirtarget() { dir="$1"; shift; target="$1";
shift; case "${dir}" in /*) this="${dir}/"; real="${dir}" ;; .)
this="external/mit/xorg/tools/";
real="/usr/src/external/mit/xorg/tools" ;; *)
this="external/mit/xorg/tools/${dir}/";
real="/usr/src/external/mit/xorg/tools/${dir}" ;; esac;
show=${this:-.}; echo "${target} ===> ${show%/}${1:+ (with: $@)}"; cd
"${real}" && /usr/src/obj/tooldir.NetBSD-7.99.29-amd64/bin/nbmake
_THISDIR_="${this}" "$@" ${target}; }; _makedirtarget fc-cache all
*** Error code 1

Stop.
nbmake[3]: stopped in /usr/src/external/mit/xorg/tools

*** Failed target:  do-x11
*** Failed command: _makedirtarget() { dir="$1"; shift; target="$1";
shift; case "${dir}" in /*) this="${dir}/"; real="${dir}" ;; .)
this=""; real="/usr/src" ;; *) this="${dir}/"; real="/usr/src/${dir}"
;; esac; show=${this:-.}; echo "${target} ===> ${show%/}${1:+ (with:
$@)}"; cd "${real}" &&
/usr/src/obj/tooldir.NetBSD-7.99.29-amd64/bin/nbmake
_THISDIR_="${this}" "$@" ${target}; }; _makedirtarget
external/mit/xorg/tools all
*** Error code 1

Stop.
nbmake[2]: stopped in /usr/src