- Update to 1.6.1

PR:		162894
Submitted by:	Gereon Kaiping <kta1c10!gereon@linta.de>
Approved by:	"Li-Lun Leland Wang" <llwang@infor.org> (maintainer)
Feature safe:	yes

5 files changed, 100 insertions, 45 deletions

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 82f9ab09980b..1cccb3ae8eed 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	numpy
-PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTVERSION=	1.6.1
 PORTEPOCH=	1
 CATEGORIES=	math python
-MASTER_SITES=	http://docs.scipy.org/doc/${DISTNAME:C/\..$/.x/}/:doc \
+MASTER_SITES=	http://docs.scipy.org/doc/${DISTNAME:C/\..$/.0/}/:doc \
 		SF/${PORTNAME}/NumPy/${PORTVERSION}:source
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}:source \
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index c1f511ef167b..c926b69905c4 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,9 +1,9 @@
-SHA256 (numpy-1.5.1.tar.gz) = c36789ec381fec09f519249744ea36a77e5534b69446a59ee73b06cac29542eb
-SIZE (numpy-1.5.1.tar.gz) = 2280220
-SHA256 (numpy-ref.pdf) = 4ae481be313756dac9db43ca7cb6ea05eafc43262f8f6a1e2fde5397a69634a0
-SIZE (numpy-ref.pdf) = 5865550
-SHA256 (numpy-user.pdf) = 4c0774547ed30323cb8c53718fb9be778f8ab9d49829772bf25f35cb482e90ab
-SIZE (numpy-user.pdf) = 470154
+SHA256 (numpy-1.6.1.tar.gz) = 788b1bc712ee566d4b4d62ef99736c5830fa264cbc56f8651ded1e795c755cdd
+SIZE (numpy-1.6.1.tar.gz) = 2637779
+SHA256 (numpy-ref.pdf) = cbeea9b1395e0576bbd256c5de11886c63321d434785c6777df7bdd50109ba9f
+SIZE (numpy-ref.pdf) = 6106335
+SHA256 (numpy-user.pdf) = d8d51913cb494228f69c5f16d659b8539cbd04c6e584fde72c00c382e86eea8f
+SIZE (numpy-user.pdf) = 474664
 SHA256 (i387/fenv.c?p=203441) = c7c558ddb6ab6604c83062fe0655d3ce8cf4d60edb4c9c82777962c49d23ca54
 SIZE (i387/fenv.c?p=203441) = 4791
 SHA256 (i387/fenv.h?p=203441) = 40c72f3cdd6990076394056e06461e1daeb6087b6a32f1962d3c33b0a00c0e0d
diff --git a/math/py-numpy/files/fenv.patch b/math/py-numpy/files/fenv.patch
index 3a5e915c5b5e..66bedfdd039e 100644
--- a/math/py-numpy/files/fenv.patch
+++ b/math/py-numpy/files/fenv.patch
@@ -1,9 +1,9 @@
---- numpy/core/include/numpy/ufuncobject.h.orig	2009-12-15 06:47:53.000000000 -0600
-+++ numpy/core/include/numpy/ufuncobject.h	2010-02-15 18:54:28.490863602 -0600
-@@ -306,7 +306,11 @@
- #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
+--- numpy/core/include/numpy/ufuncobject.h.orig	2011-07-20 13:25:27.000000000 -0500
++++ numpy/core/include/numpy/ufuncobject.h	2011-12-07 20:42:53.811178415 -0600
+@@ -229,7 +229,11 @@
  
- #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || defined(__FreeBSD__)
+ #if defined(__GLIBC__) || defined(__APPLE__) || \
+     defined(__MINGW32__) || defined(__FreeBSD__)
 +#if defined(__FreeBSD__) && (__FreeBSD_version <= 900009)
 +#include "fenv/fenv.c"
 +#else
@@ -12,9 +12,9 @@
  #elif defined(__CYGWIN__)
  #include "fenv/fenv.c"
  #endif
---- numpy/numarray/_capi.c.orig	2009-12-28 08:00:09.000000000 -0600
-+++ numpy/numarray/_capi.c	2010-02-15 18:57:25.993127759 -0600
-@@ -9,7 +9,12 @@
+--- numpy/numarray/_capi.c.orig	2010-11-21 01:34:43.000000000 -0600
++++ numpy/numarray/_capi.c	2011-12-07 20:45:35.038394561 -0600
+@@ -10,7 +10,12 @@
  #endif
  
  #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
@@ -27,9 +27,20 @@
  #elif defined(__CYGWIN__)
  #include "numpy/fenv/fenv.h"
  #include "numpy/fenv/fenv.c"
---- numpy/core/setup.py.orig	2009-12-28 08:00:09.000000000 -0600
-+++ numpy/core/setup.py	2010-02-15 19:00:44.715666850 -0600
-@@ -625,7 +625,7 @@
+--- numpy/core/setupscons.py.orig	2010-11-21 01:34:42.000000000 -0600
++++ numpy/core/setupscons.py	2011-12-07 21:48:34.674089097 -0600
+@@ -98,7 +98,7 @@
+     config.numpy_include_dirs.extend(config.paths('include'))
+ 
+     # Don't install fenv unless we need them.
+-    if sys.platform == 'cygwin':
++    if sys.platform == 'cygwin' or sys.platform.startswith('freebsd'):
+         config.add_data_dir('include/numpy/fenv')
+ 
+     config.add_data_dir('tests')
+--- numpy/core/setup.py.orig	2011-07-20 13:25:27.000000000 -0500
++++ numpy/core/setup.py	2011-12-07 21:48:51.360904277 -0600
+@@ -664,7 +664,7 @@
              ]
  
      # Don't install fenv unless we need them.
@@ -38,3 +49,18 @@
          config.add_data_dir('include/numpy/fenv')
  
      config.add_extension('_sort',
+--- numpy/core/src/npymath/ieee754.c.src.orig	2011-03-10 23:56:15.000000000 -0600
++++ numpy/core/src/npymath/ieee754.c.src	2011-12-07 20:52:14.671971546 -0600
+@@ -585,7 +585,11 @@
+ 
+ # if defined(__GLIBC__) || defined(__APPLE__) || \
+      defined(__MINGW32__) || defined(__FreeBSD__)
+-#  include <fenv.h>
++#  if defined(__FreeBSD__) && (__FreeBSD_version <= 900009)
++#   include "numpy/fenv/fenv.h"
++#  else
++#   include <fenv.h>
++#  endif
+ # elif defined(__CYGWIN__)
+ #  include "fenv/fenv.c"
+ # endif
diff --git a/math/py-numpy/files/patch-numpy-distutils-system_info.py b/math/py-numpy/files/patch-numpy-distutils-system_info.py
index 6b8841e0183c..8f3279bb63ee 100644
--- a/math/py-numpy/files/patch-numpy-distutils-system_info.py
+++ b/math/py-numpy/files/patch-numpy-distutils-system_info.py
@@ -1,6 +1,6 @@
---- numpy/distutils/system_info.py.orig	2010-11-18 05:11:51.000000000 -0600
-+++ numpy/distutils/system_info.py	2011-10-08 11:34:44.399179056 -0500
-@@ -909,8 +909,8 @@
+--- numpy/distutils/system_info.py.orig	2011-07-01 22:31:13.000000000 +0100
++++ numpy/distutils/system_info.py	2011-11-26 09:54:54.000000000 +0000
+@@ -910,8 +910,8 @@
      dir_env_var = 'ATLAS'
      _lib_names = ['f77blas','cblas']
      if sys.platform[:7]=='freebsd':
@@ -11,7 +11,7 @@
      else:
          _lib_atlas = ['atlas']
          _lib_lapack = ['lapack']
-@@ -938,6 +938,7 @@
+@@ -939,6 +939,7 @@
              atlas = self.check_libs2(d,atlas_libs,[])
              lapack_atlas = self.check_libs2(d,['lapack_atlas'],[])
              if atlas is not None:
@@ -19,14 +19,3 @@
                  lib_dirs2 = [d] + self.combine_paths(d,['atlas*','ATLAS*'])
                  for d2 in lib_dirs2:
                      lapack = self.check_libs2(d2,lapack_libs,[])
-@@ -1383,8 +1384,9 @@
-             atlas_info = get_info('atlas_blas')
-         atlas_version = None
-         need_blas = 0
-+        lapack_type = self.cp.get(self.section, 'lapack_type').strip()
-         info = {}
--        if atlas_info:
-+        if lapack_type == 'atlas' and atlas_info:
-             version_info = atlas_info.copy()
-             atlas_version = get_atlas_version(**version_info)
-             if 'define_macros' not in atlas_info:
\ No newline at end of file
diff --git a/math/py-numpy/pkg-plist b/math/py-numpy/pkg-plist
index 84433b3acab6..16ba3992af36 100644
--- a/math/py-numpy/pkg-plist
+++ b/math/py-numpy/pkg-plist
@@ -1,10 +1,4 @@
 bin/f2py
-%%PYTHON_SITELIBDIR%%/numpy/COMPATIBILITY
-%%PYTHON_SITELIBDIR%%/numpy/DEV_README.txt
-%%PYTHON_SITELIBDIR%%/numpy/INSTALL.txt
-%%PYTHON_SITELIBDIR%%/numpy/LICENSE.txt
-%%PYTHON_SITELIBDIR%%/numpy/README.txt
-%%PYTHON_SITELIBDIR%%/numpy/THANKS.txt
 %%PYTHON_SITELIBDIR%%/numpy/__config__.py
 %%PYTHON_SITELIBDIR%%/numpy/__config__.pyc
 %%PYTHON_SITELIBDIR%%/numpy/__config__.pyo
@@ -69,6 +63,7 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/arrayscalars.h
 %%FENV%%%%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/fenv/fenv.c
 %%FENV%%%%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/fenv/fenv.h
+%%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/halffloat.h
 %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/multiarray_api.txt
 %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/ndarrayobject.h
 %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/ndarraytypes.h
@@ -127,13 +122,18 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/core/shape_base.pyo
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/data/astype_copy.pkl
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/data/recarray_from_file.fits
+%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_api.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_arrayprint.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_blasdot.py
+%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_datetime.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_defchararray.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_dtype.py
+%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_einsum.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_errstate.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_function_base.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_getlimits.py
+%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_half.py
+%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_iterator.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_machar.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_memmap.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_multiarray.py
@@ -279,6 +279,9 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/none.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/none.pyc
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/none.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pathf95.py
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pathf95.pyc
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pathf95.pyo
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pg.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pg.pyc
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pg.pyo
@@ -322,6 +325,9 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/numpy_distribution.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/numpy_distribution.pyc
 %%PYTHON_SITELIBDIR%%/numpy/distutils/numpy_distribution.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/pathccompiler.py
+%%PYTHON_SITELIBDIR%%/numpy/distutils/pathccompiler.pyc
+%%PYTHON_SITELIBDIR%%/numpy/distutils/pathccompiler.pyo
 %%PYTHON_SITELIBDIR%%/numpy/distutils/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/setup.pyc
 %%PYTHON_SITELIBDIR%%/numpy/distutils/setup.pyo
@@ -360,6 +366,7 @@ bin/f2py
 %%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_fcompiler_intel.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_misc_util.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_npy_pkg_config.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/unixccompiler.py
@@ -524,17 +531,27 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/src/fortranobject.c
 %%PYTHON_SITELIBDIR%%/numpy/f2py/src/fortranobject.h
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/assumed_shape/.f2py_f2cmap
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/assumed_shape/foo_free.f90
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/assumed_shape/foo_mod.f90
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/assumed_shape/foo_use.f90
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/assumed_shape/precision.f90
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/kind/foo.f90
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/mixed/foo.f
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/mixed/foo_fixed.f90
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/mixed/foo_free.f90
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/size/foo.f90
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_array_from_pyobj.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_assumed_shape.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_callback.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_kind.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_mixed.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_character.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_complex.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_integer.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_logical.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_real.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_size.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/util.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/use_rules.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/use_rules.pyc
@@ -576,7 +593,11 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/lib/arrayterator.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/arrayterator.pyc
 %%PYTHON_SITELIBDIR%%/numpy/lib/arrayterator.pyo
-%%PYTHON_SITELIBDIR%%/numpy/lib/benchmarks/bench_arraysetops.py
+%%PYTHON_SITELIBDIR%%/numpy/lib/benchmarks/benchmark.py
+%%PYTHON_SITELIBDIR%%/numpy/lib/benchmarks/casting.py
+%%PYTHON_SITELIBDIR%%/numpy/lib/benchmarks/creating.py
+%%PYTHON_SITELIBDIR%%/numpy/lib/benchmarks/simpleindex.py
+%%PYTHON_SITELIBDIR%%/numpy/lib/benchmarks/sorting.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/financial.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/financial.pyc
 %%PYTHON_SITELIBDIR%%/numpy/lib/financial.pyo
@@ -867,6 +888,18 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/chebyshev.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/chebyshev.pyc
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/chebyshev.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite.py
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite.pyc
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite_e.py
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite_e.pyc
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite_e.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/laguerre.py
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/laguerre.pyc
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/laguerre.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/legendre.py
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/legendre.pyc
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/legendre.pyo
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/polynomial.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/polynomial.pyc
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/polynomial.pyo
@@ -880,6 +913,10 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/setup.pyc
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/setup.pyo
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/tests/test_chebyshev.py
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/tests/test_hermite.py
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/tests/test_hermite_e.py
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/tests/test_laguerre.py
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/tests/test_legendre.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/tests/test_polynomial.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/tests/test_polyutils.py
 %%PYTHON_SITELIBDIR%%/numpy/random/__init__.py
@@ -897,13 +934,13 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/random/setupscons.pyc
 %%PYTHON_SITELIBDIR%%/numpy/random/setupscons.pyo
 %%PYTHON_SITELIBDIR%%/numpy/random/tests/test_random.py
+%%PYTHON_SITELIBDIR%%/numpy/random/tests/test_regression.py
 %%PYTHON_SITELIBDIR%%/numpy/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/setup.pyc
 %%PYTHON_SITELIBDIR%%/numpy/setup.pyo
 %%PYTHON_SITELIBDIR%%/numpy/setupscons.py
 %%PYTHON_SITELIBDIR%%/numpy/setupscons.pyc
 %%PYTHON_SITELIBDIR%%/numpy/setupscons.pyo
-%%PYTHON_SITELIBDIR%%/numpy/site.cfg.example
 %%PYTHON_SITELIBDIR%%/numpy/testing/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/__init__.pyc
 %%PYTHON_SITELIBDIR%%/numpy/testing/__init__.pyo
@@ -922,6 +959,9 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/testing/numpytest.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/numpytest.pyc
 %%PYTHON_SITELIBDIR%%/numpy/testing/numpytest.pyo
+%%PYTHON_SITELIBDIR%%/numpy/testing/print_coercion_tables.py
+%%PYTHON_SITELIBDIR%%/numpy/testing/print_coercion_tables.pyc
+%%PYTHON_SITELIBDIR%%/numpy/testing/print_coercion_tables.pyo
 %%PYTHON_SITELIBDIR%%/numpy/testing/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/setup.pyc
 %%PYTHON_SITELIBDIR%%/numpy/testing/setup.pyo
@@ -935,14 +975,12 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/testing/utils.pyo
 %%PYTHON_SITELIBDIR%%/numpy/tests/test_ctypeslib.py
 %%PYTHON_SITELIBDIR%%/numpy/tests/test_matlib.py
-%%PYTHON_SITELIBDIR%%/numpy/tools/py3tool.py
 %%PYTHON_SITELIBDIR%%/numpy/version.py
 %%PYTHON_SITELIBDIR%%/numpy/version.pyc
 %%PYTHON_SITELIBDIR%%/numpy/version.pyo
 %%PORTDOCS%%%%DOCSDIR%%/numpy-ref.pdf
 %%PORTDOCS%%%%DOCSDIR%%/numpy-user.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/numpy/tools
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/tests
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/testing/tests
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/testing
@@ -966,7 +1004,10 @@ bin/f2py
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/lib
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/fft/tests
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/fft
+@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/size
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/mixed
+@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/kind
+@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/assumed_shape
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/array_from_pyobj
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/tests