<!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>[147160] 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/147160">147160</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-03-30 01:30:04 -0700 (Wed, 30 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>geant4: upgrade to 4.10.1.p03 &amp; 4.10.2.p02, fix install name (closes #50426)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegeant4Portfile">trunk/dports/science/geant4/Portfile</a></li>
<li><a href="#trunkdportssciencegeant4filespatchcmakeModulesGeant4BuildProjectConfigcmake4102diff">trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.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 (147159 => 147160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/Portfile        2016-03-30 06:42:58 UTC (rev 147159)
+++ trunk/dports/science/geant4/Portfile        2016-03-30 08:30:04 UTC (rev 147160)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> set geant.versions_info {
</span><span class="cx">      9.6  1  0  4  4.9.6.p04    3dd8f6ac2e79929d26519e83fce113691a670788  997220a5386a43ac8f533fc7d5a8360aa1fd6338244d17deeaa583fb3a0f39fd
</span><span class="cx">     10.0  1  0  4  4.10.00.p04  bfd11977b55f316f5c38d82f09dc37e7c0f60ea7  f4e1fc6d5ea4d9761ba44fd7e50921ff6276e25c2f640c7615460235d8c77d74
</span><del>-    10.1  0  0  2  4.10.01.p02  e42f15d9a30acfa6cee2e659f36bf3ec014ea996  ee7917f6a4fe4c714cc9c68abaa3a2c32628d328186d8514d7cdecd7c639143f
-    10.2  0  0  0  4.10.02      8739912899f36530c8de48df2de102bb11593882  633ca2df88b03ba818c7eb09ba21d0667a94e342f7d6d6ff3c695d83583b8aa3
</del><ins>+    10.1  0  0  3  4.10.01.p03  0b141adfceb4203f4855e0c6fb0d4c17036776ca  b198943b5bc4fd7968ef4eaa5bbe2fb094b8df1d907a05486dc05f4c92bbb174
+    10.2  0  0  1  4.10.02.p01  ac4e0d9314c41ac186bee82ca51dedfd62171541  b81f7082a15f6a34b720b6f15c6289cfe4ddbbbdcef0dc52719f71fac95f7f1c
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #   NAME               VERS  FILENAME             ENVVAR             md5                               rmd160                                    sha256
</span><span class="lines">@@ -53,6 +53,9 @@
</span><span class="cx"> }
</span><span class="cx"> #   optional
</span><span class="cx"> #   G4TENDL?           1.0   G4TENDL              G4TENDL?           bd6f381f995e1bf570c0b7cef3e40a78  88c97495862c24cf661828aaee4583fd768eb4eb  81ab22cb51f804f5c57a528e3ac3d15f0230a48b53c4443f0ddea833a4c4eb1d
</span><ins>+#   broken
+#   RadioactiveDecay   4.3.1 G4RadioactiveDecay   G4RADIOACTIVEDATA  e4a1a08a1c26000ffd32f17c38309c6d  81718f13428708c2a10c31748754b4bd1c8206ad  efa12e05db94f0fd93011821e27d672a07d9494b2b3313f86fd0229a50ee7185
+#   G4ENSDFSTATE       1.2.1 G4ENSDFSTATE         G4ENSDFSTATEDATA   55eba9a1fc69626ac8eb0eb40330acf9  e6e13d05b09f53330f3282772dbdbc7c42f00c14  284807de9387fe24d49753041e9c32ca8e2f3f61eef0038f2585603ce283a1a0
</ins><span class="cx"> 
</span><span class="cx"> set geant.data_versions_10.1 {
</span><span class="cx">     G4NDL              4.5   G4NDL                G4NEUTRONHPDATA    fd29c45fe2de432f1f67232707b654c0  5c03cd810e590e48bae8b52e44e0ba218fcfc5ec  cba928a520a788f2bc8229c7ef57f83d0934bb0c6a18c31ef05ef4865edcdf8e
</span><span class="lines">@@ -221,11 +224,16 @@
</span><span class="cx">         }
</span><span class="cx">         # arguments to -DCMAKE_INSTALL_* could be written without ${prefix}
</span><span class="cx">         # however the ${prefix} triggers the NON_RELOCATABLE flag which has some advantages like less cryptic path names
</span><ins>+        configure.args-delete -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
+                              -DCMAKE_INSTALL_RPATH=${prefix}/lib
+                            # -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
</ins><span class="cx">         configure.args-append -DGEANT4_INSTALL_DATA=OFF \
</span><span class="cx">                               -DCMAKE_INSTALL_BINDIR=${prefix}/libexec/Geant4/Geant${geant.version_simple} \
</span><span class="cx">                               -DCMAKE_INSTALL_DATAROOTDIR=${prefix}/share/Geant4 \
</span><span class="cx">                               -DCMAKE_INSTALL_INCLUDEDIR=${prefix}/include/Geant4/Geant${geant.version_simple} \
</span><del>-                              -DCMAKE_INSTALL_LIBDIR=${prefix}/lib/Geant4/Geant${geant.version_simple}
</del><ins>+                              -DCMAKE_INSTALL_LIBDIR=${prefix}/lib/Geant4/Geant${geant.version_simple} \
+                              -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/Geant4/Geant${geant.version_simple} \
+                              -DCMAKE_INSTALL_RPATH=${prefix}/lib/Geant4/Geant${geant.version_simple}
</ins><span class="cx"> 
</span><span class="cx">         if {${geant.version} != &quot;9.5&quot;} {
</span><span class="cx">             configure.args-append -DGEANT4_INSTALL_DATADIR=${geant.datadir} \
</span></span></pre></div>
<a id="trunkdportssciencegeant4filespatchcmakeModulesGeant4BuildProjectConfigcmake4102diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff (147159 => 147160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff        2016-03-30 06:42:58 UTC (rev 147159)
+++ trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff        2016-03-30 08:30:04 UTC (rev 147160)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- cmake/Modules/Geant4BuildProjectConfig.cmake.orig
</span><span class="cx"> +++ cmake/Modules/Geant4BuildProjectConfig.cmake
</span><del>-@@ -188,7 +188,7 @@ configure_file(
</del><ins>+@@ -185,7 +185,7 @@ configure_file(
</ins><span class="cx">  # - Generate Install Tree Configuration Files
</span><span class="cx">  #-----------------------------------------------------------------------
</span><span class="cx">  # Set needed variables for the install tree
</span></span></pre>
</div>
</div>

</body>
</html>