[117889] trunk/dports/science/geant4
mojca at macports.org
mojca at macports.org
Sun Mar 16 05:28:29 PDT 2014
Revision: 117889
https://trac.macports.org/changeset/117889
Author: mojca at macports.org
Date: 2014-03-16 05:28:29 -0700 (Sun, 16 Mar 2014)
Log Message:
-----------
geant4: upgrade to geant4.10.0.p01, revbump 9.5 & 9.6 after clhep upgrade
Modified Paths:
--------------
trunk/dports/science/geant4/Portfile
trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff
Added Paths:
-----------
trunk/dports/science/geant4/files/patch-upstream-examples-advanced-xray_fluorescence.diff
trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.495.diff
trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff
Removed Paths:
-------------
trunk/dports/science/geant4/files/patch-examples-advanced-xray_fluorescence.diff
trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.495.diff
trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.diff
Modified: trunk/dports/science/geant4/Portfile
===================================================================
--- trunk/dports/science/geant4/Portfile 2014-03-16 11:46:15 UTC (rev 117888)
+++ trunk/dports/science/geant4/Portfile 2014-03-16 12:28:29 UTC (rev 117889)
@@ -32,9 +32,9 @@
#
# 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 {
- 9.5 0 0 2 4.9.5.p02 33413f6233b75c003254af5888f4af32d17f515d adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777
- 9.6 0 0 2 4.9.6.p02 9ae32c3f8769e303b41df164693f77a74ca6db97 cf5df83b7e2c99e6729449b32d3ecb0727b4692317426b66fc7fd41951c7351f
- 10.0 1 0 0 4.10.00 cd8bb26e251f07ce8d6fa6e91062a1b70206b9ef ffec1714b03748b6d691eb0b91906f4c74422c1ad1f8afa918e03be421af8a17
+ 9.5 1 0 2 4.9.5.p02 33413f6233b75c003254af5888f4af32d17f515d adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777
+ 9.6 1 0 2 4.9.6.p02 9ae32c3f8769e303b41df164693f77a74ca6db97 cf5df83b7e2c99e6729449b32d3ecb0727b4692317426b66fc7fd41951c7351f
+ 10.0 0 0 1 4.10.00.p01 f1f70d381cef712781a1d0f13ffa4cb8fb4fa6a9 09c431ff3ef81034282c46501cea01046d4a20438c2ea2a7339576e1ecf26ba0
}
set geant.data_versions_10.0 {
@@ -185,30 +185,28 @@
# GEANT4_USE_SYSTEM_CLHEP=OFF
- # - patch-source-interfaces-common-src-G4Qt.cc:
+ # - patch-upstream-source-interfaces-common-src-G4Qt.cc:
# http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1487
- # - patch-examples-advanced-xray_fluorescence:
- # http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1501 (fixed on 2013-12-13)
+ # - patch-upstream-examples-advanced-xray_fluorescence:
+ # http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1501
# - patch-cmake-Modules-Geant4InterfaceOptions.cmake:
# 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
if {${geant.version} == "10.0"} {
- patchfiles patch-source-interfaces-common-src-G4Qt.cc.diff \
- patch-examples-advanced-xray_fluorescence.diff \
- patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff \
+ patchfiles patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff \
patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4100.diff
}
if {${geant.version} == "9.6"} {
patchfiles patch-upstream-qt.496.diff \
- patch-source-interfaces-common-src-G4Qt.cc.diff \
- patch-examples-advanced-xray_fluorescence.diff \
+ patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff \
+ patch-upstream-examples-advanced-xray_fluorescence.diff \
patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.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 \
+ patchfiles patch-upstream-source-interfaces-common-src-G4Qt.cc.495.diff \
+ patch-upstream-examples-advanced-xray_fluorescence.diff \
patch-cmake-Modules-Geant4InterfaceOptions.cmake.495.diff \
patch-cmake-Modules-Geant4BuildProjectConfig.cmake.495.diff
}
Modified: trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff
===================================================================
--- trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff 2014-03-16 11:46:15 UTC (rev 117888)
+++ trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff 2014-03-16 12:28:29 UTC (rev 117889)
@@ -1,6 +1,6 @@
--- cmake/Modules/Geant4InterfaceOptions.cmake.orig
+++ cmake/Modules/Geant4InterfaceOptions.cmake
-@@ -196,20 +196,11 @@ if(UNIX)
+@@ -196,22 +196,11 @@ if(UNIX)
set(CMAKE_FIND_FRAMEWORK NEVER)
set(X11_INC_SEARCH_PATH
@@ -11,6 +11,7 @@
- /usr/openwin/include
- /usr/openwin/share/include
- /opt/graphics/OpenGL/include
+- /opt/X11/include
+ @PREFIX@/include
)
@@ -19,27 +20,28 @@
- /usr/X11R6/lib
- /usr/X11R7/lib
- /usr/openwin/lib
+- /opt/X11/lib
+ @PREFIX@/lib
)
find_path(X11_Xmu_INCLUDE_PATH X11/Xmu/Xmu.h ${X11_INC_SEARCH_PATH})
-@@ -252,17 +243,17 @@ if(UNIX)
+@@ -254,17 +243,17 @@ if(UNIX)
set(CMAKE_FIND_FRAMEWORK NEVER)
find_path(OPENGL_X11_INCLUDE_DIR GL/gl.h
-- PATHS /usr/X11R6/include
+- PATHS /usr/X11R6/include /opt/X11/include
+ PATHS @PREFIX@/include
NO_DEFAULT_PATH
)
find_library(OPENGL_X11_gl_LIBRARY GL
-- PATHS /usr/X11R6/lib
+- PATHS /usr/X11R6/lib /opt/X11/lib
+ PATHS @PREFIX@/lib
NO_DEFAULT_PATH
)
find_library(OPENGL_X11_glu_LIBRARY GLU
-- PATHS /usr/X11R6/lib
+- PATHS /usr/X11R6/lib /opt/X11/lib
+ PATHS @PREFIX@/lib
NO_DEFAULT_PATH
)
Deleted: trunk/dports/science/geant4/files/patch-examples-advanced-xray_fluorescence.diff
===================================================================
--- trunk/dports/science/geant4/files/patch-examples-advanced-xray_fluorescence.diff 2014-03-16 11:46:15 UTC (rev 117888)
+++ trunk/dports/science/geant4/files/patch-examples-advanced-xray_fluorescence.diff 2014-03-16 12:28:29 UTC (rev 117889)
@@ -1,20 +0,0 @@
---- examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc.orig
-+++ 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"
Deleted: trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.495.diff
===================================================================
--- trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.495.diff 2014-03-16 11:46:15 UTC (rev 117888)
+++ trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.495.diff 2014-03-16 12:28:29 UTC (rev 117889)
@@ -1,23 +0,0 @@
---- source/interfaces/common/src/G4Qt.cc.orig
-+++ source/interfaces/common/src/G4Qt.cc
-@@ -149,6 +149,20 @@ G4Qt::G4Qt (
- }
- #endif
- // AddDispatcher ((G4DispatchFunction)XtDispatchEvent);
-+
-+/*
-+ * On some non-English locale, comma is used for the decimal separator instead of dot
-+ * bringing to weird behavior of strtod (string to double) function in user application.
-+ * This is "by design" from Qt, see https://bugreports.qt-project.org/browse/QTBUG-10994
-+ *
-+ * $ LC_NUMERIC=fr_FR.UTF-8 ./qtstrtod
-+ * strtod(0.1) = 0
-+ * $ LC_NUMERIC=C ./qtstrtod
-+ * strtod(0.1) = 0.1
-+ *
-+ * Jerome Suhard, jerome at suhard.fr
-+ */
-+ setlocale (LC_NUMERIC, "C");
- }
- /***************************************************************************/
- G4Qt::~G4Qt (
Deleted: trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.diff
===================================================================
--- trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.diff 2014-03-16 11:46:15 UTC (rev 117888)
+++ trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.diff 2014-03-16 12:28:29 UTC (rev 117889)
@@ -1,23 +0,0 @@
---- source/interfaces/common/src/G4Qt.cc.orig
-+++ source/interfaces/common/src/G4Qt.cc
-@@ -153,6 +153,20 @@ G4Qt::G4Qt (
- }
- #endif
- // AddDispatcher ((G4DispatchFunction)XtDispatchEvent);
-+
-+/*
-+ * On some non-English locale, comma is used for the decimal separator instead of dot
-+ * bringing to weird behavior of strtod (string to double) function in user application.
-+ * This is "by design" from Qt, see https://bugreports.qt-project.org/browse/QTBUG-10994
-+ *
-+ * $ LC_NUMERIC=fr_FR.UTF-8 ./qtstrtod
-+ * strtod(0.1) = 0
-+ * $ LC_NUMERIC=C ./qtstrtod
-+ * strtod(0.1) = 0.1
-+ *
-+ * Jerome Suhard, jerome at suhard.fr
-+ */
-+ setlocale (LC_NUMERIC, "C");
- }
- /***************************************************************************/
- G4Qt::~G4Qt (
Copied: trunk/dports/science/geant4/files/patch-upstream-examples-advanced-xray_fluorescence.diff (from rev 117767, trunk/dports/science/geant4/files/patch-examples-advanced-xray_fluorescence.diff)
===================================================================
--- trunk/dports/science/geant4/files/patch-upstream-examples-advanced-xray_fluorescence.diff (rev 0)
+++ trunk/dports/science/geant4/files/patch-upstream-examples-advanced-xray_fluorescence.diff 2014-03-16 12:28:29 UTC (rev 117889)
@@ -0,0 +1,22 @@
+Upstream patch:
+ * http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1501
+--- examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc.orig
++++ 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: trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.495.diff (from rev 117767, trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.495.diff)
===================================================================
--- trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.495.diff (rev 0)
+++ trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.495.diff 2014-03-16 12:28:29 UTC (rev 117889)
@@ -0,0 +1,25 @@
+Upstream patch:
+ * http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1487
+--- source/interfaces/common/src/G4Qt.cc.orig
++++ source/interfaces/common/src/G4Qt.cc
+@@ -149,6 +149,20 @@ G4Qt::G4Qt (
+ }
+ #endif
+ // AddDispatcher ((G4DispatchFunction)XtDispatchEvent);
++
++/*
++ * On some non-English locale, comma is used for the decimal separator instead of dot
++ * bringing to weird behavior of strtod (string to double) function in user application.
++ * This is "by design" from Qt, see https://bugreports.qt-project.org/browse/QTBUG-10994
++ *
++ * $ LC_NUMERIC=fr_FR.UTF-8 ./qtstrtod
++ * strtod(0.1) = 0
++ * $ LC_NUMERIC=C ./qtstrtod
++ * strtod(0.1) = 0.1
++ *
++ * Jerome Suhard, jerome at suhard.fr
++ */
++ setlocale (LC_NUMERIC, "C");
+ }
+ /***************************************************************************/
+ G4Qt::~G4Qt (
Copied: trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff (from rev 117767, trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.diff)
===================================================================
--- trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff (rev 0)
+++ trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff 2014-03-16 12:28:29 UTC (rev 117889)
@@ -0,0 +1,25 @@
+Upstream patch:
+ * http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1487
+--- source/interfaces/common/src/G4Qt.cc.orig
++++ source/interfaces/common/src/G4Qt.cc
+@@ -153,6 +153,20 @@ G4Qt::G4Qt (
+ }
+ #endif
+ // AddDispatcher ((G4DispatchFunction)XtDispatchEvent);
++
++/*
++ * On some non-English locale, comma is used for the decimal separator instead of dot
++ * bringing to weird behavior of strtod (string to double) function in user application.
++ * This is "by design" from Qt, see https://bugreports.qt-project.org/browse/QTBUG-10994
++ *
++ * $ LC_NUMERIC=fr_FR.UTF-8 ./qtstrtod
++ * strtod(0.1) = 0
++ * $ LC_NUMERIC=C ./qtstrtod
++ * strtod(0.1) = 0.1
++ *
++ * Jerome Suhard, jerome at suhard.fr
++ */
++ setlocale (LC_NUMERIC, "C");
+ }
+ /***************************************************************************/
+ G4Qt::~G4Qt (
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140316/60d92a79/attachment-0001.html>
More information about the macports-changes
mailing list