3 files changed, 62 insertions, 76 deletions

diff --git a/math/py-numeric17/Makefile b/math/py-numeric17/Makefile
index 51524f96f432..8f9236f5500c 100644
--- a/math/py-numeric17/Makefile
+++ b/math/py-numeric17/Makefile
@@ -1,47 +1,36 @@
 # New ports collection makefile for:	numpy
-# Version required:	1.8
+# Version required:	15.2
 # Date created:		20 April 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	LLNLDistribution11
-PKGNAME=	py-numeric-1.8
+DISTNAME=	Numerical-15.2
+PKGNAME=	py-numeric-15.2
 CATEGORIES=	math python
-MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/python/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://downloads.sourceforge.net/
 
 MAINTAINER=	tg@FreeBSD.org
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
+BUILD_DEPENDS=	${PREFIX}/lib/python1.5/site-packages/distutils/core.py:${PORTSDIR}/misc/py-distutils
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/Numerical
-CONFIGURE_ENV=	PREFIX=${PREFIX}
-ALL_TARGET=	sharedmods
-MAKE_FLAGS+=	'OPT=${CFLAGS}'
+DOCDIR=		${PREFIX}/share/doc/py-numeric
+EXAMPLEDIR=	${PREFIX}/share/examples/py-numeric
 
-PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
-NUMPYDIR=	${PYTHONSCRIPTDIR}/site-packages/numerical
-DOCDIR=		${PREFIX}/share/doc/py-numerical
-EXAMPLEDIR=	${PREFIX}/share/examples/py-numerical
+do-build:
+	@(cd ${WRKSRC}; python setup.py build)
 
-do-configure:
-	@(cd ${WRKSRC} && ${CONFIGURE_ENV} python makethis.py)
-
-post-install:
-	@${MKDIR} ${NUMPYDIR}
-	${INSTALL_DATA} ${WRKSRC}/Lib/* ${NUMPYDIR}
-	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${NUMPYDIR}
-	@${ECHO} "numerical" > ${NUMPYDIR}/../numerical.pth
-	@${MKDIR} ${PREFIX}/include/python1.5/numerical
-	${INSTALL_DATA} ${WRKSRC}/Include/*object.h ${PREFIX}/include/python1.5/numerical
+do-install:
+	@(cd ${WRKSRC}; python setup.py install)
 	@${MKDIR} ${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/Demo/* ${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLEDIR}
+	@${MKDIR} ${EXAMPLEDIR}/NumTut
+	${INSTALL_DATA} ${WRKSRC}/Demo/NumTut/* ${EXAMPLEDIR}/NumTut
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/Doc/*.html ${DOCDIR}
+#	@${MKDIR} ${DOCDIR}
+#	${INSTALL_DATA} ${WRKSRC}/Doc/numpy.pdf ${DOCDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/py-numeric17/distinfo b/math/py-numeric17/distinfo
index 8195abb118e7..2ca852137d8b 100644
--- a/math/py-numeric17/distinfo
+++ b/math/py-numeric17/distinfo
@@ -1 +1 @@
-MD5 (LLNLDistribution11.tgz) = 7ce5043ff3ec5d8202170c4d7892aa0e
+MD5 (Numerical-15.2.tar.gz) = d2994036a7065c9e519e11f95e41eaad
diff --git a/math/py-numeric17/pkg-plist b/math/py-numeric17/pkg-plist
index e9df84da6b7a..21a34d29e51a 100644
--- a/math/py-numeric17/pkg-plist
+++ b/math/py-numeric17/pkg-plist
@@ -1,49 +1,46 @@
-include/python1.5/numerical/arrayobject.h
-include/python1.5/numerical/ufuncobject.h
-@dirrm include/python1.5/numerical
-lib/python1.5/site-packages/numerical/ArrayPrinter.py
-lib/python1.5/site-packages/numerical/ArrayPrinter.pyc
-lib/python1.5/site-packages/numerical/ArrayPrinter.pyo
-lib/python1.5/site-packages/numerical/FFT.py
-lib/python1.5/site-packages/numerical/FFT.pyc
-lib/python1.5/site-packages/numerical/FFT.pyo
-lib/python1.5/site-packages/numerical/LinearAlgebra.py
-lib/python1.5/site-packages/numerical/LinearAlgebra.pyc
-lib/python1.5/site-packages/numerical/LinearAlgebra.pyo
-lib/python1.5/site-packages/numerical/MLab.py
-lib/python1.5/site-packages/numerical/MLab.pyc
-lib/python1.5/site-packages/numerical/MLab.pyo
-lib/python1.5/site-packages/numerical/Matrix.py
-lib/python1.5/site-packages/numerical/Matrix.pyc
-lib/python1.5/site-packages/numerical/Matrix.pyo
-lib/python1.5/site-packages/numerical/Numeric.py
-lib/python1.5/site-packages/numerical/Numeric.pyc
-lib/python1.5/site-packages/numerical/Numeric.pyo
-lib/python1.5/site-packages/numerical/Precision.py
-lib/python1.5/site-packages/numerical/Precision.pyc
-lib/python1.5/site-packages/numerical/Precision.pyo
-lib/python1.5/site-packages/numerical/RandomArray.py
-lib/python1.5/site-packages/numerical/RandomArray.pyc
-lib/python1.5/site-packages/numerical/RandomArray.pyo
-lib/python1.5/site-packages/numerical/UserArray.py
-lib/python1.5/site-packages/numerical/UserArray.pyc
-lib/python1.5/site-packages/numerical/UserArray.pyo
-@dirrm lib/python1.5/site-packages/numerical
-lib/python1.5/site-packages/numerical.pth
-lib/python1.5/site-packages/_numpymodule.so
-lib/python1.5/site-packages/fftpack.so
-lib/python1.5/site-packages/lapack_lite.so
-lib/python1.5/site-packages/multiarraymodule.so
-lib/python1.5/site-packages/ranlib.so
-lib/python1.5/site-packages/umathmodule.so
+include/python1.5/Numeric/arrayobject.h
+include/python1.5/Numeric/f2c.h
+include/python1.5/Numeric/fftpack.h
+include/python1.5/Numeric/ranlib.h
+include/python1.5/Numeric/ufuncobject.h
+lib/python1.5/site-packages/Numeric/_numpy.so
+lib/python1.5/site-packages/Numeric/ArrayPrinter.py
+lib/python1.5/site-packages/Numeric/ArrayPrinter.pyc
+lib/python1.5/site-packages/Numeric/FFT.py
+lib/python1.5/site-packages/Numeric/FFT.pyc
+lib/python1.5/site-packages/Numeric/LinearAlgebra.py
+lib/python1.5/site-packages/Numeric/LinearAlgebra.pyc
+lib/python1.5/site-packages/Numeric/MLab.py
+lib/python1.5/site-packages/Numeric/MLab.pyc
+lib/python1.5/site-packages/Numeric/Matrix.py
+lib/python1.5/site-packages/Numeric/Matrix.pyc
+lib/python1.5/site-packages/Numeric/Numeric.py
+lib/python1.5/site-packages/Numeric/Numeric.pyc
+lib/python1.5/site-packages/Numeric/Precision.py
+lib/python1.5/site-packages/Numeric/Precision.pyc
+lib/python1.5/site-packages/Numeric/RandomArray.py
+lib/python1.5/site-packages/Numeric/RandomArray.pyc
+lib/python1.5/site-packages/Numeric/UserArray.py
+lib/python1.5/site-packages/Numeric/UserArray.pyc
+lib/python1.5/site-packages/Numeric/arrayfns.so
+lib/python1.5/site-packages/Numeric/fftpack.so
+lib/python1.5/site-packages/Numeric/lapack_lite.so
+lib/python1.5/site-packages/Numeric/multiarray.so
+lib/python1.5/site-packages/Numeric/ranlib.so
+lib/python1.5/site-packages/Numeric/umath.so
+lib/python1.5/site-packages/Numeric.pth
 @unexec rmdir %B 2>/dev/null || true
-share/doc/py-numerical/doc.html
-share/doc/py-numerical/home.html
-@dirrm share/doc/py-numerical
-share/examples/py-numerical/life.py
-share/examples/py-numerical/life.pyc
-share/examples/py-numerical/mandelbrot.py
-share/examples/py-numerical/mandelbrot.pyc
-share/examples/py-numerical/sieve.py
-share/examples/py-numerical/sieve.pyc
-@dirrm share/examples/py-numerical
+@comment share/doc/py-numeric/numpy.pdf
+share/examples/py-numeric/NumTut/__init__.py
+share/examples/py-numeric/NumTut/greece.pik
+share/examples/py-numeric/NumTut/mkpic.py
+share/examples/py-numeric/NumTut/testview.py
+share/examples/py-numeric/NumTut/view.py
+share/examples/py-numeric/life.py
+share/examples/py-numeric/mandelbrot.py
+share/examples/py-numeric/sieve.py
+@dirrm lib/python1.5/site-packages/Numeric
+@dirrm share/examples/py-numeric/NumTut
+@dirrm share/examples/py-numeric
+@comment @dirrm share/doc/py-numeric
+@dirrm include/python1.5/Numeric