x11-servers/xorg-servers configure error

[Sevan / Venture37]

Hiya,
I'm runnnig -head WITH_CLANG_IS_CC, when trying the build 
x11-servers/xorg-servers I receive the error "/usr/bin/cpp does not 
preserve whitespace with or without -traditional.  I don't know what to do."

I tried the patch proposed in PR166373 which worked for x11/libX11, but 
no luck.

config.log:
http://pastebin.ca/2153752

make.conf:
STRIP=
CFLAGS+=-fno-omit-frame-pointer

WITH_LCD_FILTERING="YES"
VIDEO_DRIVER="intel"
WITHOUT_NLS="YES"
RUBY_VER=1.9
WITH_LCD_FILTERING="YES"

# added by use.perl 2012-05-20 14:42:26
PERL_VERSION=5.12.4


--- Makefile	24 Apr 2012 17:28:04 -0000	1.86
+++ Makefile	22 May 2012 17:23:06 -0000
@@ -56,6 +56,8 @@
  		--localstatedir=/var --without-dtrace --disable-xephyr \
  		--enable-record=yes

+CONFIGURE_ENV+= RAWCPP="${RAWCPP}"
+
  .if !defined(SLAVE_PORT)
  MAN1=		Xorg.1 \
  		Xserver.1 \
@@ -77,8 +79,16 @@
  OPTIONS=	AIGLX	"Compile with Accelerated Indirect GLX support" on \
  		SUID	"Install the Xorg server with setuid bit set" on

+
  .include <bsd.port.pre.mk>

+.if ${CPP:Mclang*}
+RAWCPP?= ${LOCALBASE}/bin/ucpp
+BUILD_DEPENDS+= ${RAWCPP}:${PORTSDIR}/devel/ucpp
+.else
+RAWCPP?= $$(command -v ${CPP})
+.endif
+
  .if ${ARCH} == sparc64
  OPTIONS+=	HAL	"Compile with HAL config support" off
  .else




Any suggestions?


Sevan