Index: head/sysutils/barrier/Makefile =================================================================== --- head/sysutils/barrier/Makefile (revision 542419) +++ head/sysutils/barrier/Makefile (revision 542420) @@ -1,59 +1,61 @@ # $FreeBSD$ PORTNAME= barrier DISTVERSIONPREFIX= v -DISTVERSION= 2.3.2 +DISTVERSION= 2.3.3 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org COMMENT= Mouse and keyboard sharing utility LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake compiler:c++14-lang localbase:ldflags pkgconfig ssl xorg USE_GITHUB= yes GH_ACCOUNT= debauchee USE_XORG= ice sm x11 xext xi xinerama xrandr xtst CMAKE_ARGS= -DBARRIER_BUILD_DATE=00000000 MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= EXAMPLES GUI OPTIONS_DEFAULT= GUI +# no GUI option on 11.x with base SSL since qt5-network is not available +OPTIONS_EXCLUDE= ${${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base:?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-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}${MANPREFIX}/man/man1 + ${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 Index: head/sysutils/barrier/distinfo =================================================================== --- head/sysutils/barrier/distinfo (revision 542419) +++ head/sysutils/barrier/distinfo (revision 542420) @@ -1,3 +1,3 @@ -TIMESTAMP = 1570257369 -SHA256 (debauchee-barrier-v2.3.2_GH0.tar.gz) = 6b92a70c5f4d625065842d133386982ec2ad1db2a809af47e46ab8ce2acd39b5 -SIZE (debauchee-barrier-v2.3.2_GH0.tar.gz) = 7244128 +TIMESTAMP = 1594973868 +SHA256 (debauchee-barrier-v2.3.3_GH0.tar.gz) = 259e75c150ca16d9db51870b026dc7aad56c410fa3d2f5fdccc19d4b6024bdc5 +SIZE (debauchee-barrier-v2.3.3_GH0.tar.gz) = 5465909 Index: head/sysutils/barrier/files/patch-CMakeLists.txt =================================================================== --- head/sysutils/barrier/files/patch-CMakeLists.txt (revision 542419) +++ head/sysutils/barrier/files/patch-CMakeLists.txt (revision 542420) @@ -1,20 +1,20 @@ ---- CMakeLists.txt.orig 2018-09-08 23:09:56 UTC +--- CMakeLists.txt.orig 2020-07-14 17:37:45 UTC +++ CMakeLists.txt -@@ -333,7 +333,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +@@ -341,7 +341,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() find_library (lib_ssl ssl) -@@ -403,7 +403,7 @@ endif() +@@ -417,7 +417,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/barrier.svg DESTINATION share/icons/hicolor/scalable/apps) if("${VERSION_MAJOR}" STREQUAL "2") Index: head/sysutils/barrier/files/patch-cmake_Version.cmake =================================================================== --- head/sysutils/barrier/files/patch-cmake_Version.cmake (revision 542419) +++ head/sysutils/barrier/files/patch-cmake_Version.cmake (revision 542420) @@ -1,10 +1,10 @@ ---- cmake/Version.cmake.orig 2019-05-16 15:32:09 UTC +--- cmake/Version.cmake.orig 2020-07-14 17:37:45 UTC +++ cmake/Version.cmake -@@ -69,7 +69,6 @@ else() +@@ -70,7 +70,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") Index: head/sysutils/barrier/files/patch-src_CMakeLists.txt =================================================================== --- head/sysutils/barrier/files/patch-src_CMakeLists.txt (nonexistent) +++ head/sysutils/barrier/files/patch-src_CMakeLists.txt (revision 542420) @@ -0,0 +1,10 @@ +--- src/CMakeLists.txt.orig 2020-07-17 08:17:25 UTC ++++ src/CMakeLists.txt +@@ -19,7 +19,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib) + + add_subdirectory(lib) + add_subdirectory(cmd) +-add_subdirectory(test) + + if (BARRIER_BUILD_GUI) + add_subdirectory(gui) Property changes on: head/sysutils/barrier/files/patch-src_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h =================================================================== --- head/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h (nonexistent) +++ head/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h (revision 542420) @@ -0,0 +1,33 @@ +--- 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 +- + 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 Property changes on: head/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/barrier/pkg-plist =================================================================== --- head/sysutils/barrier/pkg-plist (revision 542419) +++ head/sysutils/barrier/pkg-plist (revision 542420) @@ -1,11 +1,11 @@ %%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 +share/man/man1/barrierc.1.gz +share/man/man1/barriers.1.gz