Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Jun 2007 00:27:49 +0800 (CST)
From:      CHAO Shin <quakelee@cn.FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/113227: [UPDATE] math/numpy
Message-ID:  <200706011627.l51GRnsH089216@tarsier.delphij.net>
Resent-Message-ID: <200706011630.l51GU7Rk042194@freefall.freebsd.org>

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

>Number:         113227
>Category:       ports
>Synopsis:       [UPDATE] math/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:   Fri Jun 01 16:30:07 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     CHAO Shin
>Release:        FreeBSD 7.0-current i386
>Organization:
The FreeBSD Simplified Chinese Project
>Environment:
System: FreeBSD portyard.sysdept.sina.com.cn 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Thu Feb 1 19:02:06 CST 2007 root@portyard.sysdept.sina.com.cn:/usr/obj/usr/src/sys/GX270 i386

>Description:
		A new port I am importing need this new version numpy. Please update, Thanks! 
>How-To-Repeat:

>Fix:

--- patch-py-numpy.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/math/py-numpy/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile	26 Feb 2007 18:49:17 -0000	1.9
+++ Makefile	1 Jun 2007 15:40:43 -0000
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	numpy
-PORTVERSION=	1.0.1
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	1.0.3
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	http://numpy.scipy.org/:doc \
 		${MASTER_SITE_SOURCEFORGE:S/$/:source/}
 MASTER_SITE_SUBDIR=	numpy/:source
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=	numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}:source \
+PORTEPOCH=	1
+DISTFILES=	numpy-${PORTVERSION:S/r/rc/}-${PORTREVISION}${EXTRACT_SUFX}:source \
 		numpy.pdf:doc
 EXTRACT_ONLY=	numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}
 
@@ -68,13 +68,13 @@ post-patch:
 	@${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg
 	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" \
 	    -e "s+%%LOCALBASE%%+${LOCALBASE}+" \
-	    -e "s+%%ATLASLIBS%%+lapack, blas+" ${WRKSRC}/site.cfg
+	    -e "s+%%ATLASLIBS%%+alapack_r, f77blas_r, cblas_r, atlas_r+" \
+		 ${WRKSRC}/site.cfg
 .else
 	@${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg
 	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" \
 	    -e "s+%%LOCALBASE%%+${LOCALBASE}+" \
-	    -e "s+%%ATLASLIBS%%+alapack_r, f77blas_r, cblas_r, atlas_r+" \
-		 ${WRKSRC}/site.cfg
+	    -e "s+%%ATLASLIBS%%+lapack, blas+" ${WRKSRC}/site.cfg
 .endif
 	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" ${WRKSRC}/numpy/distutils/system_info.py
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/math/py-numpy/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo	17 Jan 2007 01:23:26 -0000	1.4
+++ distinfo	1 Jun 2007 15:41:39 -0000
@@ -1,6 +1,6 @@
-MD5 (numpy-1.0.1.tar.gz) = 13a29244cbe03e0d45e56d8d90ecb55d
-SHA256 (numpy-1.0.1.tar.gz) = c90d6f0ced132ef5bcd0b2791e0697bef6d92de45c2c591ea472d9f795757067
-SIZE (numpy-1.0.1.tar.gz) = 1249684
+MD5 (numpy-1.0.3-2.tar.gz) = ff0ec1a633e426c8230b6c9d333cc1e6
+SHA256 (numpy-1.0.3-2.tar.gz) = 4cc884c6aca944926809f0ed945153accf7b1fcc46bd7539ec2998ef92b3cb42
+SIZE (numpy-1.0.3-2.tar.gz) = 1503830
 MD5 (numpy.pdf) = 258b3758645568724ab1a3ead67db78a
 SHA256 (numpy.pdf) = 1005b55ee84265be490d8270b4e464e11f59455c220da822f6901342f5fe804f
 SIZE (numpy.pdf) = 1234555
Index: files/patch-numpy-core-include-numpy-ufuncobject.h
===================================================================
RCS file: /home/ncvs/ports/math/py-numpy/files/patch-numpy-core-include-numpy-ufuncobject.h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-numpy-core-include-numpy-ufuncobject.h
--- files/patch-numpy-core-include-numpy-ufuncobject.h	30 Dec 2006 16:02:58 -0000	1.2
+++ files/patch-numpy-core-include-numpy-ufuncobject.h	1 Jun 2007 15:57:52 -0000
@@ -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))
Index: files/patch-numpy-distutils-fcompiler-gnu.py
===================================================================
RCS file: /home/ncvs/ports/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-numpy-distutils-fcompiler-gnu.py
--- files/patch-numpy-distutils-fcompiler-gnu.py	9 Feb 2007 18:54:54 -0000	1.2
+++ files/patch-numpy-distutils-fcompiler-gnu.py	1 Jun 2007 16:17:09 -0000
@@ -1,20 +1,20 @@
---- numpy/distutils/fcompiler/gnu.py.orig	Mon Oct  9 03:46:59 2006
-+++ numpy/distutils/fcompiler/gnu.py	Thu Jan 25 21:48:15 2007
-@@ -22,7 +22,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)
+--- numpy/distutils/fcompiler/gnu.py.orig	Sat Jun  2 00:08:37 2007
++++ numpy/distutils/fcompiler/gnu.py	Sat Jun  2 00:13:39 2007
+@@ -72,7 +72,7 @@
+     suggested_f90_compiler = 'gnu95'
  
--    for fc_exe in map(find_executable,['g77','f77']):
-+    for fc_exe in map(find_executable,['gfortran', 'gfortran41', 'gfortran42', 'g77','f77']):
-         if os.path.isfile(fc_exe):
-             break
-     executables = {
-@@ -247,7 +247,7 @@
-     # OS X: GNU Fortran 95 (GCC) 4.1.0
-     #       GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental)
+     def find_executables(self):
+-        for fc_exe in [find_executable(c) for c in ['g77','f77']]:
++        for fc_exe in map(find_executable,['gfortran', 'gfortran41', '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','gfortran41','gfortran42','gfortran43','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 map(find_executable,['gfortran', 'gfortran41', 'gfortran42', 'g77','f77']):
+             if os.path.isfile(fc_exe):
+                 break
+         for key in ['version_cmd', 'compiler_f77', 'compiler_f90',
--- patch-py-numpy.diff ends here ---


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



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