Index: sysutils/synergy/Makefile =================================================================== --- sysutils/synergy/Makefile +++ sysutils/synergy/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= synergy -PORTVERSION= 1.6.2 +PORTVERSION= 1.7.3 CATEGORIES= sysutils MAINTAINER= kevlo@FreeBSD.org @@ -15,6 +15,9 @@ USE_XORG= ice xtst x11 sm USE_GITHUB= yes +DISTVERSIONPREFIX= v +DISTVERSIONSUFFIX= -stable + LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl MAKE_JOBS_UNSAFE=yes @@ -29,9 +32,10 @@ OPTIONS_DEFINE= EXAMPLES post-extract: - cd ${WRKSRC}/ext/ - ${MKDIR} ${WRKSRC}/ext/cryptopp562 - (cd ${WRKSRC}/ext/cryptopp562 && ${TAR} xfz ${WRKSRC}/ext/cryptopp562.zip) + cp ${WRKSRC}/LICENSE ${WRKSRC}/COPYING + ${MKDIR} -p ${WRKSRC}/ext/gmock-1.6.0 ${WRKSRC}/ext/gtest-1.6.0 + (cd ${WRKSRC}/ext/gmock-1.6.0 && ${TAR} xfz ../gmock-1.6.0.zip) + (cd ${WRKSRC}/ext/gtest-1.6.0 && ${TAR} xfz ../gtest-1.6.0.zip) do-install: .for f in synergyc synergyd synergys Index: sysutils/synergy/distinfo =================================================================== --- sysutils/synergy/distinfo +++ sysutils/synergy/distinfo @@ -1,2 +1,2 @@ -SHA256 (synergy-synergy-1.6.2_GH0.tar.gz) = 36c0a2c9ea1c3a13a6134ce1e76ad8dd2f442100dd6075c53f31b399d2543ba3 -SIZE (synergy-synergy-1.6.2_GH0.tar.gz) = 4411385 +SHA256 (synergy-synergy-v1.7.3-stable_GH0.tar.gz) = a4effc3ddb0ef6de95f83fa62b5290e2909f8b76729b1bde89c5061e5d381e25 +SIZE (synergy-synergy-v1.7.3-stable_GH0.tar.gz) = 13661943 Index: sysutils/synergy/files/patch-CMakeLists.txt =================================================================== --- sysutils/synergy/files/patch-CMakeLists.txt +++ sysutils/synergy/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-05-23 23:43:58.000000000 +0800 -+++ CMakeLists.txt 2014-05-30 13:55:26.000000000 +0800 -@@ -74,10 +74,6 @@ +--- CMakeLists.txt.orig 2015-05-26 15:56:21 UTC ++++ CMakeLists.txt +@@ -74,10 +74,6 @@ endif() # Depending on the platform, pass in the required defines. if (UNIX) @@ -8,6 +8,6 @@ - # we have a problem with people checking in code with warnings. - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") - - # For config.h, detect the libraries, functions, etc. - include(CheckIncludeFiles) - include(CheckLibraryExists) + if (NOT APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") + endif() Index: sysutils/synergy/files/patch-src-test-CMakeLists.txt =================================================================== --- sysutils/synergy/files/patch-src-test-CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ ---- src/test/CMakeLists.txt.orig 2014-02-27 00:52:54.000000000 +0800 -+++ src/test/CMakeLists.txt 2014-05-31 23:29:44.000000000 +0800 -@@ -1,33 +0,0 @@ --# synergy -- mouse and keyboard sharing utility --# Copyright (C) 2012 Bolton Software 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 COPYING 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) Index: sysutils/synergy/files/patch-src_CMakeLists.txt =================================================================== --- /dev/null +++ sysutils/synergy/files/patch-src_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/CMakeLists.txt.orig 2015-05-26 15:56:21 UTC ++++ src/CMakeLists.txt +@@ -18,6 +18,7 @@ add_subdirectory(lib) + add_subdirectory(cmd) + add_subdirectory(micro) + +-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX") ++if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" ++ AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX") + add_subdirectory(test) + endif() Index: sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt =================================================================== --- /dev/null +++ sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt @@ -0,0 +1,10 @@ +--- src/lib/arch/CMakeLists.txt.orig 2015-05-26 15:56:21 UTC ++++ src/lib/arch/CMakeLists.txt +@@ -49,6 +49,6 @@ endif() + + add_library(arch STATIC ${sources}) + +-if (UNIX) ++if (UNIX AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + target_link_libraries(arch dl ${libs}) + endif()