<!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>[119343] 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/119343">119343</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-04-22 18:51:00 -0700 (Tue, 22 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>geant4: update 9.6.p03, use built-in clhep (+clhep for external lib), no dependency on root</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegeant4Portfile">trunk/dports/science/geant4/Portfile</a></li>
<li><a href="#trunkdportssciencegeant4filespatchcmakeModulesGeant4InterfaceOptionscmake496diff">trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff</a></li>
<li><a href="#trunkdportssciencegeant4filespatchupstreamsourceinterfacescommonsrcG4Qtcc496diff">trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.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 (119342 => 119343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/Portfile 2014-04-23 01:39:26 UTC (rev 119342)
+++ trunk/dports/science/geant4/Portfile 2014-04-23 01:51:00 UTC (rev 119343)
</span><span class="lines">@@ -33,9 +33,9 @@
</span><span class="cx"> #
</span><span class="cx"> # if we start distributing betas, epoch will have to be added for the transition from version 4.x.y.b01 to 4.x.y
</span><span class="cx"> set geant.versions_info {
</span><del>- 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
</del><ins>+ 9.5 2 0 2 4.9.5.p02 33413f6233b75c003254af5888f4af32d17f515d adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777
+ 9.6 0 0 3 4.9.6.p03 581acefab40a25f5c7123cfa3a93c2a9d3ef2c73 3a7e969039e8992716b3bc33b44cbdbff9c8d5850385f1a02fdd756a4fa6305c
+ 10.0 1 0 1 4.10.00.p01 f1f70d381cef712781a1d0f13ffa4cb8fb4fa6a9 09c431ff3ef81034282c46501cea01046d4a20438c2ea2a7339576e1ecf26ba0
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set geant.data_versions_10.0 {
</span><span class="lines">@@ -166,17 +166,11 @@
</span><span class="cx"> file mkdir ${configure.dir}
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # https://trac.macports.org/ticket/42841
- # https://trac.macports.org/ticket/42875
- compiler.blacklist {clang > 503} macports-clang-3.4 macports-clang-3.5
-
</del><span class="cx"> configure.post_args ${worksrcpath}
</span><span class="cx">
</span><span class="cx"> # check if these are all the dependencies
</span><span class="cx"> depends_lib port:${subport}-data \
</span><del>- port:clhep \
</del><span class="cx"> port:expat \
</span><del>- port:root \
</del><span class="cx"> port:zlib
</span><span class="cx"> depends_run port:geant4_select
</span><span class="cx">
</span><span class="lines">@@ -184,13 +178,8 @@
</span><span class="cx"> select.file ${filespath}/${subport}
</span><span class="cx">
</span><span class="cx"> configure.args-append -DGEANT4_USE_SYSTEM_EXPAT=ON \
</span><del>- -DGEANT4_USE_SYSTEM_CLHEP=ON \
- -DCLHEP_CONFIG_EXECUTABLE=${prefix}/bin/clhep-config \
- -DCLHEP_INCLUDE_DIR=${prefix}/include \
- -DCLHEP_LIBRARY=${prefix}/lib/libCLHEP.dylib
</del><ins>+ -DGEANT4_USE_SYSTEM_CLHEP=OFF
</ins><span class="cx">
</span><del>- # GEANT4_USE_SYSTEM_CLHEP=OFF
-
</del><span class="cx"> # - patch-upstream-source-interfaces-common-src-G4Qt.cc:
</span><span class="cx"> # http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1487
</span><span class="cx"> # - patch-upstream-examples-advanced-xray_fluorescence:
</span><span class="lines">@@ -309,6 +298,18 @@
</span><span class="cx"> -DGEANT4_INSTALL_EXAMPLES=ON
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ # a temporary variant just for the sake of Gate users where the built-in clhep isn't sufficient
+ variant clhep description {Use external clhep} {
+ depends_lib-append port:clhep
+ configure.args-replace \
+ -DGEANT4_USE_SYSTEM_CLHEP=OFF -DGEANT4_USE_SYSTEM_CLHEP=ON
+ configure.args-append -DGEANT4_USE_SYSTEM_EXPAT=ON \
+ -DGEANT4_USE_SYSTEM_CLHEP=ON \
+ -DCLHEP_CONFIG_EXECUTABLE=${prefix}/bin/clhep-config \
+ -DCLHEP_INCLUDE_DIR=${prefix}/include \
+ -DCLHEP_LIBRARY=${prefix}/lib/libCLHEP.dylib
+ }
+
</ins><span class="cx"> default_variants +gdml +qt
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportssciencegeant4filespatchcmakeModulesGeant4InterfaceOptionscmake496diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff (119342 => 119343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff 2014-04-23 01:39:26 UTC (rev 119342)
+++ trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff 2014-04-23 01:51:00 UTC (rev 119343)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- cmake/Modules/Geant4InterfaceOptions.cmake.orig
</span><span class="cx"> +++ cmake/Modules/Geant4InterfaceOptions.cmake
</span><del>-@@ -141,20 +141,11 @@ if(UNIX)
</del><ins>+@@ -174,22 +174,11 @@ if(UNIX)
</ins><span class="cx"> set(CMAKE_FIND_FRAMEWORK NEVER)
</span><span class="cx">
</span><span class="cx"> set(X11_INC_SEARCH_PATH
</span><span class="lines">@@ -11,36 +11,37 @@
</span><span class="cx"> - /usr/openwin/include
</span><span class="cx"> - /usr/openwin/share/include
</span><span class="cx"> - /opt/graphics/OpenGL/include
</span><del>-- )
</del><ins>+- /opt/X11/include
</ins><span class="cx"> + @PREFIX@/include
</span><del>-+ )
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx"> set(X11_LIB_SEARCH_PATH
</span><span class="cx"> - /usr/pkg/xorg/lib
</span><span class="cx"> - /usr/X11R6/lib
</span><span class="cx"> - /usr/X11R7/lib
</span><span class="cx"> - /usr/openwin/lib
</span><ins>+- /opt/X11/lib
</ins><span class="cx"> + @PREFIX@/lib
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> find_path(X11_Xmu_INCLUDE_PATH X11/Xmu/Xmu.h ${X11_INC_SEARCH_PATH})
</span><del>-@@ -197,17 +188,17 @@ if(UNIX)
</del><ins>+@@ -232,17 +221,17 @@ if(UNIX)
</ins><span class="cx"> set(CMAKE_FIND_FRAMEWORK NEVER)
</span><span class="cx">
</span><span class="cx"> find_path(OPENGL_X11_INCLUDE_DIR GL/gl.h
</span><del>-- PATHS /usr/X11R6/include
</del><ins>+- PATHS /usr/X11R6/include /opt/X11/include
</ins><span class="cx"> + PATHS @PREFIX@/include
</span><span class="cx"> NO_DEFAULT_PATH
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> find_library(OPENGL_X11_gl_LIBRARY GL
</span><del>-- PATHS /usr/X11R6/lib
</del><ins>+- PATHS /usr/X11R6/lib /opt/X11/lib
</ins><span class="cx"> + PATHS @PREFIX@/lib
</span><span class="cx"> NO_DEFAULT_PATH
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> find_library(OPENGL_X11_glu_LIBRARY GLU
</span><del>-- PATHS /usr/X11R6/lib
</del><ins>+- PATHS /usr/X11R6/lib /opt/X11/lib
</ins><span class="cx"> + PATHS @PREFIX@/lib
</span><span class="cx"> NO_DEFAULT_PATH
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkdportssciencegeant4filespatchupstreamsourceinterfacescommonsrcG4Qtcc496diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff (119342 => 119343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff 2014-04-23 01:39:26 UTC (rev 119342)
+++ trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff 2014-04-23 01:51:00 UTC (rev 119343)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1487
</span><span class="cx"> --- source/interfaces/common/src/G4Qt.cc.orig
</span><span class="cx"> +++ source/interfaces/common/src/G4Qt.cc
</span><del>-@@ -153,6 +153,20 @@ G4Qt::G4Qt (
</del><ins>+@@ -148,6 +148,20 @@ G4Qt::G4Qt (
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> // AddDispatcher ((G4DispatchFunction)XtDispatchEvent);
</span></span></pre>
</div>
</div>
</body>
</html>