From nobody Thu Mar 12 20:50:25 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fX0BB0MjXz6VxVv for ; Thu, 12 Mar 2026 20:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fX0B96v8Tz3nY6 for ; Thu, 12 Mar 2026 20:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773348626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bXNKsjbdke1jGokp1WgK25rjk+OvpIq4PqN+VpUt264=; b=KpmnMA+rZLv7umwbnbMDy8xryPECRazJ1Qm5JIZZxnaAbsCvEi71+pitwSKF7DI2vAp5Zm qyC3QjjJulF+ZiTBNIVoLNQzOLSeM8BS877IXT2nhno5FNJYO0nLYE/FdcgTZmeHVO2hYt +bW+Fdi6517wYRnfp2Jbgn3yfTXnWtZk1kB9eY4yGRa0xYKBARVj/QKjU84CszXKmQ3Kvu 0ZNRl+cYRTKcbZnfNAWTqjRhRsb6TNHXfRw25dvlF1UOKQjfEiYmDtPDYj6aH0oIIoG4Gi ECekTnHndfk9tO5Ofmab6L91j/TRZ/DEuiubcWpN3HWvhoULbDjGLzem+82gng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773348626; a=rsa-sha256; cv=none; b=p1ebl1uSuS0qJm1SoUISJYEKu7gIjtdCDtFsJb53qmGHUwVJ8ZWAPxo9uJNu6eztMxd/v7 EfjQWe9eztOSpANt7DtKi8j5UVIGv8R1hibAEW8CC8KzLG4d6KMgGgVL8siV0ks8UyE+yA wh/PQZG60zNiML/22dwSdRmjyyfHhuopePFF8Cat+8uTCEUehPbrTBP6rDu5ftcpwTncTA qhWae17OYCTh4oRa0LL+trgKbxLsN6jiqKMzYLxdsQ8njVd2vQZd/P5easN11a2IUqDMMG ZdlzvsQUod3uzcmywufISjMVpiMpwnoNsjdTZQOjcDjYQI0zeSlSxSHe3IrhMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773348626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bXNKsjbdke1jGokp1WgK25rjk+OvpIq4PqN+VpUt264=; b=EWoFp7bKzHITY6leOADNswIpTG9UpEfNtEIMcEyp9a1mejefE9Rg4ULfUrWXCl0RS4DQ3i EVly5HNjedQ+yZDxGFFL3kWMFrWQRmi4D7ZFI5iNREBNZXWE4uAqVG26eXEksna/0BiKFu 0DtKsI8QO1Gp2U+OGG7qq6EOpE2rjSSExEkKaQlmEcEYiudgNawntbFlsP7xwMdlACO7P+ B5HZV8j6Aanyg8enQyuplpz1mEn1k5qXJno7+T/09gMawrXSrcCp5ixZuCPti54sgxkql7 iqDef7gn2k3lmsfl37QQuQYJFxnND7g1LXnGOBkMcwACr9iv2V/f6jmPP5StrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fX0B96QVbz11qw for ; Thu, 12 Mar 2026 20:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38880 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 20:50:25 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 4e8a8a980f11 - main - math/R-cran-terra: Fix tests List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e8a8a980f1108ea778aab9698fc248d820cffab Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 20:50:25 +0000 Message-Id: <69b32711.38880.7752f601@gitrepo.freebsd.org> The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e8a8a980f1108ea778aab9698fc248d820cffab commit 4e8a8a980f1108ea778aab9698fc248d820cffab Author: Nuno Teixeira AuthorDate: 2026-03-12 19:59:39 +0000 Commit: Nuno Teixeira CommitDate: 2026-03-12 20:50:08 +0000 math/R-cran-terra: Fix tests Apply upstream patch to fix tests. --- math/R-cran-terra/Makefile | 4 +- math/R-cran-terra/files/patch-fix-tests | 80 +++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/math/R-cran-terra/Makefile b/math/R-cran-terra/Makefile index df64236e70b7..064e1df6f497 100644 --- a/math/R-cran-terra/Makefile +++ b/math/R-cran-terra/Makefile @@ -18,8 +18,8 @@ RUN_DEPENDS= ${CRAN_DEPENDS} TEST_DEPENDS= R-cran-deldir>0:math/R-cran-deldir \ R-cran-ncdf4>0:math/R-cran-ncdf4 -USES= cran:auto-plist,compiles sqlite:3 +USES= cran:auto-plist,compiles dos2unix sqlite:3 -TESTING_UNSAFE= https://github.com/rspatial/terra/issues/2046 +DOS2UNIX_FILES= inst/tinytest/test_subst.R src/raster_methods.cpp .include diff --git a/math/R-cran-terra/files/patch-fix-tests b/math/R-cran-terra/files/patch-fix-tests new file mode 100644 index 000000000000..8724237bc1bd --- /dev/null +++ b/math/R-cran-terra/files/patch-fix-tests @@ -0,0 +1,80 @@ +From 92878433623603b4c83dfb12b7dfd1b901b749ba Mon Sep 17 00:00:00 2001 +From: Andrew Gene Brown +Date: Mon, 9 Mar 2026 19:37:10 -0700 +Subject: [PATCH] test: recycling NA + +--- + inst/tinytest/test_subst.R | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git inst/tinytest/test_subst.R inst/tinytest/test_subst.R +index 8e883f0ad..3b0c85bbb 100644 +--- inst/tinytest/test_subst.R ++++ inst/tinytest/test_subst.R +@@ -25,3 +25,8 @@ r <- rast(nrows=2, ncols=2, vals=c(1, 2, 3, 4)) + r_sub <- subst(r, 1:2, 11:12, others=1.5) + v_sub <- as.vector(values(r_sub)) + expect_equal(v_sub, c(11, 12, 1.5, 1.5)) ++ ++# subst with recycled 'to' ++r <- rast(nrows=1, ncols=10, vals=1:10) ++r_sub <- subst(r, 2:10, NA) ++expect_equal(values(r_sub), c(1, rep(NA_real_, 9))) +From 7eade71bf2a4952b729256c1368b5d1101fe6b85 Mon Sep 17 00:00:00 2001 +From: Andrew Gene Brown +Date: Tue, 10 Mar 2026 07:28:12 -0700 +Subject: [PATCH] fix(test): subst recycled + +--- + inst/tinytest/test_subst.R | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git inst/tinytest/test_subst.R inst/tinytest/test_subst.R +index 3b0c85bbb..dc4c709aa 100644 +--- inst/tinytest/test_subst.R ++++ inst/tinytest/test_subst.R +@@ -29,4 +29,4 @@ expect_equal(v_sub, c(11, 12, 1.5, 1.5)) + # subst with recycled 'to' + r <- rast(nrows=1, ncols=10, vals=1:10) + r_sub <- subst(r, 2:10, NA) +-expect_equal(values(r_sub), c(1, rep(NA_real_, 9))) ++expect_equal(values(r_sub)[, 1], c(1, rep(NA_real_, 9))) + +From d200da273f13df335aea7271cacfbc8658705d86 Mon Sep 17 00:00:00 2001 +From: Andrew Gene Brown +Date: Mon, 9 Mar 2026 14:31:49 -0700 +Subject: [PATCH] fix(subst): use recycle() in lookup_apply + +--- + +diff --git src/raster_methods.cpp src/raster_methods.cpp +index d43521ac4..5f14964a3 100644 +--- src/raster_methods.cpp ++++ src/raster_methods.cpp +@@ -74,14 +74,20 @@ SpatRaster SpatRaster::lookup_apply(std::vector from_vals, std::vector 0) { ++ recycle(to_vals, from_vals); ++ for (size_t j = 0; j < from_vals.size(); j++) { ++ int idx = (int)from_vals[j] - min_v; ++ lut[idx] = to_vals[j]; ++ lut_set[idx] = true; ++ } + } + } else { +- for (size_t j = 0; j < from_vals.size(); j++) { +- lookup_map[from_vals[j]] = to_vals[j]; ++ if (to_vals.size() > 0) { ++ recycle(to_vals, from_vals); ++ for (size_t j = 0; j < from_vals.size(); j++) { ++ lookup_map[from_vals[j]] = to_vals[j]; ++ } + } + } +