<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4c958b0706ceaadd6f36510091051c3ee7da054d">https://github.com/macports/macports-ports/commit/4c958b0706ceaadd6f36510091051c3ee7da054d</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 4c958b0 geant4: fix location of cmake files, c++11
</span>4c958b0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4c958b0706ceaadd6f36510091051c3ee7da054d
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Thu Feb 15 21:58:34 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> geant4: fix location of cmake files, c++11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Some patches for geant4.10.4 were forgotten.
</span><span style='display:block; white-space:pre;color:#404040;'> This commit fixes location of installed cmake modules
</span><span style='display:block; white-space:pre;color:#404040;'> and makes sure that cxx11 1.0 is used (1.1 has not been tested yet).
</span>---
science/geant4/Portfile | 20 ++++++++------------
...e-Modules-G4ConfigureCMakeHelpers.cmake.4104.diff | 11 +++++++++++
2 files changed, 19 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/geant4/Portfile b/science/geant4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e6f085b..119635d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/geant4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/geant4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ set geant.versions_info {
</span> 10.1 1 0 3 4.10.01.p03 0b141adfceb4203f4855e0c6fb0d4c17036776ca b198943b5bc4fd7968ef4eaa5bbe2fb094b8df1d907a05486dc05f4c92bbb174
10.2 1 1 3 4.10.02.p03 c45d91fb2def7143e6dcccb5d11907454be77386 e0bba0a9c937430e7dfac158873e218fafc0f167b12e7ff3d17ce13cbe550c4f
10.3 0 0 3 4.10.03.p03 e4e18181ab777811415b85341caec658d14f7427 a164f49c038859ab675eec474d08c9d02be8c4be9c0c2d3aa8e69adf89e1e138
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 10.4 0 0 0 4.10.04 740375629e95747af7c845bc876701bf989354b1 f6d883132f110eb036c69da2b21df51f13c585dc7b99d4211ddd32f4ccee1670
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.4 1 0 0 4.10.04 740375629e95747af7c845bc876701bf989354b1 f6d883132f110eb036c69da2b21df51f13c585dc7b99d4211ddd32f4ccee1670
</span> }
# NAME VERS FILENAME ENVVAR md5 rmd160 sha256
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -241,25 +241,21 @@ foreach {geant.version geant.revision geant.datarevision geant.patchlevel geant.
</span> # prevents linking against X11 in /usr (maybe less aggressive patch would also work)
# - patch-cmake-Modules-Geant4BuildProjectConfig.cmake:
# allows placing *.cmake files to a different location than LIBDIR
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${geant.version} == "10.3"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # a bit of a guesswork (the list was not really tested)
</span><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:#ffe0e0;'>- compiler.fallback-append macports-clang-3.9 macports-clang-3.8 macports-clang-3.7 macports-clang-3.6 macports-clang-3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${geant.version} == 10.4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-cmake-Modules-Geant4InterfaceOptions.cmake.4102.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-Modules-G4ConfigureCMakeHelpers.cmake.4104.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${geant.version} >= 10.2 && ${geant.version} < 10.4} {
</span> patchfiles patch-cmake-Modules-Geant4InterfaceOptions.cmake.4102.diff \
patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${geant.version} == "10.2"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${geant.version} >= 10.2} {
</span> # PortGroup cxx11 1.0
PortGroup compiler_blacklist_versions 1.0
configure.cxx_stdlib libc++
# a bit of a guesswork (the list was not really tested)
compiler.blacklist-append *gcc* {clang < 500} macports-clang-3.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.fallback-append macports-clang-3.9 macports-clang-3.8 macports-clang-3.7 macports-clang-3.6 macports-clang-3.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-cmake-Modules-Geant4InterfaceOptions.cmake.4102.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.fallback-append macports-clang-5.0 macports-clang-4.0
</span> }
if {${geant.version} == "10.1"} {
patchfiles patch-cmake-Modules-Geant4InterfaceOptions.cmake.4101.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/geant4/files/patch-cmake-Modules-G4ConfigureCMakeHelpers.cmake.4104.diff b/science/geant4/files/patch-cmake-Modules-G4ConfigureCMakeHelpers.cmake.4104.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6f5ebcb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/geant4/files/patch-cmake-Modules-G4ConfigureCMakeHelpers.cmake.4104.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/Modules/G4ConfigureCMakeHelpers.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/Modules/G4ConfigureCMakeHelpers.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -212,7 +212,7 @@ configure_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # - Generate Install Tree Configuration Files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set needed variables for the install tree
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(GEANT4_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}-${${PROJECT_NAME}_VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(GEANT4_CMAKE_DIR lib/${PROJECT_NAME}-${${PROJECT_NAME}_VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Header path for install tree is dependent on whether we have a relocatable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # install.
</span></pre><pre style='margin:0'>
</pre>