[117768] users/mojca/ports/science/gate

mojca at macports.org mojca at macports.org
Tue Mar 11 07:24:56 PDT 2014


Revision: 117768
          https://trac.macports.org/changeset/117768
Author:   mojca at macports.org
Date:     2014-03-11 07:24:56 -0700 (Tue, 11 Mar 2014)
Log Message:
-----------
mojca/gate: fetch the latest version, enable (nonfunctional) geant4 10.0, include date/sha in version string

Modified Paths:
--------------
    users/mojca/ports/science/gate/Portfile
    users/mojca/ports/science/gate/files/patch-addmenu.diff

Modified: users/mojca/ports/science/gate/Portfile
===================================================================
--- users/mojca/ports/science/gate/Portfile	2014-03-11 12:56:24 UTC (rev 117767)
+++ users/mojca/ports/science/gate/Portfile	2014-03-11 14:24:56 UTC (rev 117768)
@@ -8,17 +8,20 @@
 PortGroup           cmake 1.0
 PortGroup           active_variants 1.1
 
+set                 git_sha 30625f7f3c
+set                 git_date 20140228
+
 # TODO: temporary - if checksums are desired
 PortGroup           github 1.0
-github.setup        mojca gate 0bd5cc471e
+github.setup        mojca gate ${git_sha}
 
 ## official repository
 # fetch.type          git
 # git.url             http://git.opengatecollaboration.org/git/opengate-public.git
-# git.branch          0bd5cc471ecaf0032f38dba82b8204501bd20fb7
+# git.branch          30625f7f3c28f6cb473cef35b00c5a0a3c952a40
 
 name                gate
-version             6.3-beta
+version             6.99-git-${git_date}-${git_sha}
 categories          science
 maintainers         mojca
 license             LGPL
@@ -29,18 +32,19 @@
 homepage            http://www.opengatecollaboration.org
 platforms           darwin
 
-checksums           rmd160  f33ac2fad53cf94c2dd1a8307ea476030d3b6749 \
-                    sha256  fe342d3d34e06d23d2ada53048aba1d218e02b32aa50a309121f7c3480076d07
+checksums           rmd160  d83182e4be8df4b1fcb6fb290b101e06ff519f28 \
+                    sha256  beeb243f024238bd9a3a2449ea1eb3bb7313887834d1726d2b6477f021d1b395
 
 set geant.data_versions_10.0 {
-    G4NDL              4.3   G4NDL                G4NEUTRONHPDATA
-    G4EMLOW            6.33  G4EMLOW              G4LEDATA
-    PhotonEvaporation  2.3   G4PhotonEvaporation  G4LEVELGAMMADATA
-    RadioactiveDecay   3.7   G4RadioactiveDecay   G4RADIOACTIVEDATA
-    G4NEUTRONXS        1.3   G4NEUTRONXS          G4NEUTRONXSDATA
+    G4NDL              4.4   G4NDL                G4NEUTRONHPDATA
+    G4EMLOW            6.35  G4EMLOW              G4LEDATA
+    PhotonEvaporation  3.0   G4PhotonEvaporation  G4LEVELGAMMADATA
+    RadioactiveDecay   4.0   G4RadioactiveDecay   G4RADIOACTIVEDATA
+    G4NEUTRONXS        1.4   G4NEUTRONXS          G4NEUTRONXSDATA
     G4PII              1.3   G4PII                G4PIIDATA
     RealSurface        1.0   RealSurface          G4REALSURFACEDATA
     G4SAIDDATA         1.1   G4SAIDDATA           G4SAIDXSDATA
+    G4ABLA             3.0   G4ABLA               G4ABLADATA
 }
 set geant.data_versions_9.6 {
     G4NDL              4.2   G4NDL                G4NEUTRONHPDATA
@@ -69,7 +73,6 @@
 app.executable      Gate
 app.icon            ${filespath}/gate.png
 
-worksrcdir          gate_v${version}
 configure.dir       ${workpath}/build
 build.dir           ${configure.dir}
 
@@ -141,7 +144,7 @@
 
 variant examples description {Install examples to doc} {
 }
-variant geant495 conflicts geant496 description {Use Geant4 9.5} {
+variant geant495 conflicts geant496 geant4100 description {Use Geant4 9.5} {
     # TODO: this can probably be done in a more elegant way
     #       how to copy datadir and cmakedir from geant4 without duplication?
     set geant.data_versions ${geant.data_versions_9.5}
@@ -152,7 +155,7 @@
     require_active_variants geant4.9.5 qt
     configure.args-append   -DGeant4_DIR=${geant.cmakedir}
 }
-variant geant496 conflicts geant495 description {Use Geant4 9.6} {
+variant geant496 conflicts geant495 geant4100 description {Use Geant4 9.6} {
     set geant.data_versions ${geant.data_versions_9.6}
     set geant.datadir       ${prefix}/share/Geant4/Data/Geant4.9.6
     set geant.cmakedir      ${prefix}/lib/Geant4-9.6.2
@@ -161,16 +164,17 @@
     require_active_variants geant4.9.6 qt
     configure.args-append   -DGeant4_DIR=${geant.cmakedir}
 }
-# variant geant4100 conflicts geant495 geant496 description {Use Geant4 10.0 (doesn't work yet)} {
-#     set geant.data_versions ${geant.data_versions_10.0}
-#     set geant.datadir       ${prefix}/share/Geant4/Data/Geant4.10.0
-#     set geant.cmakedir      ${prefix}/lib/Geant4-10.0.0
-# 
-#     depends_lib-append      port:geant4-10.0
-#     require_active_variants geant4-10.0 qt
-#     configure.args-append   -DGeant4_DIR=${geant.cmakedir}
-# }
-if {![variant_isset geant495] && ![variant_isset geant496]} {
+variant geant4100 conflicts geant495 geant496 description {Use Geant4 10.0 (doesn't work yet)} {
+    set geant.data_versions ${geant.data_versions_10.0}
+    set geant.datadir       ${prefix}/share/Geant4/Data/Geant4.10.0
+    set geant.cmakedir      ${prefix}/lib/Geant4-10.0.0
+
+    depends_lib-append      port:geant4.10.0
+    require_active_variants geant4.10.0 qt
+    configure.args-append   -DGeant4_DIR=${geant.cmakedir}
+}
+
+if {![variant_isset geant495] && ![variant_isset geant496] && ![variant_isset geant4100]} {
     default_variants +geant496
 }
 

Modified: users/mojca/ports/science/gate/files/patch-addmenu.diff
===================================================================
--- users/mojca/ports/science/gate/files/patch-addmenu.diff	2014-03-11 12:56:24 UTC (rev 117767)
+++ users/mojca/ports/science/gate/files/patch-addmenu.diff	2014-03-11 14:24:56 UTC (rev 117768)
@@ -1,10 +1,10 @@
 --- Gate.cc
 +++ Gate.cc
-@@ -370,6 +370,7 @@ int main( int argc, char* argv[] )
-     }
-   else if( ui ) // Launching interactive mode // Qt
-     {
-+      UImanager->ApplyCommand("/gate/control/execute gui.mac");
-       ui->SessionStart();
-       delete ui;
-     }
+@@ -368,6 +368,7 @@ int main( int argc, char* argv[] )
+   else {
+     if (ui) // Launching interactive mode // Qt
+       {
++        UImanager->ApplyCommand("/gate/control/execute gui.mac");
+         ui->SessionStart();
+         delete ui;
+       }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140311/037bb47f/attachment-0001.html>


More information about the macports-changes mailing list