Revert revisions r500, r501 and r515.

Remove the usage of ucpp, it causes more problems than it solves.  With this
commit, xorg is currently broken when cpp is really clang-cpp.  A fix to
solve this issue in a hopefully better way is in the works.


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

5 files changed, 4 insertions, 14 deletions

diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 6510fd1..2641c7c 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -14,12 +14,10 @@ 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 02371f1..1bd83d9 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -18,9 +18,7 @@ COMMENT?=	X.Org X server and related programs
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
 
-BUILD_DEPENDS=	ucpp:${PORTSDIR}/devel/ucpp
-RUN_DEPENDS=	ucpp:${PORTSDIR}/devel/ucpp \
-		xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
+RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
 		xkbcomp:${PORTSDIR}/x11/xkbcomp
 
 XORG_CAT=	xserver
@@ -57,7 +55,6 @@ 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 \
@@ -94,7 +91,7 @@ OPTIONS_DEFAULT:=	${OPTIONS_DEFAULT:NHAL}
 # 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 ${PORT_OPTIONS:MHAL}
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index db9ea05..eb466e3 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -13,11 +13,9 @@ 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 f8eb94e..20a95a8 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -15,8 +15,7 @@ COMMENT=	X11 library
 
 LICENSE=	MIT
 
-BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp \
-		${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb \
+BUILD_DEPENDS+=	${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
 
@@ -26,7 +25,7 @@ USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
 			--without-xmlto \
 			--disable-specs
-CONFIGURE_ENV+=	RAWCPP="${LOCALBASE}/bin/ucpp" ac_cv_path_PS2PDF=""
+CONFIGURE_ENV+=	ac_cv_path_PS2PDF=""
 
 .include "${.CURDIR}/manpages"
 
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index 46589d4..3bf4fc4 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -15,10 +15,8 @@ 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