From d2de905d16fba79ad75f3b053edd24d2c64bb56a Mon Sep 17 00:00:00 2001 From: Thomas Gellekum Date: Mon, 4 Sep 2000 12:35:31 +0000 Subject: Upgrade to 16.0. Some parts (patch-Makefile, Makefile mods) taken from a patch set submitted by sobomax. --- math/numpy/Makefile | 26 ++++++++---- math/numpy/distinfo | 2 +- math/numpy/files/patch-Makefile | 25 +++++++++++ math/numpy/files/patch-setup.py | 23 ++++++++++ math/numpy/pkg-plist | 78 +++++++++++++++++++--------------- math/py-numeric/Makefile | 26 ++++++++---- math/py-numeric/distinfo | 2 +- math/py-numeric/files/patch-Makefile | 25 +++++++++++ math/py-numeric/files/patch-setup.py | 23 ++++++++++ math/py-numeric/pkg-plist | 78 +++++++++++++++++++--------------- math/py-numeric17/Makefile | 26 ++++++++---- math/py-numeric17/distinfo | 2 +- math/py-numeric17/files/patch-Makefile | 25 +++++++++++ math/py-numeric17/files/patch-setup.py | 23 ++++++++++ math/py-numeric17/pkg-plist | 78 +++++++++++++++++++--------------- 15 files changed, 330 insertions(+), 132 deletions(-) create mode 100644 math/numpy/files/patch-Makefile create mode 100644 math/numpy/files/patch-setup.py create mode 100644 math/py-numeric/files/patch-Makefile create mode 100644 math/py-numeric/files/patch-setup.py create mode 100644 math/py-numeric17/files/patch-Makefile create mode 100644 math/py-numeric17/files/patch-setup.py (limited to 'math') diff --git a/math/numpy/Makefile b/math/numpy/Makefile index e42838ee283f..142d5fe10eb6 100644 --- a/math/numpy/Makefile +++ b/math/numpy/Makefile @@ -6,27 +6,37 @@ # PORTNAME= numeric -PORTVERSION= 15.3 +PORTVERSION= 16.0 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= numpy PKGNAMEPREFIX= py- -DISTNAME= Numerical-${PORTVERSION} -EXTRACT_SUFX= .tgz +DISTNAME= Numeric-${PORTVERSION} MAINTAINER= tg@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/lib/python1.5/site-packages/distutils/core.py:${PORTSDIR}/misc/py-distutils +BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ + ${PYDISTUTILS} +LIB_DEPENDS= lapack.3:${PORTSDIR}/math/lapack \ + blas.2:${PORTSDIR}/math/lapack RUN_DEPENDS= python:${PORTSDIR}/lang/python +MAKE_ENV= BLASLIBDIR=${LOCALBASE}/lib LAPACKLIBDIR=${LOCALBASE}/lib +PLIST_SUB= PYVERSION="python${PYVERSION}" + DOCDIR= ${PREFIX}/share/doc/py-numeric EXAMPLEDIR= ${PREFIX}/share/examples/py-numeric +PYVERSION!= python -c 'import string, sys; \ + print string.split(sys.version)[0][:3]' \ + || echo "1.5" -do-build: - @(cd ${WRKSRC}; python setup.py build) +.if ${PYVERSION} == "2.0" +PYDISTUTILS= ${LOCALBASE}/lib/python${PYVERSION}/distutils/core.py:${PORTSDIR}/lang/python +.else +PYDISTUTILS= ${LOCALBASE}/lib/python${PYVERSION}/site-packages/distutils/core.py:${PORTSDIR}/misc/py-distutils +.endif -do-install: - @(cd ${WRKSRC}; python setup.py install) +post-install: @${MKDIR} ${EXAMPLEDIR} ${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLEDIR} @${MKDIR} ${EXAMPLEDIR}/NumTut diff --git a/math/numpy/distinfo b/math/numpy/distinfo index fad95275d889..91380954e1df 100644 --- a/math/numpy/distinfo +++ b/math/numpy/distinfo @@ -1 +1 @@ -MD5 (Numerical-15.3.tgz) = 717b48135295952a176bcc1f72c8e12b +MD5 (Numeric-16.0.tar.gz) = 0627665fd87a3b8bc77bced7c62db4fa diff --git a/math/numpy/files/patch-Makefile b/math/numpy/files/patch-Makefile new file mode 100644 index 000000000000..6512ba0c12ad --- /dev/null +++ b/math/numpy/files/patch-Makefile @@ -0,0 +1,25 @@ +--- Makefile 2000/08/31 17:23:34 1.1 ++++ Makefile 2000/08/31 17:35:38 +@@ -5,8 +5,20 @@ + @echo "Currently that is:" + @which python + +-all: MA RNG FFT ++all:: main MA RNG FFT ++ ++main: ++ python setup.py build + + MA RNG FFT: +- (cd Packages/$@; python setup.py install) ++ (cd Packages/$@; mkdir -p Include ; ln -sf ../../../Include Include/Numeric; python setup.py build) ++ ++install:: main_install MA_install RNG_install FFT_install ++ ++main_install: ++ python setup.py install ++ ++MA_install RNG_install FFT_install: ++ (cd Packages/${@:S/_install//}; python setup.py install) ++ + diff --git a/math/numpy/files/patch-setup.py b/math/numpy/files/patch-setup.py new file mode 100644 index 000000000000..69822451bcce --- /dev/null +++ b/math/numpy/files/patch-setup.py @@ -0,0 +1,23 @@ +--- setup.py.orig Mon Aug 28 13:49:52 2000 ++++ setup.py Thu Aug 31 17:48:46 2000 +@@ -21,9 +21,17 @@ + + + # Locate the directories in which the BLAS and LAPACK are located. +-# if you know where they are, put it here: +-BLASLIBDIR = None +-LAPACKLIBDIR = None ++# if you know where they are, pass them via your environment or edit ++# the except: case. ++try: ++ BLASLIBDIR = os.environ['BLASLIBDIR'] ++except KeyError: ++ BLASLIBDIR = None ++try: ++ LAPACKLIBDIR = os.environ['LAPACKLIBDIR'] ++except KeyError: ++ LAPACKLIBDIR = None ++ + # places to look and what to look for + POSSIBLE_DIRECTORIES = ['/usr/local/lib', '/usr/lib', 'lapack_lite'] + if sys.platform == 'win32': diff --git a/math/numpy/pkg-plist b/math/numpy/pkg-plist index e679111acfbe..1eb96e6e474a 100644 --- a/math/numpy/pkg-plist +++ b/math/numpy/pkg-plist @@ -1,36 +1,41 @@ -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/MA.py -lib/python1.5/site-packages/Numeric/MA.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 +include/%%PYVERSION%%/Numeric/arrayobject.h +include/%%PYVERSION%%/Numeric/ranlib.h +include/%%PYVERSION%%/Numeric/ufuncobject.h +lib/%%PYVERSION%%/site-packages/FFT/FFT.py +lib/%%PYVERSION%%/site-packages/FFT/FFT.pyc +lib/%%PYVERSION%%/site-packages/MA/MA.py +lib/%%PYVERSION%%/site-packages/MA/MA.pyc +lib/%%PYVERSION%%/site-packages/MA/__init__.py +lib/%%PYVERSION%%/site-packages/MA/__init__.pyc +lib/%%PYVERSION%%/site-packages/Numeric.pth +lib/%%PYVERSION%%/site-packages/Numeric/ArrayPrinter.py +lib/%%PYVERSION%%/site-packages/Numeric/ArrayPrinter.pyc +lib/%%PYVERSION%%/site-packages/Numeric/LinearAlgebra.py +lib/%%PYVERSION%%/site-packages/Numeric/LinearAlgebra.pyc +lib/%%PYVERSION%%/site-packages/Numeric/MLab.py +lib/%%PYVERSION%%/site-packages/Numeric/MLab.pyc +lib/%%PYVERSION%%/site-packages/Numeric/Matrix.py +lib/%%PYVERSION%%/site-packages/Numeric/Matrix.pyc +lib/%%PYVERSION%%/site-packages/Numeric/Numeric.py +lib/%%PYVERSION%%/site-packages/Numeric/Numeric.pyc +lib/%%PYVERSION%%/site-packages/Numeric/Precision.py +lib/%%PYVERSION%%/site-packages/Numeric/Precision.pyc +lib/%%PYVERSION%%/site-packages/Numeric/RandomArray.py +lib/%%PYVERSION%%/site-packages/Numeric/RandomArray.pyc +lib/%%PYVERSION%%/site-packages/Numeric/UserArray.py +lib/%%PYVERSION%%/site-packages/Numeric/UserArray.pyc +lib/%%PYVERSION%%/site-packages/Numeric/_numpy.so +lib/%%PYVERSION%%/site-packages/Numeric/arrayfns.so +lib/%%PYVERSION%%/site-packages/Numeric/lapack_lite.so +lib/%%PYVERSION%%/site-packages/Numeric/multiarray.so +lib/%%PYVERSION%%/site-packages/Numeric/ranlib.so +lib/%%PYVERSION%%/site-packages/Numeric/umath.so +lib/%%PYVERSION%%/site-packages/RNG/RNG.so +lib/%%PYVERSION%%/site-packages/RNG/Statistics.py +lib/%%PYVERSION%%/site-packages/RNG/Statistics.pyc +lib/%%PYVERSION%%/site-packages/RNG/__init__.py +lib/%%PYVERSION%%/site-packages/RNG/__init__.pyc +lib/%%PYVERSION%%/site-packages/fftpack.so @unexec rmdir %B 2>/dev/null || true @comment share/doc/py-numeric/numpy.pdf share/examples/py-numeric/NumTut/__init__.py @@ -41,8 +46,11 @@ 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 +@dirrm lib/%%PYVERSION%%/site-packages/RNG +@dirrm lib/%%PYVERSION%%/site-packages/Numeric +@dirrm lib/%%PYVERSION%%/site-packages/MA +@dirrm lib/%%PYVERSION%%/site-packages/FFT +@dirrm include/%%PYVERSION%%/Numeric diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile index e42838ee283f..142d5fe10eb6 100644 --- a/math/py-numeric/Makefile +++ b/math/py-numeric/Makefile @@ -6,27 +6,37 @@ # PORTNAME= numeric -PORTVERSION= 15.3 +PORTVERSION= 16.0 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= numpy PKGNAMEPREFIX= py- -DISTNAME= Numerical-${PORTVERSION} -EXTRACT_SUFX= .tgz +DISTNAME= Numeric-${PORTVERSION} MAINTAINER= tg@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/lib/python1.5/site-packages/distutils/core.py:${PORTSDIR}/misc/py-distutils +BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ + ${PYDISTUTILS} +LIB_DEPENDS= lapack.3:${PORTSDIR}/math/lapack \ + blas.2:${PORTSDIR}/math/lapack RUN_DEPENDS= python:${PORTSDIR}/lang/python +MAKE_ENV= BLASLIBDIR=${LOCALBASE}/lib LAPACKLIBDIR=${LOCALBASE}/lib +PLIST_SUB= PYVERSION="python${PYVERSION}" + DOCDIR= ${PREFIX}/share/doc/py-numeric EXAMPLEDIR= ${PREFIX}/share/examples/py-numeric +PYVERSION!= python -c 'import string, sys; \ + print string.split(sys.version)[0][:3]' \ + || echo "1.5" -do-build: - @(cd ${WRKSRC}; python setup.py build) +.if ${PYVERSION} == "2.0" +PYDISTUTILS= ${LOCALBASE}/lib/python${PYVERSION}/distutils/core.py:${PORTSDIR}/lang/python +.else +PYDISTUTILS= ${LOCALBASE}/lib/python${PYVERSION}/site-packages/distutils/core.py:${PORTSDIR}/misc/py-distutils +.endif -do-install: - @(cd ${WRKSRC}; python setup.py install) +post-install: @${MKDIR} ${EXAMPLEDIR} ${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLEDIR} @${MKDIR} ${EXAMPLEDIR}/NumTut diff --git a/math/py-numeric/distinfo b/math/py-numeric/distinfo index fad95275d889..91380954e1df 100644 --- a/math/py-numeric/distinfo +++ b/math/py-numeric/distinfo @@ -1 +1 @@ -MD5 (Numerical-15.3.tgz) = 717b48135295952a176bcc1f72c8e12b +MD5 (Numeric-16.0.tar.gz) = 0627665fd87a3b8bc77bced7c62db4fa diff --git a/math/py-numeric/files/patch-Makefile b/math/py-numeric/files/patch-Makefile new file mode 100644 index 000000000000..6512ba0c12ad --- /dev/null +++ b/math/py-numeric/files/patch-Makefile @@ -0,0 +1,25 @@ +--- Makefile 2000/08/31 17:23:34 1.1 ++++ Makefile 2000/08/31 17:35:38 +@@ -5,8 +5,20 @@ + @echo "Currently that is:" + @which python + +-all: MA RNG FFT ++all:: main MA RNG FFT ++ ++main: ++ python setup.py build + + MA RNG FFT: +- (cd Packages/$@; python setup.py install) ++ (cd Packages/$@; mkdir -p Include ; ln -sf ../../../Include Include/Numeric; python setup.py build) ++ ++install:: main_install MA_install RNG_install FFT_install ++ ++main_install: ++ python setup.py install ++ ++MA_install RNG_install FFT_install: ++ (cd Packages/${@:S/_install//}; python setup.py install) ++ + diff --git a/math/py-numeric/files/patch-setup.py b/math/py-numeric/files/patch-setup.py new file mode 100644 index 000000000000..69822451bcce --- /dev/null +++ b/math/py-numeric/files/patch-setup.py @@ -0,0 +1,23 @@ +--- setup.py.orig Mon Aug 28 13:49:52 2000 ++++ setup.py Thu Aug 31 17:48:46 2000 +@@ -21,9 +21,17 @@ + + + # Locate the directories in which the BLAS and LAPACK are located. +-# if you know where they are, put it here: +-BLASLIBDIR = None +-LAPACKLIBDIR = None ++# if you know where they are, pass them via your environment or edit ++# the except: case. ++try: ++ BLASLIBDIR = os.environ['BLASLIBDIR'] ++except KeyError: ++ BLASLIBDIR = None ++try: ++ LAPACKLIBDIR = os.environ['LAPACKLIBDIR'] ++except KeyError: ++ LAPACKLIBDIR = None ++ + # places to look and what to look for + POSSIBLE_DIRECTORIES = ['/usr/local/lib', '/usr/lib', 'lapack_lite'] + if sys.platform == 'win32': diff --git a/math/py-numeric/pkg-plist b/math/py-numeric/pkg-plist index e679111acfbe..1eb96e6e474a 100644 --- a/math/py-numeric/pkg-plist +++ b/math/py-numeric/pkg-plist @@ -1,36 +1,41 @@ -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/MA.py -lib/python1.5/site-packages/Numeric/MA.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 +include/%%PYVERSION%%/Numeric/arrayobject.h +include/%%PYVERSION%%/Numeric/ranlib.h +include/%%PYVERSION%%/Numeric/ufuncobject.h +lib/%%PYVERSION%%/site-packages/FFT/FFT.py +lib/%%PYVERSION%%/site-packages/FFT/FFT.pyc +lib/%%PYVERSION%%/site-packages/MA/MA.py +lib/%%PYVERSION%%/site-packages/MA/MA.pyc +lib/%%PYVERSION%%/site-packages/MA/__init__.py +lib/%%PYVERSION%%/site-packages/MA/__init__.pyc +lib/%%PYVERSION%%/site-packages/Numeric.pth +lib/%%PYVERSION%%/site-packages/Numeric/ArrayPrinter.py +lib/%%PYVERSION%%/site-packages/Numeric/ArrayPrinter.pyc +lib/%%PYVERSION%%/site-packages/Numeric/LinearAlgebra.py +lib/%%PYVERSION%%/site-packages/Numeric/LinearAlgebra.pyc +lib/%%PYVERSION%%/site-packages/Numeric/MLab.py +lib/%%PYVERSION%%/site-packages/Numeric/MLab.pyc +lib/%%PYVERSION%%/site-packages/Numeric/Matrix.py +lib/%%PYVERSION%%/site-packages/Numeric/Matrix.pyc +lib/%%PYVERSION%%/site-packages/Numeric/Numeric.py +lib/%%PYVERSION%%/site-packages/Numeric/Numeric.pyc +lib/%%PYVERSION%%/site-packages/Numeric/Precision.py +lib/%%PYVERSION%%/site-packages/Numeric/Precision.pyc +lib/%%PYVERSION%%/site-packages/Numeric/RandomArray.py +lib/%%PYVERSION%%/site-packages/Numeric/RandomArray.pyc +lib/%%PYVERSION%%/site-packages/Numeric/UserArray.py +lib/%%PYVERSION%%/site-packages/Numeric/UserArray.pyc +lib/%%PYVERSION%%/site-packages/Numeric/_numpy.so +lib/%%PYVERSION%%/site-packages/Numeric/arrayfns.so +lib/%%PYVERSION%%/site-packages/Numeric/lapack_lite.so +lib/%%PYVERSION%%/site-packages/Numeric/multiarray.so +lib/%%PYVERSION%%/site-packages/Numeric/ranlib.so +lib/%%PYVERSION%%/site-packages/Numeric/umath.so +lib/%%PYVERSION%%/site-packages/RNG/RNG.so +lib/%%PYVERSION%%/site-packages/RNG/Statistics.py +lib/%%PYVERSION%%/site-packages/RNG/Statistics.pyc +lib/%%PYVERSION%%/site-packages/RNG/__init__.py +lib/%%PYVERSION%%/site-packages/RNG/__init__.pyc +lib/%%PYVERSION%%/site-packages/fftpack.so @unexec rmdir %B 2>/dev/null || true @comment share/doc/py-numeric/numpy.pdf share/examples/py-numeric/NumTut/__init__.py @@ -41,8 +46,11 @@ 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 +@dirrm lib/%%PYVERSION%%/site-packages/RNG +@dirrm lib/%%PYVERSION%%/site-packages/Numeric +@dirrm lib/%%PYVERSION%%/site-packages/MA +@dirrm lib/%%PYVERSION%%/site-packages/FFT +@dirrm include/%%PYVERSION%%/Numeric diff --git a/math/py-numeric17/Makefile b/math/py-numeric17/Makefile index e42838ee283f..142d5fe10eb6 100644 --- a/math/py-numeric17/Makefile +++ b/math/py-numeric17/Makefile @@ -6,27 +6,37 @@ # PORTNAME= numeric -PORTVERSION= 15.3 +PORTVERSION= 16.0 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= numpy PKGNAMEPREFIX= py- -DISTNAME= Numerical-${PORTVERSION} -EXTRACT_SUFX= .tgz +DISTNAME= Numeric-${PORTVERSION} MAINTAINER= tg@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/lib/python1.5/site-packages/distutils/core.py:${PORTSDIR}/misc/py-distutils +BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ + ${PYDISTUTILS} +LIB_DEPENDS= lapack.3:${PORTSDIR}/math/lapack \ + blas.2:${PORTSDIR}/math/lapack RUN_DEPENDS= python:${PORTSDIR}/lang/python +MAKE_ENV= BLASLIBDIR=${LOCALBASE}/lib LAPACKLIBDIR=${LOCALBASE}/lib +PLIST_SUB= PYVERSION="python${PYVERSION}" + DOCDIR= ${PREFIX}/share/doc/py-numeric EXAMPLEDIR= ${PREFIX}/share/examples/py-numeric +PYVERSION!= python -c 'import string, sys; \ + print string.split(sys.version)[0][:3]' \ + || echo "1.5" -do-build: - @(cd ${WRKSRC}; python setup.py build) +.if ${PYVERSION} == "2.0" +PYDISTUTILS= ${LOCALBASE}/lib/python${PYVERSION}/distutils/core.py:${PORTSDIR}/lang/python +.else +PYDISTUTILS= ${LOCALBASE}/lib/python${PYVERSION}/site-packages/distutils/core.py:${PORTSDIR}/misc/py-distutils +.endif -do-install: - @(cd ${WRKSRC}; python setup.py install) +post-install: @${MKDIR} ${EXAMPLEDIR} ${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLEDIR} @${MKDIR} ${EXAMPLEDIR}/NumTut diff --git a/math/py-numeric17/distinfo b/math/py-numeric17/distinfo index fad95275d889..91380954e1df 100644 --- a/math/py-numeric17/distinfo +++ b/math/py-numeric17/distinfo @@ -1 +1 @@ -MD5 (Numerical-15.3.tgz) = 717b48135295952a176bcc1f72c8e12b +MD5 (Numeric-16.0.tar.gz) = 0627665fd87a3b8bc77bced7c62db4fa diff --git a/math/py-numeric17/files/patch-Makefile b/math/py-numeric17/files/patch-Makefile new file mode 100644 index 000000000000..6512ba0c12ad --- /dev/null +++ b/math/py-numeric17/files/patch-Makefile @@ -0,0 +1,25 @@ +--- Makefile 2000/08/31 17:23:34 1.1 ++++ Makefile 2000/08/31 17:35:38 +@@ -5,8 +5,20 @@ + @echo "Currently that is:" + @which python + +-all: MA RNG FFT ++all:: main MA RNG FFT ++ ++main: ++ python setup.py build + + MA RNG FFT: +- (cd Packages/$@; python setup.py install) ++ (cd Packages/$@; mkdir -p Include ; ln -sf ../../../Include Include/Numeric; python setup.py build) ++ ++install:: main_install MA_install RNG_install FFT_install ++ ++main_install: ++ python setup.py install ++ ++MA_install RNG_install FFT_install: ++ (cd Packages/${@:S/_install//}; python setup.py install) ++ + diff --git a/math/py-numeric17/files/patch-setup.py b/math/py-numeric17/files/patch-setup.py new file mode 100644 index 000000000000..69822451bcce --- /dev/null +++ b/math/py-numeric17/files/patch-setup.py @@ -0,0 +1,23 @@ +--- setup.py.orig Mon Aug 28 13:49:52 2000 ++++ setup.py Thu Aug 31 17:48:46 2000 +@@ -21,9 +21,17 @@ + + + # Locate the directories in which the BLAS and LAPACK are located. +-# if you know where they are, put it here: +-BLASLIBDIR = None +-LAPACKLIBDIR = None ++# if you know where they are, pass them via your environment or edit ++# the except: case. ++try: ++ BLASLIBDIR = os.environ['BLASLIBDIR'] ++except KeyError: ++ BLASLIBDIR = None ++try: ++ LAPACKLIBDIR = os.environ['LAPACKLIBDIR'] ++except KeyError: ++ LAPACKLIBDIR = None ++ + # places to look and what to look for + POSSIBLE_DIRECTORIES = ['/usr/local/lib', '/usr/lib', 'lapack_lite'] + if sys.platform == 'win32': diff --git a/math/py-numeric17/pkg-plist b/math/py-numeric17/pkg-plist index e679111acfbe..1eb96e6e474a 100644 --- a/math/py-numeric17/pkg-plist +++ b/math/py-numeric17/pkg-plist @@ -1,36 +1,41 @@ -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/MA.py -lib/python1.5/site-packages/Numeric/MA.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 +include/%%PYVERSION%%/Numeric/arrayobject.h +include/%%PYVERSION%%/Numeric/ranlib.h +include/%%PYVERSION%%/Numeric/ufuncobject.h +lib/%%PYVERSION%%/site-packages/FFT/FFT.py +lib/%%PYVERSION%%/site-packages/FFT/FFT.pyc +lib/%%PYVERSION%%/site-packages/MA/MA.py +lib/%%PYVERSION%%/site-packages/MA/MA.pyc +lib/%%PYVERSION%%/site-packages/MA/__init__.py +lib/%%PYVERSION%%/site-packages/MA/__init__.pyc +lib/%%PYVERSION%%/site-packages/Numeric.pth +lib/%%PYVERSION%%/site-packages/Numeric/ArrayPrinter.py +lib/%%PYVERSION%%/site-packages/Numeric/ArrayPrinter.pyc +lib/%%PYVERSION%%/site-packages/Numeric/LinearAlgebra.py +lib/%%PYVERSION%%/site-packages/Numeric/LinearAlgebra.pyc +lib/%%PYVERSION%%/site-packages/Numeric/MLab.py +lib/%%PYVERSION%%/site-packages/Numeric/MLab.pyc +lib/%%PYVERSION%%/site-packages/Numeric/Matrix.py +lib/%%PYVERSION%%/site-packages/Numeric/Matrix.pyc +lib/%%PYVERSION%%/site-packages/Numeric/Numeric.py +lib/%%PYVERSION%%/site-packages/Numeric/Numeric.pyc +lib/%%PYVERSION%%/site-packages/Numeric/Precision.py +lib/%%PYVERSION%%/site-packages/Numeric/Precision.pyc +lib/%%PYVERSION%%/site-packages/Numeric/RandomArray.py +lib/%%PYVERSION%%/site-packages/Numeric/RandomArray.pyc +lib/%%PYVERSION%%/site-packages/Numeric/UserArray.py +lib/%%PYVERSION%%/site-packages/Numeric/UserArray.pyc +lib/%%PYVERSION%%/site-packages/Numeric/_numpy.so +lib/%%PYVERSION%%/site-packages/Numeric/arrayfns.so +lib/%%PYVERSION%%/site-packages/Numeric/lapack_lite.so +lib/%%PYVERSION%%/site-packages/Numeric/multiarray.so +lib/%%PYVERSION%%/site-packages/Numeric/ranlib.so +lib/%%PYVERSION%%/site-packages/Numeric/umath.so +lib/%%PYVERSION%%/site-packages/RNG/RNG.so +lib/%%PYVERSION%%/site-packages/RNG/Statistics.py +lib/%%PYVERSION%%/site-packages/RNG/Statistics.pyc +lib/%%PYVERSION%%/site-packages/RNG/__init__.py +lib/%%PYVERSION%%/site-packages/RNG/__init__.pyc +lib/%%PYVERSION%%/site-packages/fftpack.so @unexec rmdir %B 2>/dev/null || true @comment share/doc/py-numeric/numpy.pdf share/examples/py-numeric/NumTut/__init__.py @@ -41,8 +46,11 @@ 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 +@dirrm lib/%%PYVERSION%%/site-packages/RNG +@dirrm lib/%%PYVERSION%%/site-packages/Numeric +@dirrm lib/%%PYVERSION%%/site-packages/MA +@dirrm lib/%%PYVERSION%%/site-packages/FFT +@dirrm include/%%PYVERSION%%/Numeric -- cgit