Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Jan 2015 13:05:09 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r377012 - in head/math/armadillo: . files
Message-ID:  <201501141305.t0ED59Pg079835@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danilo
Date: Wed Jan 14 13:05:09 2015
New Revision: 377012
URL: https://svnweb.freebsd.org/changeset/ports/377012
QAT: https://qat.redports.org/buildarchive/r377012/

Log:
  - Uses blaslapack and add support for arpack
  
  PR:		196645
  Submitted by:	pfg

Added:
  head/math/armadillo/files/
  head/math/armadillo/files/patch-include+armadillo_bits+config.hpp   (contents, props changed)
Modified:
  head/math/armadillo/Makefile
  head/math/armadillo/distinfo
  head/math/armadillo/pkg-plist

Modified: head/math/armadillo/Makefile
==============================================================================
--- head/math/armadillo/Makefile	Wed Jan 14 11:27:06 2015	(r377011)
+++ head/math/armadillo/Makefile	Wed Jan 14 13:05:09 2015	(r377012)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	armadillo
-PORTVERSION=	4.600.1
+PORTVERSION=	4.600.2
 CATEGORIES=	math
 MASTER_SITES=	SF/arma
 
@@ -11,10 +11,10 @@ COMMENT=	C++ linear algebra library
 LICENSE=	MPL
 
 LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
-		liblapack.so:${PORTSDIR}/math/lapack \
+		libarpack.so:${PORTSDIR}/math/arpack \
 		libhdf5.so:${PORTSDIR}/science/hdf5
 
-USES=		cmake
+USES=		cmake blaslapack
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>

Modified: head/math/armadillo/distinfo
==============================================================================
--- head/math/armadillo/distinfo	Wed Jan 14 11:27:06 2015	(r377011)
+++ head/math/armadillo/distinfo	Wed Jan 14 13:05:09 2015	(r377012)
@@ -1,2 +1,2 @@
-SHA256 (armadillo-4.600.1.tar.gz) = 142b26f1674ffdf2b9f7c0830610666ca589d1580be45c766ecc973e4b76f3bf
-SIZE (armadillo-4.600.1.tar.gz) = 5347965
+SHA256 (armadillo-4.600.2.tar.gz) = d5f85cac54db16d3cf25af54460eb5fde190c81ddbb8690a6c453012934891bf
+SIZE (armadillo-4.600.2.tar.gz) = 5347346

Added: head/math/armadillo/files/patch-include+armadillo_bits+config.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/armadillo/files/patch-include+armadillo_bits+config.hpp	Wed Jan 14 13:05:09 2015	(r377012)
@@ -0,0 +1,20 @@
+--- include/armadillo_bits/config.hpp.orig	2015-01-09 19:09:21.294357075 -0500
++++ include/armadillo_bits/config.hpp	2015-01-09 19:12:51.862339555 -0500
+@@ -24,7 +24,7 @@
+ #endif
+ 
+ #if !defined(ARMA_USE_ARPACK)
+-// #define ARMA_USE_ARPACK
++#define ARMA_USE_ARPACK
+ //// Uncomment the above line if you have ARPACK or a high-speed replacement for ARPACK.
+ //// ARPACK is required for eigendecompositions of sparse matrices, eg. eigs_sym() 
+ #endif
+@@ -54,7 +54,7 @@
+ //// Uncomment the above line if you want to use Intel MKL mkl_malloc() and mkl_free() instead of standard malloc() and free()
+ 
+ // #define ARMA_USE_ATLAS
+-// #define ARMA_ATLAS_INCLUDE_DIR /usr/include/
++// #define ARMA_ATLAS_INCLUDE_DIR /usr/local/include/
+ //// If you're using ATLAS and the compiler can't find cblas.h and/or clapack.h
+ //// uncomment the above define and specify the appropriate include directory.
+ //// Make sure the directory has a trailing /

Modified: head/math/armadillo/pkg-plist
==============================================================================
--- head/math/armadillo/pkg-plist	Wed Jan 14 11:27:06 2015	(r377011)
+++ head/math/armadillo/pkg-plist	Wed Jan 14 13:05:09 2015	(r377012)
@@ -407,7 +407,7 @@ include/armadillo_bits/xvec_htrans_bones
 include/armadillo_bits/xvec_htrans_meat.hpp
 lib/libarmadillo.so
 lib/libarmadillo.so.4
-lib/libarmadillo.so.4.600.1
+lib/libarmadillo.so.4.600.2
 share/Armadillo/CMake/ArmadilloConfig.cmake
 share/Armadillo/CMake/ArmadilloConfigVersion.cmake
 share/Armadillo/CMake/ArmadilloLibraryDepends-release.cmake



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