3 files changed, 28 insertions, 11 deletions

diff --git a/math/armadillo/Makefile b/math/armadillo/Makefile
index e5d8a9ad31cc..1f68c9b2eef4 100644
--- a/math/armadillo/Makefile
+++ b/math/armadillo/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	armadillo
-PORTVERSION=	9.200.7
-PORTREVISION=	1
+PORTVERSION=	9.600.4
 CATEGORIES=	math
 MASTER_SITES=	SF/arma
 
diff --git a/math/armadillo/distinfo b/math/armadillo/distinfo
index 384f3d3de32e..3ee78c432511 100644
--- a/math/armadillo/distinfo
+++ b/math/armadillo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548108414
-SHA256 (armadillo-9.200.7.tar.xz) = e2787d40bcd46edf70f65ba4efd523ccb8b96a93fdb8f76da6adf1e921cb7df8
-SIZE (armadillo-9.200.7.tar.xz) = 4786620
+TIMESTAMP = 1563305688
+SHA256 (armadillo-9.600.4.tar.xz) = 7dadb6deea48c53417fd82035a8f1f25c04c925e5b3300acd198a359994af0be
+SIZE (armadillo-9.600.4.tar.xz) = 4803984
diff --git a/math/armadillo/pkg-plist b/math/armadillo/pkg-plist
index 332f10052945..d21526571ab4 100644
--- a/math/armadillo/pkg-plist
+++ b/math/armadillo/pkg-plist
@@ -49,6 +49,8 @@ include/armadillo_bits/SpRow_meat.hpp
 include/armadillo_bits/SpSubview_bones.hpp
 include/armadillo_bits/SpSubview_iterators_meat.hpp
 include/armadillo_bits/SpSubview_meat.hpp
+include/armadillo_bits/SpToDOp_bones.hpp
+include/armadillo_bits/SpToDOp_meat.hpp
 include/armadillo_bits/SpValProxy_bones.hpp
 include/armadillo_bits/SpValProxy_meat.hpp
 include/armadillo_bits/access.hpp
@@ -57,6 +59,7 @@ include/armadillo_bits/arma_config.hpp
 include/armadillo_bits/arma_forward.hpp
 include/armadillo_bits/arma_ostream_bones.hpp
 include/armadillo_bits/arma_ostream_meat.hpp
+include/armadillo_bits/arma_rel_comparators.hpp
 include/armadillo_bits/arma_rng.hpp
 include/armadillo_bits/arma_rng_cxx11.hpp
 include/armadillo_bits/arma_rng_cxx98.hpp
@@ -148,6 +151,7 @@ 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
+include/armadillo_bits/fn_interp2.hpp
 include/armadillo_bits/fn_intersect.hpp
 include/armadillo_bits/fn_inv.hpp
 include/armadillo_bits/fn_join.hpp
@@ -292,6 +296,8 @@ include/armadillo_bits/mtOpCube_bones.hpp
 include/armadillo_bits/mtOpCube_meat.hpp
 include/armadillo_bits/mtOp_bones.hpp
 include/armadillo_bits/mtOp_meat.hpp
+include/armadillo_bits/mtSpGlue_bones.hpp
+include/armadillo_bits/mtSpGlue_meat.hpp
 include/armadillo_bits/mtSpOp_bones.hpp
 include/armadillo_bits/mtSpOp_meat.hpp
 include/armadillo_bits/mul_gemm.hpp
@@ -420,6 +426,10 @@ include/armadillo_bits/op_sort_bones.hpp
 include/armadillo_bits/op_sort_index_bones.hpp
 include/armadillo_bits/op_sort_index_meat.hpp
 include/armadillo_bits/op_sort_meat.hpp
+include/armadillo_bits/op_sp_minus_bones.hpp
+include/armadillo_bits/op_sp_minus_meat.hpp
+include/armadillo_bits/op_sp_plus_bones.hpp
+include/armadillo_bits/op_sp_plus_meat.hpp
 include/armadillo_bits/op_sqrtmat_bones.hpp
 include/armadillo_bits/op_sqrtmat_meat.hpp
 include/armadillo_bits/op_stddev_bones.hpp
@@ -474,6 +484,12 @@ include/armadillo_bits/spglue_join_bones.hpp
 include/armadillo_bits/spglue_join_meat.hpp
 include/armadillo_bits/spglue_kron_bones.hpp
 include/armadillo_bits/spglue_kron_meat.hpp
+include/armadillo_bits/spglue_max_bones.hpp
+include/armadillo_bits/spglue_max_meat.hpp
+include/armadillo_bits/spglue_merge_bones.hpp
+include/armadillo_bits/spglue_merge_meat.hpp
+include/armadillo_bits/spglue_min_bones.hpp
+include/armadillo_bits/spglue_min_meat.hpp
 include/armadillo_bits/spglue_minus_bones.hpp
 include/armadillo_bits/spglue_minus_meat.hpp
 include/armadillo_bits/spglue_plus_bones.hpp
@@ -510,6 +526,8 @@ include/armadillo_bits/spop_trimat_bones.hpp
 include/armadillo_bits/spop_trimat_meat.hpp
 include/armadillo_bits/spop_var_bones.hpp
 include/armadillo_bits/spop_var_meat.hpp
+include/armadillo_bits/spop_vectorise_bones.hpp
+include/armadillo_bits/spop_vectorise_meat.hpp
 include/armadillo_bits/strip.hpp
 include/armadillo_bits/subview_bones.hpp
 include/armadillo_bits/subview_cube_bones.hpp
@@ -529,6 +547,11 @@ include/armadillo_bits/subview_field_meat.hpp
 include/armadillo_bits/subview_meat.hpp
 include/armadillo_bits/sympd_helper.hpp
 include/armadillo_bits/traits.hpp
+include/armadillo_bits/translate_arpack.hpp
+include/armadillo_bits/translate_atlas.hpp
+include/armadillo_bits/translate_blas.hpp
+include/armadillo_bits/translate_lapack.hpp
+include/armadillo_bits/translate_superlu.hpp
 include/armadillo_bits/typedef_elem.hpp
 include/armadillo_bits/typedef_elem_check.hpp
 include/armadillo_bits/typedef_mat.hpp
@@ -539,18 +562,13 @@ include/armadillo_bits/unwrap_spmat.hpp
 include/armadillo_bits/upgrade_val.hpp
 include/armadillo_bits/wall_clock_bones.hpp
 include/armadillo_bits/wall_clock_meat.hpp
-include/armadillo_bits/wrapper_arpack.hpp
-include/armadillo_bits/wrapper_atlas.hpp
-include/armadillo_bits/wrapper_blas.hpp
-include/armadillo_bits/wrapper_lapack.hpp
-include/armadillo_bits/wrapper_superlu.hpp
 include/armadillo_bits/xtrans_mat_bones.hpp
 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.9
-lib/libarmadillo.so.9.200.7
+lib/libarmadillo.so.9.600.4
 libdata/pkgconfig/armadillo.pc
 share/Armadillo/CMake/ArmadilloConfig.cmake
 share/Armadillo/CMake/ArmadilloConfigVersion.cmake