<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/54d03efb5351e4e3f471d34d0d856c107c01ad92">https://github.com/macports/macports-ports/commit/54d03efb5351e4e3f471d34d0d856c107c01ad92</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 54d03efb535 R: disable the use of latex by default
</span>54d03efb535 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 54d03efb5351e4e3f471d34d0d856c107c01ad92
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Thu Apr 21 16:27:11 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> R: disable the use of latex by default
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add latex variant
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65045
</span>---
math/R/Portfile | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/R/Portfile b/math/R/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 19929d1f26e..443883a99c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/R/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/R/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup active_variants 1.1
</span> name R
# Remember to set revision to 0 when bumping version
version 4.1.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories math science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,9 +40,7 @@ compiler.blacklist-append {clang < 500}
</span> compilers.choose fc f77
compilers.setup require_fortran
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-basic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-latex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span>
depends_lib port:readline \
port:icu \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,8 +62,8 @@ depends_lib port:readline \
</span> port:xz
# avoid finding ${prefix}/bin/xdg-open first
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append R_PDFVIEWER=/usr/bin/open \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- R_BROWSER=/usr/bin/open
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append R_PDFVIEWER=/usr/bin/open \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ R_BROWSER=/usr/bin/open
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +72,7 @@ set resources ${frameworks_dir}/R.framework/Versions/${branch}/Res
</span> post-patch {
reinplace "s|R_HOME|\"${resources}\"|" "${worksrcpath}/src/unix/Rscript.c"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Check to see if this is fixed post 3.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check to see if this is fixed post 3.3.0
</span> reinplace "s|<libintl.h>|\"libintl.h\"|" "${worksrcpath}/src/include/Defn.h"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,6 +103,11 @@ configure.args --disable-openmp \
</span> --without-x \
--with-included-gettext
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# disable tex/latex the hard way as there's no configure args for these
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append ac_cv_path_TEX= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_PDFTEX= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_PDFLATEX=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && ${os.major} < 13} {
configure.args-append --disable-openmp
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,6 +166,15 @@ variant recommended description {install recommended R packages} {
</span> configure.args-append --with-recommended-packages
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant latex description {build with LaTeX support and docs in PDF} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:texlive-basic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-latex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-latex-recommended
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-delete ac_cv_path_TEX= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_PDFTEX= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_PDFLATEX=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant tcltk description {enable use of tcltk} {
depends_lib-append port:tcl \
port:tk
</pre><pre style='margin:0'>
</pre>