From owner-svn-ports-all@FreeBSD.ORG Mon May 11 11:58:47 2015 Return-Path: Delivered-To: svn-ports-all@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 7A4C4C97; Mon, 11 May 2015 11:58:47 +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 4EEE9172B; Mon, 11 May 2015 11:58:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4BBwlR7008294; Mon, 11 May 2015 11:58:47 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4BBwlfU008293; Mon, 11 May 2015 11:58:47 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201505111158.t4BBwlfU008293@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 11 May 2015 11:58:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386074 - head/math/levmar X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2015 11:58:47 -0000 Author: riggs Date: Mon May 11 11:58:46 2015 New Revision: 386074 URL: https://svnweb.freebsd.org/changeset/ports/386074 Log: - Use blaslapack.mk - Bump PORTREVISION PR: 199383 Submitted by: phd_kimberlite@yahoo.co.jp (maintainer) Modified: head/math/levmar/Makefile Modified: head/math/levmar/Makefile ============================================================================== --- head/math/levmar/Makefile Mon May 11 11:57:28 2015 (r386073) +++ head/math/levmar/Makefile Mon May 11 11:58:46 2015 (r386074) @@ -3,7 +3,7 @@ PORTNAME= levmar PORTVERSION= 2.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= http://users.ics.forth.gr/~lourakis/levmar/ @@ -17,34 +17,16 @@ USE_LDCONFIG= yes USES= fortran tar:tgz uidfix OPTIONS_DEFINE= DOCS EXAMPLES PROFILE +OPTIONS_SINGLE= BLASLIB +OPTIONS_DEFAULT= NETLIB +OPTIONS_SINGLE_BLASLIB= ATLAS NETLIB OPENBLAS PROFILE_DESC= Build a profiling library -.include - -.if exists(${LOCALBASE}/lib/libgoto2p.so) -WITH_BLAS?= gotoblas -.elif exists(${LOCALBASE}/lib/libatlas.so) -WITH_BLAS?= atlas -.else -WITH_BLAS?= reference -.endif +ATLAS_USES= blaslapack:atlas +NETLIB_USES= blaslapack:netlib +OPENBLAS_USES= blaslapack:openblas -.if ${WITH_BLAS} == "reference" -LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas \ - liblapack.so:${PORTSDIR}/math/lapack -BLAS= -lblas -LAPACK= -llapack -.elif ${WITH_BLAS} == "gotoblas" -LDFLAGS+= -lpthread -L${LOCALBASE}/lib -LIB_DEPENDS+= libgoto2p.so:${PORTSDIR}/math/gotoblas -BLAS= -lgoto2p -LAPACK= -lgoto2p -.elif ${WITH_BLAS} == "atlas" -LDFLAGS+= -lpthread -L${LOCALBASE}/lib -LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas -BLAS= -lptf77blas -LAPACK= -lalapack -lptcblas -.endif +.include PORTDOCS= README.txt PORTEXAMPLES= lmdemo.c Makefile.demo @@ -73,8 +55,8 @@ post-extract: @${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g' \ -e 's+%%CFLAGS%%+${CFLAGS} -I${LOCALBASE}/include+g' \ -e 's+%%LDFLAGS%%+${LDFLAGS}+g' \ - -e 's+%%BLAS%%+${BLAS}+g' \ - -e 's+%%LAPACK%%+${LAPACK}+g' \ + -e 's+%%BLAS%%+${BLASLIB}+g' \ + -e 's+%%LAPACK%%+${LAPACKLIB}+g' \ ${WRKSRC}/Makefile.demo post-install: