Index: devel/evdev-proto/Makefile
===================================================================
--- devel/evdev-proto/Makefile	(revision 514075)
+++ devel/evdev-proto/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	evdev-proto
 PORTVERSION=	4.19
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/torvalds/linux/raw/v${PORTVERSION}/include/uapi/linux/
 DISTFILES=	input.h input-event-codes.h uinput.h
@@ -26,7 +27,8 @@
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -E -e \
-		's/__u([[:digit:]]+)/uint\1_t/g ; \
+		's/_UAPI_INPUT_H/_EVDEV_INPUT_H/g ; \
+		s/__u([[:digit:]]+)/uint\1_t/g ; \
 		s/__s([[:digit:]]+)/int\1_t/g ; \
 		/# *include/ s|<sys/ioctl.h>|<sys/ioccom.h>| ; \
 		/# *include[[:space:]]+<linux\/types.h>/d ; \
@@ -40,7 +42,8 @@
 		/__USE_TIME_BITS64/ s|^#if (.*)$$|#if 1 /* \1 */|' \
 		${WRKSRC}/input.h
 	@${REINPLACE_CMD} -i '' -E -e \
-		's/__u([[:digit:]]+)/uint\1_t/g ; \
+		's/_UAPI__UINPUT_H_/_EVDEV_UINPUT_H_/g ; \
+		s/__u([[:digit:]]+)/uint\1_t/g ; \
 		s/__s([[:digit:]]+)/int\1_t/g ; \
 		/# *include/s|<linux/types.h>|<sys/types.h>| ; \
 		/#define/ s/_IOW(.*), *int/_IOWINT\1/ ; \
@@ -47,6 +50,9 @@
 		/#define/ s/_IOW(.*), *char\*/_IO\1/ ; \
 		/#define/ s/_IOC_READ/IOC_OUT/' \
 		${WRKSRC}/uinput.h
+	@${REINPLACE_CMD} -i '' -E -e \
+		's/_UAPI_INPUT_EVENT_CODES_H/_EVDEV_INPUT_EVENT_CODES_H/g' \
+		${WRKSRC}/input-event-codes.h
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/linux/
Index: devel/libmtdev/Makefile
===================================================================
--- devel/libmtdev/Makefile	(revision 513969)
+++ devel/libmtdev/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	mtdev
 PORTVERSION=	1.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://bitmath.org/code/${PORTNAME}/
 PKGNAMEPREFIX=	lib
@@ -14,6 +14,7 @@
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
+RUN_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 
 USES=		libtool pathfix tar:bz2
 GNU_CONFIGURE=	yes