Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Sep 2014 16:25:39 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r367289 - head/math/py-numpy
Message-ID:  <201409041625.s84GPdqQ013051@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Thu Sep  4 16:25:39 2014
New Revision: 367289
URL: http://svnweb.freebsd.org/changeset/ports/367289
QAT: https://qat.redports.org/buildarchive/r367289/

Log:
  - Add DOCS to OPTIONS_DEFINE
  - Convert to new options helper

Modified:
  head/math/py-numpy/Makefile

Modified: head/math/py-numpy/Makefile
==============================================================================
--- head/math/py-numpy/Makefile	Thu Sep  4 16:24:31 2014	(r367288)
+++ head/math/py-numpy/Makefile	Thu Sep  4 16:25:39 2014	(r367289)
@@ -24,7 +24,7 @@ RUN_DEPENDS=	nosetests:${PORTSDIR}/devel
 USES=		fortran python
 USE_PYTHON=	concurrent distutils py3kplist
 
-OPTIONS_DEFINE=		ATLAS SUITESPARSE
+OPTIONS_DEFINE=		ATLAS SUITESPARSE DOCS
 OPTIONS_DEFAULT=	SUITESPARSE
 ATLAS_DESC=		Use optimized blas library
 SUITESPARSE_DESC=	Use AMD and UMFPACK in SuiteSparse
@@ -35,6 +35,11 @@ PYDISTUTILS_BUILDARGS+=		--fcompiler=gnu
 PORTDOCS=	*
 WRKSRC=		${WRKDIR}/${DISTNAME:S/r/rc/}
 
+ATLAS_LIB_DEPENDS=	libatlas.so:${PORTSDIR}/math/atlas
+ATLAS_LIB_DEPENDS_OFF=	libblas.so:${PORTSDIR}/math/blas \
+			liblapack.so:${PORTSDIR}/math/lapack
+SUITESPARSE_LIB_DEPENDS=libumfpack.so:${PORTSDIR}/math/suitesparse
+
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	PYTHON_VER=${PYTHON_VER}
@@ -42,17 +47,6 @@ PLIST_SUB+=	PYTHON_VER=${PYTHON_VER}
 PLIST_FILES+=	man/man1/f2py.1.gz
 .endif
 
-.if ${PORT_OPTIONS:MATLAS}
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
-.else
-LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack \
-		libblas.so:${PORTSDIR}/math/blas
-.endif
-
-.if ${PORT_OPTIONS:MSUITESPARSE}
-LIB_DEPENDS+=	libumfpack.so:${PORTSDIR}/math/suitesparse
-.endif
-
 post-extract:
 	@${CP} ${DISTDIR}/numpy-ref-${PORTVERSION}.pdf ${WRKDIR}
 	@${CP} ${DISTDIR}/numpy-user-${PORTVERSION}.pdf ${WRKDIR}



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