ports/104077: py-scipy soley depends on atlas, when it does not have to

[Diane Bruce]

>Number:         104077
>Category:       ports
>Synopsis:       py-scipy soley depends on atlas, when it does not have to
>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:   Fri Oct 06 22:20:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Diane Bruce
>Release:        FreeBSD 4.11-RELEASE-p9 i386
>Organization:
Very unorganised
>Environment:
System: FreeBSD heceta.db.net 4.11-RELEASE-p9 FreeBSD 4.11-RELEASE-p9 #4: Tue May 17 16:07:52 EDT 2005 db at heceta.db.net:/usr/src/sys/compile/HECETA i386


>Description:
py-scipy depends on atlas when it could also be built with lapack/blas instead
this diff to the Makefile in /usr/ports/science/py-scipy adds an OPTION
knob to allow selection at compile time.

Note that the pending PR submitted by Li-Lun Wang is not approved at this time.
I have suggested it be added as py-scipy-devel for the time being,
as it still has some bugs as it is not ready for prime time.

>How-To-Repeat:
>Fix:


diff -ur ./Makefile /home/db/py-scipy/Makefile
--- ./Makefile	Mon Sep 11 16:06:25 2006
+++ /home/db/py-scipy/Makefile	Fri Oct  6 18:05:47 2006
@@ -8,12 +8,13 @@
 
 PORTNAME=	scipy
 PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scipy
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	SciPy_complete-${PORTVERSION}
+LATEST_LINK=	py-${PORTNAME}
 
 MAINTAINER=	db at db.net
 COMMENT=	Scientific tools for Python
@@ -22,11 +23,11 @@
 		${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft \
 		f2py:${PORTSDIR}/lang/f2py \
 		${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
-LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
-		atlas.1:${PORTSDIR}/math/atlas
+LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
 
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
+OPTIONS=	ATLAS "Use optimized blas library" OFF
 
 post-patch:
 	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
@@ -34,8 +35,15 @@
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_ATLAS)
+LIB_DEPENDS+=	atlas.1:${PORTSDIR}/math/atlas
 .if !exists(${LOCALBASE}/lib/libalapack.a)
 IGNORE=	Atlas needs to be built with WITH_STATICLIB for scipy to function properly
+.endif
+.endif
+.if defined(WITHOUT_ATLAS)
+LIB_DEPENDS+=	lapack.3:${PORTSDIR}/math/lapack \
+		blas.1:${PORTSDIR}/math/blas	
 .endif
>Release-Note:
>Audit-Trail:
>Unformatted: