<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121597] trunk/dports/science/geant4</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121597">121597</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-07-01 11:54:14 -0700 (Tue, 01 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>geant4: upgrade to 4.10.00.p02, add (preliminary/commented-out) support for 4.10.01.b01</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegeant4Portfile">trunk/dports/science/geant4/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencegeant4filesgeant4101">trunk/dports/science/geant4/files/geant4.10.1</a></li>
<li><a href="#trunkdportssciencegeant4filespatchcmakeModulesGeant4BuildProjectConfigcmake4101diff">trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4101.diff</a></li>
<li><a href="#trunkdportssciencegeant4filespatchcmakeModulesGeant4InterfaceOptionscmake4101diff">trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4101.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegeant4Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/geant4/Portfile (121596 => 121597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/Portfile 2014-07-01 18:30:06 UTC (rev 121596)
+++ trunk/dports/science/geant4/Portfile 2014-07-01 18:54:14 UTC (rev 121597)
</span><span class="lines">@@ -34,9 +34,22 @@
</span><span class="cx"> set geant.versions_info {
</span><span class="cx"> 9.5 2 0 2 4.9.5.p02 33413f6233b75c003254af5888f4af32d17f515d adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777
</span><span class="cx"> 9.6 0 0 3 4.9.6.p03 581acefab40a25f5c7123cfa3a93c2a9d3ef2c73 3a7e969039e8992716b3bc33b44cbdbff9c8d5850385f1a02fdd756a4fa6305c
</span><del>- 10.0 1 0 1 4.10.00.p01 f1f70d381cef712781a1d0f13ffa4cb8fb4fa6a9 09c431ff3ef81034282c46501cea01046d4a20438c2ea2a7339576e1ecf26ba0
</del><ins>+ 10.0 0 0 2 4.10.00.p02 861c240deeec40cdac8ab05e9cb227c5f80548c6 9d615200901f1a5760970e8f5970625ea146253e4f7c5ad9df2a9cf84549e848
+# 10.1 0 0 0 4.10.01.b01 ff662090dc3f7e5459b89b66a0c0ea03bf52eb21 517da7ba5f65a4253eccd192465188ca02e624a96ae2d7864729473e8917661c
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+set geant.data_versions_10.1 {
+ G4NDL 4.4 G4NDL G4NEUTRONHPDATA cd8cc1d96aeb9b9ed37189edda26f5ad 8ba64e2f71ccaef278450d292239b889daae72fb e9fe8800566a83ccaf9b5229a1fa1d2cd24530bbd2e9fcb96eb6b5b117233071
+ G4EMLOW 6.39 G4EMLOW G4LEDATA 60d7c0efc98f8cfbdadf974953a2d72e 304031316a430ac6537137af6dbf4baad7492f0d e21e168a35753349113db5f4c1629fd632d86777e375259567ad4ef367bc87d0
+ PhotonEvaporation 3.1 G4PhotonEvaporation G4LEVELGAMMADATA e7870c5ef18ba702e68c22b62233cbb8 9d287e92aa1943ffe736f9e91a678667650eb760 276ac5f7b45ce96ae0927c7a3fff0942b7007cfe9339540fc22554fea433142e
+ RadioactiveDecay 4.1 G4RadioactiveDecay G4RADIOACTIVEDATA be4bc5ad366f259c8ccc51d8698721d1 3a6ff2522262904d103eb8ea0d5abde3edd65eaa 9461cefa6ebee84238bf3fb4896523de51a1b3641bb0c092cae9eb4d3c0f11fd
+ G4NEUTRONXS 1.4 G4NEUTRONXS G4NEUTRONXSDATA 665a12771267e3b31a08c622ba1238a7 41278460f9c4a720f2b9e47dee878b9ec289ebd1 57b38868d7eb060ddd65b26283402d4f161db76ed2169437c266105cca73a8fd
+ G4PII 1.3 G4PII G4PIIDATA 05f2471dbcdf1a2b17cbff84e8e83b37 313a2615903b0682b8aabc344bedde82c345704b 6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926
+ RealSurface 1.0 RealSurface G4REALSURFACEDATA 0dde95e00fcd3bcd745804f870bb6884 030513fe340e0cccbfe0b9ae9acb3ba6b5291ebb 3e2d2506600d2780ed903f1f2681962e208039329347c58ba1916740679020b1
+ G4SAIDDATA 1.1 G4SAIDDATA G4SAIDXSDATA d88a31218fdf28455e5c5a3609f7216f 7f0c75c86eea3d227379d3dfe77e4600752f99a2 a38cd9a83db62311922850fe609ecd250d36adf264a88e88c82ba82b7da0ed7f
+ G4ABLA 3.0 G4ABLA G4ABLADATA d7049166ef74a592cb97df0ed4b757bd 656b10fc9d8022e89e99a728576d0b502161aa69 99fd4dcc9b4949778f14ed8364088e45fa4ff3148b3ea36f9f3103241d277014
+ G4ENSDFSTATE 1.0 G4ENSDFSTATE G4ENSDFSTATEDATA 0c153d96c74e3856288b450436a5e4db e643d1ef8bbcfaedb6108b889e3c2cc9a05a673e 4562e7476aa2df7204a1a77263e9d2331e9ffcdb591d11814dcc2d6b605021dd
+}
</ins><span class="cx"> set geant.data_versions_10.0 {
</span><span class="cx"> G4NDL 4.4 G4NDL G4NEUTRONHPDATA cd8cc1d96aeb9b9ed37189edda26f5ad 8ba64e2f71ccaef278450d292239b889daae72fb e9fe8800566a83ccaf9b5229a1fa1d2cd24530bbd2e9fcb96eb6b5b117233071
</span><span class="cx"> G4EMLOW 6.35 G4EMLOW G4LEDATA 3345d693b012c80f3e7e4432ae9884a0 1f0310afff7d6429ad054185dda233a9f469356d 1564045a0acad344c8d432cd48c2c3bb2e051a81ab3099a84e0f56ba0fe82cec
</span><span class="lines">@@ -88,6 +101,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> # TODO: use an array (hash) to implement this without if-else
</span><ins>+ if {${geant.version} == "10.1" } {
+ set geant.data_versions ${geant.data_versions_10.1}
+ }
</ins><span class="cx"> if {${geant.version} == "10.0" } {
</span><span class="cx"> set geant.data_versions ${geant.data_versions_10.0}
</span><span class="cx"> }
</span><span class="lines">@@ -187,6 +203,10 @@
</span><span class="cx"> # prevents linking against X11 in /usr (maybe less aggressive patch would also work)
</span><span class="cx"> # - patch-cmake-Modules-Geant4BuildProjectConfig.cmake:
</span><span class="cx"> # allows placing *.cmake files to a different location than LIBDIR
</span><ins>+ if {${geant.version} == "10.1"} {
+ patchfiles patch-cmake-Modules-Geant4InterfaceOptions.cmake.4101.diff \
+ patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4101.diff
+ }
</ins><span class="cx"> if {${geant.version} == "10.0"} {
</span><span class="cx"> patchfiles patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff \
</span><span class="cx"> patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4100.diff
</span><span class="lines">@@ -254,7 +274,6 @@
</span><span class="cx">
</span><span class="cx"> # or simply x11? The option name in geant4-config is opengl-x11
</span><span class="cx"> variant opengl_x11 description {Build with X11 visualisation drivers} {
</span><del>- # dependencies were determined experimentally (by checking which libraries were linked against)
</del><span class="cx"> depends_lib-append port:mesa \
</span><span class="cx"> port:xorg-libice \
</span><span class="cx"> port:xorg-libsm \
</span></span></pre></div>
<a id="trunkdportssciencegeant4filesgeant4101fromrev121577trunkdportssciencegeant4filesgeant4100"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/geant4/files/geant4.10.1 (from rev 121577, trunk/dports/science/geant4/files/geant4.10.0) (0 => 121597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/geant4.10.1 (rev 0)
+++ trunk/dports/science/geant4/files/geant4.10.1 2014-07-01 18:54:14 UTC (rev 121597)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+libexec/Geant4/Geant4.10.1/geant4-config
+libexec/Geant4/Geant4.10.1/geant4data.sh
+libexec/Geant4/Geant4.10.1/geant4data.csh
</ins></span></pre></div>
<a id="trunkdportssciencegeant4filespatchcmakeModulesGeant4BuildProjectConfigcmake4101difffromrev121577trunkdportssciencegeant4filespatchcmakeModulesGeant4BuildProjectConfigcmake4100diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4101.diff (from rev 121577, trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4100.diff) (0 => 121597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4101.diff (rev 0)
+++ trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4101.diff 2014-07-01 18:54:14 UTC (rev 121597)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- cmake/Modules/Geant4BuildProjectConfig.cmake.orig
++++ cmake/Modules/Geant4BuildProjectConfig.cmake
+@@ -182,7 +182,7 @@ configure_file(
+ # - Generate Install Tree Configuration Files
+ #-----------------------------------------------------------------------
+ # Set needed variables for the install tree
+-set(GEANT4_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}-${${PROJECT_NAME}_VERSION})
++set(GEANT4_CMAKE_DIR lib/${PROJECT_NAME}-${${PROJECT_NAME}_VERSION})
+
+ # Header path for install tree is dependent on whether we have a relocatable
+ # install.
</ins></span></pre></div>
<a id="trunkdportssciencegeant4filespatchcmakeModulesGeant4InterfaceOptionscmake4101difffromrev121577trunkdportssciencegeant4filespatchcmakeModulesGeant4InterfaceOptionscmake4100diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4101.diff (from rev 121577, trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff) (0 => 121597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4101.diff (rev 0)
+++ trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4101.diff 2014-07-01 18:54:14 UTC (rev 121597)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+--- cmake/Modules/Geant4InterfaceOptions.cmake.orig
++++ cmake/Modules/Geant4InterfaceOptions.cmake
+@@ -196,22 +196,11 @@ if(UNIX)
+ set(CMAKE_FIND_FRAMEWORK NEVER)
+
+ set(X11_INC_SEARCH_PATH
+- /usr/pkg/xorg/include
+- /usr/X11R6/include
+- /usr/X11R7/include
+- /usr/include/X11
+- /usr/openwin/include
+- /usr/openwin/share/include
+- /opt/graphics/OpenGL/include
+- /opt/X11/include
++ @PREFIX@/include
+ )
+
+ set(X11_LIB_SEARCH_PATH
+- /usr/pkg/xorg/lib
+- /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})
+@@ -254,17 +243,17 @@ if(UNIX)
+ set(CMAKE_FIND_FRAMEWORK NEVER)
+
+ find_path(OPENGL_X11_INCLUDE_DIR GL/gl.h
+- PATHS /usr/X11R6/include /opt/X11/include
++ PATHS @PREFIX@/include
+ NO_DEFAULT_PATH
+ )
+
+ find_library(OPENGL_X11_gl_LIBRARY GL
+- PATHS /usr/X11R6/lib /opt/X11/lib
++ PATHS @PREFIX@/lib
+ NO_DEFAULT_PATH
+ )
+
+ find_library(OPENGL_X11_glu_LIBRARY GLU
+- PATHS /usr/X11R6/lib /opt/X11/lib
++ PATHS @PREFIX@/lib
+ NO_DEFAULT_PATH
+ )
+
</ins></span></pre>
</div>
</div>
</body>
</html>