[136192] trunk/dports/sysutils/synergy

[dports at macports.org]

Revision: 136192
          https://trac.macports.org/changeset/136192
Author:   dports at macports.org
Date:     2015-05-11 15:52:15 -0700 (Mon, 11 May 2015)
Log Message:
-----------
synergy: update to v1.6.3, fix build (see #44018)

Modified Paths:
--------------
    trunk/dports/sysutils/synergy/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/synergy/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/sysutils/synergy/Portfile
===================================================================
--- 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)
@@ -1,3 +1,4 @@
+# -*- 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
 # $Id$
 
 PortSystem 1.0
@@ -2,7 +3,6 @@
 PortGroup cmake 1.0
+PortGroup github 1.0
 
-name            synergy
+github.setup    synergy synergy 1.6.3
 conflicts       synergy-devel
-version         1.3.8
-revision        1
 categories      sysutils
@@ -18,32 +18,29 @@
     without special hardware. It is intended for users with \
     multiple computers on their desk since each system uses its \
     own display.
-homepage        http://synergy-foss.org
-master_sites    googlecode
-distname        ${name}-${version}-Source
+homepage        http://synergy-project.org
 
-checksums       sha1    82e80b22c6746e573d047aa4a1ad7b71c28cf7d3 \
-                rmd160  3b02faec3b5e5dbea1853e6decd92e4cf6eca419
+depends_lib     port:curl
 
-# Force 32-bit, all kinds of Carbon cruft in here. (#20908)
-supported_archs i386 ppc
+checksums       rmd160  bde692fe629be6174f1cdab81917e0d6ac3fcc5a \
+                sha256  2d05b2a7e98e6556900669fea544fdc7c9861ada419fb9cfbead85da3212c046
 
-patchfiles	patch-CArchFileUnix.cpp.diff
 
-# See http://synergy-foss.org/pm/issues/57
-patchfiles-append patch-bug57-keypress.diff \
-                  patch-bug57-modifiers.diff
+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"
+    }
+}
 
-# See http://synergy-foss.org/tracker/issues/2962
-patchfiles-append patch-bug2962-clipboard.diff
+patchfiles patch-CMakeLists.txt.diff
 
-post-patch {
-    # Set default config path
-    reinplace "s|@@SYSCONFDIR@@|${prefix}/etc/${name}|g" ${worksrcpath}/src/lib/arch/CArchFileUnix.cpp
+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}
 
-    # Fix build architectures
-    reinplace "s:CMAKE_OSX_ARCHITECTURES \"ppc;i386\":CMAKE_OSX_ARCHITECTURES \"[join [get_canonical_archs] ;]\":" ${worksrcpath}/CMakeLists.txt
-}
+use_parallel_build no
 
 destroot {
         xinstall -d ${destroot}${prefix}/bin

Added: trunk/dports/sysutils/synergy/files/patch-CMakeLists.txt.diff
===================================================================
--- 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)
@@ -0,0 +1,19 @@
+--- 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150511/b4c7f1fa/attachment-0001.html>