R-RcppArmadillo: update to version 0.9.600.4.0.

Update to the canonical form of an R package and fix the LICENSE
field.

5 files changed, 61 insertions, 49 deletions

diff --git a/doc/CHANGES-2019 b/doc/CHANGES-2019
index 4c426024f8e..242211b1aac 100644
--- a/doc/CHANGES-2019
+++ b/doc/CHANGES-2019
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2019,v 1.3158 2019/07/31 18:36:26 brook Exp $
+$NetBSD: CHANGES-2019,v 1.3159 2019/07/31 18:39:23 brook Exp $
 
 Changes to the packages collection and infrastructure in 2019:
 
@@ -5115,3 +5115,4 @@ Changes to the packages collection and infrastructure in 2019:
 	Updated math/R-FNN to 1.1.3 [brook 2019-07-31]
 	Updated math/R-RandomFields to 3.3.6 [brook 2019-07-31]
 	Updated math/R-Rcmdr to 2.5.3 [brook 2019-07-31]
+	Updated math/R-RcppArmadillo to 0.9.600.4.0 [brook 2019-07-31]
diff --git a/math/R-RcppArmadillo/Makefile b/math/R-RcppArmadillo/Makefile
index 9713e741b6b..c8aebab4f79 100644
--- a/math/R-RcppArmadillo/Makefile
+++ b/math/R-RcppArmadillo/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2018/07/28 14:40:46 brook Exp $
+# $NetBSD: Makefile,v 1.4 2019/07/31 18:39:23 brook Exp $
 
-CATEGORIES=	math
+CATEGORIES=	math R
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://dirk.eddelbuettel.com/code/rcpp.armadillo.html
-COMMENT=	Testing linear regression models
-LICENSE=	gnu-gpl-v2
+COMMENT=	Rcpp integration for the Armadillo templated linear algebra library
+LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
 
 R_PKGNAME=	RcppArmadillo
-R_PKGVER=	0.8.400.0.0
+R_PKGVER=	0.9.600.4.0
 
 USE_LANGUAGES=	c++11 fortran
 
-.include "../../devel/R-Rcpp/buildlink3.mk"
 .include "../../math/R/Makefile.extension"
+.include "../../devel/R-Rcpp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/R-RcppArmadillo/buildlink3.mk b/math/R-RcppArmadillo/buildlink3.mk
index fe50857fae4..73e65eea85a 100644
--- a/math/R-RcppArmadillo/buildlink3.mk
+++ b/math/R-RcppArmadillo/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/03/22 15:36:04 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/07/31 18:39:23 brook Exp $
 
 BUILDLINK_TREE+=	R-RcppArmadillo
 
 .if !defined(R_RCPPARMADILLO_BUILDLINK3_MK)
 R_RCPPARMADILLO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.R-RcppArmadillo+=	R-RcppArmadillo>=0.8.300.1.0
+BUILDLINK_API_DEPENDS.R-RcppArmadillo+=	R-RcppArmadillo>=0.9.600.4.0
 BUILDLINK_PKGSRCDIR.R-RcppArmadillo?=	../../math/R-RcppArmadillo
 
 .include "../../devel/R-Rcpp/buildlink3.mk"
diff --git a/math/R-RcppArmadillo/distinfo b/math/R-RcppArmadillo/distinfo
index c06e9a6afd8..48c87037a91 100644
--- a/math/R-RcppArmadillo/distinfo
+++ b/math/R-RcppArmadillo/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2018/03/25 00:32:45 minskim Exp $
+$NetBSD: distinfo,v 1.3 2019/07/31 18:39:23 brook Exp $
 
-SHA1 (R/RcppArmadillo_0.8.400.0.0.tar.gz) = 4b2ef3ea7d04dd1e1b3b1234e51f7a743378a106
-RMD160 (R/RcppArmadillo_0.8.400.0.0.tar.gz) = 3337b6059afcafee8077df3e95f3892a344ba2a0
-SHA512 (R/RcppArmadillo_0.8.400.0.0.tar.gz) = 5505b16c9b59e73909e7504845ca54f90f7afa1e33647e9b285557d0b8d3a060dd636a4fa0aa2fd56fa973ac3293152a2ef3a5e64e8581c016b69f5f7ed041a0
-Size (R/RcppArmadillo_0.8.400.0.0.tar.gz) = 1332745 bytes
-SHA1 (patch-configure) = fe37058ac76616d6b781de9d60484feec19ba154
+SHA1 (R/RcppArmadillo_0.9.600.4.0.tar.gz) = dac8ff73458c0915de60935276988895cce9c48d
+RMD160 (R/RcppArmadillo_0.9.600.4.0.tar.gz) = 07c995a457b02ea5c2230e4edc9d9cd5cd0cfa8d
+SHA512 (R/RcppArmadillo_0.9.600.4.0.tar.gz) = 0b756d0e22bfcb5c78b104d277353a0de318b4a07660de8a19f580292b05e3325e094152d0eb5b93729d1cb72ab27ce7932db42b69def1571815fec6256093cd
+Size (R/RcppArmadillo_0.9.600.4.0.tar.gz) = 1360028 bytes
+SHA1 (patch-configure) = c6107dd39d3c92b70c674b5cc4e337ed39b6960d
diff --git a/math/R-RcppArmadillo/patches/patch-configure b/math/R-RcppArmadillo/patches/patch-configure
index 8acc5dfcfeb..ab32f6b50fb 100644
--- a/math/R-RcppArmadillo/patches/patch-configure
+++ b/math/R-RcppArmadillo/patches/patch-configure
@@ -1,47 +1,58 @@
-$NetBSD: patch-configure,v 1.1 2018/03/22 15:38:26 minskim Exp $
+$NetBSD: patch-configure,v 1.2 2019/07/31 18:39:24 brook Exp $
 
 Portability fix.
 
---- configure.orig	2017-12-04 21:30:47.000000000 +0000
+--- configure.orig	2019-07-15 02:31:39.000000000 +0000
 +++ configure
-@@ -2754,13 +2754,13 @@ newR=$("${R_HOME}/bin/Rscript" --vanilla
+@@ -2732,7 +2732,7 @@ fi
+ $as_echo_n "checking for macOS... " >&6; }
+ RSysinfoName=$("${R_HOME}/bin/Rscript" --vanilla -e 'cat(Sys.info()["sysname"])')
+ 
+-if test x"${RSysinfoName}" == x"Darwin"; then
++if test x"${RSysinfoName}" = x"Darwin"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+ $as_echo "found" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for macOS Apple compiler" >&5
+@@ -2740,7 +2740,7 @@ $as_echo_n "checking for macOS Apple com
+ 
+     apple_compiler=$($CXX --version 2>&1 | grep -i -c -e 'apple llvm')
+ 
+-    if test x"${apple_compiler}" == x"1"; then
++    if test x"${apple_compiler}" = x"1"; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+ $as_echo "found" >&6; }
+         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenMP unavailable and turned off." >&5
+@@ -2753,7 +2753,7 @@ $as_echo "not found" >&6; }
+ $as_echo_n "checking for clang compiler... " >&6; }
+         clang_compiler=$($CXX --version 2>&1 | grep -i -c -e 'clang ')
+ 
+-        if test x"${clang_compiler}" == x"1"; then
++        if test x"${clang_compiler}" = x"1"; then
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+ $as_echo "found" >&6; }
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenMP compatible version of clang" >&5
+@@ -2795,7 +2795,7 @@ hasRlapack=$(echo ${lapack} | grep lRlap
  ## while this may seem a little unusual we do it to fully reproduce the
  ## previous bash-based implementation
  
 -if test x"${hasRlapack}" == x""; then
 +if test x"${hasRlapack}" = x""; then
-     ## We are using a full Lapack and can use zgesdd -- so #undef remains
+     ## We are using a full Lapack and can use zgbsv -- so #undef remains
      { $as_echo "$as_me:${as_lineno-$LINENO}: result: system LAPACK found" >&5
  $as_echo "system LAPACK found" >&6; }
-     arma_lapack="#undef ARMA_CRIPPLED_LAPACK"
- else
--    if test x"${newR}" == x"yes"; then
-+    if test x"${newR}" = x"yes"; then
-         ## The R versions are recent enough and has an augmented internal Rlapack
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: fallback LAPACK from R 3.3.0 or later used" >&5
- $as_echo "fallback LAPACK from R 3.3.0 or later used" >&6; }
-@@ -2785,7 +2785,7 @@ arma_have_openmp="#define ARMA_DONT_USE_
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for macOS" >&5
- $as_echo_n "checking for macOS... " >&6; }
- RSysinfoName=$("${R_HOME}/bin/Rscript" --vanilla -e 'cat(Sys.info()["sysname"])')
--if test x"${RSysinfoName}" == x"Darwin"; then
-+if test x"${RSysinfoName}" = x"Darwin"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
- $as_echo "found" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenMP unavailable and turned off." >&5
-@@ -2795,13 +2795,13 @@ else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found as on ${RSysinfoName}" >&5
- $as_echo "not found as on ${RSysinfoName}" >&6; }
-    ## Check for OpenMP if and only if we have a suitable compile
--   if test x"${can_use_openmp}" == x"yes"; then
-+   if test x"${can_use_openmp}" = x"yes"; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenMP" >&5
+@@ -2815,13 +2815,13 @@ openmp_flag=""
+ ## Set the fallback, by default it is nope
+ arma_have_openmp="#define ARMA_DONT_USE_OPENMP 1"
+ 
+-if test x"${can_use_openmp}" == x"yes"; then
++if test x"${can_use_openmp}" = x"yes"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenMP" >&5
  $as_echo_n "checking for OpenMP... " >&6; }
-       ## if R has -fopenmp we should be good
-       allldflags=$(${R_HOME}/bin/R CMD config --ldflags)
-       hasOpenMP=$(echo ${allldflags} | grep -- -fopenmp)
--      if test x"${hasOpenMP}" == x""; then
-+      if test x"${hasOpenMP}" = x""; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: missing" >&5
+     ## if R has -fopenmp we should be good
+     allldflags=$(${R_HOME}/bin/R CMD config --ldflags)
+     hasOpenMP=$(echo ${allldflags} | grep -- -fopenmp)
+-    if test x"${hasOpenMP}" == x""; then
++    if test x"${hasOpenMP}" = x""; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: missing" >&5
  $as_echo "missing" >&6; }
-          arma_have_openmp="#define ARMA_DONT_USE_OPENMP 1"
+         arma_have_openmp="#define ARMA_DONT_USE_OPENMP 1"