From owner-svn-ports-head@FreeBSD.ORG Mon Jan 5 21:35:34 2015 Return-Path: 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 5050FCBA; Mon, 5 Jan 2015 21:35:34 +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 3C7B664406; Mon, 5 Jan 2015 21:35:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t05LZYbd057815; Mon, 5 Jan 2015 21:35:34 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t05LZYbN057814; Mon, 5 Jan 2015 21:35:34 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201501052135.t05LZYbN057814@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Mon, 5 Jan 2015 21:35:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376364 - head/math/blocksolve95 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jan 2015 21:35:34 -0000 Author: thierry Date: Mon Jan 5 21:35:33 2015 New Revision: 376364 URL: https://svnweb.freebsd.org/changeset/ports/376364 QAT: https://qat.redports.org/buildarchive/r376364/ Log: Uses blaslapack.mk. Modified: head/math/blocksolve95/Makefile Modified: head/math/blocksolve95/Makefile ============================================================================== --- head/math/blocksolve95/Makefile Mon Jan 5 21:26:31 2015 (r376363) +++ head/math/blocksolve95/Makefile Mon Jan 5 21:35:33 2015 (r376364) @@ -22,9 +22,14 @@ 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 MAKEFILE= makefile MAKE_ARGS= GMAKE=${MAKE_CMD} PETSC_ARCH=${PETSC_ARCH} BOPT=${BOPT} \ - BLAS_LIB="${BLAS_LIB}" LAPACK_LIB="${LAPACK_LIB}" + BLAS_LIB="${BLASLIB}" LAPACK_LIB="-L${LOCALBASE}/lib ${LAPACKLIB}" MPIDIR= ${LOCALBASE} PETSC_ARCH= freebsd @@ -40,16 +45,6 @@ PORTDOCS= manual.ps .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS) WITH_ATLAS= yes .endif -.if defined(WITH_ATLAS) -LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas -BLAS_LIB= -lf77blas -LAPACK_LIB= -L${LOCALBASE}/lib -lalapack -lcblas -.else -LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack -LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas -BLAS_LIB= -lblas -LAPACK_LIB= -L${LOCALBASE}/lib -llapack -.endif do-install: ${INSTALL_DATA} ${WRKSRC}/lib/lib${BOPT}/${PETSC_ARCH}/libBS95.a \