From owner-svn-ports-head@FreeBSD.ORG Tue Dec 23 20:41:00 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53BEC62C; Tue, 23 Dec 2014 20:41:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 25EFA2EAA; Tue, 23 Dec 2014 20:41:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBNKf071031820; Tue, 23 Dec 2014 20:41:00 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBNKexJD031817; Tue, 23 Dec 2014 20:40:59 GMT (envelope-from ak@FreeBSD.org) Message-Id: <201412232040.sBNKexJD031817@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Tue, 23 Dec 2014 20:40:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375352 - in head/x11-servers/xorg-server: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Dec 2014 20:41:00 -0000 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 , lightside@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) {