Index: x11/libinput/Makefile
===================================================================
--- x11/libinput/Makefile
+++ x11/libinput/Makefile
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	libinput
-PORTVERSION=	1.4.0
+PORTVERSION=	1.6.0
 CATEGORIES=	x11
+MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Generic input library
@@ -14,15 +15,16 @@
 		libudev.so:devel/libudev-devd \
 		libmtdev.so:devel/libmtdev
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	FreeBSDDesktop
-GH_TAGNAME=	67c9796
-
-USES=		autoreconf gmake libtool pathfix pkgconfig
+USES=		autoreconf gmake libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include/libepoll-shim
 INSTALL_TARGET=	install-strip
 
+post-patch:
+	${REINPLACE_CMD} -e 's|program_invocation_short_name|getprogname()|' \
+	    ${WRKSRC}/tools/libinput-list-devices.c \
+	    ${WRKSRC}/tools/ptraccel-debug.c ${WRKSRC}/tools/shared.c
+
 .include <bsd.port.mk>
Index: x11/libinput/distinfo
===================================================================
--- x11/libinput/distinfo
+++ x11/libinput/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485733398
-SHA256 (FreeBSDDesktop-libinput-1.4.0-67c9796_GH0.tar.gz) = 05a2ad401b4969d80af3495e1e8f7577a185ae2f14e21b3d3194f98f34fac911
-SIZE (FreeBSDDesktop-libinput-1.4.0-67c9796_GH0.tar.gz) = 731516
+TIMESTAMP = 1486789508
+SHA256 (libinput-1.6.0.tar.xz) = b7534f518d735c643aedca2fb4694683dfddc8d0600cfb628c87a18e65255832
+SIZE (libinput-1.6.0.tar.xz) = 927656
Index: x11/libinput/files/patch-Makefile.am
===================================================================
--- /dev/null
+++ x11/libinput/files/patch-Makefile.am
@@ -0,0 +1,8 @@
+--- Makefile.am.orig	2017-02-11 05:10:33 UTC
++++ Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = src doc test tools udev
++SUBDIRS = src doc tools udev
+ 
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
Index: x11/libinput/files/patch-include_linux_input.h
===================================================================
--- /dev/null
+++ x11/libinput/files/patch-include_linux_input.h
@@ -0,0 +1,38 @@
+--- include/linux/input.h.orig	2016-12-05 05:15:21 UTC
++++ include/linux/input.h
+@@ -11,7 +11,17 @@
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
++#ifdef __FreeBSD__
++#define __u8 uint8_t
++#define __u16 uint16_t
++#define __u32 uint32_t
++#define __s16 int16_t
++#define __s32 int32_t
++#define _IOC_READ IOC_OUT
++#define _IOC_WRITE IOC_IN
++#else
+ #include <linux/types.h>
++#endif
+ 
+ /*
+  * The event structure itself
+@@ -132,7 +142,7 @@ struct input_keymap_entry {
+  *
+  * If the request code is not an ABS_MT value, -EINVAL is returned.
+  */
+-#define EVIOCGMTSLOTS(len)	_IOC(_IOC_READ, 'E', 0x0a, len)
++#define EVIOCGMTSLOTS(len)	_IOC(IOC_INOUT, 'E', 0x0a, len)
+ 
+ #define EVIOCGKEY(len)		_IOC(_IOC_READ, 'E', 0x18, len)		/* get global key state */
+ #define EVIOCGLED(len)		_IOC(_IOC_READ, 'E', 0x19, len)		/* get all LEDs */
+@@ -147,7 +157,7 @@ struct input_keymap_entry {
+ #define EVIOCRMFF		_IOW('E', 0x81, int)			/* Erase a force effect */
+ #define EVIOCGEFFECTS		_IOR('E', 0x84, int)			/* Report number of effects playable at the same time */
+ 
+-#define EVIOCGRAB		_IOW('E', 0x90, int)			/* Grab/Release device */
++#define EVIOCGRAB		_IO('E', 0x90)				/* Grab/Release device */
+ #define EVIOCREVOKE		_IOW('E', 0x91, int)			/* Revoke device access */
+ 
+ #define EVIOCSCLOCKID		_IOW('E', 0xa0, int)			/* Set clockid to be used for timestamps */
Index: x11/libinput/files/patch-src_Makefile.am
===================================================================
--- x11/libinput/files/patch-src_Makefile.am
+++ x11/libinput/files/patch-src_Makefile.am
@@ -1,4 +1,4 @@
---- src/Makefile.am.orig	2017-01-08 12:31:29 UTC
+--- src/Makefile.am.orig	2017-02-11 05:10:33 UTC
 +++ src/Makefile.am
 @@ -38,6 +38,7 @@ libinput_la_LIBADD = $(MTDEV_LIBS) \
  		     $(LIBUDEV_LIBS) \
@@ -8,3 +8,14 @@
  		     libinput-util.la
  
  libinput_la_CFLAGS = -I$(top_srcdir)/include \
+@@ -61,8 +62,8 @@ libfilter_la_SOURCES = \
+ 	filter.c \
+ 	filter.h \
+ 	filter-private.h
+-libfilter_la_LIBADD =
+-libfilter_la_CFLAGS =
++libfilter_la_LIBADD = $(LIBUDEV_LIBS)
++libfilter_la_CFLAGS = -I$(top_srcdir)/include $(LIBUDEV_CFLAGS)
+ 
+ libinput_la_LDFLAGS = -version-info $(LIBINPUT_LT_VERSION) -shared \
+ 		      -Wl,--version-script=$(srcdir)/libinput.sym
Index: x11/libinput/files/patch-src_evdev.c
===================================================================
--- /dev/null
+++ x11/libinput/files/patch-src_evdev.c
@@ -0,0 +1,11 @@
+--- src/evdev.c.orig	2017-01-19 21:36:55 UTC
++++ src/evdev.c
+@@ -25,6 +25,8 @@
+ 
+ #include "config.h"
+ 
++#include <sys/stat.h>
++
+ #include <errno.h>
+ #include <stdbool.h>
+ #include <stdlib.h>
Index: x11/libinput/files/patch-src_libinput-private.h
===================================================================
--- /dev/null
+++ x11/libinput/files/patch-src_libinput-private.h
@@ -0,0 +1,10 @@
+--- src/libinput-private.h.orig	2017-01-18 04:32:06 UTC
++++ src/libinput-private.h
+@@ -29,6 +29,7 @@
+ 
+ #include <errno.h>
+ #include <math.h>
++#include <stdarg.h>
+ 
+ #include "linux/input.h"
+ 
Index: x11/libinput/files/patch-src_libinput-util.c
===================================================================
--- /dev/null
+++ x11/libinput/files/patch-src_libinput-util.c
@@ -0,0 +1,12 @@
+--- src/libinput-util.c.orig	2017-01-17 04:53:51 UTC
++++ src/libinput-util.c
+@@ -36,6 +36,9 @@
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef __FreeBSD__
++#include <xlocale.h>
++#endif
+ 
+ #include "libinput-util.h"
+ #include "libinput-private.h"
Index: x11/libinput/files/patch-src_libinput.h
===================================================================
--- /dev/null
+++ x11/libinput/files/patch-src_libinput.h
@@ -0,0 +1,10 @@
+--- src/libinput.h.orig	2017-01-19 05:27:32 UTC
++++ src/libinput.h
+@@ -29,6 +29,7 @@
+ extern "C" {
+ #endif
+ 
++#include <stdarg.h>
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <libudev.h>
Index: x11/libinput/files/patch-src_path-seat.c
===================================================================
--- /dev/null
+++ x11/libinput/files/patch-src_path-seat.c
@@ -0,0 +1,15 @@
+--- src/path-seat.c.orig	2017-01-19 05:27:32 UTC
++++ src/path-seat.c
+@@ -23,10 +23,11 @@
+ 
+ #include "config.h"
+ 
++#include <sys/stat.h>
++
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <string.h>
+-#include <sys/stat.h>
+ #include <libudev.h>
+ 
+ #include "path-seat.h"
Index: x11/libinput/files/patch-tools_Makefile.am
===================================================================
--- /dev/null
+++ x11/libinput/files/patch-tools_Makefile.am
@@ -0,0 +1,24 @@
+--- tools/Makefile.am.orig	2017-02-11 05:10:33 UTC
++++ tools/Makefile.am
+@@ -11,8 +11,8 @@ AM_CXXFLAGS = $(GCC_CXXFLAGS)
+ libshared_la_SOURCES = \
+ 		       shared.c \
+ 		       shared.h
+-libshared_la_CFLAGS = $(AM_CFLAGS) $(LIBEVDEV_CFLAGS)
+-libshared_la_LIBADD = $(LIBEVDEV_LIBS)
++libshared_la_CFLAGS = $(AM_CFLAGS) $(LIBEVDEV_CFLAGS) $(LIBUDEV_CFLAGS)
++libshared_la_LIBADD = $(LIBEVDEV_LIBS) $(LIBUDEV_LIBS)
+ 
+ event_debug_SOURCES = event-debug.c
+ event_debug_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS)
+@@ -20,8 +20,9 @@ event_debug_LDFLAGS = -no-install
+ event_debug_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS)
+ 
+ ptraccel_debug_SOURCES = ptraccel-debug.c
+-ptraccel_debug_LDADD = ../src/libfilter.la ../src/libinput.la
++ptraccel_debug_LDADD = ../src/libfilter.la ../src/libinput.la $(LIBUDEV_LIBS)
+ ptraccel_debug_LDFLAGS = -no-install
++ptraccel_debug_CFLAGS = $(LIBUDEV_CFLAGS)
+ 
+ libinput_list_devices_SOURCES = libinput-list-devices.c
+ libinput_list_devices_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS)
Index: x11/libinput/files/patch-udev_Makefile.am
===================================================================
--- /dev/null
+++ x11/libinput/files/patch-udev_Makefile.am
@@ -0,0 +1,10 @@
+--- udev/Makefile.am.orig	2017-02-11 05:10:33 UTC
++++ udev/Makefile.am
+@@ -19,6 +19,7 @@ endif
+ 
+ libinput_model_quirks_SOURCES = libinput-model-quirks.c
+ libinput_model_quirks_CFLAGS = \
++			       -I$(top_srcdir)/include \
+ 			       -I$(top_srcdir)/src \
+ 			       $(LIBUDEV_CFLAGS) \
+ 			       $(GCC_CFLAGS)
Index: x11/libinput/pkg-plist
===================================================================
--- x11/libinput/pkg-plist
+++ x11/libinput/pkg-plist
@@ -3,7 +3,7 @@
 include/libinput.h
 lib/libinput.so
 lib/libinput.so.10
-lib/libinput.so.10.9.1
+lib/libinput.so.10.11.2
 lib/udev/hwdb.d/90-libinput-model-quirks.hwdb
 lib/udev/libinput-device-group
 lib/udev/libinput-model-quirks