Index: net/tcptestsuite/Makefile
===================================================================
--- net/tcptestsuite/Makefile
+++ net/tcptestsuite/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	tcptestsuite
 DISTVERSION=	g20210304
+PORTEPOCH=	1
 CATEGORIES=	net
 
 MAINTAINER=	gnn@FreeBSD.org
@@ -19,12 +20,14 @@
 NO_ARCH=	yes
 NO_BUILD=	yes
 
+_TEST_DIR=	${STAGEDIR}${PREFIX}/tests/${PORTNAME}
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/run-all-tests ${STAGEDIR}${PREFIX}/bin
-	${MKDIR} ${STAGEDIR}${PREFIX}/tests/tcptestsuite
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} "fast-open snd-syn socket-api rcv-data-segments rcv-icmp snippets state-event-engine" ${STAGEDIR}${DATADIR})
-	${INSTALL_SCRIPT} ${FILESDIR}/tcptestsuite_atf_test ${STAGEDIR}${PREFIX}/tests/
-	${INSTALL_DATA} ${FILESDIR}/Kyuafile ${STAGEDIR}${PREFIX}/tests/
+	${MKDIR} ${_TEST_DIR}
+	${INSTALL_SCRIPT} ${FILESDIR}/tcptestsuite_atf_test ${_TEST_DIR}
+	${INSTALL_DATA} ${FILESDIR}/Kyuafile ${_TEST_DIR}
 
 .include <bsd.port.mk>
Index: net/tcptestsuite/pkg-plist
===================================================================
--- net/tcptestsuite/pkg-plist
+++ net/tcptestsuite/pkg-plist
@@ -1,7 +1,4 @@
 bin/run-all-tests
-tests/Kyuafile
-tests/tcptestsuite_atf_test
-@dir tests/tcptestsuite
 %%DATADIR%%/fast-open/README.md
 %%DATADIR%%/fast-open/client/all-fast-open-client-tests
 %%DATADIR%%/fast-open/client/client-handle-cookie-reject-of-length-01.pkt
@@ -42,43 +39,81 @@
 %%DATADIR%%/fast-open/client/client-handle-cookie-reject-of-length-36.pkt
 %%DATADIR%%/fast-open/client/client-handle-cookie-reject-of-length-37.pkt
 %%DATADIR%%/fast-open/client/client-handle-cookie-reject-of-length-38.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-01.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-01.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-02.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-02.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-03.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-03.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-04.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-04.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-05.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-05.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-06.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-06.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-07.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-07.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-08.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-08.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-09.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-09.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-10.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-10.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-11.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-11.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-12.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-12.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-13.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-13.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-14.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-14.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-15.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-15.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-16.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-16.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-17.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-17.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-18.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-18.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-19.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-19.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-20.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-20.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-21.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-21.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-22.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-22.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-23.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-23.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-24.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-24.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-25.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-25.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-26.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-26.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-27.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-27.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-28.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-28.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-29.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-29.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-30.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-30.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-31.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-31.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-32.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-32.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-33.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-33.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-34.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-34.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-35.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-35.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-36.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-36.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-37.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-37.pkt
+%%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-38.exfail
 %%DATADIR%%/fast-open/client/client-handle-cookie-update-of-length-38.pkt
 %%DATADIR%%/fast-open/client/client-handle-initial-cookie-of-length-01.pkt
 %%DATADIR%%/fast-open/client/client-handle-initial-cookie-of-length-02.pkt
@@ -119,6 +154,7 @@
 %%DATADIR%%/fast-open/client/client-handle-initial-cookie-of-length-37.pkt
 %%DATADIR%%/fast-open/client/client-handle-initial-cookie-of-length-38.pkt
 %%DATADIR%%/fast-open/client/client-handle-server-not-supporting-fast-open.pkt
+%%DATADIR%%/fast-open/client/client-server-not-updating-cookie.exfail
 %%DATADIR%%/fast-open/client/client-server-not-updating-cookie.pkt
 %%DATADIR%%/fast-open/client/run-all-fast-open-client-tests
 %%DATADIR%%/fast-open/run-all-fast-open-tests
@@ -987,22 +1023,40 @@
 %%DATADIR%%/state-event-engine/rcv-syn-syn-sent/run-all-rcv-syn-syn-sent-tests
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/README.md
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/all-rcv-syn-time-wait-tests
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-left-edge-insecure-ipv4.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-left-edge-insecure-ipv4.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-left-edge-insecure-ipv6.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-left-edge-insecure-ipv6.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-left-edge-secure-ipv4.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-left-edge-secure-ipv4.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-left-edge-secure-ipv6.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-left-edge-secure-ipv6.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-left-insecure-ipv4.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-left-insecure-ipv4.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-left-insecure-ipv6.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-left-insecure-ipv6.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-left-secure-ipv4.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-left-secure-ipv4.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-left-secure-ipv6.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-left-secure-ipv6.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-right-insecure-ipv4.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-right-insecure-ipv4.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-right-insecure-ipv6.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-right-insecure-ipv6.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-right-secure-ipv4.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-right-secure-ipv4.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-right-secure-ipv6.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-outside-right-secure-ipv6.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-right-edge-insecure-ipv4.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-right-edge-insecure-ipv4.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-right-edge-insecure-ipv6.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-right-edge-insecure-ipv6.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-right-edge-secure-ipv4.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-right-edge-secure-ipv4.pkt
+%%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-right-edge-secure-ipv6.exfail
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/rcv-syn-time-wait-right-edge-secure-ipv6.pkt
 %%DATADIR%%/state-event-engine/rcv-syn-time-wait/run-all-rcv-syn-time-wait-tests
 %%DATADIR%%/state-event-engine/run-all-state-event-engine-tests
 %%DATADIR%%/state-event-engine/tcpstate.d
+tests/tcptestsuite/Kyuafile
+tests/tcptestsuite/tcptestsuite_atf_test