From owner-svn-ports-all@FreeBSD.ORG  Sun Oct  7 10:26:44 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A45B8106566B;
	Sun,  7 Oct 2012 10:26:44 +0000 (UTC) (envelope-from mva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 758FA8FC0C;
	Sun,  7 Oct 2012 10:26:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q97AQieF075321;
	Sun, 7 Oct 2012 10:26:44 GMT (envelope-from mva@svn.freebsd.org)
Received: (from mva@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q97AQia3075319;
	Sun, 7 Oct 2012 10:26:44 GMT (envelope-from mva@svn.freebsd.org)
Message-Id: <201210071026.q97AQia3075319@svn.freebsd.org>
From: Marcus von Appen <mva@FreeBSD.org>
Date: Sun, 7 Oct 2012 10:26:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r305453 - head/science/py-scipy
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Oct 2012 10:26:44 -0000

Author: mva
Date: Sun Oct  7 10:26:43 2012
New Revision: 305453
URL: http://svn.freebsd.org/changeset/ports/305453

Log:
  - Remove automatic dependency to SuiteSparse; use OPTIONS instead
  - Change to new OPTIONS style
  - Add RUN_DEPENDS on py-nose
  
  PR:		ports/171349
  Submitted by:	Li-Lun Wang <llwang@infor.org> (maintainer)
  Reported by:	A.J. Kehoe IV (Nanoman)

Modified:
  head/science/py-scipy/Makefile   (contents, props changed)

Modified: head/science/py-scipy/Makefile
==============================================================================
--- head/science/py-scipy/Makefile	Sun Oct  7 10:24:47 2012	(r305452)
+++ head/science/py-scipy/Makefile	Sun Oct  7 10:26:43 2012	(r305453)
@@ -7,6 +7,7 @@
 
 PORTNAME=	scipy
 PORTVERSION=	0.10.1
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	http://docs.scipy.org/doc/${DISTNAME}/:doc \
 		SF:source
@@ -21,7 +22,8 @@ COMMENT=	Scientific tools for Python
 BUILD_DEPENDS+=	${PYNUMPY} \
 		${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
 LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3
-RUN_DEPENDS=	${PYNUMPY}
+RUN_DEPENDS=	${PYNUMPY}	\
+		nosetests:${PORTSDIR}/devel/py-nose
 
 LATEST_LINK=	py-${PORTNAME}
 OPTIONSFILE=	${PORT_DBDIR}/py-numpy/options
@@ -29,7 +31,11 @@ OPTIONSFILE=	${PORT_DBDIR}/py-numpy/opti
 USE_FORTRAN=	yes
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
-OPTIONS=	ATLAS "Use optimized blas library" OFF
+
+OPTIONS_DEFINE=	ATLAS SUITESPARSE
+OPTIONS_DEFAULT=	SUITESPARSE
+ATLAS_DESC=	Use optimized blas library
+SUITESPARSE_DESC=	Use AMD and UMFPACK in SuiteSparse
 
 post-patch:
 	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
@@ -37,7 +43,7 @@ post-patch:
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_ATLAS)
+.if ${PORT_OPTIONS:MATLAS}
 LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
 .if !exists(${LOCALBASE}/lib/libalapack.a)
 IGNORE=		atlas needs to be built with WITH_STATIC for scipy to function properly
@@ -47,7 +53,7 @@ LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/
 		blas.2:${PORTSDIR}/math/blas
 .endif
 
-.if exists(${LOCALBASE}/lib/libumfpack.so.1)
+.if ${PORT_OPTIONS:MSUITESPARSE}
 BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13
 LIB_DEPENDS+=	umfpack.1:${PORTSDIR}/math/suitesparse
 .endif