<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/62930ad7e2124989bf120333ddf7f9ca6bc696bb">https://github.com/macports/macports-ports/commit/62930ad7e2124989bf120333ddf7f9ca6bc696bb</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 62930ad7e21 geant4: updates and fixes
</span>62930ad7e21 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 62930ad7e2124989bf120333ddf7f9ca6bc696bb
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sun Mar 28 10:48:16 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> geant4: updates and fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update geant4.10.6 to 4.10.6.p03
</span><span style='display:block; white-space:pre;color:#404040;'> * Prepare for geant4.10.7
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix livecheck and master_sites
</span>---
science/geant4/Portfile | 75 +++++++++++++++++++++++-----------------
science/geant4/files/geant4.10.7 | 3 ++
2 files changed, 46 insertions(+), 32 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 bea24dcce25..02b0ed3155f 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;'>@@ -22,7 +22,8 @@ long_description Geant4 is a toolkit for the simulation of the passage of par
</span> homepage http://geant4.web.cern.ch/
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://geant4.cern.ch/support/source/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://geant4-data.web.cern.ch/releases/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://geant4-data.web.cern.ch/datasets/
</span>
set geant.url_new https://geant4.web.cern.ch/support/download
set geant.url_old https://geant4.web.cern.ch/support/download_archive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,19 +37,35 @@ set geant.url_old https://geant4.web.cern.ch/support/download_archive
</span> #
# if we start distributing betas, epoch will have to be added for the transition from version 4.x.y.b01 to 4.x.y
set geant.versions_info [list \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 10.3 0 0 3 4.10.03.p03 e4e18181ab777811415b85341caec658d14f7427 a164f49c038859ab675eec474d08c9d02be8c4be9c0c2d3aa8e69adf89e1e138 32517096 ${geant.url_old}?page=2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10.4 0 0 3 4.10.04.p03 bab0a6ea4ef537cc6965909b88778c395cbd2ff3 31a452374c86b58b3ec5bd3fa851279e396c7e5a3b5a43d61111913d611029c8 34243361 ${geant.url_old}?page=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10.5 0 0 1 4.10.05.p01 c6d01618241c369f46a08a9689cddb07a426d9e2 f4a292220500fad17e0167ce3153e96e3410ecbe96284e572dc707f63523bdff 34413415 ${geant.url_old}?page=0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10.6 0 0 0 4.10.06 ddec76eecb623d03903c544424e7099ae24e8e81 1424c5a0e37adf577f265984956a77b19701643324e87568c5cb69adc59e3199 34834510 ${geant.url_new}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.3 0 0 3 4.10.03.p03 e4e18181ab777811415b85341caec658d14f7427 a164f49c038859ab675eec474d08c9d02be8c4be9c0c2d3aa8e69adf89e1e138 32517096 ${geant.url_old}?page=3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.4 0 0 3 4.10.04.p03 bab0a6ea4ef537cc6965909b88778c395cbd2ff3 31a452374c86b58b3ec5bd3fa851279e396c7e5a3b5a43d61111913d611029c8 34243361 ${geant.url_old}?page=2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.5 0 0 1 4.10.05.p01 c6d01618241c369f46a08a9689cddb07a426d9e2 f4a292220500fad17e0167ce3153e96e3410ecbe96284e572dc707f63523bdff 34413415 ${geant.url_old}?page=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.6 0 0 3 4.10.06.p03 be80a07b7222c85b2df9c7db666d9b43e1f375e5 0b5f13672e7250047b66ffb056c6cfda328a956278cfe61a3fd5dde0672ffbf3 35099426 ${geant.url_old}?page=0 \
</span> ]
## older versions kept for anyone who might still need them
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 9.6 2 0 4 4.9.6.p04 3dd8f6ac2e79929d26519e83fce113691a670788 997220a5386a43ac8f533fc7d5a8360aa1fd6338244d17deeaa583fb3a0f39fd 25454650 ${geant.url_old}?page=6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 10.0 2 0 4 4.10.00.p04 bfd11977b55f316f5c38d82f09dc37e7c0f60ea7 f4e1fc6d5ea4d9761ba44fd7e50921ff6276e25c2f640c7615460235d8c77d74 29655911 ${geant.url_old}?page=5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 10.1 1 0 3 4.10.01.p03 0b141adfceb4203f4855e0c6fb0d4c17036776ca b198943b5bc4fd7968ef4eaa5bbe2fb094b8df1d907a05486dc05f4c92bbb174 33538209 ${geant.url_old}?page=4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 10.2 1 1 3 4.10.02.p03 c45d91fb2def7143e6dcccb5d11907454be77386 e0bba0a9c937430e7dfac158873e218fafc0f167b12e7ff3d17ce13cbe550c4f 32241693 ${geant.url_old}?page=3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 9.6 2 0 4 4.9.6.p04 3dd8f6ac2e79929d26519e83fce113691a670788 997220a5386a43ac8f533fc7d5a8360aa1fd6338244d17deeaa583fb3a0f39fd 25454650 ${geant.url_old}?page=7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 10.0 2 0 4 4.10.00.p04 bfd11977b55f316f5c38d82f09dc37e7c0f60ea7 f4e1fc6d5ea4d9761ba44fd7e50921ff6276e25c2f640c7615460235d8c77d74 29655911 ${geant.url_old}?page=6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 10.1 1 0 3 4.10.01.p03 0b141adfceb4203f4855e0c6fb0d4c17036776ca b198943b5bc4fd7968ef4eaa5bbe2fb094b8df1d907a05486dc05f4c92bbb174 33538209 ${geant.url_old}?page=5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 10.2 1 1 3 4.10.02.p03 c45d91fb2def7143e6dcccb5d11907454be77386 e0bba0a9c937430e7dfac158873e218fafc0f167b12e7ff3d17ce13cbe550c4f 32241693 ${geant.url_old}?page=4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 10.7 0 0 1 4.10.07.p01 6188268321a58afd5fdbffc298673f44b7135307 525161753a3d9c2ad19b25f2eabc8bbede91c236120771bd9c3f4aaac8412e1e 36217226 ${geant.url_new} \
</span>
# NAME VERS FILENAME ENVVAR md5 rmd160 sha256
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set geant.data_versions_10.7 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G4NDL 4.6 G4NDL G4NEUTRONHPDATA d07e43499f607e01f2c1ce06d7a09f3e 7c87ce0ed9319da7805518b63b5522644e5444d7 9d287cf2ae0fb887a2adce801ee74fb9be21b0d166dab49bcbee9408a5145408
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G4EMLOW 7.13 G4EMLOW G4LEDATA 55922521aa331655a0494cdf8f9a70e8 e0182651434804125a36ab79ff0065bfecb3760e 374896b649be776c6c10fea80abe6cf32f9136df0b6ab7c7236d571d49fb8c69
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PhotonEvaporation 5.7 G4PhotonEvaporation G4LEVELGAMMADATA 81ff27deb23af4aa225423e6b3a06b39 a8de453ac31dc95b4b66a5f2ca13ea1e757b5f01 761e42e56ffdde3d9839f9f9d8102607c6b4c0329151ee518206f4ee9e77e7e5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RadioactiveDecay 5.6 G4RadioactiveDecay G4RADIOACTIVEDATA acc1dbeb87b6b708b2874ced729a3a8f 461d412890f176856df325de08203099112dfc7c 3886077c9c8e5a98783e6718e1c32567899eeb2dbb33e402d4476bc2fe4f0df1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G4SAIDDATA 2.0 G4SAIDDATA G4SAIDXSDATA d5d4e9541120c274aeed038c621d39da 071efa2cd56ac5efbb79e5cbabeda0079cc948bb 1d26a8e79baa71e44d5759b9f55a67e8b7ede31751316a9e9037d80090c72e91
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G4PARTICLEXS 3.1.1 G4PARTICLEXS G4PARTICLEXSDATA 98b766fa2c447b541834cc9bf5206c05 adf10aa663caee9f73977973e259c9b1743d2c4b 66c17edd6cb6967375d0497add84c2201907a25e33db782ebc26051d38f2afda
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G4ABLA 3.1 G4ABLA G4ABLADATA 180f1f5d937733b207f8d5677f76296e b74be69697167ce71fd5c0ee3466b83d8679c758 7698b052b58bf1b9886beacdbd6af607adc1e099fc730ab6b21cf7f090c027ed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G4INCL 1.0 G4INCL G4INCLDATA 85fe937b6df46d41814f07175d3f5b51 266d92602c474158514346b5246b1bd39b1b545d 716161821ae9f3d0565fbf3c2cf34f4e02e3e519eb419a82236eef22c2c4367d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G4PII 1.3 G4PII G4PIIDATA 05f2471dbcdf1a2b17cbff84e8e83b37 313a2615903b0682b8aabc344bedde82c345704b 6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G4ENSDFSTATE 2.2 G4ENSDFSTATE G4ENSDFSTATEDATA 495439cf600225753d7bd99825e5c6bc c8ed1ba2796d85520f100de21df6a929d70fb534 dd7e27ef62070734a4a709601f5b3bada6641b111eb7069344e4f99a01d6e0a6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RealSurface 2.2 G4RealSurface G4REALSURFACEDATA ea8f1cfa8d8aafd64b71fb30b3e8a6d9 ef437cf6f512ce4107288d7fcda208bc1f9fa7e9 9954dee0012f5331267f783690e912e72db5bf52ea9babecd12ea22282176820
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G4TENDL 1.3.2 G4TENDL G4TENDL 209f878b777a36842d20a47ca53c6f93 7dd16c003c8bcafe64753dc25a431c17912a183d 3b2987c6e3bee74197e3bd39e25e1cc756bb866c26d21a70f647959fc7afb849
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set geant.data_versions_10.6 {
G4NDL 4.6 G4NDL G4NEUTRONHPDATA d07e43499f607e01f2c1ce06d7a09f3e 7c87ce0ed9319da7805518b63b5522644e5444d7 9d287cf2ae0fb887a2adce801ee74fb9be21b0d166dab49bcbee9408a5145408
G4EMLOW 7.9 G4EMLOW G4LEDATA d28a09f0c93243522512cf2a3a733348 22f5ea8864f0b9878d4d54fc4d5e0874bfc3e96b 4abf9aa6cda91e4612676ce4d2d8a73b91184533aa66f9aad19a53a8c4dc3aff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,28 +194,23 @@ foreach {geant.version geant.revision geant.datarevision geant.patchlevel geant.
</span>
# TODO: use an array (hash) to implement this without if-else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${geant.version} == "10.6" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${geant.version} == "10.7" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set geant.data_versions ${geant.data_versions_10.7}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${geant.version} == "10.6" } {
</span> set geant.data_versions ${geant.data_versions_10.6}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${geant.version} == "10.5" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${geant.version} == "10.5" } {
</span> set geant.data_versions ${geant.data_versions_10.5}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${geant.version} == "10.4" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${geant.version} == "10.4" } {
</span> set geant.data_versions ${geant.data_versions_10.4}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${geant.version} == "10.3" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${geant.version} == "10.3" } {
</span> set geant.data_versions ${geant.data_versions_10.3}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${geant.version} == "10.2" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${geant.version} == "10.2" } {
</span> set geant.data_versions ${geant.data_versions_10.2}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${geant.version} == "10.1" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${geant.version} == "10.1" } {
</span> set geant.data_versions ${geant.data_versions_10.1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${geant.version} == "10.0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${geant.version} == "10.0" } {
</span> set geant.data_versions ${geant.data_versions_10.0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${geant.version} == "9.6" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${geant.version} == "9.6" } {
</span> set geant.data_versions ${geant.data_versions_9.6}
}
# clear the dependency list
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -293,8 +305,7 @@ foreach {geant.version geant.revision geant.datarevision geant.patchlevel geant.
</span> if {${geant.version} == 10.4} {
patchfiles patch-cmake-Modules-Geant4InterfaceOptions.cmake.4102.diff \
patch-cmake-Modules-G4ConfigureCMakeHelpers.cmake.4104.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${geant.version} >= 10.2 && ${geant.version} < 10.4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${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:#e0e0e0;'>@@ -305,20 +316,20 @@ foreach {geant.version geant.revision geant.datarevision geant.patchlevel geant.
</span> if {${geant.version} == "10.1"} {
patchfiles patch-cmake-Modules-Geant4InterfaceOptions.cmake.4101.diff \
patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4101.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${geant.version} == "10.0"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${geant.version} == "10.0"} {
</span> patchfiles patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff \
patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4100.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${geant.version} == "9.6"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${geant.version} == "9.6"} {
</span> patchfiles patch-upstream-qt.496.diff \
patch-upstream-examples-advanced-xray_fluorescence.diff \
patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff \
patch-cmake-Modules-Geant4BuildProjectConfig.cmake.496.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/cmake/Modules/Geant4InterfaceOptions.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${geant.version} < 10.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/cmake/Modules/Geant4InterfaceOptions.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# arguments to -DCMAKE_INSTALL_* could be written without ${prefix}
# however the ${prefix} triggers the NON_RELOCATABLE flag which has some advantages like less cryptic path names
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/geant4/files/geant4.10.7 b/science/geant4/files/geant4.10.7
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..385e836be98
</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/geant4.10.7
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libexec/Geant4/Geant4.10.7/geant4-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libexec/Geant4/Geant4.10.7/geant4data.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libexec/Geant4/Geant4.10.7/geant4data.csh
</span></pre><pre style='margin:0'>
</pre>