Ignore:
Timestamp:
Oct 7, 2009, 12:33:01 PM (11 years ago)
Author:
ryandesign@…
Message:

minivmac, minivmac-devel: ensure the disabled universal and bootstrap variants can't still be selected

Location:
trunk/dports/emulators
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/emulators/minivmac-devel/Portfile

    r58922 r58923  
    128128}
    129129}
    130 if {![variant_isset universal]} {
     130if {![variant_exists universal] || ![variant_isset universal]} {
    131131    switch ${os.arch} {
    132132        powerpc {
     
    273273        set my_target [my_arch_to_target ${my_arch}]
    274274        foreach {my_machine unused} ${my_variations} {
    275             if {[variant_isset universal]} {
     275            if {[variant_exists universal] && [variant_isset universal]} {
    276276                reinplace "s|${my_target}|umch|" ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Info.plist
    277277            }
    278             if {![variant_isset bootstrap]} {
     278            if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
    279279                # To save space, keep only a single copy of the Resources directory.
    280280                set my_resources_dir ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Resources
     
    290290    }
    291291   
    292     if {![variant_isset bootstrap]} {
     292    if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
    293293        # Install the prettier icons.
    294294        eval xinstall -m 644 [glob ${worksrcpath}/${my_icons}/icons/*.icns] ${build.dir}/Resources
     
    297297
    298298destroot {
    299     if {![variant_isset bootstrap]} {
     299    if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
    300300        # Install the global Resources directory.
    301301        xinstall -d ${destroot}${my_share_dir}
     
    305305    # Install the programs.
    306306    foreach my_arch ${my_archs} {
    307         if {[variant_isset universal]} {
     307        if {[variant_exists universal] && [variant_isset universal]} {
    308308            set my_dest ${workpath}/pre-dest/${my_arch}
    309309        } else {
     
    316316        }
    317317    }
    318     if {[variant_isset universal]} {
     318    if {[variant_exists universal] && [variant_isset universal]} {
    319319        merge ${workpath}/pre-dest
    320320    }
  • trunk/dports/emulators/minivmac/Portfile

    r58922 r58923  
    108108}
    109109}
    110 if {![variant_isset universal]} {
     110if {![variant_exists universal] || ![variant_isset universal]} {
    111111    switch ${os.arch} {
    112112        powerpc {
     
    248248        set my_target [my_arch_to_target ${my_arch}]
    249249        foreach {my_machine unused} ${my_variations} {
    250             if {[variant_isset universal]} {
     250            if {[variant_exists universal] && [variant_isset universal]} {
    251251                reinplace "s|${my_target}|umch|" ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Info.plist
    252252            }
    253             if {![variant_isset bootstrap]} {
     253            if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
    254254                # To save space, keep only a single copy of the Resources directory.
    255255                set my_resources_dir ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Resources
     
    265265    }
    266266   
    267     if {![variant_isset bootstrap]} {
     267    if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
    268268        # Install the prettier icons.
    269269        eval xinstall -m 644 [glob ${worksrcpath}/${my_icons}/icons/*.icns] ${build.dir}/Resources
     
    272272
    273273destroot {
    274     if {![variant_isset bootstrap]} {
     274    if {![variant_exists bootstrap] || ![variant_isset bootstrap]} {
    275275        # Install the global Resources directory.
    276276        xinstall -d ${destroot}${my_share_dir}
     
    280280    # Install the programs.
    281281    foreach my_arch ${my_archs} {
    282         if {[variant_isset universal]} {
     282        if {[variant_exists universal] && [variant_isset universal]} {
    283283            set my_dest ${workpath}/pre-dest/${my_arch}
    284284        } else {
     
    291291        }
    292292    }
    293     if {[variant_isset universal]} {
     293    if {[variant_exists universal] && [variant_isset universal]} {
    294294        merge ${workpath}/pre-dest
    295295    }
Note: See TracChangeset for help on using the changeset viewer.