From owner-svn-ports-all@freebsd.org Wed Aug 3 19:38:01 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6898EBAEC1E; Wed, 3 Aug 2016 19:38:01 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 2C88518B8; Wed, 3 Aug 2016 19:38:01 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u73Jc0VG035518; Wed, 3 Aug 2016 19:38:00 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u73JbxE1035509; Wed, 3 Aug 2016 19:37:59 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201608031937.u73JbxE1035509@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Wed, 3 Aug 2016 19:37:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419544 - in head/math/armadillo: . files 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.22 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: Wed, 03 Aug 2016 19:38:01 -0000 Author: danilo Date: Wed Aug 3 19:37:59 2016 New Revision: 419544 URL: https://svnweb.freebsd.org/changeset/ports/419544 Log: - Update to 7.300.1 - Re-add the config.hpp patch PR: 211559 Submitted by: pi Added: 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/files/patch-CMakeLists.txt head/math/armadillo/pkg-plist Modified: head/math/armadillo/Makefile ============================================================================== --- head/math/armadillo/Makefile Wed Aug 3 19:30:57 2016 (r419543) +++ head/math/armadillo/Makefile Wed Aug 3 19:37:59 2016 (r419544) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= armadillo -PORTVERSION= 7.100.3 +PORTVERSION= 7.300.1 CATEGORIES= math MASTER_SITES= SF/arma @@ -11,6 +11,7 @@ COMMENT= C++ linear algebra library LICENSE= MPL LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ + libopenblasp.so:math/openblas \ libarpack.so:math/arpack \ libhdf5.so:science/hdf5 \ libsuperlu.so:math/superlu Modified: head/math/armadillo/distinfo ============================================================================== --- head/math/armadillo/distinfo Wed Aug 3 19:30:57 2016 (r419543) +++ head/math/armadillo/distinfo Wed Aug 3 19:37:59 2016 (r419544) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465123703 -SHA256 (armadillo-7.100.3.tar.xz) = 3fa4a2f84b54d48260efd587d7e6290618bc909d191bec0a3084a890af699d1e -SIZE (armadillo-7.100.3.tar.xz) = 3715272 +TIMESTAMP = 1470241704 +SHA256 (armadillo-7.300.1.tar.xz) = 5404744e89294ad9d47d651f2f95325840ba268b7fe374e2e40ef217d2f44bce +SIZE (armadillo-7.300.1.tar.xz) = 3994936 Modified: head/math/armadillo/files/patch-CMakeLists.txt ============================================================================== --- head/math/armadillo/files/patch-CMakeLists.txt Wed Aug 3 19:30:57 2016 (r419543) +++ head/math/armadillo/files/patch-CMakeLists.txt Wed Aug 3 19:37:59 2016 (r419544) @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2016-05-25 08:46:44 UTC +--- CMakeLists.txt.orig 2016-06-16 16:16:01 UTC +++ CMakeLists.txt @@ -368,12 +368,12 @@ if(NOT INSTALL_LIB_DIR) message(STATUS "*** Detected 64 bit system") 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 Aug 3 19:37:59 2016 (r419544) @@ -0,0 +1,27 @@ +--- include/armadillo_bits/config.hpp.orig 2016-08-03 19:20:44 UTC ++++ include/armadillo_bits/config.hpp +@@ -32,13 +32,13 @@ + #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 eigen decompositions of complex sparse matrices + #endif + + #if !defined(ARMA_USE_SUPERLU) +-// #define ARMA_USE_SUPERLU ++#define ARMA_USE_SUPERLU + //// Uncomment the above line if you have SuperLU. + //// SuperLU is used for solving sparse linear systems via spsolve() + //// Caveat: only SuperLU version 5.2 can be used! +@@ -76,7 +76,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 Aug 3 19:30:57 2016 (r419543) +++ head/math/armadillo/pkg-plist Wed Aug 3 19:37:59 2016 (r419544) @@ -137,6 +137,8 @@ include/armadillo_bits/fn_find_unique.hp include/armadillo_bits/fn_flip.hpp include/armadillo_bits/fn_hist.hpp include/armadillo_bits/fn_histc.hpp +include/armadillo_bits/fn_index_max.hpp +include/armadillo_bits/fn_index_min.hpp include/armadillo_bits/fn_inplace_strans.hpp include/armadillo_bits/fn_inplace_trans.hpp include/armadillo_bits/fn_interp1.hpp @@ -323,6 +325,10 @@ include/armadillo_bits/op_hist_bones.hpp include/armadillo_bits/op_hist_meat.hpp include/armadillo_bits/op_htrans_bones.hpp include/armadillo_bits/op_htrans_meat.hpp +include/armadillo_bits/op_index_max_bones.hpp +include/armadillo_bits/op_index_max_meat.hpp +include/armadillo_bits/op_index_min_bones.hpp +include/armadillo_bits/op_index_min_meat.hpp include/armadillo_bits/op_inv_bones.hpp include/armadillo_bits/op_inv_meat.hpp include/armadillo_bits/op_logmat_bones.hpp @@ -474,7 +480,7 @@ include/armadillo_bits/xvec_htrans_bones include/armadillo_bits/xvec_htrans_meat.hpp lib/libarmadillo.so lib/libarmadillo.so.7 -lib/libarmadillo.so.7.100.3 +lib/libarmadillo.so.7.300.0 share/Armadillo/CMake/ArmadilloConfig.cmake share/Armadillo/CMake/ArmadilloConfigVersion.cmake share/Armadillo/CMake/ArmadilloLibraryDepends-release.cmake