Date: Mon, 20 May 2019 14:56:08 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502119 - in head/sysutils: . barrier barrier/files Message-ID: <201905201456.x4KEu8xl072115@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon May 20 14:56:08 2019 New Revision: 502119 URL: https://svnweb.freebsd.org/changeset/ports/502119 Log: New port: sysutils/barrier Barrier is a community maintained fork of the Symless Synergy 1.9 codebase which aims to maintain its simplicity. Barrier will let you use your keyboard and mouse from machine A to control machine B (or more). Barrier supports Windows, OS X, Linux, and FreeBSD. WWW: https://github.com/debauchee/barrier Added: head/sysutils/barrier/ - copied from r501789, head/sysutils/synergy-1/ head/sysutils/barrier/files/patch-cmake_Version.cmake (contents, props changed) Deleted: head/sysutils/barrier/files/patch-src_lib_net_SecureSocket.cpp Modified: head/sysutils/Makefile head/sysutils/barrier/Makefile head/sysutils/barrier/distinfo head/sysutils/barrier/files/patch-CMakeLists.txt head/sysutils/barrier/pkg-descr head/sysutils/barrier/pkg-plist Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Mon May 20 14:31:22 2019 (r502118) +++ head/sysutils/Makefile Mon May 20 14:56:08 2019 (r502119) @@ -90,6 +90,7 @@ SUBDIR += bareos17-client SUBDIR += bareos17-client-static SUBDIR += bareos17-server + SUBDIR += barrier SUBDIR += bastille SUBDIR += batmon SUBDIR += battmond Modified: head/sysutils/barrier/Makefile ============================================================================== --- head/sysutils/synergy-1/Makefile Thu May 16 13:56:16 2019 (r501789) +++ head/sysutils/barrier/Makefile Mon May 20 14:56:08 2019 (r502119) @@ -1,60 +1,59 @@ # $FreeBSD$ -PORTNAME= synergy-1 +PORTNAME= barrier DISTVERSIONPREFIX= v -DISTVERSION= 1.10.2 -DISTVERSIONSUFFIX= -stable +DISTVERSION= 2.1.2 CATEGORIES= sysutils -MAINTAINER= yuri@FreeBSD.org +MAINTAINER= tobik@FreeBSD.org COMMENT= Mouse and keyboard sharing utility LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libcurl.so:ftp/curl - -USES= cmake compiler:c++14-lang cpe ssl -CPE_VENDOR= synergy-foss +USES= cmake compiler:c++14-lang localbase:ldflags pkgconfig ssl USE_GITHUB= yes -GH_ACCOUNT= symless -GH_PROJECT= synergy-core -USE_XORG= ice xtst x11 sm xext xinerama xrandr xi +GH_ACCOUNT= debauchee +USE_XORG= ice sm x11 xext xi xinerama xrandr xtst -CONFLICTS= synergy +CMAKE_ARGS= -DBARRIER_BUILD_DATE=00000000 -CMAKE_OFF= SYNERGY_BUILD_LEGACY_INSTALLER SYNERGY_BUILD_LEGACY_GUI -CMAKE_ARGS= -DSYNERGY_REVISION:STRING=${DISTVERSION:S/.//g}0000 # it expects a 7-digit hash +MAKE_JOBS_UNSAFE= yes -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +OPTIONS_DEFINE= EXAMPLES GUI +OPTIONS_DEFAULT= GUI +OPTIONS_SUB= yes -MAKE_JOBS_UNSAFE=yes +GUI_DESC= Build configuration utility (requires Qt 5) -PORTEXAMPLES= synergy.conf.example synergy.conf.example-basic \ - synergy.conf.example-advanced +GUI_CMAKE_BOOL= BARRIER_BUILD_GUI +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 -OPTIONS_DEFINE= EXAMPLES - post-patch: - @${REINPLACE_CMD} -e 's|return "/etc"|return "${PREFIX}/etc"|' \ - ${WRKSRC}/src/lib/arch/unix/ArchFileUnix.cpp - @${REINPLACE_CMD} -e 's|/etc/synergy.conf|${PREFIX}/etc/synergy.conf|' \ - ${WRKSRC}/doc/synergys.man + @${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 -do-install: -.for f in synergyc synergyd synergys - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin -.endfor -.for f in synergyc synergys - ${INSTALL_MAN} ${WRKSRC}/doc/${f}.man \ - ${STAGEDIR}${MANPREFIX}/man/man1/${f}.1 -.endfor - ${INSTALL_DATA} ${WRKSRC}/doc/synergy.conf.example-basic ${STAGEDIR}${PREFIX}/etc/synergy.conf.sample # server config +post-install: + cd ${INSTALL_WRKSRC}/bin && \ + ${INSTALL_PROGRAM} barrierc barriers ${STAGEDIR}${PREFIX}/bin + cd ${WRKSRC}/doc && \ + ${INSTALL_MAN} barrierc.1 barriers.1 ${STAGEDIR}${MANPREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/barrier.conf.example-basic \ + ${STAGEDIR}${ETCDIR}/barrier.conf.sample -do-install-EXAMPLES-on: +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -.for f in ${PORTEXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${EXAMPLESDIR} -.endfor + 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> Modified: head/sysutils/barrier/distinfo ============================================================================== --- head/sysutils/synergy-1/distinfo Thu May 16 13:56:16 2019 (r501789) +++ head/sysutils/barrier/distinfo Mon May 20 14:56:08 2019 (r502119) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557592062 -SHA256 (symless-synergy-core-v1.10.2-stable_GH0.tar.gz) = 5ffbf9b155f872714f430be911e149f3b21a839eb26270911478f85ad398f48f -SIZE (symless-synergy-core-v1.10.2-stable_GH0.tar.gz) = 6700286 +TIMESTAMP = 1558019983 +SHA256 (debauchee-barrier-v2.1.2_GH0.tar.gz) = 2a6c930157adf500ff664b628fad926256b7fff9555b40c1e50bf8114efcfb3f +SIZE (debauchee-barrier-v2.1.2_GH0.tar.gz) = 7234856 Modified: head/sysutils/barrier/files/patch-CMakeLists.txt ============================================================================== --- head/sysutils/synergy-1/files/patch-CMakeLists.txt Thu May 16 13:56:16 2019 (r501789) +++ head/sysutils/barrier/files/patch-CMakeLists.txt Mon May 20 14:56:08 2019 (r502119) @@ -1,29 +1,20 @@ ---- CMakeLists.txt.orig 2019-05-09 16:52:59 UTC +--- CMakeLists.txt.orig 2018-09-08 23:09:56 UTC +++ CMakeLists.txt -@@ -300,7 +300,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Da - ${OPENSSL_ROOT}/lib/libssl.a - ${OPENSSL_ROOT}/lib/libcrypto.a - ) +@@ -333,7 +333,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + ) + endif() + -elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") +elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD|DragonFly") set (OPENSSL_LIBS ssl crypto) else() - message (FATAL_ERROR "Couldn't find OpenSSL") -@@ -337,7 +337,7 @@ macro (configure_files srcDir destDir) - endmacro (configure_files) - - macro(generate_versionfile) -- if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD|DragonFly") - FILE(WRITE ${CMAKE_BINARY_DIR}/version - "export SYNERGY_VERSION_MAJOR=\"${SYNERGY_VERSION_MAJOR}\"\n" - "export SYNERGY_VERSION_MINOR=\"${SYNERGY_VERSION_MINOR}\"\n" -@@ -380,7 +380,7 @@ endif() + find_library (lib_ssl ssl) +@@ -403,7 +403,7 @@ endif() # # Linux installation # -if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") +if (${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD|DragonFly") configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm) - install(FILES res/synergy.svg DESTINATION share/icons/hicolor/scalable/apps) + install(FILES res/barrier.svg DESTINATION share/icons/hicolor/scalable/apps) if("${VERSION_MAJOR}" STREQUAL "2") Added: head/sysutils/barrier/files/patch-cmake_Version.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/barrier/files/patch-cmake_Version.cmake Mon May 20 14:56:08 2019 (r502119) @@ -0,0 +1,10 @@ +--- cmake/Version.cmake.orig 2019-05-16 15:32:09 UTC ++++ cmake/Version.cmake +@@ -69,7 +69,6 @@ else() + set (BARRIER_BUILD_NUMBER 1) + endif() + +-string (TIMESTAMP BARRIER_BUILD_DATE "%Y%m%d" UTC) + set (BARRIER_SNAPSHOT_INFO ".${BARRIER_VERSION_STAGE}.${BARRIER_REVISION}") + + if (BARRIER_VERSION_STAGE STREQUAL "snapshot") Modified: head/sysutils/barrier/pkg-descr ============================================================================== --- head/sysutils/synergy-1/pkg-descr Thu May 16 13:56:16 2019 (r501789) +++ head/sysutils/barrier/pkg-descr Mon May 20 14:56:08 2019 (r502119) @@ -1,7 +1,6 @@ -Synergy lets you easily share a single mouse and keyboard between -multiple computers with different operating systems, each with its -own display, without special hardware. It's intended for users -with multiple computers on their desk since each system uses its -own display. +Barrier is a community maintained fork of the Symless Synergy 1.9 +codebase which aims to maintain its simplicity. Barrier will let +you use your keyboard and mouse from machine A to control machine +B (or more). Barrier supports Windows, OS X, Linux, and FreeBSD. -WWW: https://symless.com/synergy +WWW: https://github.com/debauchee/barrier Modified: head/sysutils/barrier/pkg-plist ============================================================================== --- head/sysutils/synergy-1/pkg-plist Thu May 16 13:56:16 2019 (r501789) +++ head/sysutils/barrier/pkg-plist Mon May 20 14:56:08 2019 (r502119) @@ -1,6 +1,11 @@ -bin/synergyc -bin/synergys -bin/synergyd -man/man1/synergyc.1.gz -man/man1/synergys.1.gz -@sample etc/synergy.conf.sample +%%GUI%%bin/barrier +bin/barrierc +bin/barriers +@sample %%ETCDIR%%/barrier.conf.sample +man/man1/barrierc.1.gz +man/man1/barriers.1.gz +%%GUI%%share/applications/barrier.desktop +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/barrier.conf.example +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/barrier.conf.example-advanced +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/barrier.conf.example-basic +%%GUI%%share/icons/hicolor/scalable/apps/barrier.svg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905201456.x4KEu8xl072115>