Update to 0.9.3

5 files changed, 73 insertions, 45 deletions

diff --git a/math/py-gsl/Makefile b/math/py-gsl/Makefile
index ae631dc15de6..fea8f6086e1a 100644
--- a/math/py-gsl/Makefile
+++ b/math/py-gsl/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	gsl
-PORTVERSION=	0.3.2
-PORTREVISION=	3
+PORTVERSION=	0.9.3
 CATEGORIES=	math python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	pygsl
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygsl-${PORTVERSION}
diff --git a/math/py-gsl/distinfo b/math/py-gsl/distinfo
index f4425b5901fd..e6b14b39bf81 100644
--- a/math/py-gsl/distinfo
+++ b/math/py-gsl/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/pygsl-0.3.2.tar.gz) = dde5f5a23dba8e63818dbfadb12e9a09
-SHA256 (python/pygsl-0.3.2.tar.gz) = 8db4de81dbb2e0dac43ebdcc0cd0f289d5cae997a0d6bb5e51e593475a714a14
-SIZE (python/pygsl-0.3.2.tar.gz) = 482025
+MD5 (python/pygsl-0.9.3.tar.gz) = fdb9eb0c6843950bb50173898fbbff02
+SHA256 (python/pygsl-0.9.3.tar.gz) = 71082734c8d37fa737af0525e75c7e84f5ecd708d12eff671c6f2bb73ba39816
+SIZE (python/pygsl-0.9.3.tar.gz) = 594978
diff --git a/math/py-gsl/files/patch-src_callback_odeiv.ic b/math/py-gsl/files/patch-src_callback_odeiv.ic
deleted file mode 100644
index 40158a33c09e..000000000000
--- a/math/py-gsl/files/patch-src_callback_odeiv.ic
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- src/callback/odeiv.ic.orig
-+++ src/callback/odeiv.ic
-@@ -397,13 +397,14 @@
- 	      goto fail;	    
- 	 }	 
-          FUNC_MESS("T_0 FLOAT");
--         int dim = 1;
-+         { int dim = 1;
-          ts = (PyArrayObject *) PyGSL_New_Array(1, &dim, PyArray_DOUBLE);
- 	 if(ts == NULL) {
- 	      line = __LINE__ - 2;
- 	      goto fail;
- 	 }
-          (*(double *)(ts->data)) = v;
-+	 }
-     }
-     FUNC_MESS("T END");
-     if(PyGSL_STRIDE_RECALC(ts->strides[0], sizeof(double), &stride) != GSL_SUCCESS)
diff --git a/math/py-gsl/files/patch-src_init_block__helpers.c b/math/py-gsl/files/patch-src_init_block__helpers.c
deleted file mode 100644
index 7530878f8bcd..000000000000
--- a/math/py-gsl/files/patch-src_init_block__helpers.c
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- src/init/block_helpers.c.orig
-+++ src/init/block_helpers.c
-@@ -380,8 +380,9 @@
- 	       goto fail;	    
- 	  }	 
- 	  FUNC_MESS("=> FLOAT");
--	  int dim = 1;
-+	  { int dim = 1;
- 	  r = (PyArrayObject *) PyGSL_New_Array(1, &dim, PyArray_DOUBLE);
-+	  }
- 	  if(r == NULL) {
- 	       line = __LINE__ - 2;
- 	       goto fail;
diff --git a/math/py-gsl/pkg-plist b/math/py-gsl/pkg-plist
index cd3ec1dd016d..386303cc0c82 100644
--- a/math/py-gsl/pkg-plist
+++ b/math/py-gsl/pkg-plist
@@ -1,3 +1,69 @@
+%%PYTHON_INCLUDEDIR%%/pygsl/arrayobject.h
+%%PYTHON_INCLUDEDIR%%/pygsl/block_helpers.h
+%%PYTHON_INCLUDEDIR%%/pygsl/block_helpers_numarray.h
+%%PYTHON_INCLUDEDIR%%/pygsl/block_helpers_numeric.h
+%%PYTHON_INCLUDEDIR%%/pygsl/block_helpers_numpy.h
+%%PYTHON_INCLUDEDIR%%/pygsl/compilers.h
+%%PYTHON_INCLUDEDIR%%/pygsl/complex_helpers.h
+%%PYTHON_INCLUDEDIR%%/pygsl/error_helpers.h
+%%PYTHON_INCLUDEDIR%%/pygsl/errorno.h
+%%PYTHON_INCLUDEDIR%%/pygsl/function_helpers.h
+%%PYTHON_INCLUDEDIR%%/pygsl/general_helpers.h
+%%PYTHON_INCLUDEDIR%%/pygsl/intern.h
+%%PYTHON_INCLUDEDIR%%/pygsl/profile.h
+%%PYTHON_INCLUDEDIR%%/pygsl/pygsl.h
+%%PYTHON_INCLUDEDIR%%/pygsl/pygsl_features.h
+%%PYTHON_INCLUDEDIR%%/pygsl/rng.h
+%%PYTHON_INCLUDEDIR%%/pygsl/rng_helpers.h
+%%PYTHON_INCLUDEDIR%%/pygsl/solver.h
+%%PYTHON_INCLUDEDIR%%/pygsl/swig.h
+%%PYTHON_INCLUDEDIR%%/pygsl/utils.h
+%%PYTHON_SITELIBDIR%%/pygsl/_version.py
+%%PYTHON_SITELIBDIR%%/pygsl/_version.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/_version.pyo
+%%PYTHON_SITELIBDIR%%/pygsl/bspline.py
+%%PYTHON_SITELIBDIR%%/pygsl/bspline.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/bspline.pyo
+%%PYTHON_SITELIBDIR%%/pygsl/errno.so
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/__init__.py
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/array_includes.py
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/array_includes.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/array_includes.pyo
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/gsl_Extension.py
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/gsl_Extension.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/gsl_Extension.pyo
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/gsl_site_example.py
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/gsl_site_example.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/gsl_site_example.pyo
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/swig_extension.py
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/swig_extension.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/gsl_dist/swig_extension.pyo
+%%PYTHON_SITELIBDIR%%/pygsl/inittest.so
+%%PYTHON_SITELIBDIR%%/pygsl/multiminimize.py
+%%PYTHON_SITELIBDIR%%/pygsl/multiminimize.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/multiminimize.pyo
+%%PYTHON_SITELIBDIR%%/pygsl/sum.py
+%%PYTHON_SITELIBDIR%%/pygsl/sum.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/sum.pyo
+%%PYTHON_SITELIBDIR%%/pygsl/testing/_ufuncs.so
+%%PYTHON_SITELIBDIR%%/pygsl/testing/complex.py
+%%PYTHON_SITELIBDIR%%/pygsl/testing/complex.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/testing/complex.pyo
+%%PYTHON_SITELIBDIR%%/pygsl/testing/minimize.so
+%%PYTHON_SITELIBDIR%%/pygsl/testing/multifit_nlin.so
+%%PYTHON_SITELIBDIR%%/pygsl/testing/multimin.so
+%%PYTHON_SITELIBDIR%%/pygsl/testing/multiroot.so
+%%PYTHON_SITELIBDIR%%/pygsl/testing/odeiv.so
+%%PYTHON_SITELIBDIR%%/pygsl/testing/roots.so
+%%PYTHON_SITELIBDIR%%/pygsl/testing/sf.py
+%%PYTHON_SITELIBDIR%%/pygsl/testing/sf.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/testing/sf.pyo
+%%PYTHON_SITELIBDIR%%/pygsl/testing/solver.so
+%%PYTHON_SITELIBDIR%%/pygsl/wavelet.py
+%%PYTHON_SITELIBDIR%%/pygsl/wavelet.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/wavelet.pyo
 %%PYTHON_SITELIBDIR%%/pygsl/__block.so
 %%PYTHON_SITELIBDIR%%/pygsl/__callback.so
 %%PYTHON_SITELIBDIR%%/pygsl/__init__.py
@@ -41,7 +107,6 @@
 %%PYTHON_SITELIBDIR%%/pygsl/combination.pyo
 %%PYTHON_SITELIBDIR%%/pygsl/const.so
 %%PYTHON_SITELIBDIR%%/pygsl/deriv.so
-%%PYTHON_SITELIBDIR%%/pygsl/diff.so
 %%PYTHON_SITELIBDIR%%/pygsl/eigen.py
 %%PYTHON_SITELIBDIR%%/pygsl/eigen.pyc
 %%PYTHON_SITELIBDIR%%/pygsl/eigen.pyo
@@ -79,7 +144,6 @@
 %%PYTHON_SITELIBDIR%%/pygsl/math.py
 %%PYTHON_SITELIBDIR%%/pygsl/math.pyc
 %%PYTHON_SITELIBDIR%%/pygsl/math.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/matrix.so
 %%PYTHON_SITELIBDIR%%/pygsl/matrix_pierre.py
 %%PYTHON_SITELIBDIR%%/pygsl/matrix_pierre.pyc
 %%PYTHON_SITELIBDIR%%/pygsl/matrix_pierre.pyo
@@ -141,4 +205,6 @@
 %%PYTHON_SITELIBDIR%%/pygsl/vector.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/pygsl/testing
 @dirrm %%PYTHON_SITELIBDIR%%/pygsl/statistics
+@dirrm %%PYTHON_SITELIBDIR%%/pygsl/gsl_dist
 @dirrm %%PYTHON_SITELIBDIR%%/pygsl
+@dirrm %%PYTHON_INCLUDEDIR%%/pygsl