<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/616ce77cb5814a3cade34750aad3d976d0f9edba">https://github.com/macports/macports-ports/commit/616ce77cb5814a3cade34750aad3d976d0f9edba</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 616ce77cb5814a3cade34750aad3d976d0f9edba
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Nov 2 05:44:10 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-ps: update to 1.8.1
</span>---
R/R-ps/Portfile | 15 +++++--------
...-fix-for-missing-MNT_CPROTECT-in-macOS-10.patch | 24 ---------------------
...ch-macos-apps.m-fix-compilation-with-gcc.patch} | 0
.../0002-api-macos.c-fix-statfs-for-32-bit.patch | 25 ----------------------
4 files changed, 5 insertions(+), 59 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-ps/Portfile b/R/R-ps/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d5a97fbff1..3d6dcc4b300 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-ps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-ps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup github r-lib ps 1.8.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup github r-lib ps 1.8.1 v
</span> revision 0
categories-append sysutils
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,20 +12,15 @@ description R package to query, list and manipulate system processes
</span> long_description ps implements an API to query and manipulate system processes. \
Most of its code is based on the psutil Python package.
homepage https://ps.r-lib.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e3becd53ac081030236d396ea438af0272579e55 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f21385cbf70743cdb5aa6c2992969ae50c8f8185d6fc61a0f07a7c9b538d5a3f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 168566
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f6b45bd45ceb3f8c087dbb1f396e918e4be9da43 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 944f05c8e0d09d1c67eda14d8974b1f128ff714079453bda1c228ca407b9de56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 169437
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/r-lib/ps/commit/063cfbbe4108f0a44d28aa800e22dc48afc149c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/r-lib/ps/commit/09513e3b4546eb831a877339b814824442f8ff7c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 0001-api-macos.c-fix-for-missing-MNT_CPROTECT-in-macOS-10.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-api-macos.c-fix-statfs-for-32-bit.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {[string match *gcc* ${configure.compiler}]} {
# gcc requires specific ObjC standard to compile this code:
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-arch-macos-apps.m-fix-compilation-with-gcc.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-arch-macos-apps.m-fix-compilation-with-gcc.patch
</span> }
configure.env-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-ps/files/0001-api-macos.c-fix-for-missing-MNT_CPROTECT-in-macOS-10.patch b/R/R-ps/files/0001-api-macos.c-fix-for-missing-MNT_CPROTECT-in-macOS-10.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 69b2f175d23..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-ps/files/0001-api-macos.c-fix-for-missing-MNT_CPROTECT-in-macOS-10.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From cde9c8b3b5f410d3c7e605bfddbd91ef90e6faf6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 13 Sep 2024 13:04:25 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] api-macos.c: fix for missing MNT_CPROTECT in macOS < 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/api-macos.c | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/api-macos.c src/api-macos.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b81931a..5a77046 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/api-macos.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/api-macos.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1254,7 +1254,10 @@ SEXP ps__fs_info(SEXP path, SEXP abspath, SEXP mps) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOGICAL(VECTOR_ELT(res, 30))[i] = sfs.f_flags & MNT_JOURNALED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOGICAL(VECTOR_ELT(res, 31))[i] = sfs.f_flags & MNT_DEFWRITE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOGICAL(VECTOR_ELT(res, 32))[i] = sfs.f_flags & MNT_MULTILABEL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Since sys/mount.h includes Availability.h, we use underscore-prefixed macro */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOGICAL(VECTOR_ELT(res, 33))[i] = sfs.f_flags & MNT_CPROTECT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UNPROTECT(1);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-ps/files/0003-arch-macos-apps.m-fix-compilation-with-gcc.patch b/R/R-ps/files/0001-arch-macos-apps.m-fix-compilation-with-gcc.patch
</span>similarity index 100%
rename from R/R-ps/files/0003-arch-macos-apps.m-fix-compilation-with-gcc.patch
rename to R/R-ps/files/0001-arch-macos-apps.m-fix-compilation-with-gcc.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-ps/files/0002-api-macos.c-fix-statfs-for-32-bit.patch b/R/R-ps/files/0002-api-macos.c-fix-statfs-for-32-bit.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 69a89f37ce4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-ps/files/0002-api-macos.c-fix-statfs-for-32-bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 19b193dd26efe2f0ba970ced974b280e4ead6f16 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 13 Sep 2024 13:32:43 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] api-macos.c: fix statfs for 32-bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/api-macos.c | 5 +++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/api-macos.c src/api-macos.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5a77046..e25661f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/api-macos.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/api-macos.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdbool.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__i386__) || defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define statfs statfs64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define getfsstat getfsstat64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct mach_timebase_info PS_MACH_TIMEBASE_INFO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PS__TV2DOUBLE(t) ((t).tv_sec + (t).tv_usec / 1000000.0)
</span></pre><pre style='margin:0'>
</pre>