<!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>[141115] trunk/dports/science/root6/Portfile</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/141115">141115</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-10-11 05:34:51 -0700 (Sun, 11 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>root6: upgrade to 6.04.04, new preliminary variant with support for geocad, dependency on ocaml, additional conf. options</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceroot6Portfile">trunk/dports/science/root6/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceroot6Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/root6/Portfile (141114 => 141115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root6/Portfile 2015-10-11 06:55:06 UTC (rev 141114)
+++ trunk/dports/science/root6/Portfile 2015-10-11 12:34:51 UTC (rev 141115)
</span><span class="lines">@@ -10,16 +10,16 @@
</span><span class="cx"> PortGroup select 1.0
</span><span class="cx">
</span><span class="cx"> # don't forget to update both the git tag and the version
</span><del>-github.setup root-mirror root b43f80bccfd6b67be37708c4a5a9386b7c850d29
-#github.setup root-mirror root 6-04-02 v
-version 6.04.02.99
</del><ins>+#github.setup root-mirror root <sha>
+github.setup root-mirror root 6-04-04 v
+version 6.04.04
</ins><span class="cx">
</span><span class="cx"> # this could be a better way to set the version (unless we use a sha sum for the git tag ;)
</span><span class="cx"> # version [string map {- .} $version]
</span><span class="cx"> set version_major [lindex [split ${version} .] 0]
</span><span class="cx">
</span><del>-checksums rmd160 d4025bb6e0fe4157a145de142fd2f40490c68ac4 \
- sha256 9bf93ef6b52e3aaedbaf6c6b2aa78d6dba5c7ec9672d7d78fb173fbab7ac7b9a
</del><ins>+checksums rmd160 be5cc9ca48ee2303b68b104f96eeafce82bcf79e \
+ sha256 55cab82a145a67539b063807fde60d83a98b6743420508cebeffd57a7d06f1fb
</ins><span class="cx">
</span><span class="cx"> name root${version_major}
</span><span class="cx"> categories science
</span><span class="lines">@@ -42,6 +42,9 @@
</span><span class="cx"> port:jpeg \
</span><span class="cx"> port:libpng \
</span><span class="cx"> port:lzma \
</span><ins>+ port:ocaml \
+ port:ocaml-ctypes \
+ port:ocaml-findlib \
</ins><span class="cx"> port:pcre \
</span><span class="cx"> port:tiff \
</span><span class="cx"> port:zlib \
</span><span class="lines">@@ -68,6 +71,7 @@
</span><span class="cx">
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -Dgnuinstall=ON \
</span><ins>+ -Drpath=ON \
</ins><span class="cx"> -DCMAKE_INSTALL_PREFIX="${install_prefix}" \
</span><span class="cx"> -DCMAKE_INSTALL_SYSCONFDIR="${install_prefix}/etc/root" \
</span><span class="cx"> -Dfortran=OFF \
</span><span class="lines">@@ -76,6 +80,7 @@
</span><span class="cx"> -Dbuiltin_pcre=OFF \
</span><span class="cx"> -Dbuiltin_zlib=OFF \
</span><span class="cx"> -Dbuiltin_lzma=OFF \
</span><ins>+ -Dbuiltin_afterimage=ON \
</ins><span class="cx"> -Dfftw3=OFF \
</span><span class="cx"> -Dkrb5=OFF \
</span><span class="cx"> -Dldap=OFF \
</span><span class="lines">@@ -104,6 +109,7 @@
</span><span class="cx"> -Dgviz=OFF \
</span><span class="cx"> -Dsoversion=OFF \
</span><span class="cx"> -Dcxx11=ON \
</span><ins>+ -Dcxx14=OFF \
</ins><span class="cx"> -Dlibcxx=ON \
</span><span class="cx"> -Dxrootd=OFF \
</span><span class="cx"> -Dbuiltin_ftgl=ON \
</span><span class="lines">@@ -115,6 +121,8 @@
</span><span class="cx"> -Dgdml=ON \
</span><span class="cx"> -Dhttp=OFF \
</span><span class="cx"> -Dvc=OFF \
</span><ins>+ -Dastiff=ON \
+ -Dgeocad=OFF \
</ins><span class="cx"> -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
</span><span class="cx"> -DPNG_PNG_INCLUDE_DIR=${prefix}/include
</span><span class="cx">
</span><span class="lines">@@ -225,8 +233,14 @@
</span><span class="cx"> set default_gui_variant +x11
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# variant geocad description {Enable CAD Interface} {
+# configure.args-replace -Dgeocad=OFF -Dgeocad=ON
+# depends_lib-append port:oce
+# configure.args-append -DOCC_INCLUDE_DIR="${prefix}/include/oce"
+# }
+
</ins><span class="cx"> variant cxx14 description {Enable c++14 compiler support} {
</span><del>- configure.args-append -Dcxx14=ON
</del><ins>+ configure.args-replace -Dcxx14=OFF -Dcxx14=ON
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant valgrind description {Build internal LLVM library with valgrind support} {
</span><span class="lines">@@ -234,15 +248,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant http description {Build with HTTP Server library support} {
</span><del>- configure.args-replace -Dhttp=OFF -Dhttp=ON
</del><ins>+ configure.args-replace -Dhttp=OFF -Dhttp=ON
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant vc description {Build with Vc library support} {
</span><del>- configure.args-replace -Dvc=OFF -Dvc=ON
</del><ins>+ configure.args-replace -Dvc=OFF -Dvc=ON
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant debug description {Enable a debug build} {
</span><del>- configure.args-append -DCMAKE_BUILD_TYPE=Debug
</del><ins>+ configure.args-append -DCMAKE_BUILD_TYPE=Debug
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant xrootd description {Build with XRootD support} {
</span></span></pre>
</div>
</div>
</body>
</html>