Index: head/devel/evdev-proto/Makefile
===================================================================
--- head/devel/evdev-proto/Makefile	(revision 487798)
+++ head/devel/evdev-proto/Makefile	(revision 487799)
@@ -1,58 +1,58 @@
 # $FreeBSD$
 
 PORTNAME=	evdev-proto
 PORTVERSION=	4.19
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/torvalds/linux/raw/v${PORTVERSION}/include/uapi/linux/
-DISTNAME=	input.h input-event-codes.h uinput.h
-EXTRACT_SUFX=	# empty
+DISTFILES=	input.h input-event-codes.h uinput.h
+DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Input event device header files
 
 LICENSE=	GPLv2
 
 NO_BUILD=	yes
 NO_ARCH=	yes
-WRKSRC=		${WRKDIR}
+NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	${DISTNAME:S|^|include/linux/|}
+PLIST_FILES=	${DISTFILES:S|^|include/linux/|}
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
-.for i in ${DISTNAME}
-	@${CP} ${DISTDIR}/${i} ${WRKSRC}
+.for i in ${DISTFILES}
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${i} ${WRKSRC}
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -E -e \
 		'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 ; \
 		/EVIOC(RMFF|GRAB|REVOKE)/ s/_IOW(.*), *int/_IOWINT\1/ ; \
 		/EVIOCGKEYCODE/ s/_IOR/_IOWR/ ; \
 		/EVIOCGMASK/ s/_IOR/_IOW/ ; \
 		/EVIOCGMTSLOTS/ s/_IOC_READ/IOC_INOUT/ ; \
 		/#define/ s/_IOC_READ/IOC_OUT/ ; \
 		/#define/ s/_IOC_WRITE/IOC_IN/ ; \
 		s/[[:space:]]+__user[[:space:]]+/ / ; \
 		/__USE_TIME_BITS64/ s|^#if (.*)$$|#if 1 /* \1 */|' \
 		${WRKSRC}/input.h
 	@${REINPLACE_CMD} -i '' -E -e \
 		'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/ ; \
 		/#define/ s/_IOW(.*), *char\*/_IO\1/ ; \
 		/#define/ s/_IOC_READ/IOC_OUT/' \
 		${WRKSRC}/uinput.h
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/linux/
-.for i in ${DISTNAME}
+.for i in ${DISTFILES}
 	${INSTALL_DATA} ${WRKSRC}/${i} \
 		${STAGEDIR}${PREFIX}/include/linux/
 .endfor
 
 .include <bsd.port.mk>
Index: head/devel/evdev-proto/distinfo
===================================================================
--- head/devel/evdev-proto/distinfo	(revision 487798)
+++ head/devel/evdev-proto/distinfo	(revision 487799)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1544273147
-SHA256 (input.h) = 6daff6404fe93484d1c53f8f8bd49d3ae2094f3c1b41871e05a9ba5c8eecc420
-SIZE (input.h) = 15929
-SHA256 (input-event-codes.h) = a736ca688b6d5fd5d0f52d77b620387dd1f0d360ebba53106ca7be96a8231249
-SIZE (input-event-codes.h) = 24313
-SHA256 (uinput.h) = 9123b078f13047c34797332c4f835e5f1e418387e9a950024920faa5a1186974
-SIZE (uinput.h) = 9276
+TIMESTAMP = 1545220953
+SHA256 (evdev-proto-4.19/input.h) = 6daff6404fe93484d1c53f8f8bd49d3ae2094f3c1b41871e05a9ba5c8eecc420
+SIZE (evdev-proto-4.19/input.h) = 15929
+SHA256 (evdev-proto-4.19/input-event-codes.h) = a736ca688b6d5fd5d0f52d77b620387dd1f0d360ebba53106ca7be96a8231249
+SIZE (evdev-proto-4.19/input-event-codes.h) = 24313
+SHA256 (evdev-proto-4.19/uinput.h) = 9123b078f13047c34797332c4f835e5f1e418387e9a950024920faa5a1186974
+SIZE (evdev-proto-4.19/uinput.h) = 9276