Skip to content

Commit

Permalink
sysutils/barrier: Update to 2.4.0 and adopt port
Browse files Browse the repository at this point in the history
  • Loading branch information
Mostly BSD authored and neelchauhan committed Apr 15, 2022
1 parent 684bb39 commit 8ae93e0
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 46 deletions.
14 changes: 10 additions & 4 deletions sysutils/barrier/Makefile
@@ -1,21 +1,24 @@
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

Expand All @@ -33,6 +36,9 @@ 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
Expand Down
8 changes: 5 additions & 3 deletions 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
13 changes: 7 additions & 6 deletions 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)
33 changes: 0 additions & 33 deletions sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h

This file was deleted.

0 comments on commit 8ae93e0

Please sign in to comment.