From owner-svn-ports-head@FreeBSD.ORG  Sat May 16 11:23:06 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E986F77B;
 Sat, 16 May 2015 11:23:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D927B1A89;
 Sat, 16 May 2015 11:23:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4GBN6O4009330;
 Sat, 16 May 2015 11:23:06 GMT (envelope-from makc@FreeBSD.org)
Received: (from makc@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4GBN6jS009329;
 Sat, 16 May 2015 11:23:06 GMT (envelope-from makc@FreeBSD.org)
Message-Id: <201505161123.t4GBN6jS009329@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: makc set sender to makc@FreeBSD.org
 using -f
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Sat, 16 May 2015 11:23:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r386518 - head/math/scilab
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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: Sat, 16 May 2015 11:23:07 -0000

Author: makc
Date: Sat May 16 11:23:06 2015
New Revision: 386518
URL: https://svnweb.freebsd.org/changeset/ports/386518

Log:
  math/scilab:
  - Clean up blas/lapack usage
  
  Based on patch, provided by maho@ via email.

Modified:
  head/math/scilab/Makefile

Modified: head/math/scilab/Makefile
==============================================================================
--- head/math/scilab/Makefile	Sat May 16 11:11:08 2015	(r386517)
+++ head/math/scilab/Makefile	Sat May 16 11:23:06 2015	(r386518)
@@ -32,16 +32,21 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gfortran \
 		--without-emf \
 		-disable-static-system-lib
-CONFIGURE_ENV=	BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}"
+CONFIGURE_ENV=	BLAS_LIBS="${BLASLIB}" LAPACK_LIBS="${LAPACKLIB}"
 MAKE_ENV=	LANG=en_US.UTF-8 \
 		LC_ALL=en_US.UTF-8
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	ATLAS GUI OCAML TK
-OPTIONS_DEFAULT=	GUI OCAML TK
+OPTIONS_DEFINE=	GUI OCAML TK
+OPTIONS_RADIO=	BLAS
+OPTIONS_RADIO_BLAS=	ATLAS NETLIB OPENBLAS
+OPTIONS_DEFAULT=	GUI NETLIB OCAML TK
 OPTIONS_SUB=	yes
 
-ATLAS_DESC=	Use Atlas instead of Blas
+ATLAS_USES=	blaslapack:atlas
+NETLIB_USES=	blaslapack:netlib
+OPENBLAS_USES=	blaslapack:openblas
+
 GUI_DESC=	Graphical User Interface (Java)
 OCAML_DESC=	Scicos - dynamical system simulator (requires GUI)
 
@@ -107,17 +112,6 @@ TK_USE=		XORG=x11
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MATLAS}
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
-BLAS_LIBS=	-lf77blas
-LAPACK_LIBS=	-lalapack -lcblas
-.else
-LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack \
-		libblas.so:${PORTSDIR}/math/blas
-BLAS_LIBS=	-lblas
-LAPACK_LIBS=	-llapack
-.endif
-
 .if ${PORT_OPTIONS:MGUI}
 USE_JAVA=	yes
 # bsdjava (ie java/jdk16) doesn't have some "extra" classes that aren't in