- Update to 1.0.4

PR:		ports/122492
Submitted by:	dikshie <dikshie at lapi.itb.ac.id>
Approved by:	Li-Lun "Leland" Wang <llwang at infor.org> (maintainer)

4 files changed, 38 insertions, 57 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 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: