diff --git a/math/R-gstat/Makefile b/math/R-gstat/Makefile
index 6d4c790eb334..5d6cdd1640cf 100644
--- a/math/R-gstat/Makefile
+++ b/math/R-gstat/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2020/10/12 21:52:01 bacon Exp $
+# $NetBSD: Makefile,v 1.14 2021/09/16 22:17:41 mef Exp $
 
 R_PKGNAME=	gstat
-R_PKGVER=	2.0-2
-PKGREVISION=	1
-CATEGORIES=	math
+R_PKGVER=	2.0-7
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-COMMENT=	Spatial and spatio-temporal geostatistical modelling, prediction and simulation
+COMMENT=	Spatial & spatio-temporal modelling, prediction and simulation
 LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
 
 DEPENDS+=	R-FNN>=1.1.3:../../math/R-FNN
@@ -14,6 +12,16 @@ DEPENDS+=	R-sp>=0.9.98:../../math/R-sp
 DEPENDS+=	R-spacetime>=1.0.0:../../math/R-spacetime
 DEPENDS+=	R-zoo>=1.8.3:../../math/R-zoo
 
+# Packages suggested but not available: 'fields', 'future', 'future.apply'
+TEST_DEPENDS+=	R-mapdata-[0-9]*:../../geography/R-mapdata
+TEST_DEPENDS+=	R-maps-[0-9]*:../../geography/R-maps
+TEST_DEPENDS+=	R-maptools-[0-9]*:../../geography/R-maptools
+TEST_DEPENDS+=	R-rgdal-[0-9]*:../../geography/R-rgdal
+TEST_DEPENDS+=	R-rgeos-[0-9]*:../../geography/R-rgeos
+TEST_DEPENDS+=	R-sf-[0-9]*:../../geography/R-sf
+TEST_DEPENDS+=	R-stars-[0-9]*:../../geography/R-stars
+TEST_DEPENDS+=	R-raster-[0-9]*:../../geography/R-raster
+
 USE_LANGUAGES+=	c fortran
 
 .include "../../math/R/Makefile.extension"
diff --git a/math/R-gstat/distinfo b/math/R-gstat/distinfo
index 4020113a88ae..dfa34e89519d 100644
--- a/math/R-gstat/distinfo
+++ b/math/R-gstat/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2019/07/31 19:38:44 brook Exp $
+$NetBSD: distinfo,v 1.9 2021/09/16 22:17:41 mef Exp $
 
-SHA1 (R/gstat_2.0-2.tar.gz) = 6e8261d0f8a064880fadfe4e8ca7a2ee070da614
-RMD160 (R/gstat_2.0-2.tar.gz) = edd056e4892216a0298c51bd33f896878b436aaa
-SHA512 (R/gstat_2.0-2.tar.gz) = 03af9895366a0c7bf26f7f1127877ce2ec2c7b6c631e14772d7c6d1ded4497475d87a1b60a80902141ed32e4cff46b4f050692eb55c6e5c15b4813e1e21a0165
-Size (R/gstat_2.0-2.tar.gz) = 2285965 bytes
+SHA1 (R/gstat_2.0-7.tar.gz) = c7d63db2fcacd9c1b707bf7ad31daccc1d620888
+RMD160 (R/gstat_2.0-7.tar.gz) = 44404bb8c4e7215922c96780766a791db135f676
+SHA512 (R/gstat_2.0-7.tar.gz) = f87af89695700f737a302d6729f9dcdf9165f6870b20fd53e77686df849d74791ec71ad03e3dc0b670d2093b774925b3f5847ddfdd0cd41f7260868e739d2093
+Size (R/gstat_2.0-7.tar.gz) = 2320333 bytes