<!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>[145044] 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/145044">145044</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-01-24 02:13:57 -0800 (Sun, 24 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>geant4: remove geant4.9.5, add geant4.10.2</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="#trunkdportssciencegeant4filesgeant4102">trunk/dports/science/geant4/files/geant4.10.2</a></li>
<li><a href="#trunkdportssciencegeant4filespatchcmakeModulesGeant4BuildProjectConfigcmake4102diff">trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff</a></li>
<li><a href="#trunkdportssciencegeant4filespatchcmakeModulesGeant4InterfaceOptionscmake4102diff">trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4102.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencegeant4filesgeant495">trunk/dports/science/geant4/files/geant4.9.5</a></li>
<li><a href="#trunkdportssciencegeant4filespatchcmakeModulesGeant4BuildProjectConfigcmake495diff">trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.495.diff</a></li>
<li><a href="#trunkdportssciencegeant4filespatchcmakeModulesGeant4InterfaceOptionscmake495diff">trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.495.diff</a></li>
<li><a href="#trunkdportssciencegeant4filespatchupstreamexamplesadvancedxray_fluorescencediff">trunk/dports/science/geant4/files/patch-upstream-examples-advanced-xray_fluorescence.diff</a></li>
<li><a href="#trunkdportssciencegeant4filespatchupstreamsourceinterfacescommonsrcG4Qtcc495diff">trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.495.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 (145043 => 145044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/Portfile 2016-01-24 09:29:11 UTC (rev 145043)
+++ trunk/dports/science/geant4/Portfile 2016-01-24 10:13:57 UTC (rev 145044)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> PortGroup select 1.0
</span><span class="cx">
</span><span class="cx"> name geant4
</span><del>-version 4
</del><ins>+version 4.10.2
</ins><span class="cx"> categories science
</span><span class="cx"> maintainers mojca openmaintainer
</span><span class="cx"> license Restrictive/Distributable
</span><span class="lines">@@ -32,12 +32,28 @@
</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 3 0 2 4.9.5.p02 33413f6233b75c003254af5888f4af32d17f515d adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777
</del><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><span class="cx"> 10.1 0 0 2 4.10.01.p02 e42f15d9a30acfa6cee2e659f36bf3ec014ea996 ee7917f6a4fe4c714cc9c68abaa3a2c32628d328186d8514d7cdecd7c639143f
</span><ins>+ 10.2 0 0 0 4.10.02 8739912899f36530c8de48df2de102bb11593882 633ca2df88b03ba818c7eb09ba21d0667a94e342f7d6d6ff3c695d83583b8aa3
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+# NAME VERS FILENAME ENVVAR md5 rmd160 sha256
+set geant.data_versions_10.2 {
+ G4NDL 4.5 G4NDL G4NEUTRONHPDATA fd29c45fe2de432f1f67232707b654c0 5c03cd810e590e48bae8b52e44e0ba218fcfc5ec cba928a520a788f2bc8229c7ef57f83d0934bb0c6a18c31ef05ef4865edcdf8e
+ G4EMLOW 6.48 G4EMLOW G4LEDATA 844064faa16a063a6a08406dc7895b68 13ef27c1a45cd908ccd7f9d76b9bd6d35681ef80 9815be88cbbcc4e8855b20244d586552a8b1819b8bf4e538c342b27c17dff1c7
+ PhotonEvaporation 3.2 G4PhotonEvaporation G4LEVELGAMMADATA 01d5ba17f615d3def01f7c0c6b19bd69 6bfe26eae2bba76d48509d4f15ea95a6e216972a 35ed450a47aa610ce83c9095e17e43006e0da9557bf4433ac96ce19c730492d4
+ RadioactiveDecay 4.3 G4RadioactiveDecay G4RADIOACTIVEDATA 9f1630a5d9f00b4ba1ffc5f7df174827 ab9fc7b81338d93aa01d62c5c61d82696494e52c 0b1cb30bc339eccf7fee3cc2d7df73457b31187a5d473914d1183dd50f6611f0
+ 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.2 G4ENSDFSTATE G4ENSDFSTATEDATA a2e88f2c626141e4be4587c838832707 72c11106f1a37b92575763df5ecb2b1ee3134cdb 8944283285a66080d02bab5e1ad998711b584f4658e989dd3cf2726cd91a9015
+}
+# optional
+# G4TENDL? 1.0 G4TENDL G4TENDL? bd6f381f995e1bf570c0b7cef3e40a78 88c97495862c24cf661828aaee4583fd768eb4eb 81ab22cb51f804f5c57a528e3ac3d15f0230a48b53c4443f0ddea833a4c4eb1d
+
</ins><span class="cx"> set geant.data_versions_10.1 {
</span><span class="cx"> G4NDL 4.5 G4NDL G4NEUTRONHPDATA fd29c45fe2de432f1f67232707b654c0 5c03cd810e590e48bae8b52e44e0ba218fcfc5ec cba928a520a788f2bc8229c7ef57f83d0934bb0c6a18c31ef05ef4865edcdf8e
</span><span class="cx"> G4EMLOW 6.41 G4EMLOW G4LEDATA b9b2e455d08375ca9cc5201236db6d7d f61578e1867c52626302c55d92cf7eaae5d282d4 6d878b18bf5e748e9d0ea35ef67eebab16df80cc912402986a03a5e1935f4af2
</span><span class="lines">@@ -72,16 +88,6 @@
</span><span class="cx"> RealSurface 1.0 RealSurface G4REALSURFACEDATA 0dde95e00fcd3bcd745804f870bb6884 030513fe340e0cccbfe0b9ae9acb3ba6b5291ebb 3e2d2506600d2780ed903f1f2681962e208039329347c58ba1916740679020b1
</span><span class="cx"> G4SAIDDATA 1.1 G4SAIDDATA G4SAIDXSDATA d88a31218fdf28455e5c5a3609f7216f 7f0c75c86eea3d227379d3dfe77e4600752f99a2 a38cd9a83db62311922850fe609ecd250d36adf264a88e88c82ba82b7da0ed7f
</span><span class="cx"> }
</span><del>-set geant.data_versions_9.5 {
- G4NDL 4.0 G4NDL G4NEUTRONHPDATA 6d23aff98e5706af1dd7fff397969f37 602d209009ee93d792cb67fe592aa37de6bab7c2 cef4fab143d8dcb8eae4c6e5c095af01d735bb36334b9958e00e30bcec9827ed
- G4EMLOW 6.23 G4EMLOW G4LEDATA 98cdca1024bf168c8f8ca1deb40f43b9 84529979894ed5e35ade27201fee67884d7b381d 6452215d9a0acbd35c71eed47f3581fd0276d7088b1a1a8588c003d9072aed3e
- PhotonEvaporation 2.2 G4PhotonEvaporation G4LEVELGAMMADATA 8010e7ce8a92564e38dd3418e6040563 8efc16c40b4755d209f83f31f2d251bbef52ccb8 9db02ef8e5b065c1b7f7d1becd1b72dde2b8fc617bcedde97788040418f239c0
- RadioactiveDecay 3.4 G4RadioactiveDecay G4RADIOACTIVEDATA a5b681048584631608ab0965b33c7959 378c237cd5857b4205980815a3c47cdb654506d4 1ecfb477ca3c3966dd128193d8e11e24d6c3dc29cc188c8c9b0b21b941f9c30c
- G4ABLA 3.0 G4ABLA G4ABLADATA d7049166ef74a592cb97df0ed4b757bd 656b10fc9d8022e89e99a728576d0b502161aa69 99fd4dcc9b4949778f14ed8364088e45fa4ff3148b3ea36f9f3103241d277014
- G4NEUTRONXS 1.1 G4NEUTRONXS G4NEUTRONXSDATA 61ef3a05b56525db04e11820e3f603f1 a4cd8791219f0df856da39295e7f913a537bde1a d477a377aee229bf9d75d3c9cc4b7cd48b414285a246449e4e44a72bf037472b
- G4PII 1.3 G4PII G4PIIDATA 05f2471dbcdf1a2b17cbff84e8e83b37 313a2615903b0682b8aabc344bedde82c345704b 6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926
- RealSurface 1.0 RealSurface G4REALSURFACEDATA 0dde95e00fcd3bcd745804f870bb6884 030513fe340e0cccbfe0b9ae9acb3ba6b5291ebb 3e2d2506600d2780ed903f1f2681962e208039329347c58ba1916740679020b1
-}
</del><span class="cx">
</span><span class="cx"> foreach {geant.version geant.revision geant.datarevision geant.patchlevel geant.version_full geant.rmd160 geant.sha256} ${geant.versions_info} {
</span><span class="cx">
</span><span class="lines">@@ -101,6 +107,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.2" } {
+ set geant.data_versions ${geant.data_versions_10.2}
+ }
</ins><span class="cx"> if {${geant.version} == "10.1" } {
</span><span class="cx"> set geant.data_versions ${geant.data_versions_10.1}
</span><span class="cx"> }
</span><span class="lines">@@ -110,9 +119,6 @@
</span><span class="cx"> if {${geant.version} == "9.6" } {
</span><span class="cx"> set geant.data_versions ${geant.data_versions_9.6}
</span><span class="cx"> }
</span><del>- if {${geant.version} == "9.5" } {
- set geant.data_versions ${geant.data_versions_9.5}
- }
</del><span class="cx"> # make the distfiles list empty
</span><span class="cx"> distfiles
</span><span class="cx"> foreach {data.name data.version data.filename data.envvariable data.md5 data.rmd160 data.sha256} ${geant.data_versions} {
</span><span class="lines">@@ -120,20 +126,8 @@
</span><span class="cx"> distfiles-append ${filename}
</span><span class="cx"> checksums-append ${filename} md5 ${data.md5} rmd160 ${data.rmd160} sha256 ${data.sha256}
</span><span class="cx"> }
</span><del>- # remove an old file that has been stealth-updated in November 2011
- # (this code has been added in January 2014 and may be removed after a while)
- pre-fetch {
- set file_abla "${prefix}/var/macports/distfiles/geant4/G4ABLA.3.0.tar.gz"
- if {[file exists ${file_abla}]} {
- if {[md5 file ${file_abla}] != "d7049166ef74a592cb97df0ed4b757bd"} {
- # problematic md5: d2d4e99b14f7a5057f4c10d9c2d647dd
- ui_warn "deleting an old '${file_abla}'"
- file delete ${file_abla}
- }
- }
- }
</del><span class="cx"> post-extract {
</span><del>- # only necessary for G4EMLOW 6.23 & 6.32
</del><ins>+ # only necessary for G4EMLOW 6.32
</ins><span class="cx"> # but G4NEUTRONXS 1.1, 1.2, 1.3 and PhotonEvaporation 2.2 also have some weird permissions
</span><span class="cx"> system "find ${workpath} -type f -exec chmod 644 {} \\;"
</span><span class="cx"> }
</span><span class="lines">@@ -197,6 +191,16 @@
</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.2"} {
+# PortGroup cxx11 1.0
+ PortGroup compiler_blacklist_versions 1.0
+ configure.cxx_stdlib libc++
+ # a bit of a guesswork (the list was not really tested)
+ compiler.blacklist-append *gcc* {clang < 500} macports-clang-3.3
+ compiler.fallback-append macports-clang-3.7 macports-clang-3.6 macports-clang-3.5
+ patchfiles patch-cmake-Modules-Geant4InterfaceOptions.cmake.4102.diff \
+ patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff
+ }
</ins><span class="cx"> if {${geant.version} == "10.1"} {
</span><span class="cx"> patchfiles patch-cmake-Modules-Geant4InterfaceOptions.cmake.4101.diff \
</span><span class="cx"> patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4101.diff
</span><span class="lines">@@ -211,12 +215,6 @@
</span><span class="cx"> patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff \
</span><span class="cx"> patch-cmake-Modules-Geant4BuildProjectConfig.cmake.496.diff
</span><span class="cx"> }
</span><del>- if {${geant.version} == "9.5"} {
- 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
- }
</del><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/cmake/Modules/Geant4InterfaceOptions.cmake
</span><span class="lines">@@ -257,7 +255,6 @@
</span><span class="cx"> configure.args-append -DGEANT4_USE_QT=ON
</span><span class="cx"> }
</span><span class="cx"> # TODO: figure out which versions of Geant4 are compatible with Qt 5
</span><del>- # allow the user to switch to qt5 without the need to explicitly disable qt4
</del><span class="cx"> variant qt5 conflicts qt description {Build with Qt 5 support} {
</span><span class="cx"> PortGroup qt5 1.0
</span><span class="cx"> configure.args-append -DGEANT4_USE_QT=ON
</span><span class="lines">@@ -345,7 +342,7 @@
</span><span class="cx">
</span><span class="cx"> set geant.version_full_no_patch [join [lrange [split ${geant.version_full} .] 0 2] \\.]
</span><span class="cx"> livecheck.type regex
</span><del>- if {${geant.version} == "10.1"} {
</del><ins>+ if {${geant.version} == "10.2"} {
</ins><span class="cx"> livecheck.url http://geant4.cern.ch/support/download.shtml
</span><span class="cx"> } else {
</span><span class="cx"> livecheck.url http://geant4.cern.ch/support/source_archive.shtml
</span><span class="lines">@@ -358,8 +355,8 @@
</span><span class="cx"> # stub port
</span><span class="cx"> if {$subport eq $name} {
</span><span class="cx"> # default replacement for geant4 which used to provide geant4.9.4
</span><del>- # other users should install geant4.9.6 directly
- depends_lib port:geant4.9.6
</del><ins>+ # other users should install geant4.10.x directly
+ depends_lib port:geant${version}
</ins><span class="cx">
</span><span class="cx"> fetch {}
</span><span class="cx"> checksum {}
</span></span></pre></div>
<a id="trunkdportssciencegeant4filesgeant4102fromrev144990trunkdportssciencegeant4filesgeant4101"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/geant4/files/geant4.10.2 (from rev 144990, trunk/dports/science/geant4/files/geant4.10.1) (0 => 145044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/geant4.10.2 (rev 0)
+++ trunk/dports/science/geant4/files/geant4.10.2 2016-01-24 10:13:57 UTC (rev 145044)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+libexec/Geant4/Geant4.10.2/geant4-config
+libexec/Geant4/Geant4.10.2/geant4data.sh
+libexec/Geant4/Geant4.10.2/geant4data.csh
</ins></span></pre></div>
<a id="trunkdportssciencegeant4filesgeant495"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/geant4/files/geant4.9.5 (145043 => 145044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/geant4.9.5 2016-01-24 09:29:11 UTC (rev 145043)
+++ trunk/dports/science/geant4/files/geant4.9.5 2016-01-24 10:13:57 UTC (rev 145044)
</span><span class="lines">@@ -1,3 +0,0 @@
</span><del>-libexec/Geant4/Geant4.9.5/geant4-config
-libexec/Geant4/Geant4.9.5/geant4data.sh
-libexec/Geant4/Geant4.9.5/geant4data.csh
</del></span></pre></div>
<a id="trunkdportssciencegeant4filespatchcmakeModulesGeant4BuildProjectConfigcmake4102difffromrev144990trunkdportssciencegeant4filespatchcmakeModulesGeant4BuildProjectConfigcmake4101diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff (from rev 144990, trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4101.diff) (0 => 145044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff (rev 0)
+++ trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff 2016-01-24 10:13:57 UTC (rev 145044)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- cmake/Modules/Geant4BuildProjectConfig.cmake.orig
++++ cmake/Modules/Geant4BuildProjectConfig.cmake
+@@ -188,7 +188,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="trunkdportssciencegeant4filespatchcmakeModulesGeant4BuildProjectConfigcmake495diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.495.diff (145043 => 145044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.495.diff 2016-01-24 09:29:11 UTC (rev 145043)
+++ trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.495.diff 2016-01-24 10:13:57 UTC (rev 145044)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- cmake/Modules/Geant4BuildProjectConfig.cmake.orig
-+++ cmake/Modules/Geant4BuildProjectConfig.cmake
-@@ -152,7 +152,7 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/Templates/UseGeant4_internal.cmake
- # - 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.
</del></span></pre></div>
<a id="trunkdportssciencegeant4filespatchcmakeModulesGeant4InterfaceOptionscmake4102difffromrev144990trunkdportssciencegeant4filespatchcmakeModulesGeant4InterfaceOptionscmake4101diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4102.diff (from rev 144990, trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4101.diff) (0 => 145044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4102.diff (rev 0)
+++ trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4102.diff 2016-01-24 10:13:57 UTC (rev 145044)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+--- cmake/Modules/Geant4InterfaceOptions.cmake.orig
++++ cmake/Modules/Geant4InterfaceOptions.cmake
+@@ -201,22 +201,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})
+@@ -259,17 +248,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>
<a id="trunkdportssciencegeant4filespatchcmakeModulesGeant4InterfaceOptionscmake495diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.495.diff (145043 => 145044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.495.diff 2016-01-24 09:29:11 UTC (rev 145043)
+++ trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.495.diff 2016-01-24 10:13:57 UTC (rev 145044)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>---- cmake/Modules/Geant4InterfaceOptions.cmake.orig
-+++ cmake/Modules/Geant4InterfaceOptions.cmake
-@@ -140,20 +140,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
-- )
-+ @PREFIX@/include
-+ )
-
- set(X11_LIB_SEARCH_PATH
-- /usr/pkg/xorg/lib
-- /usr/X11R6/lib
-- /usr/X11R7/lib
-- /usr/openwin/lib
-+ @PREFIX@/lib
- )
-
- find_path(X11_Xmu_INCLUDE_PATH X11/Xmu/Xmu.h ${X11_INC_SEARCH_PATH})
-@@ -194,17 +185,17 @@ if(UNIX)
- set(CMAKE_FIND_FRAMEWORK NEVER)
-
- find_path(OPENGL_X11_INCLUDE_DIR GL/gl.h
-- PATHS /usr/X11R6/include
-+ PATHS @PREFIX@/include
- NO_DEFAULT_PATH
- )
-
- find_library(OPENGL_X11_gl_LIBRARY GL
-- PATHS /usr/X11R6/lib
-+ PATHS @PREFIX@/lib
- NO_DEFAULT_PATH
- )
-
- find_library(OPENGL_X11_glu_LIBRARY GLU
-- PATHS /usr/X11R6/lib
-+ PATHS @PREFIX@/lib
- NO_DEFAULT_PATH
- )
-
</del></span></pre></div>
<a id="trunkdportssciencegeant4filespatchupstreamexamplesadvancedxray_fluorescencediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/geant4/files/patch-upstream-examples-advanced-xray_fluorescence.diff (145043 => 145044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-upstream-examples-advanced-xray_fluorescence.diff 2016-01-24 09:29:11 UTC (rev 145043)
+++ trunk/dports/science/geant4/files/patch-upstream-examples-advanced-xray_fluorescence.diff 2016-01-24 10:13:57 UTC (rev 145044)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>-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"
</del></span></pre></div>
<a id="trunkdportssciencegeant4filespatchupstreamsourceinterfacescommonsrcG4Qtcc495diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.495.diff (145043 => 145044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.495.diff 2016-01-24 09:29:11 UTC (rev 145043)
+++ trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.495.diff 2016-01-24 10:13:57 UTC (rev 145044)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-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@suhard.fr
-+ */
-+ setlocale (LC_NUMERIC, "C");
- }
- /***************************************************************************/
- G4Qt::~G4Qt (
</del></span></pre>
</div>
</div>
</body>
</html>