Attachment #182172 for bug #218952

View | Details | Raw Unified | Return to bug 218952
Collapse All | Expand All

Lines 3-8 Link Here

(-)audio/snd/Makefile (+1 lines)
3		3
4	PORTNAME= snd	4	PORTNAME= snd
5	PORTVERSION= 15.7	5	PORTVERSION= 15.7
		6	PORTREVISION= 1
6	CATEGORIES= audio	7	CATEGORIES= audio
7	MASTER_SITES= ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \	8	MASTER_SITES= ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \
8	SF	9	SF

Lines 3-8 Link Here

(-)benchmarks/flowgrind/Makefile (+1 lines)
3		3
4	PORTNAME= flowgrind	4	PORTNAME= flowgrind
5	PORTVERSION= 0.8.0	5	PORTVERSION= 0.8.0
		6	PORTREVISION= 1
6	DISTVERSIONPREFIX= ${PORTNAME}-	7	DISTVERSIONPREFIX= ${PORTNAME}-
7	CATEGORIES= benchmarks	8	CATEGORIES= benchmarks
8		9

Lines 3-8 Link Here

(-)biology/bcftools/Makefile (+1 lines)
3		3
4	PORTNAME= bcftools	4	PORTNAME= bcftools
5	PORTVERSION= 1.3.1	5	PORTVERSION= 1.3.1
		6	PORTREVISION= 1
6	CATEGORIES= biology	7	CATEGORIES= biology
7		8
8	MAINTAINER= cartwright@asu.edu	9	MAINTAINER= cartwright@asu.edu

Lines 2-8 Link Here

(-)comms/gnuradio/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= gnuradio	3	PORTNAME= gnuradio
4	PORTVERSION= 3.7.10.1	4	PORTVERSION= 3.7.10.1
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= comms astro hamradio	6	CATEGORIES= comms astro hamradio
7	MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \	7	MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \
8	LOCAL/db	8	LOCAL/db

Lines 2-8 Link Here

(-)editors/calligra/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= calligra	3	PORTNAME= calligra
4	PORTVERSION= ${CALLIGRA_VERSION}	4	PORTVERSION= ${CALLIGRA_VERSION}
5	PORTREVISION= 8	5	PORTREVISION= 9
6	CATEGORIES= editors kde	6	CATEGORIES= editors kde
7	MASTER_SITES= KDE/${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/	7	MASTER_SITES= KDE/${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/
8	DIST_SUBDIR= KDE/${PORTNAME}/${PORTVERSION}	8	DIST_SUBDIR= KDE/${PORTNAME}/${PORTVERSION}

Lines 2-8 Link Here

(-)graphics/amide/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= amide	3	PORTNAME= amide
4	PORTVERSION= 1.0.5	4	PORTVERSION= 1.0.5
5	PORTREVISION= 6	5	PORTREVISION= 7
6	CATEGORIES= graphics	6	CATEGORIES= graphics
7	MASTER_SITES= SF	7	MASTER_SITES= SF
8		8




Obtained from:
https://sourceforge.net/p/amide/mailman/message/34638848/

Description: Fix compilation against GSL >= 2.0
Author: Gert Wollny <gw.fossdev@gmail.com>
Last-Update: Sun, 22 Nov 2015 14:21:00 +0000
Bug-Debian: http://bugs.debian.org/805748

--- src/tb_profile.c	2015-11-22 14:00:16.361526795 +0100
+++ src/tb_profile.c	2015-11-22 14:14:58.993881660 +0100
@@ -32,6 +32,7 @@
 #include "ui_common.h"
 #ifdef AMIDE_LIBGSL_SUPPORT
 #include <gsl/gsl_multifit_nlin.h>
+#include <gsl/gsl_version.h>
 #endif


@@ -605,6 +606,7 @@
   result_t * result;
   gsl_multifit_fdfsolver * solver;
   gsl_matrix *covar;
+  gsl_matrix *J;
   gsl_multifit_function_fdf fdf;
   gsl_vector * init_p;
   gint iter;
@@ -668,8 +670,16 @@
     }
     while ((status == GSL_CONTINUE) && (iter < 100));

+#if GSL_MAJOR_VERSION > 1
+    {
+      gsl_matrix *J = gsl_matrix_alloc (result->line->len, num_p);;
+      gsl_multifit_fdfsolver_jac(solver, J);
+      gsl_multifit_covar (J, 0.0, covar);
+      gsl_matrix_free(J);
+    }
+#else
     gsl_multifit_covar (solver->J, 0.0, covar);
-
+#endif
     j=0;
     result->s_fit = gsl_vector_get(solver->x, j++);
     result->p_fit = gsl_vector_get(solver->x, j++);

Lines 3-9 Link Here

(-)graphics/enblend/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= enblend	4	PORTNAME= enblend
5	PORTVERSION= 4.1.4	5	PORTVERSION= 4.1.4
6	PORTREVISION= 5	6	PORTREVISION= 6
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION:R}	8	MASTER_SITES= SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION:R}
9	DISTNAME= enblend-enfuse-${PORTVERSION}	9	DISTNAME= enblend-enfuse-${PORTVERSION}

Lines 3-9 Link Here

(-)graphics/inkscape/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= inkscape	4	PORTNAME= inkscape
5	PORTVERSION= 0.92.0	5	PORTVERSION= 0.92.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= graphics gnome	7	CATEGORIES= graphics gnome
8	MASTER_SITES= https://media.inkscape.org/dl/resources/file/ \	8	MASTER_SITES= https://media.inkscape.org/dl/resources/file/ \
9	LOCAL/kwm	9	LOCAL/kwm

Lines 3-9 Link Here

(-)graphics/luminance/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= luminance-hdr	4	PORTNAME= luminance-hdr
5	DISTVERSION= 2.3.1	5	DISTVERSION= 2.3.1
6	PORTREVISION= 10	6	PORTREVISION= 11
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION}	8	MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION}
9		9

Lines 3-9 Link Here

(-)graphics/luminance-qt5/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= luminance-hdr	4	PORTNAME= luminance-hdr
5	DISTVERSION= 2.4.0	5	DISTVERSION= 2.4.0
6	PORTREVISION= 12	6	PORTREVISION= 13
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION}	8	MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION}
9	PKGNAMESUFFIX= -qt5	9	PKGNAMESUFFIX= -qt5

Lines 3-8 Link Here

(-)graphics/nip2/Makefile (+1 lines)
3		3
4	PORTNAME= nip2	4	PORTNAME= nip2
5	PORTVERSION= 8.4.0	5	PORTVERSION= 8.4.0
		6	PORTREVISION= 1
6	CATEGORIES= graphics	7	CATEGORIES= graphics
7	MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/	8	MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
8		9

Lines 3-9 Link Here

(-)graphics/ocropus/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= ocropus	4	PORTNAME= ocropus
5	PORTVERSION= 0.4	5	PORTVERSION= 0.4
6	PORTREVISION= 14	6	PORTREVISION= 15
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= GOOGLE_CODE	8	MASTER_SITES= GOOGLE_CODE
9		9

Lines 3-9 Link Here

(-)graphics/pfstmo/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= pfstmo	4	PORTNAME= pfstmo
5	PORTVERSION= 1.5	5	PORTVERSION= 1.5
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= SF/pfstools/${PORTNAME}/${PORTVERSION}	8	MASTER_SITES= SF/pfstools/${PORTNAME}/${PORTVERSION}
9		9

Lines 4-10 Link Here

(-)graphics/qgis/Makefile (-1 / +1 lines)
4	PORTNAME= qgis	4	PORTNAME= qgis
5	DISTVERSIONPREFIX= final-	5	DISTVERSIONPREFIX= final-
6	DISTVERSION= 2_18_4	6	DISTVERSION= 2_18_4
7	PORTREVISION= 1	7	PORTREVISION= 2
8	CATEGORIES= graphics geography	8	CATEGORIES= graphics geography
9		9
10	MAINTAINER= rhurlin@gwdg.de	10	MAINTAINER= rhurlin@gwdg.de

Lines 3-9 Link Here

(-)graphics/xaos/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= xaos	4	PORTNAME= xaos
5	PORTVERSION= 3.6	5	PORTVERSION= 3.6
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= graphics math	7	CATEGORIES= graphics math
8	MASTER_SITES= SF/${PORTNAME}/XaoS/${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/XaoS/${PORTVERSION}
9		9

Lines 2-7 Link Here

(-)lang/algol68g/Makefile (+1 lines)
2		2
3	PORTNAME= algol68g	3	PORTNAME= algol68g
4	PORTVERSION= 2.8.4	4	PORTVERSION= 2.8.4
		5	PORTREVISION= 1
5	CATEGORIES= lang	6	CATEGORIES= lang
6	MASTER_SITES= http://jmvdveer.home.xs4all.nl/	7	MASTER_SITES= http://jmvdveer.home.xs4all.nl/
7		8

Lines 3-9 Link Here

(-)mail/bogofilter/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= bogofilter	4	PORTNAME= bogofilter
5	PORTVERSION= 1.2.4	5	PORTVERSION= 1.2.4
6	PORTREVISION?= 5	6	PORTREVISION?= 6
7	CATEGORIES?= mail	7	CATEGORIES?= mail
8	MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION}	8	MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION}
9		9

Lines 3-8 Link Here

(-)math/asymptote/Makefile (+1 lines)
3		3
4	PORTNAME= asymptote	4	PORTNAME= asymptote
5	PORTVERSION= 2.37	5	PORTVERSION= 2.37
		6	PORTREVISION= 1
6	CATEGORIES= math	7	CATEGORIES= math
7	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
8	DISTNAME= ${PORTNAME}-${PORTVERSION}.src	9	DISTNAME= ${PORTNAME}-${PORTVERSION}.src

Lines 3-9 Link Here

(-)math/dieharder/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= dieharder	4	PORTNAME= dieharder
5	PORTVERSION= 3.31.1	5	PORTVERSION= 3.31.1
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= math	7	CATEGORIES= math
8	MASTER_SITES= http://www.phy.duke.edu/~rgb/General/dieharder/ LOCAL/bf	8	MASTER_SITES= http://www.phy.duke.edu/~rgb/General/dieharder/ LOCAL/bf
9		9

Lines 3-9 Link Here

(-)math/fflas-ffpack/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= fflas-ffpack	4	PORTNAME= fflas-ffpack
5	PORTVERSION= 1.4.3	5	PORTVERSION= 1.4.3
6	PORTREVISION= 7	6	PORTREVISION= 8
7	CATEGORIES= math	7	CATEGORIES= math
8	MASTER_SITES= http://linalg.org/ LOCAL/bf	8	MASTER_SITES= http://linalg.org/ LOCAL/bf
9		9

Lines 3-9 Link Here

(-)math/giacxcas/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= giacxcas	4	PORTNAME= giacxcas
5	DISTVERSION= 1.2.2-57	5	DISTVERSION= 1.2.2-57
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= math	7	CATEGORIES= math
8	MASTER_SITES= http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/:giac \	8	MASTER_SITES= http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/:giac \
9	http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/	9	http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/




# $FreeBSD$

PORTNAME=	gsl
PORTVERSION=	2.3
PORTREVISION=	2
CATEGORIES=	math
MASTER_SITES=	GNU

MAINTAINER=	tcberner@FreeBSD.org
COMMENT=	The GNU Scientific Library - mathematical libs

LICENSE=	GPLv3

Lines 1-2 Link Here

(-)math/gsl/distinfo (-2 / +3 lines)
1	SHA256 (gsl-1.16.tar.gz) = 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53	1	TIMESTAMP = 1493276070
2	SIZE (gsl-1.16.tar.gz) = 3534080	2	SHA256 (gsl-2.3.tar.gz) = 562500b789cd599b3a4f88547a7a3280538ab2ff4939504c8b4ac4ca25feadfb
		3	SIZE (gsl-2.3.tar.gz) = 4510731

Lines 54-59 Link Here

(-)math/gsl/pkg-plist (-3 / +27 lines)
54	include/gsl/gsl_inline.h	54	include/gsl/gsl_inline.h
55	include/gsl/gsl_integration.h	55	include/gsl/gsl_integration.h
56	include/gsl/gsl_interp.h	56	include/gsl/gsl_interp.h
		57	include/gsl/gsl_interp2d.h
57	include/gsl/gsl_linalg.h	58	include/gsl/gsl_linalg.h
58	include/gsl/gsl_machine.h	59	include/gsl/gsl_machine.h
59	include/gsl/gsl_math.h	60	include/gsl/gsl_math.h
Lines 82-87 Link Here
82	include/gsl/gsl_monte_vegas.h	83	include/gsl/gsl_monte_vegas.h
83	include/gsl/gsl_multifit.h	84	include/gsl/gsl_multifit.h
84	include/gsl/gsl_multifit_nlin.h	85	include/gsl/gsl_multifit_nlin.h
		86	include/gsl/gsl_multifit_nlinear.h
		87	include/gsl/gsl_multilarge.h
		88	include/gsl/gsl_multilarge_nlinear.h
85	include/gsl/gsl_multimin.h	89	include/gsl/gsl_multimin.h
86	include/gsl/gsl_multiroots.h	90	include/gsl/gsl_multiroots.h
87	include/gsl/gsl_multiset.h	91	include/gsl/gsl_multiset.h
Lines 100-105 Link Here
100	include/gsl/gsl_permute_int.h	104	include/gsl/gsl_permute_int.h
101	include/gsl/gsl_permute_long.h	105	include/gsl/gsl_permute_long.h
102	include/gsl/gsl_permute_long_double.h	106	include/gsl/gsl_permute_long_double.h
		107	include/gsl/gsl_permute_matrix.h
		108	include/gsl/gsl_permute_matrix_char.h
		109	include/gsl/gsl_permute_matrix_complex_double.h
		110	include/gsl/gsl_permute_matrix_complex_float.h
		111	include/gsl/gsl_permute_matrix_complex_long_double.h
		112	include/gsl/gsl_permute_matrix_double.h
		113	include/gsl/gsl_permute_matrix_float.h
		114	include/gsl/gsl_permute_matrix_int.h
		115	include/gsl/gsl_permute_matrix_long.h
		116	include/gsl/gsl_permute_matrix_long_double.h
		117	include/gsl/gsl_permute_matrix_short.h
		118	include/gsl/gsl_permute_matrix_uchar.h
		119	include/gsl/gsl_permute_matrix_uint.h
		120	include/gsl/gsl_permute_matrix_ulong.h
		121	include/gsl/gsl_permute_matrix_ushort.h
103	include/gsl/gsl_permute_short.h	122	include/gsl/gsl_permute_short.h
104	include/gsl/gsl_permute_uchar.h	123	include/gsl/gsl_permute_uchar.h
105	include/gsl/gsl_permute_uint.h	124	include/gsl/gsl_permute_uint.h
Lines 127-132 Link Here
127	include/gsl/gsl_randist.h	146	include/gsl/gsl_randist.h
128	include/gsl/gsl_rng.h	147	include/gsl/gsl_rng.h
129	include/gsl/gsl_roots.h	148	include/gsl/gsl_roots.h
		149	include/gsl/gsl_rstat.h
130	include/gsl/gsl_sf.h	150	include/gsl/gsl_sf.h
131	include/gsl/gsl_sf_airy.h	151	include/gsl/gsl_sf_airy.h
132	include/gsl/gsl_sf_bessel.h	152	include/gsl/gsl_sf_bessel.h
Lines 183-190 Link Here
183	include/gsl/gsl_sort_vector_uint.h	203	include/gsl/gsl_sort_vector_uint.h
184	include/gsl/gsl_sort_vector_ulong.h	204	include/gsl/gsl_sort_vector_ulong.h
185	include/gsl/gsl_sort_vector_ushort.h	205	include/gsl/gsl_sort_vector_ushort.h
		206	include/gsl/gsl_spblas.h
186	include/gsl/gsl_specfunc.h	207	include/gsl/gsl_specfunc.h
		208	include/gsl/gsl_splinalg.h
187	include/gsl/gsl_spline.h	209	include/gsl/gsl_spline.h
		210	include/gsl/gsl_spline2d.h
		211	include/gsl/gsl_spmatrix.h
188	include/gsl/gsl_statistics.h	212	include/gsl/gsl_statistics.h
189	include/gsl/gsl_statistics_char.h	213	include/gsl/gsl_statistics_char.h
190	include/gsl/gsl_statistics_double.h	214	include/gsl/gsl_statistics_double.h
Lines 222-236 Link Here
222	include/gsl/gsl_wavelet2d.h	246	include/gsl/gsl_wavelet2d.h
223	lib/libgsl.a	247	lib/libgsl.a
224	lib/libgsl.so	248	lib/libgsl.so
225	lib/libgsl.so.0	249	lib/libgsl.so.19
226	lib/libgsl.so.0.17.0	250	lib/libgsl.so.19.3.0
227	lib/libgslcblas.a	251	lib/libgslcblas.a
228	lib/libgslcblas.so	252	lib/libgslcblas.so
229	lib/libgslcblas.so.0	253	lib/libgslcblas.so.0
230	lib/libgslcblas.so.0.0.0	254	lib/libgslcblas.so.0.0.0
231	libdata/pkgconfig/gsl.pc	255	libdata/pkgconfig/gsl.pc
232	share/aclocal/gsl.m4
233	man/man1/gsl-config.1.gz	256	man/man1/gsl-config.1.gz
234	man/man1/gsl-histogram.1.gz	257	man/man1/gsl-histogram.1.gz
235	man/man1/gsl-randist.1.gz	258	man/man1/gsl-randist.1.gz
236	man/man3/gsl.3.gz	259	man/man3/gsl.3.gz
		260	share/aclocal/gsl.m4

Lines 3-8 Link Here

(-)math/labplot/Makefile (+1 lines)
3		3
4	PORTNAME= labplot	4	PORTNAME= labplot
5	PORTVERSION= 2.4.0	5	PORTVERSION= 2.4.0
		6	PORTREVISION= 1
6	DISTVERSIONSUFFIX=-kf5	7	DISTVERSIONSUFFIX=-kf5
7	CATEGORIES= math kde	8	CATEGORIES= math kde
8	MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}	9	MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}

Lines 4-9 Link Here

(-)math/ocamlgsl/Makefile (+1 lines)
4	PORTNAME= ocaml-gsl	4	PORTNAME= ocaml-gsl
5	DISTVERSIONPREFIX=v	5	DISTVERSIONPREFIX=v
6	DISTVERSION= 1.19.1	6	DISTVERSION= 1.19.1
		7	PORTREVISION= 1
7	CATEGORIES= math	8	CATEGORIES= math
8		9
9	MAINTAINER= michipili@gmail.com	10	MAINTAINER= michipili@gmail.com

Lines 3-9 Link Here

(-)math/octave-forge-gsl/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= octave-forge-gsl	4	PORTNAME= octave-forge-gsl
5	PORTVERSION= 2.0.0	5	PORTVERSION= 2.0.0
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= math	7	CATEGORIES= math
8		8
9	MAINTAINER= stephen@FreeBSD.org	9	MAINTAINER= stephen@FreeBSD.org

Lines 3-9 Link Here

(-)math/orpie/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= orpie	4	PORTNAME= orpie
5	PORTVERSION= 1.5.2	5	PORTVERSION= 1.5.2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES+= math	7	CATEGORIES+= math
8	MASTER_SITES= http://pessimization.com/software/orpie/	8	MASTER_SITES= http://pessimization.com/software/orpie/
9		9




Obtained from:
https://sources.debian.net/src/orpie/1.5.2-1/debian/patches/gsl-fix/

Description: fix some incompatibilities with libgsl 2.1
Author: Uwe Steinmann <steinm@debian.org>
Forwarded: not-needed

--- gsl/mlgsl_sf.c.orig	2014-04-12 01:43:31 UTC
+++ gsl/mlgsl_sf.c
@@ -258,7 +258,8 @@ SF2(ellint_Dcomp, Double_val, GSL_MODE_v
 SF3(ellint_F, Double_val, Double_val, GSL_MODE_val)
 SF3(ellint_E, Double_val, Double_val, GSL_MODE_val)
 SF4(ellint_P, Double_val, Double_val, Double_val, GSL_MODE_val)
-SF4(ellint_D, Double_val, Double_val, Double_val, GSL_MODE_val)
+//SF4(ellint_D, Double_val, Double_val, Double_val, GSL_MODE_val)
+SF3(ellint_D, Double_val, Double_val, GSL_MODE_val)
 SF3(ellint_RC, Double_val, Double_val, GSL_MODE_val)
 SF4(ellint_RD, Double_val, Double_val, Double_val, GSL_MODE_val)
 SF4(ellint_RF, Double_val, Double_val, Double_val, GSL_MODE_val)
@@ -452,6 +453,7 @@ SF1(legendre_Q1, Double_val)
 SF2(legendre_Ql, Int_val, Double_val)
 
 /* Associated Legendre Polynomials and Spherical Harmonics  */
+/*
 SF3(legendre_Plm, Int_val, Int_val, Double_val) 
 CAMLprim value 
 ml_gsl_sf_legendre_Plm_array(value lmax, value m, value x, value result_array)
@@ -487,7 +489,7 @@ ml_gsl_sf_legendre_array_size(value lmax
   ret = Val_int(gsl_ret);
   CAMLreturn(ret);
 }
-
+*/
 /* LOGARITHM and related functions */
 SF1(log, Double_val)
 SF1(log_abs, Double_val)

Lines 3-9 Link Here

(-)math/p5-Math-GSL/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= Math-GSL	4	PORTNAME= Math-GSL
5	PORTVERSION= 0.39	5	PORTVERSION= 0.39
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= math perl5	7	CATEGORIES= math perl5
8	MASTER_SITES= CPAN	8	MASTER_SITES= CPAN
9	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-

Lines 79-84 Link Here

(-)math/p5-Math-GSL/pkg-plist (+2 lines)
79	%%SITE_ARCH%%/auto/Math/GSL/MatrixComplex/MatrixComplex.so	79	%%SITE_ARCH%%/auto/Math/GSL/MatrixComplex/MatrixComplex.so
80	%%SITE_ARCH%%/auto/Math/GSL/Min/Min.so	80	%%SITE_ARCH%%/auto/Math/GSL/Min/Min.so
81	%%SITE_ARCH%%/auto/Math/GSL/Monte/Monte.so	81	%%SITE_ARCH%%/auto/Math/GSL/Monte/Monte.so
		82	%%SITE_ARCH%%/auto/Math/GSL/Multifit/Multifit.so
		83	%%SITE_ARCH%%/auto/Math/GSL/Multilarge/Multilarge.so
82	%%SITE_ARCH%%/auto/Math/GSL/Multimin/Multimin.so	84	%%SITE_ARCH%%/auto/Math/GSL/Multimin/Multimin.so
83	%%SITE_ARCH%%/auto/Math/GSL/Multiroots/Multiroots.so	85	%%SITE_ARCH%%/auto/Math/GSL/Multiroots/Multiroots.so
84	%%SITE_ARCH%%/auto/Math/GSL/NTuple/NTuple.so	86	%%SITE_ARCH%%/auto/Math/GSL/NTuple/NTuple.so

Lines 3-8 Link Here

(-)math/pspp/Makefile (+1 lines)
3		3
4	PORTNAME= pspp	4	PORTNAME= pspp
5	PORTVERSION= 0.10.2	5	PORTVERSION= 0.10.2
		6	PORTREVISION= 1
6	CATEGORIES= math	7	CATEGORIES= math
7	MASTER_SITES= GNU	8	MASTER_SITES= GNU
8		9

Lines 2-9 Link Here

(-)math/py-gsl/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gsl	4	PORTNAME= gsl
5	PORTVERSION= 2.1.1	5	PORTVERSION= 2.2.0
6	PORTREVISION= 1
7	CATEGORIES= math python	6	CATEGORIES= math python
8	MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}	7	MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-2 Link Here

(-)math/py-gsl/distinfo (-2 / +3 lines)
1	SHA256 (python/pygsl-2.1.1.tar.gz) = 3d17e6deb5433b331a567a45ff467f41e9059def76e6ef0f21d8e891498f946a	1	TIMESTAMP = 1493448013
2	SIZE (python/pygsl-2.1.1.tar.gz) = 727636	2	SHA256 (python/pygsl-2.2.0.tar.gz) = 200e7986c368cb815685e502993e5211702219e1a0bb79030d671c35df25a59e
		3	SIZE (python/pygsl-2.2.0.tar.gz) = 983467

Lines 3-9 Link Here

(-)math/qtiplot/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= qtiplot	4	PORTNAME= qtiplot
5	DISTVERSION= 0.9.8.9	5	DISTVERSION= 0.9.8.9
6	PORTREVISION= 10	6	PORTREVISION= 11
7	CATEGORIES= math science	7	CATEGORIES= math science
8	MASTER_SITES= BERLIOS http://soft.proindependent.com/src/	8	MASTER_SITES= BERLIOS http://soft.proindependent.com/src/
9		9




Obtained from:
https://git.archlinux.org/svntogit/packages.git/tree/trunk/qtiplot-gsl2.patch?h=packages/qtiplot

Description: adoptation to gsl2.
Author: Damir Islamov <damir@secretlaboratory.ru>
Last-Update: 2015-12-04

--- qtiplot/src/analysis/Fit.cpp
+++ qtiplot/src/analysis/Fit.cpp
@@ -126,10 +126,12 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
 			break;
 		}
 	}
-
+	gsl_matrix *J = gsl_matrix_alloc(d_n, d_p);
 	if (status){
-	    gsl_multifit_covar (s->J, 0.0, covar);
+	    gsl_multifit_fdfsolver_jac(s, J);
+	    gsl_multifit_covar (J, 0.0, covar);
 	    iterations = 0;
+	    gsl_matrix_free (J);
 	    return s;
 	}

@@ -154,9 +156,9 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl

 		status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance);
 	} while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations);
-
-	gsl_multifit_covar (s->J, 0.0, covar);
-
+	gsl_multifit_fdfsolver_jac(s, J);
+	gsl_multifit_covar (J, 0.0, covar);
+	gsl_matrix_free (J);
 	iterations = iter;
 	return s;
 }

Lines 1-10 Link Here

(-)math/rubygem-rb-gsl/Makefile (-2 / +3 lines)
1	# Created by: Shin-ya MURAKAMI <murashin@gfd-dennou.org>	1	# Created by: Shin-ya MURAKAMI <murashin@gfd-dennou.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= rb-gsl	4	PORTNAME= gsl
5	PORTVERSION= 1.16.0.4	5	PORTVERSION= 2.1.0.2
6	CATEGORIES= math rubygems	6	CATEGORIES= math rubygems
7	MASTER_SITES= RG	7	MASTER_SITES= RG
		8	PKGNAMEPREFIX= rubygem-rb-
8		9
9	MAINTAINER= murashin@gfd-dennou.org	10	MAINTAINER= murashin@gfd-dennou.org
10	COMMENT= Ruby extension library for GSL (GNU Scientific Library)	11	COMMENT= Ruby extension library for GSL (GNU Scientific Library)

Lines 1-2 Link Here

(-)math/rubygem-rb-gsl/distinfo (-2 / +3 lines)
1	SHA256 (rubygem/rb-gsl-1.16.0.4.gem) = bc6573cc36410d2ec88672d4b12e2c908684796b276a8743c19345bbb44bef94	1	TIMESTAMP = 1493451497
2	SIZE (rubygem/rb-gsl-1.16.0.4.gem) = 588288	2	SHA256 (rubygem/gsl-2.1.0.2.gem) = bb748021a950ae51a7f0eeadffbcd9b039734fcbb99a04a313ca48c4e60dd9ba
		3	SIZE (rubygem/gsl-2.1.0.2.gem) = 735232

Lines 11-17 Link Here

(-)science/afni/Makefile (-1 / +1 lines)
11		11
12	PORTNAME= afni	12	PORTNAME= afni
13	PORTVERSION= 2015.11.13	13	PORTVERSION= 2015.11.13
14	PORTREVISION= 1	14	PORTREVISION= 2
15	CATEGORIES= science biology graphics	15	CATEGORIES= science biology graphics
16	MASTER_SITES= http://www.acadix.biz/Ports/distfiles/	16	MASTER_SITES= http://www.acadix.biz/Ports/distfiles/
17		17

Lines 2-8 Link Here

(-)science/fisicalab/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= fisicalab	3	PORTNAME= fisicalab
4	PORTVERSION= 0.3.3	4	PORTVERSION= 0.3.3
5	PORTREVISION= 3	5	PORTREVISION= 4
6	CATEGORIES= science gnustep	6	CATEGORIES= science gnustep
7	MASTER_SITES= SAVANNAH	7	MASTER_SITES= SAVANNAH
8		8

Lines 3-9 Link Here

(-)science/getdp/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= getdp	4	PORTNAME= getdp
5	PORTVERSION= 2.8.0	5	PORTVERSION= 2.8.0
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= science	7	CATEGORIES= science
8	MASTER_SITES= http://www.geuz.org/getdp/src/	8	MASTER_SITES= http://www.geuz.org/getdp/src/
9	DISTNAME= ${PORTNAME}-${PORTVERSION}-source	9	DISTNAME= ${PORTNAME}-${PORTVERSION}-source

Lines 3-9 Link Here

(-)science/gnudatalanguage/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= gnudatalanguage	4	PORTNAME= gnudatalanguage
5	DISTVERSION= 0.9.7	5	DISTVERSION= 0.9.7
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= science lang	7	CATEGORIES= science lang
8	MASTER_SITES= SF/${PORTNAME}/gdl/${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/gdl/${PORTVERSION}
9	.if defined(BUILD_PYTHON_MODULE)	9	.if defined(BUILD_PYTHON_MODULE)

Lines 3-8 Link Here

(-)science/kst2/Makefile (+1 lines)
3		3
4	PORTNAME= kst	4	PORTNAME= kst
5	DISTVERSION= 2.0.8	5	DISTVERSION= 2.0.8
		6	PORTREVISION= 1
6	CATEGORIES= science kde	7	CATEGORIES= science kde
7	MASTER_SITES= SF/${PORTNAME}/Kst%20${DISTVERSION:C/-r.*//}/	8	MASTER_SITES= SF/${PORTNAME}/Kst%20${DISTVERSION:C/-r.*//}/
8	DISTNAME= Kst-${DISTVERSION}	9	DISTNAME= Kst-${DISTVERSION}




Backport of:
https://github.com/Kst-plot/kst/commit/a9d24f91057441bbd2e3ed9e7536b071121526cb

From a9d24f91057441bbd2e3ed9e7536b071121526cb Mon Sep 17 00:00:00 2001
From: "D. V. Wiebe" <dvw@ketiltrout.net>
Date: Thu, 10 Mar 2016 14:09:26 -0800
Subject: [PATCH] GSL-2.x support.


--- src/plugins/fits/non_linear.h.orig	2014-02-13 09:41:44 UTC
+++ src/plugins/fits/non_linear.h
@@ -18,6 +18,7 @@
 #include <gsl/gsl_blas.h>
 #include <gsl/gsl_multifit_nlin.h>
 #include <gsl/gsl_statistics.h>
+#include <gsl/gsl_version.h>
 #include "common.h"
 
 struct data {
@@ -100,6 +101,7 @@ bool kstfit_nonlinear(
   gsl_multifit_function_fdf	function;
   gsl_vector_view vectorViewInitial;
   gsl_matrix* pMatrixCovariance;
+  gsl_matrix* pMatrixJacobian;
   struct data d;  
   double dXInitial[NUM_PARAMS];
   double* pInputX;
@@ -177,7 +179,16 @@ bool kstfit_nonlinear(
             }
             iIterations++;
           } while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS );
-          gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance );
+#if GSL_MAJOR_VERSION >= 2
+          pMatrixJacobian = gsl_matrix_alloc( iLength, NUM_PARAMS );
+#else
+          pMatrixJacobian = pSolver->J;
+#endif
+          if ( pMatrixJacobian != NULL ) {
+#if GSL_MAJOR_VERSION >= 2
+            gsl_multifit_fdfsolver_jac( pSolver, pMatrixJacobian );
+#endif
+          gsl_multifit_covar( pMatrixJacobian, 0.0, pMatrixCovariance );
 
           //
           // determine the fitted values...
@@ -207,7 +218,10 @@ bool kstfit_nonlinear(
           scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f ));
 
           bReturn = true;
-
+#if GSL_MAJOR_VERSION >= 2
+          gsl_matrix_free( pMatrixJacobian );
+#endif
+          }
           gsl_matrix_free( pMatrixCovariance );
         }
         gsl_multifit_fdfsolver_free( pSolver );
--- src/plugins/fits/non_linear_weighted.h.orig	2014-02-13 09:41:44 UTC
+++ src/plugins/fits/non_linear_weighted.h
@@ -18,6 +18,7 @@
 #include <gsl/gsl_blas.h>
 #include <gsl/gsl_multifit_nlin.h>
 #include <gsl/gsl_statistics.h>
+#include <gsl/gsl_version.h>
 #include "common.h"
 
 struct data {
@@ -101,6 +102,7 @@ bool kstfit_nonlinear_weighted(
   gsl_multifit_function_fdf	function;
   gsl_vector_view vectorViewInitial;
   gsl_matrix* pMatrixCovariance;
+  gsl_matrix* pMatrixJacobian;
   struct data d;  
   double dXInitial[NUM_PARAMS];
   double* pInputs[3];
@@ -193,7 +195,17 @@ bool kstfit_nonlinear_weighted(
           }
           while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS );
 
-          gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance );
+#if GSL_MAJOR_VERSION >= 2
+          pMatrixJacobian = gsl_matrix_alloc( iLength, NUM_PARAMS );
+#else
+          pMatrixJacobian = pSolver->J;
+#endif
+
+          if ( pMatrixJacobian != NULL ) {
+#if GSL_MAJOR_VERSION >= 2
+          gsl_multifit_fdfsolver_jac( pSolver, pMatrixJacobian );
+#endif
+          gsl_multifit_covar( pMatrixJacobian, 0.0, pMatrixCovariance );
 
           //
           // determine the fitted values...
@@ -223,7 +235,10 @@ bool kstfit_nonlinear_weighted(
           scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f ));
 
           bReturn = true;
-
+#if GSL_VERSION_MAJOR >= 2
+          gsl_matrix_free( pMatrixJacobian );
+#endif
+          }
           gsl_matrix_free( pMatrixCovariance );
         }
         gsl_multifit_fdfsolver_free( pSolver );

Lines 3-9 Link Here

(-)science/py-mlpy/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= mlpy	4	PORTNAME= mlpy
5	PORTVERSION= 3.5.0	5	PORTVERSION= 3.5.0
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= science python	7	CATEGORIES= science python
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 2-8 Link Here

(-)science/step/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= step	3	PORTNAME= step
4	PORTVERSION= ${KDE4_VERSION}	4	PORTVERSION= ${KDE4_VERSION}
5	PORTREVISION= 2	5	PORTREVISION= 3
6	CATEGORIES= science kde kde-kde4	6	CATEGORIES= science kde kde-kde4
7		7
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org

Return to bug 218952

Line 0 Link Here

(-)graphics/amide/files/patch-gsl_2x (+44 lines)
	1	Obtained from:
	2	https://sourceforge.net/p/amide/mailman/message/34638848/
	3
	4	Description: Fix compilation against GSL >= 2.0
	5	Author: Gert Wollny <gw.fossdev@gmail.com>
	6	Last-Update: Sun, 22 Nov 2015 14:21:00 +0000
	7	Bug-Debian: http://bugs.debian.org/805748
	8
	9	--- src/tb_profile.c 2015-11-22 14:00:16.361526795 +0100
	10	+++ src/tb_profile.c 2015-11-22 14:14:58.993881660 +0100
	11	@@ -32,6 +32,7 @@
	12	#include "ui_common.h"
	13	#ifdef AMIDE_LIBGSL_SUPPORT
	14	#include <gsl/gsl_multifit_nlin.h>
	15	+#include <gsl/gsl_version.h>
	16	#endif
	17
	18
	19	@@ -605,6 +606,7 @@
	20	result_t * result;
	21	gsl_multifit_fdfsolver * solver;
	22	gsl_matrix *covar;
	23	+ gsl_matrix *J;
	24	gsl_multifit_function_fdf fdf;
	25	gsl_vector * init_p;
	26	gint iter;
	27	@@ -668,8 +670,16 @@
	28	}
	29	while ((status == GSL_CONTINUE) && (iter < 100));
	30
	31	+#if GSL_MAJOR_VERSION > 1
	32	+ {
	33	+ gsl_matrix *J = gsl_matrix_alloc (result->line->len, num_p);;
	34	+ gsl_multifit_fdfsolver_jac(solver, J);
	35	+ gsl_multifit_covar (J, 0.0, covar);
	36	+ gsl_matrix_free(J);
	37	+ }
	38	+#else
	39	gsl_multifit_covar (solver->J, 0.0, covar);
	40	-
	41	+#endif
	42	j=0;
	43	result->s_fit = gsl_vector_get(solver->x, j++);
	44	result->p_fit = gsl_vector_get(solver->x, j++);

Lines 2-13 Link Here

(-)math/gsl/Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gsl	4	PORTNAME= gsl
5	PORTVERSION= 1.16	5	PORTVERSION= 2.3
6	PORTREVISION= 2
7	CATEGORIES= math	6	CATEGORIES= math
8	MASTER_SITES= GNU	7	MASTER_SITES= GNU
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= tcberner@FreeBSD.org
11	COMMENT= The GNU Scientific Library - mathematical libs	10	COMMENT= The GNU Scientific Library - mathematical libs
12		11
13	LICENSE= GPLv3	12	LICENSE= GPLv3

Line 0 Link Here

(-)math/orpie/files/patch-gsl_mlgsl__sf.c (+36 lines)
	1	Obtained from:
	2	https://sources.debian.net/src/orpie/1.5.2-1/debian/patches/gsl-fix/
	3
	4	Description: fix some incompatibilities with libgsl 2.1
	5	Author: Uwe Steinmann <steinm@debian.org>
	6	Forwarded: not-needed
	7
	8	--- gsl/mlgsl_sf.c.orig 2014-04-12 01:43:31 UTC
	9	+++ gsl/mlgsl_sf.c
	10	@@ -258,7 +258,8 @@ SF2(ellint_Dcomp, Double_val, GSL_MODE_v
	11	SF3(ellint_F, Double_val, Double_val, GSL_MODE_val)
	12	SF3(ellint_E, Double_val, Double_val, GSL_MODE_val)
	13	SF4(ellint_P, Double_val, Double_val, Double_val, GSL_MODE_val)
	14	-SF4(ellint_D, Double_val, Double_val, Double_val, GSL_MODE_val)
	15	+//SF4(ellint_D, Double_val, Double_val, Double_val, GSL_MODE_val)
	16	+SF3(ellint_D, Double_val, Double_val, GSL_MODE_val)
	17	SF3(ellint_RC, Double_val, Double_val, GSL_MODE_val)
	18	SF4(ellint_RD, Double_val, Double_val, Double_val, GSL_MODE_val)
	19	SF4(ellint_RF, Double_val, Double_val, Double_val, GSL_MODE_val)
	20	@@ -452,6 +453,7 @@ SF1(legendre_Q1, Double_val)
	21	SF2(legendre_Ql, Int_val, Double_val)
	22
	23	/* Associated Legendre Polynomials and Spherical Harmonics */
	24	+/*
	25	SF3(legendre_Plm, Int_val, Int_val, Double_val)
	26	CAMLprim value
	27	ml_gsl_sf_legendre_Plm_array(value lmax, value m, value x, value result_array)
	28	@@ -487,7 +489,7 @@ ml_gsl_sf_legendre_array_size(value lmax
	29	ret = Val_int(gsl_ret);
	30	CAMLreturn(ret);
	31	}
	32	-
	33	+*/
	34	/* LOGARITHM and related functions */
	35	SF1(log, Double_val)
	36	SF1(log_abs, Double_val)

Line 0 Link Here

(-)math/qtiplot/files/patch-archgit_c5e8e49 (+37 lines)
	1	Obtained from:
	2	https://git.archlinux.org/svntogit/packages.git/tree/trunk/qtiplot-gsl2.patch?h=packages/qtiplot
	3
	4	Description: adoptation to gsl2.
	5	Author: Damir Islamov <damir@secretlaboratory.ru>
	6	Last-Update: 2015-12-04
	7
	8	--- qtiplot/src/analysis/Fit.cpp
	9	+++ qtiplot/src/analysis/Fit.cpp
	10	@@ -126,10 +126,12 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
	11	break;
	12	}
	13	}
	14	-
	15	+ gsl_matrix *J = gsl_matrix_alloc(d_n, d_p);
	16	if (status){
	17	- gsl_multifit_covar (s->J, 0.0, covar);
	18	+ gsl_multifit_fdfsolver_jac(s, J);
	19	+ gsl_multifit_covar (J, 0.0, covar);
	20	iterations = 0;
	21	+ gsl_matrix_free (J);
	22	return s;
	23	}
	24
	25	@@ -154,9 +156,9 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
	26
	27	status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance);
	28	} while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations);
	29	-
	30	- gsl_multifit_covar (s->J, 0.0, covar);
	31	-
	32	+ gsl_multifit_fdfsolver_jac(s, J);
	33	+ gsl_multifit_covar (J, 0.0, covar);
	34	+ gsl_matrix_free (J);
	35	iterations = iter;
	36	return s;
	37	}

Line 0 Link Here

(-)science/kst2/files/patch-git_a9d24f9 (+106 lines)
		1	Backport of:
		2	https://github.com/Kst-plot/kst/commit/a9d24f91057441bbd2e3ed9e7536b071121526cb
		3
		4	From a9d24f91057441bbd2e3ed9e7536b071121526cb Mon Sep 17 00:00:00 2001
		5	From: "D. V. Wiebe" <dvw@ketiltrout.net>
		6	Date: Thu, 10 Mar 2016 14:09:26 -0800
		7	Subject: [PATCH] GSL-2.x support.
		8
		9
		10	--- src/plugins/fits/non_linear.h.orig 2014-02-13 09:41:44 UTC
		11	+++ src/plugins/fits/non_linear.h
		12	@@ -18,6 +18,7 @@
		13	#include <gsl/gsl_blas.h>
		14	#include <gsl/gsl_multifit_nlin.h>
		15	#include <gsl/gsl_statistics.h>
		16	+#include <gsl/gsl_version.h>
		17	#include "common.h"
		18
		19	struct data {
		20	@@ -100,6 +101,7 @@ bool kstfit_nonlinear(
		21	gsl_multifit_function_fdf function;
		22	gsl_vector_view vectorViewInitial;
		23	gsl_matrix* pMatrixCovariance;
		24	+ gsl_matrix* pMatrixJacobian;
		25	struct data d;
		26	double dXInitial[NUM_PARAMS];
		27	double* pInputX;
		28	@@ -177,7 +179,16 @@ bool kstfit_nonlinear(
		29	}
		30	iIterations++;
		31	} while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS );
		32	- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance );
		33	+#if GSL_MAJOR_VERSION >= 2
		34	+ pMatrixJacobian = gsl_matrix_alloc( iLength, NUM_PARAMS );
		35	+#else
		36	+ pMatrixJacobian = pSolver->J;
		37	+#endif
		38	+ if ( pMatrixJacobian != NULL ) {
		39	+#if GSL_MAJOR_VERSION >= 2
		40	+ gsl_multifit_fdfsolver_jac( pSolver, pMatrixJacobian );
		41	+#endif
		42	+ gsl_multifit_covar( pMatrixJacobian, 0.0, pMatrixCovariance );
		43
		44	//
		45	// determine the fitted values...
		46	@@ -207,7 +218,10 @@ bool kstfit_nonlinear(
		47	scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f ));
		48
		49	bReturn = true;
		50	-
		51	+#if GSL_MAJOR_VERSION >= 2
		52	+ gsl_matrix_free( pMatrixJacobian );
		53	+#endif
		54	+ }
		55	gsl_matrix_free( pMatrixCovariance );
		56	}
		57	gsl_multifit_fdfsolver_free( pSolver );
		58	--- src/plugins/fits/non_linear_weighted.h.orig 2014-02-13 09:41:44 UTC
		59	+++ src/plugins/fits/non_linear_weighted.h
		60	@@ -18,6 +18,7 @@
		61	#include <gsl/gsl_blas.h>
		62	#include <gsl/gsl_multifit_nlin.h>
		63	#include <gsl/gsl_statistics.h>
		64	+#include <gsl/gsl_version.h>
65	#include "common.h"
66
67	struct data {
68	@@ -101,6 +102,7 @@ bool kstfit_nonlinear_weighted(
69	gsl_multifit_function_fdf function;
70	gsl_vector_view vectorViewInitial;
71	gsl_matrix* pMatrixCovariance;
72	+ gsl_matrix* pMatrixJacobian;
73	struct data d;
74	double dXInitial[NUM_PARAMS];
75	double* pInputs[3];
76	@@ -193,7 +195,17 @@ bool kstfit_nonlinear_weighted(
77	}
78	while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS );
79
80	- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance );
81	+#if GSL_MAJOR_VERSION >= 2
82	+ pMatrixJacobian = gsl_matrix_alloc( iLength, NUM_PARAMS );
83	+#else
84	+ pMatrixJacobian = pSolver->J;
85	+#endif
86	+
87	+ if ( pMatrixJacobian != NULL ) {
88	+#if GSL_MAJOR_VERSION >= 2
89	+ gsl_multifit_fdfsolver_jac( pSolver, pMatrixJacobian );
90	+#endif
91	+ gsl_multifit_covar( pMatrixJacobian, 0.0, pMatrixCovariance );
92
93	//
94	// determine the fitted values...
95	@@ -223,7 +235,10 @@ bool kstfit_nonlinear_weighted(
96	scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f ));
97
98	bReturn = true;
99	-
100	+#if GSL_VERSION_MAJOR >= 2
101	+ gsl_matrix_free( pMatrixJacobian );
102	+#endif
103	+ }
104	gsl_matrix_free( pMatrixCovariance );
105	}
106	gsl_multifit_fdfsolver_free( pSolver );