<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138596] trunk/dports/math/R/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138596">138596</a></dd>
<dt>Author</dt> <dd>adfernandes@macports.org</dd>
<dt>Date</dt> <dd>2015-07-13 08:35:39 -0700 (Mon, 13 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>update: R to 3.2.1, closes #48133, maintainer timeout.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathRPortfile">trunk/dports/math/R/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathRPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/R/Portfile (138595 => 138596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/R/Portfile 2015-07-13 15:21:20 UTC (rev 138595)
+++ trunk/dports/math/R/Portfile 2015-07-13 15:35:39 UTC (rev 138596)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> name R
</span><span class="cx">
</span><span class="cx"> set major 3
</span><del>-set minor 1
-set point 2
</del><ins>+set minor 2
+set point 1
</ins><span class="cx">
</span><span class="cx"> #Remember to remove revision line when bumping version
</span><span class="cx"> version ${major}.${minor}.${point}
</span><span class="lines">@@ -33,14 +33,15 @@
</span><span class="cx"> master_sites http://cran.rstudio.com/src/base/R-3/ \
</span><span class="cx"> http://cran.r-project.org/src/base/R-3/
</span><span class="cx">
</span><del>-checksums rmd160 b2aaa42daac1ae5d114995de514d211d78a4e0a6 \
- sha256 bcd150afcae0e02f6efb5f35a6ab72432be82e849ec52ce0bb89d8c342a8fa7a
</del><ins>+checksums rmd160 dea095b5c7b32189b6768d5949243bd869564e9f \
+ sha256 d59dbc3f04f4604a5cf0fb210b8ea703ef2438b3ee65fd5ab536ec5234f4c982
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="cx"> depends_lib port:readline \
</span><span class="cx"> port:icu \
</span><del>- port:libiconv
</del><ins>+ port:libiconv \
+ port:zlib
</ins><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="lines">@@ -52,29 +53,28 @@
</span><span class="cx">
</span><span class="cx"> configure.pre_args --prefix=${frameworks_dir}
</span><span class="cx">
</span><del>-configure.args --enable-R-framework \
</del><ins>+configure.args --enable-memory-profiling \
</ins><span class="cx"> --enable-R-shlib \
</span><span class="cx"> --enable-BLAS-shlib \
</span><del>- --disable-openmp \
- --with-readline \
- --with-aqua \
</del><span class="cx"> --without-tcltk \
</span><span class="cx"> --without-cairo \
</span><del>- --with-libpng \
- --without-jpeglib \
</del><ins>+ --with-system-zlib \
+ --without-internal-tzcode \
</ins><span class="cx"> --without-recommended-packages \
</span><del>- --with-ICU \
</del><span class="cx"> --without-x \
</span><span class="cx"> --with-included-gettext \
</span><del>- --without-internal-tzcode
</del><ins>+ --without-system-xz #bug introduced in R-3.2.0, doesn't link to system copy, put port:xz back too
</ins><span class="cx">
</span><ins>+if {${os.major} < 13} {
+ configure.args-append --disable-openmp
+}
+
</ins><span class="cx"> platform darwin 13 {
</span><span class="cx"> configure.cflags-append -flax-vector-conversions
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant accelerate conflicts builtin_lapack description {build using the BLAS and Lapack in Apple's Accelerate framework} {
- configure.args-append --with-blas="-framework Accelerate" \
- --with-lapack="-framework Accelerate"
</del><ins>+variant accelerate conflicts atlas builtin_lapack description {build using the BLAS and Lapack in Apple's Accelerate framework} {
+ configure.args-append --with-blas="-framework Accelerate" --with-lapack
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant atlas conflicts accelerate builtin_lapack description {build using the BLAS in the atlas port} {
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> #See A.3.2 in R Installation and Administration for why atlas LAPACK not used
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant builtin_lapack conflicts accelerate description {build using reference BLAS and Lapack} {
</del><ins>+variant builtin_lapack conflicts accelerate atlas description {build using reference BLAS and Lapack} {
</ins><span class="cx"> configure.args-append --without-blas --without-lapack
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -93,7 +93,10 @@
</span><span class="cx"> path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span class="cx"> port:freetype \
</span><span class="cx"> port:fontconfig \
</span><del>- port:gettext
</del><ins>+ port:gettext \
+ port:libpng \
+ port:tiff \
+ port:jpeg
</ins><span class="cx"> configure.args-delete --without-cairo
</span><span class="cx"> configure.args-append --with-cairo
</span><span class="cx"> }
</span><span class="lines">@@ -174,8 +177,7 @@
</span><span class="cx"> port:xorg-libXt \
</span><span class="cx"> port:tiff \
</span><span class="cx"> port:jpeg \
</span><del>- port:libpng \
- port:zlib
</del><ins>+ port:libpng
</ins><span class="cx"> configure.args-delete --without-x \
</span><span class="cx"> --without-jpeglib
</span><span class="cx"> configure.args-append --with-x \
</span><span class="lines">@@ -192,7 +194,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset builtin_lapack]} {
</span><del>- default_variants-append +accelerate
</del><ins>+ default_variants-append +builtin_lapack
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> test.run yes
</span><span class="lines">@@ -249,3 +251,6 @@
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url [lindex ${master_sites} 0]
</span><span class="cx"> livecheck.regex >${name}-(\[0-9.\]+)${extract.suffix}<
</span><ins>+
+
+
</ins></span></pre>
</div>
</div>
</body>
</html>