[78786] users/cal/aqua/x2goclient/Portfile

[cal at macports.org]

Revision: 78786
          http://trac.macports.org/changeset/78786
Author:   cal at macports.org
Date:     2011-05-21 19:46:20 -0700 (Sat, 21 May 2011)
Log Message:
-----------
x2goclient: It build, crashes on connect

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

Modified: users/cal/aqua/x2goclient/Portfile
===================================================================
--- users/cal/aqua/x2goclient/Portfile	2011-05-22 00:59:19 UTC (rev 78785)
+++ users/cal/aqua/x2goclient/Portfile	2011-05-22 02:46:20 UTC (rev 78786)
@@ -34,9 +34,22 @@
 
 configure.cmd           ${qt_qmake_cmd}
 configure.pre_args      PREFIX=${prefix}
+
+if {[variant_isset universal]} {
+    configure.args-append   QMAKE_LFLAGS+="${configure.universal_ldflags}" \
+                            QMAKE_CXXFLAGS+="${configure.universal_cxxflags}"
+} else {
+    configure.args-append   QMAKE_LFLAGS+="${configure.ld_archflags}" \
+                            QMAKE_CXXFLAGS+="${configure.cxx_archflags}"
+}
+
+# how can this be used to build universal?
+#configure.args-append   CONFIG+="${qt_arch_types}"
+
 configure.universal_args-delete \
                         --disable-dependency-tracking
 configure.env-append    QMAKESPEC=${qt_mkspecs_dir}/macx-g++
+build.env-append        QMAKESPEC=${qt_mkspecs_dir}/macx-g++
 
 pre-configure {
     ln -s ${name}/xsettingsui.ui ${worksrcpath}
@@ -44,22 +57,6 @@
     ln -s ${name}/xsettingswidget.h ${worksrcpath}
 }
 
-build.env-append        QMAKESPEC=${qt_mkspecs_dir}/macx-g++
-if {[variant_isset universal]} {
-    build.args-append   CXXFLAGS="${configure.cxxflags} ${configure.universal_cxxflags}" \
-                        CFLAGS="${configure.cflags} ${configure.universal_cflags}" \
-                        CPPFLAGS="${configure.cppflags} ${configure.universal_cppflags}" \
-                        LFLAGS="${configure.ldflags} ${configure.universal_ldflags}"
-} else {
-    build.args-append   CXXFLAGS="${configure.cxxflags}" \
-                        CFLAGS="${configure.cflags}" \
-                        CPPFLAGS="${configure.cppflags}" \
-                        LFLAGS="${configure.ldflags}"
-}
-build.args-append       CC="${configure.cc}" \
-                        CXX="${configure.cxx}" \
-                        CPP="${configure.cpp}"
-
 destroot {
     copy ${worksrcpath}/${name}.app ${destroot}${applications_dir}
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110521/141a1a6a/attachment.html>