<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/3148efa8fac710506e7b4f1f101e058cde242aeb">https://github.com/macports/macports-ports/commit/3148efa8fac710506e7b4f1f101e058cde242aeb</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 3148efa gate: update to 8.1.p01
</span>3148efa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3148efa8fac710506e7b4f1f101e058cde242aeb
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Tue Dec 4 23:18:41 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> gate: update to 8.1.p01
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> GUI seems broken, but the old version is broken by now as well.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55677
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56132
</span>---
science/gate/Portfile | 130 +++++++++-------------------------
science/gate/files/patch-addmenu.diff | 14 ++--
2 files changed, 39 insertions(+), 105 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gate/Portfile b/science/gate/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 16c21a8..1a57c8c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gate/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gate/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,18 +4,13 @@
</span>
PortSystem 1.0
PortGroup app 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span> PortGroup github 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_sha 0be152cf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20151007
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup OpenGATE Gate ${git_sha}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OpenGATE Gate 8.1.p01 v
</span> name gate
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# version 7.1-git-${git_date}-${git_sha}
</span>
categories science
maintainers {mojca @mojca} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,33 +22,23 @@ long_description GATE is dedicated to numerical simulations in medical imagin
</span> homepage http://www.opengatecollaboration.org
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8e5316fa5984541c6afa11f6194b970cdf74ab9b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4fcab7083b675804397fdf91e4a79ebcb185dbb3a7ff98c8430e8a8ec0d57911
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e5b4600b4e3a0c8051a4cd1971c1a6db89400827 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fc2817fff480b6eacd53d3840c206621340eddd1153a93528dca4e2c9192562a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2419444
</span>
# TODO: take this data from a geant4 portgroup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set geant.data_versions_10.1 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set geant.data_versions_10.4 {
</span> G4NDL 4.5 G4NDL G4NEUTRONHPDATA
<span style='display:block; white-space:pre;background:#ffe0e0;'>- G4EMLOW 6.41 G4EMLOW G4LEDATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PhotonEvaporation 3.1 G4PhotonEvaporation G4LEVELGAMMADATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RadioactiveDecay 4.2 G4RadioactiveDecay G4RADIOACTIVEDATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G4NEUTRONXS 1.4 G4NEUTRONXS G4NEUTRONXSDATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G4PII 1.3 G4PII G4PIIDATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RealSurface 1.0 RealSurface G4REALSURFACEDATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G4SAIDDATA 1.1 G4SAIDDATA G4SAIDXSDATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G4ABLA 3.0 G4ABLA G4ABLADATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G4ENSDFSTATE 1.0 G4ENSDFSTATE G4ENSDFSTATEDATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set geant.data_versions_10.0 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G4NDL 4.4 G4NDL G4NEUTRONHPDATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G4EMLOW 6.35 G4EMLOW G4LEDATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PhotonEvaporation 3.0 G4PhotonEvaporation G4LEVELGAMMADATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RadioactiveDecay 4.0 G4RadioactiveDecay G4RADIOACTIVEDATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G4EMLOW 7.3 G4EMLOW G4LEDATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PhotonEvaporation 5.2 G4PhotonEvaporation G4LEVELGAMMADATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RadioactiveDecay 5.2 G4RadioactiveDecay G4RADIOACTIVEDATA
</span> G4NEUTRONXS 1.4 G4NEUTRONXS G4NEUTRONXSDATA
G4PII 1.3 G4PII G4PIIDATA
<span style='display:block; white-space:pre;background:#ffe0e0;'>- RealSurface 1.0 RealSurface G4REALSURFACEDATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RealSurface 2.1 G4RealSurface G4REALSURFACEDATA
</span> G4SAIDDATA 1.1 G4SAIDDATA G4SAIDXSDATA
<span style='display:block; white-space:pre;background:#ffe0e0;'>- G4ABLA 3.0 G4ABLA G4ABLADATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G4ENSDFSTATE 1.0 G4ENSDFSTATE G4ENSDFSTATEDATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G4ABLA 3.1 G4ABLA G4ABLADATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G4ENSDFSTATE 2.2 G4ENSDFSTATE G4ENSDFSTATEDATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G4TENDL 1.3.2 G4TENDL G4TENDL
</span> }
set geant.datadir ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,42 +48,21 @@ app.name Gate
</span> app.executable Gate
app.icon ${filespath}/gate.png
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:root5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:root6
</span>
patchfiles-append patch-addmenu.diff
configure.args-append \
-DGATE_USE_OPTICAL=ON \
-DGATE_USE_SYSTEM_CLHEP=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DROOT_CONFIG_EXECUTABLE=${prefix}/libexec/root5/bin/root-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DROOT_CONFIG_EXECUTABLE=${prefix}/libexec/root6/bin/root-config
</span> # ROOT is optional: we could make a variant if needed
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch examples if needed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset examples]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [exec find "${worksrcpath}/examples" -type f -name "*.mac"] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gpumacros/ct/mac/visu.mac gpumacros/optical/macro_biolum_cpu.mac gpumacros/optical/macro_biolum_gpu.mac gpumacros/pet/mac/visu.mac gpumacros/photradthera/mac/visu.mac example_CT/classic/visu.mac example_CT/fast/visu.mac example_CT/vrt/visu.mac example_OPTICAL/macro/Visualisation.mac example_PET/PET_CylindricalPET_System.mac example_PET/PET_Ecat_System.mac example_PHANTOM_SOURCE/Voxelized_Phantom_Source/mainMacro.mac example_SPECT/vis.mac example_TimeActivityCurve/vis.mac ex [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # replace "/vis/open OGLIX" with "/vis/open OGLIQt" (not sure about the difference between OGLIQt and OGLSQt; maybe even just OGL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # just in case we could check that the statement actually starts with /vis/open
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|OGLIX|OGLIQt|g" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|OGLSX|OGLSQt|g" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: create a single expression to cover both, possibly storing the variables to simplify the replacement part
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/gate/geometry/setMaterialDatabase.*GateMaterials.db|/gate/geometry/setMaterialDatabase GateMaterials.db|g" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/gate/geometry/setMaterialDatabase.*GateMaterialsGPU.db|/gate/geometry/setMaterialDatabase GateMaterialsGPU.db|g" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> pre-destroot {
set destdocdir ${destroot}${prefix}/share/doc/${name}
xinstall -m 755 -d ${destdocdir}
# copy license
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/license ${destdocdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # copy examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset examples]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/examples ${destdocdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/LICENSE.md ${destdocdir}
</span> # copy materials database
set sharedir ${prefix}/share/${name}
set destsharedir ${destroot}${sharedir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,24 +93,11 @@ post-destroot {
</span> system "chmod 755 ${destexecutable}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant examples description {Install examples to doc} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant geant4100 conflicts geant4101 description {Use Geant4 10.0 (deprecated)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set geant.version 10.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set geant.revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set geant.port_name geant4.${geant.version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set geant.data_versions ${geant.data_versions_10.0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set geant.datadir ${prefix}/share/Geant4/Data/Geant4.${geant.version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set geant.cmakedir ${prefix}/lib/Geant4-${geant.version}.${geant.revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${geant.port_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DGeant4_DIR=${geant.cmakedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant geant4101 conflicts geant4100 description {Use Geant4 10.1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set geant.version 10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant geant4104 description {Use Geant4 10.4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set geant.version 10.4
</span> set geant.revision 1
set geant.port_name geant4.${geant.version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set geant.data_versions ${geant.data_versions_10.1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set geant.data_versions ${geant.data_versions_10.4}
</span> set geant.datadir ${prefix}/share/Geant4/Data/Geant4.${geant.version}
set geant.cmakedir ${prefix}/lib/Geant4-${geant.version}.${geant.revision}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,45 +108,28 @@ variant geant4101 conflicts geant4100 description {Use Geant4 10.1} {
</span> variant qt4 conflicts qt5 description {Use Geant4 with Qt 4} {
PortGroup qt4 1.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt5 conflicts qt4 description {Use Geant4 with Qt 5 (buggy)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt5 conflicts qt4 description {Use Geant4 with Qt 5} {
</span> PortGroup qt5 1.0
}
default_variants-append +examples
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset geant4101] && ![variant_isset geant4100]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +geant4101
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants-append +geant4104
</span>
# some ugly code to make sure that the variants for Qt version used
# are consistent between Gate and Geant4; looking for suggestions for improvement
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset geant4101]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set result [active_variants geant4.10.1 qt5 qt4]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$result} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +qt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants geant4.10.1 qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants geant4.10.1 qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset geant4100]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set result [active_variants geant4.10.0 qt5 qt4]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$result} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +qt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants geant4.10.0 qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants geant4.10.0 qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![catch {set result [active_variants geant4.10.4 qt5 qt]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qt4
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants geant4.10.4 qt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants geant4.10.4 qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
livecheck.version ${version}
github.livecheck.regex {([^"]+)}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gate/files/patch-addmenu.diff b/science/gate/files/patch-addmenu.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fbf5b5..0320807 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gate/files/patch-addmenu.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gate/files/patch-addmenu.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> --- Gate.cc.orig
+++ Gate.cc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -389,6 +389,7 @@ int main( int argc, char* argv[] )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -406,6 +406,7 @@ int main( int argc, char* argv[] )
</span> #ifdef G4UI_USE
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ui) // Launching interactive mode // Qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ UImanager->ApplyCommand("/gate/control/execute gui.mac");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui->SessionStart();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ui;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ui) // Launching interactive mode // Qt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UImanager->ApplyCommand("/gate/control/execute gui.mac");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui->SessionStart();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ui;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>