summaryrefslogtreecommitdiffstats
path: root/x11-servers/xorg-server/Makefile
diff options
context:
space:
mode:
authorzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2012-06-07 19:34:36 +0800
committerzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2012-06-07 19:34:36 +0800
commit1f0c88a11a23abc03a9e8759c6d47803d114f83c (patch)
treef189d8993d2ecf71bb98fe0cd883b381d1cb9bb3 /x11-servers/xorg-server/Makefile
parent8d7b21764371ef56144409956fbd1bf23397a22e (diff)
downloadxorg-devel-ports-1f0c88a11a23abc03a9e8759c6d47803d114f83c.tar
xorg-devel-ports-1f0c88a11a23abc03a9e8759c6d47803d114f83c.tar.gz
xorg-devel-ports-1f0c88a11a23abc03a9e8759c6d47803d114f83c.tar.bz2
xorg-devel-ports-1f0c88a11a23abc03a9e8759c6d47803d114f83c.tar.lz
xorg-devel-ports-1f0c88a11a23abc03a9e8759c6d47803d114f83c.tar.xz
xorg-devel-ports-1f0c88a11a23abc03a9e8759c6d47803d114f83c.tar.zst
xorg-devel-ports-1f0c88a11a23abc03a9e8759c6d47803d114f83c.zip
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
Diffstat (limited to 'x11-servers/xorg-server/Makefile')
-rw-r--r--x11-servers/xorg-server/Makefile7
1 files changed, 2 insertions, 5 deletions
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}