<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/95c85cca55a78cbc58ec55e8aebde03504bf3caa">https://github.com/macports/macports-ports/commit/95c85cca55a78cbc58ec55e8aebde03504bf3caa</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 95c85cca55a78cbc58ec55e8aebde03504bf3caa
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Wed Sep 6 21:11:12 2023 +0700
<span style='display:block; white-space:pre;color:#404040;'> R-terra: update to 1.7-46
</span>---
R/R-terra/Portfile | 18 +++++++-----------
R/R-terra/files/patch-32-bit.diff | 34 ----------------------------------
2 files changed, 7 insertions(+), 45 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-terra/Portfile b/R/R-terra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f0ab4ebfb1d..05cc45050e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-terra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-terra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,17 +3,17 @@
</span> PortSystem 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran rspatial terra 1.7-39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories-append math
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran rspatial terra 1.7-46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories-append gis
</span> maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license GPL-3+
description Spatial data analysis
long_description {*}${description}
homepage https://rspatial.org/terra
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 263ab5eccc11a15bc6e68f2ee4839454dd0116d6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b43859be4bad5e094d07e872f9606bc610ed03088176874181d80c9150156c0e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 815403
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f116aca9380f02de0e5876f045410c7350fca7b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 017a3e5ef91248172dc6e5cfc135533de520c46822bf1b0ec41ae6f48a88f64a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 822160
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,11 +23,6 @@ depends_lib-append path:lib/proj5/lib/pkgconfig/proj.pc:proj \
</span> port:R-Rcpp \
port:sqlite3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: verify this works correctly:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} in [list i386 ppc]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-32-bit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.cxx_standard 2017
destroot.pre_args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +35,7 @@ destroot.pre_args-append \
</span>
depends_test-append port:R-deldir \
port:R-htmlwidgets \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-leaflet \
</span> port:R-ncdf4 \
port:R-sf \
port:R-tinytest \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-terra/files/patch-32-bit.diff b/R/R-terra/files/patch-32-bit.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a84a333fdeb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-terra/files/patch-32-bit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/ram.cpp.orig 2023-04-26 05:07:41.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/ram.cpp 2023-05-18 20:28:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,19 +44,29 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sysinfo (&memInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ram = memInfo.freeram;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm_size_t page_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mach_port_t mach_port;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mach_msg_type_number_t count;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined(__ppc__) || defined(__i386__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vm_statistics_data_t vm_stats;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm_statistics64_data_t vm_stats;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mach_port = mach_host_self();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- count = sizeof(vm_stats) / sizeof(natural_t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined(__ppc__) || defined(__i386__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (KERN_SUCCESS == host_page_size(mach_port, &page_size) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ KERN_SUCCESS == host_statistics(mach_port, HOST_VM_INFO,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (host_info_t)&vm_stats, &count)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ long long free_memory = ((int32_t)vm_stats.free_count +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (int32_t)vm_stats.inactive_count) * (int32_t)page_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (KERN_SUCCESS == host_page_size(mach_port, &page_size) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KERN_SUCCESS == host_statistics64(mach_port, HOST_VM_INFO,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (host_info64_t)&vm_stats, &count)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long long free_memory = ((int64_t)vm_stats.free_count +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (int64_t)vm_stats.inactive_count) * (int64_t)page_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ram = free_memory;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //https://stackoverflow.com/questions/63166/how-to-determine-cpu-and-memory-consumption-from-inside-a-process
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>