Changeset 114328


Ignore:
Timestamp:
Dec 5, 2013, 10:21:52 AM (4 years ago)
Author:
ryandesign@…
Message:

use eq and ne instead of == and != when comparing ${os.arch}, ${configure.build_arch}, ${build_arch}, and some port-specific variables for referring to architectures

Location:
trunk/dports
Files:
147 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/benchmarks/nbench-byte/Portfile

    r91510 r114328  
    4444}
    4545
    46 if {$build_arch != ""} {
     46if {${build_arch} ne ""} {
    4747    build.env-append CFLAGS="${configure.cc_archflags}"
    4848}
  • trunk/dports/cross/arm-elf-gcc/Portfile

    r114325 r114328  
    178178configure.objc_archflags
    179179configure.ld_archflags
    180 if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
     180if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
    181181    configure.args-append --build=${build_arch}-apple-darwin${os.major}
    182182}
  • trunk/dports/cross/arm-elf-gcc3/Portfile

    r114325 r114328  
    100100configure.objc_archflags
    101101configure.ld_archflags
    102 if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
     102if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
    103103    configure.args-append --build=${build_arch}-apple-${os.platform}${os.version} \
    104104                          --host=${build_arch}-apple-${os.platform}${os.version} \
  • trunk/dports/cross/arm-none-eabi-gdb/Portfile

    r110370 r114328  
    3030compiler.blacklist *clang*
    3131
    32 if {${configure.build_arch} == "ppc" || ${configure.build_arch} == "ppc64"} {
     32if {${configure.build_arch} eq "ppc" || ${configure.build_arch} eq "ppc64"} {
    3333    notes "${name} does not support building on ${configure.build_arch}."
    3434    pre-fetch {
  • trunk/dports/cross/arm-none-linux-gnueabi-binutils/Portfile

    r114325 r114328  
    4141                        --program-prefix=${crossgcc-target}- --mandir='${prefix}/share/man' --with-sysroots \
    4242                        --disable-werror
    43 if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
     43if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
    4444    configure.args-append --build=${build_arch}-apple-darwin${os.version} \
    4545                          --host=${build_arch}-apple-darwin${os.version}
  • trunk/dports/cross/arm-none-linux-gnueabi-gcc/Portfile

    r114325 r114328  
    8383configure.objc_archflags
    8484configure.ld_archflags
    85 if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
     85if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
    8686    configure.args-append --build=${build_arch}-apple-darwin${os.version} \
    8787                          --host=${build_arch}-apple-darwin${os.version}
  • trunk/dports/cross/i386-mingw32-binutils/Portfile

    r114325 r114328  
    3333                    --program-prefix=${crossgcc-target}- --mandir='${prefix}/share/man' \
    3434                    --disable-werror
    35 if {${os.platform} eq "darwin" && $build_arch != ""} {
     35if {${os.platform} eq "darwin" && ${build_arch} ne ""} {
    3636    configure.args-append --build=${build_arch}-apple-darwin${os.major}
    3737}
  • trunk/dports/cross/i386-mingw32-gcc/Portfile

    r114325 r114328  
    7272                --with-gxx-include-dir=${prefix}/${crossgcc-target}/include/c++/${gnu_version}/ \
    7373                --enable-sjlj-exceptions
    74 if {$build_arch != ""} {
     74if {${build_arch} ne ""} {
    7575    configure.cc_archflags
    7676    configure.cxx_archflags
  • trunk/dports/cross/m68k-elf-gcc/Portfile

    r114325 r114328  
    9393configure.objc_archflags
    9494configure.ld_archflags
    95 if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
     95if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
    9696    configure.args-append --build=${build_arch}-apple-${os.platform}${os.version} \
    9797                          --host=${build_arch}-apple-${os.platform}${os.version}
  • trunk/dports/cross/mips-elf-binutils/Portfile

    r95197 r114328  
    4242
    4343platform darwin {
    44         if {$build_arch == "i386"} {
     44        if {${build_arch} eq "i386"} {
    4545                configure.args-append --build=i686-apple-${os.platform}${os.version} \
    4646                                                          --host=i686-apple-${os.platform}${os.version}
  • trunk/dports/cross/mips-elf-gcc/Portfile

    r110942 r114328  
    9393configure.ld_archflags
    9494platform darwin {
    95         if {$build_arch == "i386"} {
     95        if {${build_arch} eq "i386"} {
    9696                configure.args-append --build=i686-apple-${os.platform}${os.version} \
    9797                                                          --host=i686-apple-${os.platform}${os.version}
  • trunk/dports/cross/mipsel-linux-binutils/Portfile

    r94994 r114328  
    4242
    4343platform darwin {
    44         if {$build_arch == "i386"} {
     44        if {${build_arch} eq "i386"} {
    4545                configure.args-append --build=i686-apple-darwin${os.major} \
    4646                                                          --host=i686-apple-darwin${os.major}
  • trunk/dports/cross/mipsel-linux-gcc34/Portfile

    r95194 r114328  
    5757
    5858platform darwin {
    59         if {$build_arch == "i386"} {
     59        if {${build_arch} eq "i386"} {
    6060                configure.args-append --build=i686-apple-darwin${os.major} \
    6161                                                          --host=i686-apple-darwin${os.major}
  • trunk/dports/cross/sh-rtems-binutils/Portfile

    r114325 r114328  
    5555                                        --program-prefix=${crossgcc-target}- --mandir='${prefix}/share/man' \
    5656                                        --disable-werror
    57 if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
     57if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
    5858    configure.args-append --build=${build_arch}-apple-darwin${os.version}
    5959}
  • trunk/dports/cross/sh-rtems-gcc/Portfile

    r114325 r114328  
    103103                                --with-gxx-include-dir=${prefix}/${crossgcc-target}/include/c++/${version}/ \
    104104                                ${default-languages}
    105 if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
     105if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
    106106    configure.args-append --build=${build_arch}-apple-darwin${os.version} \
    107107                          --host=${build_arch}-apple-darwin${os.version}
  • trunk/dports/cross/sparc-rtems-gcc/Portfile

    r104266 r114328  
    106106configure.ld_archflags
    107107platform darwin {
    108     if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
     108    if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
    109109        configure.args-append --build=${build_arch}-apple-${os.platform}${os.version} \
    110110                              --host=${build_arch}-apple-${os.platform}${os.version}
  • trunk/dports/databases/db46/Portfile

    r113122 r114328  
    178178
    179179if { [variant_isset universal] } {
    180     if { ${os.arch}=="i386" } {
     180    if {${os.arch} eq "i386"} {
    181181        if { ${os.major} >= 10 } {
    182182            set merger_configure_args(ppc) --with-mutex=Darwin/_spin_lock_try
  • trunk/dports/databases/db47/Portfile

    r114325 r114328  
    104104
    105105if { [variant_isset universal] } {
    106     if { ${os.arch}=="i386" } {
     106    if {${os.arch} eq "i386"} {
    107107        if { ${os.major} >= 10 } {
    108108            set merger_configure_args(ppc) --with-mutex=Darwin/_spin_lock_try
  • trunk/dports/databases/db48/Portfile

    r114325 r114328  
    7474
    7575if { [variant_isset universal] } {
    76     if { ${os.arch}=="i386" } {
     76    if {${os.arch} eq "i386"} {
    7777        if { ${os.major} >= 10 } {
    7878            set merger_configure_args(ppc) --with-mutex=Darwin/_spin_lock_try
  • trunk/dports/databases/db51/Portfile

    r114325 r114328  
    102102
    103103if { [variant_isset universal] } {
    104     if { ${os.arch}=="i386" } {
     104    if {${os.arch} eq "i386"} {
    105105        if { ${os.major} >= 10 } {
    106106            set merger_configure_args(ppc) --with-mutex=Darwin/_spin_lock_try
  • trunk/dports/databases/db52/Portfile

    r114325 r114328  
    100100
    101101if { [variant_isset universal] } {
    102     if { ${os.arch}=="i386" } {
     102    if {${os.arch} eq "i386"} {
    103103        if { ${os.major} >= 10 } {
    104104            set merger_configure_args(ppc) --with-mutex=Darwin/_spin_lock_try
  • trunk/dports/databases/db53/Portfile

    r114325 r114328  
    9191
    9292if { [variant_isset universal] } {
    93     if { ${os.arch}=="i386" } {
     93    if {${os.arch} eq "i386"} {
    9494        if { ${os.major} >= 10 } {
    9595            set merger_configure_args(ppc) --with-mutex=Darwin/_spin_lock_try
  • trunk/dports/devel/boost/Portfile

    r114325 r114328  
    284284    if {[lsearch ${build_arch} ppc*] != -1} {
    285285        build.args-append   architecture=power
    286         if {${os.arch} != "powerpc"} {
     286        if {${os.arch} ne "powerpc"} {
    287287            build.args-append   --disable-long-double
    288288        }
     
    313313        }
    314314
    315         if {${os.arch} != "powerpc"} {
     315        if {${os.arch} ne "powerpc"} {
    316316            build.args-append   --disable-long-double
    317317        }
  • trunk/dports/devel/camlimages/Portfile

    r111008 r114328  
    3434
    3535use_configure   no
    36 if {$build_arch == "i386" || $build_arch == "ppc"} {
     36if {${build_arch} eq "i386" || ${build_arch} eq "ppc"} {
    3737    configure.ld_archflags -m32
    3838} else {
  • trunk/dports/devel/cctools/Portfile

    r113162 r114328  
    3131variant universal {}
    3232
    33 if {${os.arch} == "powerpc" || ${os.major} < 9} {
     33if {${os.arch} eq "powerpc" || ${os.major} < 9} {
    3434    # XCode 4.1
    3535    version             806
  • trunk/dports/devel/cmake/Portfile

    r114177 r114328  
    4545platform darwin 9 {
    4646    global universal_archs_supported
    47     if {${build_arch} == "i386" || ${build_arch} == "x86_64"} {
     47    if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
    4848        supported_archs i386 x86_64
    49     } elseif {${build_arch} == "ppc" || ${build_arch} == "ppc64"} {
     49    } elseif {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
    5050        supported_archs ppc ppc64
    5151    }
  • trunk/dports/devel/dbus/Portfile

    r107708 r114328  
    213213
    214214set cross_opts  "ac_cv_have_abstract_sockets=no"
    215 if { ${os.arch}=="i386" } {
     215if {${os.arch} eq "i386"} {
    216216    if { ${os.major} >= 10 } {
    217217        set merger_configure_env(ppc) ${cross_opts}
  • trunk/dports/devel/globus-core/Portfile

    r110696 r114328  
    22# $Id$
    33
    4 if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
     4if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
    55    set flavor gcc64pthr
    66    set enable64 yes
  • trunk/dports/devel/gmp/Portfile

    r110548 r114328  
    6262
    6363if {![variant_isset universal]} {
    64     if {${build_arch} == "x86_64"} {
     64    if {${build_arch} eq "x86_64"} {
    6565        configure.env   ABI=64
    6666        # fails to correctly detect some x86_64 models
     
    7373            }
    7474        }
    75     } elseif {${build_arch} == "ppc64"} {
     75    } elseif {${build_arch} eq "ppc64"} {
    7676        configure.env   ABI=mode64
    7777    } else {
     
    9898        global os.arch
    9999       
    100         if { ${os.arch}=="i386" && (${arch}=="i386" || ${arch}=="x86_64") } {
     100        if {${os.arch} eq "i386" && (${arch} eq "i386" || ${arch} eq "x86_64")} {
    101101            set archf ""
    102         } elseif { ${os.arch}=="powerpc" && (${arch}=="ppc" && ${arch}=="ppc64") } {
     102        } elseif {${os.arch} eq "powerpc" && (${arch} eq "ppc" && ${arch} eq "ppc64")} {
    103103            set archf ""
    104104        } else {
     
    119119
    120120    # For cross-compiling, set C compiler and pre-processor.
    121     if { ${os.arch}=="i386" } {
     121    if {${os.arch} eq "i386"} {
    122122        if { ${os.major} >= 10 } {
    123123            lappend merger_configure_env(ppc)  CC_FOR_BUILD=${configure.cc} CPP_FOR_BUILD=${configure.cpp}
  • trunk/dports/devel/gnutls/Portfile

    r113161 r114328  
    5757    set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
    5858    set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
    59 } elseif {${build_arch} == "i386"} {
     59} elseif {${build_arch} eq "i386"} {
    6060    configure.args-append \
    6161        --host=i686-apple-${os.platform}${os.major} \
    6262        --build=i686-apple-${os.platform}${os.major}
    63 } elseif {${build_arch} == "x86_64"} {
     63} elseif {${build_arch} eq "x86_64"} {
    6464    configure.args-append \
    6565        --host=${build_arch}-apple-${os.platform}${os.major} \
  • trunk/dports/devel/google-perftools/Portfile

    r94572 r114328  
    2424
    2525# http://code.google.com/p/google-perftools/issues/detail?id=66
    26 if {![variant_isset universal] && $build_arch == "x86_64" ||
     26if {![variant_isset universal] && ${build_arch} eq "x86_64" ||
    2727    [variant_isset universal] && [string match *x86_64* $universal_archs]} {
    2828    configure.args-append --enable-frame-pointers \
  • trunk/dports/devel/icu/Portfile

    r109411 r114328  
    5454        }
    5555        foreach a $universal_archs_to_use {
    56             if {($32bit && ($a == "x86_64" || $a == "ppc64"))
    57                 || (${os.arch} == "powerpc" && ($a == "x86_64" || $a == "i386"))
    58                 || (${os.arch} == "i386" && ($a == "ppc" || $a == "ppc64"))} {
     56            if {($32bit && ($a eq "x86_64" || $a eq "ppc64"))
     57                || (${os.arch} eq "powerpc" && ($a eq "x86_64" || $a eq "i386"))
     58                || (${os.arch} eq "i386" && ($a eq "ppc" || $a eq "ppc64"))} {
    5959                set cross 1
    6060                set merger_configure_args($a) --with-cross-build=${crosspath}
  • trunk/dports/devel/judy/Portfile

    r96122 r114328  
    2727configure.args  --mandir=${prefix}/share/man
    2828
    29 if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
     29if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
    3030    configure.args-append   --enable-64-bit
    31 } elseif {$build_arch == "i386" || $build_arch == "ppc"} {
     31} elseif {${build_arch} eq "i386" || ${build_arch} eq "ppc"} {
    3232    configure.args-append   --enable-32-bit
    3333}
  • trunk/dports/devel/ld64/Portfile

    r110679 r114328  
    3636
    3737    # Leopard/powerpc has the option to not be LTO
    38     if {![variant_isset llvm33] && ${os.arch} != "powerpc"} {
     38    if {![variant_isset llvm33] && ${os.arch} ne "powerpc"} {
    3939        ui_error "Your platform cannot be configured without LTO support in ld64.  Please enable one of the llvmXX variants, and try again."
    4040        return -code error "Your platform cannot be configured without LTO support in ld64.  Please enable one of the llvmXX variants, and try again."
     
    7777set makefile "Makefile-133"
    7878
    79 if {${os.arch} == "powerpc" || ${os.major} < 9} {
     79if {${os.arch} eq "powerpc" || ${os.major} < 9} {
    8080    # XCode 3.2.6
    8181    # 127.2 should work for powerpc, but it will require some build fixes.
  • trunk/dports/devel/libgcrypt/Portfile

    r108800 r114328  
    4747# rijndael.c:895: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
    4848# rijndael.c:895: error: 'asm' operand has impossible constraints
    49 if {${build_arch} == "i386" || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1)} {
     49if {${build_arch} eq "i386" || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1)} {
    5050    if {[vercmp ${xcodeversion} 3.0] >= 0} {
    5151        compiler.blacklist-append gcc-4.0
  • trunk/dports/devel/libgii/Portfile

    r114325 r114328  
    4040configure.args   --mandir=${prefix}/share/man
    4141
    42 if {$build_arch == "x86_64" && ${os.platform} eq "darwin"} {
     42if {${build_arch} eq "x86_64" && ${os.platform} eq "darwin"} {
    4343    configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
    4444}
  • trunk/dports/devel/libidl/Portfile

    r108275 r114328  
    4242
    4343# Required when cross-compiling.
    44 if { ${os.arch}=="i386" } {
     44if { ${os.arch} eq "i386" } {
    4545    if { ${os.major} >= 10 } {
    4646        set merger_configure_env(ppc) libIDL_cv_long_long_format=ll
  • trunk/dports/devel/liboil/Portfile

    r113161 r114328  
    3636    set merger_host(i386) i686-apple-${os.platform}${os.major}
    3737    set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
    38 } elseif {${build_arch} == "i386"} {
     38} elseif {${build_arch} eq "i386"} {
    3939    configure.args-append \
    4040        --host=i686-apple-${os.platform}${os.major}
    41 } elseif {${build_arch} == "x86_64"} {
     41} elseif {${build_arch} eq "x86_64"} {
    4242    configure.args-append \
    4343        --host=${build_arch}-apple-${os.platform}${os.major}
  • trunk/dports/devel/nettle/Portfile

    r113161 r114328  
    4848    set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
    4949} else {
    50     if {${build_arch} == "i386"} {
     50    if {${build_arch} eq "i386"} {
    5151        configure.args-append \
    5252            --host=i686-apple-${os.platform}${os.major} \
    5353            --build=i686-apple-${os.platform}${os.major}
    54     } elseif {${build_arch} == "x86_64"} {
     54    } elseif {${build_arch} eq "x86_64"} {
    5555        configure.args-append \
    5656            --host=${build_arch}-apple-${os.platform}${os.major} \
  • trunk/dports/devel/nusmv/Portfile

    r95086 r114328  
    3939pre-configure {
    4040    # build included cudd first so that configure can pick it up
    41     if {$build_arch == "x86_64"} {
     41    if {${build_arch} eq "x86_64"} {
    4242        system -W ${worksrcpath}/cudd-2.4.1.1 "mv Makefile_os_x_64bit Makefile_os_x"
    4343    }
  • trunk/dports/devel/omniORB/Portfile

    r114325 r114328  
    4343                    --with-omniNames-logdir="${prefix}/var"
    4444
    45 if {$build_arch == "x86_64" && ${os.platform} eq "darwin"} {
     45if {${build_arch} eq "x86_64" && ${os.platform} eq "darwin"} {
    4646    configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
    4747}
  • trunk/dports/devel/orbit2/Portfile

    r104857 r114328  
    4747if { [variant_isset universal] } {
    4848    # Find architectures which will not run on build platform.
    49     if { ${os.arch}=="i386" } {
     49    if { ${os.arch} eq "i386" } {
    5050        if { ${os.major} >= 10 } {
    5151            set cross_archs "ppc ppc64"
     
    7373    }
    7474
    75     if { ${os.arch}=="i386" } {
     75    if { ${os.arch} eq "i386" } {
    7676        if { ${os.major} >= 10 } {
    7777        lappend merger_configure_env(ppc)      \
  • trunk/dports/devel/orc/Portfile

    r113910 r114328  
    2222if {[string match "*gcc-4.2" ${configure.compiler}]} {
    2323    lappend merger_configure_cflags(i386) -O1 -fexpensive-optimizations
    24     if {![variant_isset universal] && ${build_arch} == "i386"} {
     24    if {![variant_isset universal] && ${build_arch} eq "i386"} {
    2525        configure.cflags-delete -O2
    2626        configure.cflags-append -O1 -fexpensive-optimizations
  • trunk/dports/devel/ossp-uuid/Portfile

    r100997 r114328  
    2929
    3030if {[variant_isset universal]} {
    31     if { ${os.arch} == "i386" } {
     31    if { ${os.arch} eq "i386" } {
    3232        if { ${os.major} >= 10 } {
    3333            set merger_configure_env(ppc) ac_cv_va_copy=yes
  • trunk/dports/devel/plib/Portfile

    r107417 r114328  
    3535
    3636configure.args      --with-x
    37 if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
     37if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
    3838    # these components currently use carbon
    3939    configure.args-append --disable-sl --disable-pw
  • trunk/dports/devel/valgrind-devel/Portfile

    r112848 r114328  
    3838                --without-mpicc
    3939
    40 if {$build_arch == "i386"} {
     40if {${build_arch} eq "i386"} {
    4141    configure.args-append --enable-only32bit
    42 } elseif {$build_arch == "x86_64"} {
     42} elseif {${build_arch} eq "x86_64"} {
    4343    configure.args-append --enable-only64bit
    4444}
     
    5555
    5656    pre-configure {
    57         if {$build_arch == "i386"} {
     57        if {${build_arch} eq "i386"} {
    5858            # See #25684 and https://bugs.kde.org/show_bug.cgi?id=243362
    5959            ui_error "valgrind does not build +universal on a 32-bit only CPU!"
  • trunk/dports/devel/valgrind/Portfile

    r114325 r114328  
    4545                --without-mpicc
    4646
    47 if {$build_arch == "i386"} {
     47if {${build_arch} eq "i386"} {
    4848    configure.args-append --enable-only32bit
    49 } elseif {$build_arch == "x86_64"} {
     49} elseif {${build_arch} eq "x86_64"} {
    5050    configure.args-append --enable-only64bit
    5151}
     
    6262
    6363    pre-configure {
    64         if {$build_arch == "i386"} {
     64        if {${build_arch} eq "i386"} {
    6565            # See #25684 and https://bugs.kde.org/show_bug.cgi?id=243362
    6666            ui_error "valgrind does not build +universal on a 32-bit only CPU!"
  • trunk/dports/fuse/fuse4x-kext/Portfile

    r98106 r114328  
    4040# kernel, so don't try to build it ppc64 or universal.
    4141supported_archs     i386 x86_64 ppc
    42 if {$build_arch == "i386" || $build_arch == "x86_64"} {
     42if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
    4343    default_variants    +universal
    4444}
  • trunk/dports/genealogy/geneweb/Portfile

    r98499 r114328  
    4545
    4646platform darwin {
    47         if {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
     47        if {${configure.build_arch} eq "x86_64" || ${configure.build_arch} eq "ppc64"} {
    4848                patchfiles-append patch-64-bit
    4949        }
  • trunk/dports/gnome/gstreamer010-gst-ffmpeg/Portfile

    r113161 r114328  
    6161    set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=ppc\""
    6262    set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=ppc64\""
    63 } elseif {${build_arch} == "i386"} {
     63} elseif {${build_arch} eq "i386"} {
    6464    configure.args-append \
    6565        --host=i686-apple-${os.platform}${os.major} \
  • trunk/dports/gnome/gstreamer010-gst-plugins-bad/Portfile

    r114119 r114328  
    125125    configure.args-append \
    126126        --disable-osx_video
    127 } elseif {${build_arch} == "i386"} {
     127} elseif {${build_arch} eq "i386"} {
    128128    configure.args-append \
    129129        --host=i686-apple-${os.platform}${os.major} \
    130130        --build=i686-apple-${os.platform}${os.major}
    131 } elseif {${build_arch} == "x86_64"} {
     131} elseif {${build_arch} eq "x86_64"} {
    132132    configure.args-append \
    133133        --host=${build_arch}-apple-${os.platform}${os.major} \
  • trunk/dports/gnome/gstreamer010-gst-plugins-base/Portfile

    r113664 r114328  
    9393if {[string match "*gcc-4.2" ${configure.compiler}]} {
    9494    lappend merger_configure_cflags(i386) -O1 -fexpensive-optimizations
    95     if {![variant_isset universal] && ${build_arch} == "i386"} {
     95    if {![variant_isset universal] && ${build_arch} eq "i386"} {
    9696        configure.cflags-delete -O2
    9797        configure.cflags-append -O1 -fexpensive-optimizations
     
    104104    set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
    105105    set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
    106 } elseif {${build_arch} == "i386"} {
     106} elseif {${build_arch} eq "i386"} {
    107107    configure.args-append \
    108108        --host=i686-apple-${os.platform}${os.major} \
    109109        --build=i686-apple-${os.platform}${os.major}
    110 } elseif {${build_arch} == "x86_64"} {
     110} elseif {${build_arch} eq "x86_64"} {
    111111    configure.args-append \
    112112        --host=${build_arch}-apple-${os.platform}${os.major} \
  • trunk/dports/gnome/gstreamer010-gst-plugins-gl/Portfile

    r113161 r114328  
    6262    set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
    6363    set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
    64 } elseif {${build_arch} == "i386"} {
     64} elseif {${build_arch} eq "i386"} {
    6565    configure.args-append \
    6666        --host=i686-apple-${os.platform}${os.major} \
    6767        --build=i686-apple-${os.platform}${os.major}
    68 } elseif {${build_arch} == "x86_64"} {
     68} elseif {${build_arch} eq "x86_64"} {
    6969    configure.args-append \
    7070        --host=${build_arch}-apple-${os.platform}${os.major} \
  • trunk/dports/gnome/gstreamer010-gst-plugins-good/Portfile

    r113667 r114328  
    7070    set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
    7171    set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
    72 } elseif {${build_arch} == "i386"} {
     72} elseif {${build_arch} eq "i386"} {
    7373    configure.args-append \
    7474        --host=i686-apple-${os.platform}${os.major} \
    7575        --build=i686-apple-${os.platform}${os.major}
    76 } elseif {${build_arch} == "x86_64"} {
     76} elseif {${build_arch} eq "x86_64"} {
    7777    configure.args-append \
    7878        --host=${build_arch}-apple-${os.platform}${os.major} \
  • trunk/dports/gnome/gstreamer010-gst-plugins-ugly/Portfile

    r112717 r114328  
    6464    set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
    6565    set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
    66 } elseif {${build_arch} == "i386"} {
     66} elseif {${build_arch} eq "i386"} {
    6767    configure.args-append \
    6868        --host=i686-apple-${os.platform}${os.major} \
    6969        --build=i686-apple-${os.platform}${os.major}
    70 } elseif {${build_arch} == "x86_64"} {
     70} elseif {${build_arch} eq "x86_64"} {
    7171    configure.args-append \
    7272        --host=${build_arch}-apple-${os.platform}${os.major} \
  • trunk/dports/gnome/gstreamer010/Portfile

    r112812 r114328  
    5757    # g-ir-scanner does not honor CFLAGS
    5858    configure.args-append   --disable-introspection
    59 } elseif {${build_arch} == "i386"} {
     59} elseif {${build_arch} eq "i386"} {
    6060    configure.args-append \
    6161        --host=i686-apple-${os.platform}${os.major} \
    6262        --build=i686-apple-${os.platform}${os.major}
    63 } elseif {${build_arch} == "x86_64"} {
     63} elseif {${build_arch} eq "x86_64"} {
    6464    configure.args-append \
    6565        --host=${build_arch}-apple-${os.platform}${os.major} \
  • trunk/dports/gnome/gstreamer1-gst-libav/Portfile

    r113886 r114328  
    5252    set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major}"
    5353    set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major}"
    54 } elseif {${build_arch} == "i386"} {
     54} elseif {${build_arch} eq "i386"} {
    5555    configure.args-append \
    5656        --host=i686-apple-${os.platform}${os.major} \
  • trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile

    r113922 r114328  
    133133} else {
    134134
    135     if {${build_arch} == "i386"} {
     135    if {${build_arch} eq "i386"} {
    136136        configure.args-append \
    137137            --host=i686-apple-${os.platform}${os.major} \
    138138            --build=i686-apple-${os.platform}${os.major}
    139     } elseif {${build_arch} == "x86_64"} {
     139    } elseif {${build_arch} eq "x86_64"} {
    140140        configure.args-append \
    141141            --host=${build_arch}-apple-${os.platform}${os.major} \
  • trunk/dports/gnome/gstreamer1-gst-plugins-base/Portfile

    r113921 r114328  
    101101if {[string match "*gcc-4.2" ${configure.compiler}]} {
    102102    lappend merger_configure_cflags(i386) -O1 -fexpensive-optimizations
    103     if {![variant_isset universal] && ${build_arch} == "i386"} {
     103    if {![variant_isset universal] && ${build_arch} eq "i386"} {
    104104        configure.cflags-delete -O2
    105105        configure.cflags-append -O1 -fexpensive-optimizations
     
    120120} else {
    121121
    122     if {${build_arch} == "i386"} {
     122    if {${build_arch} eq "i386"} {
    123123        configure.args-append \
    124124            --host=i686-apple-${os.platform}${os.major} \
    125125            --build=i686-apple-${os.platform}${os.major}
    126     } elseif {${build_arch} == "x86_64"} {
     126    } elseif {${build_arch} eq "x86_64"} {
    127127        configure.args-append \
    128128            --host=${build_arch}-apple-${os.platform}${os.major} \
  • trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile

    r113886 r114328  
    8080} else {
    8181
    82     if {${build_arch} == "i386"} {
     82    if {${build_arch} eq "i386"} {
    8383        configure.args-append \
    8484            --host=i686-apple-${os.platform}${os.major} \
    8585            --build=i686-apple-${os.platform}${os.major}
    86     } elseif {${build_arch} == "x86_64"} {
     86    } elseif {${build_arch} eq "x86_64"} {
    8787        configure.args-append \
    8888            --host=${build_arch}-apple-${os.platform}${os.major} \
  • trunk/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile

    r113886 r114328  
    6969} else {
    7070
    71     if {${build_arch} == "i386"} {
     71    if {${build_arch} eq "i386"} {
    7272        configure.args-append \
    7373            --host=i686-apple-${os.platform}${os.major} \
    7474            --build=i686-apple-${os.platform}${os.major}
    75     } elseif {${build_arch} == "x86_64"} {
     75    } elseif {${build_arch} eq "x86_64"} {
    7676        configure.args-append \
    7777            --host=${build_arch}-apple-${os.platform}${os.major} \
  • trunk/dports/gnome/gstreamer1/Portfile

    r113886 r114328  
    6060} else {
    6161
    62     if {${build_arch} == "i386"} {
     62    if {${build_arch} eq "i386"} {
    6363        configure.args-append \
    6464            --host=i686-apple-${os.platform}${os.major} \
    6565            --build=i686-apple-${os.platform}${os.major}
    66     } elseif {${build_arch} == "x86_64"} {
     66    } elseif {${build_arch} eq "x86_64"} {
    6767        configure.args-append \
    6868            --host=${build_arch}-apple-${os.platform}${os.major} \
  • trunk/dports/graphics/exempi/Portfile

    r107670 r114328  
    2525
    2626# see http://trac.macports.org/ticket/20965
    27 if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
     27if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
    2828    patchfiles-append      patch-source__XMPFiles__FormatSupport__Makefile.am
    2929    configure.cppflags-append     -DXMP_64
  • trunk/dports/graphics/gegl/Portfile

    r114119 r114328  
    9090        set merger_configure_cflags(ppc) -fno-altivec
    9191        set merger_configure_cxxflags(ppc) -fno-altivec
    92     } elseif {${build_arch} == "ppc"} {
     92    } elseif {${build_arch} eq "ppc"} {
    9393        configure.cflags-append -fno-altivec
    9494        configure.cxxflags-append -fno-altivec
    95     } elseif {${build_arch} == "x86_64"} {
     95    } elseif {${build_arch} eq "x86_64"} {
    9696        configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
    9797    }
  • trunk/dports/graphics/gimp-gap/Portfile

    r110608 r114328  
    5050
    5151post-patch     {
    52                    if {$build_arch != ""} {
     52                   if {${build_arch} ne ""} {
    5353                       set ffmpeg_extras "--cc=${configure.cc} --arch=${build_arch}"
    5454                   } else {
  • trunk/dports/graphics/gimp2/Portfile

    r114314 r114328  
    191191#
    192192
    193     if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
     193    if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
    194194        configure.args-append --without-lcms
    195195    }
  • trunk/dports/graphics/lensfun/Portfile

    r112354 r114328  
    6363    set merger_configure_args(i386)   "--target=mac.x86.i686"
    6464    set merger_configure_args(x86_64) "--target=mac.x86_64.generic"
    65 } elseif {${build_arch} == "ppc64"} {
     65} elseif {${build_arch} eq "ppc64"} {
    6666    configure.args-append --target=mac.powerpc64.G5 --vectorization=''
    67 } elseif {${build_arch} == "ppc"} {
     67} elseif {${build_arch} eq "ppc"} {
    6868    configure.args-append --target=mac.powerpc.powerpc --vectorization=''
    69 } elseif {${build_arch} == "i386"} {
     69} elseif {${build_arch} eq "i386"} {
    7070    configure.args-append --target=mac.x86.i686
    71 } elseif {${build_arch} == "x86_64"} {
     71} elseif {${build_arch} eq "x86_64"} {
    7272    configure.args-append --target=mac.x86_64.generic
    7373}
  • trunk/dports/graphics/libemf/Portfile

    r111743 r114328  
    3333    } else {
    3434        universal_variant no
    35         if {${configure.build_arch} == "ppc"} {
     35        if {${configure.build_arch} eq "ppc"} {
    3636            configure.cppflags-append -D__PPC__=1
    3737        }
  • trunk/dports/graphics/vlfeat/Portfile

    r98287 r114328  
    3030supported_archs     x86_64 i386
    3131
    32 if {$build_arch == "x86_64"} {
     32if {${build_arch} eq "x86_64"} {
    3333    set vlfeat_arch maci64
    34 } elseif {$build_arch == "i386"} {
     34} elseif {${build_arch} eq "i386"} {
    3535    set vlfeat_arch maci
    3636}
  • trunk/dports/kde/kdevelop/Portfile

    r114325 r114328  
    7878if {${configure.compiler} == "clang" && ${os.platform} eq "darwin" && ${os.major} >= 11} {
    7979    lappend merger_configure_args(x86_64)   -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DHAVE_UNORDERED_MAP=1
    80     if {${build_arch} == "x86_64" && ![variant_isset universal]} {
     80    if {${build_arch} eq "x86_64" && ![variant_isset universal]} {
    8181        configure.args-append               -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
    8282    }
  • trunk/dports/kde/kdevplatform/Portfile

    r114325 r114328  
    6262if {${configure.compiler} == "clang" && ${os.platform} eq "darwin" && ${os.major} >= 11} {
    6363    lappend merger_configure_args(x86_64)   -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DHAVE_UNORDERED_MAP=1
    64     if {${build_arch} == "x86_64" && ![variant_isset universal]} {
     64    if {${build_arch} eq "x86_64" && ![variant_isset universal]} {
    6565        configure.args-append               -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
    6666    }
  • trunk/dports/lang/apple-gcc42/Portfile

    r112955 r114328  
    8181
    8282# Building universal with a ppc slice doesn't work (Tried on Leopard)
    83 if {${build_arch} == "i386" || ${build_arch} == "x86_64"} {
     83if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
    8484    supported_archs i386 x86_64
    85 } elseif {${build_arch} == "ppc" || ${build_arch} == "ppc64"} {
     85} elseif {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
    8686    supported_archs ppc ppc64
    8787}
     
    144144        ${worksrcpath}/gcc/version.c
    145145
    146     if {${build_arch} == "ppc"} {
     146    if {${build_arch} eq "ppc"} {
    147147        reinplace "/^PPC_SYSROOT=/ s:=.*$:=/:" ${worksrcpath}/build_gcc
    148148    } elseif {[file exists ${developer_dir}/SDKs/MacOSX10.5.sdk]} {
     
    227227set build_targets {}
    228228
    229 if {${os.major} > 8 || ${os.arch} == "i386"} {
     229if {${os.major} > 8 || ${os.arch} eq "i386"} {
    230230    lappend build_targets i386
    231231}
     
    236236            [file exists ${developer_dir}/SDKs/MacOSX10.4u.sdk] ||
    237237            [file exists ${developer_dir}/SDKs/MacOSX10.5.sdk] ||
    238             ${build_arch} == "ppc"} {
     238            ${build_arch} eq "ppc"} {
    239239        lappend build_targets ppc
    240240    }
  • trunk/dports/lang/ccl/Portfile

    r103826 r114328  
    3232    global ccl_script
    3333
    34     if { ${configure.build_arch} == "x86_64" } {
     34    if { ${configure.build_arch} eq "x86_64" } {
    3535        set bootimg dx86cl64
    3636        set ccl_script ccl64
    37     } elseif { ${configure.build_arch} == "i386" } {
     37    } elseif { ${configure.build_arch} eq "i386" } {
    3838        set bootimg dx86cl
    3939        set ccl_script ccl
     
    5050    global ccl_script
    5151
    52     if { ${configure.build_arch} == "ppc64" } {
     52    if { ${configure.build_arch} eq "ppc64" } {
    5353        set bootimg dppccl64
    5454        set ccl_script ccl64
    55     } elseif { ${configure.build_arch} == "ppc" } {
     55    } elseif { ${configure.build_arch} eq "ppc" } {
    5656        set bootimg dppccl
    5757        set ccl_script ccl
  • trunk/dports/lang/dmd-doc/Portfile

    r112981 r114328  
    2727use_configure       no
    2828
    29 if {${build_arch}=="x86_64"} {
     29if {${build_arch} eq "x86_64"} {
    3030    set model 64
    3131} else {
  • trunk/dports/lang/dmd-tools/Portfile

    r112982 r114328  
    3131set dflags "-O -d"
    3232
    33 if {${build_arch}=="x86_64"} {
     33if {${build_arch} eq "x86_64"} {
    3434    set model 64
    3535} else {
  • trunk/dports/lang/druntime/Portfile

    r112979 r114328  
    2525use_configure       no
    2626
    27 if {${build_arch}=="x86_64"} {
     27if {${build_arch} eq "x86_64"} {
    2828    set model 64
    2929} else {
  • trunk/dports/lang/eero-devel/Portfile

    r111504 r114328  
    9595        }
    9696
    97     if {${build_arch} == "i386" } {
     97    if {${build_arch} eq "i386"} {
    9898        configure.pre_args-append --build=i686-apple-darwin${os.major}
    99     } elseif {${build_arch} == "ppc" } {
     99    } elseif {${build_arch} eq "ppc"} {
    100100        configure.pre_args-append --build=powerpc-apple-darwin${os.major}
    101     } elseif {${build_arch} == "ppc64" } {
     101    } elseif {${build_arch} eq "ppc64"} {
    102102        configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
    103103    } else {
  • trunk/dports/lang/eiffelstudio70/Portfile

    r93345 r114328  
    4545set ise_platform ${os.platform}-${os.arch}
    4646platform darwin i386     {
    47                     if {${build_arch} == "i386"} {
     47                    if {${build_arch} eq "i386"} {
    4848                        set ise_platform macosx-x86
    49                     } elseif {${build_arch} == "x86_64"} {
     49                    } elseif {${build_arch} eq "x86_64"} {
    5050                        set ise_platform macosx-x86-64
    5151                    }
  • trunk/dports/lang/eiffelstudio71/Portfile

    r98512 r114328  
    4646set ise_platform ${os.platform}-${os.arch}
    4747platform darwin i386     {
    48                     if {${build_arch} == "i386"} {
     48                    if {${build_arch} eq "i386"} {
    4949                        set ise_platform macosx-x86
    50                     } elseif {${build_arch} == "x86_64"} {
     50                    } elseif {${build_arch} eq "x86_64"} {
    5151                        set ise_platform macosx-x86-64
    5252                    }
  • trunk/dports/lang/eiffelstudio72/Portfile

    r111418 r114328  
    4747set ise_platform ${os.platform}-${os.arch}
    4848platform darwin i386     {
    49                     if {${build_arch} == "i386"} {
     49                    if {${build_arch} eq "i386"} {
    5050                        set ise_platform macosx-x86
    51                     } elseif {${build_arch} == "x86_64"} {
     51                    } elseif {${build_arch} eq "x86_64"} {
    5252                        set ise_platform macosx-x86-64
    5353                    }
  • trunk/dports/lang/eiffelstudio73/Portfile

    r111420 r114328  
    4747set ise_platform ${os.platform}-${os.arch}
    4848platform darwin i386     {
    49                     if {${build_arch} == "i386"} {
     49                    if {${build_arch} eq "i386"} {
    5050                        set ise_platform macosx-x86
    51                     } elseif {${build_arch} == "x86_64"} {
     51                    } elseif {${build_arch} eq "x86_64"} {
    5252                        set ise_platform macosx-x86-64
    5353                    }
  • trunk/dports/lang/erlang/Portfile

    r113329 r114328  
    107107
    108108platform darwin {
    109     if {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
     109    if {${configure.build_arch} eq "x86_64" || ${configure.build_arch} eq "ppc64"} {
    110110        configure.args-append   --enable-darwin-64bit
    111111    } else {
  • trunk/dports/lang/factor/Portfile

    r105473 r114328  
    3838use_configure       no
    3939
    40 if {${build_arch} == "x86_64"} {
     40if {${build_arch} eq "x86_64"} {
    4141    build.target    macosx-x86-64
    4242    set boot_image  boot.unix-x86.64.image
    4343
    44 } elseif {${build_arch} == "i386"} {
     44} elseif {${build_arch} eq "i386"} {
    4545    build.target    macosx-x86-32
    4646    set boot_image  boot.unix-x86.32.image
  • trunk/dports/lang/g95/Portfile

    r110972 r114328  
    2121dist_subdir     ${name}/${version}
    2222
    23 if {${os.major} < 10 || ${build_arch}=="ppc" || ${build_arch}=="i386"} {
     23if {${os.major} < 10 || ${build_arch} eq "ppc" || ${build_arch} eq "i386"} {
    2424    default_variants +gcc40
    2525}
     
    9393    file mkdir ${workpath}/gcc-${version_gcc}/${name}
    9494    reinplace "s|tjmp %%edx|tjmp *%%edx|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/i386.c
    95     if {${build_arch} == "i386"} {
     95    if {${build_arch} eq "i386"} {
    9696        reinplace "s|i686|i386|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/darwin.h
    9797    }
     
    133133
    134134pre-build {
    135     if {![variant_isset gcc40] && ${os.arch}=="i386"} {
     135    if {![variant_isset gcc40] && ${os.arch} eq "i386"} {
    136136        reinplace "s|\(g95_LDADD\)|(g95_LDADD) ${workpath}/gcc-${version_gcc}/g95/gcc/driver-i386.o|" ${worksrcpath}/Makefile
    137137    }
  • trunk/dports/lang/gcc42/Portfile

    r110870 r114328  
    7373        }
    7474    }
    75     if {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
     75    if {${configure.build_arch} eq "x86_64" || ${configure.build_arch} eq "ppc64"} {
    7676        configure.pre_args-append --build=${configure.build_arch}-apple-${os.platform}${os.version} \
    7777                                  --host=${configure.build_arch}-apple-${os.platform}${os.version}
  • trunk/dports/lang/gcc45/Portfile

    r110870 r114328  
    135135
    136136# LTO doesn't work for other targets, see ticket #32863
    137 if {![variant_isset universal] && $build_arch == "x86_64"} {
     137if {![variant_isset universal] && ${build_arch} eq "x86_64"} {
    138138    configure.args-append --enable-lto
    139139}
     
    225225
    226226    # darwin-sections.def gets missed on install for some reason
    227     if {${os.arch} != "powerpc"} {
     227    if {${os.arch} ne "powerpc"} {
    228228        eval file copy ${worksrcpath}/../gcc-${version}/gcc/config/darwin-sections.def [glob ${destroot}${prefix}/lib/${name}/gcc/*/${version}/plugin/include/config]
    229229    }
  • trunk/dports/lang/gforth/Portfile

    r98469 r114328  
    3838
    3939platform darwin {
    40     if {$build_arch == "x86_64"} {
     40    if {${build_arch} eq "x86_64"} {
    4141        configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
    4242    }
  • trunk/dports/lang/guile/Portfile

    r109063 r114328  
    6666
    6767# Unable to cross compile, so we need to be able to run the built code
    68 if {${os.arch} == "i386" && ${os.major} >= 11} {
     68if {${os.arch} eq "i386" && ${os.major} >= 11} {
    6969    supported_archs i386 x86_64
    7070    set universal_archs_supported {i386 x86_64}
    71 } elseif {${os.arch} == "i386" && ${build_arch} == "x86_64"} {
     71} elseif {${os.arch} eq "i386" && ${build_arch} eq "x86_64"} {
    7272    supported_archs i386 x86_64 ppc
    7373    set universal_archs_supported {i386 x86_64 ppc}
    74 } elseif {${os.arch} == "i386"} {
     74} elseif {${os.arch} eq "i386"} {
    7575    supported_archs i386 ppc
    7676    set universal_archs_supported {i386 ppc}
    77 } elseif {${build_arch} == "ppc64"} {
     77} elseif {${build_arch} eq "ppc64"} {
    7878    supported_archs ppc ppc64
    7979    set universal_archs_supported {ppc ppc64}
     
    9393        set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major}"
    9494        set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major}"
    95     } elseif {${build_arch} == "i386"} {
     95    } elseif {${build_arch} eq "i386"} {
    9696        configure.args-append \
    9797            --host=i686-apple-${os.platform}${os.major} \
    9898            --build=i686-apple-${os.platform}${os.major}
    99     } elseif {${build_arch} == "x86_64"} {
     99    } elseif {${build_arch} eq "x86_64"} {
    100100        configure.args-append \
    101101            --host=x86_64-apple-${os.platform}${os.major} \
    102102            --build=x86_64-apple-${os.platform}${os.major}
    103     } elseif {${build_arch} == "ppc"} {
     103    } elseif {${build_arch} eq "ppc"} {
    104104        configure.args-append \
    105105            --host=powerpc-apple-${os.platform}${os.major} \
    106106            --build=powerpc-apple-${os.platform}${os.major}
    107     } elseif {${build_arch} == "ppc64"} {
     107    } elseif {${build_arch} eq "ppc64"} {
    108108        configure.args-append \
    109109            --host=powerpc64-apple-${os.platform}${os.major} \
  • trunk/dports/lang/llvm-2.9/Portfile

    r112812 r114328  
    158158
    159159platform darwin {
    160     if {${build_arch} == "i386" } {
     160    if {${build_arch} eq "i386"} {
    161161        configure.pre_args-append --build=i686-apple-darwin${os.major}
    162     } elseif {${build_arch} == "ppc" } {
     162    } elseif {${build_arch} eq "ppc"} {
    163163        configure.pre_args-append --build=powerpc-apple-darwin${os.major}
    164     } elseif {${build_arch} == "ppc64" } {
     164    } elseif {${build_arch} eq "ppc64"} {
    165165        configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
    166166    } else {
  • trunk/dports/lang/llvm-3.0/Portfile

    r112812 r114328  
    156156
    157157platform darwin {
    158     if {${build_arch} == "i386" } {
     158    if {${build_arch} eq "i386"} {
    159159        configure.pre_args-append --build=i686-apple-darwin${os.major}
    160     } elseif {${build_arch} == "ppc" } {
     160    } elseif {${build_arch} eq "ppc"} {
    161161        configure.pre_args-append --build=powerpc-apple-darwin${os.major}
    162     } elseif {${build_arch} == "ppc64" } {
     162    } elseif {${build_arch} eq "ppc64"} {
    163163        configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
    164164    } else {
  • trunk/dports/lang/llvm-3.1/Portfile

    r112812 r114328  
    160160
    161161platform darwin {
    162     if {${build_arch} == "i386" } {
     162    if {${build_arch} eq "i386"} {
    163163        configure.pre_args-append --build=i686-apple-darwin${os.major}
    164     } elseif {${build_arch} == "ppc" } {
     164    } elseif {${build_arch} eq "ppc"} {
    165165        configure.pre_args-append --build=powerpc-apple-darwin${os.major}
    166     } elseif {${build_arch} == "ppc64" } {
     166    } elseif {${build_arch} eq "ppc64"} {
    167167        configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
    168168    } else {
  • trunk/dports/lang/llvm-3.2/Portfile

    r113436 r114328  
    162162
    163163platform darwin {
    164     if {${build_arch} == "i386" } {
     164    if {${build_arch} eq "i386"} {
    165165        configure.pre_args-append --build=i686-apple-darwin${os.major}
    166     } elseif {${build_arch} == "ppc" } {
     166    } elseif {${build_arch} eq "ppc"} {
    167167        configure.pre_args-append --build=powerpc-apple-darwin${os.major}
    168     } elseif {${build_arch} == "ppc64" } {
     168    } elseif {${build_arch} eq "ppc64"} {
    169169        configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
    170170    } else {
  • trunk/dports/lang/llvm-3.3/Portfile

    r113409 r114328  
    150150
    151151platform darwin {
    152     if {${build_arch} == "i386" } {
     152    if {${build_arch} eq "i386"} {
    153153        configure.pre_args-append --build=i686-apple-darwin${os.major}
    154     } elseif {${build_arch} == "ppc" } {
     154    } elseif {${build_arch} eq "ppc"} {
    155155        configure.pre_args-append --build=powerpc-apple-darwin${os.major}
    156     } elseif {${build_arch} == "ppc64" } {
     156    } elseif {${build_arch} eq "ppc64"} {
    157157        configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
    158158    } else {
  • trunk/dports/lang/llvm-3.4/Portfile

    r113978 r114328  
    136136
    137137platform darwin {
    138     if {${build_arch} == "i386" } {
     138    if {${build_arch} eq "i386"} {
    139139        configure.pre_args-append --build=i686-apple-darwin${os.major}
    140     } elseif {${build_arch} == "ppc" } {
     140    } elseif {${build_arch} eq "ppc"} {
    141141        configure.pre_args-append --build=powerpc-apple-darwin${os.major}
    142     } elseif {${build_arch} == "ppc64" } {
     142    } elseif {${build_arch} eq "ppc64"} {
    143143        configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
    144144    } else {
  • trunk/dports/lang/llvm-gcc42/Portfile

    r112955 r114328  
    8282        ${worksrcpath}/llvmCore/utils/buildit/build_llvm
    8383
    84     if {${build_arch} == "ppc"} {
     84    if {${build_arch} eq "ppc"} {
    8585        reinplace "/^PPC_SYSROOT=/ s:=.*$:=/:" ${worksrcpath}/build_gcc
    8686    } elseif {[file exists ${developer_dir}/SDKs/MacOSX10.5.sdk]} {
     
    150150set build_targets {}
    151151
    152 if {${os.major} > 8 || ${os.arch} == "i386"} {
     152if {${os.major} > 8 || ${os.arch} eq "i386"} {
    153153    lappend build_targets i386
    154154}
     
    159159#            [file exists ${developer_dir}/SDKs/MacOSX10.4u.sdk] ||
    160160#            [file exists ${developer_dir}/SDKs/MacOSX10.5.sdk] ||
    161 #            ${build_arch} == "ppc"} {
     161#            ${build_arch} eq "ppc"} {
    162162#        lappend build_targets ppc
    163163#    }
    164164#}
    165 if {${os.major} < 11 && ${build_arch} == "ppc"} {
     165if {${os.major} < 11 && ${build_arch} eq "ppc"} {
    166166    lappend build_targets ppc
    167167}
  • trunk/dports/lang/omnixmp/Portfile

    r113458 r114328  
    3131
    3232post-patch {
    33     if {${build_arch}=="x86_64"} {
     33    if {${build_arch} eq "x86_64"} {
    3434        reinplace "s|CPU=i386|CPU=x86_64|g" ${worksrcpath}/configure
    3535    }
  • trunk/dports/lang/phobos/Portfile

    r112980 r114328  
    2727use_configure       no
    2828
    29 if {${build_arch}=="x86_64"} {
     29if {${build_arch} eq "x86_64"} {
    3030    set model 64
    3131} else {
  • trunk/dports/lang/python26/Portfile

    r114325 r114328  
    150150      foreach arch ${universal_archs} {
    151151         lappend universal_arch_flags -arch ${arch}
    152          if { ${arch}=="i386" || ${arch}=="ppc" } {
     152         if {${arch} eq "i386" || ${arch} eq "ppc"} {
    153153            lappend arch_run_32bit -${arch}
    154154         }
  • trunk/dports/lang/python31/Portfile

    r104926 r114328  
    133133      foreach arch ${universal_archs} {
    134134         lappend universal_arch_flags -arch ${arch}
    135          if { ${arch}=="i386" || ${arch}=="ppc" } {
     135         if {${arch} eq "i386" || ${arch} eq "ppc"} {
    136136            lappend arch_run_32bit -${arch}
    137137         }
  • trunk/dports/lang/python32/Portfile

    r106228 r114328  
    118118      foreach arch ${universal_archs} {
    119119         lappend universal_arch_flags -arch ${arch}
    120          if { ${arch}=="i386" || ${arch}=="ppc" } {
     120         if {${arch} eq "i386" || ${arch} eq "ppc"} {
    121121            lappend arch_run_32bit -${arch}
    122122         }
  • trunk/dports/lang/python33/Portfile

    r113802 r114328  
    128128      foreach arch ${universal_archs} {
    129129         lappend universal_arch_flags -arch ${arch}
    130          if { ${arch}=="i386" || ${arch}=="ppc" } {
     130         if {${arch} eq "i386" || ${arch} eq "ppc"} {
    131131            lappend arch_run_32bit -${arch}
    132132         }
  • trunk/dports/lang/python34/Portfile

    r114107 r114328  
    132132      foreach arch ${universal_archs} {
    133133         lappend universal_arch_flags -arch ${arch}
    134          if { ${arch}=="i386" || ${arch}=="ppc" } {
     134         if {${arch} eq "i386" || ${arch} eq "ppc"} {
    135135            lappend arch_run_32bit -${arch}
    136136         }
  • trunk/dports/lang/ruby/Portfile

    r110667 r114328  
    121121                        "ac_cv_build=\"${cpu_type}-apple-darwin${os.major}\" "
    122122        }
    123 } elseif {[info exists build_arch] && ${build_arch} != ""} {
     123} elseif {[info exists build_arch] && ${build_arch} ne ""} {
    124124        configure.env-append ARCH_FLAG="-arch ${build_arch}"
    125125}
  • trunk/dports/lang/ruby186/Portfile

    r110379 r114328  
    7777                                --disable-ucontext
    7878
    79 if {![variant_isset universal] && [info exists build_arch] && $build_arch != ""} {
     79if {![variant_isset universal] && [info exists build_arch] && ${build_arch} ne ""} {
    8080        configure.env-append ARCH_FLAG="-arch ${build_arch}"
    8181}
  • trunk/dports/lang/ruby19/Portfile

    r113808 r114328  
    7575
    7676# Add the architecture flag as required
    77 if {[info exists build_arch] && ${build_arch} != ""} {
     77if {[info exists build_arch] && ${build_arch} ne ""} {
    7878        configure.args-append "--with-arch=${build_arch}"
    7979}
  • trunk/dports/lang/ruby20/Portfile

    r113807 r114328  
    6464
    6565# Add the architecture flag as required
    66 if {[info exists build_arch] && ${build_arch} != ""} {
     66if {[info exists build_arch] && ${build_arch} ne ""} {
    6767    configure.args-append "--with-arch=${build_arch}"
    6868}
  • trunk/dports/lang/upc/Portfile

    r114325 r114328  
    3939
    4040pre-configure {
    41     if {${os.platform} eq "darwin" && ${os.arch} == "powerpc"} {
     41    if {${os.platform} eq "darwin" && ${os.arch} eq "powerpc"} {
    4242        ui_error "PowerPC is not supported"
    4343    }
     
    5959                    --with-upc-backtrace-gdb=ggdb \
    6060                    --enable-languages=upc
    61 if {${os.platform} eq "darwin" && ${build_arch} == "x86_64"} {
     61if {${os.platform} eq "darwin" && ${build_arch} eq "x86_64"} {
    6262    configure.args-append   --build=${build_arch}-apple-${os.platform}${os.major}
    6363}
  • trunk/dports/lang/yap-devel/Portfile

    r114325 r114328  
    3434                --with-readline=${prefix}
    3535
    36 if {${os.platform} eq "darwin" && ${build_arch} == "x86_64"} {
     36if {${os.platform} eq "darwin" && ${build_arch} eq "x86_64"} {
    3737    configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
    3838}
  • trunk/dports/lang/yap/Portfile

    r114325 r114328  
    3434                --with-readline=${prefix}
    3535
    36 if {${os.platform} eq "darwin" && ${build_arch} == "x86_64"} {
     36if {${os.platform} eq "darwin" && ${build_arch} eq "x86_64"} {
    3737    configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
    3838}
  • trunk/dports/math/OpenBLAS/Portfile

    r113940 r114328  
    9191            puts $makeINC "FC = ${configure.fc}"
    9292
    93             if {${arch} == "x86_64" || ${arch} == "ppc64"} {
     93            if {${arch} eq "x86_64" || ${arch} eq "ppc64"} {
    9494                puts $makeINC "BINARY = 64"
    9595            } else {
     
    120120        puts $makeINC "FC = ${configure.fc}"
    121121
    122         if {${build_arch} == "x86_64" || ${build_arch} == "ppc64"} {
     122        if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
    123123            puts $makeINC "BINARY = 64"
    124124        } else {
  • trunk/dports/math/arpack/Portfile

    r114325 r114328  
    2424
    2525configure.args-append home=${worksrcpath} --disable-mpi
    26 if { ${build_arch}=="x86_64" || ${build_arch}=="ppc64" } {
     26if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
    2727    configure.args-append FFLAGS='-O2 -m64'
    2828} else {
     
    4848
    4949# Fortran compilers can not cross-compile
    50 if { ${os.arch}=="i386" } {
     50if {${os.arch} eq "i386"} {
    5151    set universal_archs_supported "i386 x86_64"
    5252} else {
  • trunk/dports/math/atlas/Portfile

    r114017 r114328  
    205205set native_arch ${build_arch}
    206206
    207 if {${os.arch} == "i386"} {
     207if {${os.arch} eq "i386"} {
    208208
    209209    set universal_archs_supported {i386 x86_64}
     
    211211        set native_arch ${result}
    212212    }
    213 } elseif {${os.arch} == "powerpc"} {
     213} elseif {${os.arch} eq "powerpc"} {
    214214
    215215    set universal_archs_supported {ppc  ppc64}
     
    230230# Chose the right flags for GCC and Clang compilers
    231231
    232 if {${build_arch} == "i386" || ${build_arch} == "x86_64"} {
     232if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
    233233
    234234    # General flags
     
    284284        set cvct_flag   "-msse3"
    285285    }
    286 } elseif {${build_arch} == "ppc"} {
     286} elseif {${build_arch} eq "ppc"} {
    287287
    288288    # PPC
     
    300300    # is not as efficient as ppc64
    301301    pre-fetch {
    302         if {${native_arch} == "ppc64"} {
     302        if {${native_arch} eq "ppc64"} {
    303303
    304304                ui_msg "Compiling for ppc on a G5 machine.\
     
    381381
    382382post-patch {
    383     if {${build_arch} == "ppc" || ${build_arch} == "ppc64"} {
     383    if {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
    384384   
    385385        reinplace \
     
    471471        # -march=natives supersedes -msse4.2 so disable it on AVX
    472472        # capable machines
    473         if {${has_avx} == "no" && ${build_arch} != "ppc"} {
     473        if {${has_avx} == "no" && ${build_arch} ne "ppc"} {
    474474
    475475            append gcc_flags    " -march=native"
     
    489489        }
    490490       
    491         if {${build_arch} == "ppc"} {
     491        if {${build_arch} eq "ppc"} {
    492492       
    493493            # ppc uses altivec vectorizing unit
     
    507507                                            ${libgccpath}/libgfortran.dylib
    508508            }
    509             if {${build_arch} == "x86_64" || ${build_arch} == "ppc64"} {
     509            if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
    510510
    511511                configure.args-append   -b 64
     
    532532            }
    533533
    534             if {${build_arch} == "x86_64"} {
     534            if {${build_arch} eq "x86_64"} {
    535535
    536536                configure.args-append   -b 64
     
    558558           
    559559            # We build for the native architecture
    560             if {${arch} == ${native_arch} && ${build_arch} != "ppc"} {
     560            if {${arch} eq ${native_arch} && ${build_arch} ne "ppc"} {
    561561               
    562562                # Don’t add -march=native to a GCC build on an AVX
     
    573573            # Clamp i386 optimization to -sse3 in universal builds and
    574574            # forces clang/gcc to use -m32 flag
    575             if {${arch} == "i386" && ${native_arch} != "i386"} {
     575            if {${arch} eq "i386" && ${native_arch} ne "i386"} {
    576576
    577577                set gvct_univ_flag      "-msse3"
     
    584584            # For x86_64 builds, be conservative and use only -ssse3
    585585            # Core2 CPU and SSE3 ASM kernels
    586             if {${arch} == "x86_64" && ${native_arch} != "x86_64"} {
     586            if {${arch} eq "x86_64" && ${native_arch} ne "x86_64"} {
    587587           
    588588                set gvct_univ_flag      "-mssse3"
     
    596596           
    597597            # ppc (on Intel or ppc64 machines)
    598             if {${arch} == "ppc" && ${native_arch} != "ppc"} {
     598            if {${arch} eq "ppc" && ${native_arch} ne "ppc"} {
    599599           
    600600                set gcc_univ_flags      "-O3 -mcpu=7400 -mtune=7400\
     
    612612            # ppc64 (only for gcc, for clang this is taken to be the
    613613            # same target as ppc)
    614             if {${arch} == "ppc64" && ${native_arch} != "ppc64"} {
     614            if {${arch} eq "ppc64" && ${native_arch} ne "ppc64"} {
    615615           
    616616                set gcc_univ_flags      "-mcpu=970 -mtune=970 -mvrsave \
     
    692692   
    693693    # On PPC64 we need extra flags for configuring
    694     if {${native_arch} == "ppc64"} {
     694    if {${native_arch} eq "ppc64"} {
    695695        configure.args-append   --cc="\"${configure.cc} -m32 \
    696696                                 -force_cpusubtype_ALL\""
     
    700700    set cpufreq [expr {[sysctl hw.cpufrequency] / 1000000}]
    701701
    702     if {${os.arch} == "powerpc"} {
     702    if {${os.arch} eq "powerpc"} {
    703703
    704704        configure.args-append    -D c -DWALL
     
    740740        #   set gmpfx    ${prefix}/lib/gcc${gcc_version}
    741741        #   set arch     [lindex [split [lindex [split $path "/"] end] "-"] 2]
    742         #   if {${arch} != "" && \
     742        #   if {${arch} ne "" && \
    743743        #       [file exists ${gmpfx}/${arch}/libgomp.dylib]} {
    744744
  • trunk/dports/math/fftw-3/Portfile

    r114294 r114328  
    209209}
    210210
    211 if { ${os.arch} == "i386" } {
     211if {${os.arch} eq "i386"} {
    212212    lappend merger_configure_args(ppc)     "--disable-fortran"
    213213    lappend merger_configure_args(ppc64)   "--disable-fortran"
     
    267267    configure.f90 ${prefix}/bin/g95
    268268
    269     if {${build_arch} == "i386"} {
     269    if {${build_arch} eq "i386"} {
    270270        lappend merger_configure_args(x86_64)  "--disable-fortran"
    271     } elseif {${build_arch} == "x86_64"} {
     271    } elseif {${build_arch} eq "x86_64"} {
    272272        lappend merger_configure_args(i386)    "--disable-fortran"
    273273    } else {
  • trunk/dports/math/maxima/Portfile

    r114325 r114328  
    3939                --enable-sbcl
    4040
    41 if {${os.platform} ne "darwin" && ${os.arch} != "i386"} {
     41if {${os.platform} ne "darwin" && ${os.arch} ne "i386"} {
    4242variant clisp description {Use CLISP instead of SBCL for Lisp} {
    4343    depends_lib-delete  port:sbcl
  • trunk/dports/math/pari/Portfile

    r102928 r114328  
    5656
    5757# pari does not build for ppc on intel
    58 if {${build_arch} == "i386" || ${build_arch} == "x86_64"} {
     58if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
    5959    supported_archs i386 x86_64
    60 } elseif {${build_arch} == "ppc" || ${build_arch} == "ppc64"} {
     60} elseif {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
    6161    supported_archs ppc ppc64
    6262}
  • trunk/dports/math/qrupdate/Portfile

    r110831 r114328  
    4040
    4141# Fortran compilers can not cross-compile
    42 if { ${os.arch}=="i386" } {
     42if {${os.arch} eq "i386"} {
    4343    set universal_archs_supported "i386 x86_64"
    4444} else {
     
    4848post-configure {
    4949    if { ! [variant_isset universal] } {
    50         if { ${build_arch} == "x86_64" || ${build_arch} == "ppc64" } {
     50        if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
    5151            reinplace "s|^FFLAGS=|FFLAGS=-m64 |"  ${worksrcpath}/Makeconf
    5252        } else {
     
    5555    } else {
    5656        foreach arch ${universal_archs_to_use} {
    57             if { ${arch}=="x86_64" || ${arch}=="ppc64" } {
     57            if {${arch} eq "x86_64" || ${arch} eq "ppc64"} {
    5858                reinplace "s|^FFLAGS=|FFLAGS=-m64 |"  ${worksrcpath}-${arch}/Makeconf
    5959            } else {
  • trunk/dports/multimedia/MPlayer/Portfile

    r114119 r114328  
    254254
    255255platform macosx {
    256     if { ${configure.build_arch} == "x86_64" } {
     256    if {${configure.build_arch} eq "x86_64"} {
    257257        configure.args-append   --disable-qtx
    258258    } else {
     
    291291
    292292platform darwin {
    293     if { ${configure.build_arch} == "x86_64" } {
     293    if {${configure.build_arch} eq "x86_64"} {
    294294        configure.args-append --target=${configure.build_arch}-Darwin
    295295    }
  • trunk/dports/multimedia/ffmpeg-devel/Portfile

    r114184 r114328  
    184184    configure.args-append --arch=${configure.build_arch}
    185185    configure.env-append  ASFLAGS='[get_canonical_archflags]'
    186     if {$build_arch == "i386" || $build_arch == "x86_64"} {
     186    if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
    187187        depends_build-append port:yasm
    188188        configure.args-append --enable-yasm
  • trunk/dports/multimedia/ffmpeg/Portfile

    r114119 r114328  
    178178    configure.args-append --arch=${configure.build_arch}
    179179    configure.env-append  ASFLAGS='[get_canonical_archflags]'
    180     if {$build_arch == "i386" || $build_arch == "x86_64"} {
     180    if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
    181181        depends_build-append port:yasm
    182182        configure.args-append --enable-yasm
  • trunk/dports/multimedia/mlt/Portfile

    r114119 r114328  
    5555
    5656platform darwin 10 {
    57     if { ${build_arch} == "x86_64" } {
     57    if {${build_arch} eq "x86_64"} {
    5858        configure.args-delete --disable-mmx
    5959    }
  • trunk/dports/multimedia/mplayer-devel/Portfile

    r114119 r114328  
    265265
    266266platform macosx {
    267     if { ${configure.build_arch} == "x86_64" } {
     267    if {${configure.build_arch} eq "x86_64"} {
    268268        configure.args-append   --disable-qtx
    269269    } else {
     
    302302
    303303platform darwin {
    304     if { ${configure.build_arch} == "x86_64" } {
     304    if {${configure.build_arch} eq "x86_64"} {
    305305        configure.args-append --target=${configure.build_arch}-Darwin
    306306    }
  • trunk/dports/multimedia/x264/Portfile

    r114325 r114328  
    4949# asm works with a 64-bit snow leopard build
    5050
    51 if {[variant_isset asm] || (${os.platform} eq "darwin" && 10 == ${os.major} && "x86_64" == $build_arch && ![variant_isset universal])} {
     51if {[variant_isset asm] || (${os.platform} eq "darwin" && ${os.major} == 10 && ${build_arch} eq "x86_64" && ![variant_isset universal])} {
    5252        depends_build-append    port:yasm
    5353        configure.args-delete   --disable-asm
    5454}
    5555
    56 if {${os.platform} eq "darwin" && $build_arch != "" && ![variant_isset universal]} {
    57     if {$build_arch == "i386"} {
     56if {${os.platform} eq "darwin" && ${build_arch} ne "" && ![variant_isset universal]} {
     57    if {${build_arch} eq "i386"} {
    5858        configure.args-append   --host=i686-apple-darwin${os.major}
    5959    } else {
     
    6464
    6565foreach arch ${universal_archs} {
    66     if {$arch == "i386"} {
     66    if {${arch} eq "i386"} {
    6767        set merger_configure_args(${arch}) --host=i686-apple-darwin${os.major}
    6868    } else {
     
    7575platform darwin 8 {
    7676    # https://trac.macports.org/ticket/24893
    77     if {$build_arch == "i386" && ![variant_isset universal]} {
     77    if {${build_arch} eq "i386" && ![variant_isset universal]} {
    7878        configure.cflags-append -msse2
    7979    }
  • trunk/dports/net/dynamips-devel/Portfile

    r80549 r114328  
    3838# compile using nojit if on non-i386 platform
    3939# is meant to work on x86_64 too but apparently crashes; ticket #22285
    40 if {${build_arch} != "i386"} {
     40if {${build_arch} ne "i386"} {
    4141        build.pre_args-append           DYNAMIPS_ARCH=nojit
    4242        destroot.pre_args-append        DYNAMIPS_ARCH=nojit
  • trunk/dports/net/dynamips/Portfile

    r90682 r114328  
    4343destroot.env-append         CFLAGS="${configure.cc_archflags}"
    4444
    45 if {${build_arch} == "x86_64"} {
     45if {${build_arch} eq "x86_64"} {
    4646        set dynamips_arch amd64
    47 } elseif {${build_arch} == "i386"} {
     47} elseif {${build_arch} eq "i386"} {
    4848    set dynamips_arch x86
    4949} else {
  • trunk/dports/net/nss/Portfile

    r108927 r114328  
    5656
    5757build {
    58     if {[info exists build_arch] && (${build_arch} == "x86_64" || $build_arch == "ppc64")} {
     58    if {[info exists build_arch] && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
    5959        set use_64 " USE_64=1"
    6060    } else {
  • trunk/dports/print/freetype/Portfile

    r114266 r114328  
    9191}
    9292
    93 if { ${os.arch}=="i386" } {
     93if {${os.arch} eq "i386"} {
    9494    if { ${os.major}>=10 } {
    9595        set merger_configure_env(ppc) CC_BUILD=${configure.cc}
  • trunk/dports/python/py-numpy/Portfile

    r114324 r114328  
    113113        # either 32 or 64 bits.  Restrict the supported archs
    114114        # accordingly.
    115         if {${os.arch} == "i386"} {
     115        if {${os.arch} eq "i386"} {
    116116            supported_archs         i386 x86_64
    117         } elseif {${os.arch} == "powerpc"} {
     117        } elseif {${os.arch} eq "powerpc"} {
    118118            supported_archs         ppc ppc64
    119119        }
  • trunk/dports/python/py-psyco/Portfile

    r114324 r114328  
    2828
    2929    pre-fetch {
    30         if {${os.arch} != "i386"} {
     30        if {${os.arch} ne "i386"} {
    3131            return -code error "psyco only works on Intel machines"
    3232        }
    3333    }
    3434   
    35     if {$build_arch == "x86_64"} {
     35    if {${build_arch} eq "x86_64"} {
    3636        if {${python.version} >= 25} {
    3737            set interp_path ${python.prefix}/Resources/Python.app/Contents/MacOS/Python
  • trunk/dports/python/py-pyglet/Portfile

    r114324 r114328  
    3232        set Resources_dir ${frameworks_dir}/Python.framework/Versions/${python.branch}/Resources
    3333    }
    34     if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
     34    if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
    3535        notes "Since MacPorts is configured to use the $build_arch architecture\
    3636where possible and the current version of pyglet only works when built for\
  • trunk/dports/python/py-pyqt4/Portfile

    r114324 r114328  
    180180            set conflags ""
    181181            foreach arch ${configure.universal_archs} {
    182                 if {${arch} == "i386"} {append conflags "x86 "} else {
    183                     if {${arch} == "ppc64"} {append conflags "ppc_64 "} else {
     182                if {${arch} eq "i386"} {append conflags "x86 "} else {
     183                    if {${arch} eq "ppc64"} {append conflags "ppc_64 "} else {
    184184                        append conflags ${arch} " "
    185185                    }
  • trunk/dports/ruby/rb-cocoa/Portfile

    r104085 r114328  
    3838        }
    3939} else {
    40         if {[info exists build_arch] && $build_arch != ""} {
     40        if {[info exists build_arch] && ${build_arch} ne ""} {
    4141                configure.args-append --target-archs="${build_arch}"
    4242        }
  • trunk/dports/science/afni/Portfile

    r102822 r114328  
    5757
    5858if {${os.major} == 9} {
    59     if {${configure.build_arch} == "x86_64"} {
     59    if {${configure.build_arch} eq "x86_64"} {
    6060        set combination macosx_10.5_Intel_64
    6161    }
    62     if {${configure.build_arch} == "i386"}  {
     62    if {${configure.build_arch} eq "i386"}  {
    6363        set combination macosx_10.5_Intel
    6464    }
    65     if {${configure.build_arch} == "ppc64"} {
     65    if {${configure.build_arch} eq "ppc64"} {
    6666        set combination macosx_10.5_G5
    6767    }
    68     if {${configure.build_arch} == "ppc"} {
     68    if {${configure.build_arch} eq "ppc"} {
    6969        set combination macosx_10.5_G4
    7070    }
     
    7272
    7373if {${os.major} == 8} {
    74     if {${configure.build_arch} == "i386"}  {
     74    if {${configure.build_arch} eq "i386"}  {
    7575        set combination macosx_10.4_Intel
    7676    }
    77     if {${configure.build_arch} == "ppc64"} {
     77    if {${configure.build_arch} eq "ppc64"} {
    7878        set combination macosx_10.4_G5
    7979    }
    80     if {${configure.build_arch} == "ppc"} {
     80    if {${configure.build_arch} eq "ppc"} {
    8181        set combination macosx_10.4
    8282    }
  • trunk/dports/science/arb/Portfile

    r110645 r114328  
    5656
    5757configure               {
    58                         if {${build_arch} == "ppc" || ${build_arch} == "i386"} {
     58                        if {${build_arch} eq "ppc" || ${build_arch} eq "i386"} {
    5959                            set is64bit 0
    6060                        } else {
  • trunk/dports/science/ds9/Portfile

    r112612 r114328  
    7979}
    8080
    81 if {${configure.build_arch} == "ppc"} {
     81if {${configure.build_arch} eq "ppc"} {
    8282    set ds9arch ppc
    8383}
    84 if {${configure.build_arch} == "ppc64"} {
     84if {${configure.build_arch} eq "ppc64"} {
    8585    set ds9arch ppc
    8686}
    87 if {${configure.build_arch} == "i386"} {
     87if {${configure.build_arch} eq "i386"} {
    8888    set ds9arch x86
    8989}
    90 if {${configure.build_arch} == "x86_64"} {
     90if {${configure.build_arch} eq "x86_64"} {
    9191    set ds9arch 64x86
    9292}
  • trunk/dports/science/netcdf-fortran/Portfile

    r112961 r114328  
    3131
    3232# Fortran compilers can not cross-compile
    33 if {${os.arch} == "i386"} {
     33if {${os.arch} eq "i386"} {
    3434    set universal_archs_supported "i386 x86_64"
    3535} else {
  • trunk/dports/science/rasmol/Portfile

    r108156 r114328  
    2424patchfiles          patch-Imakefile.diff \
    2525                    rasmol.h.diff
    26 if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
     26if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
    2727    patchfiles-append longlong.diff
    2828}
  • trunk/dports/science/raxml/Portfile

    r110781 r114328  
    5555
    5656#For Intel machines add SSE and AVX as a variant and use it by default with pthreads
    57 if {${build_arch} == "i386" || ${build_arch} == "x86_64"} {
     57if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
    5858    variant sse3 conflicts avx description {Use the SSE3 extended instruction set from Intel since 2004} {
    5959        set EXTm ".SSE3"
  • trunk/dports/science/root/Portfile

    r114191 r114328  
    5555        --with-f77=${configure.f77}
    5656    # the build type (32 or 64 bit) -must- be for first argument
    57     if {${build_arch} == "i386" || ${build_arch} == "ppc"} {
     57    if {${build_arch} eq "i386" || ${build_arch} eq "ppc"} {
    5858        configure.pre_args macosx --prefix=${prefix}
    5959    } else {
  • trunk/dports/science/vapor/Portfile

    r113459 r114328  
    4747    reinplace "s|QT_LIB_PATH = |QT_LIB_PATH=${prefix}/lib/qt3/lib|" ${worksrcpath}/options.mk
    4848    reinplace "s|BUILD_AMR_SUPPORT = 0|BUILD_AMR_SUPPORT = 1|" ${worksrcpath}/options.mk
    49     if {${build_arch}=="x86_64"} {
     49    if {${build_arch} eq "x86_64"} {
    5050        set f [open ${worksrcpath}/site.mk "w"]
    5151        puts $f "MACHTYPE=x86_64"
  • trunk/dports/security/botan/Portfile

    r114325 r114328  
    3636
    3737if {[info exists build_arch] && ${os.platform} eq "darwin"} {
    38     if {(${build_arch} == "i386")} {
     38    if {(${build_arch} eq "i386")} {
    3939        configure.args-append --cpu=ia32
    4040        build.args CXX="${configure.cxx} -m32"
    41     } elseif {(${build_arch} == "x86_64")} {
     41    } elseif {(${build_arch} eq "x86_64")} {
    4242        configure.args-append --cpu=amd64
    4343        build.args CXX="${configure.cxx} -m64"
    44     } elseif {(${build_arch} == "ppc")} {
     44    } elseif {(${build_arch} eq "ppc")} {
    4545        configure.args-append --cpu=ppc
    4646        build.args CXX="${configure.cxx} -m32"
    47     } elseif {(${build_arch} == "ppc64")} {
     47    } elseif {(${build_arch} eq "ppc64")} {
    4848        configure.args-append --cpu=ppc64
    4949        build.args CXX="${configure.cxx} -m64"
  • trunk/dports/sysutils/memcached/Portfile

    r112927 r114328  
    3636    set merger_configure_args(ppc64)  --enable-64bit
    3737} else {
    38     if {[info exists build_arch] && (${build_arch} == "x86_64" || $build_arch == "ppc64")} {
     38    if {[info exists build_arch] && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
    3939                configure.args-append --enable-64bit
    4040    }
  • trunk/dports/textproc/libutf8proc/Portfile

    r80030 r114328  
    2727        configure.cflags-append ${configure.universal_cflags}
    2828}
    29 if {![variant_isset universal] && ${build_arch} != ""} {
     29if {![variant_isset universal] && ${build_arch} ne ""} {
    3030        configure.cflags-append ${configure.cc_archflags}
    3131}
  • trunk/dports/x11/libhangul/Portfile

    r95398 r114328  
    2020
    2121post-patch {
    22     if { ${os.arch} == "powerpc" } {
     22    if {${os.arch} eq "powerpc"} {
    2323            reinplace "s|__PLATFORM__|ppc|g" \
    2424                    ${worksrcpath}/test/hangul.c
  • trunk/dports/x11/mesa/Portfile

    r109643 r114328  
    110110    # https://trac.macports.org/ticket/24393
    111111    # https://trac.macports.org/ticket/29860
    112     if {${build_arch} == "ppc"} {
     112    if {${build_arch} eq "ppc"} {
    113113        patchfiles-append patch-src-mesa-Makefile.diff
    114114        post-patch {
  • trunk/dports/x11/qt3/Portfile

    r103820 r114328  
    113113        file attributes ${worksrcpath}/${file} -permissions 0755
    114114    }
    115     if {${os.major}>=10 && ${configure.build_arch} == "x86_64"} {
     115    if {${os.major} >= 10 && ${configure.build_arch} eq "x86_64"} {
    116116        system "perl -pi -e \"s,\\(int\\)owner\\, \\(int\\),\\(long\\)owner\\, \\(long\\),g\" ${worksrcpath}/src/tools/qmutex_unix.cpp"
    117117    }
  • trunk/dports/x11/quartz-wm/Portfile

    r102284 r114328  
    3434
    3535# http://trac.macports.org/ticket/33515
    36 if {${os.arch} == "powerpc"} {
     36if {${os.arch} eq "powerpc"} {
    3737    # This is sub-optimal, but it will work for now
    3838    post-patch {
  • trunk/dports/x11/tk/Portfile

    r114325 r114328  
    6161}
    6262
    63 if {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
     63if {${configure.build_arch} eq "x86_64" || ${configure.build_arch} eq "ppc64"} {
    6464    configure.args-append   --enable-64bit
    6565}
Note: See TracChangeset for help on using the changeset viewer.