Update to version 1.7.0 (and unbreak with python-3.3).

PR:		178256
Submitted by:	Roland Smith <rsmith@xs4all.nl>
Approved by:	maintainer

math/py-numpy/Makefile

@@ -1,13 +1,8 @@
-# New ports collection makefile for:	numpy
-# Date created:				24 July 2006
-# Whom:					Tony Maher
-#
+# Created by: Tony Maher
 # $FreeBSD$
-#
 
 PORTNAME=	numpy
-PORTVERSION=	1.6.2
-PORTREVISION=	1
+PORTVERSION=	1.7.0
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://docs.scipy.org/doc/${DISTNAME:C/\..$/.0/}/:doc \
@@ -75,8 +70,8 @@ PYDISTUTILS_CONFIGUREARGS+=	--fcompiler=gnu95
 PYDISTUTILS_BUILDARGS+=	--fcompiler=gnu95
 
 post-extract:
-	@${CP} ${DISTDIR}/numpy-ref.pdf ${WRKDIR}
-	@${CP} ${DISTDIR}/numpy-user.pdf ${WRKDIR}
+	@${CP} ${DISTDIR}/numpy-ref-${PORTVERSION}.pdf ${WRKDIR}
+	@${CP} ${DISTDIR}/numpy-user-${PORTVERSION}.pdf ${WRKDIR}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py
@@ -118,8 +113,8 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/numpy/f2py/f2py.1 ${MAN1PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/numpy-ref.pdf ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/numpy-user.pdf ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/numpy-ref-${PORTVERSION}.pdf ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/numpy-user-${PORTVERSION}.pdf ${DOCSDIR}
 .endif
 .if defined(WITH_FIXED_FENV)
 	@if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \

math/py-numpy/distinfo

@@ -1,9 +1,9 @@
-SHA256 (numpy-1.6.2.tar.gz) = 0b83d96ab79711b548470b7aeee1272c4ba8fcbba6586a67116b566a21ed16c6
-SIZE (numpy-1.6.2.tar.gz) = 2585329
-SHA256 (numpy-ref.pdf) = cbeea9b1395e0576bbd256c5de11886c63321d434785c6777df7bdd50109ba9f
-SIZE (numpy-ref.pdf) = 6106335
-SHA256 (numpy-user.pdf) = d8d51913cb494228f69c5f16d659b8539cbd04c6e584fde72c00c382e86eea8f
-SIZE (numpy-user.pdf) = 474664
+SHA256 (numpy-1.7.0.tar.gz) = f4fa70b7edbab65ee6432eb63743f5489f1919c614632b20b2fb45aa7e682ac6
+SIZE (numpy-1.7.0.tar.gz) = 2832457
+SIZE (numpy-ref-1.7.0.pdf) = 5161456
+SHA256 (numpy-ref-1.7.0.pdf) = 0581709ef96441953404bc1369d70117b83359aff94f44779b960bed30a156d7
+SIZE (numpy-user-1.7.0.pdf) = 404104
+SHA256 (numpy-user-1.7.0.pdf) = 0c8dc1d53cc057a66139039dbaaf65499687cf64e72af5852eb96d9c3cd3ab18
 SHA256 (i387/fenv.c?p=203441) = c7c558ddb6ab6604c83062fe0655d3ce8cf4d60edb4c9c82777962c49d23ca54
 SIZE (i387/fenv.c?p=203441) = 4791
 SHA256 (i387/fenv.h?p=203441) = 40c72f3cdd6990076394056e06461e1daeb6087b6a32f1962d3c33b0a00c0e0d

math/py-numpy/files/patch-numpy-distutils-system_info.py

@@ -1,9 +1,9 @@
---- numpy/distutils/system_info.py.orig	2011-07-01 22:31:13.000000000 +0100
-+++ numpy/distutils/system_info.py	2011-11-26 09:54:54.000000000 +0000
-@@ -910,8 +910,8 @@
+--- numpy/distutils/system_info.py.orig	2013-02-09 22:04:56.000000000 +0100
++++ numpy/distutils/system_info.py	2013-03-22 21:01:34.000000000 +0100
+@@ -983,8 +983,8 @@
      dir_env_var = 'ATLAS'
-     _lib_names = ['f77blas','cblas']
-     if sys.platform[:7]=='freebsd':
+     _lib_names = ['f77blas', 'cblas']
+     if sys.platform[:7] == 'freebsd':
 -        _lib_atlas = ['atlas_r']
 -        _lib_lapack = ['alapack_r']
 +        _lib_atlas = ['atlas']
@@ -11,11 +11,3 @@
      else:
          _lib_atlas = ['atlas']
          _lib_lapack = ['lapack']
-@@ -939,6 +939,7 @@
-             atlas = self.check_libs2(d,atlas_libs,[])
-             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*'])
-                 for d2 in lib_dirs2:
-                     lapack = self.check_libs2(d2,lapack_libs,[])

math/py-numpy/pkg-descr

@@ -15,4 +15,4 @@ and can also be used to replace numarray.
 Note:	Development for Numeric has ceased, and users should transisition to
 	NumPy as quickly as possible.
 
-WWW: http://numpy.scipy.org/
+WWW: http://www.numpy.org/