[58923] trunk/dports/emulators

[ryandesign at macports.org]

Revision: 58923
          http://trac.macports.org/changeset/58923
Author:   ryandesign at macports.org
Date:     2009-10-07 05:33:01 -0700 (Wed, 07 Oct 2009)
Log Message:
-----------
minivmac, minivmac-devel: ensure the disabled universal and bootstrap variants can't still be selected

Modified Paths:
--------------
    trunk/dports/emulators/minivmac/Portfile
    trunk/dports/emulators/minivmac-devel/Portfile

Modified: trunk/dports/emulators/minivmac/Portfile
===================================================================
--- trunk/dports/emulators/minivmac/Portfile	2009-10-07 12:04:47 UTC (rev 58922)
+++ trunk/dports/emulators/minivmac/Portfile	2009-10-07 12:33:01 UTC (rev 58923)
@@ -107,7 +107,7 @@
     set my_archs ${configure.universal_archs}
 }
 }
-if {![variant_isset universal]} {
+if {![variant_exists universal] || ![variant_isset universal]} {
     switch ${os.arch} {
         powerpc {
             configure.build_arch ppc
@@ -247,10 +247,10 @@
     foreach my_arch ${my_archs} {
         set my_target [my_arch_to_target ${my_arch}]
         foreach {my_machine unused} ${my_variations} {
-            if {[variant_isset universal]} {
+            if {[variant_exists universal] && [variant_isset universal]} {
                 reinplace "s|${my_target}|umch|" ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Info.plist
             }
-            if {![variant_isset bootstrap]} {
+            if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
                 # To save space, keep only a single copy of the Resources directory.
                 set my_resources_dir ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Resources
                 if {0 == ${i}} {
@@ -264,14 +264,14 @@
         }
     }
     
-    if {![variant_isset bootstrap]} {
+    if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
         # Install the prettier icons.
         eval xinstall -m 644 [glob ${worksrcpath}/${my_icons}/icons/*.icns] ${build.dir}/Resources
     }
 }
 
 destroot {
-    if {![variant_isset bootstrap]} {
+    if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
         # Install the global Resources directory.
         xinstall -d ${destroot}${my_share_dir}
         copy ${build.dir}/Resources ${destroot}${my_share_dir}
@@ -279,7 +279,7 @@
     
     # Install the programs.
     foreach my_arch ${my_archs} {
-        if {[variant_isset universal]} {
+        if {[variant_exists universal] && [variant_isset universal]} {
             set my_dest ${workpath}/pre-dest/${my_arch}
         } else {
             set my_dest ${destroot}
@@ -290,7 +290,7 @@
                 "${my_dest}${my_app_dir}/Mini vMac ${my_machine}.app"
         }
     }
-    if {[variant_isset universal]} {
+    if {[variant_exists universal] && [variant_isset universal]} {
         merge ${workpath}/pre-dest
     }
 }

Modified: trunk/dports/emulators/minivmac-devel/Portfile
===================================================================
--- trunk/dports/emulators/minivmac-devel/Portfile	2009-10-07 12:04:47 UTC (rev 58922)
+++ trunk/dports/emulators/minivmac-devel/Portfile	2009-10-07 12:33:01 UTC (rev 58923)
@@ -127,7 +127,7 @@
     set my_archs ${configure.universal_archs}
 }
 }
-if {![variant_isset universal]} {
+if {![variant_exists universal] || ![variant_isset universal]} {
     switch ${os.arch} {
         powerpc {
             configure.build_arch ppc
@@ -272,10 +272,10 @@
     foreach my_arch ${my_archs} {
         set my_target [my_arch_to_target ${my_arch}]
         foreach {my_machine unused} ${my_variations} {
-            if {[variant_isset universal]} {
+            if {[variant_exists universal] && [variant_isset universal]} {
                 reinplace "s|${my_target}|umch|" ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Info.plist
             }
-            if {![variant_isset bootstrap]} {
+            if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
                 # To save space, keep only a single copy of the Resources directory.
                 set my_resources_dir ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Resources
                 if {0 == ${i}} {
@@ -289,14 +289,14 @@
         }
     }
     
-    if {![variant_isset bootstrap]} {
+    if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
         # Install the prettier icons.
         eval xinstall -m 644 [glob ${worksrcpath}/${my_icons}/icons/*.icns] ${build.dir}/Resources
     }
 }
 
 destroot {
-    if {![variant_isset bootstrap]} {
+    if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
         # Install the global Resources directory.
         xinstall -d ${destroot}${my_share_dir}
         copy ${build.dir}/Resources ${destroot}${my_share_dir}
@@ -304,7 +304,7 @@
     
     # Install the programs.
     foreach my_arch ${my_archs} {
-        if {[variant_isset universal]} {
+        if {[variant_exists universal] && [variant_isset universal]} {
             set my_dest ${workpath}/pre-dest/${my_arch}
         } else {
             set my_dest ${destroot}
@@ -315,7 +315,7 @@
                 "${my_dest}${my_app_dir}/Mini vMac ${my_machine}.app"
         }
     }
-    if {[variant_isset universal]} {
+    if {[variant_exists universal] && [variant_isset universal]} {
         merge ${workpath}/pre-dest
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091007/97d0babc/attachment.html>