From owner-svn-ports-head@freebsd.org Sat May 11 16:44:37 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7415D15A1B1F; Sat, 11 May 2019 16:44:37 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 15FB58F470; Sat, 11 May 2019 16:44:37 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DD07E1E424; Sat, 11 May 2019 16:44:36 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4BGiaFE049126; Sat, 11 May 2019 16:44:36 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4BGiaMg049123; Sat, 11 May 2019 16:44:36 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201905111644.x4BGiaMg049123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 11 May 2019 16:44:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501267 - in head/sysutils/synergy-1: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/sysutils/synergy-1: . files X-SVN-Commit-Revision: 501267 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 15FB58F470 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 May 2019 16:44:37 -0000 Author: yuri Date: Sat May 11 16:44:35 2019 New Revision: 501267 URL: https://svnweb.freebsd.org/changeset/ports/501267 Log: sysutils/synergy-1: Update 1.10.1 -> 1.10.2 Reported by: portscout Deleted: head/sysutils/synergy-1/files/patch-src_lib_arch_CMakeLists.txt Modified: head/sysutils/synergy-1/Makefile head/sysutils/synergy-1/distinfo head/sysutils/synergy-1/files/patch-CMakeLists.txt head/sysutils/synergy-1/files/patch-src_lib_net_SecureSocket.cpp Modified: head/sysutils/synergy-1/Makefile ============================================================================== --- head/sysutils/synergy-1/Makefile Sat May 11 16:26:40 2019 (r501266) +++ head/sysutils/synergy-1/Makefile Sat May 11 16:44:35 2019 (r501267) @@ -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 Modified: head/sysutils/synergy-1/distinfo ============================================================================== --- head/sysutils/synergy-1/distinfo Sat May 11 16:26:40 2019 (r501266) +++ head/sysutils/synergy-1/distinfo Sat May 11 16:44:35 2019 (r501267) @@ -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 Modified: head/sysutils/synergy-1/files/patch-CMakeLists.txt ============================================================================== --- head/sysutils/synergy-1/files/patch-CMakeLists.txt Sat May 11 16:26:40 2019 (r501266) +++ head/sysutils/synergy-1/files/patch-CMakeLists.txt Sat May 11 16:44:35 2019 (r501267) @@ -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") Modified: head/sysutils/synergy-1/files/patch-src_lib_net_SecureSocket.cpp ============================================================================== --- head/sysutils/synergy-1/files/patch-src_lib_net_SecureSocket.cpp Sat May 11 16:26:40 2019 (r501266) +++ head/sysutils/synergy-1/files/patch-src_lib_net_SecureSocket.cpp Sat May 11 16:44:35 2019 (r501267) @@ -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); }