Date: Sat, 14 Mar 2015 07:00:39 +0000 (UTC) From: Maho Nakata <maho@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381252 - head/math/lapack++ Message-ID: <201503140700.t2E70d07087168@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: maho Date: Sat Mar 14 07:00:38 2015 New Revision: 381252 URL: https://svnweb.freebsd.org/changeset/ports/381252 QAT: https://qat.redports.org/buildarchive/r381252/ Log: Uses blaslapack.mk (*), and update to 2.5.4. Submitted by: thierry@ (*) Modified: head/math/lapack++/Makefile head/math/lapack++/distinfo head/math/lapack++/pkg-plist Modified: head/math/lapack++/Makefile ============================================================================== --- head/math/lapack++/Makefile Sat Mar 14 06:41:37 2015 (r381251) +++ head/math/lapack++/Makefile Sat Mar 14 07:00:38 2015 (r381252) @@ -2,15 +2,13 @@ # $FreeBSD$ PORTNAME= lapack++ -PORTVERSION= 2.5.3 -PORTREVISION= 8 +PORTVERSION= 2.5.4 CATEGORIES= math -MASTER_SITES= SF/lapackpp/lapackpp/${PORTVERSION} \ +MASTER_SITES= SF/lapackpp \ http://math.nist.gov/lapack++/:doc - DISTNAME= lapackpp-${PORTVERSION} DIST_SUBDIR= lapackpp -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= maho@FreeBSD.org COMMENT= Linear Algebra PACKage in C++, a wrapper for LAPACK @@ -18,39 +16,31 @@ COMMENT= Linear Algebra PACKage in C++, USES= fortran gmake pathfix libtool OPTIONS_DEFINE= DOCS +OPTIONS_RADIO= BLAS +OPTIONS_RADIO_BLAS= REFERENCE OBLAS +OPTIONS_DEFAULT= REFERENCE -.include <bsd.port.pre.mk> - -.if ${PORT_OPTIONS:MDOCS} -DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} lapack++.ps.gz:doc lapackpp1_1.ps.gz:doc \ - lapackppman1_1.ps.gz:doc lapack++_install.ps.gz:doc -.endif +REFERENCE_DESC= Blas / Lapack +REFERENCE_USES= blaslapack:netlib -.if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS) -WITH_ATLAS= yes -.endif -.if defined(WITH_ATLAS) -LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas -.else -LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas -LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack -.endif +OBLAS_DESC= Openblas +OBLAS_USES= blaslapack:openblas GNU_CONFIGURE= yes -.if defined(WITH_ATLAS) -BLAS_LIB= -L${LOCALBASE}/lib -lf77blas -LAPACK_LIB= -L${LOCALBASE}/lib -lalapack -lcblas -.else -BLAS_LIB= -L${LOCALBASE}/lib -lblas -LAPACK_LIB= -L${LOCALBASE}/lib -llapack -.endif - -#BLAS_LIB= -L${LOCALBASE}/lib -lptf77blas -#LAPACK_LIB= -L${LOCALBASE}/lib -lalapack -lptcblas +USE_LDCONFIG= yes +BLAS_LIB= -L${LOCALBASE}/lib ${BLASLIB} +LAPACK_LIB= -L${LOCALBASE}/lib ${LAPACKLIB} #lapack++ forces to use atlas when detected, so we should disable here. CONFIGURE_ARGS+= --with-blas="${BLAS_LIB}" --with-lapack="${LAPACK_LIB}" --disable-atlas --enable-static +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} +DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} lapack++.ps.gz:doc lapackpp1_1.ps.gz:doc \ + lapackppman1_1.ps.gz:doc lapack++_install.ps.gz:doc +.endif + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/lapack++.ps.gz ${STAGEDIR}${DOCSDIR} @@ -58,4 +48,4 @@ post-install: ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/lapackpp1_1.ps.gz ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/lapackppman1_1.ps.gz ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/math/lapack++/distinfo ============================================================================== --- head/math/lapack++/distinfo Sat Mar 14 06:41:37 2015 (r381251) +++ head/math/lapack++/distinfo Sat Mar 14 07:00:38 2015 (r381252) @@ -1,5 +1,5 @@ -SHA256 (lapackpp/lapackpp-2.5.3.tar.gz) = 7ef4cb4b4768bb6227f5f95b33d3ff93f6ddcd4fbf8a661917bb538b1554daeb -SIZE (lapackpp/lapackpp-2.5.3.tar.gz) = 571923 +SHA256 (lapackpp/lapackpp-2.5.4.tar.gz) = 776c4b2b09412479e1559bcec08a71cfbb162dfbe3f6fbd4da52cef3039cddbc +SIZE (lapackpp/lapackpp-2.5.4.tar.gz) = 635178 SHA256 (lapackpp/lapack++.ps.gz) = 97ee0b6301c076722a4fe8f97f25a815b8cd4ea84d34152fea2ce32f32441abf SIZE (lapackpp/lapack++.ps.gz) = 71184 SHA256 (lapackpp/lapackpp1_1.ps.gz) = 956865d88d258ab91a4671b30dd860647a8df62be0aa5645279d5aae511d4549 Modified: head/math/lapack++/pkg-plist ============================================================================== --- head/math/lapack++/pkg-plist Sat Mar 14 06:41:37 2015 (r381251) +++ head/math/lapack++/pkg-plist Sat Mar 14 07:00:38 2015 (r381252) @@ -66,7 +66,7 @@ lib/liblapackpp.so.14 lib/liblapackpp.so.14.2.0 libdata/pkgconfig/lapackpp.pc share/aclocal/acx_lapackpp.m4 -%%PORTDOCS%%share/doc/lapack++/lapack++.ps.gz -%%PORTDOCS%%share/doc/lapack++/lapack++_install.ps.gz -%%PORTDOCS%%share/doc/lapack++/lapackpp1_1.ps.gz -%%PORTDOCS%%share/doc/lapack++/lapackppman1_1.ps.gz +%%PORTDOCS%%%%DOCSDIR%%/lapack++.ps.gz +%%PORTDOCS%%%%DOCSDIR%%/lapack++_install.ps.gz +%%PORTDOCS%%%%DOCSDIR%%/lapackpp1_1.ps.gz +%%PORTDOCS%%%%DOCSDIR%%/lapackppman1_1.ps.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503140700.t2E70d07087168>