Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Jan 2015 22:38:37 +0000 (UTC)
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r376503 - head/math/blocksolve95
Message-ID:  <201501072238.t07McbuE054044@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: thierry
Date: Wed Jan  7 22:38:36 2015
New Revision: 376503
URL: https://svnweb.freebsd.org/changeset/ports/376503
QAT: https://qat.redports.org/buildarchive/r376503/

Log:
  - Use options;
  
  - Do not check the existence of libatlas.
  
  Suggested by:	bapt

Modified:
  head/math/blocksolve95/Makefile

Modified: head/math/blocksolve95/Makefile
==============================================================================
--- head/math/blocksolve95/Makefile	Wed Jan  7 22:38:32 2015	(r376502)
+++ head/math/blocksolve95/Makefile	Wed Jan  7 22:38:36 2015	(r376503)
@@ -22,11 +22,17 @@ LIB_DEPENDS=	libf2c.so:${PORTSDIR}/lang/
 		libmpich.so:${PORTSDIR}/net/mpich2
 
 USES=		fortran gmake tar:Z
-.if defined(WITH_ATLAS)
-USES+=		blaslapack:atlas
-.else
-USES+=		blaslapack
-.endif
+
+OPTIONS_RADIO=	BLAS
+OPTIONS_RADIO_BLAS=	REFERENCE ATLAS
+OPTIONS_DEFAULT=	REFERENCE
+
+REFERENCE_DESC=	Blas / Lapack
+REFERENCE_USES=	blaslapack:netlib
+
+ATLAS_DESC=	ATLAS
+ATLAS_USES=	blaslapack:atlas
+
 MAKEFILE=	makefile
 MAKE_ARGS=	GMAKE=${MAKE_CMD} PETSC_ARCH=${PETSC_ARCH} BOPT=${BOPT}	\
 		BLAS_LIB="${BLASLIB}" LAPACK_LIB="-L${LOCALBASE}/lib ${LAPACKLIB}"
@@ -40,11 +46,7 @@ FFLAGS+=	-O2
 INCLUDES=	BMmsg.h BSdepend.h BSlog.h BSmy_blas.h BSprivate.h BSsparse.h
 PORTDOCS=	manual.ps
 
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
-WITH_ATLAS=	yes
-.endif
+.include <bsd.port.options.mk>
 
 do-install:
 	${INSTALL_DATA}	${WRKSRC}/lib/lib${BOPT}/${PETSC_ARCH}/libBS95.a	\
@@ -74,4 +76,4 @@ regression-test:	build
 	${LOCALBASE}/bin/mpdallexit
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



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