[73039] trunk/dports/_resources/port1.0/group/qt4-1.0.tcl

[jmr at macports.org]

Revision: 73039
          http://trac.macports.org/changeset/73039
Author:   jmr at macports.org
Date:     2010-11-01 15:00:03 -0700 (Mon, 01 Nov 2010)
Log Message:
-----------
qt4 portgroup: fix qt_arch_types so it doesn't only exist in the patch phase

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/qt4-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/qt4-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/qt4-1.0.tcl	2010-11-01 21:54:50 UTC (rev 73038)
+++ trunk/dports/_resources/port1.0/group/qt4-1.0.tcl	2010-11-01 22:00:03 UTC (rev 73039)
@@ -125,15 +125,8 @@
      -DQT_PNG_LIBRARY=${prefix}/lib/libpng.dylib"
 
 # set Qt understood arch types, based on user preference
-pre-patch {
-    global qt_arch_types
-    if {[variant_exists universal] && [variant_isset universal]} {
-        set qt_arch_types ${universal_archs}
-    } else {
-        set qt_arch_types ${build_arch}
-    }
-    set qt_arch_types [string map {i386 x86} ${qt_arch_types}]
-}
+options qt_arch_types
+default qt_arch_types {[string map {i386 x86} [get_canonical_archs]]}
 
 # allow for both qt4 and qt4 devel
 depends_lib-append      path:bin/qmake:qt4-mac
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101101/7645aa34/attachment.html>