xorg upgrade problem - fontconfig won't compile

[Matt]

Hi, I followed Kris' instruction on upgrading, but was stuck with the
following error when running "portupgrade -Rf libXft" on this headless,
6.1-SECURITY:

...
cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/local/include/freetype2
-I/usr/local/include -I/usr/local/include -Wall -Wpointer-arith
-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
-Wnested-externs -fno-strict-aliasing
-DFONTCONFIG_PATH=\"/usr/local/etc/fonts\" -I.. -I../src -O2
-fno-strict-aliasing -pipe -MT fcfreetype.lo -MD -MP -MF
.deps/fcfreetype.Tpo -c fcfreetype.c -fPIC -DPIC -o .libs/fcfreetype.o
fcfreetype.c:53:10: #include expects "FILENAME" or <FILENAME>
fcfreetype.c:58:10: #include expects "FILENAME" or <FILENAME>
fcfreetype.c:59:10: #include expects "FILENAME" or <FILENAME>
fcfreetype.c:60:10: #include expects "FILENAME" or <FILENAME>
fcfreetype.c: In function `FcGetPixelSize':
fcfreetype.c:958: error: dereferencing pointer to incomplete type
fcfreetype.c: In function `FcFreeTypeQuery':
fcfreetype.c:1435: error: dereferencing pointer to incomplete type
fcfreetype.c:1442: error: dereferencing pointer to incomplete type
fcfreetype.c:1465: error: dereferencing pointer to incomplete type
fcfreetype.c:1545: error: dereferencing pointer to incomplete type
... many more similar lines
gmake[2]: *** [fcfreetype.lo] Error 1
gmake[2]: Leaving directory
`/usr/ports/x11-fonts/fontconfig/work/fontconfig-2.3.2/src'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory
`/usr/ports/x11-fonts/fontconfig/work/fontconfig-2.3.2'
gmake: *** [all] Error 2
*** Error code 2

Stop in /usr/ports/x11-fonts/fontconfig.
** Command failed [exit code 1]: /usr/bin/script -qa
/tmp/portupgrade.3578.4 env UPGRADE_TOOL=portupgrade
UPGRADE_PORT=fontconfig-2.3.2_3,1 UPGRADE_PORT_VER=2.3.2_3,1 make
** Fix the problem and try again.
---> Skipping 'x11/xorg-libraries' (xorg-libraries-6.9.0) because a
requisite package 'fontconfig-2.3.2_3,1' (x11-fonts/fontconfig) failed
(specify -k to force)
---> Skipping 'x11-fonts/libXft' (libXft-2.1.7_1) because a requisite
package 'xorg-libraries-6.9.0' (x11/xorg-libraries) failed (specify -k
to force)
** Listing the failed packages (*:skipped / !:failed)
! x11-fonts/fontconfig (fontconfig-2.3.2_3,1) (compiler error)
* x11/xorg-libraries (xorg-libraries-6.9.0)
* x11-fonts/libXft (libXft-2.1.7_1)
---> Packages processed: 4 done, 0 ignored, 2 skipped and 1 failed

Did I miss something?

Best, Matt