<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/0157b117dc7b7ad87bd7fb955946da2c27c5fd15">https://github.com/macports/macports-ports/commit/0157b117dc7b7ad87bd7fb955946da2c27c5fd15</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 0157b11 root6: update to 6.18.00
</span>0157b11 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0157b117dc7b7ad87bd7fb955946da2c27c5fd15
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Jun 26 10:26:28 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> root6: update to 6.18.00
</span>---
science/root6/Portfile | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root6/Portfile b/science/root6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5afcf8b..fd54bb4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ PortGroup xcodeversion 1.0
</span> PortGroup cxx11 1.1
PortGroup legacysupport 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup root-project root 6-16-00 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup root-project root 6-18-00 v
</span> version [string map {- .} ${github.version}]
revision 2
livecheck.version ${github.version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,15 +23,18 @@ livecheck.version ${github.version}
</span> #livecheck.version 6-14-00
#revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# extract major version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set version_major [lindex [split ${version} .] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url ${github.homepage}/tags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {v(6[-.]\d[02468][-.]\d{2}).tar.gz}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# even numbered minor releases are production releases, odd are developmental so skip.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Also, skip anything with trailing rcX etc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {v(6[-.]\d[024678][-.]\d{2}).tar.gz}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_major [lindex [split ${version} .] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2f0a7290099087f29ca4808ad3ed6c3c04729075 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fe60cde3f3f909c6840781c4c46f3f040014bd1e65cc56634eccd820f9dbd7bf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 164845858
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 62811d368040e06fd13a1c78c2fbd069d9f95f99 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3845a8244cc329cc5ede4d18908882a397719a507ff89adc244cca89f4526705 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 165926785
</span>
name root${version_major}
categories science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +72,6 @@ depends_lib-append port:expat \
</span> port:lzma \
port:pcre \
port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span> port:xz \
port:gl2ps \
port:lz4 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +80,10 @@ depends_lib-append port:expat \
</span> port:git \
path:lib/libopenblas.dylib:OpenBLAS \
path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# port:freetype
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Use builtin zlib instead as upstream claims has better performance
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://root.cern/content/release-61800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port:zlib
</span>
depends_run port:root_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +111,7 @@ configure.args-append \
</span> -Dbuiltin_freetype=ON \
-Dbuiltin_glew=OFF \
-Dbuiltin_pcre=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dbuiltin_zlib=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuiltin_zlib=ON \
</span> -Dbuiltin_lzma=OFF \
-Dbuiltin_tbb=OFF \
-Dbuiltin_afterimage=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +154,6 @@ configure.args-append \
</span> -Dgenvector=ON \
-Dmemstat=ON \
-Dunuran=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dtable=ON \
</span> -Dgdml=ON \
-Dhttp=ON \
-Dvc=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -524,14 +528,14 @@ variant sqlite3 description {Build with sqlite3 support} {
</span> depends_lib-append port:sqlite3
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql conflicts mariadb percona description {Build with mysql 5.7 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql conflicts mariadb percona description {Build with mysql support} {
</span> set ver 57
configure.args-replace -Dmysql=OFF -Dmysql=ON
configure.args-append -DMYSQL_CONFIG_EXECUTABLE=${prefix}"/lib/mysql${ver}/bin/mysql_config"
depends_lib-append port:mysql${ver}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mariadb conflicts mysql percona description {Build with mariadb 10.2 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mariadb conflicts mysql percona description {Build with mariadb support} {
</span> set ver 10.2
configure.args-replace -Dmysql=OFF -Dmysql=ON
configure.args-append -DMYSQL_CONFIG_EXECUTABLE=${prefix}"/lib/mariadb-${ver}/bin/mysql_config"
</pre><pre style='margin:0'>
</pre>