Date: Tue, 28 Aug 2007 08:54:41 +0800 (CST) From: Li-Lun Wang (Leland Wang) <llwang@infor.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: db@FreeBSD.org Subject: ports/115890: [patch] Update port: math/py-numpy to 1.0.3.1, science/py-scipy to 0.5.2.1 Message-ID: <20070828005441.22108178EB@infor.ck.tp.edu.tw> Resent-Message-ID: <200708280120.l7S1K1EZ086603@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 115890 >Category: ports >Synopsis: [patch] Update port: math/py-numpy to 1.0.3.1, science/py-scipy to 0.5.2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Aug 28 01:20:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Li-Lun Wang (Leland Wang) >Release: FreeBSD 6.2-RELEASE-p7 i386 >Organization: >Environment: System: FreeBSD Athena.infor.org 6.2-RELEASE-p7 FreeBSD 6.2-RELEASE-p7 #7: Sat Aug 4 19:58:55 TST 2007 root@Athena.infor.org:/usr/obj/usr/src/sys/Athena i386 >Description: - Update math/py-numpy to 1.0.3.1,1 - Update science/py-scipy to 0.5.2.1 - Fix build for scipy - Supersedes ports/113227 - Maintainer CC'd math/py-numpy: Changed files: - Makefile - distinfo - files/patch-numpy-core-include-numpy-ufuncobject.h - files/patch-numpy-distutils-fcompiler-__init__.py I added -fPIC to compile_switch to work around build of fftpack in scipy on amd64. A better fix would be to set pic_flags instead, and have scipy build a shared object for dfftpack instead a static archive, but I didn't figure out how. - files/patch-numpy-distutils-fcompiler-gnu.py - pkg-plist science/py-scipy: Changed files: - Makefile - distinfo Added files: - files/patch-Lib-fftpack-setup.py Fix build of dfftpack. >How-To-Repeat: >Fix: diff -urN py-numpy.orig/Makefile py-numpy/Makefile --- py-numpy.orig/Makefile 2007-07-28 17:13:03.000000000 -0500 +++ py-numpy/Makefile 2007-08-27 15:20:45.000000000 -0500 @@ -6,7 +6,7 @@ # PORTNAME= numpy -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3.1 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= http://numpy.scipy.org/:doc \ diff -urN py-numpy.orig/distinfo py-numpy/distinfo --- py-numpy.orig/distinfo 2007-06-24 22:47:18.000000000 -0500 +++ py-numpy/distinfo 2007-08-27 15:04:28.000000000 -0500 @@ -1,6 +1,6 @@ -MD5 (numpy-1.0.2.tar.gz) = 8be83678056ae31bfe641d35bbc181f4 -SHA256 (numpy-1.0.2.tar.gz) = 1f253c7482895f7ec95cb57f5f412eafcf3be23eaebdb7d1b7bbcc2c8a65c226 -SIZE (numpy-1.0.2.tar.gz) = 1400121 +MD5 (numpy-1.0.3.1.tar.gz) = 3358c772f0d51dcfd78c5ee23126aff9 +SHA256 (numpy-1.0.3.1.tar.gz) = 15999e7c0231a5aa1cab6347c9a512cddb31e8a014c9e0232bbf6fb4849fe18d +SIZE (numpy-1.0.3.1.tar.gz) = 1500255 MD5 (numpy.pdf) = 258b3758645568724ab1a3ead67db78a SHA256 (numpy.pdf) = 1005b55ee84265be490d8270b4e464e11f59455c220da822f6901342f5fe804f SIZE (numpy.pdf) = 1234555 diff -urN py-numpy.orig/files/patch-numpy-core-include-numpy-ufuncobject.h py-numpy/files/patch-numpy-core-include-numpy-ufuncobject.h --- py-numpy.orig/files/patch-numpy-core-include-numpy-ufuncobject.h 2006-12-30 10:02:58.000000000 -0600 +++ py-numpy/files/patch-numpy-core-include-numpy-ufuncobject.h 2007-08-27 15:09:20.000000000 -0500 @@ -1,5 +1,5 @@ ---- numpy/core/include/numpy/ufuncobject.h.orig Mon Oct 23 15:13:40 2006 -+++ numpy/core/include/numpy/ufuncobject.h Sat Dec 9 22:51:47 2006 +--- numpy/core/include/numpy/ufuncobject.h.orig 2007-08-20 21:00:58.000000000 -0500 ++++ numpy/core/include/numpy/ufuncobject.h 2007-08-27 15:08:11.000000000 -0500 @@ -262,7 +262,10 @@ /* Solaris --------------------------------------------------------*/ /* --------ignoring SunOS ieee_flags approach, someone else can @@ -16,8 +16,8 @@ (void) fpsetsticky(0); \ } --#elif defined(linux) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) -+#elif defined(linux) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) +-#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) ++#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) -#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) +#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) diff -urN py-numpy.orig/files/patch-numpy-distutils-fcompiler-__init__.py py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py --- py-numpy.orig/files/patch-numpy-distutils-fcompiler-__init__.py 2006-12-30 10:02:58.000000000 -0600 +++ py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py 2007-08-27 19:27:15.000000000 -0500 @@ -1,6 +1,15 @@ ---- numpy/distutils/fcompiler/__init__.py.orig Wed Oct 11 22:28:42 2006 -+++ numpy/distutils/fcompiler/__init__.py Sat Dec 9 22:51:47 2006 -@@ -273,11 +273,7 @@ +--- numpy/distutils/fcompiler/__init__.py.orig 2007-08-20 21:00:55.000000000 -0500 ++++ numpy/distutils/fcompiler/__init__.py 2007-08-27 19:26:14.000000000 -0500 +@@ -78,7 +78,7 @@ + 'ranlib' : None, + } + +- compile_switch = "-c" ++ compile_switch = "-c -fPIC" + object_switch = "-o " # Ending space matters! It will be stripped + # but if it is missing then object_switch + # will be prefixed to object file name by +@@ -278,11 +278,7 @@ f90 = self.__get_cmd('compiler_f90','F90',(conf,'f90exec')) # Temporarily setting f77,f90 compilers so that # version_cmd can use their executables. diff -urN py-numpy.orig/files/patch-numpy-distutils-fcompiler-gnu.py py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py --- py-numpy.orig/files/patch-numpy-distutils-fcompiler-gnu.py 2007-06-25 11:33:24.000000000 -0500 +++ py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py 2007-08-27 15:13:28.000000000 -0500 @@ -1,15 +1,6 @@ ---- numpy/distutils/fcompiler/gnu.py.orig Mon Mar 26 14:27:13 2007 -+++ numpy/distutils/fcompiler/gnu.py Mon Jun 11 11:55:16 2007 -@@ -21,7 +21,7 @@ - # GNU Fortran 0.5.25 20010319 (prerelease) - # Redhat: GNU Fortran (GCC 3.2.2 20030222 (Red Hat Linux 3.2.2-5)) 3.2.2 20030222 (Red Hat Linux 3.2.2-5) - -- for fc_exe in map(find_executable,['g77','f77']): -+ for fc_exe in map(find_executable,['gfortran', 'gfortran42', 'g77','f77']): - if os.path.isfile(fc_exe): - break - executables = { -@@ -47,7 +47,7 @@ +--- numpy/distutils/fcompiler/gnu.py.orig 2007-08-20 21:00:55.000000000 -0500 ++++ numpy/distutils/fcompiler/gnu.py 2007-08-27 15:12:10.000000000 -0500 +@@ -67,12 +67,12 @@ for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']: executables[key].append('-mno-cygwin') @@ -18,12 +9,18 @@ suggested_f90_compiler = 'gnu95' -@@ -258,7 +258,7 @@ - # GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental) - # GNU Fortran (GCC) 4.3.0 20070316 (experimental) + def find_executables(self): +- for fc_exe in [find_executable(c) for c in ['g77','f77']]: ++ for fc_exe in [find_executable(c) for c in ['gfortran', 'gfortran42', 'g77','f77']]: + if os.path.isfile(fc_exe): + break + for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']: +@@ -318,7 +318,7 @@ + g2c = 'gfortran' -- for fc_exe in map(find_executable,['gfortran','f95']): -+ for fc_exe in map(find_executable,['gfortran','gfortran42','f95']): - if os.path.isfile(fc_exe): - break - executables = { + def find_executables(self): +- for fc_exe in [find_executable(c) for c in ['gfortran','f95']]: ++ for fc_exe in [find_executable(c) for c in ['gfortran', 'gfortran42', 'f95']]: + if os.path.isfile(fc_exe): + break + for key in ['version_cmd', 'compiler_f77', 'compiler_f90', diff -urN py-numpy.orig/pkg-plist py-numpy/pkg-plist --- py-numpy.orig/pkg-plist 2007-06-26 18:14:54.000000000 -0500 +++ py-numpy/pkg-plist 2007-08-27 15:20:10.000000000 -0500 @@ -1,7 +1,7 @@ bin/f2py +%%PYTHON_SITELIBDIR%%/numpy-1.0.3.1-py2.5.egg-info %%PYTHON_SITELIBDIR%%/numpy/COMPATIBILITY %%PYTHON_SITELIBDIR%%/numpy/DEV_README.txt -%%PYTHON_SITELIBDIR%%/numpy/DOCSTRING_README.txt %%PYTHON_SITELIBDIR%%/numpy/LICENSE.txt %%PYTHON_SITELIBDIR%%/numpy/README.txt %%PYTHON_SITELIBDIR%%/numpy/THANKS.txt @@ -273,6 +273,7 @@ %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/swig_ext/src/zoo.i %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/swig_ext/tests/test_example.py %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/swig_ext/tests/test_example2.py +%%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_fcompiler_gnu.py %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_misc_util.py %%PYTHON_SITELIBDIR%%/numpy/distutils/unixccompiler.py %%PYTHON_SITELIBDIR%%/numpy/distutils/unixccompiler.pyc @@ -292,18 +293,28 @@ %%PYTHON_SITELIBDIR%%/numpy/doc/pyrex/run_test.py %%PYTHON_SITELIBDIR%%/numpy/doc/pyrex/setup.py %%PYTHON_SITELIBDIR%%/numpy/doc/records.txt -%%PYTHON_SITELIBDIR%%/numpy/doc/simple.py -%%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy_swig.html -%%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy_swig.pdf -%%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy_swig.txt %%PYTHON_SITELIBDIR%%/numpy/doc/swig/Makefile +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Matrix.cxx +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Matrix.h +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Matrix.i %%PYTHON_SITELIBDIR%%/numpy/doc/swig/README -%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Series.i +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Tensor.cxx +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Tensor.h +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Tensor.i +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Vector.cxx +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Vector.h +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Vector.i %%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy.i -%%PYTHON_SITELIBDIR%%/numpy/doc/swig/series.cxx -%%PYTHON_SITELIBDIR%%/numpy/doc/swig/series.h +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy_swig.html +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy_swig.pdf +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy_swig.txt %%PYTHON_SITELIBDIR%%/numpy/doc/swig/setup.py -%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testSeries.py +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testMatrix.py +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testTensor.py +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testVector.py +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testing.html +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testing.pdf +%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testing.txt %%PYTHON_SITELIBDIR%%/numpy/doc/ufuncs.txt %%PYTHON_SITELIBDIR%%/numpy/dual.py %%PYTHON_SITELIBDIR%%/numpy/dual.pyc @@ -405,7 +416,6 @@ %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/LICENSE.txt %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/README.txt %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/THANKS.txt -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/DOCSTRING_README.txt %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/__init__.py %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/__init__.pyc %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/__init__.pyo @@ -415,6 +425,9 @@ %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/main.py %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/main.pyc %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/main.pyo +%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/nary.py +%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/nary.pyc +%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/nary.pyo %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/Fortran2003.py %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/Fortran2003.pyc %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/Fortran2003.pyo @@ -475,21 +488,6 @@ %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/setup.pyo %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/src/F_FUNC.cpp %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/src/pyobj_to_string_len.c -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_derived_scalar.py -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_derived_scalar.pyc -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_derived_scalar.pyo -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_module_module.py -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_module_module.pyc -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_module_module.pyo -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_module_scalar.py -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_module_scalar.pyc -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_module_scalar.pyo -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_scalar_function_in.py -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_scalar_function_in.pyc -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_scalar_function_in.pyo -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_scalar_in_out.py -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_scalar_in_out.pyc -%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_scalar_in_out.pyo %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/wrapper_base.py %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/wrapper_base.pyc %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/wrapper_base.pyo @@ -673,12 +671,12 @@ %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/alter_code2.py %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/alter_code2.pyc %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/alter_code2.pyo -%%PYTHON_SITELIBDIR%%/numpy/oldnumeric/arrayfns.py -%%PYTHON_SITELIBDIR%%/numpy/oldnumeric/arrayfns.pyc -%%PYTHON_SITELIBDIR%%/numpy/oldnumeric/arrayfns.pyo %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/array_printer.py %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/array_printer.pyc %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/array_printer.pyo +%%PYTHON_SITELIBDIR%%/numpy/oldnumeric/arrayfns.py +%%PYTHON_SITELIBDIR%%/numpy/oldnumeric/arrayfns.pyc +%%PYTHON_SITELIBDIR%%/numpy/oldnumeric/arrayfns.pyo %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/compat.py %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/compat.pyc %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/compat.pyo @@ -776,12 +774,12 @@ @dirrm %%PYTHON_SITELIBDIR%%/numpy/linalg @dirrm %%PYTHON_SITELIBDIR%%/numpy/lib/tests @dirrm %%PYTHON_SITELIBDIR%%/numpy/lib -@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser -@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/src -@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/lib @dirrm %%PYTHON_SITELIBDIR%%/numpy/fft/tests @dirrm %%PYTHON_SITELIBDIR%%/numpy/fft @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/src +@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/src +@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser +@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/lib @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/docs/usersguide @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/docs @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py diff -urN py-scipy.orig/Makefile py-scipy/Makefile --- py-scipy.orig/Makefile 2007-07-27 13:55:31.000000000 -0500 +++ py-scipy/Makefile 2007-08-27 15:27:30.000000000 -0500 @@ -7,8 +7,7 @@ # PORTNAME= scipy -PORTVERSION= 0.5.1 -PORTREVISION= 1 +PORTVERSION= 0.5.2.1 CATEGORIES= science python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= scipy diff -urN py-scipy.orig/distinfo py-scipy/distinfo --- py-scipy.orig/distinfo 2006-11-14 23:54:00.000000000 -0600 +++ py-scipy/distinfo 2007-08-27 15:28:36.000000000 -0500 @@ -1,3 +1,3 @@ -MD5 (scipy-0.5.1.tar.gz) = 48442a427f0556ad2ad1721dd62e401c -SHA256 (scipy-0.5.1.tar.gz) = 312e7562aa04923c02c346866e06fd44e4fcf872c518f64c0f9dabece5ff860a -SIZE (scipy-0.5.1.tar.gz) = 4141008 +MD5 (scipy-0.5.2.1.tar.gz) = 8d9083b94b0bbbc96a96099f68e62526 +SHA256 (scipy-0.5.2.1.tar.gz) = c347b55f8f3fcf4048b6f5f46fd006d52fb1d6d07a688199758066307382d0f8 +SIZE (scipy-0.5.2.1.tar.gz) = 6000165 diff -urN py-scipy.orig/files/patch-Lib-fftpack-setup.py py-scipy/files/patch-Lib-fftpack-setup.py --- py-scipy.orig/files/patch-Lib-fftpack-setup.py 1969-12-31 18:00:00.000000000 -0600 +++ py-scipy/files/patch-Lib-fftpack-setup.py 2007-08-27 18:26:42.000000000 -0500 @@ -0,0 +1,11 @@ +--- Lib/fftpack/setup.py.orig 2007-08-20 21:43:51.000000000 -0500 ++++ Lib/fftpack/setup.py 2007-08-27 18:24:34.000000000 -0500 +@@ -30,7 +30,7 @@ + config.add_extension('_fftpack', + sources=sources, + libraries=['dfftpack'], +- extra_info = fft_opt_info ++ extra_info = [fft_opt_info, djbfft_info], + ) + + config.add_extension('convolve', >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070828005441.22108178EB>