- 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. [1]
- Pass maintainership to llwang@infor.org

PR:		ports/112429 [1]
Submitted by:	Li-Lun "Leland" Wang <llwang@infor.org> (new maintainer)

3 files changed, 33 insertions, 27 deletions

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 d7c1699811e7..bbb37fbfe0bf 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,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 --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
index 9c42980d29ad..fa1380656164 100644
--- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
+++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
@@ -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 --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
index c79698892e7a..491a3afa4fcf 100644
--- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
+++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
@@ -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',