ports/161400: [maintainer update][patch] fix build math/py-numpy science/py-scipy

[Li-Lun Wang]

>Number:         161400
>Category:       ports
>Synopsis:       [maintainer update][patch] fix build math/py-numpy science/py-scipy
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 08 17:20:01 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Li-Lun Wang
>Release:        8.2-STABLE
>Organization:
>Environment:
FreeBSD ll-zfs 8.2-STABLE FreeBSD 8.2-STABLE #6: Sat Jul 23 12:53:04 CDT 2011     root at ll-zfs:/usr/obj/usr/src/sys/C2D  amd64
>Description:
- Update math/py-numpy to reflect changes in math/atlas
- Bump PORTREVISION
- Fix build for science/py-scipy
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN py-numpy.orig/Makefile py-numpy/Makefile
--- py-numpy.orig/Makefile	2011-10-07 20:49:02.122154000 -0500
+++ py-numpy/Makefile	2011-10-08 11:50:20.228738321 -0500
@@ -7,6 +7,7 @@
 
 PORTNAME=	numpy
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://docs.scipy.org/doc/${DISTNAME:C/\..$/.x/}/:doc \
@@ -91,7 +92,7 @@
 .ifdef WITH_ATLAS
 	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \
 	    -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
-	    -e "s+%%ATLASLIBS%%+alapack_r, f77blas_r, cblas_r, atlas_r+" \
+	    -e "s+%%ATLASLIBS%%+alapack, f77blas, cblas, atlas+" \
 		${WRKSRC}/site.cfg
 .else
 	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \
diff -urN py-numpy.orig/files/patch-numpy-distutils-system_info.py py-numpy/files/patch-numpy-distutils-system_info.py
--- py-numpy.orig/files/patch-numpy-distutils-system_info.py	2008-04-08 21:08:59.000000000 -0500
+++ py-numpy/files/patch-numpy-distutils-system_info.py	2011-10-08 11:38:16.647013598 -0500
@@ -1,6 +1,17 @@
---- 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 @@
+--- 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 @@
+     dir_env_var = 'ATLAS'
+     _lib_names = ['f77blas','cblas']
+     if sys.platform[:7]=='freebsd':
+-        _lib_atlas = ['atlas_r']
+-        _lib_lapack = ['alapack_r']
++        _lib_atlas = ['atlas']
++        _lib_lapack = ['alapack']
+     else:
+         _lib_atlas = ['atlas']
+         _lib_lapack = ['lapack']
+@@ -938,6 +938,7 @@
              atlas = self.check_libs2(d,atlas_libs,[])
              lapack_atlas = self.check_libs2(d,['lapack_atlas'],[])
              if atlas is not None:
@@ -8,7 +19,7 @@
                  lib_dirs2 = [d] + self.combine_paths(d,['atlas*','ATLAS*'])
                  for d2 in lib_dirs2:
                      lapack = self.check_libs2(d2,lapack_libs,[])
-@@ -1324,8 +1325,9 @@
+@@ -1383,8 +1384,9 @@
              atlas_info = get_info('atlas_blas')
          atlas_version = None
          need_blas = 0
@@ -18,4 +29,4 @@
 +        if lapack_type == 'atlas' and atlas_info:
              version_info = atlas_info.copy()
              atlas_version = get_atlas_version(**version_info)
-             if not atlas_info.has_key('define_macros'):
+             if 'define_macros' not in atlas_info:


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