[108779] users/mojca/ports/science/geant

[mojca at macports.org]

Revision: 108779
          https://trac.macports.org/changeset/108779
Author:   mojca at macports.org
Date:     2013-08-01 12:36:34 -0700 (Thu, 01 Aug 2013)
Log Message:
-----------
mojca/geant4: apply the patch for xray examples also to 9.5 and 9.6

Modified Paths:
--------------
    users/mojca/ports/science/geant/Portfile

Added Paths:
-----------
    users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.diff

Removed Paths:
-------------
    users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.4100.diff

Modified: users/mojca/ports/science/geant/Portfile
===================================================================
--- users/mojca/ports/science/geant/Portfile	2013-08-01 19:06:59 UTC (rev 108778)
+++ users/mojca/ports/science/geant/Portfile	2013-08-01 19:36:34 UTC (rev 108779)
@@ -177,15 +177,17 @@
         # - patch-examples-advanced-xray_fluorescence.4100.diff: http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1501
         if {${geant.version} == "10.0"} {
             patchfiles      patch-source-interfaces-common-src-G4Qt.cc.diff \
-                            patch-examples-advanced-xray_fluorescence.4100.diff \
+                            patch-examples-advanced-xray_fluorescence.diff \
                             patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4100.diff
         }
         if {${geant.version} == "9.6"} {
             patchfiles      patch-source-interfaces-common-src-G4Qt.cc.diff \
+                            patch-examples-advanced-xray_fluorescence.diff \
                             patch-cmake-Modules-Geant4BuildProjectConfig.cmake.496.diff
         }
         if {${geant.version} == "9.5"} {
             patchfiles      patch-source-interfaces-common-src-G4Qt.cc.495.diff \
+                            patch-examples-advanced-xray_fluorescence.diff \
                             patch-cmake-Modules-Geant4BuildProjectConfig.cmake.495.diff
         }
 

Deleted: users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.4100.diff
===================================================================
--- users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.4100.diff	2013-08-01 19:06:59 UTC (rev 108778)
+++ users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.4100.diff	2013-08-01 19:36:34 UTC (rev 108779)
@@ -1,20 +0,0 @@
---- examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc
-+++ examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc
-@@ -41,6 +41,7 @@
- // -------------------------------------------------------------------
- #ifdef G4ANALYSIS_USE
- 
-+#include "G4SystemOfUnits.hh"
- #include "G4VProcess.hh"
- #include <fstream>
- #include "G4ios.hh"
---- examples/advanced/xray_fluorescence/src/XrayFluoRunAction.cc
-+++ examples/advanced/xray_fluorescence/src/XrayFluoRunAction.cc
-@@ -35,6 +35,7 @@
- //
- // -------------------------------------------------------------------
- 
-+#include "G4SystemOfUnits.hh"
- #include "XrayFluoRunAction.hh"
- #include "G4Run.hh"
- #include "G4UImanager.hh"

Copied: users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.diff (from rev 108769, users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.4100.diff)
===================================================================
--- users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.diff	                        (rev 0)
+++ users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.diff	2013-08-01 19:36:34 UTC (rev 108779)
@@ -0,0 +1,20 @@
+--- examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc
++++ examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc
+@@ -41,6 +41,7 @@
+ // -------------------------------------------------------------------
+ #ifdef G4ANALYSIS_USE
+ 
++#include "G4SystemOfUnits.hh"
+ #include "G4VProcess.hh"
+ #include <fstream>
+ #include "G4ios.hh"
+--- examples/advanced/xray_fluorescence/src/XrayFluoRunAction.cc
++++ examples/advanced/xray_fluorescence/src/XrayFluoRunAction.cc
+@@ -35,6 +35,7 @@
+ //
+ // -------------------------------------------------------------------
+ 
++#include "G4SystemOfUnits.hh"
+ #include "XrayFluoRunAction.hh"
+ #include "G4Run.hh"
+ #include "G4UImanager.hh"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130801/9f4f1699/attachment.html>