Add dependency on ucpp for the ports that does not build using clang's cpp.

This is done explicitly regardless of wether cpp is clang or gcc.



git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@500 058c260c-8361-11dd-a0ac-aa2bafec7d09

5 files changed, 13 insertions, 4 deletions

diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 2641c7c..6510fd1 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -14,10 +14,12 @@ COMMENT=	X.Org sis display driver
 
 CONFLICTS=	xf86-video-sis-intel-[0-9]*
 
+BUILD_DEPENDS=	ucpp:${PORTSDIR}/devel/ucpp
 USE_GL=		gl
 
 XORG_CAT=	driver
 USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 MAN4=		sis.4x
+CONFIGURE_ENV+=	RAWCPP="${LOCALBASE}/bin/ucpp"
 
 .include <bsd.port.mk>
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 84216f4..c9af1ba 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -18,7 +18,8 @@ COMMENT?=	X.Org X server and related programs
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
 
-RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
+RUN_DEPENDS=	ucpp:${PORTSDIR}/devel/ucpp \
+		xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
 		xkbcomp:${PORTSDIR}/x11/xkbcomp
 
 XORG_CAT=	xserver
@@ -55,6 +56,7 @@ CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
 		--without-xmlto --disable-docs --disable-devel-docs \
 		--localstatedir=/var --without-dtrace --disable-xephyr \
 		--enable-record=yes
+CONFIGURE_ENV+=	RAWCPP="${LOCALBASE}/bin/ucpp"
 
 .if !defined(SLAVE_PORT)
 MAN1=		Xorg.1 \
@@ -90,7 +92,7 @@ OPTIONS+=	HAL	"Compile with HAL config support" on
 # The reason why I use this is cause openssl from base doesn't install a .pc file
 # and configure will fail trying to find it. Setting both of those variables to
 # a *non-empty* value by-passes the pkg-config check.
-CONFIGURE_ENV=	SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
+CONFIGURE_ENV+=	SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
 .endif
 
 .if !defined(WITHOUT_HAL)
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index eb466e3..db9ea05 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -13,9 +13,11 @@ CATEGORIES=	x11-toolkits
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Toolkit library
 
+BUILD_DEPENDS=	ucpp:${PORTSDIR}/devel/ucpp
 XORG_CAT=	lib
 USE_XORG=	x11 sm xproto:both kbproto
 CONFIGURE_ARGS=	--disable-specs
+CONFIGURE_ENV+=	RAWCPP="${LOCALBASE}/bin/ucpp"
 
 MAN3=	MenuPopdown.3 \
 	MenuPopup.3 \
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 4cf7834..4970e9b 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -15,7 +15,8 @@ COMMENT=	X11 library
 
 LICENSE=	MIT
 
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb \
+BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp \
+		${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb \
 		${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 
@@ -25,7 +26,7 @@ USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
 			--without-xmlto \
 			--disable-specs
-CONFIGURE_ENV+=	ac_cv_path_PS2PDF=""
+CONFIGURE_ENV+=	RAWCPP="${LOCALBASE}/bin/ucpp ac_cv_path_PS2PDF=""
 
 .include "${.CURDIR}/manpages"
 
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index 3bf4fc4..46589d4 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -15,8 +15,10 @@ COMMENT=	X Window System initializer
 
 LICENSE=	MIT
 
+BUILD_DEPENDS=	ucpp:${PORTSDIR}/devel/ucpp
 XORG_CAT=	app
 USE_XORG=	x11
+CONFIGURE_ENV+=	RAWCPP="${LOCALBASE}/bin/ucpp"
 
 PLIST_FILES=	bin/startx bin/xinit lib/X11/xinit/xinitrc
 PLIST_DIRS=	lib/X11/xinit