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

[jmr at macports.org]

Revision: 53387
          http://trac.macports.org/changeset/53387
Author:   jmr at macports.org
Date:     2009-07-04 07:22:52 -0700 (Sat, 04 Jul 2009)
Log Message:
-----------
use the options infrastructure

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-07-04 13:58:15 UTC (rev 53386)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-07-04 14:22:52 UTC (rev 53387)
@@ -49,18 +49,13 @@
 #     merger_must_run_binaries: if yes, build platform must be able to run binaries for supported architectures
 #            merger_no_3_archs: if yes, merger will not work correctly if there are three supported architectures
 
-if { ! [info exists universal_archs_supported] } {
-    set universal_archs_supported  ${universal_archs}
-}
+options universal_archs_supported merger_must_run_binaries merger_no_3_archs merger_arch_flag merger_arch_compiler
+default universal_archs_supported {${universal_archs}}
+default merger_must_run_binaries {no}
+default merger_no_3_archs {no}
+default merger_arch_flag {yes}
+default merger_arch_compiler {yes}
 
-if { ! [info exists merger_must_run_binaries] } {
-    set merger_must_run_binaries "no"
-}
-
-if { ! [info exists merger_no_3_archs] } {
-    set merger_no_3_archs "no"
-}
-
 proc muniversal_get_arch_flag {arch} {
     global os.arch 
     # Prefer -m to -arch 
@@ -77,14 +72,6 @@
     return ${archf}
 }
 
-if { ! [info exists merger_arch_flag ] } {
-        set merger_arch_flag "yes"
-}
-
-if { ! [info exists merger_arch_compiler ] } {
-        set merger_arch_compiler "yes"
-}
-
 variant universal {
     global universal_archs_to_use
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090704/57065b5c/attachment.html>