Update barrier to 2.3.3

OK abieber@

net/barrier/Makefile

@@ -1,36 +1,36 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2020/01/31 23:32:54 abieber Exp $
+# $OpenBSD: Makefile,v 1.2 2021/01/03 08:35:56 rsadowski Exp $
 
 COMMENT =		mouse and keyboard sharing utility
 
-V =			2.3.2
-DISTNAME =		deterministic-barrier-source
+V =			2.3.3
+DISTNAME =		barrier-${V}-release
 PKGNAME =		barrier-${V}
 CATEGORIES =		net x11
 
 MASTER_SITES =		https://github.com/debauchee/barrier/releases/download/v${V}/
 
-# GPLv2 only
-PERMIT_PACKAGE =	Yes
-
 WANTLIB += ${COMPILER_LIBCXX} ICE Qt5Core Qt5Gui Qt5Network Qt5Widgets
 WANTLIB += SM X11 Xext Xi Xinerama Xrandr Xtst c crypto curl dns_sd
 WANTLIB += m ssl
 
-LIB_DEPENDS =		net/curl \
-			net/avahi
-
-WRKDIST =		${WRKDIR}/barrier
+# GPLv2 only
+PERMIT_PACKAGE =	Yes
 
 MODULES =		devel/cmake \
 			x11/qt5
 
+BUILD_DEPENDS =		devel/gtest
+
+LIB_DEPENDS =		net/curl \
+			net/avahi
+
 NO_TEST =		Yes
 
-SLBST_VARS +=		LOCALBASE
-SLBST_VARS +=		X11BASE
-
 pre-configure:
-	${SUBST_CMD} ${WRKDIST}/*.txt
+	rm -rf ${WRKSRC}/ext/*
+	sed -i 's|add_library.*||g' ${WRKSRC}/src/test/CMakeLists.txt
+	sed -i 's|set_target_properties.*||g' ${WRKSRC}/src/test/CMakeLists.txt
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/build-*/bin/barrier* ${PREFIX}/bin/
 	mv ${PREFIX}/bin/barrier ${PREFIX}/bin/barrier-gui

net/barrier/distinfo

@@ -1,2 +1,2 @@
-SHA256 (deterministic-barrier-source.tar.gz) = hnKJ9ZtAufIQ6wtwyN+3fS6f0aW407gsbGn+COvIcnA=
-SIZE (deterministic-barrier-source.tar.gz) = 7243785
+SHA256 (barrier-2.3.3-release.tar.gz) = RExHQDyrmZmlXAslm61YJl83i4I0kynrxM7Xub/nuBY=
+SIZE (barrier-2.3.3-release.tar.gz) = 6179696

net/barrier/patches/patch-CMakeLists_txt

@@ -1,22 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2020/01/31 23:32:54 abieber Exp $
-
-https://github.com/debauchee/barrier/pull/468
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -167,6 +167,14 @@ if (UNIX)
-             link_directories("/usr/local/lib")
-         endif()
- 
-+	if (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-+	    set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${X11BASE}/include;${LOCALBASE}/include;${LOCALBASE}/include/avahi-compat-libdns_sd")
-+	    set (CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib")
-+	    include_directories("${LOCALBASE}/include" "${X11BASE}/include" "${LOCALBASE}/include/avahi-compat-libdns_sd")
-+            link_directories("${LOCALBASE}/lib")
-+	    link_directories("${X11BASE}/lib")
-+        endif()
-+
-         if (${PKG_CONFIG_FOUND})
-             pkg_check_modules (AVAHI_COMPAT REQUIRED avahi-compat-libdns_sd)
-             include_directories (BEFORE SYSTEM ${AVAHI_COMPAT_INCLUDE_DIRS})

net/barrier/patches/patch-src_gui_CMakeLists_txt

@@ -1,15 +1,14 @@
-$OpenBSD: patch-src_gui_CMakeLists_txt,v 1.1.1.1 2020/01/31 23:32:54 abieber Exp $
-
-https://github.com/debauchee/barrier/pull/468
+$OpenBSD: patch-src_gui_CMakeLists_txt,v 1.2 2021/01/03 08:35:56 rsadowski Exp $
 
 Index: src/gui/CMakeLists.txt
 --- src/gui/CMakeLists.txt.orig
 +++ src/gui/CMakeLists.txt
-@@ -48,6 +48,6 @@ target_link_libraries (barrier common)
- 
- if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-     install (TARGETS barrier DESTINATION ${BARRIER_BUNDLE_BINARY_DIR})
--elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD")
-     install (TARGETS barrier DESTINATION bin)
+@@ -41,7 +41,7 @@ else()
  endif()
+ 
+ if (HAVE_X11)
+-    target_link_libraries (barrier X11)
++    target_link_libraries (barrier X11 pthread)
+ endif()
+ 
+ target_link_libraries (barrier common)