<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[136192] trunk/dports/sysutils/synergy</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/136192">136192</a></dd>
<dt>Author</dt> <dd>dports@macports.org</dd>
<dt>Date</dt> <dd>2015-05-11 15:52:15 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>synergy: update to v1.6.3, fix build (see #44018)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssysutilssynergyPortfile">trunk/dports/sysutils/synergy/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssysutilssynergyfilespatchCMakeListstxtdiff">trunk/dports/sysutils/synergy/files/patch-CMakeLists.txt.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssysutilssynergyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/synergy/Portfile (136191 => 136192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/synergy/Portfile 2015-05-11 22:51:25 UTC (rev 136191)
+++ trunk/dports/sysutils/synergy/Portfile 2015-05-11 22:52:15 UTC (rev 136192)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+# -*- 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
</ins><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="lines">@@ -2,7 +3,6 @@
</span><span class="cx"> PortGroup cmake 1.0
</span><ins>+PortGroup github 1.0
</ins><span class="cx">
</span><del>-name synergy
</del><ins>+github.setup synergy synergy 1.6.3
</ins><span class="cx"> conflicts synergy-devel
</span><del>-version 1.3.8
-revision 1
</del><span class="cx"> categories sysutils
</span><span class="lines">@@ -18,32 +18,29 @@
</span><span class="cx"> without special hardware. It is intended for users with \
</span><span class="cx"> multiple computers on their desk since each system uses its \
</span><span class="cx"> own display.
</span><del>-homepage http://synergy-foss.org
-master_sites googlecode
-distname ${name}-${version}-Source
</del><ins>+homepage http://synergy-project.org
</ins><span class="cx">
</span><del>-checksums sha1 82e80b22c6746e573d047aa4a1ad7b71c28cf7d3 \
- rmd160 3b02faec3b5e5dbea1853e6decd92e4cf6eca419
</del><ins>+depends_lib port:curl
</ins><span class="cx">
</span><del>-# Force 32-bit, all kinds of Carbon cruft in here. (#20908)
-supported_archs i386 ppc
</del><ins>+checksums rmd160 bde692fe629be6174f1cdab81917e0d6ac3fcc5a \
+ sha256 2d05b2a7e98e6556900669fea544fdc7c9861ada419fb9cfbead85da3212c046
</ins><span class="cx">
</span><del>-patchfiles patch-CArchFileUnix.cpp.diff
</del><span class="cx">
</span><del>-# See http://synergy-foss.org/pm/issues/57
-patchfiles-append patch-bug57-keypress.diff \
- patch-bug57-modifiers.diff
</del><ins>+post-extract {
+ foreach x {gmock-1.6.0 gtest-1.6.0 cryptopp562} {
+ xinstall -d ${worksrcpath}/ext/$x
+ system -W ${worksrcpath}/ext/$x "unzip ../$x.zip"
+ }
+}
</ins><span class="cx">
</span><del>-# See http://synergy-foss.org/tracker/issues/2962
-patchfiles-append patch-bug2962-clipboard.diff
</del><ins>+patchfiles patch-CMakeLists.txt.diff
</ins><span class="cx">
</span><del>-post-patch {
- # Set default config path
- reinplace "s|@@SYSCONFDIR@@|${prefix}/etc/${name}|g" ${worksrcpath}/src/lib/arch/CArchFileUnix.cpp
</del><ins>+set major [lindex [split ${macosx_version} .] 0]
+set minor [lindex [split ${macosx_version} .] 1]
+configure.args -G \"Unix Makefiles\" \
+ -DOSX_TARGET_MAJOR=${major} -DOSX_TARGET_MINOR=${minor}
</ins><span class="cx">
</span><del>- # Fix build architectures
- reinplace "s:CMAKE_OSX_ARCHITECTURES \"ppc;i386\":CMAKE_OSX_ARCHITECTURES \"[join [get_canonical_archs] ;]\":" ${worksrcpath}/CMakeLists.txt
-}
</del><ins>+use_parallel_build no
</ins><span class="cx">
</span><span class="cx"> destroot {
</span><span class="cx"> xinstall -d ${destroot}${prefix}/bin
</span></span></pre></div>
<a id="trunkdportssysutilssynergyfilespatchCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/synergy/files/patch-CMakeLists.txt.diff (0 => 136192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/synergy/files/patch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/sysutils/synergy/files/patch-CMakeLists.txt.diff 2015-05-11 22:52:15 UTC (rev 136192)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+--- CMakeLists.txt.orig 2015-04-03 19:52:39.000000000 -0700
++++ CMakeLists.txt 2015-04-03 19:53:53.000000000 -0700
+@@ -168,16 +168,6 @@
+ message(FATAL_ERROR "Mac OS X target must be 10.x")
+ endif ()
+
+- if (OSX_TARGET_MINOR LESS 6)
+- # <= 10.5: 32-bit Intel and PowerPC
+- set(CMAKE_OSX_ARCHITECTURES "ppc;i386"
+- CACHE STRING "" FORCE)
+- else()
+- # >= 10.6: Intel only
+- set(CMAKE_OSX_ARCHITECTURES "i386;x86_64"
+- CACHE STRING "" FORCE)
+- endif()
+-
+ set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
+
+ find_library(lib_ScreenSaver ScreenSaver)
</ins></span></pre>
</div>
</div>
</body>
</html>