2 files changed, 2 insertions, 220 deletions

diff --git a/math/py-gsl/Makefile b/math/py-gsl/Makefile
index b791d2de81b4..f131e254cc90 100644
--- a/math/py-gsl/Makefile
+++ b/math/py-gsl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gsl
 PORTVERSION=	0.9.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math python
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,10 +17,8 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/core/include/numpy/arrayobject.h:${POR
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/__init__.py:${PORTSDIR}/math/py-numpy
 LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl
 
-PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g}
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	pygsl
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/math/py-gsl/pkg-plist b/math/py-gsl/pkg-plist
deleted file mode 100644
index 3363a6c243d0..000000000000
--- a/math/py-gsl/pkg-plist
+++ /dev/null
@@ -1,216 +0,0 @@
-%%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/_callback_function_test.so
-%%PYTHON_SITELIBDIR%%/pygsl/_sum.so
-%%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/callback_function_test.py
-%%PYTHON_SITELIBDIR%%/pygsl/callback_function_test.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/callback_function_test.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
-%%PYTHON_SITELIBDIR%%/pygsl/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/__poly.so
-%%PYTHON_SITELIBDIR%%/pygsl/_block.py
-%%PYTHON_SITELIBDIR%%/pygsl/_block.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/_block.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/_bspline.so
-%%PYTHON_SITELIBDIR%%/pygsl/_callback.py
-%%PYTHON_SITELIBDIR%%/pygsl/_callback.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/_callback.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/_generic_solver.py
-%%PYTHON_SITELIBDIR%%/pygsl/_generic_solver.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/_generic_solver.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/_gslwrap.so
-%%PYTHON_SITELIBDIR%%/pygsl/_hankel.so
-%%PYTHON_SITELIBDIR%%/pygsl/_mlab.py
-%%PYTHON_SITELIBDIR%%/pygsl/_mlab.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/_mlab.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/_numobj.py
-%%PYTHON_SITELIBDIR%%/pygsl/_numobj.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/_numobj.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/_poly.py
-%%PYTHON_SITELIBDIR%%/pygsl/_poly.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/_poly.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/_qrng.so
-%%PYTHON_SITELIBDIR%%/pygsl/_siman.so
-%%PYTHON_SITELIBDIR%%/pygsl/_transform.so
-%%PYTHON_SITELIBDIR%%/pygsl/blas.py
-%%PYTHON_SITELIBDIR%%/pygsl/blas.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/blas.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/block.py
-%%PYTHON_SITELIBDIR%%/pygsl/block.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/block.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/chebyshev.py
-%%PYTHON_SITELIBDIR%%/pygsl/chebyshev.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/chebyshev.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/combination.py
-%%PYTHON_SITELIBDIR%%/pygsl/combination.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/combination.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/const.so
-%%PYTHON_SITELIBDIR%%/pygsl/deriv.so
-%%PYTHON_SITELIBDIR%%/pygsl/eigen.py
-%%PYTHON_SITELIBDIR%%/pygsl/eigen.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/eigen.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/errors.py
-%%PYTHON_SITELIBDIR%%/pygsl/errors.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/errors.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/errortest.so
-%%PYTHON_SITELIBDIR%%/pygsl/fft.py
-%%PYTHON_SITELIBDIR%%/pygsl/fft.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/fft.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/fit.py
-%%PYTHON_SITELIBDIR%%/pygsl/fit.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/fit.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/gsl_function.py
-%%PYTHON_SITELIBDIR%%/pygsl/gsl_function.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/gsl_function.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/gslwrap.py
-%%PYTHON_SITELIBDIR%%/pygsl/gslwrap.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/gslwrap.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/hankel.py
-%%PYTHON_SITELIBDIR%%/pygsl/hankel.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/hankel.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/histogram.so
-%%PYTHON_SITELIBDIR%%/pygsl/ieee.so
-%%PYTHON_SITELIBDIR%%/pygsl/init.so
-%%PYTHON_SITELIBDIR%%/pygsl/integrate.py
-%%PYTHON_SITELIBDIR%%/pygsl/integrate.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/integrate.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/interpolation.py
-%%PYTHON_SITELIBDIR%%/pygsl/interpolation.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/interpolation.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/linalg.py
-%%PYTHON_SITELIBDIR%%/pygsl/linalg.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/linalg.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/math.py
-%%PYTHON_SITELIBDIR%%/pygsl/math.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/math.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/matrix_pierre.py
-%%PYTHON_SITELIBDIR%%/pygsl/matrix_pierre.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/matrix_pierre.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/minimize.py
-%%PYTHON_SITELIBDIR%%/pygsl/minimize.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/minimize.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/monte.py
-%%PYTHON_SITELIBDIR%%/pygsl/monte.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/monte.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/multifit.py
-%%PYTHON_SITELIBDIR%%/pygsl/multifit.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/multifit.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/multifit_nlin.py
-%%PYTHON_SITELIBDIR%%/pygsl/multifit_nlin.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/multifit_nlin.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/multimin.so
-%%PYTHON_SITELIBDIR%%/pygsl/multiroots.py
-%%PYTHON_SITELIBDIR%%/pygsl/multiroots.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/multiroots.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/odeiv.py
-%%PYTHON_SITELIBDIR%%/pygsl/odeiv.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/odeiv.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/permutation.py
-%%PYTHON_SITELIBDIR%%/pygsl/permutation.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/permutation.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/poly.py
-%%PYTHON_SITELIBDIR%%/pygsl/poly.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/poly.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/qrng.py
-%%PYTHON_SITELIBDIR%%/pygsl/qrng.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/qrng.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/rng.so
-%%PYTHON_SITELIBDIR%%/pygsl/roots.py
-%%PYTHON_SITELIBDIR%%/pygsl/roots.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/roots.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/sf.so
-%%PYTHON_SITELIBDIR%%/pygsl/siman.py
-%%PYTHON_SITELIBDIR%%/pygsl/siman.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/siman.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/spline.py
-%%PYTHON_SITELIBDIR%%/pygsl/spline.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/spline.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/statistics/__init__.py
-%%PYTHON_SITELIBDIR%%/pygsl/statistics/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/statistics/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/statistics/_stat.so
-%%PYTHON_SITELIBDIR%%/pygsl/statistics/char.so
-%%PYTHON_SITELIBDIR%%/pygsl/statistics/double.so
-%%PYTHON_SITELIBDIR%%/pygsl/statistics/float.so
-%%PYTHON_SITELIBDIR%%/pygsl/statistics/int.so
-%%PYTHON_SITELIBDIR%%/pygsl/statistics/long.so
-%%PYTHON_SITELIBDIR%%/pygsl/statistics/short.so
-%%PYTHON_SITELIBDIR%%/pygsl/statistics/uchar.so
-%%PYTHON_SITELIBDIR%%/pygsl/testing/__init__.py
-%%PYTHON_SITELIBDIR%%/pygsl/testing/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pygsl/testing/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pygsl/vector.py
-%%PYTHON_SITELIBDIR%%/pygsl/vector.pyc
-%%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