<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/07b83c94e57f63bc30a9bb9503a85ce61ec60e4e">https://github.com/macports/macports-ports/commit/07b83c94e57f63bc30a9bb9503a85ce61ec60e4e</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 07b83c94e57 synergy, synergy-app: Update to 1.11.1
</span>07b83c94e57 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 07b83c94e57f63bc30a9bb9503a85ce61ec60e4e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Aug 3 01:21:50 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> synergy, synergy-app: Update to 1.11.1
</span>---
sysutils/synergy-app/Portfile | 42 -----------------
sysutils/synergy-app/files/patch-openssl.diff | 20 ---------
sysutils/synergy/Portfile | 52 +++++++++++++---------
.../files/patch-Info.plist.in.diff | 0
sysutils/synergy/files/patch-openssl.diff | 13 +++---
5 files changed, 38 insertions(+), 89 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy-app/Portfile b/sysutils/synergy-app/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 83aed9d4923..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- 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><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup symless synergy-core 1.10.3 v -stable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name synergy-app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories sysutils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description A client/server for sharing a single mouse and keyboard
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Synergy lets you easily share a single mouse and keyboard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- between multiple computers with different operating systems \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- without special hardware. It is intended for users with \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- multiple computers on their desk since each system uses its \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- own display.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://symless.com/synergy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir synergy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:curl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 24da306f70943a69f99ed69ea60c6cd6f45bac83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 264608068ba829a7ae748d751bab080c95a8700a18e89c4694058e293bb6ffa4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7595908
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-openssl.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Info.plist.in.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${cmake.build_dir}/bundle/Synergy.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy-app/files/patch-openssl.diff b/sysutils/synergy-app/files/patch-openssl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1bc797d0a84..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy-app/files/patch-openssl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2019-09-17 09:54:17.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-09-17 11:50:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -292,7 +292,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${OPENSSL_ROOT}/lib/libssl.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${OPENSSL_ROOT}/lib/libcrypto.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+elseif (FALSE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Try use 1.1 for the latest features. otherwise use the default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(EXISTS /usr/local/opt/openssl@1.1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (OPENSSL_ROOT /usr/local/opt/openssl@1.1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -304,7 +304,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${OPENSSL_ROOT}/lib/libssl.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${OPENSSL_ROOT}/lib/libcrypto.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (OPENSSL_LIBS ssl crypto)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message (FATAL_ERROR "Couldn't find OpenSSL")
</span><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 d2858f584c9..d58ad776ddb 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,16 @@
</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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup symless synergy-core 1.10.3-stable v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup symless synergy-core 1.11.1 v -stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 84f0a1ade8bb9337229295bb9fcf9f3898f73493 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 338e5fda0323f8c24259d8fc26e513bdc4f0f249bf66e9722953bb8e6311f88b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7556850
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name synergy
categories sysutils
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,38 +23,45 @@ long_description \
</span> without special hardware. It is intended for users with \
multiple computers on their desk since each system uses its \
own display.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://synergy-project.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://symless.com/synergy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive
</span>
depends_lib-append \
port:curl \
path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 24da306f70943a69f99ed69ea60c6cd6f45bac83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 264608068ba829a7ae748d751bab080c95a8700a18e89c4694058e293bb6ffa4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7595908
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles patch-openssl.diff
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -G \"Unix Makefiles\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DSYNERGY_BUILD_LEGACY_INSTALLER=OFF
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/bin/synergyc ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/bin/synergys ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/synergyc.man ${destroot}${prefix}/share/man/man1/synergyc.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/synergys.man ${destroot}${prefix}/share/man/man1/synergys.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -W ${build.dir}/bin synergyc synergys ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/doc/synergyc.man ${destroot}${prefix}/share/man/man1/synergyc.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/doc/synergys.man ${destroot}${prefix}/share/man/man1/synergys.1
</span> xinstall -d ${destroot}${prefix}/etc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath}/doc/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath}/doc/ \
</span> synergy.conf.example \
synergy.conf.example-advanced \
synergy.conf.example-basic \
${destroot}${prefix}/etc/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.create yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.executable ${prefix}/bin/synergys --no-daemon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.create yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.executable ${prefix}/bin/synergys --no-daemon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-app {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-Info.plist.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${cmake.build_dir}/bundle/Synergy.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy-app/files/patch-Info.plist.in.diff b/sysutils/synergy/files/patch-Info.plist.in.diff
</span>similarity index 100%
rename from sysutils/synergy-app/files/patch-Info.plist.in.diff
rename to sysutils/synergy/files/patch-Info.plist.in.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/files/patch-openssl.diff b/sysutils/synergy/files/patch-openssl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1bc797d0a84..524ee441c18 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy/files/patch-openssl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/synergy/files/patch-openssl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2019-09-17 09:54:17.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-09-17 11:50:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -292,7 +292,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2020-03-19 10:45:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-08-02 22:39:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -292,14 +292,14 @@
</span> ${OPENSSL_ROOT}/lib/libssl.lib
${OPENSSL_ROOT}/lib/libcrypto.lib
)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+elseif (FALSE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #Try use 1.1 for the latest features. otherwise use the default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(EXISTS /usr/local/opt/openssl@1.1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (OPENSSL_ROOT /usr/local/opt/openssl@1.1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -304,7 +304,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set (OPENSSL_ROOT /usr/local/opt/openssl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set (OPENSSL_LIBS
</span> ${OPENSSL_ROOT}/lib/libssl.a
${OPENSSL_ROOT}/lib/libcrypto.a
)
</pre><pre style='margin:0'>
</pre>