svn commit: r375352 - in head/x11-servers/xorg-server: . files

[Alex Kozlov]

Author: ak
Date: Tue Dec 23 20:40:58 2014
New Revision: 375352
URL: https://svnweb.freebsd.org/changeset/ports/375352
QAT: https://qat.redports.org/buildarchive/r375352/

Log:
  - Fix AutoAddDevices option when config/devd backend is used
  
  Reported by:	Jonathan Chen <jonc at chen.org.nz>, lightside at gmx.com, many others
  Approved by:	x11 (dumbbell, kwm)

Added:
  head/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c   (contents, props changed)
Modified:
  head/x11-servers/xorg-server/Makefile

Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile	Tue Dec 23 20:30:03 2014	(r375351)
+++ head/x11-servers/xorg-server/Makefile	Tue Dec 23 20:40:58 2014	(r375352)
@@ -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

Added: head/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c	Tue Dec 23 20:40:58 2014	(r375352)
@@ -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) {