<!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>[94239] trunk/dports/math/scalc</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/94239">94239</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2012-06-12 19:12:40 -0700 (Tue, 12 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>scalc: fix build failure on Lion and up due to redefinition of getline</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathscalcPortfile">trunk/dports/math/scalc/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmathscalcfilespatchgetlinediff">trunk/dports/math/scalc/files/patch-getline.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathscalcPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/scalc/Portfile (94238 => 94239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/scalc/Portfile 2012-06-13 01:59:17 UTC (rev 94238)
+++ trunk/dports/math/scalc/Portfile 2012-06-13 02:12:40 UTC (rev 94239)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:smake
</span><span class="cx">
</span><del>-patchfiles patch-RULES_rules.prg.diff
</del><ins>+patchfiles patch-RULES_rules.prg.diff \
+ patch-getline.diff
</ins><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><span class="lines">@@ -35,6 +36,7 @@
</span><span class="cx">
</span><span class="cx"> destroot.destdir INS_BASE=${destroot}${prefix} \
</span><span class="cx"> MANDIR=share/man
</span><ins>+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> delete ${destroot}${prefix}/lib ${destroot}${prefix}/include \
</span><span class="cx"> ${destroot}${prefix}/share/man/man5
</span></span></pre></div>
<a id="trunkdportsmathscalcfilespatchgetlinediff"></a>
<div class="addfile"><h4>Added: trunk/dports/math/scalc/files/patch-getline.diff (0 => 94239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/scalc/files/patch-getline.diff (rev 0)
+++ trunk/dports/math/scalc/files/patch-getline.diff 2012-06-13 02:12:40 UTC (rev 94239)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+--- calc/calc.c.orig 2004-07-11 16:34:54.000000000 -0500
++++ calc/calc.c 2012-06-12 21:09:24.000000000 -0500
+@@ -96,7 +96,7 @@
+ }
+
+ putchar('?'); flush();
+- while (getline(eingabe, LLEN) >= 0 && !streql(eingabe, "quit")) {
++ while (schily_getline(eingabe, LLEN) >= 0 && !streql(eingabe, "quit")) {
+
+ opstr = eingabe;
+ while (*opstr == ' ' || *opstr == '\t')
+--- include/schily.h.orig 2004-03-04 18:30:40.000000000 -0600
++++ include/schily.h 2012-06-12 21:09:36.000000000 -0500
+@@ -187,7 +187,7 @@
+ extern char *findbytes __PR((const void *, int, char));
+ extern int findline __PR((const char *, char, const char *,
+ int, char **, int));
+-extern int getline __PR((char *, int));
++extern int schily_getline __PR((char *, int));
+ extern int getstr __PR((char *, int));
+ extern int breakline __PR((char *, char, char **, int));
+ extern int getallargs __PR((int *, char * const**, const char *, ...));
+--- libschily/stdio/fgetline.c.orig 2003-06-14 18:55:42.000000000 -0500
++++ libschily/stdio/fgetline.c 2012-06-12 21:09:58.000000000 -0500
+@@ -64,7 +64,7 @@
+ }
+
+ EXPORT int
+-getline(buf, len)
++schily_getline(buf, len)
+ char *buf;
+ int len;
+ {
</ins></span></pre>
</div>
</div>
</body>
</html>