Revision: 147477 https://trac.macports.org/changeset/147477 Author: mojca@macports.org Date: 2016-04-05 04:51:35 -0700 (Tue, 05 Apr 2016) Log Message: ----------- root5: upgrade to 5.34.36 (maintainer, closes #50998, #51057) Modified Paths: -------------- trunk/dports/science/root5/Portfile Removed Paths: ------------- trunk/dports/science/root5/files/patch-math-mathmore-src-GSLMultiFit.h.diff Modified: trunk/dports/science/root5/Portfile =================================================================== --- trunk/dports/science/root5/Portfile 2016-04-05 09:47:33 UTC (rev 147476) +++ trunk/dports/science/root5/Portfile 2016-04-05 11:51:35 UTC (rev 147477) @@ -8,14 +8,13 @@ PortGroup compiler_blacklist_versions 1.0 PortGroup github 1.0 -github.setup root-mirror root 5-34-34 v -version 5.34.34 -revision 3 +github.setup root-mirror root 5-34-36 v +version 5.34.36 set version_major [lindex [split ${version} .] 0] -checksums rmd160 027526f9b553be61b28d82716e5bedeb9a9fbad9 \ - sha256 0baaf2ff06edcfe79936917f35edea1bf3033d07b2d328aa1433e84ccc48c684 +checksums rmd160 bd19fe36d42928fe2e6b6df6f055f5cc0e6bece5 \ + sha256 8482b84a90928ef7eb44b9172f961b8b9607969959ab175eeff812cd91dd4893 name root${version_major} categories science @@ -50,8 +49,6 @@ select.group root select.file ${filespath}/${name} -patchfiles-append patch-math-mathmore-src-GSLMultiFit.h.diff - post-patch { # reinplace "s|-lfreetype| \`freetype-config --libs\`|g" ${worksrcpath}/config/root-config.in reinplace "s|\"/usr/include\"|\"${prefix}/include /usr/include\"|g" ${worksrcpath}/configure Deleted: trunk/dports/science/root5/files/patch-math-mathmore-src-GSLMultiFit.h.diff =================================================================== --- trunk/dports/science/root5/files/patch-math-mathmore-src-GSLMultiFit.h.diff 2016-04-05 09:47:33 UTC (rev 147476) +++ trunk/dports/science/root5/files/patch-math-mathmore-src-GSLMultiFit.h.diff 2016-04-05 11:51:35 UTC (rev 147477) @@ -1,77 +0,0 @@ -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)