5 files changed, 20 insertions, 23 deletions

diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index 3d014c2a00bd..c1c104dc7e4e 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	gsl
-PORTVERSION=	1.6
-PORTREVISION=	1
+PORTVERSION=	1.8
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNU:S/$/:gsl/} \
+		http://www.gnu.org/software/${PORTNAME}/manual/:gslref
+MASTER_SITE_SUBDIR=	${PORTNAME}/:gsl
 .if !defined(NOPORTDOCS)
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${GSLREF}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:gsl \
+		${GSLREF}:gslref
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 .endif
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	rainer.alves@gmail.com
 COMMENT=	The GNU Scientific Library - mathematical libs
 
 INSTALLS_SHLIB=	yes
@@ -32,7 +33,7 @@ GSLREF=		gsl-ref.ps.gz
 IGNOREFILES=	${GSLREF}
 
 post-extract:
-	${RM} -f ${WRKSRC}/doc/gsl-ref.info*
+	@${RM} -f ${WRKSRC}/doc/gsl-ref.info*
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/math/gsl/distinfo b/math/gsl/distinfo
index baac238498c5..86a3378baca2 100644
--- a/math/gsl/distinfo
+++ b/math/gsl/distinfo
@@ -1,5 +1,5 @@
-MD5 (gsl-1.6.tar.gz) = 2c63ab9b925a7be70a5a5b4e0a95ea03
-SHA256 (gsl-1.6.tar.gz) = 52e097b5228a617fef788d54eba6855c1addc62b8f68a1dfb5895cad25594f1f
-SIZE (gsl-1.6.tar.gz) = 2294804
+MD5 (gsl-1.8.tar.gz) = c60a5d193cc6b472496ff191744fc306
+SHA256 (gsl-1.8.tar.gz) = a66a4c5243111f98f11114a9c7e00c316b281e8e383b0d0b8a0b7debdb27d9d6
+SIZE (gsl-1.8.tar.gz) = 2419825
 MD5 (gsl-ref.ps.gz) = IGNORE
 SHA256 (gsl-ref.ps.gz) = IGNORE
diff --git a/math/gsl/files/patch-Makefile.in b/math/gsl/files/patch-Makefile.in
index 27edee17d77f..c91d9e2f5477 100644
--- a/math/gsl/files/patch-Makefile.in
+++ b/math/gsl/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sat Sep 29 13:07:34 2001
-+++ Makefile.in	Sat Sep 29 13:08:00 2001
-@@ -90,7 +90,7 @@
- 
+--- Makefile.in.orig	Fri Mar 31 14:47:46 2006
++++ Makefile.in	Wed May  3 17:02:20 2006
+@@ -254,7 +254,7 @@
+ SUBLIBS = block/libgslblock.la blas/libgslblas.la complex/libgslcomplex.la cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la fft/libgslfft.la fit/libgslfit.la histogram/libgslhistogram.la ieee-utils/libgslieeeutils.la integration/libgslintegration.la interpolation/libgslinterpolation.la linalg/libgsllinalg.la matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la multifit/libgslmultifit.la multimin/libgslmultimin.la multiroots/libgslmultiroots.la ntuple/libgslntuple.la ode-initval/libgslodeiv.la permutation/libgslpermutation.la combination/libgslcombination.la poly/libgslpoly.la qrng/libgslqrng.la randist/libgslrandist.la rng/libgslrng.la roots/libgslroots.la siman/libgslsiman.la sort/libgslsort.la specfunc/libgslspecfunc.la statistics/libgslstatistics.la sum/libgslsum.la sys/libgslsys.la test/libgsltest.la utils/libutils.la vector/libgslvector.la cdf/libgslcdf.la wavelet/libgslwavelet.la
+ pkginclude_HEADERS = gsl_math.h gsl_pow_int.h gsl_nan.h gsl_machine.h gsl_mode.h gsl_precision.h gsl_types.h gsl_version.h
  bin_SCRIPTS = gsl-config
- 
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = gsl.pc
- 
- EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.in THANKS KNOWN-PROBLEMS gsl.spec.in gsl.m4 MACHINES test_gsl_histogram.sh
+ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS SUPPORT gsl.spec.in gsl.m4 test_gsl_histogram.sh
+ lib_LTLIBRARIES = libgsl.la
diff --git a/math/gsl/pkg-descr b/math/gsl/pkg-descr
index 87ecdc059157..4b39428553a3 100644
--- a/math/gsl/pkg-descr
+++ b/math/gsl/pkg-descr
@@ -6,7 +6,4 @@ languages.
 
 Example programs are available at http://www.silbsd.org/projects/GSL.tar.gz
 
-WWW: http://sources.redhat.com/gsl/
-
-- Vlad
-vlad@reid.ru
+WWW: http://www.gnu.org/software/gsl
diff --git a/math/gsl/pkg-plist b/math/gsl/pkg-plist
index 68e0dddcbf51..122e3cb68e73 100644
--- a/math/gsl/pkg-plist
+++ b/math/gsl/pkg-plist
@@ -5,7 +5,6 @@ include/gsl/gsl_blas.h
 include/gsl/gsl_blas_types.h
 include/gsl/gsl_block.h
 include/gsl/gsl_block_char.h
-include/gsl/gsl_block_complex.h
 include/gsl/gsl_block_complex_double.h
 include/gsl/gsl_block_complex_float.h
 include/gsl/gsl_block_complex_long_double.h
@@ -218,7 +217,7 @@ include/gsl/gsl_wavelet2d.h
 lib/libgsl.a
 lib/libgsl.la
 lib/libgsl.so
-lib/libgsl.so.7
+lib/libgsl.so.9
 lib/libgslcblas.a
 lib/libgslcblas.la
 lib/libgslcblas.so