<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/1916d6f553cde96dd98c720e3b78a8f9bf29ca85">https://github.com/macports/macports-base/commit/1916d6f553cde96dd98c720e3b78a8f9bf29ca85</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1916d6f5 Adapt to macOS versioning changes
</span>1916d6f5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1916d6f553cde96dd98c720e3b78a8f9bf29ca85
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Nov 21 01:14:25 2020 +1100
<span style='display:block; white-space:pre;color:#404040;'> Adapt to macOS versioning changes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Deprecate macosx_version and add new variables macos_version, containing
</span><span style='display:block; white-space:pre;color:#404040;'> the full OS version, and macos_version_major, containing the leading
</span><span style='display:block; white-space:pre;color:#404040;'> version number segment that remains constant throughout the lifetime of a
</span><span style='display:block; white-space:pre;color:#404040;'> major OS release, like 10.15 for Catalina or 11 for Big Sur.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The situation with SDK versioning going forward is still a bit unclear and
</span><span style='display:block; white-space:pre;color:#404040;'> make need further tweaking.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://github.com/macports/macports-base/pull/181
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://github.com/macports/macports-base/pull/180
</span>---
src/macports1.0/diagnose.tcl | 10 ++++-----
src/macports1.0/macports.tcl | 44 +++++++++++++++++++++++++++-----------
src/port1.0/portconfigure.tcl | 8 +++----
src/port1.0/portlint.tcl | 5 +++++
src/port1.0/portmain.tcl | 6 +++---
src/port1.0/porttrace.tcl | 4 +---
src/port1.0/portutil.tcl | 14 ++++++------
src/port1.0/tests/portinstall.test | 2 +-
src/port1.0/tests/portmain.test | 2 +-
src/port1.0/tests/portpatch.test | 2 +-
src/port1.0/tests/portutil.test | 4 ++--
11 files changed, 60 insertions(+), 41 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/diagnose.tcl b/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 488b006e..f53ea3da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +91,7 @@ namespace eval diagnose {
</span>
array set config_options [list]
set parser_options [list macports_location profile_path shell_location \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xcode_version_${macports::macosx_version} xcode_build]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xcode_version_${macports::macos_version_major} xcode_build]
</span>
set user_config_path "${macports::autoconf::macports_conf_path}/port_diagnose.ini"
set xcode_config_path [macports::getdefaultportresourcepath "macports1.0/xcode_versions.ini"]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,9 +150,7 @@ namespace eval diagnose {
</span>
output "command line tools"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set version ${macports::macosx_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$version eq "10.9"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${macports::macos_version_major} eq "10.9"} {
</span>
if {![file exists "/Library/Developer/CommandLineTools/"]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -491,7 +489,7 @@ namespace eval diagnose {
</span> # Returns:
# None
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${macports::macosx_version} eq "10.6"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${macports::macos_version_major} eq "10.6"} {
</span> output "X11.app on Mac OS X 10.6 systems"
if {[file exists /Applications/X11.app]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -587,7 +585,7 @@ namespace eval diagnose {
</span>
upvar $config_options config
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set mac_version ${macports::macosx_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mac_version ${macports::macos_version_major}
</span> set xcode_current ${macports::xcodeversion}
if {[info exists config(xcode_version_$mac_version)]} {
set xcode_versions $config(xcode_version_$mac_version)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f0d665ed..9d127e15 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,9 +68,9 @@ namespace eval macports {
</span> configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \
applications_dir applications_dir_frozen current_phase frameworks_dir frameworks_dir_frozen \
developer_dir universal_archs build_arch os_arch os_endian os_version os_major os_minor \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- os_platform os_subplatform macosx_version macosx_sdk_version macosx_deployment_target \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- packagemaker_path default_compilers sandbox_enable sandbox_network delete_la_files cxx_stdlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkg_post_unarchive_deletions $user_options"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os_platform os_subplatform macos_version macos_version_major macosx_version macosx_sdk_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macosx_deployment_target packagemaker_path default_compilers sandbox_enable sandbox_network \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete_la_files cxx_stdlib pkg_post_unarchive_deletions $user_options"
</span>
# deferred options are only computed when needed.
# they are not exported to the trace thread.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,7 +169,7 @@ proc macports::_log_sysinfo {} {
</span> global macports::os_platform macports::os_subplatform \
macports::os_version macports::os_major macports::os_minor \
macports::os_endian macports::os_arch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- macports::macosx_version macports::macosx_sdk_version macports::macosx_deployment_target \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports::macos_version macports::macosx_sdk_version macports::macosx_deployment_target \
</span> macports::xcodeversion
global tcl_platform
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,12 +178,12 @@ proc macports::_log_sysinfo {} {
</span>
if {$os_platform eq "darwin"} {
if {$os_subplatform eq "macosx"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $macosx_version 10.12] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set os_version_string "macOS ${macosx_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[vercmp $macosx_version 10.8] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set os_version_string "OS X ${macosx_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $macos_version 10.12] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set os_version_string "macOS ${macos_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[vercmp $macos_version 10.8] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set os_version_string "OS X ${macos_version}"
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set os_version_string "Mac OS X ${macosx_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set os_version_string "Mac OS X ${macos_version}"
</span> }
} else {
set os_version_string "PureDarwin ${os_version}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -672,6 +672,8 @@ proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
</span> macports::os_minor \
macports::os_platform \
macports::os_subplatform \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports::macos_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports::macos_version_major \
</span> macports::macosx_version \
macports::macosx_sdk_version \
macports::macosx_deployment_target \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -710,14 +712,14 @@ proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
</span> # Remove trailing "Endian"
set os_endian [string range $tcl_platform(byteOrder) 0 end-6]
set os_subplatform {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set macosx_version {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macos_version {}
</span> if {$os_platform eq "darwin"} {
if {[file isdirectory /System/Library/Frameworks/Carbon.framework]} {
# macOS
set os_subplatform macosx
if {[file executable /usr/bin/sw_vers]} {
try -pass_signal {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set macosx_version [exec /usr/bin/sw_vers -productVersion | cut -f1,2 -d.]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macos_version [exec /usr/bin/sw_vers -productVersion]
</span> } catch {* ec result} {
ui_debug "sw_vers exists but running it failed: $result"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -727,6 +729,14 @@ proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
</span> set os_subplatform puredarwin
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $macos_version 11] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Big Sur is apparently any 11.x version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macos_version_major [lindex [split $macos_version .] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macos_version_major [join [lrange [split $macos_version .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # backward compatibility synonym
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macosx_version $macos_version_major
</span>
# Check that the current platform is the one we were configured for, otherwise need to do migration
if {($os_platform ne $macports::autoconf::os_platform) || ($os_platform eq "darwin" && $os_major != $macports::autoconf::os_major)} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1143,10 +1153,18 @@ match macports.conf.default."
</span> }
if {![info exists macports::macosx_deployment_target]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set macports::macosx_deployment_target $macosx_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $macos_version 11] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macports::macosx_deployment_target ${macos_version_major}.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macports::macosx_deployment_target $macos_version_major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {![info exists macports::macosx_sdk_version]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set macports::macosx_sdk_version $macosx_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $macos_version 11] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macports::macosx_sdk_version ${macos_version_major}.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macports::macosx_sdk_version $macos_version_major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {![info exists macports::revupgrade_autorun]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index aad5d777..e472fb2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -508,7 +508,7 @@ proc portconfigure::configure_get_ld_archflags {} {
</span> }
proc portconfigure::configure_get_sdkroot {sdk_version} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global developer_dir macosx_version xcodeversion os.arch os.major os.platform use_xcode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global developer_dir macos_version_major xcodeversion os.arch os.major os.platform use_xcode
</span>
# This is only relevant for macOS
if {${os.platform} ne "darwin"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -516,12 +516,12 @@ proc portconfigure::configure_get_sdkroot {sdk_version} {
</span> }
# Special hack for Tiger/ppc, since the system libraries do not contain intel slices
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.arch} eq "powerpc" && $macosx_version eq "10.4" && [variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.arch} eq "powerpc" && $macos_version_major eq "10.4" && [variant_exists universal] && [variant_isset universal]} {
</span> return ${developer_dir}/SDKs/MacOSX10.4u.sdk
}
# Use the DevSDK (eg: /usr/include) if present and the requested SDK version matches the host version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 19 && $sdk_version eq $macosx_version && [file exists /usr/include/sys/cdefs.h]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 19 && $sdk_version eq $macos_version_major && [file exists /usr/include/sys/cdefs.h]} {
</span> return {}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -618,7 +618,7 @@ proc portconfigure::configure_get_sdkroot {sdk_version} {
</span> return $sdk
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # We can get here if $sdk_version != $macosx_version on old OS versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We can get here if $sdk_version != $macos_version_major on old OS versions
</span> return {}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portlint.tcl b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 9460b7e5..468cef3d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -477,6 +477,11 @@ proc portlint::lint_main {args} {
</span> incr errors
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[regexp {\$\{?macosx_version} $line]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Line $lineno using macosx_version; switch to macos_version or macos_version_major"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incr warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ### TODO: more checks to Portfile syntax
incr lineno
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portmain.tcl b/src/port1.0/portmain.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index df41f183..dedcf929 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portmain.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portmain.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,11 +135,11 @@ default os.minor {$os_minor}
</span> default os.arch {$os_arch}
default os.endian {$os_endian}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set macosx_version_text {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set macos_version_text {}
</span> if {[option os.platform] eq "darwin"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set macosx_version_text "(macOS ${macosx_version}) "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macos_version_text "(macOS ${macos_version}) "
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ui_debug "OS [option os.platform]/[option os.version] ${macosx_version_text}arch [option os.arch]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ui_debug "OS [option os.platform]/[option os.version] ${macos_version_text}arch [option os.arch]"
</span>
default universal_variant {${use_configure}}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/porttrace.tcl b/src/port1.0/porttrace.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ce3f6e0..caeb8e15 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/porttrace.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/porttrace.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -273,9 +273,7 @@ namespace eval porttrace {
</span> # the communication socket. Just must call this once for each call to
# trace_start.
proc trace_stop {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macosx_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global env
</span>
variable fifo
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 816b91e4..cff6e706 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1343,7 +1343,7 @@ set ports_dry_last_skipped ""
</span> proc target_run {ditem} {
global target_state_fd workpath portpath ports_trace PortInfo ports_dryrun \
ports_dry_last_skipped worksrcpath subport env portdbpath \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- macosx_version prefix_frozen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix_frozen
</span> set portname $subport
set result 0
set skipped 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3274,10 +3274,10 @@ proc check_supported_archs {} {
</span>
# check if the installed xcode version is new enough
proc _check_xcode_version {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global os.subplatform os.major macosx_version xcodeversion use_xcode subport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global os.subplatform os.major macos_version_major xcodeversion use_xcode subport
</span>
if {${os.subplatform} eq "macosx"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- switch $macosx_version {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch $macos_version_major {
</span> 10.4 {
set min 2.0
set ok 2.4.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3359,15 +3359,15 @@ proc _check_xcode_version {} {
</span> return 1
}
} elseif {[vercmp $xcodeversion $min] < 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "The installed version of Xcode (${xcodeversion}) is too old to use on the installed OS version. Version $rec or later is recommended on macOS ${macosx_version}."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "The installed version of Xcode (${xcodeversion}) is too old to use on the installed OS version. Version $rec or later is recommended on macOS ${macos_version_major}."
</span> return 1
} elseif {[vercmp $xcodeversion $ok] < 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "The installed version of Xcode (${xcodeversion}) is known to cause problems. Version $rec or later is recommended on macOS ${macosx_version}."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "The installed version of Xcode (${xcodeversion}) is known to cause problems. Version $rec or later is recommended on macOS ${macos_version_major}."
</span> }
# Xcode 4.3 and above requires the command-line utilities package to be installed.
if {[vercmp $xcodeversion 4.3] >= 0 || ($xcodeversion eq "none" && [file exists "/Applications/Xcode.app"])} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $macosx_version 10.9] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $macos_version_major 10.9] >= 0} {
</span> # on Mavericks, /usr/bin/make might always installed as a shim into the command line tools installer.
# Let's check for /Library/Developer/CommandLineTools, installed by the
# com.apple.pkg.CLTools_Executables package.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3383,7 +3383,7 @@ proc _check_xcode_version {} {
</span> } else {
ui_warn "System headers do not appear to be installed. Most ports should build correctly, but if you experience problems due to a port depending on system headers, please file a ticket at https://trac.macports.org."
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $macosx_version 10.9] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $macos_version_major 10.9] >= 0} {
</span> ui_warn "You can install them as part of the Xcode Command Line Tools package by running `xcode-select --install'."
} else {
ui_warn "You can install them as part of the Xcode Command Line Tools package from Xcode's Preferences in the Downloads section."
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/tests/portinstall.test b/src/port1.0/tests/portinstall.test
</span><span style='display:block; white-space:pre;color:#808080;'>index b9e0e49c..c55cefec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/tests/portinstall.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/tests/portinstall.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ macports_worker_init
</span>
# Set env vars
set os.platform darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set macosx_version 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set macos_version 10.8.0
</span> set os_version 12
set os_arch i386
set os.major 10
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/tests/portmain.test b/src/port1.0/tests/portmain.test
</span><span style='display:block; white-space:pre;color:#808080;'>index ce0a6810..dc05fc8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/tests/portmain.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/tests/portmain.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ package require portmain 1.0
</span>
# Set testing vars
set os_platform darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set macosx_version 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set macos_version 10.8.0
</span> set os_version 12
set os_arch i386
set portpath .
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/tests/portpatch.test b/src/port1.0/tests/portpatch.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 9f368137..28f84925 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/tests/portpatch.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/tests/portpatch.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ test patch_main {
</span> } -constraints {
root
} -setup {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set macosx_version 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macos_version 11.0.1
</span>
set subport gcc_select
set filespath $pwd/files
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/tests/portutil.test b/src/port1.0/tests/portutil.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 183511df..75dd3a22 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/tests/portutil.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/tests/portutil.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,11 +34,11 @@ proc init {} {
</span> }
proc init_eval_targets {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global os_platform os_version os_arch macosx_version pwd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global os_platform os_version os_arch macos_version pwd \
</span> version mport portpath portbuildpath macports::portdbpath
set os_platform darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set macosx_version 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macos_version 10.8.0
</span> set os_version 11
set os_arch i386
set portpath .
</pre><pre style='margin:0'>
</pre>