Index: head/x11-toolkits/qt5-gui/Makefile
===================================================================
--- head/x11-toolkits/qt5-gui/Makefile	(revision 514241)
+++ head/x11-toolkits/qt5-gui/Makefile	(revision 514242)
@@ -1,105 +1,106 @@
 # $FreeBSD$
 
 PORTNAME=	gui
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits graphics
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt graphical user interface module
 
-BUILD_DEPENDS=	at-spi2-core>=0:accessibility/at-spi2-core
+BUILD_DEPENDS=	at-spi2-core>=0:accessibility/at-spi2-core \
+		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libevdev.so:devel/libevdev \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libinput.so:x11/libinput \
 		libpng.so:graphics/png \
 		libxcb.so:x11/libxcb \
 		libxcb-image.so:x11/xcb-util-image \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxcb-render-util.so:x11/xcb-util-renderutil \
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		compiler:c++11-lang gl gnome jpeg localbase qmake:no_env \
 		qt-dist:5,base xorg
 USE_GL=		gl egl
 USE_GNOME=	glib20
 USE_QT=		core dbus network qmake_build buildtools_build
 USE_XORG=	ice sm x11 xi xrender
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-no-eglfs \
 		-no-libudev \
 		-system-harfbuzz
 # Explicitly set to c++14 to avoid c++17/c++1z, since libX11's headers
 # are using the obsolete 'register' keyword.
 CONFIGURE_ARGS+=	-c++std c++14
 
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 # Build and install QtPlatformSupport and default QPA plugins (XCB,
 # minimal and offscreen). QtGui won't work without (one of) them, but
 # they depend on QtGui itself, so they can't be added as dependencies.
 # QtPlatformSupport doesn't need to be installed (it's a static
 # library), but might be needed by people porting Qt on new platforms.
 MORE_WRKSRCS=	src/platformheaders \
 		src/platformsupport \
 		src/plugins/platforms \
 		src/plugins/generic
 
 # Image formats are split through different tarballs, these are the
 # main ones; input contexts require no additional dependency.
 MORE_WRKSRCS+=	src/plugins/imageformats \
 		src/plugins/platforminputcontexts
 
 # openglextensions is the static library to use for further things like qtcanvas3d
 MORE_WRKSRCS+=	src/openglextensions
 
 QT_DEFINES=	ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \
 		IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER
 QT_CONFIG=	accessibility accessibility-atspi-bridge dbus \
 		fontconfig glib opengl png system-freetype \
 		system-jpeg system-png xcb xcb-glx xcb-render \
 		xcb-xlib xinput2 xlib xrender
 
 # Inherited from Qt 4.
 .if defined(PACKAGE_BUILDING)
 RUN_DEPENDS+=	${LOCALBASE}/share/fonts/encodings/encodings.dir:x11-fonts/encodings \
 		xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
 .endif
 
 post-configure:
 .for d in src/tools/qvkgen src/gui ${MORE_WRKSRCS}
 	${MKDIR} ${WRKSRC}/${d}
 	cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d}
 .endfor
 
 pre-build:
 .for d in src/tools/qvkgen
 	@cd ${WRKSRC}/${d} && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
 		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
 .endfor
 
 post-build:
 .for d in ${MORE_WRKSRCS}
 	@cd ${WRKSRC}/${d} && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
 		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
 .endfor
 
 post-install:
 .for d in src/tools/qvkgen ${MORE_WRKSRCS}
 	@cd ${WRKSRC}/${d} && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} ${INSTALL_TARGET}
 .endfor
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp
===================================================================
--- head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp	(nonexistent)
+++ head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp	(revision 514242)
@@ -0,0 +1,14 @@
+--- src/platformsupport/devicediscovery/qdevicediscovery_static.cpp.orig	2019-06-13 04:18:18 UTC
++++ src/platformsupport/devicediscovery/qdevicediscovery_static.cpp
+@@ -47,11 +47,7 @@
+ #include <QLoggingCategory>
+ #include <QtCore/private/qcore_unix_p.h>
+ 
+-#ifdef Q_OS_FREEBSD
+-#include <dev/evdev/input.h>
+-#else
+ #include <linux/input.h>
+-#endif
+ #include <fcntl.h>
+ 
+ /* android (and perhaps some other linux-derived stuff) don't define everything

Property changes on: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h
===================================================================
--- head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h	(nonexistent)
+++ head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h	(revision 514242)
@@ -0,0 +1,14 @@
+--- src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h.orig	2019-06-13 04:18:18 UTC
++++ src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
+@@ -52,11 +52,7 @@
+ //
+ 
+ #include "qnamespace.h"
+-#ifdef Q_OS_FREEBSD
+-#include <dev/evdev/input.h>
+-#else
+ #include "linux/input.h"
+-#endif
+ 
+ // no QT_BEGIN_NAMESPACE, since we include it internally...
+ 

Property changes on: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp
===================================================================
--- head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp	(nonexistent)
+++ head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp	(revision 514242)
@@ -0,0 +1,14 @@
+--- src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp.orig	2019-06-13 04:18:18 UTC
++++ src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
+@@ -52,11 +52,7 @@
+ #include <QtGui/private/qguiapplication_p.h>
+ #include <QtGui/private/qinputdevicemanager_p.h>
+ 
+-#ifdef Q_OS_FREEBSD
+-#include <dev/evdev/input.h>
+-#else
+ #include <linux/input.h>
+-#endif
+ 
+ QT_BEGIN_NAMESPACE
+ 

Property changes on: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevmouse_qevdevmousehandler.cpp
===================================================================
--- head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevmouse_qevdevmousehandler.cpp	(nonexistent)
+++ head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevmouse_qevdevmousehandler.cpp	(revision 514242)
@@ -0,0 +1,15 @@
+--- src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp.orig	2019-06-13 04:18:18 UTC
++++ src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
+@@ -53,12 +53,8 @@
+ 
+ #include <errno.h>
+ 
+-#ifdef Q_OS_FREEBSD
+-#include <dev/evdev/input.h>
+-#else
+ #include <linux/kd.h>
+ #include <linux/input.h>
+-#endif
+ 
+ #define TEST_BIT(array, bit)    (array[bit/8] & (1<<(bit%8)))
+ 

Property changes on: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevmouse_qevdevmousehandler.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp
===================================================================
--- head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp	(nonexistent)
+++ head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp	(revision 514242)
@@ -0,0 +1,14 @@
+--- src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp.orig	2019-06-13 04:18:18 UTC
++++ src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp
+@@ -45,11 +45,7 @@
+ #include <QLoggingCategory>
+ #include <QtCore/private/qcore_unix_p.h>
+ #include <qpa/qwindowsysteminterface.h>
+-#ifdef Q_OS_FREEBSD
+-#include <dev/evdev/input.h>
+-#else
+ #include <linux/input.h>
+-#endif
+ 
+ QT_BEGIN_NAMESPACE
+ 

Property changes on: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp
===================================================================
--- head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp	(nonexistent)
+++ head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp	(revision 514242)
@@ -0,0 +1,14 @@
+--- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig	2019-06-13 04:18:18 UTC
++++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
+@@ -49,11 +49,7 @@
+ #include <QtCore/private/qcore_unix_p.h>
+ #include <QtGui/private/qhighdpiscaling_p.h>
+ #include <QtGui/private/qguiapplication_p.h>
+-#ifdef Q_OS_FREEBSD
+-#include <dev/evdev/input.h>
+-#else
+ #include <linux/input.h>
+-#endif
+ 
+ #include <math.h>
+ 

Property changes on: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property