math/armadillo: 6.700.7 -> 7.100.3

PR:		210050
Changes:	http://arma.sourceforge.net/docs.html#version_7100
Approved by:	danilo (maintainer timeout)

5 files changed, 49 insertions, 36 deletions

diff --git a/math/armadillo/Makefile b/math/armadillo/Makefile
index 816bab975bd2..8d260f112cc9 100644
--- a/math/armadillo/Makefile
+++ b/math/armadillo/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	armadillo
-PORTVERSION=	6.700.7
+PORTVERSION=	7.100.3
 CATEGORIES=	math
 MASTER_SITES=	SF/arma
 
@@ -10,14 +10,14 @@ COMMENT=	C++ linear algebra library
 
 LICENSE=	MPL
 
-BROKEN_powerpc64=	Does not build
-
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libarpack.so:math/arpack \
 		libhdf5.so:science/hdf5 \
 		libsuperlu.so:math/superlu
 
-USES=		cmake blaslapack
+USES=		blaslapack cmake compiler:c++11-lang tar:xz
 USE_LDCONFIG=	yes
 
+BROKEN_powerpc64=	Does not build
+
 .include <bsd.port.mk>
diff --git a/math/armadillo/distinfo b/math/armadillo/distinfo
index 650bac012b52..fc381711e75d 100644
--- a/math/armadillo/distinfo
+++ b/math/armadillo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464054577
-SHA256 (armadillo-6.700.7.tar.gz) = 2a3388ee99d345b3e31c83ea3b0850292ac1a2154ffb785c1f03af9d3b6b7175
-SIZE (armadillo-6.700.7.tar.gz) = 5470594
+TIMESTAMP = 1465123703
+SHA256 (armadillo-7.100.3.tar.xz) = 3fa4a2f84b54d48260efd587d7e6290618bc909d191bec0a3084a890af699d1e
+SIZE (armadillo-7.100.3.tar.xz) = 3715272
diff --git a/math/armadillo/files/patch-CMakeLists.txt b/math/armadillo/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..2d047d5d5ee8
--- /dev/null
+++ b/math/armadillo/files/patch-CMakeLists.txt
@@ -0,0 +1,21 @@
+--- CMakeLists.txt.orig	2016-05-25 08:46:44 UTC
++++ CMakeLists.txt
+@@ -368,12 +368,12 @@ if(NOT INSTALL_LIB_DIR)
+       message(STATUS "*** Detected 64 bit system")
+       # use "lib64" only on systems that have it (eg. Fedora, Red Hat).
+       # if installing in /usr/local/, the use of lib64 might be unreliable on systems which have /usr/local/lib64 but don't use it
+-      if(IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/lib64")
+-        unset(INSTALL_LIB_DIR)
+-        set(INSTALL_LIB_DIR "lib64")
+-        message(STATUS "*** ${CMAKE_INSTALL_PREFIX}/lib64/ exists, so destination directory for the run-time library changed to ${CMAKE_INSTALL_PREFIX}/lib64/")
+-        message(STATUS "*** Your system and/or compiler must search ${CMAKE_INSTALL_PREFIX}/lib64/ during linking")
+-      endif()
++#      if(IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/lib64")
++#        unset(INSTALL_LIB_DIR)
++#        set(INSTALL_LIB_DIR "lib64")
++#        message(STATUS "*** ${CMAKE_INSTALL_PREFIX}/lib64/ exists, so destination directory for the run-time library changed to ${CMAKE_INSTALL_PREFIX}/lib64/")
++#        message(STATUS "*** Your system and/or compiler must search ${CMAKE_INSTALL_PREFIX}/lib64/ during linking")
++#      endif()
+     endif()
+   endif()
+ endif()
diff --git a/math/armadillo/files/patch-include+armadillo_bits+config.hpp b/math/armadillo/files/patch-include+armadillo_bits+config.hpp
deleted file mode 100644
index a0941da62357..000000000000
--- a/math/armadillo/files/patch-include+armadillo_bits+config.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- include/armadillo_bits/config.hpp.orig	2015-04-10 05:54:47 UTC
-+++ include/armadillo_bits/config.hpp
-@@ -24,13 +24,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 eigendecompositions of sparse matrices, eg. eigs_sym(), svds() 
- #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 4.3 can be used!
-@@ -68,7 +68,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 /
diff --git a/math/armadillo/pkg-plist b/math/armadillo/pkg-plist
index 56c9c6773c85..9c49691aa633 100644
--- a/math/armadillo/pkg-plist
+++ b/math/armadillo/pkg-plist
@@ -262,6 +262,25 @@ include/armadillo_bits/mul_gemm_mixed.hpp
 include/armadillo_bits/mul_gemv.hpp
 include/armadillo_bits/mul_herk.hpp
 include/armadillo_bits/mul_syrk.hpp
+include/armadillo_bits/newarp_DenseGenMatProd_bones.hpp
+include/armadillo_bits/newarp_DenseGenMatProd_meat.hpp
+include/armadillo_bits/newarp_DoubleShiftQR_bones.hpp
+include/armadillo_bits/newarp_DoubleShiftQR_meat.hpp
+include/armadillo_bits/newarp_EigsSelect.hpp
+include/armadillo_bits/newarp_GenEigsSolver_bones.hpp
+include/armadillo_bits/newarp_GenEigsSolver_meat.hpp
+include/armadillo_bits/newarp_SortEigenvalue.hpp
+include/armadillo_bits/newarp_SparseGenMatProd_bones.hpp
+include/armadillo_bits/newarp_SparseGenMatProd_meat.hpp
+include/armadillo_bits/newarp_SymEigsSolver_bones.hpp
+include/armadillo_bits/newarp_SymEigsSolver_meat.hpp
+include/armadillo_bits/newarp_TridiagEigen_bones.hpp
+include/armadillo_bits/newarp_TridiagEigen_meat.hpp
+include/armadillo_bits/newarp_UpperHessenbergEigen_bones.hpp
+include/armadillo_bits/newarp_UpperHessenbergEigen_meat.hpp
+include/armadillo_bits/newarp_UpperHessenbergQR_bones.hpp
+include/armadillo_bits/newarp_UpperHessenbergQR_meat.hpp
+include/armadillo_bits/newarp_cx_attrib.hpp
 include/armadillo_bits/op_all_bones.hpp
 include/armadillo_bits/op_all_meat.hpp
 include/armadillo_bits/op_any_bones.hpp
@@ -454,8 +473,8 @@ include/armadillo_bits/xtrans_mat_meat.hpp
 include/armadillo_bits/xvec_htrans_bones.hpp
 include/armadillo_bits/xvec_htrans_meat.hpp
 lib/libarmadillo.so
-lib/libarmadillo.so.6
-lib/libarmadillo.so.6.700.7
+lib/libarmadillo.so.7
+lib/libarmadillo.so.7.100.3
 share/Armadillo/CMake/ArmadilloConfig.cmake
 share/Armadillo/CMake/ArmadilloConfigVersion.cmake
 share/Armadillo/CMake/ArmadilloLibraryDepends-release.cmake