<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f521b72d4bc68bbc11a504714e0235abb71f35bb">https://github.com/macports/macports-ports/commit/f521b72d4bc68bbc11a504714e0235abb71f35bb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f521b72d4bc68bbc11a504714e0235abb71f35bb
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 24 10:21:23 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    R: fix dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * add several ports that R opportunistically uses
</span><span style='display:block; white-space:pre;color:#404040;'>    * the tcl GUI works when tcl is installed with +quartz
</span><span style='display:block; white-space:pre;color:#404040;'>    * add java as a variant instead of opportunistically using it
</span>---
 math/R/Portfile | 50 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 19 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 ff2a741..76a5a9a 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;'>@@ -7,6 +7,7 @@ PortGroup active_variants 1.1
</span> name                        R
 #Remember to remove revision line when bumping version
 version                     3.5.1
<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;'>@@ -41,8 +42,25 @@ depends_lib                 port:readline \
</span>                             port:icu \
                             port:libiconv \
                             port:zlib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:pcre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:pcre2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:less \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:texinfo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:gzip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:zip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:unzip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:gnutar \
</span>                             port:xz
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid finding ${prefix}/bin/xdg-open first
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> universal_variant           no
 
 set resources               ${frameworks_dir}/R.framework/Versions/${branch}/Resources
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,12 +93,12 @@ configure.args              --enable-R-framework \
</span>                             --enable-BLAS-shlib \
                             --without-tcltk \
                             --without-cairo \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --disable-java \
</span>                             --without-recommended-packages \
                             --without-x \
                             --with-included-gettext
 
 if {${os.platform} eq "darwin" && ${os.major} < 13} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append    port:curl
</span>     configure.args-append --disable-openmp
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,12 +126,9 @@ variant cairo description {use cairo and pango} {
</span>                             path:lib/pkgconfig/glib-2.0.pc:glib2 \
                             port:freetype \
                             port:fontconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:jpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-delete   --without-cairo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   --with-cairo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-replace  --without-cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-cairo
</span> }
 
 variant debug description {build with debug symbols} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,12 +140,9 @@ variant recommended description {install recommended R packages} {
</span>     configure.args-append   --with-recommended-packages
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant tcltk requires x11 description {enable use of tcltk} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tcltk description {enable use of tcltk} {
</span>     depends_lib-append      port:tcl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:tk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXScrnSaver \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    require_active_variants tk x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:tk
</span>     configure.args-delete   --without-tcltk
     configure.args-append   --with-tcltk \
                             --with-tcl-config=${prefix}/lib/tclConfig.sh \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,18 +157,18 @@ variant x11 description {enable use of x11} {
</span>     depends_lib-append      port:xorg-libsm \
                             port:xorg-libice \
                             port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:jpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:libpng
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-delete   --without-x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --without-jpeglib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:xorg-libXt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-delete   --without-x
</span>     configure.args-append   --with-x \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-jpeglib \
</span>                             --x-include=${prefix}/include/X11 \
                             --x-lib=${prefix}/lib
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant java description {enable Java} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup java 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-replace --disable-java --enable-java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> default_variants +cairo +recommended +x11
 
 if {[variant_isset cairo] && [variant_isset x11]} {
</pre><pre style='margin:0'>

</pre>