[114328] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Thu Dec 5 02:21:53 PST 2013
Revision: 114328
https://trac.macports.org/changeset/114328
Author: ryandesign at macports.org
Date: 2013-12-05 02:21:52 -0800 (Thu, 05 Dec 2013)
Log 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
Modified Paths:
--------------
trunk/dports/benchmarks/nbench-byte/Portfile
trunk/dports/cross/arm-elf-gcc/Portfile
trunk/dports/cross/arm-elf-gcc3/Portfile
trunk/dports/cross/arm-none-eabi-gdb/Portfile
trunk/dports/cross/arm-none-linux-gnueabi-binutils/Portfile
trunk/dports/cross/arm-none-linux-gnueabi-gcc/Portfile
trunk/dports/cross/i386-mingw32-binutils/Portfile
trunk/dports/cross/i386-mingw32-gcc/Portfile
trunk/dports/cross/m68k-elf-gcc/Portfile
trunk/dports/cross/mips-elf-binutils/Portfile
trunk/dports/cross/mips-elf-gcc/Portfile
trunk/dports/cross/mipsel-linux-binutils/Portfile
trunk/dports/cross/mipsel-linux-gcc34/Portfile
trunk/dports/cross/sh-rtems-binutils/Portfile
trunk/dports/cross/sh-rtems-gcc/Portfile
trunk/dports/cross/sparc-rtems-gcc/Portfile
trunk/dports/databases/db46/Portfile
trunk/dports/databases/db47/Portfile
trunk/dports/databases/db48/Portfile
trunk/dports/databases/db51/Portfile
trunk/dports/databases/db52/Portfile
trunk/dports/databases/db53/Portfile
trunk/dports/devel/boost/Portfile
trunk/dports/devel/camlimages/Portfile
trunk/dports/devel/cctools/Portfile
trunk/dports/devel/cmake/Portfile
trunk/dports/devel/dbus/Portfile
trunk/dports/devel/globus-core/Portfile
trunk/dports/devel/gmp/Portfile
trunk/dports/devel/gnutls/Portfile
trunk/dports/devel/google-perftools/Portfile
trunk/dports/devel/icu/Portfile
trunk/dports/devel/judy/Portfile
trunk/dports/devel/ld64/Portfile
trunk/dports/devel/libgcrypt/Portfile
trunk/dports/devel/libgii/Portfile
trunk/dports/devel/libidl/Portfile
trunk/dports/devel/liboil/Portfile
trunk/dports/devel/nettle/Portfile
trunk/dports/devel/nusmv/Portfile
trunk/dports/devel/omniORB/Portfile
trunk/dports/devel/orbit2/Portfile
trunk/dports/devel/orc/Portfile
trunk/dports/devel/ossp-uuid/Portfile
trunk/dports/devel/plib/Portfile
trunk/dports/devel/valgrind/Portfile
trunk/dports/devel/valgrind-devel/Portfile
trunk/dports/fuse/fuse4x-kext/Portfile
trunk/dports/genealogy/geneweb/Portfile
trunk/dports/gnome/gstreamer010/Portfile
trunk/dports/gnome/gstreamer010-gst-ffmpeg/Portfile
trunk/dports/gnome/gstreamer010-gst-plugins-bad/Portfile
trunk/dports/gnome/gstreamer010-gst-plugins-base/Portfile
trunk/dports/gnome/gstreamer010-gst-plugins-gl/Portfile
trunk/dports/gnome/gstreamer010-gst-plugins-good/Portfile
trunk/dports/gnome/gstreamer010-gst-plugins-ugly/Portfile
trunk/dports/gnome/gstreamer1/Portfile
trunk/dports/gnome/gstreamer1-gst-libav/Portfile
trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile
trunk/dports/gnome/gstreamer1-gst-plugins-base/Portfile
trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile
trunk/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile
trunk/dports/graphics/exempi/Portfile
trunk/dports/graphics/gegl/Portfile
trunk/dports/graphics/gimp-gap/Portfile
trunk/dports/graphics/gimp2/Portfile
trunk/dports/graphics/lensfun/Portfile
trunk/dports/graphics/libemf/Portfile
trunk/dports/graphics/vlfeat/Portfile
trunk/dports/kde/kdevelop/Portfile
trunk/dports/kde/kdevplatform/Portfile
trunk/dports/lang/apple-gcc42/Portfile
trunk/dports/lang/ccl/Portfile
trunk/dports/lang/dmd-doc/Portfile
trunk/dports/lang/dmd-tools/Portfile
trunk/dports/lang/druntime/Portfile
trunk/dports/lang/eero-devel/Portfile
trunk/dports/lang/eiffelstudio70/Portfile
trunk/dports/lang/eiffelstudio71/Portfile
trunk/dports/lang/eiffelstudio72/Portfile
trunk/dports/lang/eiffelstudio73/Portfile
trunk/dports/lang/erlang/Portfile
trunk/dports/lang/factor/Portfile
trunk/dports/lang/g95/Portfile
trunk/dports/lang/gcc42/Portfile
trunk/dports/lang/gcc45/Portfile
trunk/dports/lang/gforth/Portfile
trunk/dports/lang/guile/Portfile
trunk/dports/lang/llvm-2.9/Portfile
trunk/dports/lang/llvm-3.0/Portfile
trunk/dports/lang/llvm-3.1/Portfile
trunk/dports/lang/llvm-3.2/Portfile
trunk/dports/lang/llvm-3.3/Portfile
trunk/dports/lang/llvm-3.4/Portfile
trunk/dports/lang/llvm-gcc42/Portfile
trunk/dports/lang/omnixmp/Portfile
trunk/dports/lang/phobos/Portfile
trunk/dports/lang/python26/Portfile
trunk/dports/lang/python31/Portfile
trunk/dports/lang/python32/Portfile
trunk/dports/lang/python33/Portfile
trunk/dports/lang/python34/Portfile
trunk/dports/lang/ruby/Portfile
trunk/dports/lang/ruby186/Portfile
trunk/dports/lang/ruby19/Portfile
trunk/dports/lang/ruby20/Portfile
trunk/dports/lang/upc/Portfile
trunk/dports/lang/yap/Portfile
trunk/dports/lang/yap-devel/Portfile
trunk/dports/math/OpenBLAS/Portfile
trunk/dports/math/arpack/Portfile
trunk/dports/math/atlas/Portfile
trunk/dports/math/fftw-3/Portfile
trunk/dports/math/maxima/Portfile
trunk/dports/math/pari/Portfile
trunk/dports/math/qrupdate/Portfile
trunk/dports/multimedia/MPlayer/Portfile
trunk/dports/multimedia/ffmpeg/Portfile
trunk/dports/multimedia/ffmpeg-devel/Portfile
trunk/dports/multimedia/mlt/Portfile
trunk/dports/multimedia/mplayer-devel/Portfile
trunk/dports/multimedia/x264/Portfile
trunk/dports/net/dynamips/Portfile
trunk/dports/net/dynamips-devel/Portfile
trunk/dports/net/nss/Portfile
trunk/dports/print/freetype/Portfile
trunk/dports/python/py-numpy/Portfile
trunk/dports/python/py-psyco/Portfile
trunk/dports/python/py-pyglet/Portfile
trunk/dports/python/py-pyqt4/Portfile
trunk/dports/ruby/rb-cocoa/Portfile
trunk/dports/science/afni/Portfile
trunk/dports/science/arb/Portfile
trunk/dports/science/ds9/Portfile
trunk/dports/science/netcdf-fortran/Portfile
trunk/dports/science/rasmol/Portfile
trunk/dports/science/raxml/Portfile
trunk/dports/science/root/Portfile
trunk/dports/science/vapor/Portfile
trunk/dports/security/botan/Portfile
trunk/dports/sysutils/memcached/Portfile
trunk/dports/textproc/libutf8proc/Portfile
trunk/dports/x11/libhangul/Portfile
trunk/dports/x11/mesa/Portfile
trunk/dports/x11/qt3/Portfile
trunk/dports/x11/quartz-wm/Portfile
trunk/dports/x11/tk/Portfile
Modified: trunk/dports/benchmarks/nbench-byte/Portfile
===================================================================
--- trunk/dports/benchmarks/nbench-byte/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/benchmarks/nbench-byte/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -43,7 +43,7 @@
ui_msg "that you start nbench from."
}
-if {$build_arch != ""} {
+if {${build_arch} ne ""} {
build.env-append CFLAGS="${configure.cc_archflags}"
}
Modified: trunk/dports/cross/arm-elf-gcc/Portfile
===================================================================
--- trunk/dports/cross/arm-elf-gcc/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/arm-elf-gcc/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -177,7 +177,7 @@
configure.cxx_archflags
configure.objc_archflags
configure.ld_archflags
-if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
+if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
configure.args-append --build=${build_arch}-apple-darwin${os.major}
}
Modified: trunk/dports/cross/arm-elf-gcc3/Portfile
===================================================================
--- trunk/dports/cross/arm-elf-gcc3/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/arm-elf-gcc3/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -99,7 +99,7 @@
configure.cxx_archflags
configure.objc_archflags
configure.ld_archflags
-if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
+if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.version} \
--host=${build_arch}-apple-${os.platform}${os.version} \
}
Modified: trunk/dports/cross/arm-none-eabi-gdb/Portfile
===================================================================
--- trunk/dports/cross/arm-none-eabi-gdb/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/arm-none-eabi-gdb/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -29,7 +29,7 @@
# TODO: Why? Ticket URL?
compiler.blacklist *clang*
-if {${configure.build_arch} == "ppc" || ${configure.build_arch} == "ppc64"} {
+if {${configure.build_arch} eq "ppc" || ${configure.build_arch} eq "ppc64"} {
notes "${name} does not support building on ${configure.build_arch}."
pre-fetch {
ui_error "${name} does not support building on ${configure.build_arch}."
Modified: trunk/dports/cross/arm-none-linux-gnueabi-binutils/Portfile
===================================================================
--- trunk/dports/cross/arm-none-linux-gnueabi-binutils/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/arm-none-linux-gnueabi-binutils/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -40,7 +40,7 @@
configure.args --infodir='${prefix}/share/info' --target=${crossgcc-target} \
--program-prefix=${crossgcc-target}- --mandir='${prefix}/share/man' --with-sysroots \
--disable-werror
-if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
+if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
configure.args-append --build=${build_arch}-apple-darwin${os.version} \
--host=${build_arch}-apple-darwin${os.version}
}
Modified: trunk/dports/cross/arm-none-linux-gnueabi-gcc/Portfile
===================================================================
--- trunk/dports/cross/arm-none-linux-gnueabi-gcc/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/arm-none-linux-gnueabi-gcc/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -82,7 +82,7 @@
configure.cxx_archflags
configure.objc_archflags
configure.ld_archflags
-if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
+if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
configure.args-append --build=${build_arch}-apple-darwin${os.version} \
--host=${build_arch}-apple-darwin${os.version}
}
Modified: trunk/dports/cross/i386-mingw32-binutils/Portfile
===================================================================
--- trunk/dports/cross/i386-mingw32-binutils/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/i386-mingw32-binutils/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -32,7 +32,7 @@
configure.args --infodir='${prefix}/share/info' --target=${crossgcc-target} \
--program-prefix=${crossgcc-target}- --mandir='${prefix}/share/man' \
--disable-werror
-if {${os.platform} eq "darwin" && $build_arch != ""} {
+if {${os.platform} eq "darwin" && ${build_arch} ne ""} {
configure.args-append --build=${build_arch}-apple-darwin${os.major}
}
# Append CPPFLAGS to CFLAGS and CXXFLAGS as CPPFLAGS seems to be ignored
Modified: trunk/dports/cross/i386-mingw32-gcc/Portfile
===================================================================
--- trunk/dports/cross/i386-mingw32-gcc/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/i386-mingw32-gcc/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -71,7 +71,7 @@
--disable-multilib \
--with-gxx-include-dir=${prefix}/${crossgcc-target}/include/c++/${gnu_version}/ \
--enable-sjlj-exceptions
-if {$build_arch != ""} {
+if {${build_arch} ne ""} {
configure.cc_archflags
configure.cxx_archflags
configure.objc_archflags
Modified: trunk/dports/cross/m68k-elf-gcc/Portfile
===================================================================
--- trunk/dports/cross/m68k-elf-gcc/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/m68k-elf-gcc/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -92,7 +92,7 @@
configure.cxx_archflags
configure.objc_archflags
configure.ld_archflags
-if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
+if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.version} \
--host=${build_arch}-apple-${os.platform}${os.version}
}
Modified: trunk/dports/cross/mips-elf-binutils/Portfile
===================================================================
--- trunk/dports/cross/mips-elf-binutils/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/mips-elf-binutils/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -41,7 +41,7 @@
--disable-werror
platform darwin {
- if {$build_arch == "i386"} {
+ if {${build_arch} eq "i386"} {
configure.args-append --build=i686-apple-${os.platform}${os.version} \
--host=i686-apple-${os.platform}${os.version}
} else {
Modified: trunk/dports/cross/mips-elf-gcc/Portfile
===================================================================
--- trunk/dports/cross/mips-elf-gcc/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/mips-elf-gcc/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -92,7 +92,7 @@
configure.objc_archflags
configure.ld_archflags
platform darwin {
- if {$build_arch == "i386"} {
+ if {${build_arch} eq "i386"} {
configure.args-append --build=i686-apple-${os.platform}${os.version} \
--host=i686-apple-${os.platform}${os.version}
} else {
Modified: trunk/dports/cross/mipsel-linux-binutils/Portfile
===================================================================
--- trunk/dports/cross/mipsel-linux-binutils/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/mipsel-linux-binutils/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -41,7 +41,7 @@
--with-float=soft
platform darwin {
- if {$build_arch == "i386"} {
+ if {${build_arch} eq "i386"} {
configure.args-append --build=i686-apple-darwin${os.major} \
--host=i686-apple-darwin${os.major}
} else {
Modified: trunk/dports/cross/mipsel-linux-gcc34/Portfile
===================================================================
--- trunk/dports/cross/mipsel-linux-gcc34/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/mipsel-linux-gcc34/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -56,7 +56,7 @@
--with-float=soft
platform darwin {
- if {$build_arch == "i386"} {
+ if {${build_arch} eq "i386"} {
configure.args-append --build=i686-apple-darwin${os.major} \
--host=i686-apple-darwin${os.major}
} else {
Modified: trunk/dports/cross/sh-rtems-binutils/Portfile
===================================================================
--- trunk/dports/cross/sh-rtems-binutils/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/sh-rtems-binutils/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -54,7 +54,7 @@
configure.args --infodir='${prefix}/share/info' --target=${crossgcc-target} \
--program-prefix=${crossgcc-target}- --mandir='${prefix}/share/man' \
--disable-werror
-if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
+if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
configure.args-append --build=${build_arch}-apple-darwin${os.version}
}
build.dir ${workpath}/build
Modified: trunk/dports/cross/sh-rtems-gcc/Portfile
===================================================================
--- trunk/dports/cross/sh-rtems-gcc/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/sh-rtems-gcc/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -102,7 +102,7 @@
--with-newlib \
--with-gxx-include-dir=${prefix}/${crossgcc-target}/include/c++/${version}/ \
${default-languages}
-if {${os.platform} eq "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
+if {${os.platform} eq "darwin" && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
configure.args-append --build=${build_arch}-apple-darwin${os.version} \
--host=${build_arch}-apple-darwin${os.version}
}
Modified: trunk/dports/cross/sparc-rtems-gcc/Portfile
===================================================================
--- trunk/dports/cross/sparc-rtems-gcc/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/cross/sparc-rtems-gcc/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -105,7 +105,7 @@
configure.objc_archflags
configure.ld_archflags
platform darwin {
- if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+ if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.version} \
--host=${build_arch}-apple-${os.platform}${os.version}
}
Modified: trunk/dports/databases/db46/Portfile
===================================================================
--- trunk/dports/databases/db46/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/databases/db46/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -177,7 +177,7 @@
}
if { [variant_isset universal] } {
- if { ${os.arch}=="i386" } {
+ if {${os.arch} eq "i386"} {
if { ${os.major} >= 10 } {
set merger_configure_args(ppc) --with-mutex=Darwin/_spin_lock_try
}
Modified: trunk/dports/databases/db47/Portfile
===================================================================
--- trunk/dports/databases/db47/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/databases/db47/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -103,7 +103,7 @@
}
if { [variant_isset universal] } {
- if { ${os.arch}=="i386" } {
+ if {${os.arch} eq "i386"} {
if { ${os.major} >= 10 } {
set merger_configure_args(ppc) --with-mutex=Darwin/_spin_lock_try
}
Modified: trunk/dports/databases/db48/Portfile
===================================================================
--- trunk/dports/databases/db48/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/databases/db48/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -73,7 +73,7 @@
}
if { [variant_isset universal] } {
- if { ${os.arch}=="i386" } {
+ if {${os.arch} eq "i386"} {
if { ${os.major} >= 10 } {
set merger_configure_args(ppc) --with-mutex=Darwin/_spin_lock_try
}
Modified: trunk/dports/databases/db51/Portfile
===================================================================
--- trunk/dports/databases/db51/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/databases/db51/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -101,7 +101,7 @@
}
if { [variant_isset universal] } {
- if { ${os.arch}=="i386" } {
+ if {${os.arch} eq "i386"} {
if { ${os.major} >= 10 } {
set merger_configure_args(ppc) --with-mutex=Darwin/_spin_lock_try
}
Modified: trunk/dports/databases/db52/Portfile
===================================================================
--- trunk/dports/databases/db52/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/databases/db52/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -99,7 +99,7 @@
}
if { [variant_isset universal] } {
- if { ${os.arch}=="i386" } {
+ if {${os.arch} eq "i386"} {
if { ${os.major} >= 10 } {
set merger_configure_args(ppc) --with-mutex=Darwin/_spin_lock_try
}
Modified: trunk/dports/databases/db53/Portfile
===================================================================
--- trunk/dports/databases/db53/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/databases/db53/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -90,7 +90,7 @@
}
if { [variant_isset universal] } {
- if { ${os.arch}=="i386" } {
+ if {${os.arch} eq "i386"} {
if { ${os.major} >= 10 } {
set merger_configure_args(ppc) --with-mutex=Darwin/_spin_lock_try
}
Modified: trunk/dports/devel/boost/Portfile
===================================================================
--- trunk/dports/devel/boost/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/boost/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -283,7 +283,7 @@
# Honour 'build_arch', if not universal as per #28327
if {[lsearch ${build_arch} ppc*] != -1} {
build.args-append architecture=power
- if {${os.arch} != "powerpc"} {
+ if {${os.arch} ne "powerpc"} {
build.args-append --disable-long-double
}
} else {
@@ -312,7 +312,7 @@
build.args-append architecture=power
}
- if {${os.arch} != "powerpc"} {
+ if {${os.arch} ne "powerpc"} {
build.args-append --disable-long-double
}
} else {
Modified: trunk/dports/devel/camlimages/Portfile
===================================================================
--- trunk/dports/devel/camlimages/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/camlimages/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -33,7 +33,7 @@
worksrcdir camlspotter-${name}-c803efa9d5d3
use_configure no
-if {$build_arch == "i386" || $build_arch == "ppc"} {
+if {${build_arch} eq "i386" || ${build_arch} eq "ppc"} {
configure.ld_archflags -m32
} else {
configure.ld_archflags -m64
Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/cctools/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -30,7 +30,7 @@
variant universal {}
-if {${os.arch} == "powerpc" || ${os.major} < 9} {
+if {${os.arch} eq "powerpc" || ${os.major} < 9} {
# XCode 4.1
version 806
revision 2
Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/cmake/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -44,9 +44,9 @@
# Leopard's Rosetta has some difficulties configuring the ppc slice
platform darwin 9 {
global universal_archs_supported
- if {${build_arch} == "i386" || ${build_arch} == "x86_64"} {
+ if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
supported_archs i386 x86_64
- } elseif {${build_arch} == "ppc" || ${build_arch} == "ppc64"} {
+ } elseif {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
supported_archs ppc ppc64
}
set universal_archs_supported ${supported_archs}
Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/dbus/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -212,7 +212,7 @@
}
set cross_opts "ac_cv_have_abstract_sockets=no"
-if { ${os.arch}=="i386" } {
+if {${os.arch} eq "i386"} {
if { ${os.major} >= 10 } {
set merger_configure_env(ppc) ${cross_opts}
}
Modified: trunk/dports/devel/globus-core/Portfile
===================================================================
--- trunk/dports/devel/globus-core/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/globus-core/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -1,7 +1,7 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
-if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
set flavor gcc64pthr
set enable64 yes
} else {
Modified: trunk/dports/devel/gmp/Portfile
===================================================================
--- trunk/dports/devel/gmp/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/gmp/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -61,7 +61,7 @@
test.target check
if {![variant_isset universal]} {
- if {${build_arch} == "x86_64"} {
+ if {${build_arch} eq "x86_64"} {
configure.env ABI=64
# fails to correctly detect some x86_64 models
pre-configure {
@@ -72,7 +72,7 @@
configure.args-append --build=x86_64-[join [lrange $build_triplet 1 end] -]
}
}
- } elseif {${build_arch} == "ppc64"} {
+ } elseif {${build_arch} eq "ppc64"} {
configure.env ABI=mode64
} else {
configure.env ABI=32
@@ -97,9 +97,9 @@
proc muniversal_get_arch_flag {arch {fortran ""}} {
global os.arch
- if { ${os.arch}=="i386" && (${arch}=="i386" || ${arch}=="x86_64") } {
+ if {${os.arch} eq "i386" && (${arch} eq "i386" || ${arch} eq "x86_64")} {
set archf ""
- } elseif { ${os.arch}=="powerpc" && (${arch}=="ppc" && ${arch}=="ppc64") } {
+ } elseif {${os.arch} eq "powerpc" && (${arch} eq "ppc" && ${arch} eq "ppc64")} {
set archf ""
} else {
set archf "-arch ${arch}"
@@ -118,7 +118,7 @@
}
# For cross-compiling, set C compiler and pre-processor.
- if { ${os.arch}=="i386" } {
+ if {${os.arch} eq "i386"} {
if { ${os.major} >= 10 } {
lappend merger_configure_env(ppc) CC_FOR_BUILD=${configure.cc} CPP_FOR_BUILD=${configure.cpp}
}
Modified: trunk/dports/devel/gnutls/Portfile
===================================================================
--- trunk/dports/devel/gnutls/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/gnutls/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -56,11 +56,11 @@
set merger_host(i386) i686-apple-${os.platform}${os.major}
set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "i386"} {
+} elseif {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "x86_64"} {
+} elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
Modified: trunk/dports/devel/google-perftools/Portfile
===================================================================
--- trunk/dports/devel/google-perftools/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/google-perftools/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -23,7 +23,7 @@
rmd160 565943c6e6ca4e7cc318d98d46dcf757f7486bd3
# http://code.google.com/p/google-perftools/issues/detail?id=66
-if {![variant_isset universal] && $build_arch == "x86_64" ||
+if {![variant_isset universal] && ${build_arch} eq "x86_64" ||
[variant_isset universal] && [string match *x86_64* $universal_archs]} {
configure.args-append --enable-frame-pointers \
--build=x86_64-apple-${os.platform}${os.major}
Modified: trunk/dports/devel/icu/Portfile
===================================================================
--- trunk/dports/devel/icu/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/icu/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -53,9 +53,9 @@
set 32bit 1
}
foreach a $universal_archs_to_use {
- if {($32bit && ($a == "x86_64" || $a == "ppc64"))
- || (${os.arch} == "powerpc" && ($a == "x86_64" || $a == "i386"))
- || (${os.arch} == "i386" && ($a == "ppc" || $a == "ppc64"))} {
+ if {($32bit && ($a eq "x86_64" || $a eq "ppc64"))
+ || (${os.arch} eq "powerpc" && ($a eq "x86_64" || $a eq "i386"))
+ || (${os.arch} eq "i386" && ($a eq "ppc" || $a eq "ppc64"))} {
set cross 1
set merger_configure_args($a) --with-cross-build=${crosspath}
}
Modified: trunk/dports/devel/judy/Portfile
===================================================================
--- trunk/dports/devel/judy/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/judy/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -26,9 +26,9 @@
configure.args --mandir=${prefix}/share/man
-if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
configure.args-append --enable-64-bit
-} elseif {$build_arch == "i386" || $build_arch == "ppc"} {
+} elseif {${build_arch} eq "i386" || ${build_arch} eq "ppc"} {
configure.args-append --enable-32-bit
}
Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/ld64/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -35,7 +35,7 @@
default_variants +llvm33
# Leopard/powerpc has the option to not be LTO
- if {![variant_isset llvm33] && ${os.arch} != "powerpc"} {
+ if {![variant_isset llvm33] && ${os.arch} ne "powerpc"} {
ui_error "Your platform cannot be configured without LTO support in ld64. Please enable one of the llvmXX variants, and try again."
return -code error "Your platform cannot be configured without LTO support in ld64. Please enable one of the llvmXX variants, and try again."
}
@@ -76,7 +76,7 @@
set makefile "Makefile-133"
-if {${os.arch} == "powerpc" || ${os.major} < 9} {
+if {${os.arch} eq "powerpc" || ${os.major} < 9} {
# XCode 3.2.6
# 127.2 should work for powerpc, but it will require some build fixes.
version 97.17
Modified: trunk/dports/devel/libgcrypt/Portfile
===================================================================
--- trunk/dports/devel/libgcrypt/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/libgcrypt/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -46,7 +46,7 @@
# rijndael.c: In function 'do_aesni_ctr':
# rijndael.c:895: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
# rijndael.c:895: error: 'asm' operand has impossible constraints
-if {${build_arch} == "i386" || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1)} {
+if {${build_arch} eq "i386" || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1)} {
if {[vercmp ${xcodeversion} 3.0] >= 0} {
compiler.blacklist-append gcc-4.0
}
Modified: trunk/dports/devel/libgii/Portfile
===================================================================
--- trunk/dports/devel/libgii/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/libgii/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -39,7 +39,7 @@
configure.args --mandir=${prefix}/share/man
-if {$build_arch == "x86_64" && ${os.platform} eq "darwin"} {
+if {${build_arch} eq "x86_64" && ${os.platform} eq "darwin"} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
}
if {([variant_isset universal] && [string match *64* $universal_archs])
Modified: trunk/dports/devel/libidl/Portfile
===================================================================
--- trunk/dports/devel/libidl/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/libidl/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -41,7 +41,7 @@
port:gettext
# Required when cross-compiling.
-if { ${os.arch}=="i386" } {
+if { ${os.arch} eq "i386" } {
if { ${os.major} >= 10 } {
set merger_configure_env(ppc) libIDL_cv_long_long_format=ll
}
Modified: trunk/dports/devel/liboil/Portfile
===================================================================
--- trunk/dports/devel/liboil/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/liboil/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -35,10 +35,10 @@
if {[variant_isset universal]} {
set merger_host(i386) i686-apple-${os.platform}${os.major}
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "i386"} {
+} elseif {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "x86_64"} {
+} elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major}
}
Modified: trunk/dports/devel/nettle/Portfile
===================================================================
--- trunk/dports/devel/nettle/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/nettle/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -47,11 +47,11 @@
set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
} else {
- if {${build_arch} == "i386"} {
+ if {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
Modified: trunk/dports/devel/nusmv/Portfile
===================================================================
--- trunk/dports/devel/nusmv/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/nusmv/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -38,7 +38,7 @@
pre-configure {
# build included cudd first so that configure can pick it up
- if {$build_arch == "x86_64"} {
+ if {${build_arch} eq "x86_64"} {
system -W ${worksrcpath}/cudd-2.4.1.1 "mv Makefile_os_x_64bit Makefile_os_x"
}
system -W ${worksrcpath}/cudd-2.4.1.1 "make -f Makefile_os_x CPP=${configure.cxx} CC=${configure.cc} ICFLAGS=\"${configure.cc_archflags}\""
Modified: trunk/dports/devel/omniORB/Portfile
===================================================================
--- trunk/dports/devel/omniORB/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/omniORB/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -42,7 +42,7 @@
--with-omniORB-config="${prefix}/etc/omniORB.cfg" \
--with-omniNames-logdir="${prefix}/var"
-if {$build_arch == "x86_64" && ${os.platform} eq "darwin"} {
+if {${build_arch} eq "x86_64" && ${os.platform} eq "darwin"} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
}
Modified: trunk/dports/devel/orbit2/Portfile
===================================================================
--- trunk/dports/devel/orbit2/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/orbit2/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -46,7 +46,7 @@
if { [variant_isset universal] } {
# Find architectures which will not run on build platform.
- if { ${os.arch}=="i386" } {
+ if { ${os.arch} eq "i386" } {
if { ${os.major} >= 10 } {
set cross_archs "ppc ppc64"
} else {
@@ -72,7 +72,7 @@
--with-idl-compiler=${worksrcpath}-${run_arch}/src/idl-compiler/orbit-idl-2
}
- if { ${os.arch}=="i386" } {
+ if { ${os.arch} eq "i386" } {
if { ${os.major} >= 10 } {
lappend merger_configure_env(ppc) \
ac_cv_alignof_CORBA_boolean=1 \
Modified: trunk/dports/devel/orc/Portfile
===================================================================
--- trunk/dports/devel/orc/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/orc/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -21,7 +21,7 @@
#-fgcse (from -O2) causes build failures, but -O2 -fno-gcse doesn't seem to work
if {[string match "*gcc-4.2" ${configure.compiler}]} {
lappend merger_configure_cflags(i386) -O1 -fexpensive-optimizations
- if {![variant_isset universal] && ${build_arch} == "i386"} {
+ if {![variant_isset universal] && ${build_arch} eq "i386"} {
configure.cflags-delete -O2
configure.cflags-append -O1 -fexpensive-optimizations
}
Modified: trunk/dports/devel/ossp-uuid/Portfile
===================================================================
--- trunk/dports/devel/ossp-uuid/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/ossp-uuid/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -28,7 +28,7 @@
--includedir=${prefix}/include/ossp
if {[variant_isset universal]} {
- if { ${os.arch} == "i386" } {
+ if { ${os.arch} eq "i386" } {
if { ${os.major} >= 10 } {
set merger_configure_env(ppc) ac_cv_va_copy=yes
}
Modified: trunk/dports/devel/plib/Portfile
===================================================================
--- trunk/dports/devel/plib/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/plib/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -34,7 +34,7 @@
}
configure.args --with-x
-if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
# these components currently use carbon
configure.args-append --disable-sl --disable-pw
}
Modified: trunk/dports/devel/valgrind/Portfile
===================================================================
--- trunk/dports/devel/valgrind/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/valgrind/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -44,9 +44,9 @@
configure.args --mandir=${prefix}/share/man \
--without-mpicc
-if {$build_arch == "i386"} {
+if {${build_arch} eq "i386"} {
configure.args-append --enable-only32bit
-} elseif {$build_arch == "x86_64"} {
+} elseif {${build_arch} eq "x86_64"} {
configure.args-append --enable-only64bit
}
@@ -61,7 +61,7 @@
configure.universal_ldflags {}
pre-configure {
- if {$build_arch == "i386"} {
+ if {${build_arch} eq "i386"} {
# See #25684 and https://bugs.kde.org/show_bug.cgi?id=243362
ui_error "valgrind does not build +universal on a 32-bit only CPU!"
return -code error "unsupported CPU"
Modified: trunk/dports/devel/valgrind-devel/Portfile
===================================================================
--- trunk/dports/devel/valgrind-devel/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/devel/valgrind-devel/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -37,9 +37,9 @@
configure.args --mandir=${prefix}/share/man \
--without-mpicc
-if {$build_arch == "i386"} {
+if {${build_arch} eq "i386"} {
configure.args-append --enable-only32bit
-} elseif {$build_arch == "x86_64"} {
+} elseif {${build_arch} eq "x86_64"} {
configure.args-append --enable-only64bit
}
@@ -54,7 +54,7 @@
configure.universal_ldflags {}
pre-configure {
- if {$build_arch == "i386"} {
+ if {${build_arch} eq "i386"} {
# See #25684 and https://bugs.kde.org/show_bug.cgi?id=243362
ui_error "valgrind does not build +universal on a 32-bit only CPU!"
return -code error "unsupported CPU"
Modified: trunk/dports/fuse/fuse4x-kext/Portfile
===================================================================
--- trunk/dports/fuse/fuse4x-kext/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/fuse/fuse4x-kext/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -39,7 +39,7 @@
# binary by default on Intel platforms. On PPC, there's only one
# kernel, so don't try to build it ppc64 or universal.
supported_archs i386 x86_64 ppc
-if {$build_arch == "i386" || $build_arch == "x86_64"} {
+if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
default_variants +universal
}
Modified: trunk/dports/genealogy/geneweb/Portfile
===================================================================
--- trunk/dports/genealogy/geneweb/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/genealogy/geneweb/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -44,7 +44,7 @@
startupitem.pidfile none
platform darwin {
- if {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
+ if {${configure.build_arch} eq "x86_64" || ${configure.build_arch} eq "ppc64"} {
patchfiles-append patch-64-bit
}
}
Modified: trunk/dports/gnome/gstreamer010/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer010/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/gnome/gstreamer010/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -56,11 +56,11 @@
# g-ir-scanner does not honor CFLAGS
configure.args-append --disable-introspection
-} elseif {${build_arch} == "i386"} {
+} elseif {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "x86_64"} {
+} elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
Modified: trunk/dports/gnome/gstreamer010-gst-ffmpeg/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer010-gst-ffmpeg/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/gnome/gstreamer010-gst-ffmpeg/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -60,7 +60,7 @@
set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=i686\""
set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=ppc\""
set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=ppc64\""
-} elseif {${build_arch} == "i386"} {
+} elseif {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major} \
Modified: trunk/dports/gnome/gstreamer010-gst-plugins-bad/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer010-gst-plugins-bad/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/gnome/gstreamer010-gst-plugins-bad/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -124,11 +124,11 @@
set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
configure.args-append \
--disable-osx_video
-} elseif {${build_arch} == "i386"} {
+} elseif {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "x86_64"} {
+} elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
Modified: trunk/dports/gnome/gstreamer010-gst-plugins-base/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer010-gst-plugins-base/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/gnome/gstreamer010-gst-plugins-base/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -92,7 +92,7 @@
#-fgcse (from -O2) causes build failures, but -O2 -fno-gcse doesn't seem to work
if {[string match "*gcc-4.2" ${configure.compiler}]} {
lappend merger_configure_cflags(i386) -O1 -fexpensive-optimizations
- if {![variant_isset universal] && ${build_arch} == "i386"} {
+ if {![variant_isset universal] && ${build_arch} eq "i386"} {
configure.cflags-delete -O2
configure.cflags-append -O1 -fexpensive-optimizations
}
@@ -103,11 +103,11 @@
set merger_host(i386) i686-apple-${os.platform}${os.major}
set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "i386"} {
+} elseif {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "x86_64"} {
+} elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
Modified: trunk/dports/gnome/gstreamer010-gst-plugins-gl/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer010-gst-plugins-gl/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/gnome/gstreamer010-gst-plugins-gl/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -61,11 +61,11 @@
set merger_host(i386) i686-apple-${os.platform}${os.major}
set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "i386"} {
+} elseif {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "x86_64"} {
+} elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
Modified: trunk/dports/gnome/gstreamer010-gst-plugins-good/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer010-gst-plugins-good/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/gnome/gstreamer010-gst-plugins-good/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -69,11 +69,11 @@
set merger_host(i386) i686-apple-${os.platform}${os.major}
set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "i386"} {
+} elseif {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "x86_64"} {
+} elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
Modified: trunk/dports/gnome/gstreamer010-gst-plugins-ugly/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer010-gst-plugins-ugly/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/gnome/gstreamer010-gst-plugins-ugly/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -63,11 +63,11 @@
set merger_host(i386) i686-apple-${os.platform}${os.major}
set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "i386"} {
+} elseif {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} == "x86_64"} {
+} elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
Modified: trunk/dports/gnome/gstreamer1/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/gnome/gstreamer1/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -59,11 +59,11 @@
}
} else {
- if {${build_arch} == "i386"} {
+ if {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
Modified: trunk/dports/gnome/gstreamer1-gst-libav/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1-gst-libav/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/gnome/gstreamer1-gst-libav/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -51,7 +51,7 @@
set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major}"
set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major}"
set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major}"
-} elseif {${build_arch} == "i386"} {
+} elseif {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
Modified: trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -132,11 +132,11 @@
}
} else {
- if {${build_arch} == "i386"} {
+ if {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
Modified: trunk/dports/gnome/gstreamer1-gst-plugins-base/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1-gst-plugins-base/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/gnome/gstreamer1-gst-plugins-base/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -100,7 +100,7 @@
#-fgcse (from -O2) causes build failures, but -O2 -fno-gcse doesn't seem to work
if {[string match "*gcc-4.2" ${configure.compiler}]} {
lappend merger_configure_cflags(i386) -O1 -fexpensive-optimizations
- if {![variant_isset universal] && ${build_arch} == "i386"} {
+ if {![variant_isset universal] && ${build_arch} eq "i386"} {
configure.cflags-delete -O2
configure.cflags-append -O1 -fexpensive-optimizations
}
@@ -119,11 +119,11 @@
}
} else {
- if {${build_arch} == "i386"} {
+ if {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
Modified: trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -79,11 +79,11 @@
}
} else {
- if {${build_arch} == "i386"} {
+ if {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
Modified: trunk/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -68,11 +68,11 @@
}
} else {
- if {${build_arch} == "i386"} {
+ if {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
--build=${build_arch}-apple-${os.platform}${os.major}
Modified: trunk/dports/graphics/exempi/Portfile
===================================================================
--- trunk/dports/graphics/exempi/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/graphics/exempi/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -24,7 +24,7 @@
malloc.patch
# see http://trac.macports.org/ticket/20965
-if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
patchfiles-append patch-source__XMPFiles__FormatSupport__Makefile.am
configure.cppflags-append -DXMP_64
}
Modified: trunk/dports/graphics/gegl/Portfile
===================================================================
--- trunk/dports/graphics/gegl/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/graphics/gegl/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -89,10 +89,10 @@
set merger_configure_args(x86_64) --build=${build_arch}-apple-${os.platform}${os.version}
set merger_configure_cflags(ppc) -fno-altivec
set merger_configure_cxxflags(ppc) -fno-altivec
- } elseif {${build_arch} == "ppc"} {
+ } elseif {${build_arch} eq "ppc"} {
configure.cflags-append -fno-altivec
configure.cxxflags-append -fno-altivec
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
}
}
Modified: trunk/dports/graphics/gimp-gap/Portfile
===================================================================
--- trunk/dports/graphics/gimp-gap/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/graphics/gimp-gap/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -49,7 +49,7 @@
patch-configure-ccache.diff
post-patch {
- if {$build_arch != ""} {
+ if {${build_arch} ne ""} {
set ffmpeg_extras "--cc=${configure.cc} --arch=${build_arch}"
} else {
set ffmpeg_extras "--cc=${configure.cc}"
Modified: trunk/dports/graphics/gimp2/Portfile
===================================================================
--- trunk/dports/graphics/gimp2/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/graphics/gimp2/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -190,7 +190,7 @@
# if variant is +quartz lcms plugin uses 32 bit only Carbon API
#
- if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+ if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
configure.args-append --without-lcms
}
}
Modified: trunk/dports/graphics/lensfun/Portfile
===================================================================
--- trunk/dports/graphics/lensfun/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/graphics/lensfun/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -62,13 +62,13 @@
set merger_configure_args(ppc) "--target=mac.powerpc.powerpc --vectorization=''"
set merger_configure_args(i386) "--target=mac.x86.i686"
set merger_configure_args(x86_64) "--target=mac.x86_64.generic"
-} elseif {${build_arch} == "ppc64"} {
+} elseif {${build_arch} eq "ppc64"} {
configure.args-append --target=mac.powerpc64.G5 --vectorization=''
-} elseif {${build_arch} == "ppc"} {
+} elseif {${build_arch} eq "ppc"} {
configure.args-append --target=mac.powerpc.powerpc --vectorization=''
-} elseif {${build_arch} == "i386"} {
+} elseif {${build_arch} eq "i386"} {
configure.args-append --target=mac.x86.i686
-} elseif {${build_arch} == "x86_64"} {
+} elseif {${build_arch} eq "x86_64"} {
configure.args-append --target=mac.x86_64.generic
}
Modified: trunk/dports/graphics/libemf/Portfile
===================================================================
--- trunk/dports/graphics/libemf/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/graphics/libemf/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -32,7 +32,7 @@
configure.cppflags-append -Xarch_ppc -D__PPC__=1
} else {
universal_variant no
- if {${configure.build_arch} == "ppc"} {
+ if {${configure.build_arch} eq "ppc"} {
configure.cppflags-append -D__PPC__=1
}
}
Modified: trunk/dports/graphics/vlfeat/Portfile
===================================================================
--- trunk/dports/graphics/vlfeat/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/graphics/vlfeat/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -29,9 +29,9 @@
supported_archs x86_64 i386
-if {$build_arch == "x86_64"} {
+if {${build_arch} eq "x86_64"} {
set vlfeat_arch maci64
-} elseif {$build_arch == "i386"} {
+} elseif {${build_arch} eq "i386"} {
set vlfeat_arch maci
}
if {[info exists vlfeat_arch]} {
Modified: trunk/dports/kde/kdevelop/Portfile
===================================================================
--- trunk/dports/kde/kdevelop/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/kde/kdevelop/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -77,7 +77,7 @@
#Using c++0x for Lion and higher in case of clang 64-bit
if {${configure.compiler} == "clang" && ${os.platform} eq "darwin" && ${os.major} >= 11} {
lappend merger_configure_args(x86_64) -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DHAVE_UNORDERED_MAP=1
- if {${build_arch} == "x86_64" && ![variant_isset universal]} {
+ if {${build_arch} eq "x86_64" && ![variant_isset universal]} {
configure.args-append -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
}
}
Modified: trunk/dports/kde/kdevplatform/Portfile
===================================================================
--- trunk/dports/kde/kdevplatform/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/kde/kdevplatform/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -61,7 +61,7 @@
#Using c++0x for Lion and higher in case of clang 64-bit
if {${configure.compiler} == "clang" && ${os.platform} eq "darwin" && ${os.major} >= 11} {
lappend merger_configure_args(x86_64) -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DHAVE_UNORDERED_MAP=1
- if {${build_arch} == "x86_64" && ![variant_isset universal]} {
+ if {${build_arch} eq "x86_64" && ![variant_isset universal]} {
configure.args-append -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
}
}
Modified: trunk/dports/lang/apple-gcc42/Portfile
===================================================================
--- trunk/dports/lang/apple-gcc42/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/apple-gcc42/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -80,9 +80,9 @@
variant universal {}
# Building universal with a ppc slice doesn't work (Tried on Leopard)
-if {${build_arch} == "i386" || ${build_arch} == "x86_64"} {
+if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
supported_archs i386 x86_64
-} elseif {${build_arch} == "ppc" || ${build_arch} == "ppc64"} {
+} elseif {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
supported_archs ppc ppc64
}
@@ -143,7 +143,7 @@
reinplace "/bug_report_url/s|http:.*>|https://trac.macports.org/newticket>|" \
${worksrcpath}/gcc/version.c
- if {${build_arch} == "ppc"} {
+ if {${build_arch} eq "ppc"} {
reinplace "/^PPC_SYSROOT=/ s:=.*$:=/:" ${worksrcpath}/build_gcc
} elseif {[file exists ${developer_dir}/SDKs/MacOSX10.5.sdk]} {
reinplace "/^PPC_SYSROOT=/ s:=.*$:=${developer_dir}/SDKs/MacOSX10.5.sdk:" ${worksrcpath}/build_gcc
@@ -226,7 +226,7 @@
set build_targets {}
-if {${os.major} > 8 || ${os.arch} == "i386"} {
+if {${os.major} > 8 || ${os.arch} eq "i386"} {
lappend build_targets i386
}
@@ -235,7 +235,7 @@
if {[file exists ${developer_dir}/SDKs/MacOSX10.3.9.sdk] ||
[file exists ${developer_dir}/SDKs/MacOSX10.4u.sdk] ||
[file exists ${developer_dir}/SDKs/MacOSX10.5.sdk] ||
- ${build_arch} == "ppc"} {
+ ${build_arch} eq "ppc"} {
lappend build_targets ppc
}
}
Modified: trunk/dports/lang/ccl/Portfile
===================================================================
--- trunk/dports/lang/ccl/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/ccl/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -31,10 +31,10 @@
global bootimg
global ccl_script
- if { ${configure.build_arch} == "x86_64" } {
+ if { ${configure.build_arch} eq "x86_64" } {
set bootimg dx86cl64
set ccl_script ccl64
- } elseif { ${configure.build_arch} == "i386" } {
+ } elseif { ${configure.build_arch} eq "i386" } {
set bootimg dx86cl
set ccl_script ccl
} else {
@@ -49,10 +49,10 @@
global bootimg
global ccl_script
- if { ${configure.build_arch} == "ppc64" } {
+ if { ${configure.build_arch} eq "ppc64" } {
set bootimg dppccl64
set ccl_script ccl64
- } elseif { ${configure.build_arch} == "ppc" } {
+ } elseif { ${configure.build_arch} eq "ppc" } {
set bootimg dppccl
set ccl_script ccl
} else {
Modified: trunk/dports/lang/dmd-doc/Portfile
===================================================================
--- trunk/dports/lang/dmd-doc/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/dmd-doc/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -26,7 +26,7 @@
use_configure no
-if {${build_arch}=="x86_64"} {
+if {${build_arch} eq "x86_64"} {
set model 64
} else {
set model 32
Modified: trunk/dports/lang/dmd-tools/Portfile
===================================================================
--- trunk/dports/lang/dmd-tools/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/dmd-tools/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -30,7 +30,7 @@
set dmd ${prefix}/bin/dmd
set dflags "-O -d"
-if {${build_arch}=="x86_64"} {
+if {${build_arch} eq "x86_64"} {
set model 64
} else {
set model 32
Modified: trunk/dports/lang/druntime/Portfile
===================================================================
--- trunk/dports/lang/druntime/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/druntime/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -24,7 +24,7 @@
use_configure no
-if {${build_arch}=="x86_64"} {
+if {${build_arch} eq "x86_64"} {
set model 64
} else {
set model 32
Modified: trunk/dports/lang/eero-devel/Portfile
===================================================================
--- trunk/dports/lang/eero-devel/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/eero-devel/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -94,11 +94,11 @@
depends_skip_archcheck-append ld64
}
- if {${build_arch} == "i386" } {
+ if {${build_arch} eq "i386"} {
configure.pre_args-append --build=i686-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc" } {
+ } elseif {${build_arch} eq "ppc"} {
configure.pre_args-append --build=powerpc-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc64" } {
+ } elseif {${build_arch} eq "ppc64"} {
configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
} else {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
Modified: trunk/dports/lang/eiffelstudio70/Portfile
===================================================================
--- trunk/dports/lang/eiffelstudio70/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/eiffelstudio70/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -44,9 +44,9 @@
set ise_platform ${os.platform}-${os.arch}
platform darwin i386 {
- if {${build_arch} == "i386"} {
+ if {${build_arch} eq "i386"} {
set ise_platform macosx-x86
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
set ise_platform macosx-x86-64
}
}
Modified: trunk/dports/lang/eiffelstudio71/Portfile
===================================================================
--- trunk/dports/lang/eiffelstudio71/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/eiffelstudio71/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -45,9 +45,9 @@
set ise_platform ${os.platform}-${os.arch}
platform darwin i386 {
- if {${build_arch} == "i386"} {
+ if {${build_arch} eq "i386"} {
set ise_platform macosx-x86
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
set ise_platform macosx-x86-64
}
}
Modified: trunk/dports/lang/eiffelstudio72/Portfile
===================================================================
--- trunk/dports/lang/eiffelstudio72/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/eiffelstudio72/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -46,9 +46,9 @@
set ise_platform ${os.platform}-${os.arch}
platform darwin i386 {
- if {${build_arch} == "i386"} {
+ if {${build_arch} eq "i386"} {
set ise_platform macosx-x86
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
set ise_platform macosx-x86-64
}
}
Modified: trunk/dports/lang/eiffelstudio73/Portfile
===================================================================
--- trunk/dports/lang/eiffelstudio73/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/eiffelstudio73/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -46,9 +46,9 @@
set ise_platform ${os.platform}-${os.arch}
platform darwin i386 {
- if {${build_arch} == "i386"} {
+ if {${build_arch} eq "i386"} {
set ise_platform macosx-x86
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
set ise_platform macosx-x86-64
}
}
Modified: trunk/dports/lang/erlang/Portfile
===================================================================
--- trunk/dports/lang/erlang/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/erlang/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -106,7 +106,7 @@
}
platform darwin {
- if {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
+ if {${configure.build_arch} eq "x86_64" || ${configure.build_arch} eq "ppc64"} {
configure.args-append --enable-darwin-64bit
} else {
configure.args-append --disable-darwin-64-bit
Modified: trunk/dports/lang/factor/Portfile
===================================================================
--- trunk/dports/lang/factor/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/factor/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -37,11 +37,11 @@
use_configure no
-if {${build_arch} == "x86_64"} {
+if {${build_arch} eq "x86_64"} {
build.target macosx-x86-64
set boot_image boot.unix-x86.64.image
-} elseif {${build_arch} == "i386"} {
+} elseif {${build_arch} eq "i386"} {
build.target macosx-x86-32
set boot_image boot.unix-x86.32.image
}
Modified: trunk/dports/lang/g95/Portfile
===================================================================
--- trunk/dports/lang/g95/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/g95/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -20,7 +20,7 @@
homepage http://g95.org/
dist_subdir ${name}/${version}
-if {${os.major} < 10 || ${build_arch}=="ppc" || ${build_arch}=="i386"} {
+if {${os.major} < 10 || ${build_arch} eq "ppc" || ${build_arch} eq "i386"} {
default_variants +gcc40
}
@@ -92,7 +92,7 @@
pre-configure {
file mkdir ${workpath}/gcc-${version_gcc}/${name}
reinplace "s|tjmp %%edx|tjmp *%%edx|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/i386.c
- if {${build_arch} == "i386"} {
+ if {${build_arch} eq "i386"} {
reinplace "s|i686|i386|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/darwin.h
}
# set gcc_configargs "--with-as=/usr/bin/as --with-ld=/usr/bin/ld --with-nm=/usr/bin/nm"
@@ -132,7 +132,7 @@
}
pre-build {
- if {![variant_isset gcc40] && ${os.arch}=="i386"} {
+ if {![variant_isset gcc40] && ${os.arch} eq "i386"} {
reinplace "s|\(g95_LDADD\)|(g95_LDADD) ${workpath}/gcc-${version_gcc}/g95/gcc/driver-i386.o|" ${worksrcpath}/Makefile
}
}
Modified: trunk/dports/lang/gcc42/Portfile
===================================================================
--- trunk/dports/lang/gcc42/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/gcc42/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -72,7 +72,7 @@
error "unsupported platform"
}
}
- if {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
+ if {${configure.build_arch} eq "x86_64" || ${configure.build_arch} eq "ppc64"} {
configure.pre_args-append --build=${configure.build_arch}-apple-${os.platform}${os.version} \
--host=${configure.build_arch}-apple-${os.platform}${os.version}
}
Modified: trunk/dports/lang/gcc45/Portfile
===================================================================
--- trunk/dports/lang/gcc45/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/gcc45/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -134,7 +134,7 @@
compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
# LTO doesn't work for other targets, see ticket #32863
-if {![variant_isset universal] && $build_arch == "x86_64"} {
+if {![variant_isset universal] && ${build_arch} eq "x86_64"} {
configure.args-append --enable-lto
}
@@ -224,7 +224,7 @@
${destroot}${prefix}/share/python/classfile-45.py
# darwin-sections.def gets missed on install for some reason
- if {${os.arch} != "powerpc"} {
+ if {${os.arch} ne "powerpc"} {
eval file copy ${worksrcpath}/../gcc-${version}/gcc/config/darwin-sections.def [glob ${destroot}${prefix}/lib/${name}/gcc/*/${version}/plugin/include/config]
}
Modified: trunk/dports/lang/gforth/Portfile
===================================================================
--- trunk/dports/lang/gforth/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/gforth/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -37,7 +37,7 @@
}
platform darwin {
- if {$build_arch == "x86_64"} {
+ if {${build_arch} eq "x86_64"} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
}
}
Modified: trunk/dports/lang/guile/Portfile
===================================================================
--- trunk/dports/lang/guile/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/guile/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -65,16 +65,16 @@
}
# Unable to cross compile, so we need to be able to run the built code
-if {${os.arch} == "i386" && ${os.major} >= 11} {
+if {${os.arch} eq "i386" && ${os.major} >= 11} {
supported_archs i386 x86_64
set universal_archs_supported {i386 x86_64}
-} elseif {${os.arch} == "i386" && ${build_arch} == "x86_64"} {
+} elseif {${os.arch} eq "i386" && ${build_arch} eq "x86_64"} {
supported_archs i386 x86_64 ppc
set universal_archs_supported {i386 x86_64 ppc}
-} elseif {${os.arch} == "i386"} {
+} elseif {${os.arch} eq "i386"} {
supported_archs i386 ppc
set universal_archs_supported {i386 ppc}
-} elseif {${build_arch} == "ppc64"} {
+} elseif {${build_arch} eq "ppc64"} {
supported_archs ppc ppc64
set universal_archs_supported {ppc ppc64}
} else {
@@ -92,19 +92,19 @@
set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major}"
set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major}"
set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major}"
- } elseif {${build_arch} == "i386"} {
+ } elseif {${build_arch} eq "i386"} {
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
configure.args-append \
--host=x86_64-apple-${os.platform}${os.major} \
--build=x86_64-apple-${os.platform}${os.major}
- } elseif {${build_arch} == "ppc"} {
+ } elseif {${build_arch} eq "ppc"} {
configure.args-append \
--host=powerpc-apple-${os.platform}${os.major} \
--build=powerpc-apple-${os.platform}${os.major}
- } elseif {${build_arch} == "ppc64"} {
+ } elseif {${build_arch} eq "ppc64"} {
configure.args-append \
--host=powerpc64-apple-${os.platform}${os.major} \
--build=powerpc64-apple-${os.platform}${os.major}
Modified: trunk/dports/lang/llvm-2.9/Portfile
===================================================================
--- trunk/dports/lang/llvm-2.9/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/llvm-2.9/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -157,11 +157,11 @@
}
platform darwin {
- if {${build_arch} == "i386" } {
+ if {${build_arch} eq "i386"} {
configure.pre_args-append --build=i686-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc" } {
+ } elseif {${build_arch} eq "ppc"} {
configure.pre_args-append --build=powerpc-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc64" } {
+ } elseif {${build_arch} eq "ppc64"} {
configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
} else {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
Modified: trunk/dports/lang/llvm-3.0/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.0/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/llvm-3.0/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -155,11 +155,11 @@
}
platform darwin {
- if {${build_arch} == "i386" } {
+ if {${build_arch} eq "i386"} {
configure.pre_args-append --build=i686-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc" } {
+ } elseif {${build_arch} eq "ppc"} {
configure.pre_args-append --build=powerpc-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc64" } {
+ } elseif {${build_arch} eq "ppc64"} {
configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
} else {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
Modified: trunk/dports/lang/llvm-3.1/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.1/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/llvm-3.1/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -159,11 +159,11 @@
}
platform darwin {
- if {${build_arch} == "i386" } {
+ if {${build_arch} eq "i386"} {
configure.pre_args-append --build=i686-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc" } {
+ } elseif {${build_arch} eq "ppc"} {
configure.pre_args-append --build=powerpc-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc64" } {
+ } elseif {${build_arch} eq "ppc64"} {
configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
} else {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
Modified: trunk/dports/lang/llvm-3.2/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.2/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/llvm-3.2/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -161,11 +161,11 @@
}
platform darwin {
- if {${build_arch} == "i386" } {
+ if {${build_arch} eq "i386"} {
configure.pre_args-append --build=i686-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc" } {
+ } elseif {${build_arch} eq "ppc"} {
configure.pre_args-append --build=powerpc-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc64" } {
+ } elseif {${build_arch} eq "ppc64"} {
configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
} else {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
Modified: trunk/dports/lang/llvm-3.3/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.3/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/llvm-3.3/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -149,11 +149,11 @@
}
platform darwin {
- if {${build_arch} == "i386" } {
+ if {${build_arch} eq "i386"} {
configure.pre_args-append --build=i686-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc" } {
+ } elseif {${build_arch} eq "ppc"} {
configure.pre_args-append --build=powerpc-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc64" } {
+ } elseif {${build_arch} eq "ppc64"} {
configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
} else {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/llvm-3.4/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -135,11 +135,11 @@
}
platform darwin {
- if {${build_arch} == "i386" } {
+ if {${build_arch} eq "i386"} {
configure.pre_args-append --build=i686-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc" } {
+ } elseif {${build_arch} eq "ppc"} {
configure.pre_args-append --build=powerpc-apple-darwin${os.major}
- } elseif {${build_arch} == "ppc64" } {
+ } elseif {${build_arch} eq "ppc64"} {
configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
} else {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
Modified: trunk/dports/lang/llvm-gcc42/Portfile
===================================================================
--- trunk/dports/lang/llvm-gcc42/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/llvm-gcc42/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -81,7 +81,7 @@
${worksrcpath}/GNUmakefile \
${worksrcpath}/llvmCore/utils/buildit/build_llvm
- if {${build_arch} == "ppc"} {
+ if {${build_arch} eq "ppc"} {
reinplace "/^PPC_SYSROOT=/ s:=.*$:=/:" ${worksrcpath}/build_gcc
} elseif {[file exists ${developer_dir}/SDKs/MacOSX10.5.sdk]} {
reinplace "/^PPC_SYSROOT=/ s:=.*$:=${developer_dir}/SDKs/MacOSX10.5.sdk:" ${worksrcpath}/build_gcc
@@ -149,7 +149,7 @@
set build_targets {}
-if {${os.major} > 8 || ${os.arch} == "i386"} {
+if {${os.major} > 8 || ${os.arch} eq "i386"} {
lappend build_targets i386
}
@@ -158,11 +158,11 @@
# if {[file exists ${developer_dir}/SDKs/MacOSX10.3.9.sdk] ||
# [file exists ${developer_dir}/SDKs/MacOSX10.4u.sdk] ||
# [file exists ${developer_dir}/SDKs/MacOSX10.5.sdk] ||
-# ${build_arch} == "ppc"} {
+# ${build_arch} eq "ppc"} {
# lappend build_targets ppc
# }
#}
-if {${os.major} < 11 && ${build_arch} == "ppc"} {
+if {${os.major} < 11 && ${build_arch} eq "ppc"} {
lappend build_targets ppc
}
Modified: trunk/dports/lang/omnixmp/Portfile
===================================================================
--- trunk/dports/lang/omnixmp/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/omnixmp/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -30,7 +30,7 @@
patch-libxmpf-Makefile.in.diff
post-patch {
- if {${build_arch}=="x86_64"} {
+ if {${build_arch} eq "x86_64"} {
reinplace "s|CPU=i386|CPU=x86_64|g" ${worksrcpath}/configure
}
}
Modified: trunk/dports/lang/phobos/Portfile
===================================================================
--- trunk/dports/lang/phobos/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/phobos/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -26,7 +26,7 @@
use_configure no
-if {${build_arch}=="x86_64"} {
+if {${build_arch} eq "x86_64"} {
set model 64
} else {
set model 32
Modified: trunk/dports/lang/python26/Portfile
===================================================================
--- trunk/dports/lang/python26/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/python26/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -149,7 +149,7 @@
set arch_run_32bit {}
foreach arch ${universal_archs} {
lappend universal_arch_flags -arch ${arch}
- if { ${arch}=="i386" || ${arch}=="ppc" } {
+ if {${arch} eq "i386" || ${arch} eq "ppc"} {
lappend arch_run_32bit -${arch}
}
}
Modified: trunk/dports/lang/python31/Portfile
===================================================================
--- trunk/dports/lang/python31/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/python31/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -132,7 +132,7 @@
set arch_run_32bit {}
foreach arch ${universal_archs} {
lappend universal_arch_flags -arch ${arch}
- if { ${arch}=="i386" || ${arch}=="ppc" } {
+ if {${arch} eq "i386" || ${arch} eq "ppc"} {
lappend arch_run_32bit -${arch}
}
}
Modified: trunk/dports/lang/python32/Portfile
===================================================================
--- trunk/dports/lang/python32/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/python32/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -117,7 +117,7 @@
set arch_run_32bit {}
foreach arch ${universal_archs} {
lappend universal_arch_flags -arch ${arch}
- if { ${arch}=="i386" || ${arch}=="ppc" } {
+ if {${arch} eq "i386" || ${arch} eq "ppc"} {
lappend arch_run_32bit -${arch}
}
}
Modified: trunk/dports/lang/python33/Portfile
===================================================================
--- trunk/dports/lang/python33/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/python33/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -127,7 +127,7 @@
set arch_run_32bit {}
foreach arch ${universal_archs} {
lappend universal_arch_flags -arch ${arch}
- if { ${arch}=="i386" || ${arch}=="ppc" } {
+ if {${arch} eq "i386" || ${arch} eq "ppc"} {
lappend arch_run_32bit -${arch}
}
}
Modified: trunk/dports/lang/python34/Portfile
===================================================================
--- trunk/dports/lang/python34/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/python34/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -131,7 +131,7 @@
set arch_run_32bit {}
foreach arch ${universal_archs} {
lappend universal_arch_flags -arch ${arch}
- if { ${arch}=="i386" || ${arch}=="ppc" } {
+ if {${arch} eq "i386" || ${arch} eq "ppc"} {
lappend arch_run_32bit -${arch}
}
}
Modified: trunk/dports/lang/ruby/Portfile
===================================================================
--- trunk/dports/lang/ruby/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/ruby/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -120,7 +120,7 @@
append merger_configure_env(${arch}) \
"ac_cv_build=\"${cpu_type}-apple-darwin${os.major}\" "
}
-} elseif {[info exists build_arch] && ${build_arch} != ""} {
+} elseif {[info exists build_arch] && ${build_arch} ne ""} {
configure.env-append ARCH_FLAG="-arch ${build_arch}"
}
Modified: trunk/dports/lang/ruby186/Portfile
===================================================================
--- trunk/dports/lang/ruby186/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/ruby186/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -76,7 +76,7 @@
--without-tk \
--disable-ucontext
-if {![variant_isset universal] && [info exists build_arch] && $build_arch != ""} {
+if {![variant_isset universal] && [info exists build_arch] && ${build_arch} ne ""} {
configure.env-append ARCH_FLAG="-arch ${build_arch}"
}
Modified: trunk/dports/lang/ruby19/Portfile
===================================================================
--- trunk/dports/lang/ruby19/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/ruby19/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -74,7 +74,7 @@
configure.env-append UNAME_RELEASE=${os.major}
# Add the architecture flag as required
-if {[info exists build_arch] && ${build_arch} != ""} {
+if {[info exists build_arch] && ${build_arch} ne ""} {
configure.args-append "--with-arch=${build_arch}"
}
Modified: trunk/dports/lang/ruby20/Portfile
===================================================================
--- trunk/dports/lang/ruby20/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/ruby20/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -63,7 +63,7 @@
patchfiles patch-ext-tk-extconf.rb.diff
# Add the architecture flag as required
-if {[info exists build_arch] && ${build_arch} != ""} {
+if {[info exists build_arch] && ${build_arch} ne ""} {
configure.args-append "--with-arch=${build_arch}"
}
Modified: trunk/dports/lang/upc/Portfile
===================================================================
--- trunk/dports/lang/upc/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/upc/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -38,7 +38,7 @@
}
pre-configure {
- if {${os.platform} eq "darwin" && ${os.arch} == "powerpc"} {
+ if {${os.platform} eq "darwin" && ${os.arch} eq "powerpc"} {
ui_error "PowerPC is not supported"
}
}
@@ -58,7 +58,7 @@
--with-mpc=${prefix} \
--with-upc-backtrace-gdb=ggdb \
--enable-languages=upc
-if {${os.platform} eq "darwin" && ${build_arch} == "x86_64"} {
+if {${os.platform} eq "darwin" && ${build_arch} eq "x86_64"} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.major}
}
use_parallel_build yes
Modified: trunk/dports/lang/yap/Portfile
===================================================================
--- trunk/dports/lang/yap/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/yap/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -33,7 +33,7 @@
configure.args --with-gmp=${prefix} \
--with-readline=${prefix}
-if {${os.platform} eq "darwin" && ${build_arch} == "x86_64"} {
+if {${os.platform} eq "darwin" && ${build_arch} eq "x86_64"} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
}
Modified: trunk/dports/lang/yap-devel/Portfile
===================================================================
--- trunk/dports/lang/yap-devel/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/lang/yap-devel/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -33,7 +33,7 @@
configure.args --with-gmp=${prefix} \
--with-readline=${prefix}
-if {${os.platform} eq "darwin" && ${build_arch} == "x86_64"} {
+if {${os.platform} eq "darwin" && ${build_arch} eq "x86_64"} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
}
Modified: trunk/dports/math/OpenBLAS/Portfile
===================================================================
--- trunk/dports/math/OpenBLAS/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/math/OpenBLAS/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -90,7 +90,7 @@
puts $makeINC "CC = ${configure.cc}"
puts $makeINC "FC = ${configure.fc}"
- if {${arch} == "x86_64" || ${arch} == "ppc64"} {
+ if {${arch} eq "x86_64" || ${arch} eq "ppc64"} {
puts $makeINC "BINARY = 64"
} else {
puts $makeINC "BINARY = 32"
@@ -119,7 +119,7 @@
puts $makeINC "CC = ${configure.cc}"
puts $makeINC "FC = ${configure.fc}"
- if {${build_arch} == "x86_64" || ${build_arch} == "ppc64"} {
+ if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
puts $makeINC "BINARY = 64"
} else {
puts $makeINC "BINARY = 32"
Modified: trunk/dports/math/arpack/Portfile
===================================================================
--- trunk/dports/math/arpack/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/math/arpack/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -23,7 +23,7 @@
worksrcdir ${name}-ng-${version}
configure.args-append home=${worksrcpath} --disable-mpi
-if { ${build_arch}=="x86_64" || ${build_arch}=="ppc64" } {
+if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
configure.args-append FFLAGS='-O2 -m64'
} else {
configure.args-append FFLAGS='-O2 -m32'
@@ -47,7 +47,7 @@
}
# Fortran compilers can not cross-compile
-if { ${os.arch}=="i386" } {
+if {${os.arch} eq "i386"} {
set universal_archs_supported "i386 x86_64"
} else {
set universal_archs_supported "ppc ppc64"
Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/math/atlas/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -204,13 +204,13 @@
# Finds the type of CPU we are running on
set native_arch ${build_arch}
-if {${os.arch} == "i386"} {
+if {${os.arch} eq "i386"} {
set universal_archs_supported {i386 x86_64}
if {![catch {exec sysctl -n hw.machine} result]} {
set native_arch ${result}
}
-} elseif {${os.arch} == "powerpc"} {
+} elseif {${os.arch} eq "powerpc"} {
set universal_archs_supported {ppc ppc64}
if {![catch {exec sysctl -n hw.cpusubtype} result] && $result == 100} {
@@ -229,7 +229,7 @@
# Chose the right flags for GCC and Clang compilers
-if {${build_arch} == "i386" || ${build_arch} == "x86_64"} {
+if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
# General flags
# GCC
@@ -283,7 +283,7 @@
set gvct_flag "-msse3"
set cvct_flag "-msse3"
}
-} elseif {${build_arch} == "ppc"} {
+} elseif {${build_arch} eq "ppc"} {
# PPC
set gcc_flags "-O3 -mcpu=7400 -mtune=7400\
@@ -299,7 +299,7 @@
# On Leopard, we may warn the user that ppc
# is not as efficient as ppc64
pre-fetch {
- if {${native_arch} == "ppc64"} {
+ if {${native_arch} eq "ppc64"} {
ui_msg "Compiling for ppc on a G5 machine.\
This could lead to reduced performance."
@@ -380,7 +380,7 @@
extract.post_args-append {|| true}
post-patch {
- if {${build_arch} == "ppc" || ${build_arch} == "ppc64"} {
+ if {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
reinplace \
"s|cMVFLAGS=\\\\\"%s\\\\\"|cMVFLAGS=\\\\\"-force_cpusubtype_ALL\ %s\\\\\"|" \
@@ -470,7 +470,7 @@
# machine arch tuning (except on ppc)
# -march=natives supersedes -msse4.2 so disable it on AVX
# capable machines
- if {${has_avx} == "no" && ${build_arch} != "ppc"} {
+ if {${has_avx} == "no" && ${build_arch} ne "ppc"} {
append gcc_flags " -march=native"
}
@@ -488,7 +488,7 @@
configure.args-append -A 25
}
- if {${build_arch} == "ppc"} {
+ if {${build_arch} eq "ppc"} {
# ppc uses altivec vectorizing unit
configure.args-append -V 4
@@ -506,7 +506,7 @@
configure.args-append -Ss f77lib \
${libgccpath}/libgfortran.dylib
}
- if {${build_arch} == "x86_64" || ${build_arch} == "ppc64"} {
+ if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
configure.args-append -b 64
} else {
@@ -531,7 +531,7 @@
${libgccpath}/libgfortran.dylib
}
- if {${build_arch} == "x86_64"} {
+ if {${build_arch} eq "x86_64"} {
configure.args-append -b 64
} else {
@@ -557,7 +557,7 @@
set clang_supp_flags ""
# We build for the native architecture
- if {${arch} == ${native_arch} && ${build_arch} != "ppc"} {
+ if {${arch} eq ${native_arch} && ${build_arch} ne "ppc"} {
# Don’t add -march=native to a GCC build on an AVX
# machine because this flag overrides -msse4.2
@@ -572,7 +572,7 @@
# Clamp i386 optimization to -sse3 in universal builds and
# forces clang/gcc to use -m32 flag
- if {${arch} == "i386" && ${native_arch} != "i386"} {
+ if {${arch} eq "i386" && ${native_arch} ne "i386"} {
set gvct_univ_flag "-msse3"
set cvct_univ_flag "-msse3"
@@ -583,7 +583,7 @@
# For x86_64 builds, be conservative and use only -ssse3
# Core2 CPU and SSE3 ASM kernels
- if {${arch} == "x86_64" && ${native_arch} != "x86_64"} {
+ if {${arch} eq "x86_64" && ${native_arch} ne "x86_64"} {
set gvct_univ_flag "-mssse3"
set cvct_univ_flag "-mssse3"
@@ -595,7 +595,7 @@
}
# ppc (on Intel or ppc64 machines)
- if {${arch} == "ppc" && ${native_arch} != "ppc"} {
+ if {${arch} eq "ppc" && ${native_arch} ne "ppc"} {
set gcc_univ_flags "-O3 -mcpu=7400 -mtune=7400\
-fno-schedule-insns -fschedule-insns2\
@@ -611,7 +611,7 @@
# ppc64 (only for gcc, for clang this is taken to be the
# same target as ppc)
- if {${arch} == "ppc64" && ${native_arch} != "ppc64"} {
+ if {${arch} eq "ppc64" && ${native_arch} ne "ppc64"} {
set gcc_univ_flags "-mcpu=970 -mtune=970 -mvrsave \
-mpowerpc64 -fno-schedule-insns\
@@ -691,7 +691,7 @@
}
# On PPC64 we need extra flags for configuring
- if {${native_arch} == "ppc64"} {
+ if {${native_arch} eq "ppc64"} {
configure.args-append --cc="\"${configure.cc} -m32 \
-force_cpusubtype_ALL\""
}
@@ -699,7 +699,7 @@
# Get some system specific variables for maximum optimization
set cpufreq [expr {[sysctl hw.cpufrequency] / 1000000}]
- if {${os.arch} == "powerpc"} {
+ if {${os.arch} eq "powerpc"} {
configure.args-append -D c -DWALL
} else {
@@ -739,7 +739,7 @@
# set gmpfx ${prefix}/lib/gcc${gcc_version}
# set arch [lindex [split [lindex [split $path "/"] end] "-"] 2]
- # if {${arch} != "" && \
+ # if {${arch} ne "" && \
# [file exists ${gmpfx}/${arch}/libgomp.dylib]} {
# reinplace -E \
Modified: trunk/dports/math/fftw-3/Portfile
===================================================================
--- trunk/dports/math/fftw-3/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/math/fftw-3/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -208,7 +208,7 @@
}
}
-if { ${os.arch} == "i386" } {
+if {${os.arch} eq "i386"} {
lappend merger_configure_args(ppc) "--disable-fortran"
lappend merger_configure_args(ppc64) "--disable-fortran"
} else {
@@ -266,9 +266,9 @@
configure.f77 ${prefix}/bin/g95
configure.f90 ${prefix}/bin/g95
- if {${build_arch} == "i386"} {
+ if {${build_arch} eq "i386"} {
lappend merger_configure_args(x86_64) "--disable-fortran"
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
lappend merger_configure_args(i386) "--disable-fortran"
} else {
lappend merger_configure_args(ppc64) "--disable-fortran"
Modified: trunk/dports/math/maxima/Portfile
===================================================================
--- trunk/dports/math/maxima/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/math/maxima/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -38,7 +38,7 @@
--mandir=${prefix}/share/man \
--enable-sbcl
-if {${os.platform} ne "darwin" && ${os.arch} != "i386"} {
+if {${os.platform} ne "darwin" && ${os.arch} ne "i386"} {
variant clisp description {Use CLISP instead of SBCL for Lisp} {
depends_lib-delete port:sbcl
depends_lib-append port:clisp
Modified: trunk/dports/math/pari/Portfile
===================================================================
--- trunk/dports/math/pari/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/math/pari/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -55,9 +55,9 @@
set merger_must_run_binaries yes
# pari does not build for ppc on intel
-if {${build_arch} == "i386" || ${build_arch} == "x86_64"} {
+if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
supported_archs i386 x86_64
-} elseif {${build_arch} == "ppc" || ${build_arch} == "ppc64"} {
+} elseif {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
supported_archs ppc ppc64
}
set universal_archs_supported ${supported_archs}
Modified: trunk/dports/math/qrupdate/Portfile
===================================================================
--- trunk/dports/math/qrupdate/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/math/qrupdate/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -39,7 +39,7 @@
}
# Fortran compilers can not cross-compile
-if { ${os.arch}=="i386" } {
+if {${os.arch} eq "i386"} {
set universal_archs_supported "i386 x86_64"
} else {
set universal_archs_supported "ppc ppc64"
@@ -47,14 +47,14 @@
post-configure {
if { ! [variant_isset universal] } {
- if { ${build_arch} == "x86_64" || ${build_arch} == "ppc64" } {
+ if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
reinplace "s|^FFLAGS=|FFLAGS=-m64 |" ${worksrcpath}/Makeconf
} else {
reinplace "s|^FFLAGS=|FFLAGS=-m32 |" ${worksrcpath}/Makeconf
}
} else {
foreach arch ${universal_archs_to_use} {
- if { ${arch}=="x86_64" || ${arch}=="ppc64" } {
+ if {${arch} eq "x86_64" || ${arch} eq "ppc64"} {
reinplace "s|^FFLAGS=|FFLAGS=-m64 |" ${worksrcpath}-${arch}/Makeconf
} else {
reinplace "s|^FFLAGS=|FFLAGS=-m32 |" ${worksrcpath}-${arch}/Makeconf
Modified: trunk/dports/multimedia/MPlayer/Portfile
===================================================================
--- trunk/dports/multimedia/MPlayer/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/multimedia/MPlayer/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -253,7 +253,7 @@
}
platform macosx {
- if { ${configure.build_arch} == "x86_64" } {
+ if {${configure.build_arch} eq "x86_64"} {
configure.args-append --disable-qtx
} else {
configure.args-append --enable-qtx
@@ -290,7 +290,7 @@
}
platform darwin {
- if { ${configure.build_arch} == "x86_64" } {
+ if {${configure.build_arch} eq "x86_64"} {
configure.args-append --target=${configure.build_arch}-Darwin
}
build.env LD=${configure.cc}
Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -177,7 +177,7 @@
} else {
configure.args-append --arch=${configure.build_arch}
configure.env-append ASFLAGS='[get_canonical_archflags]'
- if {$build_arch == "i386" || $build_arch == "x86_64"} {
+ if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
depends_build-append port:yasm
configure.args-append --enable-yasm
}
Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -183,7 +183,7 @@
} else {
configure.args-append --arch=${configure.build_arch}
configure.env-append ASFLAGS='[get_canonical_archflags]'
- if {$build_arch == "i386" || $build_arch == "x86_64"} {
+ if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
depends_build-append port:yasm
configure.args-append --enable-yasm
}
Modified: trunk/dports/multimedia/mlt/Portfile
===================================================================
--- trunk/dports/multimedia/mlt/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/multimedia/mlt/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -54,7 +54,7 @@
--disable-swfdec
platform darwin 10 {
- if { ${build_arch} == "x86_64" } {
+ if {${build_arch} eq "x86_64"} {
configure.args-delete --disable-mmx
}
}
Modified: trunk/dports/multimedia/mplayer-devel/Portfile
===================================================================
--- trunk/dports/multimedia/mplayer-devel/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/multimedia/mplayer-devel/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -264,7 +264,7 @@
}
platform macosx {
- if { ${configure.build_arch} == "x86_64" } {
+ if {${configure.build_arch} eq "x86_64"} {
configure.args-append --disable-qtx
} else {
configure.args-append --enable-qtx
@@ -301,7 +301,7 @@
}
platform darwin {
- if { ${configure.build_arch} == "x86_64" } {
+ if {${configure.build_arch} eq "x86_64"} {
configure.args-append --target=${configure.build_arch}-Darwin
}
build.env LD=${configure.cc}
Modified: trunk/dports/multimedia/x264/Portfile
===================================================================
--- trunk/dports/multimedia/x264/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/multimedia/x264/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -48,13 +48,13 @@
# asm works with a 64-bit snow leopard build
-if {[variant_isset asm] || (${os.platform} eq "darwin" && 10 == ${os.major} && "x86_64" == $build_arch && ![variant_isset universal])} {
+if {[variant_isset asm] || (${os.platform} eq "darwin" && ${os.major} == 10 && ${build_arch} eq "x86_64" && ![variant_isset universal])} {
depends_build-append port:yasm
configure.args-delete --disable-asm
}
-if {${os.platform} eq "darwin" && $build_arch != "" && ![variant_isset universal]} {
- if {$build_arch == "i386"} {
+if {${os.platform} eq "darwin" && ${build_arch} ne "" && ![variant_isset universal]} {
+ if {${build_arch} eq "i386"} {
configure.args-append --host=i686-apple-darwin${os.major}
} else {
configure.args-append --host=${build_arch}-apple-darwin${os.major}
@@ -63,7 +63,7 @@
}
foreach arch ${universal_archs} {
- if {$arch == "i386"} {
+ if {${arch} eq "i386"} {
set merger_configure_args(${arch}) --host=i686-apple-darwin${os.major}
} else {
set merger_configure_args(${arch}) --host=${arch}-apple-darwin${os.major}
@@ -74,7 +74,7 @@
platform darwin 8 {
# https://trac.macports.org/ticket/24893
- if {$build_arch == "i386" && ![variant_isset universal]} {
+ if {${build_arch} eq "i386" && ![variant_isset universal]} {
configure.cflags-append -msse2
}
set merger_configure_cflags(i386) -msse2
Modified: trunk/dports/net/dynamips/Portfile
===================================================================
--- trunk/dports/net/dynamips/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/net/dynamips/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -42,9 +42,9 @@
destroot.pre_args-append PREFIX=${prefix} CC=${configure.cc}
destroot.env-append CFLAGS="${configure.cc_archflags}"
-if {${build_arch} == "x86_64"} {
+if {${build_arch} eq "x86_64"} {
set dynamips_arch amd64
-} elseif {${build_arch} == "i386"} {
+} elseif {${build_arch} eq "i386"} {
set dynamips_arch x86
} else {
set dynamips_arch nojit
Modified: trunk/dports/net/dynamips-devel/Portfile
===================================================================
--- trunk/dports/net/dynamips-devel/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/net/dynamips-devel/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -37,7 +37,7 @@
# compile using nojit if on non-i386 platform
# is meant to work on x86_64 too but apparently crashes; ticket #22285
-if {${build_arch} != "i386"} {
+if {${build_arch} ne "i386"} {
build.pre_args-append DYNAMIPS_ARCH=nojit
destroot.pre_args-append DYNAMIPS_ARCH=nojit
}
Modified: trunk/dports/net/nss/Portfile
===================================================================
--- trunk/dports/net/nss/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/net/nss/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -55,7 +55,7 @@
}
build {
- if {[info exists build_arch] && (${build_arch} == "x86_64" || $build_arch == "ppc64")} {
+ if {[info exists build_arch] && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
set use_64 " USE_64=1"
} else {
set use_64 ""
Modified: trunk/dports/print/freetype/Portfile
===================================================================
--- trunk/dports/print/freetype/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/print/freetype/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -90,7 +90,7 @@
}
}
-if { ${os.arch}=="i386" } {
+if {${os.arch} eq "i386"} {
if { ${os.major}>=10 } {
set merger_configure_env(ppc) CC_BUILD=${configure.cc}
}
Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/python/py-numpy/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -112,9 +112,9 @@
# create binaries only for the native OS architecture, at
# either 32 or 64 bits. Restrict the supported archs
# accordingly.
- if {${os.arch} == "i386"} {
+ if {${os.arch} eq "i386"} {
supported_archs i386 x86_64
- } elseif {${os.arch} == "powerpc"} {
+ } elseif {${os.arch} eq "powerpc"} {
supported_archs ppc ppc64
}
Modified: trunk/dports/python/py-psyco/Portfile
===================================================================
--- trunk/dports/python/py-psyco/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/python/py-psyco/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -27,12 +27,12 @@
extract.post_args "| tar -xf - --exclude '.cvsignore'"
pre-fetch {
- if {${os.arch} != "i386"} {
+ if {${os.arch} ne "i386"} {
return -code error "psyco only works on Intel machines"
}
}
- if {$build_arch == "x86_64"} {
+ if {${build_arch} eq "x86_64"} {
if {${python.version} >= 25} {
set interp_path ${python.prefix}/Resources/Python.app/Contents/MacOS/Python
} else {
Modified: trunk/dports/python/py-pyglet/Portfile
===================================================================
--- trunk/dports/python/py-pyglet/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/python/py-pyglet/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -31,7 +31,7 @@
if {${python.version} == 25} {
set Resources_dir ${frameworks_dir}/Python.framework/Versions/${python.branch}/Resources
}
- if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+ if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
notes "Since MacPorts is configured to use the $build_arch architecture\
where possible and the current version of pyglet only works when built for\
32-bit archs, you will probably need to run python like this to use pyglet:
Modified: trunk/dports/python/py-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py-pyqt4/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/python/py-pyqt4/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -179,8 +179,8 @@
if {[variant_isset universal]} {
set conflags ""
foreach arch ${configure.universal_archs} {
- if {${arch} == "i386"} {append conflags "x86 "} else {
- if {${arch} == "ppc64"} {append conflags "ppc_64 "} else {
+ if {${arch} eq "i386"} {append conflags "x86 "} else {
+ if {${arch} eq "ppc64"} {append conflags "ppc_64 "} else {
append conflags ${arch} " "
}
}
Modified: trunk/dports/ruby/rb-cocoa/Portfile
===================================================================
--- trunk/dports/ruby/rb-cocoa/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/ruby/rb-cocoa/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -37,7 +37,7 @@
configure.args-append --target-archs="${universal_archs}"
}
} else {
- if {[info exists build_arch] && $build_arch != ""} {
+ if {[info exists build_arch] && ${build_arch} ne ""} {
configure.args-append --target-archs="${build_arch}"
}
}
Modified: trunk/dports/science/afni/Portfile
===================================================================
--- trunk/dports/science/afni/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/science/afni/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -56,28 +56,28 @@
}
if {${os.major} == 9} {
- if {${configure.build_arch} == "x86_64"} {
+ if {${configure.build_arch} eq "x86_64"} {
set combination macosx_10.5_Intel_64
}
- if {${configure.build_arch} == "i386"} {
+ if {${configure.build_arch} eq "i386"} {
set combination macosx_10.5_Intel
}
- if {${configure.build_arch} == "ppc64"} {
+ if {${configure.build_arch} eq "ppc64"} {
set combination macosx_10.5_G5
}
- if {${configure.build_arch} == "ppc"} {
+ if {${configure.build_arch} eq "ppc"} {
set combination macosx_10.5_G4
}
}
if {${os.major} == 8} {
- if {${configure.build_arch} == "i386"} {
+ if {${configure.build_arch} eq "i386"} {
set combination macosx_10.4_Intel
}
- if {${configure.build_arch} == "ppc64"} {
+ if {${configure.build_arch} eq "ppc64"} {
set combination macosx_10.4_G5
}
- if {${configure.build_arch} == "ppc"} {
+ if {${configure.build_arch} eq "ppc"} {
set combination macosx_10.4
}
}
Modified: trunk/dports/science/arb/Portfile
===================================================================
--- trunk/dports/science/arb/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/science/arb/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -55,7 +55,7 @@
patch-ARB-Makefile.diff
configure {
- if {${build_arch} == "ppc" || ${build_arch} == "i386"} {
+ if {${build_arch} eq "ppc" || ${build_arch} eq "i386"} {
set is64bit 0
} else {
set is64bit 1
Modified: trunk/dports/science/ds9/Portfile
===================================================================
--- trunk/dports/science/ds9/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/science/ds9/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -78,16 +78,16 @@
}
}
-if {${configure.build_arch} == "ppc"} {
+if {${configure.build_arch} eq "ppc"} {
set ds9arch ppc
}
-if {${configure.build_arch} == "ppc64"} {
+if {${configure.build_arch} eq "ppc64"} {
set ds9arch ppc
}
-if {${configure.build_arch} == "i386"} {
+if {${configure.build_arch} eq "i386"} {
set ds9arch x86
}
-if {${configure.build_arch} == "x86_64"} {
+if {${configure.build_arch} eq "x86_64"} {
set ds9arch 64x86
}
Modified: trunk/dports/science/netcdf-fortran/Portfile
===================================================================
--- trunk/dports/science/netcdf-fortran/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/science/netcdf-fortran/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -30,7 +30,7 @@
depends_lib port:netcdf
# Fortran compilers can not cross-compile
-if {${os.arch} == "i386"} {
+if {${os.arch} eq "i386"} {
set universal_archs_supported "i386 x86_64"
} else {
set universal_archs_supported "ppc ppc64"
Modified: trunk/dports/science/rasmol/Portfile
===================================================================
--- trunk/dports/science/rasmol/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/science/rasmol/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -23,7 +23,7 @@
patchfiles patch-Imakefile.diff \
rasmol.h.diff
-if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
patchfiles-append longlong.diff
}
post-patch {
Modified: trunk/dports/science/raxml/Portfile
===================================================================
--- trunk/dports/science/raxml/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/science/raxml/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -54,7 +54,7 @@
}
#For Intel machines add SSE and AVX as a variant and use it by default with pthreads
-if {${build_arch} == "i386" || ${build_arch} == "x86_64"} {
+if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
variant sse3 conflicts avx description {Use the SSE3 extended instruction set from Intel since 2004} {
set EXTm ".SSE3"
set EXTb "-SSE3"
Modified: trunk/dports/science/root/Portfile
===================================================================
--- trunk/dports/science/root/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/science/root/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -54,7 +54,7 @@
--with-ld=${configure.cxx} \
--with-f77=${configure.f77}
# the build type (32 or 64 bit) -must- be for first argument
- if {${build_arch} == "i386" || ${build_arch} == "ppc"} {
+ if {${build_arch} eq "i386" || ${build_arch} eq "ppc"} {
configure.pre_args macosx --prefix=${prefix}
} else {
configure.pre_args macosx64 --prefix=${prefix}
Modified: trunk/dports/science/vapor/Portfile
===================================================================
--- trunk/dports/science/vapor/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/science/vapor/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -46,7 +46,7 @@
reinplace "s|QTDIR =|QTDIR =${prefix}/lib/qt3|" ${worksrcpath}/options.mk
reinplace "s|QT_LIB_PATH = |QT_LIB_PATH=${prefix}/lib/qt3/lib|" ${worksrcpath}/options.mk
reinplace "s|BUILD_AMR_SUPPORT = 0|BUILD_AMR_SUPPORT = 1|" ${worksrcpath}/options.mk
- if {${build_arch}=="x86_64"} {
+ if {${build_arch} eq "x86_64"} {
set f [open ${worksrcpath}/site.mk "w"]
puts $f "MACHTYPE=x86_64"
close $f
Modified: trunk/dports/security/botan/Portfile
===================================================================
--- trunk/dports/security/botan/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/security/botan/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -35,16 +35,16 @@
platform darwin { configure.args-append --os=darwin }
if {[info exists build_arch] && ${os.platform} eq "darwin"} {
- if {(${build_arch} == "i386")} {
+ if {(${build_arch} eq "i386")} {
configure.args-append --cpu=ia32
build.args CXX="${configure.cxx} -m32"
- } elseif {(${build_arch} == "x86_64")} {
+ } elseif {(${build_arch} eq "x86_64")} {
configure.args-append --cpu=amd64
build.args CXX="${configure.cxx} -m64"
- } elseif {(${build_arch} == "ppc")} {
+ } elseif {(${build_arch} eq "ppc")} {
configure.args-append --cpu=ppc
build.args CXX="${configure.cxx} -m32"
- } elseif {(${build_arch} == "ppc64")} {
+ } elseif {(${build_arch} eq "ppc64")} {
configure.args-append --cpu=ppc64
build.args CXX="${configure.cxx} -m64"
}
Modified: trunk/dports/sysutils/memcached/Portfile
===================================================================
--- trunk/dports/sysutils/memcached/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/sysutils/memcached/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -35,7 +35,7 @@
set merger_configure_args(x86_64) --enable-64bit
set merger_configure_args(ppc64) --enable-64bit
} else {
- if {[info exists build_arch] && (${build_arch} == "x86_64" || $build_arch == "ppc64")} {
+ if {[info exists build_arch] && (${build_arch} eq "x86_64" || ${build_arch} eq "ppc64")} {
configure.args-append --enable-64bit
}
}
Modified: trunk/dports/textproc/libutf8proc/Portfile
===================================================================
--- trunk/dports/textproc/libutf8proc/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/textproc/libutf8proc/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -26,7 +26,7 @@
variant universal {
configure.cflags-append ${configure.universal_cflags}
}
-if {![variant_isset universal] && ${build_arch} != ""} {
+if {![variant_isset universal] && ${build_arch} ne ""} {
configure.cflags-append ${configure.cc_archflags}
}
Modified: trunk/dports/x11/libhangul/Portfile
===================================================================
--- trunk/dports/x11/libhangul/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/x11/libhangul/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -19,7 +19,7 @@
patchfiles patch-Makefile patch-test
post-patch {
- if { ${os.arch} == "powerpc" } {
+ if {${os.arch} eq "powerpc"} {
reinplace "s|__PLATFORM__|ppc|g" \
${worksrcpath}/test/hangul.c
} else {
Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/x11/mesa/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -109,7 +109,7 @@
# https://trac.macports.org/ticket/24345
# https://trac.macports.org/ticket/24393
# https://trac.macports.org/ticket/29860
- if {${build_arch} == "ppc"} {
+ if {${build_arch} eq "ppc"} {
patchfiles-append patch-src-mesa-Makefile.diff
post-patch {
reinplace "/SRC_DIRS/ s/gallium//" ${worksrcpath}/configs/darwin
Modified: trunk/dports/x11/qt3/Portfile
===================================================================
--- trunk/dports/x11/qt3/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/x11/qt3/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -112,7 +112,7 @@
reinplace "s|__MAKE__|${build.cmd}|g" ${worksrcpath}/${file}
file attributes ${worksrcpath}/${file} -permissions 0755
}
- if {${os.major}>=10 && ${configure.build_arch} == "x86_64"} {
+ if {${os.major} >= 10 && ${configure.build_arch} eq "x86_64"} {
system "perl -pi -e \"s,\\(int\\)owner\\, \\(int\\),\\(long\\)owner\\, \\(long\\),g\" ${worksrcpath}/src/tools/qmutex_unix.cpp"
}
reinplace "s|pipe|pipe ${configure.cflags}|" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
Modified: trunk/dports/x11/quartz-wm/Portfile
===================================================================
--- trunk/dports/x11/quartz-wm/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/x11/quartz-wm/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -33,7 +33,7 @@
no_title_crash.patch
# http://trac.macports.org/ticket/33515
-if {${os.arch} == "powerpc"} {
+if {${os.arch} eq "powerpc"} {
# This is sub-optimal, but it will work for now
post-patch {
reinplace "/install_name_tool/d" ${worksrcpath}/lib/Makefile.in
Modified: trunk/dports/x11/tk/Portfile
===================================================================
--- trunk/dports/x11/tk/Portfile 2013-12-05 10:08:08 UTC (rev 114327)
+++ trunk/dports/x11/tk/Portfile 2013-12-05 10:21:52 UTC (rev 114328)
@@ -60,7 +60,7 @@
ln -s libtk8.6.dylib ${destroot}${prefix}/lib/libtk.dylib
}
-if {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
+if {${configure.build_arch} eq "x86_64" || ${configure.build_arch} eq "ppc64"} {
configure.args-append --enable-64bit
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131205/c9301050/attachment-0001.html>
More information about the macports-changes
mailing list