xorg-server doesn't build?

I'm not sure if ports_at_ is the right list for this, but I have this build 
problem for xorg-server on -current:

making all in programs/Xserver/hw/xfree86/xf86cfg...
rm -f interface.o
cc -c -O2 -fno-strict-aliasing -pipe -ansi -pedantic -Wno-system-headers 
-Dasm=__asm    -Wall -Wpointer-arith -Wundef    -fno-merge-constants 
-I../common -I../scanpci -I../loader 
-I/usr/ports/x11-servers/xorg-server/work/xc/programs/Xserver/hw/xfree86/os-support 
 
-I/usr/ports/x11-servers/xorg-server/work/xc/programs/Xserver/include 
-I/usr/ports/x11-servers/xorg-server/work/xc/exports/include/X11 
           -I/usr/ports/x11-servers/xorg-server/work/xc/lib/font/include 
  -I/usr/ports/x11-servers/xorg-server/work/xc 
-I/usr/ports/x11-servers/xorg-server/work/xc/exports/include 
-I/usr/X11R6/include -I/usr/X11R6/include -DCSRG_BASED -DSHAPE -DXINPUT 
-DXKB  -DXAPPGROUP    -DXCSECURITY -DTOGCUP   -DXF86BIGFONT 
-DDPMSExtension     -DPANORAMIX    -DRENDER -DRANDR       -DXFIXES 
-DDAMAGE -DCOMPOSITE -DXEVIE -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV 
-DSINGLEDEPTH    -DXFreeXDGA -DXvExtension 
   -DXFree86LOADER  -DXFree86Server 
-DXF86VIDMODE                          -DXvMCExtension 
         -DSMART_SCHEDULE                       -DBUILDDEBUG 
-DXResExtension 
-DX_BYTE_ORDER=X_LITTLE_ENDIAN 
-DXORG_VERSION_CURRENT="(((6) * 10000000) + ((8) * 100000) + ((1) * 
1000) + 0)" -DNDEBUG   -DFUNCPROTO=15 -DNARROWPROTO 
-DXF86CONFIG=\"xorg.conf\" -DUSE_MODULES               -DHAS_NCURSES 
        -DPROJECT_ROOT=\"/usr/X11R6\" 
-DXF86CONFIGDIR=\"/usr/X11R6/lib/X11\" -DPCCONS_SUPPORT 
-DSYSCONS_SUPPORT -DPCVT_SUPPORT 
-D__XCONFIGFILE__='"xorg.conf"' 
-D__XCONFIGDIR__='"/usr/X11R6/lib/X11"' -D__XLOGFILE__='"Xorg"' 
-D__XSERVERNAME__='"Xorg"' -D__XKBDEFRULES__='"xorg"'   interface.c
interface.c: In function `Usage':
interface.c:224: warning: string length `630' is greater than the length 
`509' ISO C89 compilers are required to support
interface.c: In function `main':
interface.c:411: error: `compositeWidgetClass' undeclared (first use in 
this function)
interface.c:411: error: (Each undeclared identifier is reported only once
interface.c:411: error: for each function it appears in.)
*** Error code 1

Stop in 
/usr/ports/x11-servers/xorg-server/work/xc/programs/Xserver/hw/xfree86/xf86cfg.
*** Error code 1

Stop in 
/usr/ports/x11-servers/xorg-server/work/xc/programs/Xserver/hw/xfree86.
*** Error code 1

Stop in /usr/ports/x11-servers/xorg-server/work/xc/programs/Xserver.
*** Error code 1


-- 
Nate