Index: x11/xf86-input-mouse/Makefile
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/x11/xf86-input-mouse/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- x11/xf86-input-mouse/Makefile	14 Sep 2010 11:03:11 -0000	1.12
+++ x11/xf86-input-mouse/Makefile	15 Mar 2012 03:39:56 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.12 2010/09/14 11:03:11 wiz Exp $
 
-DISTNAME=	xf86-input-mouse-1.4.0
-PKGREVISION=	2
+DISTNAME=	xf86-input-mouse-1.7.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,10 +15,19 @@
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	pkg-config
 
+INSTALLATION_DIRS=	include/sys
+
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/inputproto/buildlink3.mk"
 .include "../../x11/kbproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../x11/xineramaproto/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
+
+	# xf86-input-synaptics wants include/sys/mouse.h
+post-install:
+	${MKDIR}	-p                    ${DESTDIR}${PREFIX}/${INSTALLATION_DIRS}
+	${INSTALL_DATA} ${WRKSRC}/src/mouse.h ${DESTDIR}${PREFIX}/${INSTALLATION_DIRS}
Index: x11/xf86-input-mouse/PLIST
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/x11/xf86-input-mouse/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- x11/xf86-input-mouse/PLIST	14 Jun 2009 18:25:11 -0000	1.2
+++ x11/xf86-input-mouse/PLIST	15 Mar 2012 03:44:24 -0000
@@ -1,3 +1,4 @@
 @comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:11 joerg Exp $
+include/sys/mouse.h
 lib/xorg/modules/input/mouse_drv.la
 man/man4/mousedrv.4
Index: x11/xf86-input-mouse/distinfo
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/x11/xf86-input-mouse/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- x11/xf86-input-mouse/distinfo	22 May 2009 19:05:57 -0000	1.8
+++ x11/xf86-input-mouse/distinfo	15 Mar 2012 03:39:35 -0000
@@ -1,9 +1,8 @@
 $NetBSD: distinfo,v 1.8 2009/05/22 19:05:57 tnn Exp $
 
-SHA1 (xf86-input-mouse-1.4.0.tar.bz2) = d16c09580a0a5deb1675874e914f616548859747
-RMD160 (xf86-input-mouse-1.4.0.tar.bz2) = 17985f0493711a25ffa8fdeae4d741d7f602ca4e
-Size (xf86-input-mouse-1.4.0.tar.bz2) = 292626 bytes
-SHA1 (patch-aa) = baf529a3ae260e98fb068cb9549f749705d8213b
+SHA1 (xf86-input-mouse-1.7.1.tar.bz2) = 11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed
+RMD160 (xf86-input-mouse-1.7.1.tar.bz2) = 27ec9a6578b2fb97e135afb991b0ff73dc656da4
+Size (xf86-input-mouse-1.7.1.tar.bz2) = 319429 bytes
 SHA1 (patch-ab) = 632ec0e3908ccd16678a480b5ffa00dba7db640f
 SHA1 (patch-ac) = d32bbb082c0898e6eb6bf9dadb2af401b1e79312
-SHA1 (patch-ad) = 8301f21624cecdb19b2f705d546b6bd37d105dc3
+SHA1 (patch-ad) = 398e4f6c9f1c045567b83d2e5ad4c253eca7368d
Index: x11/xf86-input-mouse/patches/patch-ad
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/x11/xf86-input-mouse/patches/patch-ad,v
retrieving revision 1.1
diff -u -r1.1 patch-ad
--- x11/xf86-input-mouse/patches/patch-ad	22 May 2009 19:05:57 -0000	1.1
+++ x11/xf86-input-mouse/patches/patch-ad	15 Mar 2012 03:39:35 -0000
@@ -11,7 +11,7 @@
 ----------------------------
 
 --- ./src/xf86OSmouse.h.orig	2009-05-19 15:15:31 +0300
-+++ ./src/xf86OSmouse.h	2009-05-19 15:18:54 +0300
++++ ./src/mouse.h	2009-05-19 15:18:54 +0300
 @@ -82,6 +82,7 @@ typedef Bool (*BuiltinPreInitProc)(Input
  				   int flags);
  typedef const char *(*DefaultProtocolProc)(void);