Index: head/devel/libepoll-shim/Makefile
===================================================================
--- head/devel/libepoll-shim/Makefile	(revision 525982)
+++ head/devel/libepoll-shim/Makefile	(revision 525983)
@@ -1,35 +1,35 @@
 # Created by: Johannes Lundberg <johalun0@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	libepoll-shim
-PORTVERSION=	0.0.20190311
+PORTVERSION=	0.0.20200212
 CATEGORIES=	devel
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	epoll shim implemented using kevent
+COMMENT=	Small epoll implementation using kqueue
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		cmake compiler:c11
+USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeBSDDesktop
 GH_PROJECT=	epoll-shim
-GH_TAGNAME=	1d1135384395dbf38eea00680ca28ead04f8dce2
+GH_TAGNAME=	07e2a80
 
-USE_LDCONFIG=	yes
+do-test:
+	# Exclude certain tests in resource restricted environments
+	@(if [ `ulimit -n` -lt 20100 ]; then \
+	    ${ECHO} "Skipping test perf-many-fds.perf_many_fds__perf"; \
+	    SKIP_TESTS="-E ^(perf-many-fds.perf_many_fds__perf"; \
+	    if [ `ulimit -n` -lt 1100 ]; then \
+	        ${ECHO} "Skipping test timerfd-test.timerfd__many_timers"; \
+	        SKIP_TESTS=$$SKIP_TESTS"|timerfd-test.timerfd__many_timers"; \
+	    fi; \
+	    SKIP_TESTS=$$SKIP_TESTS")$$"; \
+	fi; \
+	cd ${TEST_WRKSRC} && \
+	${SETENV} ${TEST_ENV} ctest -C ${CMAKE_BUILD_TYPE} $$SKIP_TESTS)
 
-USES=		compiler uidfix
-MAKE_ARGS=	WITHOUT_PROFILE=yes
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' ${WRKSRC}/Makefile
-.if "${CHOSEN_COMPILER_TYPE}" == "gcc"
-	@${REINPLACE_CMD} -e 's|Wno-missing-variable-declarations|Wno-missing-declarations|' \
-		-e 's|-Wno-thread-safety-analysis||' ${WRKSRC}/Makefile
-.endif
-
-pre-install:
-	@${MKDIR} ${STAGEDIR}/${PREFIX}/include/libepoll-shim/sys
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/devel/libepoll-shim/distinfo
===================================================================
--- head/devel/libepoll-shim/distinfo	(revision 525982)
+++ head/devel/libepoll-shim/distinfo	(revision 525983)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554794906
-SHA256 (FreeBSDDesktop-epoll-shim-0.0.20190311-1d1135384395dbf38eea00680ca28ead04f8dce2_GH0.tar.gz) = 689aaf4a6f8f14a715986f03c283cbabf404a2ac5370ad6430f28cc8e101b554
-SIZE (FreeBSDDesktop-epoll-shim-0.0.20190311-1d1135384395dbf38eea00680ca28ead04f8dce2_GH0.tar.gz) = 16341
+TIMESTAMP = 1581547152
+SHA256 (FreeBSDDesktop-epoll-shim-0.0.20200212-07e2a80_GH0.tar.gz) = 80444f72efd2756cf91b323cd8a0a7a9a02ecf81b4b107499ec047cdac651929
+SIZE (FreeBSDDesktop-epoll-shim-0.0.20200212-07e2a80_GH0.tar.gz) = 39959
Index: head/devel/libepoll-shim/pkg-descr
===================================================================
--- head/devel/libepoll-shim/pkg-descr	(revision 525982)
+++ head/devel/libepoll-shim/pkg-descr	(revision 525983)
@@ -1 +1,5 @@
-epoll shim implemented using kevent.
+epoll-shim is a small library that implements epoll on top of kqueue. It
+has been successfully used to port libinput, libevdev, Wayland and more
+software to FreeBSD.
+
+WWW: https://github.com/jiixyj/epoll-shim
Index: head/devel/libepoll-shim/pkg-plist
===================================================================
--- head/devel/libepoll-shim/pkg-plist	(revision 525982)
+++ head/devel/libepoll-shim/pkg-plist	(revision 525983)
@@ -1,7 +1,10 @@
 include/libepoll-shim/sys/epoll.h
+include/libepoll-shim/sys/eventfd.h
 include/libepoll-shim/sys/signalfd.h
 include/libepoll-shim/sys/timerfd.h
-lib/libepoll-shim.a
+lib/cmake/epoll-shim/epoll-shim-config.cmake
+lib/cmake/epoll-shim/epoll-shim-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/epoll-shim/epoll-shim-targets.cmake
 lib/libepoll-shim.so
 lib/libepoll-shim.so.0
 libdata/pkgconfig/epoll-shim.pc