<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/06a980089ff2cecaefbd42b19e44dd67b0b0a54c">https://github.com/macports/macports-ports/commit/06a980089ff2cecaefbd42b19e44dd67b0b0a54c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 06a9800 synergy: update to v1.8.5; fixes build on Sierra
</span>06a9800 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 06a980089ff2cecaefbd42b19e44dd67b0b0a54c
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Tue Dec 6 19:20:18 2016 -0800
<span style='display:block; white-space:pre;color:#404040;'> synergy: update to v1.8.5; fixes build on Sierra
</span>---
sysutils/synergy/Portfile | 16 +++++----
sysutils/synergy/files/patch-CMakeLists.txt.diff | 8 ++---
.../synergy/files/patch-src_CMakeLists.txt.diff | 42 ++++++++++++++++++++++
3 files changed, 56 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/Portfile b/sysutils/synergy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b58c5b2..00bdd46 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/synergy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
PortGroup cmake 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup synergy synergy 1.6.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup symless synergy 1.8.5-stable v
</span> conflicts synergy-devel
categories sysutils
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,18 +21,23 @@ homepage http://synergy-project.org
</span>
depends_lib port:curl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 bde692fe629be6174f1cdab81917e0d6ac3fcc5a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2d05b2a7e98e6556900669fea544fdc7c9861ada419fb9cfbead85da3212c046
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0aecd412e5e33051050d4cffffd83396bd5fba9b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3bac78711a2960efdb72c752b92ec6928acf86206a3822ae37777854df4cb77b
</span>
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach x {gmock-1.6.0 gtest-1.6.0 cryptopp562} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach x {gmock-1.6.0 gtest-1.6.0} {
</span> xinstall -d ${worksrcpath}/ext/$x
system -W ${worksrcpath}/ext/$x "unzip ../$x.zip"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
set major [lindex [split ${macosx_version} .] 0]
set minor [lindex [split ${macosx_version} .] 1]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/files/patch-CMakeLists.txt.diff b/sysutils/synergy/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c4bb779..5cce6d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/synergy/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2015-04-03 19:52:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2015-04-03 19:53:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,16 +168,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2016-11-21 15:45:07.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2016-11-21 15:45:27.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,16 +173,6 @@
</span> message(FATAL_ERROR "Mac OS X target must be 10.x")
endif ()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> - CACHE STRING "" FORCE)
- else()
- # >= 10.6: Intel only
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_OSX_ARCHITECTURES "i386;x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_OSX_ARCHITECTURES "i386"
</span> - CACHE STRING "" FORCE)
- endif()
-
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/files/patch-src_CMakeLists.txt.diff b/sysutils/synergy/files/patch-src_CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5ed07be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/synergy/files/patch-src_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt.orig 2016-12-06 18:41:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt 2016-12-06 18:42:28.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,37 +14,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # You should have received a copy of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(OPENSSL_PLAT_DIR openssl-win64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(OPENSSL_PLAT_DIR openssl-win32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(OPENSSL_PLAT_DIR openssl-osx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(OPENSSL_LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/ssleay32.lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(OPENSSL_LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libssl.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libcrypto.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(OPENSSL_LIBS ssl crypto)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(OPENSSL_INCLUDE @@PREFIX@@/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(OPENSSL_LIBS ssl crypto)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(cmd)
</span></pre><pre style='margin:0'>
</pre>