[73108] trunk/dports/aqua/qtpfsgui

[michaelld at macports.org]

Revision: 73108
          http://trac.macports.org/changeset/73108
Author:   michaelld at macports.org
Date:     2010-11-03 18:58:20 -0700 (Wed, 03 Nov 2010)
Log Message:
-----------
qtpfsgui changes:
* better way to handle setting arch type(s).
* allow for use of ccache/distcc.

Modified Paths:
--------------
    trunk/dports/aqua/qtpfsgui/Portfile
    trunk/dports/aqua/qtpfsgui/files/patch-project.pro.diff

Modified: trunk/dports/aqua/qtpfsgui/Portfile
===================================================================
--- trunk/dports/aqua/qtpfsgui/Portfile	2010-11-04 01:54:21 UTC (rev 73107)
+++ trunk/dports/aqua/qtpfsgui/Portfile	2010-11-04 01:58:20 UTC (rev 73108)
@@ -27,33 +27,21 @@
 patchfiles      patch-project.pro.diff
 
 post-patch {
-    # set ARCHES in project.pro (per the second patchfile),
-    set MP_ARCHES ""
-    if {[variant_exists universal] && [variant_isset universal]} {
-        # build for universal, as defined by the local user
-        set MP_ARCHES ${universal_archs}
-    } else {
-        # build arch specific
-        set MP_ARCHES ${build_arch}
-    }
-    array set macports_to_qt_build_arch {
-        ppc     ppc
-        i386    x86
-        ppc64   ppc64
-        x86_64  x86_64
-    }
-    set QT_ARCHES ""
-    foreach arch ${MP_ARCHES} {
-        set this_arch_in_qt $macports_to_qt_build_arch($arch)
-        lappend QT_ARCHES ${this_arch_in_qt}
-    }
-    set ARCHES [join ${QT_ARCHES} " "]
-    reinplace "s|@@ARCHES@@|${ARCHES}|g" ${worksrcpath}/project.pro
+    # set arch type(s)
+    reinplace "s|@ARCHES@|${qt_arch_types}|g" \
+        ${worksrcpath}/project.pro
 }
 
 configure.pre_args  PREFIX="${prefix}"
 configure.args      APPLICATIONS_DIR="${applications_dir}" \
-                    DOCDIR="${prefix}/share/doc/${name}" \
-                    QMAKE_CC="\${CC}" \
-                    QMAKE_CXX="\${CXX}"
+                    DOCDIR="${prefix}/share/doc/${name}"
 configure.cmd   "LOCALSOFT=${prefix} ${qt_qmake_cmd}"
+
+# allow ccache, if specified by the user
+pre-build {
+    if {[tbool configure.ccache]} {
+        build.post_args "CCACHE=ccache"
+    }
+}
+
+universal_variant   yes

Modified: trunk/dports/aqua/qtpfsgui/files/patch-project.pro.diff
===================================================================
--- trunk/dports/aqua/qtpfsgui/files/patch-project.pro.diff	2010-11-04 01:54:21 UTC (rev 73107)
+++ trunk/dports/aqua/qtpfsgui/files/patch-project.pro.diff	2010-11-04 01:58:20 UTC (rev 73108)
@@ -43,7 +43,7 @@
 -		CONFIG += ppc
 -	}
 -}
-+CONFIG += @@ARCHES@@
++CONFIG += release @ARCHES@
  
  # We like to search the LOCALSOFT/lib explicitly on MacOSX
  LIBS += -L$$(LOCALSOFT)/lib
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101103/18a7bf3e/attachment.html>