<!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>[143637] trunk/dports</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/143637">143637</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-12-16 05:56:33 -0800 (Wed, 16 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>root: upgrade root6 to 6.06.00, fix gsl in root5 (closes #50007, #50011)
root6:
* upgrade to version 6.06.00
* `cocoa` is always the default variant
(the Portfile currently doesn't support 10.6 anyway)
* introduce a new variant `cxx14`
(enabled by default on Xcode 6.3 and later)
* add support for compiling with clang 3.8
* (closes #50011)
root5:
* fix compatibility with GSL v2
* make `+gsl` the default variant again (reverts <a href="https://trac.macports.org/changeset/142498">r142498</a>)
* (closes #50007)
root_select:
* add more files from the new `root6` version</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceroot5Portfile">trunk/dports/science/root5/Portfile</a></li>
<li><a href="#trunkdportsscienceroot5filesroot5">trunk/dports/science/root5/files/root5</a></li>
<li><a href="#trunkdportsscienceroot6Portfile">trunk/dports/science/root6/Portfile</a></li>
<li><a href="#trunkdportsscienceroot6filesroot6">trunk/dports/science/root6/files/root6</a></li>
<li><a href="#trunkdportssysutilsroot_selectPortfile">trunk/dports/sysutils/root_select/Portfile</a></li>
<li><a href="#trunkdportssysutilsroot_selectfilesbase">trunk/dports/sysutils/root_select/files/base</a></li>
<li><a href="#trunkdportssysutilsroot_selectfilesnone">trunk/dports/sysutils/root_select/files/none</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsscienceroot5filespatchmathmathmoresrcGSLMultiFithdiff">trunk/dports/science/root5/files/patch-math-mathmore-src-GSLMultiFit.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceroot5Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/root5/Portfile (143636 => 143637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root5/Portfile 2015-12-16 13:36:54 UTC (rev 143636)
+++ trunk/dports/science/root5/Portfile 2015-12-16 13:56:33 UTC (rev 143637)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx">
</span><span class="cx"> github.setup root-mirror root 5-34-34 v
</span><span class="cx"> version 5.34.34
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx">
</span><span class="cx"> set version_major [lindex [split ${version} .] 0]
</span><span class="cx">
</span><span class="lines">@@ -50,6 +50,8 @@
</span><span class="cx"> select.group root
</span><span class="cx"> select.file ${filespath}/${name}
</span><span class="cx">
</span><ins>+patchfiles-append patch-math-mathmore-src-GSLMultiFit.h.diff
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> # reinplace "s|-lfreetype| \`freetype-config --libs\`|g" ${worksrcpath}/config/root-config.in
</span><span class="cx"> reinplace "s|\"/usr/include\"|\"${prefix}/include /usr/include\"|g" ${worksrcpath}/configure
</span><span class="lines">@@ -187,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><del>-default_variants +ssl +xml +minuit2 +tmva +roofit +graphviz +opengl +soversion +http
</del><ins>+default_variants +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http
</ins><span class="cx">
</span><span class="cx"> # Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer
</span><span class="cx"> # We also make it default on 10.7
</span></span></pre></div>
<a id="trunkdportsscienceroot5filespatchmathmathmoresrcGSLMultiFithdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/root5/files/patch-math-mathmore-src-GSLMultiFit.h.diff (0 => 143637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root5/files/patch-math-mathmore-src-GSLMultiFit.h.diff (rev 0)
+++ trunk/dports/science/root5/files/patch-math-mathmore-src-GSLMultiFit.h.diff 2015-12-16 13:56:33 UTC (rev 143637)
</span><span class="lines">@@ -0,0 +1,77 @@
</span><ins>+From 850a56cad37733694a6858314e30e3dafbacc220 Mon Sep 17 00:00:00 2001
+From: Pere Mato <pere.mato@cern.ch>
+Date: Tue, 15 Dec 2015 11:58:24 +0100
+Subject: [PATCH] Fix for ROOT-7776 - Integrate GSL 2.0 in ROOT.
+
+---
+ math/mathmore/src/GSLMultiFit.h | 40 ++++++++++++++++++++++++++--------------
+ 1 file changed, 26 insertions(+), 14 deletions(-)
+
+diff --git a/math/mathmore/src/GSLMultiFit.h b/math/mathmore/src/GSLMultiFit.h
+index a1cb348..e2570a0 100644
+--- math/mathmore/src/GSLMultiFit.h
++++ math/mathmore/src/GSLMultiFit.h
+@@ -31,6 +31,7 @@
+ #include "gsl/gsl_matrix.h"
+ #include "gsl/gsl_multifit_nlin.h"
+ #include "gsl/gsl_blas.h"
++#include "gsl/gsl_version.h"
+ #include "GSLMultiFitFunctionWrapper.h"
+
+ #include "Math/IFunction.h"
+@@ -127,20 +128,24 @@ class GSLMultiFit {
+ int Iterate() {
+ if (fSolver == 0) return -1;
+ return gsl_multifit_fdfsolver_iterate(fSolver);
+- }
+-
+- /// parameter values at the minimum
+- const double * X() const {
+- if (fSolver == 0) return 0;
+- gsl_vector * x = gsl_multifit_fdfsolver_position(fSolver);
+- return x->data;
+ }
+
+- /// gradient value at the minimum
+- const double * Gradient() const {
+- if (fSolver == 0) return 0;
+- gsl_multifit_gradient(fSolver->J, fSolver->f,fVec);
+- return fVec->data;
++ /// parameter values at the minimum
++ const double * X() const {
++ if (fSolver == 0) return 0;
++ gsl_vector * x = gsl_multifit_fdfsolver_position(fSolver);
++ return x->data;
++ }
++
++ /// gradient value at the minimum
++ const double * Gradient() const {
++ if (fSolver == 0) return 0;
++#if GSL_MAJOR_VERSION > 1
++ fType->gradient(fSolver->state, fVec);
++#else
++ gsl_multifit_gradient(fSolver->J, fSolver->f,fVec);
++#endif
++ return fVec->data;
+ }
+
+ /// return covariance matrix of the parameters
+@@ -150,9 +155,16 @@ class GSLMultiFit {
+ unsigned int npar = fSolver->fdf->p;
+ fCov = gsl_matrix_alloc( npar, npar );
+ static double kEpsrel = 0.0001;
++#if GSL_MAJOR_VERSION > 1
++ gsl_matrix* J = gsl_matrix_alloc(npar,npar);
++ gsl_multifit_fdfsolver_jac (fSolver, J);
++ int ret = gsl_multifit_covar(J, kEpsrel, fCov);
++ gsl_matrix_free(J);
++#else
+ int ret = gsl_multifit_covar(fSolver->J, kEpsrel, fCov);
+- if (ret != GSL_SUCCESS) return 0;
+- return fCov->data;
++#endif
++ if (ret != GSL_SUCCESS) return 0;
++ return fCov->data;
+ }
+
+ /// test gradient (ask from solver gradient vector)
</ins></span></pre></div>
<a id="trunkdportsscienceroot5filesroot5"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/root5/files/root5 (143636 => 143637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root5/files/root5 2015-12-16 13:36:54 UTC (rev 143636)
+++ trunk/dports/science/root5/files/root5 2015-12-16 13:56:33 UTC (rev 143637)
</span><span class="lines">@@ -28,6 +28,14 @@
</span><span class="cx"> libexec/root5/bin/thisroot.sh
</span><span class="cx"> libexec/root5/bin/xpdtest
</span><span class="cx"> -
</span><ins>+-
+-
+-
+-
+-
+-
+-
+-
</ins><span class="cx"> libexec/root5/share/man/man1/cint.1.gz
</span><span class="cx"> libexec/root5/share/man/man1/g2root.1.gz
</span><span class="cx"> libexec/root5/share/man/man1/g2rootold.1.gz
</span></span></pre></div>
<a id="trunkdportsscienceroot6Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/root6/Portfile (143636 => 143637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root6/Portfile 2015-12-16 13:36:54 UTC (rev 143636)
+++ trunk/dports/science/root6/Portfile 2015-12-16 13:56:33 UTC (rev 143637)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</del><ins>+ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</ins><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="lines">@@ -8,18 +8,19 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup select 1.0
</span><ins>+PortGroup xcodeversion 1.0
</ins><span class="cx">
</span><span class="cx"> # don't forget to update both the git tag and the version
</span><span class="cx"> #github.setup root-mirror root <sha>
</span><del>-github.setup root-mirror root 6-04-12 v
-version 6.04.12
</del><ins>+github.setup root-mirror root 6-06-00 v
+version 6.06.00
</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 a607eb11c3e84c8e61c1c7dcdad5de7daa0c998c \
- sha256 140de60f190970453dd0c53aa27b33fa73fe1c8a6e863620a4c6fb9ac9a975a2
</del><ins>+checksums rmd160 84ce0e3b637e2cc81cc4d6c598118e50d5f18125 \
+ sha256 90416cd4d836b8ca48c2e31cc7774a5e35ee21f0748596487e39fa0af2cf2324
</ins><span class="cx">
</span><span class="cx"> name root${version_major}
</span><span class="cx"> categories science
</span><span class="lines">@@ -60,9 +61,10 @@
</span><span class="cx"> select.file ${filespath}/${name}
</span><span class="cx">
</span><span class="cx"> # Force a compatible compiler
</span><ins>+#compiler.blacklist-append *gcc* {clang < 602} macports-clang-3.4 macports-clang-3.3
+#compiler.fallback-append macports-clang-3.7 macports-clang-3.6 macports-clang-3.5
</ins><span class="cx"> compiler.blacklist-append *gcc* {clang < 500} macports-clang-3.3
</span><del>-compiler.fallback-append macports-clang-3.7 macports-clang-3.6 macports-clang-3.5 \
- macports-clang-3.4
</del><ins>+compiler.fallback-append macports-clang-3.7 macports-clang-3.6 macports-clang-3.5
</ins><span class="cx">
</span><span class="cx"> # port specific location
</span><span class="cx"> set install_prefix ${prefix}/libexec/root${version_major}
</span><span class="lines">@@ -124,6 +126,7 @@
</span><span class="cx"> -Dvc=OFF \
</span><span class="cx"> -Dastiff=ON \
</span><span class="cx"> -Dgeocad=OFF \
</span><ins>+ -Dr=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">@@ -169,9 +172,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><del>- # create versioned symlinks for the content of libexec
- # bin dir
</del><ins>+ # Temporary - Set execute flag on binaries (broken in 6.06.00)
</ins><span class="cx"> foreach f [glob -directory ${destroot}${install_prefix}/bin *] {
</span><ins>+ system "chmod +x $f"
+ }
+ # create versioned symlinks for the content of libexec bin dir
+ foreach f [glob -directory ${destroot}${install_prefix}/bin *] {
</ins><span class="cx"> set filename [file tail $f]
</span><span class="cx"> set extension [file extension $filename]
</span><span class="cx"> set base [file rootname $filename]
</span><span class="lines">@@ -224,22 +230,13 @@
</span><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><del>-default_variants +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http
</del><ins>+default_variants +cocoa +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http
</ins><span class="cx">
</span><del>-# Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer
-# We also make it default on 10.7
-if {${os.major} > 10} {
- set default_gui_variant +cocoa
-} else {
- set default_gui_variant +x11
</del><ins>+# Enable C++14 by default when Xcode allows (Xcode 6.3 onwards)
+if { [vercmp $xcodeversion "6.3"] >= 0 } {
+ default_variants-append +cxx14
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-# 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"
-# }
-
</del><span class="cx"> variant qt4 description {Enable QT4 support} {
</span><span class="cx"> configure.args-replace -Dqt=OFF -Dqt=ON
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="lines">@@ -247,6 +244,8 @@
</span><span class="cx">
</span><span class="cx"> variant cxx14 description {Enable c++14 compiler support} {
</span><span class="cx"> configure.args-replace -Dcxx14=OFF -Dcxx14=ON
</span><ins>+ # Update compiler blacklist to force use of MP's Clang 3.7 when required
+ compiler.blacklist-append {clang < 602} macports-clang-3.4
</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">@@ -423,6 +422,9 @@
</span><span class="cx"> foreach f [ exec find ${destroot}${install_prefix} -type f -and -name "*.py" ] {
</span><span class="cx"> reinplace "s|${pystringtoreplace}|${prefix}/bin/python${active_python_version}|g" $f
</span><span class="cx"> }
</span><ins>+ foreach f [ exec find ${destroot}${install_prefix}/bin -type f | xargs grep -Il ${pystringtoreplace} ] {
+ reinplace "s|${pystringtoreplace}|${prefix}/bin/python${active_python_version}|g" $f
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -487,14 +489,14 @@
</span><span class="cx"> variant postgresql90 conflicts postgresql92 description {Build with PostgreSQL 9.0 support} {
</span><span class="cx"> configure.args-replace -Dpgsql=OFF -Dpgsql=ON
</span><span class="cx"> configure.args-append -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql90"\
</span><del>- -DPOSTGRESQL_LIBRARIES="${prefix}/lib/postgresql90/libpq.dylib"
</del><ins>+ -DPOSTGRESQL_LIBRARY="${prefix}/lib/postgresql90/libpq.dylib"
</ins><span class="cx"> depends_lib-append port:libpqxx port:postgresql90
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant postgresql92 conflicts postgresql90 description {Build with PostgreSQL 9.2 support} {
</span><span class="cx"> configure.args-replace -Dpgsql=OFF -Dpgsql=ON
</span><span class="cx"> configure.args-append -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql92" \
</span><del>- -DPOSTGRESQL_LIBRARIES="${prefix}/lib/postgresql92/libpq.dylib"
</del><ins>+ -DPOSTGRESQL_LIBRARY="${prefix}/lib/postgresql92/libpq.dylib"
</ins><span class="cx"> depends_lib-append port:libpqxx port:postgresql92
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -540,17 +542,12 @@
</span><span class="cx"> -DOPENGL_glu_LIBRARY=${prefix}/lib/libGLU.dylib
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# If neither graphical variant is set, use default
-if { ![variant_isset cocoa] && ![variant_isset x11] } {
- default_variants-append ${default_gui_variant}
-}
-
</del><span class="cx"> # ========================================================================================
</span><span class="cx"> # Setup various clang variants, to provide alternative C++ compilers that support cocoa
</span><span class="cx"> # ========================================================================================
</span><span class="cx">
</span><span class="cx"> # List of possible clang versions that work
</span><del>-set clang_versions { 3.4 3.5 3.6 3.7 }
</del><ins>+set clang_versions { 3.4 3.5 3.6 3.7 3.8 }
</ins><span class="cx">
</span><span class="cx"> # Define the available variants
</span><span class="cx"> foreach clang_ver ${clang_versions} {
</span><span class="lines">@@ -567,12 +564,12 @@
</span><span class="cx">
</span><span class="cx"> # make sure that the proper variant is automatically selected
</span><span class="cx"> # (ROOT crashes if the compiler it was built with doesn't exist)
</span><del>-if { ![variant_isset clang33] && ![variant_isset clang34] &&
- ![variant_isset clang35] && ![variant_isset clang36] &&
- ![variant_isset clang37] } {
- if { ${configure.compiler} eq "macports-clang-3.3" } {
- default_variants-append +clang33
- } elseif { ${configure.compiler} eq "macports-clang-3.4" } {
</del><ins>+if { ![variant_isset clang34] &&
+ ![variant_isset clang35] &&
+ ![variant_isset clang36] &&
+ ![variant_isset clang37] &&
+ ![variant_isset clang38] } {
+ if { ${configure.compiler} eq "macports-clang-3.4" } {
</ins><span class="cx"> default_variants-append +clang34
</span><span class="cx"> } elseif { ${configure.compiler} eq "macports-clang-3.5" } {
</span><span class="cx"> default_variants-append +clang35
</span><span class="lines">@@ -580,6 +577,8 @@
</span><span class="cx"> default_variants-append +clang36
</span><span class="cx"> } elseif { ${configure.compiler} eq "macports-clang-3.7" } {
</span><span class="cx"> default_variants-append +clang37
</span><ins>+ } elseif { ${configure.compiler} eq "macports-clang-3.8" } {
+ default_variants-append +clang38
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -655,7 +654,8 @@
</span><span class="cx">
</span><span class="cx"> # ========================================================================================
</span><span class="cx">
</span><del>-# Problems finding includes ...
</del><ins>+# Various variants etc. with problems. Work in progress...
+
</ins><span class="cx"> # variant ruby description {Build with ruby support} {
</span><span class="cx"> # configure.args-replace -Druby=OFF -Druby=ON
</span><span class="cx"> # depends_lib-append port:ruby
</span><span class="lines">@@ -665,3 +665,14 @@
</span><span class="cx"> # livecheck.type regex
</span><span class="cx"> # livecheck.url http://root.cern.ch/svn/root/trunk
</span><span class="cx"> # livecheck.regex ${name}_v(\[0-9a-z.\]+)\\.source
</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"
+# }
+
+# variant r description {Enable R support} {
+# configure.args-replace -Dr=OFF -Dr=ON
+# depends_lib-append port:R
+# }
</ins></span></pre></div>
<a id="trunkdportsscienceroot6filesroot6"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/root6/files/root6 (143636 => 143637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root6/files/root6 2015-12-16 13:36:54 UTC (rev 143636)
+++ trunk/dports/science/root6/files/root6 2015-12-16 13:56:33 UTC (rev 143637)
</span><span class="lines">@@ -28,12 +28,20 @@
</span><span class="cx"> libexec/root6/bin/thisroot.sh
</span><span class="cx"> -
</span><span class="cx"> libexec/root6/bin/rootcling
</span><ins>+libexec/root6/bin/rootbrowse
+libexec/root6/bin/rootcp
+libexec/root6/bin/rooteventselector
+libexec/root6/bin/rootls
+libexec/root6/bin/rootmkdir
+libexec/root6/bin/rootmv
+libexec/root6/bin/rootprint
+libexec/root6/bin/rootrm
</ins><span class="cx"> -
</span><span class="cx"> libexec/root6/share/man/man1/g2root.1.gz
</span><span class="cx"> libexec/root6/share/man/man1/g2rootold.1.gz
</span><span class="cx"> libexec/root6/share/man/man1/genmap.1.gz
</span><del>-libexec/root6/share/man/man1/genreflex-rootcint.1.gz
-libexec/root6/share/man/man1/genreflex.1.gz
</del><ins>+-
+-
</ins><span class="cx"> libexec/root6/share/man/man1/h2root.1.gz
</span><span class="cx"> libexec/root6/share/man/man1/hadd.1.gz
</span><span class="cx"> libexec/root6/share/man/man1/hist2workspace.1.gz
</span><span class="lines">@@ -54,7 +62,7 @@
</span><span class="cx"> libexec/root6/share/man/man1/proofd.1.gz
</span><span class="cx"> libexec/root6/share/man/man1/proofserv.1.gz
</span><span class="cx"> libexec/root6/share/man/man1/proofserva.1.gz
</span><del>-libexec/root6/share/man/man1/rlibmap.1.gz
</del><ins>+-
</ins><span class="cx"> libexec/root6/share/man/man1/rmkdepend.1.gz
</span><span class="cx"> libexec/root6/share/man/man1/root-config.1.gz
</span><span class="cx"> libexec/root6/share/man/man1/root.1.gz
</span><span class="lines">@@ -69,7 +77,7 @@
</span><span class="cx"> libexec/root6/share/man/man1/system.rootdaemonrc.1.gz
</span><span class="cx"> libexec/root6/share/man/man1/xpdtest.1.gz
</span><span class="cx"> libexec/root6/share/man/man1/xproofd.1.gz
</span><del>-libexec/root6/share/man/man1/rootcling.1.gz
</del><ins>+-
</ins><span class="cx"> libexec/root6/etc/root
</span><span class="cx"> libexec/root6/include/root
</span><span class="cx"> libexec/root6/share
</span></span></pre></div>
<a id="trunkdportssysutilsroot_selectPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/root_select/Portfile (143636 => 143637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/root_select/Portfile 2015-12-16 13:36:54 UTC (rev 143636)
+++ trunk/dports/sysutils/root_select/Portfile 2015-12-16 13:56:33 UTC (rev 143637)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup select 1.0
</span><span class="cx">
</span><span class="cx"> name root_select
</span><del>-version 1.1
</del><ins>+version 1.2
</ins><span class="cx">
</span><span class="cx"> categories sysutils science
</span><span class="cx"> platforms darwin
</span></span></pre></div>
<a id="trunkdportssysutilsroot_selectfilesbase"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/root_select/files/base (143636 => 143637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/root_select/files/base 2015-12-16 13:36:54 UTC (rev 143636)
+++ trunk/dports/sysutils/root_select/files/base 2015-12-16 13:56:33 UTC (rev 143637)
</span><span class="lines">@@ -28,6 +28,14 @@
</span><span class="cx"> bin/thisroot.sh
</span><span class="cx"> bin/xpdtest
</span><span class="cx"> bin/rootcling
</span><ins>+bin/rootbrowse
+bin/rootcp
+bin/rooteventselector
+bin/rootls
+bin/rootmkdir
+bin/rootmv
+bin/rootprint
+bin/rootrm
</ins><span class="cx"> share/man/man1/cint.1.gz
</span><span class="cx"> share/man/man1/g2root.1.gz
</span><span class="cx"> share/man/man1/g2rootold.1.gz
</span></span></pre></div>
<a id="trunkdportssysutilsroot_selectfilesnone"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/root_select/files/none (143636 => 143637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/root_select/files/none 2015-12-16 13:36:54 UTC (rev 143636)
+++ trunk/dports/sysutils/root_select/files/none 2015-12-16 13:56:33 UTC (rev 143637)
</span><span class="lines">@@ -73,3 +73,11 @@
</span><span class="cx"> -
</span><span class="cx"> -
</span><span class="cx"> -
</span><ins>+-
+-
+-
+-
+-
+-
+-
+-
</ins></span></pre>
</div>
</div>
</body>
</html>