R-RandomFields: update to version 3.3.6.

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

5 files changed, 12 insertions, 57 deletions

diff --git a/math/R-RandomFields/Makefile b/math/R-RandomFields/Makefile
index 484a7cd5a64..6790a6d2376 100644
--- a/math/R-RandomFields/Makefile
+++ b/math/R-RandomFields/Makefile
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile,v 1.3 2018/07/28 14:40:46 brook Exp $
+# $NetBSD: Makefile,v 1.4 2019/07/31 18:34:10 brook Exp $
 
-CATEGORIES=	math
+CATEGORIES=	math R
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	${R_HOMEPAGE_BASE}/RandomFields/
 COMMENT=	Simulation and analysis of random fields
-LICENSE=	gnu-gpl-v2
+LICENSE=	gnu-gpl-v3
 
 R_PKGNAME=	RandomFields
-R_PKGVER=	2.0.66
+R_PKGVER=	3.3.6
+
+DEPENDS+=	R-sp>=1.3.1:../../math/R-sp
 
 USE_LANGUAGES+=	c c++ fortran
 
 .include "../../math/R/Makefile.extension"
+.include "../../math/R-RandomFieldsUtils/buildlink3.mk"
 .include "../../math/blas/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/R-RandomFields/distinfo b/math/R-RandomFields/distinfo
index e675f45d626..e57dfa65f22 100644
--- a/math/R-RandomFields/distinfo
+++ b/math/R-RandomFields/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 23:33:27 agc Exp $
+$NetBSD: distinfo,v 1.5 2019/07/31 18:34:10 brook Exp $
 
-SHA1 (R/RandomFields_2.0.66.tar.gz) = 58f5ec3c5c2995e88268bc4eaae0360b80dc636b
-RMD160 (R/RandomFields_2.0.66.tar.gz) = 8713109ab626cabf52b7a3a02ced34951843f373
-SHA512 (R/RandomFields_2.0.66.tar.gz) = fe8334614790acd391a103cae47a58fcc5d54e44dce6d79d6af6f2d8446148f9676717df4eb5a2b4b11f4ced9555cd055644f4a1e597384f8bc36aa515bbc39c
-Size (R/RandomFields_2.0.66.tar.gz) = 451832 bytes
-SHA1 (patch-src_MLE.cc) = 859ea7c42d6b680f7f03d81292f34df75249558f
-SHA1 (patch-src_getNset.cc) = 49d769a7254de108442a97d0966acb4110c9306f
-SHA1 (patch-src_userinterfaces.cc) = 195b7e9c27b297c7e13124c873b159bf19969eae
+SHA1 (R/RandomFields_3.3.6.tar.gz) = c0a5090e8db226d09ddaeeaedb2a5602b139f022
+RMD160 (R/RandomFields_3.3.6.tar.gz) = 6c4e175b86b440404b42d95d28cea0f4fc2111e7
+SHA512 (R/RandomFields_3.3.6.tar.gz) = 233c0b2e9b4123984f8cbed67578f48eb80ce699e978a01002b6a15f7910d33b848415443e499f02007cf47762b8f7b47b25b4e343175f2547f3c02c613d2a61
+Size (R/RandomFields_3.3.6.tar.gz) = 1065533 bytes
diff --git a/math/R-RandomFields/patches/patch-src_MLE.cc b/math/R-RandomFields/patches/patch-src_MLE.cc
deleted file mode 100644
index 578a287987b..00000000000
--- a/math/R-RandomFields/patches/patch-src_MLE.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_MLE.cc,v 1.1 2013/06/13 14:27:21 joerg Exp $
-
---- src/MLE.cc.orig	2013-06-12 19:41:35.000000000 +0000
-+++ src/MLE.cc
-@@ -22,10 +22,8 @@ along with this program; if not, write t
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
- 
--extern "C" {
- #include <R.h>
- #include <Rdefines.h>
--}
- #include <R_ext/Linpack.h>
- #include <math.h>  
- #include <stdio.h>  
diff --git a/math/R-RandomFields/patches/patch-src_getNset.cc b/math/R-RandomFields/patches/patch-src_getNset.cc
deleted file mode 100644
index 6f926c0f0b9..00000000000
--- a/math/R-RandomFields/patches/patch-src_getNset.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_getNset.cc,v 1.1 2013/06/13 14:27:21 joerg Exp $
-
---- src/getNset.cc.orig	2013-06-12 19:43:18.000000000 +0000
-+++ src/getNset.cc
-@@ -23,10 +23,8 @@ along with this program; if not, write t
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
- 
--extern "C" {
- #include <R.h>
- #include <Rdefines.h>
--}
- #include <math.h>  
- #include <stdio.h>  
- #include <stdlib.h>
diff --git a/math/R-RandomFields/patches/patch-src_userinterfaces.cc b/math/R-RandomFields/patches/patch-src_userinterfaces.cc
deleted file mode 100644
index b516a6f8844..00000000000
--- a/math/R-RandomFields/patches/patch-src_userinterfaces.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_userinterfaces.cc,v 1.1 2013/06/13 14:27:21 joerg Exp $
-
---- src/userinterfaces.cc.orig	2013-06-12 19:43:36.000000000 +0000
-+++ src/userinterfaces.cc
-@@ -23,10 +23,8 @@ along with this program; if not, write t
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
- 
--extern "C" {
- #include <R.h>
- #include <Rdefines.h>
--}
- #include <R_ext/Linpack.h>
- #include <math.h>  
- #include <stdio.h>