5 files changed, 27 insertions, 30 deletions

diff --git a/sysutils/synergy-1/Makefile b/sysutils/synergy-1/Makefile
index b6189021d2ba..2027cb5ae807 100644
--- a/sysutils/synergy-1/Makefile
+++ b/sysutils/synergy-1/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	synergy-1
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.10.1
-PORTREVISION=	1
+DISTVERSION=	1.10.2
 DISTVERSIONSUFFIX=	-stable
 CATEGORIES=	sysutils
 
@@ -24,6 +23,7 @@ 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
diff --git a/sysutils/synergy-1/distinfo b/sysutils/synergy-1/distinfo
index fc889ab88543..515129fdb410 100644
--- a/sysutils/synergy-1/distinfo
+++ b/sysutils/synergy-1/distinfo
@@ -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
diff --git a/sysutils/synergy-1/files/patch-CMakeLists.txt b/sysutils/synergy-1/files/patch-CMakeLists.txt
index a818161e5556..46de98a8f38c 100644
--- a/sysutils/synergy-1/files/patch-CMakeLists.txt
+++ b/sysutils/synergy-1/files/patch-CMakeLists.txt
@@ -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") 
diff --git a/sysutils/synergy-1/files/patch-src_lib_arch_CMakeLists.txt b/sysutils/synergy-1/files/patch-src_lib_arch_CMakeLists.txt
deleted file mode 100644
index 13634b64b574..000000000000
--- a/sysutils/synergy-1/files/patch-src_lib_arch_CMakeLists.txt
+++ /dev/null
@@ -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()
diff --git a/sysutils/synergy-1/files/patch-src_lib_net_SecureSocket.cpp b/sysutils/synergy-1/files/patch-src_lib_net_SecureSocket.cpp
index 582c985d1ad1..912f1a357a1c 100644
--- a/sysutils/synergy-1/files/patch-src_lib_net_SecureSocket.cpp
+++ b/sysutils/synergy-1/files/patch-src_lib_net_SecureSocket.cpp
@@ -1,6 +1,6 @@
---- 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);
      }