Upgrade to 1.1.

3 files changed, 49 insertions, 59 deletions

diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index bfd8090a7a30..d78205a532a2 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -1,44 +1,40 @@
 # New ports collection makefile for:	numpy
-# Version required:	1.0b3
+# Version required:	1.1
 # Date created:		20 April 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1998/01/21 11:44:57 asami Exp $
+# $Id: Makefile,v 1.5 1998/01/21 13:07:44 tg Exp $
 #
 
-DISTNAME=	NumPy
-PKGNAME=	numpy-1.0b3
+DISTNAME=	NumPy-11
+PKGNAME=	numpy-1.1
 CATEGORIES=	math
-MASTER_SITES=	http://www.sls.lcs.mit.edu/~jjh/numpy/
-DISTFILES=	NumPy-1.0b3.tar.gz NumPyLib-1.0b2.tar.gz
+MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/python/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	lapack\\.2\\.:${PORTSDIR}/math/lapack \
-		ranlib\\.1\\.:${PORTSDIR}/math/libranlib
 
+WRKSRC=		${WRKDIR}/LLNLDistribution/Numerical
 CONFIGURE_ENV=	PREFIX=${PREFIX}
 ALL_TARGET=	sharedmods
 MAKE_FLAGS+=	'OPT=${CFLAGS}'
 
 PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
-NUMPYDIR=	${PYTHONSCRIPTDIR}/${DISTNAME}
-DOCDIR=		${PREFIX}/share/doc/${DISTNAME}
+NUMPYDIR=	${PREFIX}/lib/python1.5/site-packages
+DOCDIR=		${PREFIX}/share/doc/NumPy
 
 do-configure:
-	@(cd ${WRKSRC} && ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in Makefile)
+	@(cd ${WRKSRC} && ${CONFIGURE_ENV} python makethis.py)
 
-do-install:
-	@${MKDIR} ${NUMPYDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/*.so ${NUMPYDIR}
-	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}/*.py ${NUMPYDIR}
-	@${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${NUMPYDIR}
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/Lib/* ${NUMPYDIR}
 	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${NUMPYDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/Doc/*.html ${DOCDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/py-numeric/distinfo b/math/py-numeric/distinfo
index 30670a197662..92e2eb9f77c1 100644
--- a/math/py-numeric/distinfo
+++ b/math/py-numeric/distinfo
@@ -1,2 +1 @@
-MD5 (NumPy-1.0b3.tar.gz) = d8917963148c059436c529e717cb0790
-MD5 (NumPyLib-1.0b2.tar.gz) = 0517f4bc112e3d6515fcdf1b5c079d23
+MD5 (NumPy-11.tgz) = c6ad8ba18ea6dd8836e6374bb2dd2a0d
diff --git a/math/py-numeric/pkg-plist b/math/py-numeric/pkg-plist
index 82519fb074f0..a2de915d61dd 100644
--- a/math/py-numeric/pkg-plist
+++ b/math/py-numeric/pkg-plist
@@ -1,43 +1,38 @@
-lib/python1.5/NumPy/fast_umathmodule.so
-lib/python1.5/NumPy/fftpack.so
-lib/python1.5/NumPy/lapack_litemodule.so
-lib/python1.5/NumPy/multiarraymodule.so
-lib/python1.5/NumPy/ranlibmodule.so
-lib/python1.5/NumPy/umathmodule.so
-lib/python1.5/NumPy/ArrayPrinter.py
-lib/python1.5/NumPy/ArrayPrinter.pyc
-lib/python1.5/NumPy/ArrayPrinter.pyo
-lib/python1.5/NumPy/FFT.py
-lib/python1.5/NumPy/FFT.pyc
-lib/python1.5/NumPy/FFT.pyo
-lib/python1.5/NumPy/LinearAlgebra.py
-lib/python1.5/NumPy/LinearAlgebra.pyc
-lib/python1.5/NumPy/LinearAlgebra.pyo
-lib/python1.5/NumPy/MLab.py
-lib/python1.5/NumPy/MLab.pyc
-lib/python1.5/NumPy/MLab.pyo
-lib/python1.5/NumPy/Matrix.py
-lib/python1.5/NumPy/Matrix.pyc
-lib/python1.5/NumPy/Matrix.pyo
-lib/python1.5/NumPy/Numeric.py
-lib/python1.5/NumPy/Numeric.pyc
-lib/python1.5/NumPy/Numeric.pyo
-lib/python1.5/NumPy/Precision.py
-lib/python1.5/NumPy/Precision.pyc
-lib/python1.5/NumPy/Precision.pyo
-lib/python1.5/NumPy/RandomArray.py
-lib/python1.5/NumPy/RandomArray.pyc
-lib/python1.5/NumPy/RandomArray.pyo
-lib/python1.5/NumPy/UserArray.py
-lib/python1.5/NumPy/UserArray.pyc
-lib/python1.5/NumPy/UserArray.pyo
-@dirrm lib/python1.5/NumPy
-share/doc/NumPy/contributions.html
+lib/python1.5/site-packages/_numpymodule.so
+lib/python1.5/site-packages/fast_umathmodule.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
+lib/python1.5/site-packages/ArrayPrinter.py
+lib/python1.5/site-packages/ArrayPrinter.pyc
+lib/python1.5/site-packages/ArrayPrinter.pyo
+lib/python1.5/site-packages/FFT.py
+lib/python1.5/site-packages/FFT.pyc
+lib/python1.5/site-packages/FFT.pyo
+lib/python1.5/site-packages/LinearAlgebra.py
+lib/python1.5/site-packages/LinearAlgebra.pyc
+lib/python1.5/site-packages/LinearAlgebra.pyo
+lib/python1.5/site-packages/MLab.py
+lib/python1.5/site-packages/MLab.pyc
+lib/python1.5/site-packages/MLab.pyo
+lib/python1.5/site-packages/Matrix.py
+lib/python1.5/site-packages/Matrix.pyc
+lib/python1.5/site-packages/Matrix.pyo
+lib/python1.5/site-packages/Numeric.py
+lib/python1.5/site-packages/Numeric.pyc
+lib/python1.5/site-packages/Numeric.pyo
+lib/python1.5/site-packages/Precision.py
+lib/python1.5/site-packages/Precision.pyc
+lib/python1.5/site-packages/Precision.pyo
+lib/python1.5/site-packages/RandomArray.py
+lib/python1.5/site-packages/RandomArray.pyc
+lib/python1.5/site-packages/RandomArray.pyo
+lib/python1.5/site-packages/UserArray.py
+lib/python1.5/site-packages/UserArray.pyc
+lib/python1.5/site-packages/UserArray.pyo
+@dirrm lib/python1.5/site-packages
 share/doc/NumPy/doc.html
-share/doc/NumPy/download.html
-share/doc/NumPy/download1.html
-share/doc/NumPy/extensions.html
 share/doc/NumPy/home.html
-share/doc/NumPy/numpy.html
-share/doc/NumPy/paper.html
 @dirrm share/doc/NumPy