[92985] users/cal/ports/aqua/x2goclient

[cal at macports.org]

Revision: 92985
          https://trac.macports.org/changeset/92985
Author:   cal at macports.org
Date:     2012-05-12 11:01:31 -0700 (Sat, 12 May 2012)
Log Message:
-----------
x2goclient: update to 3.99.2.0, first version actually working on mac

Modified Paths:
--------------
    users/cal/ports/aqua/x2goclient/Portfile

Added Paths:
-----------
    users/cal/ports/aqua/x2goclient/files/
    users/cal/ports/aqua/x2goclient/files/patch-x2goclient.pro-do-not-set-archflags.patch

Modified: users/cal/ports/aqua/x2goclient/Portfile
===================================================================
--- users/cal/ports/aqua/x2goclient/Portfile	2012-05-12 17:47:02 UTC (rev 92984)
+++ users/cal/ports/aqua/x2goclient/Portfile	2012-05-12 18:01:31 UTC (rev 92985)
@@ -5,7 +5,7 @@
 PortGroup               qt4 1.0
 
 name                    x2goclient
-version                 3.99.0.3
+version                 3.99.2.0
 
 livecheck.url           http://code.x2go.org/releases/source/x2goclient/
 livecheck.regex         ${name}_(\\d+(?:\\.\\d+)*)\\.tar.gz
@@ -23,8 +23,8 @@
 homepage                http://www.x2go.org/
 master_sites            http://code.x2go.org/releases/source/${name}/
 distname                ${name}_${version}
-checksums               sha256  ce5e3095ff9ba4459e79b406337e53e5f02bcee197bf574768db7aeedaf3a3b2 \
-                        rmd160  2e2e9db7a808eb67563e092313e6012712b504b8
+checksums               sha256  473da6dc7261027eb782dabd066adcf026711aa3c798abdeee03797ad7c610d9 \
+                        rmd160  f101c724d1a8a0ef1f1be5d224bdef29c1bedc16
 
 universal_variant       yes
 supported_archs         ppc i386 x86_64
@@ -35,21 +35,21 @@
                         port:libssh \
                         port:xorg-libX11
 
-# building with clang calls the linker with -lstdc++ in the end, which fails
-# because there's only libstdc++.6.dylib in /Developer/SDKs/MacOSX10.6sdk/lib
-if {${configure.compiler} == "clang"} {
-    configure.compiler  llvm-gcc-4.2
+patchfiles              patch-x2goclient.pro-do-not-set-archflags.patch
+
+pre-configure {
+    system -W "${worksrcpath}" "${qt_lrelease_cmd} ${name}.pro"
 }
 
 configure.cmd           ${qt_qmake_cmd}
 configure.pre_args      PREFIX=${prefix}
 
-configure.args-append   QMAKE_CC="${configure.cc}" \
-                        QMAKE_CXX="${configure.cxx}" \
-                        QMAKE_LINK="${configure.cxx}" \
-                        CONFIG+="${qt_arch_types}"
+configure.args-append   CONFIG+=\"${qt_arch_types}\" \
+                        CONFIG-=\"sdk\"
 
 destroot {
     copy ${worksrcpath}/${name}.app ${destroot}${applications_dir}
+    xinstall -d -m 755 ${destroot}${applications_dir}/${name}.app/Contents/exe
+    ln -s ${prefix}/bin/nxproxy ${destroot}${applications_dir}/${name}.app/Contents/exe/nxproxy
 }
 

Added: users/cal/ports/aqua/x2goclient/files/patch-x2goclient.pro-do-not-set-archflags.patch
===================================================================
--- users/cal/ports/aqua/x2goclient/files/patch-x2goclient.pro-do-not-set-archflags.patch	                        (rev 0)
+++ users/cal/ports/aqua/x2goclient/files/patch-x2goclient.pro-do-not-set-archflags.patch	2012-05-12 18:01:31 UTC (rev 92985)
@@ -0,0 +1,10 @@
+--- x2goclient.pro.orig	2012-05-12 18:46:52.000000000 +0200
++++ x2goclient.pro	2012-05-12 18:46:58.000000000 +0200
+@@ -139,7 +139,6 @@
+ macx {
+ 	message(building $$TARGET with ldap and cups)
+ 	LIBS += -framework LDAP -lcups -lcrypto -lssl -lz
+-	CONFIG += x86 x86_64
+ }
+ win32-* {
+ 	message(building $$TARGET for windows without ldap and cups)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120512/9635b4db/attachment.html>