7 files changed, 113 insertions, 87 deletions

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index e71a85584ead..65102f041544 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	numpy
-PORTVERSION=	1.0.3.1
+PORTVERSION=	1.0.4
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://numpy.scipy.org/:doc \
@@ -54,7 +54,7 @@ post-extract:
 
 FC=		gfortran42
 F77=		gfortran42
-GCCLIBDIR=	`${FC} -print-file-name=`
+GCCLIBDIR=	`${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//`
 post-patch:
 .ifdef WITH_ATLAS
 	@${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index b8bb51c08ad6..7c91806d95ae 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,6 +1,6 @@
-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-1.0.4.tar.gz) = 8f011e9d7697da570efaac61c51725e0
+SHA256 (numpy-1.0.4.tar.gz) = b993ecc060aa2bdca9a45a552f4ea77d96959ce0f429d5f9019e05738d68c9bd
+SIZE (numpy-1.0.4.tar.gz) = 1547541
 MD5 (numpy.pdf) = 258b3758645568724ab1a3ead67db78a
 SHA256 (numpy.pdf) = 1005b55ee84265be490d8270b4e464e11f59455c220da822f6901342f5fe804f
 SIZE (numpy.pdf) = 1234555
diff --git a/math/py-numpy/files/patch-numpy-core-include-numpy-ufuncobject.h b/math/py-numpy/files/patch-numpy-core-include-numpy-ufuncobject.h
index bbb37fbfe0bf..f9eae5535d85 100644
--- a/math/py-numpy/files/patch-numpy-core-include-numpy-ufuncobject.h
+++ b/math/py-numpy/files/patch-numpy-core-include-numpy-ufuncobject.h
@@ -1,6 +1,6 @@
---- 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 @@
+--- numpy/core/include/numpy/ufuncobject.h.orig	2008-04-06 22:57:59.000000000 +0900
++++ numpy/core/include/numpy/ufuncobject.h	2008-04-06 23:02:05.000000000 +0900
+@@ -267,7 +267,10 @@
  /* Solaris --------------------------------------------------------*/
  /* --------ignoring SunOS ieee_flags approach, someone else can
  **         deal with that! */
@@ -12,7 +12,7 @@
  #include <ieeefp.h>
  
  #define UFUNC_CHECK_STATUS(ret) {				\
-@@ -276,9 +279,9 @@
+@@ -281,9 +284,9 @@
  	(void) fpsetsticky(0);						\
  	}
  
diff --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
index fa1380656164..9fc8e28faf26 100644
--- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
+++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
@@ -1,24 +1,11 @@
---- 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,
-         }
+--- numpy/distutils/fcompiler/__init__.py.orig	2008-04-06 23:03:15.000000000 +0900
++++ numpy/distutils/fcompiler/__init__.py	2008-04-06 23:08:56.000000000 +0900
+@@ -173,7 +173,7 @@
+     # gnu95 compiler type when there are F90 sources.
+     suggested_f90_compiler = 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.
--        if f77:
--            self.set_executables(compiler_f77=[f77])
--        if f90:
--            self.set_executables(compiler_f90=[f90])
--
-+	# If you do that, --f77exec and --f90exec break -db
-         # Must set version_cmd before others as self.get_flags*
-         # methods may call self.get_version.
-         vers_cmd = self.__get_cmd(self.get_version_cmd)
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 491a3afa4fcf..1eb1fcc823c1 100644
--- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
+++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
@@ -1,6 +1,15 @@
---- 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 @@
+--- numpy/distutils/fcompiler/gnu.py.orig	2007-11-07 16:05:14.000000000 -0600
++++ numpy/distutils/fcompiler/gnu.py	2008-04-07 13:54:56.000000000 -0500
+@@ -48,7 +48,7 @@
+     # 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)
+     # GNU Fortran (GCC) 3.4.2 (mingw-special)
+ 
+-    possible_executables = ['g77', 'f77']
++    possible_executables = ['gfortran', 'gfortran42', 'g77', 'f77']
+     executables = {
+         'version_cmd'  : [None, "--version"],
+         'compiler_f77' : [None, "-g", "-Wall", "-fno-second-underscore"],
+@@ -72,7 +72,7 @@
          for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']:
              executables[key].append('-mno-cygwin')
  
@@ -9,18 +18,12 @@
  
      suggested_f90_compiler = 'gnu95'
  
-     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'
+@@ -295,7 +295,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 ['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',
+-    possible_executables = ['gfortran', 'f95']
++    possible_executables = ['gfortran', 'gfortran42', 'f95']
+     executables = {
+         'version_cmd'  : ["<F90>", "--version"],
+         'compiler_f77' : [None, "-Wall", "-ffixed-form",
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 61723c4174ed..21e4f924f518 100644
--- a/math/py-numpy/files/patch-numpy-distutils-system_info.py
+++ b/math/py-numpy/files/patch-numpy-distutils-system_info.py
@@ -1,27 +1,18 @@
---- numpy/distutils/system_info.py.orig	Tue Oct  3 00:35:22 2006
-+++ numpy/distutils/system_info.py	Sun Feb  4 19:46:15 2007
-@@ -860,6 +860,8 @@
-         atlas_1 = None
-         for d in lib_dirs:
+--- numpy/distutils/system_info.py.orig	2007-11-07 16:05:15.000000000 -0600
++++ numpy/distutils/system_info.py	2008-04-07 11:39:05.000000000 -0500
+@@ -883,6 +883,7 @@
              atlas = self.check_libs2(d,atlas_libs,[])
-+            if atlas is not None:
-+                atlas['libraries'].extend(['gfortran', 'm', 'pthread'])
              lapack_atlas = self.check_libs2(d,['lapack_atlas'],[])
              if atlas is not None:
++                atlas['libraries'].extend(['gfortran', 'm', 'pthread'])
                  lib_dirs2 = [d] + self.combine_paths(d,['atlas*','ATLAS*'])
-@@ -935,6 +937,7 @@
-             else:
-                 info['language'] = 'f77'
- 
-+        info['language'] = 'f77'
-         self.set_info(**info)
- 
- class atlas_blas_info(atlas_info):
-@@ -1188,8 +1191,9 @@
+                 for d2 in lib_dirs2:
+                     lapack = self.check_libs2(d2,lapack_libs,[])
+@@ -1324,8 +1325,9 @@
+             atlas_info = get_info('atlas_blas')
          atlas_version = None
-         need_lapack = 0
          need_blas = 0
-+	lapack_type = self.cp.get(self.section, 'lapack_type').strip()
++        lapack_type = self.cp.get(self.section, 'lapack_type').strip()
          info = {}
 -        if atlas_info:
 +        if lapack_type == 'atlas' and atlas_info:
diff --git a/math/py-numpy/pkg-plist b/math/py-numpy/pkg-plist
index d5b13d0852d8..f5e065384e4e 100644
--- a/math/py-numpy/pkg-plist
+++ b/math/py-numpy/pkg-plist
@@ -160,6 +160,9 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/cpuinfo.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/cpuinfo.pyc
 %%PYTHON_SITELIBDIR%%/numpy/distutils/cpuinfo.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/environment.py
+%%PYTHON_SITELIBDIR%%/numpy/distutils/environment.pyc
+%%PYTHON_SITELIBDIR%%/numpy/distutils/environment.pyo
 %%PYTHON_SITELIBDIR%%/numpy/distutils/exec_command.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/exec_command.pyc
 %%PYTHON_SITELIBDIR%%/numpy/distutils/exec_command.pyo
@@ -281,6 +284,22 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/doc/DISTUTILS.txt
 %%PYTHON_SITELIBDIR%%/numpy/doc/HOWTO_DOCUMENT.txt
 %%PYTHON_SITELIBDIR%%/numpy/doc/README.txt
+%%PYTHON_SITELIBDIR%%/numpy/doc/example.py
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/api-objects.txt
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/crarr.png
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/epydoc.css
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/epydoc.js
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/example-module.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/example-pysrc.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/frames.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/help.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/identifier-index.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/index.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/module-tree.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/redirect.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/toc-everything.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/toc-example-module.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/html/toc.html
 %%PYTHON_SITELIBDIR%%/numpy/doc/pep_buffer.txt
 %%PYTHON_SITELIBDIR%%/numpy/doc/pyrex/MANIFEST
 %%PYTHON_SITELIBDIR%%/numpy/doc/pyrex/Makefile
@@ -293,27 +312,29 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/doc/pyrex/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/records.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/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/doc/Makefile
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/doc/numpy_swig.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/doc/numpy_swig.pdf
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/doc/numpy_swig.txt
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/doc/testing.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/doc/testing.pdf
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/doc/testing.txt
 %%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy.i
-%%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/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/swig/test/Makefile
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/test/Matrix.cxx
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/test/Matrix.h
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/test/Matrix.i
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/test/Tensor.cxx
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/test/Tensor.h
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/test/Tensor.i
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/test/Vector.cxx
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/test/Vector.h
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/test/Vector.i
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/test/setup.py
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/test/testMatrix.py
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/test/testTensor.py
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/test/testVector.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/ufuncs.txt
 %%PYTHON_SITELIBDIR%%/numpy/dual.py
 %%PYTHON_SITELIBDIR%%/numpy/dual.pyc
@@ -411,16 +432,31 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/info.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/info.pyc
 %%PYTHON_SITELIBDIR%%/numpy/f2py/info.pyo
-%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/DEV_README.txt
-%%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/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/__init__.pyo
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/api.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/api.pyc
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/api.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/doc.txt
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/__init__.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/__init__.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/base.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/base.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/base.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/c_support.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/c_support.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/c_support.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/py_support.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/py_support.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/py_support.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/setup_py.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/setup_py.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/setup_py.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/utils.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/utils.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/extgen/utils.pyo
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/main.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/main.pyc
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/main.pyo
@@ -738,10 +774,11 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/random/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/random/setup.pyc
 %%PYTHON_SITELIBDIR%%/numpy/random/setup.pyo
-%%PYTHON_SITELIBDIR%%/numpy/scipy_compatibility
+%%PYTHON_SITELIBDIR%%/numpy/random/tests/test_random.py
 %%PYTHON_SITELIBDIR%%/numpy/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/setup.pyc
 %%PYTHON_SITELIBDIR%%/numpy/setup.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
@@ -751,6 +788,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/parametric.py
+%%PYTHON_SITELIBDIR%%/numpy/testing/parametric.pyc
+%%PYTHON_SITELIBDIR%%/numpy/testing/parametric.pyo
 %%PYTHON_SITELIBDIR%%/numpy/testing/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/setup.pyc
 %%PYTHON_SITELIBDIR%%/numpy/testing/setup.pyo
@@ -761,10 +801,11 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/version.py
 %%PYTHON_SITELIBDIR%%/numpy/version.pyc
 %%PYTHON_SITELIBDIR%%/numpy/version.pyo
-%%DOCSDIR%%/numpy.pdf
+%%PORTDOCS%%%%DOCSDIR%%/numpy.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/tests
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/testing
+@dirrm %%PYTHON_SITELIBDIR%%/numpy/random/tests
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/random
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/oldnumeric
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/numarray/numpy
@@ -778,12 +819,16 @@ bin/f2py
 @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/extgen
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/lib
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/docs/usersguide
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/docs
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py
+@dirrm %%PYTHON_SITELIBDIR%%/numpy/doc/swig/test
+@dirrm %%PYTHON_SITELIBDIR%%/numpy/doc/swig/doc
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/doc/swig
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/doc/pyrex
+@dirrm %%PYTHON_SITELIBDIR%%/numpy/doc/html
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/doc
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/swig_ext/tests
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/swig_ext/src