<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/711312fd49cf66a3043853424b48e231156d1867">https://github.com/macports/macports-ports/commit/711312fd49cf66a3043853424b48e231156d1867</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 711312fd49cf66a3043853424b48e231156d1867
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sun Apr 7 14:28:29 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-rsconnect: update to 1.2.2
</span>---
R/R-PKI/Portfile | 36 +++++++++++++++++++++++++++++++++
R/R-PKI/files/patch-unbreak-macros.diff | 24 ++++++++++++++++++++++
R/R-rsconnect/Portfile | 9 +++++----
3 files changed, 65 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-PKI/Portfile b/R/R-PKI/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9d6eda2a181
</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-PKI/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup R 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran r-project PKI 0.1-12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories-append crypto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license {GPL-2 GPL-3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Public Key Infrastucture for R, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ based on the X.509 standard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.rforge.net/PKI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1e5616775e870f8733a22695cbe5491f81f6520f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ad837a42866ecbbe5a17eb5912133f4464217cf34e80126bf4b7669ba8792d5a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 85544
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The code is wrong, which is obscured by misplaced macros.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# We add a temporary fix for older systems here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# It should be replaced or dropped, once fixed in upstream.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://github.com/s-u/PKI/pull/31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-unbreak-macros.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;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:R-base64enc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:R-gmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-PKI/files/patch-unbreak-macros.diff b/R/R-PKI/files/patch-unbreak-macros.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..051891a5f18
</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-PKI/files/patch-unbreak-macros.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/pki.h 2022-11-28 05:31:11.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/pki.h 2024-04-05 14:42:38.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +33,7 @@
</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;'>+ #if __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined MAC_OS_X_VERSION_10_7 && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* use accelerated crypto on OS X instead of OpenSSL crypto */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* We only use the one-shot functions normally declared in CommonCrypto/CommonDigest.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to avoid nonsensical warnings */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SHA256(D,L,H) CC_SHA256(D, (uint32_t)(L), H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef MD5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MD5(D,L,H) CC_MD5(D, (uint32_t)(L), H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else /* !LP64 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef SHA1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SHA1(D,L,H) do (1) { if ((L) >= 4294967296L) SHA1(D,L,H) else CC_SHA1(D, (uint32_t)(L), H); break }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,3 +58,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MD5 do (1) { if ((L) >= 4294967296L) MD5(D,L,H) else CC_MD5(D, (uint32_t)(L), H); break }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* LP64 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-rsconnect/Portfile b/R/R-rsconnect/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7da24d8020a..61c00aca883 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-rsconnect/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-rsconnect/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,16 +4,16 @@ PortSystem 1.0
</span> PortGroup R 1.0
# Revert to GitHub once updated there.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran rstudio rsconnect 1.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran rstudio rsconnect 1.2.2
</span> revision 0
maintainers nomaintainer
license GPL-2
description Deployment interface for R-rmarkdown documents and R-shiny applications
long_description {*}${description}
homepage https://github.com/rstudio/rsconnect
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f47b68f22068165294ec7a295f2bbbc17bc27ae4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2925480684095b121e622faddf886f8eee04bc4f3870d120182624d745fece6a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 470779
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 18d10f90b5d02563d42c95582f429a6f0721df4d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 257bc0fe17d9d6749d66982f044133f7b45059f8b4e8f7cbc585782fde91c0a6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 473136
</span> supported_archs noarch
depends_lib-append port:R-cli \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,7 @@ depends_lib-append port:R-cli \
</span> port:R-lifecycle \
port:R-openssl \
port:R-packrat \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-PKI \
</span> port:R-renv \
port:R-rlang \
port:R-rstudioapi \
</pre><pre style='margin:0'>
</pre>