<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/a8a577703b5c1e7f41adb65ee0888b6ad7b80f0b">https://github.com/macports/macports-ports/commit/a8a577703b5c1e7f41adb65ee0888b6ad7b80f0b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a8a577703b5c1e7f41adb65ee0888b6ad7b80f0b
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu May 18 23:07:49 2023 +0800

<span style='display:block; white-space:pre;color:#404040;'>    R-terra: unbreak 32-bit
</span>---
 R/R-terra/Portfile                |  5 +++++
 R/R-terra/files/patch-32-bit.diff | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

<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 19a000ee912..d8f526d6722 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;'>@@ -25,6 +25,11 @@ 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:#e0ffe0;'>+# TODO: verify this works correctly:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${build_arch} in [list i386 ppc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles      patch-32-bit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.pre_args-append \
                     --configure-args=' \
                         --with-proj-include=${prefix}/lib/proj5/include \
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a84a333fdeb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-terra/files/patch-32-bit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ram.cpp.orig       2023-04-26 05:07:41.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ram.cpp    2023-05-18 20:28:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,19 +44,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           sysinfo (&memInfo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ram = memInfo.freeram;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #elif __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           vm_size_t page_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           mach_port_t mach_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           mach_msg_type_number_t count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #if defined(__ppc__) || defined(__i386__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          vm_statistics_data_t vm_stats;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           vm_statistics64_data_t vm_stats;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           mach_port = mach_host_self();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           count = sizeof(vm_stats) / sizeof(natural_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #if defined(__ppc__) || defined(__i386__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          if (KERN_SUCCESS == host_page_size(mach_port, &page_size) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                  KERN_SUCCESS == host_statistics(mach_port, HOST_VM_INFO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                                                                  (host_info_t)&vm_stats, &count)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                  long long free_memory = ((int32_t)vm_stats.free_count +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                               (int32_t)vm_stats.inactive_count) * (int32_t)page_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           if (KERN_SUCCESS == host_page_size(mach_port, &page_size) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   KERN_SUCCESS == host_statistics64(mach_port, HOST_VM_INFO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                                                                   (host_info64_t)&vm_stats, &count)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   long long free_memory = ((int64_t)vm_stats.free_count +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                (int64_t)vm_stats.inactive_count) * (int64_t)page_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   ram = free_memory;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           //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:#e0ffe0;'>+           }
</span></pre><pre style='margin:0'>

</pre>