<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/bc00d7ac1d45a4f5fb8fe5d1a28ce902c1898a27">https://github.com/macports/macports-ports/commit/bc00d7ac1d45a4f5fb8fe5d1a28ce902c1898a27</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bc00d7ac1d45a4f5fb8fe5d1a28ce902c1898a27
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Fri Sep 13 18:58:49 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-ps: update to 1.8.0; R-ragg: update to 1.3.3
</span>---
R/R-ps/Portfile | 22 ++++++++++++++-----
...-fix-for-missing-MNT_CPROTECT-in-macOS-10.patch | 24 +++++++++++++++++++++
.../0002-api-macos.c-fix-statfs-for-32-bit.patch | 25 ++++++++++++++++++++++
...rch-macos-apps.m-fix-compilation-with-gcc.patch | 22 +++++++++++++++++++
R/R-ragg/Portfile | 11 +++++-----
5 files changed, 94 insertions(+), 10 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 a7d9d8602ab..0d5a97fbff1 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.7.7 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup github r-lib ps 1.8.0 v
</span> revision 0
categories-append sysutils
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,11 +12,22 @@ 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 b573682b7770099aa335c6deaba65f133cd1bd6e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 acbc68887f0db137bdec29badb3fcc2a4c8a183141dc007e70f522813d82aa88 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 133007
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e3becd53ac081030236d396ea438af0272579e55 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f21385cbf70743cdb5aa6c2992969ae50c8f8185d6fc61a0f07a7c9b538d5a3f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 168566
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/r-lib/ps/commit/063cfbbe4108f0a44d28aa800e22dc48afc149c9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/r-lib/ps/commit/09513e3b4546eb831a877339b814824442f8ff7c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 0001-api-macos.c-fix-for-missing-MNT_CPROTECT-in-macOS-10.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-api-macos.c-fix-statfs-for-32-bit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gcc requires specific ObjC standard to compile this code:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-arch-macos-apps.m-fix-compilation-with-gcc.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.env-append \
RBIN=${r.cmd}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +40,8 @@ depends_test-append port:R-callr \
</span> port:R-R6 \
port:R-rlang \
port:R-testthat \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:R-webfakes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-webfakes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-withr
</span>
# FIXME: some tests fail on older macOS: https://github.com/r-lib/ps/issues/137
test.run yes
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..69b2f175d23
</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-ps/files/0001-api-macos.c-fix-for-missing-MNT_CPROTECT-in-macOS-10.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From cde9c8b3b5f410d3c7e605bfddbd91ef90e6faf6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 13 Sep 2024 13:04:25 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] api-macos.c: fix for missing MNT_CPROTECT in macOS < 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/api-macos.c | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/api-macos.c src/api-macos.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b81931a..5a77046 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/api-macos.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/api-macos.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1254,7 +1254,10 @@ SEXP ps__fs_info(SEXP path, SEXP abspath, SEXP mps) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOGICAL(VECTOR_ELT(res, 30))[i] = sfs.f_flags & MNT_JOURNALED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOGICAL(VECTOR_ELT(res, 31))[i] = sfs.f_flags & MNT_DEFWRITE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOGICAL(VECTOR_ELT(res, 32))[i] = sfs.f_flags & MNT_MULTILABEL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Since sys/mount.h includes Availability.h, we use underscore-prefixed macro */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOGICAL(VECTOR_ELT(res, 33))[i] = sfs.f_flags & MNT_CPROTECT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNPROTECT(1);
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..69a89f37ce4
</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-ps/files/0002-api-macos.c-fix-statfs-for-32-bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 19b193dd26efe2f0ba970ced974b280e4ead6f16 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 13 Sep 2024 13:32:43 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] api-macos.c: fix statfs for 32-bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/api-macos.c | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/api-macos.c src/api-macos.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5a77046..e25661f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/api-macos.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/api-macos.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdbool.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__i386__) || defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define statfs statfs64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define getfsstat getfsstat64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct mach_timebase_info PS_MACH_TIMEBASE_INFO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PS__TV2DOUBLE(t) ((t).tv_sec + (t).tv_usec / 1000000.0)
</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/0003-arch-macos-apps.m-fix-compilation-with-gcc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a98d5c4d8dd
</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-ps/files/0003-arch-macos-apps.m-fix-compilation-with-gcc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 02b4f15f0ef9d2455bee2b54974a321d6f2efcc2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 13 Sep 2024 13:33:10 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] arch/macos/apps.m: fix compilation with gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Makevars.in | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/Makevars.in b/src/Makevars.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9aeeeda..7fd4472 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makevars.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makevars.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,8 @@ OBJECTS = @OBJECTS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_LIBS = @LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_OBJCFLAGS = -std=c11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: all clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: px @TARGETS@ $(SHLIB)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-ragg/Portfile b/R/R-ragg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 174dc58e60d..d7c45d15fad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-ragg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-ragg/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 ragg 1.3.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup github r-lib ragg 1.3.3 v
</span> revision 0
categories-append graphics
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,13 +11,14 @@ license MIT
</span> description Graphic devices based on AGG
long_description {*}${description}
homepage https://ragg.r-lib.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 89d366670801fcf5a0cbfe9161a21a93b07a4f4d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 68129c327f39ff50fa2b7584aac13ef2821d13a361bd3a3c889bb57d153fa11f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 608492
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c3bc0522ef8d03735e06b11ed325593146e2eb82 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4ad9f8bdade59fdfd879695613a92ac2f86ac24f5a41e71631fed495168801e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 608518
</span> github.tarball_from archive
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:freetype \
path:include/turbojpeg.h:libjpeg-turbo \
port:libpng \
</pre><pre style='margin:0'>
</pre>