<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/cf48706af49f88ec2bd9cc121ecb504c555dc9ed">https://github.com/macports/macports-ports/commit/cf48706af49f88ec2bd9cc121ecb504c555dc9ed</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cf48706af49f88ec2bd9cc121ecb504c555dc9ed
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Wed Sep 13 01:27:40 2023 +0700

<span style='display:block; white-space:pre;color:#404040;'>    R-QuickJSR: fix for < 10.11, revbump
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/68152
</span>---
 R/R-QuickJSR/Portfile                   | 18 ++++++++++++++++--
 R/R-QuickJSR/files/patch-legacy.diff    | 11 +++++++++++
 R/R-QuickJSR/files/patch-libatomic.diff | 11 +++++------
 3 files changed, 32 insertions(+), 8 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-QuickJSR/Portfile b/R/R-QuickJSR/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d3e4f21380..94cc1c9f6c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-QuickJSR/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-QuickJSR/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,13 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           legacysupport 1.1
</span> PortGroup           R 1.0
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> R.setup             cran andrjohns QuickJSR 1.0.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories-append   devel
 maintainers         {@barracuda156 gmail.com:vital.had} openmaintainer
 license             MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,8 +25,19 @@ depends_lib-append  port:R-jsonlite \
</span> # See: https://github.com/andrjohns/QuickJSR/issues/1
 # However the solution used relies on uname, which leaves Rosetta build broken.
 # We do not need to guess here and can fix flags directly.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Notice, this is not a Darwin-specific issue.
</span> if {[string match macports-gcc* ${configure.compiler}] && (${configure.build_arch} in [list i386 ppc])} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles      patch-libatomic.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-libatomic.diff
</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;'>+# https://trac.macports.org/ticket/68152
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-legacy.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/Makevars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 depends_test-append port:R-testthat
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-QuickJSR/files/patch-legacy.diff b/R/R-QuickJSR/files/patch-legacy.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6207e6ab549
</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-QuickJSR/files/patch-legacy.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makevars   2023-09-03 20:16:54.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makevars   2023-09-12 23:43:25.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_CPPFLAGS = -I"../inst/include" -D_GNU_SOURCE -DCONFIG_VERSION=\"2021-03-27\" -DSTRICT_R_HEADERS -DCONFIG_BIGNUM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_CPPFLAGS = -I"../inst/include" -I@PREFIX@/include/LegacySupport -D_GNU_SOURCE -DCONFIG_VERSION=\"2021-03-27\" -DSTRICT_R_HEADERS -DCONFIG_BIGNUM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CXXFLAGS = -DSTRICT_R_HEADERS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_LIBS = -L../inst/lib/$(R_ARCH)/ -lquickjs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_LIBS = -L../inst/lib/$(R_ARCH)/ -lquickjs -L@PREFIX@/lib -lMacportsLegacySupport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(shell uname -p), powerpc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ifeq ($(shell getconf LONG_BIT), 32)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-QuickJSR/files/patch-libatomic.diff b/R/R-QuickJSR/files/patch-libatomic.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bc8c8217179..450bd582e81 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-QuickJSR/files/patch-libatomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-QuickJSR/files/patch-libatomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,15 @@
</span> --- src/Makevars  2023-09-03 20:16:54.000000000 +0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makevars        2023-09-08 21:10:30.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,12 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CPPFLAGS = -I"../inst/include" -D_GNU_SOURCE -DCONFIG_VERSION=\"2021-03-27\" -DSTRICT_R_HEADERS -DCONFIG_BIGNUM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makevars   2023-09-12 23:52:12.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,11 +2,7 @@
</span>  PKG_CXXFLAGS = -DSTRICT_R_HEADERS
<span style='display:block; white-space:pre;background:#ffe0e0;'>--PKG_LIBS = -L../inst/lib/$(R_ARCH)/ -lquickjs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_LIBS = -L../inst/lib/$(R_ARCH)/ -lquickjs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span> -ifeq ($(shell uname -p), powerpc)
 -      ifeq ($(shell getconf LONG_BIT), 32)
 -              PKG_LIBS += -latomic
 -      endif
 -endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+PKG_LIBS = -L../inst/lib/$(R_ARCH)/ -lquickjs -latomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_LIBS += -latomic
</span>  
  QUICKJS_OBJECTS = quickjs/cutils.o quickjs/libbf.o quickjs/libregexp.o quickjs/libunicode.o \
                    quickjs/quickjs-libc.o quickjs/quickjs.o quickjs/unicode_gen.o
</pre><pre style='margin:0'>

</pre>