[49157] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

[raimue at macports.org]

Revision: 49157
          http://trac.macports.org/changeset/49157
Author:   raimue at macports.org
Date:     2009-04-04 12:00:39 -0700 (Sat, 04 Apr 2009)
Log Message:
-----------
group/muniversal-1.0.tcl:
Quick hack for base after r49087

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

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-04-04 18:53:23 UTC (rev 49156)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-04-04 19:00:39 UTC (rev 49157)
@@ -100,7 +100,12 @@
     }
 
     # undo setting of --host and --target from portconfigure.tcl procedure configure_get_universal_args
-    set undo_system_value [configure_get_universal_system_name]
+    # XXX Quick hack for base after r49087
+    if {[llength [info commands "portconfigure::*"]] > 0} {
+        set undo_system_value [portconfigure::configure_get_universal_system_name]
+    } else {
+        set undo_system_value [configure_get_universal_system_name]
+    }
     if {[llength ${configure.universal_archs}] == 1 &&
         [info exists undo_system_value] && $undo_system_value != ""} {
         configure.args-delete --host=${undo_system_value} --target=${undo_system_value}
@@ -258,7 +263,12 @@
                 }
             }
 
-            configure_main
+            # XXX Quick hack for base after r49087
+            if {[llength [info commands "portconfigure::*"]] > 0} {
+                portconfigure::configure_main
+            } else {
+                configure_main
+            }
 
             # Undo changes to the configure related variables
             eval autoreconf.dir ${autoreconf_dir_save}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090404/63ac82fd/attachment.html>