<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/9f3c51b1fdc74b0d4d0c338e269ece184d25cdfe">https://github.com/macports/macports-ports/commit/9f3c51b1fdc74b0d4d0c338e269ece184d25cdfe</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9f3c51b1fdc74b0d4d0c338e269ece184d25cdfe
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Fri Apr 14 23:11:52 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-magick: allow depending on it, drop patches from several R packages
</span>---
R/R-ggpp/Portfile | 4 +---
R/R-ggpp/files/patch-no-magick.diff | 12 ------------
R/R-rtweet/Portfile | 4 +---
R/R-rtweet/files/patch-no-magick.diff | 10 ----------
R/R-usethis/Portfile | 4 +---
R/R-usethis/files/patch-no-magick.diff | 10 ----------
R/R-xfun/Portfile | 4 +---
R/R-xfun/files/patch-no-magick.diff | 11 -----------
8 files changed, 4 insertions(+), 55 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-ggpp/Portfile b/R/R-ggpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14d70af58e5..e4a671de188 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-ggpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-ggpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,12 +30,10 @@ depends_lib-append port:R-dplyr \
</span> port:R-xts \
port:R-zoo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Until this is fixed: https://trac.macports.org/ticket/66978
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-no-magick.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_test-append port:R-gginnards \
port:R-ggrepel \
port:R-knitr \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-magick \
</span> port:R-rmarkdown \
port:R-testthat \
port:R-vdiffr
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-ggpp/files/patch-no-magick.diff b/R/R-ggpp/files/patch-no-magick.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ec42fb952ba..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-ggpp/files/patch-no-magick.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- DESCRIPTION.orig 2023-04-02 04:00:02.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ DESCRIPTION 2023-04-03 18:11:21.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,8 +30,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MASS (>= 7.3-58), polynom (>= 1.4-0), lubridate (>= 1.9.0),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stringr (>= 1.4.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Suggests: knitr (>= 1.40), rmarkdown (>= 2.20), ggrepel (>= 0.9.2),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gginnards(>= 0.1.1), magick (>= 2.7.3), testthat (>= 3.1.5),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vdiffr (>= 1.0.5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gginnards(>= 0.1.1), vdiffr (>= 1.0.5), testthat (>= 3.1.5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- URL: https://docs.r4photobiology.info/ggpp/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://github.com/aphalo/ggpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BugReports: https://github.com/aphalo/ggpp/issues
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-rtweet/Portfile b/R/R-rtweet/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf218f0171c..02f141176ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-rtweet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-rtweet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +27,6 @@ depends_lib-append port:R-bit64 \
</span> port:R-tibble \
port:R-withr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Until this is fixed: https://trac.macports.org/ticket/66978
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-no-magick.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_test-append port:R-askpass \
port:R-covr \
port:R-dplyr \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +34,7 @@ depends_test-append port:R-askpass \
</span> port:R-httpuv \
port:R-igraph \
port:R-knitr \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-magick \
</span> port:R-maps \
port:R-openssl \
port:R-rmarkdown \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-rtweet/files/patch-no-magick.diff b/R/R-rtweet/files/patch-no-magick.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2e0fc0b6fb7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-rtweet/files/patch-no-magick.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- DESCRIPTION.orig 2023-03-31 05:42:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ DESCRIPTION 2023-04-03 16:40:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,7 +46,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- httpuv (>= 1.6.5),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- igraph (>= 1.3.2),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- knitr (>= 1.39),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- magick (>= 2.7.3),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- maps (>= 3.4.0),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openssl (>= 2.0.2),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmarkdown (>= 2.14),
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-usethis/Portfile b/R/R-usethis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ee5cc64339..730d105c9f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-usethis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-usethis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,11 +36,9 @@ depends_lib-append port:R-cli \
</span> port:R-withr \
port:R-yaml
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# For now, due to: https://trac.macports.org/ticket/66978
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-no-magick.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_test-append port:R-covr \
port:R-knitr \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-magick \
</span> port:R-mockr \
port:R-pkgload \
port:R-rmarkdown \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-usethis/files/patch-no-magick.diff b/R/R-usethis/files/patch-no-magick.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 885467e649e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-usethis/files/patch-no-magick.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- DESCRIPTION.orig 2022-05-26 04:19:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ DESCRIPTION 2023-03-07 17:46:33.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Suggests:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- covr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- knitr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- magick,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mockr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkgload,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmarkdown,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-xfun/Portfile b/R/R-xfun/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 88e218e5e13..8b65ca0c3d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-xfun/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-xfun/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,13 +15,11 @@ checksums rmd160 c512f9589ba087e561200ba74507a31ff44b0222 \
</span> sha256 a710c2f895f6c68944f38a106448f8d1e79fb0d99a5c6a3b2ee6bd8c0203c68a \
size 133925
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# For now, remove a heavy dependency on R-magick:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-no-magick.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_test-append port:R-curl \
port:R-htmltools \
port:R-jsonlite \
port:R-knitr \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-magick \
</span> port:R-markdown \
port:R-mime \
port:R-pak \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-xfun/files/patch-no-magick.diff b/R/R-xfun/files/patch-no-magick.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ba84b905a6f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-xfun/files/patch-no-magick.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- DESCRIPTION.orig 2023-03-24 17:00:02.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ DESCRIPTION 2023-03-24 19:40:08.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Imports: stats, tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Suggests: testit, parallel, codetools, rstudioapi, tinytex (>= 0.30),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mime, markdown (>= 1.5), knitr (>= 1.42), htmltools, remotes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pak, rhub, renv, curl, jsonlite, magick, yaml, rmarkdown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pak, rhub, renv, curl, jsonlite, yaml, rmarkdown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- License: MIT + file LICENSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- URL: https://github.com/yihui/xfun
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BugReports: https://github.com/yihui/xfun/issues
</span></pre><pre style='margin:0'>
</pre>