git: 09c3ad77b9f2 - main - math/R-cran-terra: Update to 1.8-60

From: Nuno Teixeira <eduardo_at_FreeBSD.org>
Date: Mon, 28 Jul 2025 23:00:08 UTC
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=09c3ad77b9f2a53ebcad10052413017c2df888c2

commit 09c3ad77b9f2a53ebcad10052413017c2df888c2
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2025-07-28 22:50:39 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2025-07-28 22:56:28 +0000

    math/R-cran-terra: Update to 1.8-60
    
    ChangeLog: https://cran.r-project.org/web/packages/terra/news/news.html
---
 math/R-cran-terra/Makefile         |  2 +-
 math/R-cran-terra/distinfo         |  6 ++---
 math/R-cran-terra/files/patch-i386 | 45 --------------------------------------
 3 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/math/R-cran-terra/Makefile b/math/R-cran-terra/Makefile
index ba6e77decc65..6cf421ca8011 100644
--- a/math/R-cran-terra/Makefile
+++ b/math/R-cran-terra/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	terra
-DISTVERSION=	1.8-54
+DISTVERSION=	1.8-60
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-terra/distinfo b/math/R-cran-terra/distinfo
index 111d619ec6fc..a2ff24f11e8e 100644
--- a/math/R-cran-terra/distinfo
+++ b/math/R-cran-terra/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1748855908
-SHA256 (terra_1.8-54.tar.gz) = 3d43dafa6dd7bf8cb52cb63e740eb418fc35c7cb01731f0a637d6ee85999138c
-SIZE (terra_1.8-54.tar.gz) = 1045074
+TIMESTAMP = 1753717458
+SHA256 (terra_1.8-60.tar.gz) = de8ea8bb116b668146dba8668209864f992117a8e2b7e3b109502f545bce8c23
+SIZE (terra_1.8-60.tar.gz) = 1046067
diff --git a/math/R-cran-terra/files/patch-i386 b/math/R-cran-terra/files/patch-i386
deleted file mode 100644
index ba6c983cb12d..000000000000
--- a/math/R-cran-terra/files/patch-i386
+++ /dev/null
@@ -1,45 +0,0 @@
-From 891bb07da1152988225d1f1cfac75aabfa40df62 Mon Sep 17 00:00:00 2001
-From: rhijmans <r.hijmans@gmail.com>
-Date: Tue, 3 Jun 2025 07:51:14 -0700
-Subject: [PATCH] for #1846
-
----
- src/gdal_multidimensional.cpp | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git src/gdal_multidimensional.cpp src/gdal_multidimensional.cpp
-index 7116212a9..42049f59a 100644
---- src/gdal_multidimensional.cpp
-+++ src/gdal_multidimensional.cpp
-@@ -9,6 +9,11 @@
- #include "file_utils.h"
- #include "vecmath.h"
- 
-+#if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__) || defined(__aarch64__) || defined(__MINGW64__) || defined(__amd64__)
-+    #define IS_64_BIT
-+#endif
-+
-+
- bool parse_ncdf_time(SpatRasterSource &s, const std::string unit, const std::string calendar, std::vector<double> raw, std::string &msg) {
- 
- 	std::vector<int_64> out;
-@@ -179,7 +184,7 @@ bool parse_ncdf_time(SpatRasterSource &s, const std::string unit, const std::str
- 
- 
- 
--#if GDAL_VERSION_MAJOR >= 3 && GDAL_VERSION_MINOR >= 4
-+#if GDAL_VERSION_MAJOR >= 3 && GDAL_VERSION_MINOR >= 4 && defined(IS_64_BIT)
- 
- 
- std::vector<std::string> GetArrayNames(std::shared_ptr<GDALGroup> x, bool filter) {
-@@ -804,8 +809,9 @@ bool SpatRaster::writeStopMulti() {
- #else
- 
- 
-+
- bool SpatRaster::constructFromFileMulti(std::string fname, std::vector<int> subds, std::vector<std::string> subname, std::vector<std::string> drivers, std::vector<std::string> options, std::vector<int> dims, bool noflip, bool guessCRS, std::vector<std::string> domains) {
--	setError("multidim is not supported with GDAL < 3.4");
-+	setError("multidim is not supported with GDAL < 3.4 or on 32 bit systems");
- 	return false;
- }
-