diff --git a/sysutils/barrier/Makefile b/sysutils/barrier/Makefile
index 9888725815c5..c1fff1d739df 100644
--- a/sysutils/barrier/Makefile
+++ b/sysutils/barrier/Makefile
@@ -1,60 +1,66 @@
 PORTNAME=	barrier
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.3
+DISTVERSION=	2.4.0
 CATEGORIES=	sysutils
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sec.research.2005@gmail.com
 COMMENT=	Mouse and keyboard sharing utility
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake compiler:c++14-lang cpe localbase:ldflags pkgconfig ssl xorg
 USE_GITHUB=	yes
-GH_ACCOUNT=	debauchee
+GH_ACCOUNT=	debauchee gulrak:gulrak
+GH_PROJECT=	filesystem:gulrak
+GH_TAGNAME= v1.5.12:gulrak
 USE_XORG=	ice sm x11 xext xi xinerama xrandr xtst
 CPE_VENDOR=	barrier_project
 
-CMAKE_ARGS=	-DBARRIER_BUILD_DATE=00000000
+CMAKE_ARGS=	-DBARRIER_BUILD_DATE=00000000 \
+						-DBARRIER_BUILD_TESTS=OFF
 
 CONFLICTS_INSTALL=	clusterit # bin/barrier
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		EXAMPLES GUI
 OPTIONS_DEFAULT=	GUI
 OPTIONS_SUB=		yes
 
 GUI_DESC=	Build configuration utility (requires Qt 5)
 
 GUI_LIB_DEPENDS=	libcurl.so:ftp/curl \
 			libdns_sd.so:net/avahi-libdns
 GUI_USES=		qt:5
 GUI_USE=		QT=core,gui,network,widgets,buildtools_build,qmake_build
 GUI_CMAKE_BOOL=		BARRIER_BUILD_GUI
 
+post-extract:
+	@${CP} -a ${WRKSRC_gulrak}/include ${WRKSRC}/ext/gulrak-filesystem/
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|"/etc/barrier/|"${ETCDIR}/|' \
 		${WRKSRC}/src/lib/arch/unix/ArchDaemonUnix.h
 	@${REINPLACE_CMD} -e 's|/etc/barrier.conf|${ETCDIR}/barrier.conf|' \
 		${WRKSRC}/doc/barriers.1
 
 post-install:
 	cd ${INSTALL_WRKSRC}/bin && \
 		${INSTALL_PROGRAM} barrierc barriers ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC}/doc && \
 		${INSTALL_MAN} barrierc.1 barriers.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/barrier.conf.example-basic \
 		${STAGEDIR}${ETCDIR}/barrier.conf.sample
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/doc && \
 		${INSTALL_DATA} barrier.conf.example barrier.conf.example-advanced \
 		barrier.conf.example-basic ${STAGEDIR}${EXAMPLESDIR}
 
 post-install-GUI-on:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/barrier ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/sysutils/barrier/distinfo b/sysutils/barrier/distinfo
index 65d08439c848..5d3e00af6869 100644
--- a/sysutils/barrier/distinfo
+++ b/sysutils/barrier/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1594973868
-SHA256 (debauchee-barrier-v2.3.3_GH0.tar.gz) = 259e75c150ca16d9db51870b026dc7aad56c410fa3d2f5fdccc19d4b6024bdc5
-SIZE (debauchee-barrier-v2.3.3_GH0.tar.gz) = 5465909
+TIMESTAMP = 1649943232
+SHA256 (debauchee-barrier-v2.4.0_GH0.tar.gz) = 20046cae7a831d9bb3740b6f04feb9bded4c794c11586a70089080e94ae2fe77
+SIZE (debauchee-barrier-v2.4.0_GH0.tar.gz) = 5572043
+SHA256 (gulrak-filesystem-v1.5.12_GH0.tar.gz) = 7d62c5746c724d28da216d9e11827ba4e573df15ef40720292827a4dfd33f2e9
+SIZE (gulrak-filesystem-v1.5.12_GH0.tar.gz) = 209661
diff --git a/sysutils/barrier/files/patch-src_CMakeLists.txt b/sysutils/barrier/files/patch-src_CMakeLists.txt
index 1eef855cd592..7ee43b8df7d9 100644
--- a/sysutils/barrier/files/patch-src_CMakeLists.txt
+++ b/sysutils/barrier/files/patch-src_CMakeLists.txt
@@ -1,10 +1,11 @@
---- src/CMakeLists.txt.orig	2020-07-17 08:17:25 UTC
+--- src/CMakeLists.txt.orig	2022-04-13 21:47:41 UTC
 +++ src/CMakeLists.txt
-@@ -19,7 +19,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib)
- 
+@@ -20,8 +20,6 @@
  add_subdirectory(lib)
  add_subdirectory(cmd)
--add_subdirectory(test)
  
- if (BARRIER_BUILD_GUI)
-     add_subdirectory(gui)
+-include(../cmake/gtest.cmake)
+-
+ if (BARRIER_BUILD_TESTS)
+     add_subdirectory(test/integtests)
+     add_subdirectory(test/unittests)
diff --git a/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h b/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h
deleted file mode 100644
index 6c2f4a006fca..000000000000
--- a/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/lib/barrier/KeyMap.h.orig	2020-07-17 08:20:18 UTC
-+++ src/lib/barrier/KeyMap.h
-@@ -24,8 +24,6 @@
- #include "common/stdset.h"
- #include "common/stdvector.h"
- 
--#include <gtest/gtest_prod.h>
--
- namespace barrier {
- 
- //! Key map
-@@ -325,21 +323,6 @@ class KeyMap { (public)
-     static bool            parseModifiers(String&, KeyModifierMask&);
- 
-     //@}
--
--private:
--    FRIEND_TEST(KeyMapTests,
--                findBestKey_requiredDown_matchExactFirstItem);
--    FRIEND_TEST(KeyMapTests,
--        findBestKey_requiredAndExtraSensitiveDown_matchExactFirstItem);
--    FRIEND_TEST(KeyMapTests,
--        findBestKey_requiredAndExtraSensitiveDown_matchExactSecondItem);
--    FRIEND_TEST(KeyMapTests,
--        findBestKey_extraSensitiveDown_matchExactSecondItem);
--    FRIEND_TEST(KeyMapTests,
--                findBestKey_noRequiredDown_matchOneRequiredChangeItem);
--    FRIEND_TEST(KeyMapTests,
--                findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
--    FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
- 
- private:
-     //! Ways to synthesize a key