diff options
author | db <db@FreeBSD.org> | 2007-06-25 16:33:24 +0000 |
---|---|---|
committer | db <db@FreeBSD.org> | 2007-06-25 16:33:24 +0000 |
commit | b19d9760a8e576d44bb882bb9f47a761c05c3159 (patch) | |
tree | d3673dbdb355ae9d49728adce12b2579dfeb588b /math | |
parent | d84f71a3d0c32b5fff003d38f09e982317ec93e2 (diff) | |
download | FreeBSD-ports-b19d9760a8e576d44bb882bb9f47a761c05c3159.zip FreeBSD-ports-b19d9760a8e576d44bb882bb9f47a761c05c3159.tar.gz |
- Forgotten files for 1.0.2 commit
Approved by: ehaupt (mentor)
Diffstat (limited to 'math')
-rw-r--r-- | math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py | 23 | ||||
-rw-r--r-- | math/py-numpy/files/patch-numpy_f2py_setup.py | 6 | ||||
-rw-r--r-- | math/py-numpy/files/site.cfg | 4 | ||||
-rw-r--r-- | math/py-numpy/pkg-plist | 17 |
4 files changed, 32 insertions, 18 deletions
diff --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py index db87e27..c796988 100644 --- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py +++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py @@ -1,20 +1,29 @@ ---- numpy/distutils/fcompiler/gnu.py.orig Mon Oct 9 03:46:59 2006 -+++ numpy/distutils/fcompiler/gnu.py Thu Jan 25 21:48:15 2007 -@@ -22,7 +22,7 @@ +--- 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', 'gfortran41', 'gfortran42', 'g77','f77']): ++ for fc_exe in map(find_executable,['gfortran', 'gfortran42', 'g77','f77']): if os.path.isfile(fc_exe): break executables = { -@@ -247,7 +247,7 @@ - # OS X: GNU Fortran 95 (GCC) 4.1.0 +@@ -47,7 +47,7 @@ + for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']: + executables[key].append('-mno-cygwin') + +- g2c = 'g2c' ++ g2c = 'gfortran' + + 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) - for fc_exe in map(find_executable,['gfortran','f95']): -+ for fc_exe in map(find_executable,['gfortran','gfortran41','gfortran42','gfortran43','f95']): ++ for fc_exe in map(find_executable,['gfortran','gfortran42','f95']): if os.path.isfile(fc_exe): break executables = { diff --git a/math/py-numpy/files/patch-numpy_f2py_setup.py b/math/py-numpy/files/patch-numpy_f2py_setup.py index 6398ace..aa12daf 100644 --- a/math/py-numpy/files/patch-numpy_f2py_setup.py +++ b/math/py-numpy/files/patch-numpy_f2py_setup.py @@ -1,6 +1,6 @@ ---- numpy/f2py/setup.py.orig Wed Jul 26 16:04:20 2006 -+++ numpy/f2py/setup.py Sat Nov 18 17:13:33 2006 -@@ -32,14 +32,13 @@ +--- numpy/f2py/setup.py.orig Mon Oct 2 17:08:55 2006 ++++ numpy/f2py/setup.py Mon Jun 11 12:17:13 2007 +@@ -34,14 +34,13 @@ config.add_data_dir('docs') config.add_data_files('src/fortranobject.c', diff --git a/math/py-numpy/files/site.cfg b/math/py-numpy/files/site.cfg index 2988e7f..5c9f1cb 100644 --- a/math/py-numpy/files/site.cfg +++ b/math/py-numpy/files/site.cfg @@ -1,10 +1,10 @@ [DEFAULT] lapack_type=atlas library_dirs = /usr/lib:%%LOCALBASE%%/lib:%%GCCLIBDIR%% -include_dirs = /usr/include:%%LOCALBASE/include +include_dirs = /usr/include:%%LOCALBASE%%/include src_dirs = %%LOCALBASE%%/src # search static libraries (.a) in preference to shared ones (.so) search_static_first = 0 [atlas] -library_dirs = %%LOCALBASE%%, %%GCCLIBDIR%% +library_dirs = %%LOCALBASE%%:%%GCCLIBDIR%% atlas_libs = %%ATLASLIBS%% diff --git a/math/py-numpy/pkg-plist b/math/py-numpy/pkg-plist index e28dcd1..89a9a86 100644 --- a/math/py-numpy/pkg-plist +++ b/math/py-numpy/pkg-plist @@ -1,6 +1,7 @@ bin/f2py %%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 @@ -80,15 +81,12 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/core/setup.pyo %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_defmatrix.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_errstate.py -%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_ma.orig %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_ma.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_multiarray.py -%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_numeric.orig %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_numeric.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_numerictypes.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_records.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_regression.py -%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_reshape.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_scalarmath.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_umath.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_unicode.py @@ -281,7 +279,9 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/distutils/unixccompiler.pyo %%PYTHON_SITELIBDIR%%/numpy/doc/CAPI.txt %%PYTHON_SITELIBDIR%%/numpy/doc/DISTUTILS.txt +%%PYTHON_SITELIBDIR%%/numpy/doc/HOWTO_DOCUMENT.txt %%PYTHON_SITELIBDIR%%/numpy/doc/README.txt +%%PYTHON_SITELIBDIR%%/numpy/doc/pep_buffer.txt %%PYTHON_SITELIBDIR%%/numpy/doc/pyrex/MANIFEST %%PYTHON_SITELIBDIR%%/numpy/doc/pyrex/Makefile %%PYTHON_SITELIBDIR%%/numpy/doc/pyrex/c_numpy.pxd @@ -292,7 +292,10 @@ bin/f2py %%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/swig/HelperFunctions.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/README %%PYTHON_SITELIBDIR%%/numpy/doc/swig/Series.i @@ -402,6 +405,7 @@ bin/f2py %%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 @@ -556,14 +560,12 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/lib/shape_base.pyc %%PYTHON_SITELIBDIR%%/numpy/lib/shape_base.pyo %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_arraysetops.py -%%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_function_base.orig %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_function_base.py %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_getlimits.py %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_index_tricks.py %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_polynomial.py %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_shape_base.py %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_twodim_base.py -%%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_type_check.orig %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_type_check.py %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_ufunclike.py %%PYTHON_SITELIBDIR%%/numpy/lib/twodim_base.py @@ -671,6 +673,9 @@ bin/f2py %%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 |