aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kozlov <ak@FreeBSD.org>2014-12-23 20:40:58 +0000
committerAlex Kozlov <ak@FreeBSD.org>2014-12-23 20:40:58 +0000
commitb7088112c08172842aab5035b0db18dd0113111c (patch)
treef113c2da9cfbabcc2853233a1ed3aec6d711f03e
parent6f85aaae76d270313492e2dfca8e046e42322c3c (diff)
downloadports-b7088112c08172842aab5035b0db18dd0113111c.tar.gz
ports-b7088112c08172842aab5035b0db18dd0113111c.zip
Notes
-rw-r--r--x11-servers/xorg-server/Makefile4
-rw-r--r--x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c9
2 files changed, 11 insertions, 2 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index f54cd438881c..2725363c9a8f 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= xorg-server
PORTVERSION= 1.14.7
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH?= 1
CATEGORIES= x11-servers
MASTER_SITES= XORG
@@ -25,7 +25,7 @@ SLAVE_PORT?= no
OPTIONS_SUB= yes
OPTIONS_DEFINE= SUID
OPTIONS_RADIO= CONF
-OPTIONS_RADIO_CONF= HAL DEVD
+OPTIONS_RADIO_CONF= HAL DEVD
SUID_DESC= Install the Xorg server with setuid bit set
HAL_DESC= Compile with HAL config support
DEVD_DESC= Use devd for autoconfiguration of input devices
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c
new file mode 100644
index 000000000000..0260fb86b780
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c
@@ -0,0 +1,9 @@
+Index: hw/xfree86/common/xf86Xinput.c
+@@ -942,6 +942,7 @@
+ if (strcmp(key, "_source") == 0 &&
+ (strcmp(value, "server/hal") == 0 ||
+ strcmp(value, "server/udev") == 0 ||
++ strcmp(value, "server/devd") == 0 ||
+ strcmp(value, "server/wscons") == 0)) {
+ is_auto = 1;
+ if (!xf86Info.autoAddDevices) {