<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b4b44d8125f8a37e9dd33cd5284b7278bc918c6a">https://github.com/macports/macports-ports/commit/b4b44d8125f8a37e9dd33cd5284b7278bc918c6a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b4b44d8125f8a37e9dd33cd5284b7278bc918c6a
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Nov 8 18:02:40 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> portgroups: use clearer form of vercmp, brace exprs
</span>---
_resources/port1.0/group/bazel-1.0.tcl | 2 +-
_resources/port1.0/group/cltversion-1.0.tcl | 2 +-
.../group/compiler_blacklist_versions-1.0.tcl | 2 +-
_resources/port1.0/group/compiler_wrapper-1.0.tcl | 6 +++---
_resources/port1.0/group/compilers-1.0.tcl | 8 ++++----
_resources/port1.0/group/crossgcc-1.0.tcl | 6 +++---
_resources/port1.0/group/deprecated-1.0.tcl | 4 ++--
_resources/port1.0/group/developerversion-1.0.tcl | 4 ++--
_resources/port1.0/group/haskell_cabal-1.0.tcl | 4 ++--
_resources/port1.0/group/mpiutil-1.0.tcl | 2 +-
_resources/port1.0/group/openssl-1.0.tcl | 2 +-
_resources/port1.0/group/php-1.1.tcl | 2 +-
_resources/port1.0/group/qmake5-1.0.tcl | 12 ++++++------
_resources/port1.0/group/qt5-1.0.tcl | 20 ++++++++++----------
_resources/port1.0/group/qt6-1.0.tcl | 14 +++++++-------
_resources/port1.0/group/rust-1.0.tcl | 8 ++++----
_resources/port1.0/group/wxWidgets-1.0.tcl | 4 ++--
_resources/port1.0/group/xcode-1.0.tcl | 4 ++--
_resources/port1.0/group/xcode_workaround-1.0.tcl | 10 +++++-----
_resources/port1.0/group/xcodeversion-1.0.tcl | 2 +-
20 files changed, 59 insertions(+), 59 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/bazel-1.0.tcl b/_resources/port1.0/group/bazel-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 8746999bb2e..278dae8c4c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/bazel-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/bazel-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,7 +105,7 @@ proc bazel::use_mp_clang {} {
</span> global configure.compiler xcodeversion
set is_mp_clang [ expr { [ string match macports-clang-* ${configure.compiler} ] } ]
set xcode_not_ok [ expr { ${xcodeversion} eq "none" || [ vercmp ${xcodeversion} [option bazel.min_xcode] ] < 0 } ]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [ expr ${is_mp_clang} || ${xcode_not_ok} ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [expr {${is_mp_clang} || ${xcode_not_ok}}]
</span> }
# Xcode blacklist
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cltversion-1.0.tcl b/_resources/port1.0/group/cltversion-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c281f9a3ce8..fef649e9c25 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cltversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cltversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ proc cltversion::get_default_cltversion {} {
</span> # There are reports of pkgutil returning (null) for version.
# It is unclear why this is or how common it is.
# Ensure $result is a valid version number.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${result} 0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${result} >= 0]} {
</span> ui_debug "cltversion: Found Command Line Tools Version ${result}"
} else {
ui_debug "cltversion: Unable to Find Command Line Tools using pkgutil"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compiler_blacklist_versions-1.0.tcl b/_resources/port1.0/group/compiler_blacklist_versions-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a2da7f48b2..c799a064070 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compiler_blacklist_versions-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compiler_blacklist_versions-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,5 +80,5 @@ proc compiler_blacklist_versions._version_matches {compiler comparison_operator
</span> if {${actual_version} eq ""} {
return 1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [expr [vercmp ${actual_version} ${test_version}] ${comparison_operator} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [vercmp ${actual_version} ${comparison_operator} ${test_version}]
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compiler_wrapper-1.0.tcl b/_resources/port1.0/group/compiler_wrapper-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 9df4f810094..f6a55708ef6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compiler_wrapper-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compiler_wrapper-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +36,9 @@ default compwrap.ccache_supported_compilers [list cc objc cxx objcxx]
</span>
proc compwrap::use_ccache {tag} {
global prefix
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [ expr [option configure.ccache] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [file exists ${prefix}/bin/ccache] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [lsearch -exact [option compwrap.ccache_supported_compilers] ${tag}] >= 0 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [ expr {[option configure.ccache] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [file exists ${prefix}/bin/ccache] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [lsearch -exact [option compwrap.ccache_supported_compilers] ${tag}] >= 0} ]
</span> }
proc compwrap::get_ccache_dir {} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compilers-1.0.tcl b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 264c5b33037..b9c0a576128 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,11 +120,11 @@ foreach ver ${gcc_versions} {
</span> set cdb(gcc$ver_nodot,dependsa) gcc-devel
} else {
set cdb(gcc$ver_nodot,depends) port:gcc$ver_nodot
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${ver} 4.6] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${ver} < 4.6]} {
</span> set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc45"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[vercmp ${ver} 7] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[vercmp ${ver} < 7]} {
</span> set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc6"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[vercmp ${ver} ${gcc_main_version}] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[vercmp ${ver} < ${gcc_main_version}]} {
</span> set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc${ver_nodot}"
} else {
# Do not depend directly on primary runtime port, as implied by libgcc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +146,7 @@ foreach ver ${gcc_versions} {
</span> set cdb(gcc$ver_nodot,f90) ${prefix}/bin/gfortran-mp-$ver
# The devel port, and starting with version 10, GCC will support using -stdlib=libc++,
# so use it for improved compatibility with clang builds
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { $ver eq "devel" || [vercmp ${ver} 10] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { $ver eq "devel" || [vercmp ${ver} >= 10]} {
</span> set cdb(gcc$ver_nodot,cxx_stdlib) libc++
} else {
set cdb(gcc$ver_nodot,cxx_stdlib) libstdc++
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/crossgcc-1.0.tcl b/_resources/port1.0/group/crossgcc-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 90d2b109c64..8192f1cd048 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/crossgcc-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/crossgcc-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -285,7 +285,7 @@ proc crossgcc.setup {target version} {
</span>
# https://trac.macports.org/ticket/29104
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48301
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${xcodeversion} 4.3] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} < 4.3]} {
</span> compiler.blacklist llvm-gcc-4.2
}
# Failed to build with clang from Xcode 4.5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -293,12 +293,12 @@ proc crossgcc.setup {target version} {
</span> compiler.blacklist {clang >= 421 < 422}
# Opportunistic links zstd for LTO byte code compression
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${version} "10.0"] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${version} >= "10.0"]} {
</span> depends_lib-append port:zstd
}
# Section taken from gcc11 Portfile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${version} "11.0"] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${version} >= "11.0"]} {
</span> # https://trac.macports.org/ticket/29067
# https://trac.macports.org/ticket/29104
# https://trac.macports.org/ticket/47996
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/deprecated-1.0.tcl b/_resources/port1.0/group/deprecated-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 204fcd2a593..72caac163a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/deprecated-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/deprecated-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ proc deprecated.deprecate_port {} {
</span> os.platform \
os.major \
xcodeversion
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && (${deprecated.maximum_osmajor} ne {}) && ([vercmp ${os.major} ${deprecated.maximum_osmajor}] > 0)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && (${deprecated.maximum_osmajor} ne {}) && ([vercmp ${os.major} > ${deprecated.maximum_osmajor}])} {
</span> depends_lib
depends_run
archive_sites
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ proc deprecated.deprecate_port {} {
</span> ui_error "building ${name} is not supported on OS version greater than ${deprecated.maximum_osmajor}"
return -code error {unsupported platform}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${os.platform} eq "darwin" && (${deprecated.maximum_xcodeversion} ne {}) && ([vercmp ${xcodeversion} ${deprecated.maximum_xcodeversion}] > 0)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.platform} eq "darwin" && (${deprecated.maximum_xcodeversion} ne {}) && ([vercmp ${xcodeversion} > ${deprecated.maximum_xcodeversion}])} {
</span> depends_lib
depends_run
archive_sites
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/developerversion-1.0.tcl b/_resources/port1.0/group/developerversion-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index df88e4b6b02..4ea432eb46f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/developerversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/developerversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ default minimum_developerversions {}
</span>
platform macosx {
pre-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {darwin_major minimum_developerversion} [join ${minimum_developerversions}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {darwin_major minimum_developerversion} [concat {*}${minimum_developerversions}] {
</span> if {${darwin_major} == ${os.major}} {
if {![info exists developerversion] || $developerversion eq "none" || $developerversion eq ""} {
ui_error "Couldn't determine your Developer Tools version."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ platform macosx {
</span> ui_error ""
return -code error "unable to find Developer Tools"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${developerversion} ${minimum_developerversion}] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${developerversion} < ${minimum_developerversion}]} {
</span> ui_error "On macOS ${macosx_version}, ${subport} @${version} requires Developer Tools ${minimum_developerversion} or later, but you have Developer Tools ${developerversion}."
return -code error "incompatible Developer Tools"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/haskell_cabal-1.0.tcl b/_resources/port1.0/group/haskell_cabal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 8df123148c7..b7d5cdc671e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/haskell_cabal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/haskell_cabal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -277,10 +277,10 @@ post-destroot {
</span> ${binfile}.slash_hack
foreach build_datadir ${build_datadirs} {
set extra_slashes \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [expr [string length ${build_datadir}] - [string length ${prefix}/${haskell_cabal.datadir}]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [expr {[string length ${build_datadir}] - [string length ${prefix}/${haskell_cabal.datadir}]}]
</span> if {${extra_slashes} >= 0} {
set slash_hack \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [string repeat / [expr ${extra_slashes} + 1]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [string repeat / [expr {${extra_slashes} + 1}]]
</span> set datadir_slash_hack \
[strsed ${prefix}/${haskell_cabal.datadir} "g|/${haskell_cabal.datadir}\$|${slash_hack}${haskell_cabal.datadir}|"]
set build_datadir_esc \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/mpiutil-1.0.tcl b/_resources/port1.0/group/mpiutil-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 67dd8a2038a..51cdba34ced 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/mpiutil-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/mpiutil-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +80,7 @@ proc mpiutil_validate_subport {name subport cname clist clist_unsupported clist_
</span> if {${cname} eq "default"} {
if {${configure.compiler} eq "clang"} {
set compiler_version [compiler.command_line_tools_version ${configure.compiler}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp 421.11.66 ${compiler_version}] <= 0 && [vercmp ${compiler_version} 425.0.24] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp 421.11.66 <= ${compiler_version}] && [vercmp ${compiler_version} < 425.0.24]} {
</span> ui_debug "mpiutil_validate_subport: apple clang segfault potential; fail subport: ${subport}"
# Linker for Apple clang version 421.11.66 segfaults
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/openssl-1.0.tcl b/_resources/port1.0/group/openssl-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b00d9172e73..a5cad4dea0c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/openssl-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/openssl-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,7 @@ proc openssl::check_branch {} {
</span> }
proc openssl::is_enabled {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [expr [openssl::check_branch] && {[option openssl.branch] != "no_version"} ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [expr {[openssl::check_branch] && {[option openssl.branch] != "no_version"}}]
</span> }
proc openssl::set_openssl_dependency {} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/php-1.1.tcl b/_resources/port1.0/group/php-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 42854349870..f64fe099ffb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/php-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/php-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -377,7 +377,7 @@ proc php.add_port_code {} {
</span> depends_lib-append port:${php}
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${php.branch} 7.0] < 0 && [vercmp ${xcodeversion} 12.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${php.branch} < 7.0] && [vercmp ${xcodeversion} >= 12.0]} {
</span> # Implicit function declarations. Need to backport upstream fixes from php73+.
# https://bugs.php.net/80176
# https://trac.macports.org/ticket/60988
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qmake5-1.0.tcl b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7125b8b4095..8dd104fb9ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@ pre-configure {
</span> # -spec specifies build configuration (compiler, 32-bit/64-bit, etc.)
#
if { [tbool qt5.add_spec] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt5.version} 5.9]>=0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} >= 5.9]} {
</span> configure.args-append "${qt5.spec_cmd}${qt_qmake_spec}"
} else {
if {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,7 @@ pre-configure {
</span> set cache_file "${qt5.top_level}/.qmake.cache"
set cache [open ${cache_file} w 0644]
ui_debug "QT5 Qmake Cache ${cache_file}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt5.version} 5.9] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} >= 5.9]} {
</span> if {[variant_exists universal] && [variant_isset universal]} {
puts ${cache} "QMAKE_APPLE_DEVICE_ARCHS=${configure.universal_archs}"
} elseif { ${configure.build_arch} ne "" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,7 +118,7 @@ pre-configure {
</span>
# https://github.com/qt/qtbase/commit/d64940891dffcb951f4b76426490cbc94fb4aba7
# Enable ccache support if active and available in given qt5 version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [option configure.ccache] && [vercmp ${qt5.version} 5.9.2] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option configure.ccache] && [vercmp ${qt5.version} >= 5.9.2]} {
</span> puts ${cache} "CONFIG+=ccache"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,7 +155,7 @@ pre-configure {
</span> set qmake5_c_flags [join ${qmake5_c_flags} " "]
set qmake5_l_flags [join ${qmake5_l_flags} " "]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [vercmp ${qt5.version} 5.6] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [vercmp ${qt5.version} >= 5.6]} {
</span> # see https://trac.macports.org/ticket/59128 for `${configure.cxx_stdlib} ne ""` test
if { ${configure.cxx_stdlib} ne "libc++" && ${configure.cxx_stdlib} ne "" } {
# override C++ flags set in ${prefix}/libexec/qt5/mkspecs/common/clang-mac.conf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,7 +168,7 @@ pre-configure {
</span> if {${qmake5_cxx11_flags} ne ""} {
puts ${cache} QMAKE_CXXFLAGS+="${qmake5_cxx11_flags}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { [vercmp ${qt5.version} 5.5] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { [vercmp ${qt5.version} >= 5.5]} {
</span>
# always use the same standard library
puts ${cache} QMAKE_CXXFLAGS+=-stdlib=${configure.cxx_stdlib}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -252,7 +252,7 @@ pre-configure {
</span> }
# respect configure.optflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt5.version} 5.9] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} >= 5.9]} {
</span> puts ${cache} "CONFIG+=optimize_size"
puts ${cache} "QMAKE_CFLAGS_OPTIMIZE_SIZE=${configure.optflags}"
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a764b2c1df9..7270cfe30d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,10 +48,10 @@ global qt_qmake_spec_32
</span> global qt_qmake_spec_64
compiler.blacklist-append *gcc*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${qt5.version} 5.15]>=0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${qt5.version} >= 5.15]} {
</span> # only qt5 5.15.x has so far been built as arm64 on MacPorts
default supported_archs "x86_64 arm64"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[vercmp ${qt5.version} 5.10]>=0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[vercmp ${qt5.version} >= 5.10]} {
</span> # see https://bugreports.qt.io/browse/QTBUG-58401
default supported_archs x86_64
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,7 @@ if {[vercmp ${qt5.version} 5.15]>=0} {
</span> default supported_archs "i386 x86_64"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${qt5.version} 5.9]>=0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${qt5.version} >= 5.9]} {
</span> # in version 5.9, QT changed how it handles multiple architectures
# see http://web.archive.org/web/20170621174843/http://doc.qt.io/qt-5/osx.html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -235,10 +235,10 @@ namespace eval qt5pg {
</span> set component_info $qt5pg::qt5_component_lib(${component})
set path [lindex ${component_info} 2]
set version_intro [lindex ${component_info} 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt5.version} ${version_intro}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} >= ${version_intro}]} {
</span> depends_lib-append path:${path}:${qt5.name}-${component}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt5.version} ${qt5.min_version}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} >= ${qt5.min_version}]} {
</span> ui_warn "${component} does not exist in Qt ${qt5.version}"
} else {
# port will fail during pre-fetch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -253,10 +253,10 @@ namespace eval qt5pg {
</span> set component_info $qt5pg::qt5_component_lib(${component})
set path [lindex ${component_info} 2]
set version_intro [lindex ${component_info} 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt5.version} ${version_intro}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} >= ${version_intro}]} {
</span> depends_build-append path:${path}:${qt5.name}-${component}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt5.version} ${qt5.min_version}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} >= ${qt5.min_version}]} {
</span> ui_warn "${component} does not exist in Qt ${qt5.version}"
} else {
# port will fail during pre-fetch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -271,10 +271,10 @@ namespace eval qt5pg {
</span> set component_info $qt5pg::qt5_component_lib(${component})
set path [lindex ${component_info} 2]
set version_intro [lindex ${component_info} 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt5.version} ${version_intro}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} >= ${version_intro}]} {
</span> depends_run-append path:${path}:${qt5.name}-${component}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt5.version} ${qt5.min_version}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} >= ${qt5.min_version}]} {
</span> ui_warn "${component} does not exist in Qt ${qt5.version}"
} else {
# port will fail during pre-fetch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -294,7 +294,7 @@ if {!${private_building_qt5}} {
</span>
proc qt5pg::check_min_version {} {
global qt5.version qt5.min_version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt5.version} ${qt5.min_version}] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} < ${qt5.min_version}]} {
</span> known_fail yes
pre-fetch {
ui_error "Qt version ${qt5.min_version} or above is required, but Qt version ${qt5.version} is installed"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt6-1.0.tcl b/_resources/port1.0/group/qt6-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b2fdc825463..2dd4fea1736 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt6-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt6-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,10 +121,10 @@ namespace eval qt6pg {
</span> set component_info $qt6pg::qt6_component_lib(${component})
set path [lindex ${component_info} 2]
set version_intro [lindex ${component_info} 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt6.version} ${version_intro}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt6.version} >= ${version_intro}]} {
</span> depends_lib-append path:${path}:${qt6.name}-${component}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt6.version} ${qt6.min_version}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt6.version} >= ${qt6.min_version}]} {
</span> ui_warn "${component} does not exist in Qt ${qt6.version}"
} else {
# port will fail during pre-fetch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,10 +139,10 @@ namespace eval qt6pg {
</span> set component_info $qt6pg::qt6_component_lib(${component})
set path [lindex ${component_info} 2]
set version_intro [lindex ${component_info} 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt6.version} ${version_intro}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt6.version} >= ${version_intro}]} {
</span> depends_build-append path:${path}:${qt6.name}-${component}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt6.version} ${qt6.min_version}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt6.version} >= ${qt6.min_version}]} {
</span> ui_warn "${component} does not exist in Qt ${qt6.version}"
} else {
# port will fail during pre-fetch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,10 +157,10 @@ namespace eval qt6pg {
</span> set component_info $qt6pg::qt6_component_lib(${component})
set path [lindex ${component_info} 2]
set version_intro [lindex ${component_info} 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt6.version} ${version_intro}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt6.version} >= ${version_intro}]} {
</span> depends_run-append path:${path}:${qt6.name}-${component}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt6.version} ${qt6.min_version}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt6.version} >= ${qt6.min_version}]} {
</span> ui_warn "${component} does not exist in Qt ${qt6.version}"
} else {
# port will fail during pre-fetch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,7 +179,7 @@ if {!${private_building_qt6}} {
</span>
proc qt6pg::check_min_version {} {
global qt6.version qt6.min_version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt6.version} ${qt6.min_version}] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt6.version} < ${qt6.min_version}]} {
</span> known_fail yes
pre-fetch {
ui_error "Qt version ${qt6.min_version} or above is required, but Qt version ${qt6.version} is installed"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/rust-1.0.tcl b/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f590df6c2cb..c58cf46e608 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +149,7 @@ proc rust.add_bootstrap_components {architectures {components {rust-std rustc ca
</span> set rustc_version ${version_m1}; # ensure value is always set (see https://trac.macports.org/ticket/65183)
foreach arch ${architectures} {
# rust-bootstrap requires `macosx_deployment_target` instead of `os.major`
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${arch} in [option rust.upstream_archs] && [vercmp [option macosx_deployment_target] [option rust.upstream_deployment_target]] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${arch} in [option rust.upstream_archs] && [vercmp [option macosx_deployment_target] >= [option rust.upstream_deployment_target]]} {
</span> set build_vendor apple
if { ${is_bootstrap} } {
set rustc_version ${version_m2}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -546,7 +546,7 @@ proc rust::old_macos_compatibility {cname cversion} {
</span> }
# rust-bootstrap requires `macosx_deployment_target` instead of `os.major`
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option os.platform] ne "darwin" || [vercmp [option macosx_deployment_target] 10.8] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option os.platform] ne "darwin" || [vercmp [option macosx_deployment_target] >= 10.8]} {
</span> return
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -576,7 +576,7 @@ proc rust::old_macos_compatibility {cname cversion} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option os.platform] ne "darwin" || [vercmp [option macosx_deployment_target] 10.6] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option os.platform] ne "darwin" || [vercmp [option macosx_deployment_target] >= 10.6]} {
</span> return
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -776,7 +776,7 @@ proc rust::rust_pg_callback {} {
</span> }
# rust-bootstrap requires `macosx_deployment_target` instead of `os.major`
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [option os.platform] eq "darwin" && [vercmp [option macosx_deployment_target] 10.6] < 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option os.platform] eq "darwin" && [vercmp [option macosx_deployment_target] < 10.6]} {
</span> # __Unwind_RaiseException
depends_lib-delete port:libunwind
depends_lib-append port:libunwind
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/wxWidgets-1.0.tcl b/_resources/port1.0/group/wxWidgets-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c7cb749523a..ee1446b5ea9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/wxWidgets-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/wxWidgets-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,13 +194,13 @@ proc wxWidgets._set {option action args} {
</span>
pre-fetch {
# 10.8 (or later) -or- 10.7 with Xcode 4.4 (or later)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 12 || [vercmp $xcodeversion 4.4] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 12 || [vercmp $xcodeversion >= 4.4]} {
</span> ui_error "${wxWidgets.port} cannot be built on macOS >= 10.7 with Xcode >= 4.4; please use port wxWidgets-3.0 or wxgtk-2.8 instead"
return -code return "wxWidgets-2.8 cannot be built on macOS >= 10.7 with Xcode >= 4.4; please use port wxWidgets-3.0 or wxgtk-2.8 instead"
} else {
# 10.7
if {${os.major} == 11} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $xcodeversion 4.3] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $xcodeversion < 4.3]} {
</span> set sdks_dir "${developer_dir}/SDKs"
} else {
set sdks_dir "${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/xcode-1.0.tcl b/_resources/port1.0/group/xcode-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index aba4242ab5f..20f22ea7a45 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/xcode-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/xcode-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +100,7 @@ proc xcode::get_project_path {} {
</span> # fix resource dependencies (with Xcode >= 2.1).
proc xcode::fix_resource_dependencies {} {
global xcodeversion xcode.configuration
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $xcodeversion 2.1] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $xcodeversion >= 2.1]} {
</span> set build_path "[xcode::get_project_path]/build/"
set config_build_path "[xcode::get_project_path]/build/${xcode.configuration}/"
if {[file isdirectory ${config_build_path}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,7 +118,7 @@ proc xcode::fix_resource_dependencies {} {
</span> proc xcode::get_configuration_arg { style } {
global xcodeversion
if {${style} ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${xcodeversion} 2.1] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} >= 2.1]} {
</span> return "-configuration ${style}"
} else {
return "-buildstyle ${style}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/xcode_workaround-1.0.tcl b/_resources/port1.0/group/xcode_workaround-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ed237b0778..1e1b4291458 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/xcode_workaround-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/xcode_workaround-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +57,7 @@ proc xcode_workaround::xcode_workaround.appy_fix {} {
</span> if { ${os.major} == 19 } {
set attempt_fix yes
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} == 18 && [vercmp $xcodeversion 11] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} == 18 && [vercmp $xcodeversion >= 11]} {
</span> set attempt_fix yes
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,14 +66,14 @@ proc xcode_workaround::xcode_workaround.appy_fix {} {
</span>
# Check if Xcode is newer than defined fixed version
# N.B. vercmp should properly handle none or "" for $xcodeversion or $cltversion
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set xcode_is_ok [expr [vercmp $xcodeversion ${xcode_workaround.fixed_xcode_version}] >= 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set xcode_is_ok [vercmp $xcodeversion >= ${xcode_workaround.fixed_xcode_version}]
</span>
# Check flag from cltversion PG to see if Xcode or CLT should be used
if {${use_xcode}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set attempt_fix [expr !${xcode_is_ok}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set attempt_fix [expr {!${xcode_is_ok}}]
</span> } else {
# Check if CLT version is fixed or not
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set clt_is_ok [expr [vercmp $cltversion ${xcode_workaround.fixed_xcode_version}] >= 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set clt_is_ok [vercmp $cltversion >= ${xcode_workaround.fixed_xcode_version}]
</span> # If broken, but Xcode OK, use that instead
if {${xcode_is_ok} && !${clt_is_ok}} {
# MacPorts defaults to CLTs, but Xcode can easily be ahead
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +81,7 @@ proc xcode_workaround::xcode_workaround.appy_fix {} {
</span> use_xcode yes
set attempt_fix no
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set attempt_fix [expr !${clt_is_ok}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set attempt_fix [expr {!${clt_is_ok}}]
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/xcodeversion-1.0.tcl b/_resources/port1.0/group/xcodeversion-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f9d59d97052..b4b9b415c85 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/xcodeversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/xcodeversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ platform macosx {
</span> ui_error "See https://guide.macports.org/chunked/installing.xcode.html for download links."
ui_error ""
return -code error "unable to find Xcode"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[vercmp ${xcodeversion} ${minimum_xcodeversion}] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[vercmp ${xcodeversion} < ${minimum_xcodeversion}]} {
</span> ui_error "On macOS ${macos_version_major}, ${name} @${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${xcodeversion}."
ui_error "See https://guide.macports.org/chunked/installing.xcode.html for download links."
return -code error "incompatible Xcode version"
</pre><pre style='margin:0'>
</pre>