Make this work with python1.5.

6 files changed, 123 insertions, 102 deletions

diff --git a/math/numpy/Makefile b/math/numpy/Makefile
index 5fad47e58350..bfd8090a7a30 100644
--- a/math/numpy/Makefile
+++ b/math/numpy/Makefile
@@ -3,7 +3,7 @@
 # Date created:		20 April 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1997/05/14 07:38:50 tg Exp $
+# $Id: Makefile,v 1.4 1998/01/21 11:44:57 asami Exp $
 #
 
 DISTNAME=	NumPy
@@ -19,25 +19,23 @@ RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 LIB_DEPENDS=	lapack\\.2\\.:${PORTSDIR}/math/lapack \
 		ranlib\\.1\\.:${PORTSDIR}/math/libranlib
 
-BROKEN=		python upgrade
-
+CONFIGURE_ENV=	PREFIX=${PREFIX}
 ALL_TARGET=	sharedmods
 MAKE_FLAGS+=	'OPT=${CFLAGS}'
 
-PYTHONSCRIPTDIR=	${PREFIX}/share/python1.4
-PYTHONLIBDIR=	${PREFIX}/lib/python1.4/sharedmodules
+PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
 NUMPYDIR=	${PYTHONSCRIPTDIR}/${DISTNAME}
 DOCDIR=		${PREFIX}/share/doc/${DISTNAME}
 
 do-configure:
-	@cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in Makefile
+	@(cd ${WRKSRC} && ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in Makefile)
 
 do-install:
 	@${MKDIR} ${NUMPYDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/*.so ${PYTHONLIBDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/*.so ${NUMPYDIR}
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}/*.py ${NUMPYDIR}
-	@PYTHONPATH=${PYTHONSCRIPTDIR}:${NUMPYDIR} \
-		${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${NUMPYDIR}
+	@${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${NUMPYDIR}
+	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${NUMPYDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCDIR}
diff --git a/math/numpy/pkg-plist b/math/numpy/pkg-plist
index ecb3b22f68e3..82519fb074f0 100644
--- a/math/numpy/pkg-plist
+++ b/math/numpy/pkg-plist
@@ -1,28 +1,37 @@
-lib/python1.4/sharedmodules/fast_umathmodule.so
-lib/python1.4/sharedmodules/fftpack.so
-lib/python1.4/sharedmodules/lapack_litemodule.so
-lib/python1.4/sharedmodules/multiarraymodule.so
-lib/python1.4/sharedmodules/ranlibmodule.so
-lib/python1.4/sharedmodules/umathmodule.so
-share/python1.4/NumPy/ArrayPrinter.py
-share/python1.4/NumPy/ArrayPrinter.pyc
-share/python1.4/NumPy/FFT.py
-share/python1.4/NumPy/FFT.pyc
-share/python1.4/NumPy/LinearAlgebra.py
-share/python1.4/NumPy/LinearAlgebra.pyc
-share/python1.4/NumPy/MLab.py
-share/python1.4/NumPy/MLab.pyc
-share/python1.4/NumPy/Matrix.py
-share/python1.4/NumPy/Matrix.pyc
-share/python1.4/NumPy/Numeric.py
-share/python1.4/NumPy/Numeric.pyc
-share/python1.4/NumPy/Precision.py
-share/python1.4/NumPy/Precision.pyc
-share/python1.4/NumPy/RandomArray.py
-share/python1.4/NumPy/RandomArray.pyc
-share/python1.4/NumPy/UserArray.py
-share/python1.4/NumPy/UserArray.pyc
-@dirrm share/python1.4/NumPy
+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
 share/doc/NumPy/doc.html
 share/doc/NumPy/download.html
diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 5fad47e58350..bfd8090a7a30 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -3,7 +3,7 @@
 # Date created:		20 April 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1997/05/14 07:38:50 tg Exp $
+# $Id: Makefile,v 1.4 1998/01/21 11:44:57 asami Exp $
 #
 
 DISTNAME=	NumPy
@@ -19,25 +19,23 @@ RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 LIB_DEPENDS=	lapack\\.2\\.:${PORTSDIR}/math/lapack \
 		ranlib\\.1\\.:${PORTSDIR}/math/libranlib
 
-BROKEN=		python upgrade
-
+CONFIGURE_ENV=	PREFIX=${PREFIX}
 ALL_TARGET=	sharedmods
 MAKE_FLAGS+=	'OPT=${CFLAGS}'
 
-PYTHONSCRIPTDIR=	${PREFIX}/share/python1.4
-PYTHONLIBDIR=	${PREFIX}/lib/python1.4/sharedmodules
+PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
 NUMPYDIR=	${PYTHONSCRIPTDIR}/${DISTNAME}
 DOCDIR=		${PREFIX}/share/doc/${DISTNAME}
 
 do-configure:
-	@cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in Makefile
+	@(cd ${WRKSRC} && ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in Makefile)
 
 do-install:
 	@${MKDIR} ${NUMPYDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/*.so ${PYTHONLIBDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/*.so ${NUMPYDIR}
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}/*.py ${NUMPYDIR}
-	@PYTHONPATH=${PYTHONSCRIPTDIR}:${NUMPYDIR} \
-		${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${NUMPYDIR}
+	@${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${NUMPYDIR}
+	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${NUMPYDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCDIR}
diff --git a/math/py-numeric/pkg-plist b/math/py-numeric/pkg-plist
index ecb3b22f68e3..82519fb074f0 100644
--- a/math/py-numeric/pkg-plist
+++ b/math/py-numeric/pkg-plist
@@ -1,28 +1,37 @@
-lib/python1.4/sharedmodules/fast_umathmodule.so
-lib/python1.4/sharedmodules/fftpack.so
-lib/python1.4/sharedmodules/lapack_litemodule.so
-lib/python1.4/sharedmodules/multiarraymodule.so
-lib/python1.4/sharedmodules/ranlibmodule.so
-lib/python1.4/sharedmodules/umathmodule.so
-share/python1.4/NumPy/ArrayPrinter.py
-share/python1.4/NumPy/ArrayPrinter.pyc
-share/python1.4/NumPy/FFT.py
-share/python1.4/NumPy/FFT.pyc
-share/python1.4/NumPy/LinearAlgebra.py
-share/python1.4/NumPy/LinearAlgebra.pyc
-share/python1.4/NumPy/MLab.py
-share/python1.4/NumPy/MLab.pyc
-share/python1.4/NumPy/Matrix.py
-share/python1.4/NumPy/Matrix.pyc
-share/python1.4/NumPy/Numeric.py
-share/python1.4/NumPy/Numeric.pyc
-share/python1.4/NumPy/Precision.py
-share/python1.4/NumPy/Precision.pyc
-share/python1.4/NumPy/RandomArray.py
-share/python1.4/NumPy/RandomArray.pyc
-share/python1.4/NumPy/UserArray.py
-share/python1.4/NumPy/UserArray.pyc
-@dirrm share/python1.4/NumPy
+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
 share/doc/NumPy/doc.html
 share/doc/NumPy/download.html
diff --git a/math/py-numeric17/Makefile b/math/py-numeric17/Makefile
index 5fad47e58350..bfd8090a7a30 100644
--- a/math/py-numeric17/Makefile
+++ b/math/py-numeric17/Makefile
@@ -3,7 +3,7 @@
 # Date created:		20 April 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1997/05/14 07:38:50 tg Exp $
+# $Id: Makefile,v 1.4 1998/01/21 11:44:57 asami Exp $
 #
 
 DISTNAME=	NumPy
@@ -19,25 +19,23 @@ RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 LIB_DEPENDS=	lapack\\.2\\.:${PORTSDIR}/math/lapack \
 		ranlib\\.1\\.:${PORTSDIR}/math/libranlib
 
-BROKEN=		python upgrade
-
+CONFIGURE_ENV=	PREFIX=${PREFIX}
 ALL_TARGET=	sharedmods
 MAKE_FLAGS+=	'OPT=${CFLAGS}'
 
-PYTHONSCRIPTDIR=	${PREFIX}/share/python1.4
-PYTHONLIBDIR=	${PREFIX}/lib/python1.4/sharedmodules
+PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
 NUMPYDIR=	${PYTHONSCRIPTDIR}/${DISTNAME}
 DOCDIR=		${PREFIX}/share/doc/${DISTNAME}
 
 do-configure:
-	@cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in Makefile
+	@(cd ${WRKSRC} && ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in Makefile)
 
 do-install:
 	@${MKDIR} ${NUMPYDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/*.so ${PYTHONLIBDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/*.so ${NUMPYDIR}
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}/*.py ${NUMPYDIR}
-	@PYTHONPATH=${PYTHONSCRIPTDIR}:${NUMPYDIR} \
-		${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${NUMPYDIR}
+	@${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${NUMPYDIR}
+	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${NUMPYDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCDIR}
diff --git a/math/py-numeric17/pkg-plist b/math/py-numeric17/pkg-plist
index ecb3b22f68e3..82519fb074f0 100644
--- a/math/py-numeric17/pkg-plist
+++ b/math/py-numeric17/pkg-plist
@@ -1,28 +1,37 @@
-lib/python1.4/sharedmodules/fast_umathmodule.so
-lib/python1.4/sharedmodules/fftpack.so
-lib/python1.4/sharedmodules/lapack_litemodule.so
-lib/python1.4/sharedmodules/multiarraymodule.so
-lib/python1.4/sharedmodules/ranlibmodule.so
-lib/python1.4/sharedmodules/umathmodule.so
-share/python1.4/NumPy/ArrayPrinter.py
-share/python1.4/NumPy/ArrayPrinter.pyc
-share/python1.4/NumPy/FFT.py
-share/python1.4/NumPy/FFT.pyc
-share/python1.4/NumPy/LinearAlgebra.py
-share/python1.4/NumPy/LinearAlgebra.pyc
-share/python1.4/NumPy/MLab.py
-share/python1.4/NumPy/MLab.pyc
-share/python1.4/NumPy/Matrix.py
-share/python1.4/NumPy/Matrix.pyc
-share/python1.4/NumPy/Numeric.py
-share/python1.4/NumPy/Numeric.pyc
-share/python1.4/NumPy/Precision.py
-share/python1.4/NumPy/Precision.pyc
-share/python1.4/NumPy/RandomArray.py
-share/python1.4/NumPy/RandomArray.pyc
-share/python1.4/NumPy/UserArray.py
-share/python1.4/NumPy/UserArray.pyc
-@dirrm share/python1.4/NumPy
+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
 share/doc/NumPy/doc.html
 share/doc/NumPy/download.html