46 files changed, 301 insertions, 39 deletions

diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 6c707028dc3d..8c5cc46f7b5b 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	snd
 PORTVERSION=	15.7
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \
 		SF
diff --git a/benchmarks/flowgrind/Makefile b/benchmarks/flowgrind/Makefile
index d7d4abb3c4cf..b0d36c4819db 100644
--- a/benchmarks/flowgrind/Makefile
+++ b/benchmarks/flowgrind/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	flowgrind
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	benchmarks
 
diff --git a/biology/bcftools/Makefile b/biology/bcftools/Makefile
index ddde407aa8d6..837866b954f3 100644
--- a/biology/bcftools/Makefile
+++ b/biology/bcftools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bcftools
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	biology
 
 MAINTAINER=	cartwright@asu.edu
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 7259b558b1c4..0b60f5d4e529 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gnuradio
 PORTVERSION=	3.7.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
 		LOCAL/db
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 8300ae23b375..25b5e1aa732d 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra
 PORTVERSION=	${CALLIGRA_VERSION}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	editors kde
 MASTER_SITES=	KDE/${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/
 DIST_SUBDIR=	KDE/${PORTNAME}/${PORTVERSION}
diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile
index 5e24c2c5fb14..972b75fe8d5a 100644
--- a/graphics/amide/Makefile
+++ b/graphics/amide/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	amide
 PORTVERSION=	1.0.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
diff --git a/graphics/amide/files/patch-gsl_2x b/graphics/amide/files/patch-gsl_2x
new file mode 100644
index 000000000000..14f97d80f474
--- /dev/null
+++ b/graphics/amide/files/patch-gsl_2x
@@ -0,0 +1,44 @@
+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++);
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index 036d1248c2b7..8f90490018ef 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	enblend
 PORTVERSION=	4.1.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION:R}
 DISTNAME=	enblend-enfuse-${PORTVERSION}
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 6ffa13425339..28503c7d4bf0 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.92.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	https://media.inkscape.org/dl/resources/file/ \
 		LOCAL/kwm
diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile
index caa48ff25b16..69ac1be981e1 100644
--- a/graphics/luminance-qt5/Makefile
+++ b/graphics/luminance-qt5/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	luminance-hdr
 DISTVERSION=	2.4.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	SF/qtpfsgui/luminance/${DISTVERSION}
 PKGNAMESUFFIX=	-qt5
diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile
index 450b482f9f70..89d2f9d51f87 100644
--- a/graphics/luminance/Makefile
+++ b/graphics/luminance/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	luminance-hdr
 DISTVERSION=	2.3.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	SF/qtpfsgui/luminance/${DISTVERSION}
 
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 623c211e4289..4c880773d52a 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nip2
 PORTVERSION=	8.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
 
diff --git a/graphics/pfstmo/Makefile b/graphics/pfstmo/Makefile
index c8876a3c11f1..3a7cd8bd52c2 100644
--- a/graphics/pfstmo/Makefile
+++ b/graphics/pfstmo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pfstmo
 PORTVERSION=	1.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/pfstools/${PORTNAME}/${PORTVERSION}
 
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 5c1b9d454f94..52ecf44c9676 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	2_18_7
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin@gwdg.de
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index b69ff7d496f6..2d531ac804ea 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xaos
 PORTVERSION=	3.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics math
 MASTER_SITES=	SF/${PORTNAME}/XaoS/${PORTVERSION}
 
diff --git a/lang/algol68g/Makefile b/lang/algol68g/Makefile
index d5286d2ea2ae..4fb5708b9204 100644
--- a/lang/algol68g/Makefile
+++ b/lang/algol68g/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	algol68g
 PORTVERSION=	2.8.4
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://jmvdveer.home.xs4all.nl/
 
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 6ea1542eb525..9a526c0ac407 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bogofilter
 PORTVERSION=	1.2.4
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES?=	mail
 MASTER_SITES=	SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION}
 
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index 598108c3e142..75e7308e991c 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	asymptote
 PORTVERSION=	2.37
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
diff --git a/math/dieharder/Makefile b/math/dieharder/Makefile
index 5426064682f9..b95945ad25ca 100644
--- a/math/dieharder/Makefile
+++ b/math/dieharder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dieharder
 PORTVERSION=	3.31.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	http://www.phy.duke.edu/~rgb/General/dieharder/ LOCAL/bf
 
diff --git a/math/fflas-ffpack/Makefile b/math/fflas-ffpack/Makefile
index 4a94750cdbd8..8694e38cdeb8 100644
--- a/math/fflas-ffpack/Makefile
+++ b/math/fflas-ffpack/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fflas-ffpack
 PORTVERSION=	1.4.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 MASTER_SITES=	http://linalg.org/ LOCAL/bf
 
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index a3fc103f014a..30423cf0b6c7 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	giacxcas
 DISTVERSION=	1.2.2-57
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/:giac \
 		http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index 1a46aa8f3a3e..e12bbb20418b 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	gsl
-PORTVERSION=	1.16
-PORTREVISION=	2
+PORTVERSION=	2.3
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tcberner@FreeBSD.org
 COMMENT=	The GNU Scientific Library - mathematical libs
 
 LICENSE=	GPLv3
diff --git a/math/gsl/distinfo b/math/gsl/distinfo
index 4de762b80637..9c5741505850 100644
--- a/math/gsl/distinfo
+++ b/math/gsl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gsl-1.16.tar.gz) = 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53
-SIZE (gsl-1.16.tar.gz) = 3534080
+TIMESTAMP = 1493276070
+SHA256 (gsl-2.3.tar.gz) = 562500b789cd599b3a4f88547a7a3280538ab2ff4939504c8b4ac4ca25feadfb
+SIZE (gsl-2.3.tar.gz) = 4510731
diff --git a/math/gsl/pkg-plist b/math/gsl/pkg-plist
index da56cfdc7449..304571ddc471 100644
--- a/math/gsl/pkg-plist
+++ b/math/gsl/pkg-plist
@@ -54,6 +54,7 @@ include/gsl/gsl_ieee_utils.h
 include/gsl/gsl_inline.h
 include/gsl/gsl_integration.h
 include/gsl/gsl_interp.h
+include/gsl/gsl_interp2d.h
 include/gsl/gsl_linalg.h
 include/gsl/gsl_machine.h
 include/gsl/gsl_math.h
@@ -82,6 +83,9 @@ include/gsl/gsl_monte_plain.h
 include/gsl/gsl_monte_vegas.h
 include/gsl/gsl_multifit.h
 include/gsl/gsl_multifit_nlin.h
+include/gsl/gsl_multifit_nlinear.h
+include/gsl/gsl_multilarge.h
+include/gsl/gsl_multilarge_nlinear.h
 include/gsl/gsl_multimin.h
 include/gsl/gsl_multiroots.h
 include/gsl/gsl_multiset.h
@@ -100,6 +104,21 @@ include/gsl/gsl_permute_float.h
 include/gsl/gsl_permute_int.h
 include/gsl/gsl_permute_long.h
 include/gsl/gsl_permute_long_double.h
+include/gsl/gsl_permute_matrix.h
+include/gsl/gsl_permute_matrix_char.h
+include/gsl/gsl_permute_matrix_complex_double.h
+include/gsl/gsl_permute_matrix_complex_float.h
+include/gsl/gsl_permute_matrix_complex_long_double.h
+include/gsl/gsl_permute_matrix_double.h
+include/gsl/gsl_permute_matrix_float.h
+include/gsl/gsl_permute_matrix_int.h
+include/gsl/gsl_permute_matrix_long.h
+include/gsl/gsl_permute_matrix_long_double.h
+include/gsl/gsl_permute_matrix_short.h
+include/gsl/gsl_permute_matrix_uchar.h
+include/gsl/gsl_permute_matrix_uint.h
+include/gsl/gsl_permute_matrix_ulong.h
+include/gsl/gsl_permute_matrix_ushort.h
 include/gsl/gsl_permute_short.h
 include/gsl/gsl_permute_uchar.h
 include/gsl/gsl_permute_uint.h
@@ -127,6 +146,7 @@ include/gsl/gsl_qrng.h
 include/gsl/gsl_randist.h
 include/gsl/gsl_rng.h
 include/gsl/gsl_roots.h
+include/gsl/gsl_rstat.h
 include/gsl/gsl_sf.h
 include/gsl/gsl_sf_airy.h
 include/gsl/gsl_sf_bessel.h
@@ -183,8 +203,12 @@ include/gsl/gsl_sort_vector_uchar.h
 include/gsl/gsl_sort_vector_uint.h
 include/gsl/gsl_sort_vector_ulong.h
 include/gsl/gsl_sort_vector_ushort.h
+include/gsl/gsl_spblas.h
 include/gsl/gsl_specfunc.h
+include/gsl/gsl_splinalg.h
 include/gsl/gsl_spline.h
+include/gsl/gsl_spline2d.h
+include/gsl/gsl_spmatrix.h
 include/gsl/gsl_statistics.h
 include/gsl/gsl_statistics_char.h
 include/gsl/gsl_statistics_double.h
@@ -222,15 +246,15 @@ include/gsl/gsl_wavelet.h
 include/gsl/gsl_wavelet2d.h
 lib/libgsl.a
 lib/libgsl.so
-lib/libgsl.so.0
-lib/libgsl.so.0.17.0
+lib/libgsl.so.19
+lib/libgsl.so.19.3.0
 lib/libgslcblas.a
 lib/libgslcblas.so
 lib/libgslcblas.so.0
 lib/libgslcblas.so.0.0.0
 libdata/pkgconfig/gsl.pc
-share/aclocal/gsl.m4
 man/man1/gsl-config.1.gz
 man/man1/gsl-histogram.1.gz
 man/man1/gsl-randist.1.gz
 man/man3/gsl.3.gz
+share/aclocal/gsl.m4
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index ad2a62cd19a5..37305b691814 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	labplot
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=-kf5
 CATEGORIES=	math kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
diff --git a/math/ocamlgsl/Makefile b/math/ocamlgsl/Makefile
index f246aec36fa6..dc39c3bc45a3 100644
--- a/math/ocamlgsl/Makefile
+++ b/math/ocamlgsl/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	ocaml-gsl
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.19.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	michipili@gmail.com
diff --git a/math/octave-forge-gsl/Makefile b/math/octave-forge-gsl/Makefile
index 8039f73c513a..6044adbe8464 100644
--- a/math/octave-forge-gsl/Makefile
+++ b/math/octave-forge-gsl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-gsl
 PORTVERSION=	2.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/orpie/Makefile b/math/orpie/Makefile
index 71f7b4201e2c..2bf30c499e86 100644
--- a/math/orpie/Makefile
+++ b/math/orpie/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	orpie
 PORTVERSION=	1.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	math
 MASTER_SITES=	http://pessimization.com/software/orpie/
 
diff --git a/math/orpie/files/patch-gsl_mlgsl__sf.c b/math/orpie/files/patch-gsl_mlgsl__sf.c
new file mode 100644
index 000000000000..3f7dec98222a
--- /dev/null
+++ b/math/orpie/files/patch-gsl_mlgsl__sf.c
@@ -0,0 +1,36 @@
+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)
diff --git a/math/p5-Math-GSL/Makefile b/math/p5-Math-GSL/Makefile
index 3dac520e76e8..fe10f8e8589e 100644
--- a/math/p5-Math-GSL/Makefile
+++ b/math/p5-Math-GSL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Math-GSL
 PORTVERSION=	0.39
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-GSL/pkg-plist b/math/p5-Math-GSL/pkg-plist
index 85df7050bc93..302e41db163a 100644
--- a/math/p5-Math-GSL/pkg-plist
+++ b/math/p5-Math-GSL/pkg-plist
@@ -79,6 +79,8 @@
 %%SITE_ARCH%%/auto/Math/GSL/MatrixComplex/MatrixComplex.so
 %%SITE_ARCH%%/auto/Math/GSL/Min/Min.so
 %%SITE_ARCH%%/auto/Math/GSL/Monte/Monte.so
+%%SITE_ARCH%%/auto/Math/GSL/Multifit/Multifit.so
+%%SITE_ARCH%%/auto/Math/GSL/Multilarge/Multilarge.so
 %%SITE_ARCH%%/auto/Math/GSL/Multimin/Multimin.so
 %%SITE_ARCH%%/auto/Math/GSL/Multiroots/Multiroots.so
 %%SITE_ARCH%%/auto/Math/GSL/NTuple/NTuple.so
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 40483c011536..5584e7e3feb6 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pspp
 PORTVERSION=	0.10.2
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
diff --git a/math/py-gsl/Makefile b/math/py-gsl/Makefile
index a90761d719bd..32db0fe846f9 100644
--- a/math/py-gsl/Makefile
+++ b/math/py-gsl/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gsl
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	math python
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-gsl/distinfo b/math/py-gsl/distinfo
index 82273d6d66fc..2c08027a62d8 100644
--- a/math/py-gsl/distinfo
+++ b/math/py-gsl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (python/pygsl-2.1.1.tar.gz) = 3d17e6deb5433b331a567a45ff467f41e9059def76e6ef0f21d8e891498f946a
-SIZE (python/pygsl-2.1.1.tar.gz) = 727636
+TIMESTAMP = 1493448013
+SHA256 (python/pygsl-2.2.0.tar.gz) = 200e7986c368cb815685e502993e5211702219e1a0bb79030d671c35df25a59e
+SIZE (python/pygsl-2.2.0.tar.gz) = 983467
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index 4a5e1bf7139c..7bdca9a9a6c3 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qtiplot
 DISTVERSION=	0.9.8.9
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	math science
 MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
 
diff --git a/math/qtiplot/files/patch-archgit_c5e8e49 b/math/qtiplot/files/patch-archgit_c5e8e49
new file mode 100644
index 000000000000..bb9dd8bedbcc
--- /dev/null
+++ b/math/qtiplot/files/patch-archgit_c5e8e49
@@ -0,0 +1,37 @@
+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;
+ }
diff --git a/math/rubygem-rb-gsl/Makefile b/math/rubygem-rb-gsl/Makefile
index d9dbecccb5f7..f693dbcc989b 100644
--- a/math/rubygem-rb-gsl/Makefile
+++ b/math/rubygem-rb-gsl/Makefile
@@ -1,10 +1,11 @@
 # Created by: Shin-ya MURAKAMI <murashin@gfd-dennou.org>
 # $FreeBSD$
 
-PORTNAME=	rb-gsl
-PORTVERSION=	1.16.0.4
+PORTNAME=	gsl
+PORTVERSION=	2.1.0.2
 CATEGORIES=	math rubygems
 MASTER_SITES=	RG
+PKGNAMEPREFIX=	rubygem-rb-
 
 MAINTAINER=	murashin@gfd-dennou.org
 COMMENT=	Ruby extension library for GSL (GNU Scientific Library)
diff --git a/math/rubygem-rb-gsl/distinfo b/math/rubygem-rb-gsl/distinfo
index 764e3ffb74c9..e1b42930feef 100644
--- a/math/rubygem-rb-gsl/distinfo
+++ b/math/rubygem-rb-gsl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/rb-gsl-1.16.0.4.gem) = bc6573cc36410d2ec88672d4b12e2c908684796b276a8743c19345bbb44bef94
-SIZE (rubygem/rb-gsl-1.16.0.4.gem) = 588288
+TIMESTAMP = 1493451497
+SHA256 (rubygem/gsl-2.1.0.2.gem) = bb748021a950ae51a7f0eeadffbcd9b039734fcbb99a04a313ca48c4e60dd9ba
+SIZE (rubygem/gsl-2.1.0.2.gem) = 735232
diff --git a/science/afni/Makefile b/science/afni/Makefile
index cabb4159c8bc..3c40a38ea228 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -11,7 +11,7 @@
 
 PORTNAME=	afni
 PORTVERSION=	2015.11.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science biology graphics
 MASTER_SITES=	http://www.acadix.biz/Ports/distfiles/
 
diff --git a/science/fisicalab/Makefile b/science/fisicalab/Makefile
index 4dfdf9cdc06c..c90708a04f46 100644
--- a/science/fisicalab/Makefile
+++ b/science/fisicalab/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	fisicalab
 PORTVERSION=	0.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science gnustep
 MASTER_SITES=	SAVANNAH
 
diff --git a/science/getdp/Makefile b/science/getdp/Makefile
index 34822ea44ba9..00396b5590c3 100644
--- a/science/getdp/Makefile
+++ b/science/getdp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	getdp
 PORTVERSION=	2.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	http://www.geuz.org/getdp/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 10b86c1739d6..9d14cd33f953 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnudatalanguage
 DISTVERSION=	0.9.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science lang
 MASTER_SITES=	SF/${PORTNAME}/gdl/${PORTVERSION}
 .if defined(BUILD_PYTHON_MODULE)
diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index a5fda2435859..b2596e5432e9 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kst
 DISTVERSION=	2.0.8
+PORTREVISION=	1
 CATEGORIES=	science kde
 MASTER_SITES=	SF/${PORTNAME}/Kst%20${DISTVERSION:C/-r.*//}/
 DISTNAME=	Kst-${DISTVERSION}
diff --git a/science/kst2/files/patch-git_a9d24f9 b/science/kst2/files/patch-git_a9d24f9
new file mode 100644
index 000000000000..3dd6306cb73b
--- /dev/null
+++ b/science/kst2/files/patch-git_a9d24f9
@@ -0,0 +1,106 @@
+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 );
diff --git a/science/py-mlpy/Makefile b/science/py-mlpy/Makefile
index dc362ead1933..7f394aa865f2 100644
--- a/science/py-mlpy/Makefile
+++ b/science/py-mlpy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mlpy
 PORTVERSION=	3.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/science/step/Makefile b/science/step/Makefile
index 5ad4662abb85..d648914cc747 100644
--- a/science/step/Makefile
+++ b/science/step/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	step
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org