[122483] trunk/dports/math/R/Portfile

[larryv at macports.org]

Revision: 122483
          https://trac.macports.org/changeset/122483
Author:   larryv at macports.org
Date:     2014-07-22 20:07:08 -0700 (Tue, 22 Jul 2014)
Log Message:
-----------
R: Update to 3.1.1, extricate +cairo from +x11 (maintainer, #44337).

Modified Paths:
--------------
    trunk/dports/math/R/Portfile

Modified: trunk/dports/math/R/Portfile
===================================================================
--- trunk/dports/math/R/Portfile	2014-07-23 03:04:13 UTC (rev 122482)
+++ trunk/dports/math/R/Portfile	2014-07-23 03:07:08 UTC (rev 122483)
@@ -8,13 +8,11 @@
 
 set major 3
 set minor 1
-set point 0
+set point 1
 
 #Remember to remove revision line when bumping version
 version                     ${major}.${minor}.${point}
-revision                    1
 
-
 categories                  math science
 maintainers                 me.com:kjell.konis
 license                     {GPL-2 GPL-3}
@@ -34,8 +32,8 @@
 master_sites                http://cran.rstudio.com/src/base/R-3/ \
                             http://cran.r-project.org/src/base/R-3/
 
-checksums                   rmd160  15d6c762baf36d4e2680599b5e976d0c068b7dbd \
-                            sha256  8a680390f84c58c01dcdefd682eaa0e90389f09e6d2f2e090c71af40065f5fe2
+checksums                   rmd160  72e5d7a9ec4dc9c960321e7fc8d939cb59d63c31 \
+                            sha256  ce5c4d5e34414ce8f1ec2d5642861435fa1ddc4cd89bd336172bbe25a62c7a19
 
 depends_build               port:pkgconfig
 
@@ -88,15 +86,13 @@
     configure.args-append   --without-blas --without-lapack
 }
 
-variant cairo requires x11 description {include cairo support in R's x11 graphics device} {
+variant cairo description {use cairo and pango} {
     depends_lib-append      path:lib/pkgconfig/cairo.pc:cairo \
                             path:lib/pkgconfig/pango.pc:pango \
                             path:lib/pkgconfig/glib-2.0.pc:glib2 \
                             port:freetype \
                             port:fontconfig \
                             port:gettext 
-    require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
-    require_active_variants path:lib/pkgconfig/pango.pc:pango x11
     configure.args-delete   --without-cairo
     configure.args-append   --with-cairo
 }
@@ -187,10 +183,11 @@
                             --x-lib=${prefix}/lib
 }
 
-default_variants +recommended +x11
+default_variants +cairo +recommended +x11
 
-if {[variant_isset x11]} {
-    default_variants-append +cairo
+if {[variant_isset cairo] && [variant_isset x11]} {
+    require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
+    require_active_variants path:lib/pkgconfig/pango.pc:pango x11
 }
 
 if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset builtin_lapack]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140722/5c5a40bf/attachment-0001.html>