From owner-svn-ports-head@FreeBSD.ORG  Sun Oct  7 10:24:48 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 07ACA106564A;
	Sun,  7 Oct 2012 10:24:48 +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 CBB078FC0A;
	Sun,  7 Oct 2012 10:24:47 +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 q97AOlwV075032;
	Sun, 7 Oct 2012 10:24:47 GMT (envelope-from mva@svn.freebsd.org)
Received: (from mva@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q97AOl3B075030;
	Sun, 7 Oct 2012 10:24:47 GMT (envelope-from mva@svn.freebsd.org)
Message-Id: <201210071024.q97AOl3B075030@svn.freebsd.org>
From: Marcus von Appen <mva@FreeBSD.org>
Date: Sun, 7 Oct 2012 10:24:47 +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: r305452 - head/math/py-numpy
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Oct 2012 10:24:48 -0000

Author: mva
Date: Sun Oct  7 10:24:47 2012
New Revision: 305452
URL: http://svn.freebsd.org/changeset/ports/305452

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

Modified:
  head/math/py-numpy/Makefile   (contents, props changed)

Modified: head/math/py-numpy/Makefile
==============================================================================
--- head/math/py-numpy/Makefile	Sun Oct  7 10:23:23 2012	(r305451)
+++ head/math/py-numpy/Makefile	Sun Oct  7 10:24:47 2012	(r305452)
@@ -7,6 +7,7 @@
 
 PORTNAME=	numpy
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://docs.scipy.org/doc/${DISTNAME:C/\..$/.0/}/:doc \
@@ -24,7 +25,10 @@ LICENSE=	BSD
 
 RUN_DEPENDS=	nosetests:${PORTSDIR}/devel/py-nose
 
-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
 
 USE_FORTRAN=	yes
 USE_PYTHON=	yes
@@ -53,7 +57,7 @@ FP_ARCH=	${ARCH}
 DISTFILES+=	${FP_ARCH}/fenv.c?p=203441:fp ${FP_ARCH}/fenv.h?p=203441:fp
 .endif
 
-.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 numpy to function properly
@@ -63,7 +67,7 @@ LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/
 		blas.2:${PORTSDIR}/math/blas
 .endif
 
-.if exists(${LOCALBASE}/lib/libumfpack.so.1)
+.if ${PORT_OPTIONS:MSUITESPARSE}
 LIB_DEPENDS+=	umfpack.1:${PORTSDIR}/math/suitesparse
 .endif
 
@@ -90,17 +94,17 @@ pre-configure:
 		${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/fenv.patch; \
  	fi
 .endif
-.ifdef WITH_ATLAS
-	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \
-	    -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
-	    -e "s+%%ATLASLIBS%%+alapack, f77blas, cblas, atlas+" \
-		${WRKSRC}/site.cfg
+.if ${PORT_OPTIONS:MATLAS}
+	@${REINPLACE_CMD} -e "s+%%ATLASLIBS%%+alapack, f77blas, cblas, atlas+" ${WRKSRC}/site.cfg
 .else
+	@${REINPLACE_CMD} -e "s+%%ATLASLIBS%%+lapack, blas+" ${WRKSRC}/site.cfg
+.endif
+.if !${PORT_OPTIONS:MSUITESPARSE}
+	@${REINPLACE_CMD} -e "s+:%%LOCALBASE%%/include/suitesparse++" ${WRKSRC}/site.cfg
+.endif
 	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \
 	    -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
-	    -e "s+%%ATLASLIBS%%+lapack, blas+" \
-		 ${WRKSRC}/site.cfg
-.endif
+		${WRKSRC}/site.cfg
 	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/numpy/distutils/system_info.py
 
 pre-install: