Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Apr 2008 15:28:46 GMT
From:      dikshie <dikshie@lapi.itb.ac.id>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/122492: [update] ports/math/py-numpy
Message-ID:  <200804061528.m36FSkkI021496@www.freebsd.org>
Resent-Message-ID: <200804061530.m36FU1Xp032242@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         122492
>Category:       ports
>Synopsis:       [update] ports/math/py-numpy
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 06 15:30:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     dikshie
>Release:        FreeBSD-7.0
>Organization:
Institute of Technology Bandung, Indonesia
>Environment:
FreeBSD totoro.sfc.wide.ad.jp 7.0-STABLE FreeBSD 7.0-STABLE #2: Mon Mar 31 03:58:58 JST 2008     dikshie@totoro.sfc.wide.ad.jp:/usr/obj/usr/src/sys/X20a  i386
>Description:
update py-numpy to 1.0.4 
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- /usr/ports/math/py-numpy/Makefile	2007-09-28 05:33:01.000000000 +0900
+++ Makefile	2008-04-06 23:24:49.000000000 +0900
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	numpy
-PORTVERSION=	1.0.3.1
-PORTEPOCH=	1
+PORTVERSION=	1.0.4
 CATEGORIES=	math python
 MASTER_SITES=	http://numpy.scipy.org/:doc \
 		${MASTER_SITE_SOURCEFORGE:S/$/:source/}
--- distinfo.orig	2008-04-06 23:24:10.000000000 +0900
+++ distinfo	2008-04-06 23:32:37.000000000 +0900
@@ -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
--- /usr/ports/math/py-numpy/files/patch-numpy-core-include-numpy-ufuncobject.h	2007-09-03 05:03:45.000000000 +0900
+++ patch-numpy-core-include-numpy-ufuncobject.h	2008-04-06 23:37:54.000000000 +0900
@@ -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);						\
  	}
  
@@ -20,7 +20,7 @@
 +#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))
++#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)  || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
  #include <fenv.h>
  #elif defined(__CYGWIN__)
  #include "fenv/fenv.c"
--- /usr/ports/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py	2007-09-03 05:03:45.000000000 +0900
+++ patch-numpy-distutils-fcompiler-__init__.py	2008-04-06 23:38:40.000000000 +0900
@@ -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)
--- /usr/ports/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py	2007-09-03 05:03:45.000000000 +0900
+++ patch-numpy-distutils-fcompiler-gnu.py	2008-04-06 23:40:51.000000000 +0900
@@ -1,6 +1,6 @@
---- 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	2008-04-06 23:09:19.000000000 +0900
++++ numpy/distutils/fcompiler/gnu.py	2008-04-06 23:11:32.000000000 +0900
+@@ -72,7 +72,7 @@
          for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']:
              executables[key].append('-mno-cygwin')
  
@@ -9,18 +9,3 @@
  
      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'
- 
-     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',
--- /usr/ports/math/py-numpy/files/patch-numpy-distutils-system_info.py	2007-02-10 03:54:54.000000000 +0900
+++ patch-numpy-distutils-system_info.py	2008-04-06 23:41:30.000000000 +0900
@@ -1,25 +1,8 @@
---- 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:
-             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:
-                 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 @@
+--- numpy/distutils/system_info.py.orig	2008-04-06 23:12:26.000000000 +0900
++++ numpy/distutils/system_info.py	2008-04-06 23:17:54.000000000 +0900
+@@ -1324,8 +1324,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()
          info = {}
--- /usr/ports/math/py-numpy/files/patch-numpy_f2py_setup.py	2007-06-26 01:33:24.000000000 +0900
+++ patch-numpy_f2py_setup.py	2008-04-06 23:42:11.000000000 +0900
@@ -1,19 +1,19 @@
---- 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 @@
+--- numpy/f2py/setup.py.orig	2008-04-06 23:18:19.000000000 +0900
++++ numpy/f2py/setup.py	2008-04-06 23:19:41.000000000 +0900
+@@ -35,14 +35,14 @@
      config.add_data_dir('docs')
  
      config.add_data_files('src/fortranobject.c',
 -                          'src/fortranobject.h',
 -                          'f2py.1'
-+                          'src/fortranobject.h'
++			  'src/fortranobject.h'
                            )
  
      config.make_svn_version_py()
  
      def generate_f2py_py(build_dir):
--        f2py_exe = 'f2py'+os.path.basename(sys.executable)[6:]
-+        f2py_exe = 'f2py'
+         f2py_exe = 'f2py'+os.path.basename(sys.executable)[6:]
++	f2py_exe = 'f2py'
          if f2py_exe[-4:]=='.exe':
              f2py_exe = f2py_exe[:-4] + '.py'
          if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py':


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804061528.m36FSkkI021496>