From owner-svn-ports-head@FreeBSD.ORG  Wed Nov  7 08:36:26 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3DB5A5AD;
 Wed,  7 Nov 2012 08:36:26 +0000 (UTC)
 (envelope-from bsam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0AC588FC17;
 Wed,  7 Nov 2012 08:36:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA78aPHZ088548;
 Wed, 7 Nov 2012 08:36:25 GMT (envelope-from bsam@svn.freebsd.org)
Received: (from bsam@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA78aPmU088545;
 Wed, 7 Nov 2012 08:36:25 GMT (envelope-from bsam@svn.freebsd.org)
Message-Id: <201211070836.qA78aPmU088545@svn.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Wed, 7 Nov 2012 08:36:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307125 - in head/x11-drivers/xf86-input-mouse: . 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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Nov 2012 08:36:26 -0000

Author: bsam
Date: Wed Nov  7 08:36:25 2012
New Revision: 307125
URL: http://svnweb.freebsd.org/changeset/ports/307125

Log:
  . incorporate an upstream patch to fix wrong read Protocol and Device
    from xorg.conf: http://cgit.freedesktop.org/xorg/driver/xf86-input-mouse/commit/?id=b65651974ee5620086b484086ea12d78c92fa369
  . trim makefile headers.
  
  PR:		ports/171433
  Submitted by:	Martin Birgmeier <Martin.Birgmeier@aon.at>
  Approved by:	x11 (maintainer timeout 8+ weeks)
  Feature safe:	yes

Added:
  head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c   (contents, props changed)
Modified:
  head/x11-drivers/xf86-input-mouse/Makefile

Modified: head/x11-drivers/xf86-input-mouse/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-mouse/Makefile	Wed Nov  7 08:29:58 2012	(r307124)
+++ head/x11-drivers/xf86-input-mouse/Makefile	Wed Nov  7 08:36:25 2012	(r307125)
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	xf86-input-mouse
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-input-mouse
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Added: head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	Wed Nov  7 08:36:25 2012	(r307125)
@@ -0,0 +1,11 @@
+--- src/mouse.c.orig	2012-10-18 11:06:28.000000000 +0400
++++ src/mouse.c	2012-10-18 11:06:57.000000000 +0400
+@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr
+     pInfo->private_flags = 0;
+     pInfo->always_core_feedback = NULL;
+ 
++    COLLECT_INPUT_OPTIONS(pInfo, NULL);
++
+     if (NewMousePreInit(drv, pInfo, flags) == Success)
+     {
+         /* Check if SendDragEvents has been disabled. */