[98883] trunk/dports/sysutils

[raimue at macports.org]

Revision: 98883
          http://trac.macports.org//changeset/98883
Author:   raimue at macports.org
Date:     2012-10-19 12:53:45 -0700 (Fri, 19 Oct 2012)
Log Message:
-----------
sysutils/synergy, sysutils/synergy-devel:
Add new devel port, mark conflicting with existing port

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

Added Paths:
-----------
    trunk/dports/sysutils/synergy-devel/
    trunk/dports/sysutils/synergy-devel/files/patch-uSynergyUnix.diff

Modified: trunk/dports/sysutils/synergy/Portfile
===================================================================
--- trunk/dports/sysutils/synergy/Portfile	2012-10-19 18:26:16 UTC (rev 98882)
+++ trunk/dports/sysutils/synergy/Portfile	2012-10-19 19:53:45 UTC (rev 98883)
@@ -4,6 +4,7 @@
 PortGroup cmake 1.0
 
 name            synergy
+conflicts       synergy-devel
 version         1.3.8
 revision        1
 categories      sysutils

Modified: trunk/dports/sysutils/synergy-devel/Portfile
===================================================================
--- trunk/dports/sysutils/synergy/Portfile	2012-10-19 07:57:52 UTC (rev 98868)
+++ trunk/dports/sysutils/synergy-devel/Portfile	2012-10-19 19:53:45 UTC (rev 98883)
@@ -3,9 +3,10 @@
 PortSystem 1.0
 PortGroup cmake 1.0
 
-name            synergy
-version         1.3.8
-revision        1
+name            synergy-devel
+set realname    synergy
+conflicts       synergy
+version         1.4.10
 categories      sysutils
 license         GPL-2
 platforms       darwin
@@ -18,27 +19,21 @@
     multiple computers on their desk since each system uses its \
     own display.
 homepage        http://synergy-foss.org
-master_sites    googlecode
-distname        ${name}-${version}-Source
+master_sites    googlecode:${realname}
+distname        ${realname}-${version}-Source
 
-checksums       sha1    82e80b22c6746e573d047aa4a1ad7b71c28cf7d3 \
-                rmd160  3b02faec3b5e5dbea1853e6decd92e4cf6eca419
+checksums       rmd160  829fb9c59312df9698b0e97b9a028396fe9078df \
+                sha256  06d5a2ceb4cf8808cdab22441897c7b54ec8b4bc8351ac116f9accf54c720fbe
 
+patchfiles	patch-CArchFileUnix.cpp.diff \
+                patch-uSynergyUnix.diff
+
 # Force 32-bit, all kinds of Carbon cruft in here. (#20908)
 supported_archs i386 ppc
 
-patchfiles	patch-CArchFileUnix.cpp.diff
-
-# See http://synergy-foss.org/pm/issues/57
-patchfiles-append patch-bug57-keypress.diff \
-                  patch-bug57-modifiers.diff
-
-# See http://synergy-foss.org/tracker/issues/2962
-patchfiles-append patch-bug2962-clipboard.diff
-
 post-patch {
     # Set default config path
-    reinplace "s|@@SYSCONFDIR@@|${prefix}/etc/${name}|g" ${worksrcpath}/src/lib/arch/CArchFileUnix.cpp
+    reinplace "s|@@SYSCONFDIR@@|${prefix}/etc/${realname}|g" ${worksrcpath}/src/lib/arch/CArchFileUnix.cpp
 
     # Fix build architectures
     reinplace "s:CMAKE_OSX_ARCHITECTURES \"ppc;i386\":CMAKE_OSX_ARCHITECTURES \"[join [get_canonical_archs] ;]\":" ${worksrcpath}/CMakeLists.txt
@@ -50,12 +45,12 @@
         xinstall -m 755 ${worksrcpath}/bin/synergys ${destroot}${prefix}/bin
         xinstall -m 644 ${worksrcpath}/doc/synergyc.man ${destroot}${prefix}/share/man/man1/synergyc.1
         xinstall -m 644 ${worksrcpath}/doc/synergys.man ${destroot}${prefix}/share/man/man1/synergys.1
-        xinstall -d ${destroot}${prefix}/etc/${name}
+        xinstall -d ${destroot}${prefix}/etc/${realname}
         xinstall -m 644 -W ${worksrcpath}/doc/ \
             synergy.conf.example \
             synergy.conf.example-advanced \
             synergy.conf.example-basic \
-            ${destroot}${prefix}/etc/${name}
+            ${destroot}${prefix}/etc/${realname}
 }
 
 startupitem.create      yes

Added: trunk/dports/sysutils/synergy-devel/files/patch-uSynergyUnix.diff
===================================================================
--- trunk/dports/sysutils/synergy-devel/files/patch-uSynergyUnix.diff	                        (rev 0)
+++ trunk/dports/sysutils/synergy-devel/files/patch-uSynergyUnix.diff	2012-10-19 19:53:45 UTC (rev 98883)
@@ -0,0 +1,11 @@
+--- src/cmd/usynergy/uSynergyUnix.c.orig	2012-10-19 21:36:15.000000000 +0200
++++ src/cmd/usynergy/uSynergyUnix.c	2012-10-19 21:36:37.000000000 +0200
+@@ -27,7 +27,7 @@
+ #include "uSynergy.h"
+ 
+ // TODO: implement callbacks.
+-int main(char* argv, int argc) {
++int main(int argc, char** argv) {
+ 	uSynergyContext context;
+ 	uSynergyInit(&context);
+ 	
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121019/f4ab7060/attachment.html>