<!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>[119608] trunk/dports/kde/rkward</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/119608">119608</a></dd>
<dt>Author</dt> <dd>mk@macports.org</dd>
<dt>Date</dt> <dd>2014-05-02 03:57:29 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>rkward: update according to #32837</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskderkwardPortfile">trunk/dports/kde/rkward/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/kde/rkward/files/</li>
<li><a href="#trunkdportskderkwardfilespatchrkwardrbackendrkstructuregettercppdiff">trunk/dports/kde/rkward/files/patch-rkward-rbackend-rkstructuregetter.cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportskderkwardPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/rkward/Portfile (119607 => 119608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/rkward/Portfile 2014-05-02 09:55:17 UTC (rev 119607)
+++ trunk/dports/kde/rkward/Portfile 2014-05-02 10:57:29 UTC (rev 119608)
</span><span class="lines">@@ -2,15 +2,17 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup cmake 1.0
</ins><span class="cx"> fetch.type svn
</span><del>-svn.url http://svn.code.sf.net/p/rkward/code/branches/release_branches/rkward_0.6.1
</del><ins>+name rkward
+version 0.6.1
+revision 2
+svn.url http://svn.code.sf.net/p/rkward/code/branches/release_branches/rkward_${version}
</ins><span class="cx"> svn.revision 4635
</span><del>-worksrcdir ${workpath}/rkward_0.6.1
</del><ins>+patchfiles patch-rkward-rbackend-rkstructuregetter.cpp.diff
+worksrcdir ${name}_${version}
</ins><span class="cx">
</span><del>-name rkward
</del><span class="cx"> conflicts rkward-devel
</span><del>-version 0.6.1
-revision 1
</del><span class="cx"> categories kde kde4 math science
</span><span class="cx"> maintainers hhu.de:meik.michalke
</span><span class="cx"> license GPL-2
</span><span class="lines">@@ -24,45 +26,27 @@
</span><span class="cx">
</span><span class="cx"> homepage http://rkward.sourceforge.net
</span><span class="cx">
</span><del>-master_sites https://sourceforge.net/projects/rkward/files/Current_Stable_Releases
-
-PortGroup cmake 1.0
-
</del><span class="cx"> depends_lib port:kdelibs4 \
</span><span class="cx"> port:kate \
</span><ins>+ port:okular \
</ins><span class="cx"> port:R
</span><span class="cx">
</span><del>-# add port:okular once the graphics device is fully functional
-# this needs port:poppler with +qt4 +quartz varaints which cannot be
-# specified with depends_lib-append
-variant okular description {Add okular for nice PDF handling} {
- depends_lib-append port:okular
-}
-
-if {${configure.compiler} == "clang"} {
- # force the use of gcc 4.8 to be able to link with R-framework
- depends_lib-append port:gcc48
- configure.compiler macports-gcc-4.8
- configure.objc /usr/bin/gcc
- configure.env-append "OBJCXX=${configure.objc}"
-}
-
</del><span class="cx"> post-extract {
</span><del>- # creates the build dir if it doesn't exist
- # this won't return errors if directory is already there
- file mkdir ${worksrcdir}/build
</del><ins>+ file mkdir ${worksrcpath}/build
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-configure.dir ${worksrcdir}/build
</del><ins>+configure.dir ${worksrcpath}/build
</ins><span class="cx"> configure.args-append \
</span><span class="cx"> -DNO_R_XML=1 \
</span><span class="cx"> -DRKVERSION_NUMBER=${version} \
</span><span class="cx"> -DBUNDLE_INSTALL_DIR=${applications_dir} \
</span><del>- -DR_EXECUTABLE=${prefix}/Library/Frameworks/R.framework/Resources/R
-# work around moved Qt include dir
-if { ![file exists ${prefix}/include/Qt/qglobal.h] && [file exists ${prefix}/include/QtCore/qglobal.h] } {
- configure.args-append -DQT_QT_INCLUDE_DIR=${prefix}/include/QtCore
</del><ins>+ -DR_EXECUTABLE=${frameworks_dir}/R.framework/Resources/R
+
+variant debug description {Add full debugging support} {
+ depends_lib-append port:valgrind
</ins><span class="cx"> }
</span><del>-configure.cmd cmake ..
</del><span class="cx">
</span><del>-build.dir ${worksrcdir}/build
</del><ins>+configure.post_args ..
+
+build.dir ${worksrcpath}/build
+
</ins></span></pre></div>
<a id="trunkdportskderkwardfilespatchrkwardrbackendrkstructuregettercppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/rkward/files/patch-rkward-rbackend-rkstructuregetter.cpp.diff (0 => 119608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/rkward/files/patch-rkward-rbackend-rkstructuregetter.cpp.diff (rev 0)
+++ trunk/dports/kde/rkward/files/patch-rkward-rbackend-rkstructuregetter.cpp.diff 2014-05-02 10:57:29 UTC (rev 119608)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+Index: rkward/rbackend/rkstructuregetter.cpp
+===================================================================
+--- rkward/rbackend/rkstructuregetter.cpp (revision 4653)
++++ rkward/rbackend/rkstructuregetter.cpp (revision 4660)
+@@ -193,22 +193,33 @@
+
+ // get classes
+ SEXP classes_s;
++ QStringList classes;
+
+ if ((TYPEOF (value) == LANGSXP) || (TYPEOF (value) == SYMSXP)) { // if it's a call, we should NEVER send it through eval
+- extern SEXP R_data_class (SEXP, Rboolean);
+- classes_s = R_data_class (value, (Rboolean) 0);
++ // stripped down and adjusted from R_data_class
++ PROTECT (classes_s = Rf_getAttrib (value, R_ClassSymbol));
++ if (Rf_length (classes_s)) classes = RKRSupport::SEXPToStringList(classes_s);
++ UNPROTECT (1);
++ if (classes.isEmpty ()) {
++ if (TYPEOF (value) == LANGSXP) {
++ SEXP symb = PROTECT (CAR (value));
++ QString cl;
++ if (TYPEOF (symb) == SYMSXP) cl = CHAR (PRINTNAME (symb));
++ UNPROTECT (1);
++ if ((cl != "if") && (cl != "while") && (cl != "for") && (cl != "=") && (cl != "<-") && (cl != "(") && (cl != "{")) cl = "call";
++ classes = QStringList (cl);
++ } else {
++ classes = QStringList ("name");
++ }
++ }
+
+ REPROTECT (value = Rf_coerceVector (value, EXPRSXP), value_index); // make sure the object is safe for everything to come
+-
+- PROTECT (classes_s);
+ } else {
+- classes_s = RKRSupport::callSimpleFun (class_fun, value, baseenv);
+- PROTECT (classes_s);
++ PROTECT (classes_s = RKRSupport::callSimpleFun (class_fun, value, baseenv));
++ classes = RKRSupport::SEXPToStringList (classes_s);
++ UNPROTECT (1);
+ }
+
+- QStringList classes = RKRSupport::SEXPToStringList (classes_s);
+- UNPROTECT (1); /* classes_s */
+-
+ // store classes
+ RData *classdata = new RData;
+ classdata->setData (classes);
</ins></span></pre>
</div>
</div>
</body>
</html>