ports/103830: Update port: science/py-scipy to 0.5.1

Li-Lun Wang (Leland Wang) llwang at infor.org
Fri Sep 29 23:40:35 UTC 2006


>Number:         103830
>Category:       ports
>Synopsis:       Update port: science/py-scipy to 0.5.1
>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 Sep 29 23:40:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Li-Lun Wang (Leland Wang)
>Release:        FreeBSD 6.0-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD Athena.infor.org 6.0-RELEASE-p10 FreeBSD 6.0-RELEASE-p10 #5: Mon Sep 4 15:07:32 CST 2006 root at Athena.infor.org:/usr/obj/usr/src/sys/Athena i386


	
>Description:
- Update to 0.5.1
- Depends on the new py-numpy rather than the obsolete py-numeric
- Depends on wxPython either 2.4 or 2.6
- Port maintainer CC'd

Modified files:
- science/py-scipy
- - Makefile
- - distinfo

Removed files:
- science/py-scipy/files
- - patch-scipy__core_scipy__base_fastumathmodule.c
- - patch-scipy__core_scipy__distutils_system__info.py
	
>How-To-Repeat:
	
>Fix:
diff -urN py-scipy.orig/Makefile py-scipy/Makefile
--- py-scipy.orig/Makefile	Tue Sep 19 20:32:05 2006
+++ py-scipy/Makefile	Fri Sep 29 18:12:39 2006
@@ -7,23 +7,27 @@
 #
 
 PORTNAME=	scipy
-PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTVERSION=	0.5.1
 CATEGORIES=	science python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scipy
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	SciPy_complete-${PORTVERSION}
 
 MAINTAINER=	db at db.net
 COMMENT=	Scientific tools for Python
 
-BUILD_DEPENDS=	${PYNUMERIC} \
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy \
 		${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft \
-		f2py:${PORTSDIR}/lang/f2py \
-		${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+		f2py:${PORTSDIR}/lang/f2py
 LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
 		atlas.1:${PORTSDIR}/math/atlas
+.if exists(${PYTHON_SITELIBDIR}/wx.pth)
+BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/wx.pth:${PORTSDIR}/x11-toolkits/py-wxPython26
+.elif exists(${PYTHON_SITELIBDIR}/wx/__init__.py)
+BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+.else
+BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/wx.pth:${PORTSDIR}/x11-toolkits/py-wxPython26
+.endif
 
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
@@ -39,14 +43,9 @@
 .endif
 
 post-install:
-	@${RMDIR} ${PYTHON_SITELIBDIR}/weave/swig # empty
-.for dir in ${PYTHON_SITELIBDIR}/gui_thread ${PYTHON_SITELIBDIR}/scipy \
-		${PYTHON_SITELIBDIR}/scipy_base ${PYTHON_SITELIBDIR}/scipy_distutils \
-		${PYTHON_SITELIBDIR}/scipy_test ${PYTHON_SITELIBDIR}/weave
-	@${FIND} ${dir} ! -type d | \
+	@${FIND} ${PYTHON_SITELIBDIR}/scipy ! -type d | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${dir} -type d | ${SORT} -r | \
+	@${FIND} ${PYTHON_SITELIBDIR}/scipy -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/, at dirrm ,' >> ${TMPPLIST}
-.endfor
 
 .include <bsd.port.post.mk>
diff -urN py-scipy.orig/distinfo py-scipy/distinfo
--- py-scipy.orig/distinfo	Fri Nov 25 19:57:19 2005
+++ py-scipy/distinfo	Fri Sep 29 17:04:20 2006
@@ -1,3 +1,3 @@
-MD5 (SciPy_complete-0.3.2.tar.gz) = 5ae2280ab2c4c653cb0ff8479e81284a
-SHA256 (SciPy_complete-0.3.2.tar.gz) = bd1addc8d41d79f8866e7960cea391cfbfc3c6b36d5af205864d7f30a2fb98e8
-SIZE (SciPy_complete-0.3.2.tar.gz) = 3368595
+MD5 (scipy-0.5.1.tar.gz) = 48442a427f0556ad2ad1721dd62e401c
+SHA256 (scipy-0.5.1.tar.gz) = 312e7562aa04923c02c346866e06fd44e4fcf872c518f64c0f9dabece5ff860a
+SIZE (scipy-0.5.1.tar.gz) = 4141008
diff -urN py-scipy.orig/files/patch-scipy__core_scipy__base_fastumathmodule.c py-scipy/files/patch-scipy__core_scipy__base_fastumathmodule.c
--- py-scipy.orig/files/patch-scipy__core_scipy__base_fastumathmodule.c	Wed May 18 10:44:50 2005
+++ py-scipy/files/patch-scipy__core_scipy__base_fastumathmodule.c	Wed Dec 31 18:00:00 1969
@@ -1,15 +0,0 @@
-
-$FreeBSD: ports/science/py-scipy/files/patch-scipy__core_scipy__base_fastumathmodule.c,v 1.1 2005/05/18 15:44:50 vs Exp $
-
---- scipy_core/scipy_base/fastumathmodule.c.orig
-+++ scipy_core/scipy_base/fastumathmodule.c
-@@ -1,8 +1,8 @@
-+#include <math.h>
- #include "Python.h"
- #include "Numeric/arrayobject.h"
- #include "Numeric/ufuncobject.h"
- #include "abstract.h"
--#include <math.h>
- #include "mconf_lite.h"
- 
- /* Fast umath module whose functions do not check for range and domain
diff -urN py-scipy.orig/files/patch-scipy__core_scipy__distutils_system__info.py py-scipy/files/patch-scipy__core_scipy__distutils_system__info.py
--- py-scipy.orig/files/patch-scipy__core_scipy__distutils_system__info.py	Wed May 18 10:44:50 2005
+++ py-scipy/files/patch-scipy__core_scipy__distutils_system__info.py	Wed Dec 31 18:00:00 1969
@@ -1,16 +0,0 @@
-
-$FreeBSD: ports/science/py-scipy/files/patch-scipy__core_scipy__distutils_system__info.py,v 1.1 2005/05/18 15:44:50 vs Exp $
-
---- scipy_core/scipy_distutils/system_info.py.orig
-+++ scipy_core/scipy_distutils/system_info.py
-@@ -548,8 +548,8 @@
-         lib_dirs = self.get_lib_dirs()
-         info = {}
-         atlas_libs = self.get_libs('atlas_libs',
--                                   self._lib_names + ['atlas'])
--        lapack_libs = self.get_libs('lapack_libs',['lapack'])
-+                                   self._lib_names + ['atlas_r'])
-+        lapack_libs = self.get_libs('lapack_libs',['alapack_r'])
-         atlas = None
-         lapack = None
-         atlas_1 = None

	


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



More information about the freebsd-ports-bugs mailing list