[69047] trunk/dports/emulators

[ryandesign at macports.org]

Revision: 69047
          http://trac.macports.org/changeset/69047
Author:   ryandesign at macports.org
Date:     2010-06-21 16:51:51 -0700 (Mon, 21 Jun 2010)
Log Message:
-----------
minivmac, minivmac-devel: enable universal variant, now that MacPorts 1.9 is out

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

Modified: trunk/dports/emulators/minivmac/Portfile
===================================================================
--- trunk/dports/emulators/minivmac/Portfile	2010-06-21 23:43:13 UTC (rev 69046)
+++ trunk/dports/emulators/minivmac/Portfile	2010-06-21 23:51:51 UTC (rev 69047)
@@ -109,8 +109,6 @@
                         {IIx}       {-m IIx -mem 8M -hres 800 -vres 600 -depth 3}
 }
 
-# The universal variant is disabled until MacPorts 1.8.3 is released.
-if {0} {
 # To build the bootstrap, use "sudo port install bootstrap=yes".
 # The variant is hidden because it is useful only to the port maintainer.
 if {[tbool bootstrap]} {
@@ -129,19 +127,8 @@
     configure.universal_archs ppc i386
     set my_archs ${configure.universal_archs}
 }
-}
-if {[info exists supported_archs]} {
-    supported_archs i386 ppc
-}
-if {![variant_exists universal] || ![variant_isset universal]} {
-    switch ${os.arch} {
-        powerpc {
-            configure.build_arch ppc
-        }
-        default {
-            configure.build_arch ${os.arch}
-        }
-    }
+supported_archs         i386 ppc
+if {![variant_isset universal]} {
     set my_archs ${configure.build_arch}
 }
 
@@ -287,7 +274,7 @@
     foreach my_arch ${my_archs} {
         set my_target [my_arch_to_target ${my_arch}]
         foreach {my_machine unused} ${my_variations} {
-            if {[variant_exists universal] && [variant_isset universal]} {
+            if {[variant_isset universal]} {
                 reinplace "s|${my_target}|umch|" ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Info.plist
             }
             if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
@@ -319,7 +306,7 @@
     
     # Install the programs.
     foreach my_arch ${my_archs} {
-        if {[variant_exists universal] && [variant_isset universal]} {
+        if {[variant_isset universal]} {
             set my_dest ${workpath}/pre-dest/${my_arch}
         } else {
             set my_dest ${destroot}
@@ -330,7 +317,7 @@
                 "${my_dest}${my_app_dir}/Mini vMac ${my_machine}.app"
         }
     }
-    if {[variant_exists universal] && [variant_isset universal]} {
+    if {[variant_isset universal]} {
         merge ${workpath}/pre-dest
     }
 }

Modified: trunk/dports/emulators/minivmac-devel/Portfile
===================================================================
--- trunk/dports/emulators/minivmac-devel/Portfile	2010-06-21 23:43:13 UTC (rev 69046)
+++ trunk/dports/emulators/minivmac-devel/Portfile	2010-06-21 23:51:51 UTC (rev 69047)
@@ -117,8 +117,6 @@
                         {IIx}       {-m IIx -mem 8M -hres 800 -vres 600 -depth 3}
 }
 
-# The universal variant is disabled until MacPorts 1.8.3 is released.
-if {0} {
 # To build the bootstrap, use "sudo port install bootstrap=yes".
 # The variant is hidden because it is useful only to the port maintainer.
 if {[tbool bootstrap]} {
@@ -137,19 +135,8 @@
     configure.universal_archs ppc i386
     set my_archs ${configure.universal_archs}
 }
-}
-if {[info exists supported_archs]} {
-    supported_archs i386 ppc
-}
-if {![variant_exists universal] || ![variant_isset universal]} {
-    switch ${os.arch} {
-        powerpc {
-            configure.build_arch ppc
-        }
-        default {
-            configure.build_arch ${os.arch}
-        }
-    }
+supported_archs         i386 ppc
+if {![variant_isset universal]} {
     set my_archs ${configure.build_arch}
 }
 
@@ -295,7 +282,7 @@
     foreach my_arch ${my_archs} {
         set my_target [my_arch_to_target ${my_arch}]
         foreach {my_machine unused} ${my_variations} {
-            if {[variant_exists universal] && [variant_isset universal]} {
+            if {[variant_isset universal]} {
                 reinplace "s|${my_target}|umch|" ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Info.plist
             }
             if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
@@ -327,7 +314,7 @@
     
     # Install the programs.
     foreach my_arch ${my_archs} {
-        if {[variant_exists universal] && [variant_isset universal]} {
+        if {[variant_isset universal]} {
             set my_dest ${workpath}/pre-dest/${my_arch}
         } else {
             set my_dest ${destroot}
@@ -338,7 +325,7 @@
                 "${my_dest}${my_app_dir}/Mini vMac ${my_machine}.app"
         }
     }
-    if {[variant_exists universal] && [variant_isset universal]} {
+    if {[variant_isset universal]} {
         merge ${workpath}/pre-dest
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100621/7d282215/attachment.html>