Update math/gsl to 1.16 and adjust some dependent ports

40 files changed, 76 insertions, 46 deletions

diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index db975be103b3..135d1e221eed 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	snd
 PORTVERSION=	13.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \
 		http://mirror.mcx2.org/
@@ -42,7 +43,7 @@ CONFIGURE_ARGS+=	--without-fftw
 .endif
 
 .if ${PORT_OPTIONS:MGSL}
-LIB_DEPENDS+=	gsl.16:${PORTSDIR}/math/gsl
+LIB_DEPENDS+=	gsl:${PORTSDIR}/math/gsl
 .else
 CONFIGURE_ARGS+=	--without-gsl
 .endif
diff --git a/benchmarks/flowgrind/Makefile b/benchmarks/flowgrind/Makefile
index a59a9a3e9d8a..28b134835b79 100644
--- a/benchmarks/flowgrind/Makefile
+++ b/benchmarks/flowgrind/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	flowgrind
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 MASTER_SITES=	https://launchpad.net/flowgrind/trunk/${PORTNAME}-0.6.1/+download/
 
diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile
index 1b042249ea09..6e6569fcf417 100644
--- a/benchmarks/sipp/Makefile
+++ b/benchmarks/sipp/Makefile
@@ -31,7 +31,7 @@ PCAPPLAY_DESC=	RTP play support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGSL}
-LIB_DEPENDS+=	gsl.16:${PORTSDIR}/math/gsl
+LIB_DEPENDS+=	gsl:${PORTSDIR}/math/gsl
 
 MAKE_ENV+=	EXTRACPPFLAGS=-DHAVE_GSL \
 		EXTRACFLAGS=-DHAVE_GSL \
diff --git a/biology/adun/Makefile b/biology/adun/Makefile
index cb270a53dfd2..2c6b89eba116 100644
--- a/biology/adun/Makefile
+++ b/biology/adun/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	adun
 PORTVERSION=	0.81
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology gnustep
 MASTER_SITES=	http://download.gna.org/adun/
 DISTNAME=	Adun-${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME=	Adun-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Molecular Simulator for GNUstep
 
-LIB_DEPENDS+=	gsl.16:${PORTSDIR}/math/gsl
+LIB_DEPENDS+=	gsl:${PORTSDIR}/math/gsl
 
 LICENSE=	GPLv2
 
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 62dfc5c02fad..b39a39c5e904 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gnuradio
 PORTVERSION=	3.6.5
+PORTREVISION=	1
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
 		${MASTER_SITE_LOCAL}
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 1afee03b6f47..b845f318e7b2 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra
 PORTVERSION=	${CALLIGRA_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/
diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile
index 8f129eaf827e..adb8c439f1e1 100644
--- a/graphics/amide/Makefile
+++ b/graphics/amide/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	amide
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index 8b62d52c582d..3629355f17b6 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	enblend
 PORTVERSION=	4.1.1
+PORTREVISION=	1
 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 dbb0c18793d1..a7ddc018a26e 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.48.4
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION}
diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile
index 486688498298..e74ff94a66e9 100644
--- a/graphics/luminance/Makefile
+++ b/graphics/luminance/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	luminance-hdr
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSION=	2.3.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/qtpfsgui/luminance/${DISTVERSION}
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 411958cd2d87..4a55be6e600b 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nip2
 PORTVERSION=	7.26.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
 
diff --git a/graphics/ocropus/Makefile b/graphics/ocropus/Makefile
index 5d88a18ed54c..22c83a134d7a 100644
--- a/graphics/ocropus/Makefile
+++ b/graphics/ocropus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ocropus
 PORTVERSION=	0.4
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -14,7 +14,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		iulib.0:${PORTSDIR}/graphics/iulib \
-		gsl.16:${PORTSDIR}/math/gsl
+		gsl:${PORTSDIR}/math/gsl
 
 WRKSRC=		${WRKDIR}/ocropus-0.4/ocropus
 
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 7caa5a57a4c1..cfa971f535ef 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qgis
 PORTVERSION=	1.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://qgis.org/downloads/ \
 		http://download.osgeo.org/qgis/src/
diff --git a/lang/algol68g/Makefile b/lang/algol68g/Makefile
index d45636fbb45f..7bd410307482 100644
--- a/lang/algol68g/Makefile
+++ b/lang/algol68g/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	algol68g
 PORTVERSION=	2.7
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://jmvdveer.home.xs4all.nl/
 
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 331f8c988c2a..873c88591290 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bogofilter
 PORTVERSION=	1.2.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	mail
 MASTER_SITES=	SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION}
 
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index a31b98e27552..8f9cd7f4f3f8 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	asymptote
 PORTVERSION=	2.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
diff --git a/math/dieharder/Makefile b/math/dieharder/Makefile
index 40103624e819..c90b4919b5dd 100644
--- a/math/dieharder/Makefile
+++ b/math/dieharder/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dieharder
 PORTVERSION=	3.31.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.phy.duke.edu/~rgb/General/dieharder/ LOCAL/bf
 EXTRACT_SUFX=	.tgz
diff --git a/math/fflas-ffpack/Makefile b/math/fflas-ffpack/Makefile
index f91b7c586976..1a33391e5bda 100644
--- a/math/fflas-ffpack/Makefile
+++ b/math/fflas-ffpack/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	fflas-ffpack
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://linalg.org/ LOCAL/bf
 
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index 2404f2bf6242..fe012335cbb3 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	giacxcas
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/ \
 		http://people.math.jussieu.fr/~han/xcas/sources/
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index 315942d97fe8..24eb9d47e872 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	gsl
-# Date created:				15 Feb 2000
-# Whom:					Andrew L. Neporada <andrew@chg.ru>
-#
+# Created by: Andrew L. Neporada <andrew@chg.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	gsl
-PORTVERSION=	1.15
-PORTREVISION=	1
+PORTVERSION=	1.16
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
@@ -27,9 +22,15 @@ INFO=		gsl-ref
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/gsl-ref.info*
 
+#prevent regression test coredumps from causing failures on the
+#package-building cluster:
+.ifndef(MAINTAINER_MODE)
+CORELIMIT?=	/usr/bin/limits -Sc 0
+.endif
+
 check regression-test test: build
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
-	${MAKE_ARGS} check)
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CORELIMIT} ${MAKE_CMD} \
+	${MAKE_ARGS} check
 
 .include <bsd.port.pre.mk>
 
diff --git a/math/gsl/distinfo b/math/gsl/distinfo
index a29a961f9f4b..4de762b80637 100644
--- a/math/gsl/distinfo
+++ b/math/gsl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gsl-1.15.tar.gz) = 85b907e57902e2b7606ef3aef960302ffdd13bd9dc5b8fcbfa75e4f0bf340ea3
-SIZE (gsl-1.15.tar.gz) = 3281134
+SHA256 (gsl-1.16.tar.gz) = 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53
+SIZE (gsl-1.16.tar.gz) = 3534080
diff --git a/math/gsl/pkg-plist b/math/gsl/pkg-plist
index 9cb20e79ff73..3eb7e61b7bbc 100644
--- a/math/gsl/pkg-plist
+++ b/math/gsl/pkg-plist
@@ -223,7 +223,7 @@ include/gsl/gsl_wavelet2d.h
 lib/libgsl.a
 lib/libgsl.la
 lib/libgsl.so
-lib/libgsl.so.16
+lib/libgsl.so.17
 lib/libgslcblas.a
 lib/libgslcblas.la
 lib/libgslcblas.so
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 6d5601127086..a182a6940813 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	labplot
 DISTVERSION=	2.0.0.alpha3
+PORTREVISION=	1
 CATEGORIES=	math kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
 
diff --git a/math/ocamlgsl/Makefile b/math/ocamlgsl/Makefile
index c73ee700bca1..86ac3e983650 100644
--- a/math/ocamlgsl/Makefile
+++ b/math/ocamlgsl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ocamlgsl
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://oandrieu.nerim.net/ocaml/gsl/
 
@@ -27,6 +28,7 @@ USE_GMAKE=	YES
 USE_GCC=	4.2+
 USE_OCAML=	YES
 MAKE_ENV+=	OCAMLDIR=${OCAML_LIBDIR}
+MAKE_JOBS_UNSAFE=	yes
 NO_OCAML_BUILDDEPENDS=	yes
 USE_OCAML_LDCONFIG=	yes
 
diff --git a/math/octave-forge-gsl/Makefile b/math/octave-forge-gsl/Makefile
index 775c6ea407df..c0e6d2ee00bd 100644
--- a/math/octave-forge-gsl/Makefile
+++ b/math/octave-forge-gsl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-gsl
 PORTVERSION=	1.0.8
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/orpie/Makefile b/math/orpie/Makefile
index fa5704352f81..92bdb7be8bfd 100644
--- a/math/orpie/Makefile
+++ b/math/orpie/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	orpie
 PORTVERSION=	1.5.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES+=	math
 MASTER_SITES=	http://pessimization.com/software/orpie/
 
@@ -15,7 +15,7 @@ MAINTAINER=	dylan@dylex.net
 COMMENT=	A fullscreen RPN calculator for the console
 
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
-LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/math/p5-Math-GSL/Makefile b/math/p5-Math-GSL/Makefile
index 47315be658d5..d34e66b948d2 100644
--- a/math/p5-Math-GSL/Makefile
+++ b/math/p5-Math-GSL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-GSL
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -82,4 +83,10 @@ MAN3=		Math::GSL.3 \
 BROKEN=		Does not compile on sparc64
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -Ee 's/(\()(back|for)(ward\))/\1gsl_fft_\2\3/' \
+		${WRKSRC}/xs/FFT_wrap.1.15.c
+	@${REINPLACE_CMD} -Ee 's/(\()(back|for)(ward\))/\1gsl_wavelet_\2\3/' \
+		${WRKSRC}/xs/Wavelet_wrap.1.15.c
+
 .include <bsd.port.post.mk>
diff --git a/math/p5-Math-GSL/pkg-descr b/math/p5-Math-GSL/pkg-descr
index 903b8110c90b..ba47b9bfff52 100644
--- a/math/p5-Math-GSL/pkg-descr
+++ b/math/p5-Math-GSL/pkg-descr
@@ -4,5 +4,4 @@ The GSL is itself distributed under GPL and is available from:
 Only the routines relating the solving of polynomials are exported.
 It exists to provide that function to "tkscope" in Audio::Data.
 
-WWW:	http://sources.redhat.com/gsl/
-	http://search.cpan.org/dist/Math-GSL/
+WWW: http://search.cpan.org/dist/Math-GSL/
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index afc1f6598230..30992668a8ac 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pspp
 PORTVERSION=	0.6.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
@@ -11,7 +11,7 @@ MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Program for statistical analysis of sampled data
 
 LIB_DEPENDS=	plot.4:${PORTSDIR}/graphics/plotutils \
-		gslcblas.0:${PORTSDIR}/math/gsl
+		gslcblas:${PORTSDIR}/math/gsl
 
 OPTIONS_DEFINE=	GUI PGSQL
 
diff --git a/math/py-gsl/Makefile b/math/py-gsl/Makefile
index 9c88b1463e7d..83d99f842ed5 100644
--- a/math/py-gsl/Makefile
+++ b/math/py-gsl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gsl
 PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +19,7 @@ COMMENT=	Python interface to GNU Scientific Library
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/core/include/numpy/arrayobject.h:${PORTSDIR}/math/py-numpy
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/__init__.py:${PORTSDIR}/math/py-numpy
-LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl
 
 PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g}
 USE_PYTHON=	yes
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index 1280d7f94ada..004e59899084 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qtiplot
 DISTVERSION=	0.9.8.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math science
 MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
 
@@ -11,7 +11,7 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Data analysis and scientific plotting
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser
-LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl \
+LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl \
 		png15:${PORTSDIR}/graphics/png
 # use bundled modified libraries
 # 		qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
diff --git a/math/ruby-gsl/Makefile b/math/ruby-gsl/Makefile
index 3258eabe755e..ad1ab6aba263 100644
--- a/math/ruby-gsl/Makefile
+++ b/math/ruby-gsl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gsl
 PORTVERSION=	1.14.7
+PORTREVISION=	1
 CATEGORIES=	math ruby
 MASTER_SITES=	RF
 MASTER_SITE_SUBDIR=	rb-${PORTNAME}
@@ -18,7 +19,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A Ruby extension library for GSL (GNU Scientific Library)
 
-LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl
 
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
@@ -35,6 +36,11 @@ post-patch:
 	${WRKSRC}/ext/matrix_complex.c
 	${REINPLACE_CMD} -e 's|gsl_vector_complex_equal|rb_&|g' \
 	${WRKSRC}/ext/vector_complex.c
+	${REINPLACE_CMD} -Ee \
+	'/(gsl_wavelet_direction|INT2FIX)/s/(for|back)ward/gsl_wavelet_&/' \
+	${WRKSRC}/ext/wavelet.c
+	${REINPLACE_CMD} -Ee '/INT2FIX/s/(for|back)ward/gsl_fft_&/' \
+	${WRKSRC}/ext/fft.c
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
diff --git a/science/abinit/Makefile b/science/abinit/Makefile
index 00f32524e02f..03d83a55927a 100644
--- a/science/abinit/Makefile
+++ b/science/abinit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	abinit
 PORTVERSION=	5.7.3
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.abinit.org/pub/abinitio/ABINIT_v${PORTVERSION}/
 
@@ -16,7 +16,7 @@ COMMENT=	Abinit calculates electronic structure of systems
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numarray/__init__.py:${PORTSDIR}/math/py-numarray
 LIB_DEPENDS=	netcdff.4:${PORTSDIR}/science/netcdf3-ftn	\
-		gsl.16:${PORTSDIR}/math/gsl
+		gsl:${PORTSDIR}/math/gsl
 
 USE_FORTRAN=	yes
 USE_GMAKE=	yes
diff --git a/science/afni/Makefile b/science/afni/Makefile
index dc4605b41efe..c4fa87eabc1e 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -11,7 +11,7 @@
 
 PORTNAME=	afni
 PORTVERSION=	2012.04.17.2129
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science biology graphics
 MASTER_SITES=	http://personalpages.tds.net/~jwbacon/Ports/distfiles/AFNI/${PORTVERSION}/ \
 		http://www.acadix.biz/Ports/distfiles/AFNI/${PORTVERSION}/
diff --git a/science/getdp/Makefile b/science/getdp/Makefile
index 88d36bfa38ae..19fdaba1a79d 100644
--- a/science/getdp/Makefile
+++ b/science/getdp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	getdp
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://www.geuz.org/getdp/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -11,7 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	A rather general finite element solver using mixed finite elements
 
-LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl	\
+LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl	\
 		lapack.4:${PORTSDIR}/math/lapack
 
 USE_GMAKE=	yes
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index eb780e01f7d4..26153795ac5d 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnudatalanguage
 DISTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science lang
 MASTER_SITES=	SF/${PORTNAME}/gdl/${DISTVERSION}
 .if defined(BUILD_PYTHON_MODULE)
@@ -30,7 +30,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS+=	plplotd.11:${PORTSDIR}/math/plplot	\
 		ps.4:${PORTSDIR}/print/pslib		\
-		gsl.16:${PORTSDIR}/math/gsl		\
+		gsl:${PORTSDIR}/math/gsl		\
 		dps.0:${PORTSDIR}/x11/dgs
 
 USE_GCC=	yes
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index cfbd380f5785..52e69e87ce1c 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gromacs
 PORTVERSION=	4.6.3
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.gromacs.org/pub/gromacs/
 
diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index 9bb7230fe662..bdba23cede4a 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -3,13 +3,14 @@
 
 PORTNAME=	kst
 DISTVERSION=	2.0.6
+PORTREVISION=	1
 CATEGORIES=	science kde
 MASTER_SITES=	SF/${PORTNAME}/Kst%20${DISTVERSION:C/-r.*//}/
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Data viewing and plotting tool
 
-LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl
 
 LATEST_LINK=	kst2
 
diff --git a/science/py-mlpy/Makefile b/science/py-mlpy/Makefile
index fd79813a6d0e..db845410671d 100644
--- a/science/py-mlpy/Makefile
+++ b/science/py-mlpy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mlpy
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 MASTER_SITES=	https://mlpy.fbk.eu/download/src/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +19,7 @@ COMMENT=	High performance Python package for predictive modeling
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
 		cython>0:${PORTSDIR}/lang/cython
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl
 
 CFLAGS+=	-I${LOCALBASE}/include -I${PYTHON_SITELIBDIR}/numpy/core
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/science/step/Makefile b/science/step/Makefile
index 95a50a99659b..2a02f2859ec9 100644
--- a/science/step/Makefile
+++ b/science/step/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	step
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	science kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -11,7 +12,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 interactive physics simulator
 
 LIB_DEPENDS=	qalculate.5:${PORTSDIR}/math/libqalculate \
-		gsl.16:${PORTSDIR}/math/gsl
+		gsl:${PORTSDIR}/math/gsl
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2