Index: head/sysutils/synergy-1/Makefile =================================================================== --- head/sysutils/synergy-1/Makefile (revision 501266) +++ head/sysutils/synergy-1/Makefile (revision 501267) @@ -1,60 +1,60 @@ # $FreeBSD$ PORTNAME= synergy-1 DISTVERSIONPREFIX= v -DISTVERSION= 1.10.1 -PORTREVISION= 1 +DISTVERSION= 1.10.2 DISTVERSIONSUFFIX= -stable CATEGORIES= sysutils MAINTAINER= yuri@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 USE_GITHUB= yes GH_ACCOUNT= symless GH_PROJECT= synergy-core USE_XORG= ice xtst x11 sm xext xinerama xrandr xi CONFLICTS= synergy +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 CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE=yes PORTEXAMPLES= synergy.conf.example synergy.conf.example-basic \ synergy.conf.example-advanced 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 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 do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ${PORTEXAMPLES} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor .include Index: head/sysutils/synergy-1/distinfo =================================================================== --- head/sysutils/synergy-1/distinfo (revision 501266) +++ head/sysutils/synergy-1/distinfo (revision 501267) @@ -1,3 +1,3 @@ -TIMESTAMP = 1536563910 -SHA256 (symless-synergy-core-v1.10.1-stable_GH0.tar.gz) = 67ef37a9c090e0197018220c04df3005fc574a391935c29b7cb0c3f208fd0429 -SIZE (symless-synergy-core-v1.10.1-stable_GH0.tar.gz) = 6694179 +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 Index: head/sysutils/synergy-1/files/patch-src_lib_arch_CMakeLists.txt =================================================================== --- head/sysutils/synergy-1/files/patch-src_lib_arch_CMakeLists.txt (revision 501266) +++ head/sysutils/synergy-1/files/patch-src_lib_arch_CMakeLists.txt (nonexistent) @@ -1,9 +0,0 @@ ---- src/lib/arch/CMakeLists.txt.orig 2018-08-08 17:39:28 UTC -+++ src/lib/arch/CMakeLists.txt -@@ -40,5 +40,5 @@ endif() - add_library(arch STATIC ${sources}) - - if (UNIX) -- target_link_libraries(arch dl ${libs}) -+ target_link_libraries(arch ${CMAKE_DL_LIBS} ${libs}) - endif() Property changes on: head/sysutils/synergy-1/files/patch-src_lib_arch_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/synergy-1/files/patch-CMakeLists.txt =================================================================== --- head/sysutils/synergy-1/files/patch-CMakeLists.txt (revision 501266) +++ head/sysutils/synergy-1/files/patch-CMakeLists.txt (revision 501267) @@ -1,23 +1,29 @@ ---- CMakeLists.txt.orig 2018-08-08 17:39:28 UTC +--- CMakeLists.txt.orig 2019-05-09 16:52:59 UTC +++ CMakeLists.txt -@@ -17,9 +17,9 @@ - cmake_minimum_required (VERSION 3.4) - project (synergy-core C CXX) - --option (SYNERGY_BUILD_LEGACY_GUI "Build the legacy GUI" ON) -+option (SYNERGY_BUILD_LEGACY_GUI "Build the legacy GUI" OFF) - option (SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON) --option (SYNERGY_BUILD_LEGACY_INSTALLER "Build the legacy installer" ON) -+option (SYNERGY_BUILD_LEGACY_INSTALLER "Build the legacy installer" OFF) - - if (DEFINED ENV{SYNERGY_ENTERPRISE}) - option (SYNERGY_ENTERPRISE "Build Enterprise" ON) @@ -300,7 +300,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Da ${OPENSSL_ROOT}/lib/libssl.a ${OPENSSL_ROOT}/lib/libcrypto.a ) -elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD") ++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() + # + # 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) + if("${VERSION_MAJOR}" STREQUAL "2") Index: head/sysutils/synergy-1/files/patch-src_lib_net_SecureSocket.cpp =================================================================== --- head/sysutils/synergy-1/files/patch-src_lib_net_SecureSocket.cpp (revision 501266) +++ head/sysutils/synergy-1/files/patch-src_lib_net_SecureSocket.cpp (revision 501267) @@ -1,11 +1,11 @@ ---- src/lib/net/SecureSocket.cpp.orig 2018-03-01 20:07:30 UTC +--- src/lib/net/SecureSocket.cpp.orig 2019-05-09 16:52:59 UTC +++ src/lib/net/SecureSocket.cpp -@@ -807,7 +807,7 @@ SecureSocket::showSecureCipherInfo() +@@ -812,7 +812,7 @@ SecureSocket::showSecureCipherInfo() showCipherStackDesc(sStack); } -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) // m_ssl->m_ssl->session->ciphers is not forward compatable, // In future release of OpenSSL, it's not visible, STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;