summaryrefslogtreecommitdiff
path: root/x11-drivers
diff options
context:
space:
mode:
authorBoris Samorodov <bsam@FreeBSD.org>2012-11-07 08:36:25 +0000
committerBoris Samorodov <bsam@FreeBSD.org>2012-11-07 08:36:25 +0000
commitb3de4ee38fda3ab360dfd113123a70be42ae166f (patch)
tree66864028702452e38b1a6add82fca38b01ac2766 /x11-drivers
parent- Update multimedia/vtkmpeg2encode to reflect math/vtk5 PORTVERSION (diff)
. 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
Notes
Notes: svn path=/head/; revision=307125
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-input-mouse/Makefile7
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-src_mouse.c11
2 files changed, 13 insertions, 5 deletions
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index 8e1512a1d49e..42ee890b0afe 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -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
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
new file mode 100644
index 000000000000..8255608025a1
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
@@ -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. */