<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e9234c19855519d76b02238a5dc823245a6481e2">https://github.com/macports/macports-ports/commit/e9234c19855519d76b02238a5dc823245a6481e2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e9234c19855519d76b02238a5dc823245a6481e2
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Oct 5 01:36:52 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> ROOT5: Remove support for macOS10.13 and newer.
</span>---
science/root5/Portfile | 40 +++++++++++++++++++++++++++++++---------
1 file changed, 31 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root5/Portfile b/science/root5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 79d015c..e17352e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,15 +7,15 @@ PortGroup select 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#github.setup root-mirror root 5-34-36 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup root-mirror root c06fdea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#github.setup root-project root 5-34-36 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup root-project root d02b60bde4176bfa9acef498491833ea4a55ccf9
</span> version 5.34.37
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
set version_major [lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4d28ced0f6faee87e5dd7130f96c15fd0237041b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 da68645b5c31b6fe2c52cf73a6f7c848d3ccdd2ef68436b953c95c55cb030468
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ce36223d2177eb1865c963bb5eba636f0fde41f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a62826802d67d32dfcaadff07f181a45032d79d740c07c70eabfb13fa5fdec8e
</span>
name root${version_major}
categories science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ select.group root
</span> select.file ${filespath}/${name}
# Force a compatible compiler
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append *gcc* {clang < 500} macports-clang-3.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc* {clang < 500} {clang > 890} macports-clang-3.3
</span> compiler.fallback-append macports-clang-3.8 macports-clang-3.7 macports-clang-3.6 macports-clang-3.5
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,6 +201,14 @@ if {${os.major} > 10} {
</span> set default_gui_variant +x11
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ROOT5 is no longer support from macOS 10.13.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} > 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} is not supported on macOS 10.13 or newer. Please migrate to ROOT6."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Unsupported OSX version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant http description {Build with HTTP Server library support} {
configure.args-replace --disable-http --enable-http
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -492,7 +500,7 @@ if { ![variant_isset cocoa] && ![variant_isset x11] } {
</span> # ========================================================================================
# List of possible clang versions that work
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set clang_versions { 3.4 3.5 3.6 3.7 3.8 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clang_versions { 3.4 3.5 3.6 3.7 3.8 3.9 }
</span>
# Define the available variants
foreach ver ${clang_versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -509,13 +517,27 @@ foreach ver ${clang_versions} {
</span>
# make sure that the proper variant is automatically selected
# (ROOT crashes if the compiler it was built with doesn't exist)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset clang33] && ![variant_isset clang34] && ![variant_isset clang35]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.compiler} eq "macports-clang-3.3" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ![variant_isset clang33] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang34] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang36] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang37] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang38] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang39] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.compiler} eq "macports-clang-3.3" } {
</span> default_variants-append +clang33
} elseif { ${configure.compiler} eq "macports-clang-3.4" } {
default_variants-append +clang34
} elseif { ${configure.compiler} eq "macports-clang-3.5" } {
default_variants-append +clang35
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.compiler} eq "macports-clang-3.6" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.compiler} eq "macports-clang-3.7" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.compiler} eq "macports-clang-3.8" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.compiler} eq "macports-clang-3.9" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang39
</span> }
}
</pre><pre style='margin:0'>
</pre>