<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/e261e97712ccd613d65561b6874909669a561b1c">https://github.com/macports/macports-ports/commit/e261e97712ccd613d65561b6874909669a561b1c</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 e261e97 ROOT6: Update to 6.12/04
</span>e261e97 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e261e97712ccd613d65561b6874909669a561b1c
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Dec 13 23:06:40 2017 +0000
<span style='display:block; white-space:pre;color:#404040;'> ROOT6: Update to 6.12/04
</span>---
science/root6/Portfile | 6 +++---
science/root6/files/patch-disable-hsimple-macro.diff | 14 +++++++++-----
2 files changed, 12 insertions(+), 8 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 6c7271f..72a193e 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;'>@@ -10,7 +10,7 @@ PortGroup select 1.0
</span> PortGroup xcodeversion 1.0
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup root-project root 6-10-08 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup root-project root 6-12-04 v
</span> version [string map {- .} ${github.version}]
revision 0
livecheck.version ${github.version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,8 +22,8 @@ livecheck.version ${github.version}
</span>
set version_major [lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ee48c2357b2022ef76473f4c729036ca21e9d44b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5f118dc2ccee5f2b9a3baf0793c5f34783fd5c07a1541591a279eb90e6fe3f3f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b323ccefc22a55dd587cf0673ddd40a5621d68f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c655b6ff0b8359355e1a71f648a862d67b21abe78c7f75062cf6b93404dce927
</span>
name root${version_major}
categories science
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root6/files/patch-disable-hsimple-macro.diff b/science/root6/files/patch-disable-hsimple-macro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c47e550..39a3ddb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root6/files/patch-disable-hsimple-macro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root6/files/patch-disable-hsimple-macro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.original.txt 2017-06-14 09:49:07.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2017-06-14 09:51:10.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -294,24 +294,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2017-12-13 07:27:42.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2017-12-13 22:33:48.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -360,26 +360,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span>
#---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(NOT WIN32)
</span> -add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
-add_dependencies(hsimple onepcm)
-if(WIN32)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,6 +23,8 @@
</span> - DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
-endif()
-install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if(NOT WIN32)
</span> +#add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
+#add_dependencies(hsimple onepcm)
+#if(WIN32)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +43,7 @@
</span> +# DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
+#endif()
+#install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif()
</span>
#---version--------------------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>- add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT WIN32)
</span></pre><pre style='margin:0'>
</pre>