summaryrefslogtreecommitdiffstats
path: root/x11-servers/xorg-server/Makefile
diff options
context:
space:
mode:
authorkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2012-02-09 02:25:38 +0800
committerkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2012-02-09 02:25:38 +0800
commitb1bd7cfa275f6a653d4da4b402223694544f3ac1 (patch)
tree214779834c3422e4ace90a8d6bf654c7aa6a9409 /x11-servers/xorg-server/Makefile
parenteea0b19d8169dde771efa3c783a1b604e919e4a5 (diff)
downloadxorg-devel-ports-b1bd7cfa275f6a653d4da4b402223694544f3ac1.tar
xorg-devel-ports-b1bd7cfa275f6a653d4da4b402223694544f3ac1.tar.gz
xorg-devel-ports-b1bd7cfa275f6a653d4da4b402223694544f3ac1.tar.bz2
xorg-devel-ports-b1bd7cfa275f6a653d4da4b402223694544f3ac1.tar.lz
xorg-devel-ports-b1bd7cfa275f6a653d4da4b402223694544f3ac1.tar.xz
xorg-devel-ports-b1bd7cfa275f6a653d4da4b402223694544f3ac1.tar.zst
xorg-devel-ports-b1bd7cfa275f6a653d4da4b402223694544f3ac1.zip
Update xorg-server WITH_NEW_XORG=1 to 1.11.99.902. (1.12 RC 2)
Make sure we got recent enough xkeyboard-config to prevent security issue(s). git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@413 058c260c-8361-11dd-a0ac-aa2bafec7d09
Diffstat (limited to 'x11-servers/xorg-server/Makefile')
-rw-r--r--x11-servers/xorg-server/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index d375810..6b9e5fb 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -18,19 +18,20 @@ COMMENT?= X.Org X server and related programs
LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm
-RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
+RUN_DEPENDS= xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config
XORG_CAT= xserver
.if defined(WITH_NEW_XORG)
-XORG_VERSION= 1.10.4
-XORG_REVISION= 1
+XORG_VERSION= 1.11.99.902
+XORG_REVISION= 0
PLIST_SUB+= OLD="@comment " NEW=""
.else
XORG_VERSION= 1.7.7
XORG_REVISION= 4
PLIST_SUB+= OLD="" NEW="@comment "
-EXTRA_PATCHES+= ${FILESDIR}/extra-include_eventstr.h
+EXTRA_PATCHES+= ${FILESDIR}/extra-include_eventstr.h \
+ ${FILESDIR}/extra-os-utils.c
.endif
USE_GMAKE= yes