From 5f6ea9fd25f5875db4fbf1d467c564420884b91b Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Sun, 25 Feb 2018 03:23:21 +0000 Subject: [PATCH] sysutils/synergy: Update to 2.0.0 Changelog (incomplete): https://github.com/symless/synergy-core/blob/master/ChangeLog Additional port changes: * Changed to DISTVERSION * USES=cmake:outsource * Added SYNERGY_REVISION cmake variable with fake 7-digit hash that it now expects * Updated PLIST_FILES * Updated do-install * Split out do-install-EXAMPLES-on * Removed post-extract with gtest extraction (not needed) * Updated WWW * Updated patches, deleted unnecessary ones. Approved by: tcberner (mentor, implicit) --- sysutils/synergy/Makefile | 30 ++++++++-------- sysutils/synergy/distinfo | 6 ++-- sysutils/synergy/files/patch-CMakeLists.txt | 11 ++++++ .../synergy/files/patch-src_CMakeLists.txt | 10 ------ .../files/patch-src_lib_arch_CMakeLists.txt | 10 +++--- .../files/patch-src_lib_common_common.h | 11 ------ .../files/patch-src_test_CMakeLists.txt | 36 ------------------- sysutils/synergy/pkg-descr | 2 +- 8 files changed, 35 insertions(+), 81 deletions(-) create mode 100644 sysutils/synergy/files/patch-CMakeLists.txt delete mode 100644 sysutils/synergy/files/patch-src_CMakeLists.txt delete mode 100644 sysutils/synergy/files/patch-src_lib_common_common.h delete mode 100644 sysutils/synergy/files/patch-src_test_CMakeLists.txt diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile index 56c19a3fd7b5..42fae81ccfa2 100644 --- a/sysutils/synergy/Makefile +++ b/sysutils/synergy/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= synergy -PORTVERSION= 1.8.8 DISTVERSIONPREFIX= v +DISTVERSION= 2.0.0 DISTVERSIONSUFFIX= -stable CATEGORIES= sysutils @@ -14,37 +14,37 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcurl.so:ftp/curl -USES= cmake cpe ssl +USES= cmake:outsource cpe ssl CPE_VENDOR= synergy-foss -USE_XORG= ice xtst x11 sm xext xinerama xrandr xi USE_GITHUB= yes GH_ACCOUNT= symless GH_PROJECT= synergy-core +USE_XORG= ice xtst x11 sm xext xinerama xrandr xi + +CMAKE_ARGS= -DSYNERGY_REVISION:STRING=${PORTVERSION:S/.//g}00000 # it expects a 7-digit hash CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE=yes -PLIST_FILES= bin/synergyc bin/synergyd bin/synergys \ +PLIST_FILES= bin/synergyc bin/synergys bin/synergy-core \ man/man1/synergyc.1.gz man/man1/synergys.1.gz PORTEXAMPLES= synergy.conf.example synergy.conf.example-basic \ synergy.conf.example-advanced OPTIONS_DEFINE= EXAMPLES -post-extract: - @${MKDIR} ${WRKSRC}/ext/gtest-1.6.0 - @${TAR} xf ${WRKSRC}/ext/gtest-1.6.0.zip -C ${WRKSRC}/ext/gtest-1.6.0 - do-install: -.for f in synergyc synergyd synergys - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin +.for f in synergyc synergys synergy-core + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin .endfor - ${INSTALL_MAN} ${WRKSRC}/doc/synergyc.man \ - ${STAGEDIR}${MANPREFIX}/man/man1/synergyc.1 - ${INSTALL_MAN} ${WRKSRC}/doc/synergys.man \ - ${STAGEDIR}${MANPREFIX}/man/man1/synergys.1 - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +.for f in synergyc synergys + ${INSTALL_MAN} ${WRKSRC}/doc/${f}.man \ + ${STAGEDIR}${MANPREFIX}/man/man1/${f}.1 +.endfor + +do-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ${PORTEXAMPLES} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor diff --git a/sysutils/synergy/distinfo b/sysutils/synergy/distinfo index 7cc43a8e3fda..8457db7ed23f 100644 --- a/sysutils/synergy/distinfo +++ b/sysutils/synergy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511905795 -SHA256 (symless-synergy-core-v1.8.8-stable_GH0.tar.gz) = 9ee45aabf9f77925bfab6248e713ae5d9e6bfe6bc246e4a0a6304dc6a30f5f14 -SIZE (symless-synergy-core-v1.8.8-stable_GH0.tar.gz) = 13498827 +TIMESTAMP = 1519524199 +SHA256 (symless-synergy-core-v2.0.0-stable_GH0.tar.gz) = d4afbbde2c819da44588afbf66ebb3376494d627f6bc4efaf0144b3fb3a41905 +SIZE (symless-synergy-core-v2.0.0-stable_GH0.tar.gz) = 5892923 diff --git a/sysutils/synergy/files/patch-CMakeLists.txt b/sysutils/synergy/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..eab9ae516bc0 --- /dev/null +++ b/sysutils/synergy/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2018-02-25 02:25:11 UTC ++++ CMakeLists.txt +@@ -299,7 +299,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") + set (OPENSSL_LIBS ssl crypto) + else() + message (FATAL_ERROR "Couldn't find OpenSSL") diff --git a/sysutils/synergy/files/patch-src_CMakeLists.txt b/sysutils/synergy/files/patch-src_CMakeLists.txt deleted file mode 100644 index c3c6e7144423..000000000000 --- a/sysutils/synergy/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- src/CMakeLists.txt.orig 2015-08-13 10:21:27.325279000 +0800 -+++ src/CMakeLists.txt 2015-08-13 10:21:43.969252000 +0800 -@@ -17,7 +17,3 @@ - add_subdirectory(lib) - add_subdirectory(cmd) - add_subdirectory(micro) -- --if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX") -- add_subdirectory(test) --endif() diff --git a/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt b/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt index 6482461541a5..3a9310f42fb6 100644 --- a/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt +++ b/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt @@ -1,9 +1,9 @@ ---- src/lib/arch/CMakeLists.txt.orig 2015-08-03 10:52:29.431081000 +0800 -+++ src/lib/arch/CMakeLists.txt 2015-08-03 10:52:45.330309000 +0800 -@@ -50,5 +50,5 @@ +--- src/lib/arch/CMakeLists.txt.orig 2018-02-25 02:17:23 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 ${libs}) +- target_link_libraries(arch dl ${libs}) ++ target_link_libraries(arch ${CMAKE_DL_LIBS} ${libs}) endif() diff --git a/sysutils/synergy/files/patch-src_lib_common_common.h b/sysutils/synergy/files/patch-src_lib_common_common.h deleted file mode 100644 index a9b2753bb06b..000000000000 --- a/sysutils/synergy/files/patch-src_lib_common_common.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/common/common.h.orig 2018-01-28 08:03:58.996880000 -0800 -+++ src/lib/common/common.h 2018-01-28 08:04:48.899097000 -0800 -@@ -137,7 +137,7 @@ - #include - - // if not c++0x, future proof code by allowing use of nullptr --#ifndef nullptr -+#if __cplusplus < 201103L - # define nullptr NULL - #endif - diff --git a/sysutils/synergy/files/patch-src_test_CMakeLists.txt b/sysutils/synergy/files/patch-src_test_CMakeLists.txt deleted file mode 100644 index f0291a0c40fd..000000000000 --- a/sysutils/synergy/files/patch-src_test_CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ ---- src/test/CMakeLists.txt.orig 2015-05-26 23:56:21.000000000 +0800 -+++ src/test/CMakeLists.txt 2015-08-03 10:48:57.642889000 +0800 -@@ -1,33 +0,0 @@ --# synergy -- mouse and keyboard sharing utility --# Copyright (C) 2012 Synergy Si Ltd. --# Copyright (C) 2011 Nick Bolton --# --# This package is free software; you can redistribute it and/or --# modify it under the terms of the GNU General Public License --# found in the file LICENSE that should have accompanied this file. --# --# This package is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program. If not, see . -- --include_directories( -- ../../ext/gtest-1.6.0 -- ../../ext/gtest-1.6.0/include -- ../../ext/gmock-1.6.0 -- ../../ext/gmock-1.6.0/include) -- --add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc) --add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc) -- --if (UNIX) -- # ignore warnings in gtest and gmock -- set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w") -- set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w") --endif() -- --add_subdirectory(integtests) --add_subdirectory(unittests) diff --git a/sysutils/synergy/pkg-descr b/sysutils/synergy/pkg-descr index a5d40b47aeb5..f6276742ebd9 100644 --- a/sysutils/synergy/pkg-descr +++ b/sysutils/synergy/pkg-descr @@ -4,4 +4,4 @@ own display, without special hardware. It's intended for users with multiple computers on their desk since each system uses its own display. -WWW: http://synergy-foss.org/ +WWW: https://symless.com/synergy