<!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>[128623] trunk/dports/devel/ddd</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/128623">128623</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2014-11-24 07:27:36 -0800 (Mon, 24 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>devel/ddd:
Fix build error on OS X >= 10.9, closes #42800</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdeveldddPortfile">trunk/dports/devel/ddd/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdeveldddfilespatchstrclassfrienddiff">trunk/dports/devel/ddd/files/patch-strclass-friend.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdeveldddPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/ddd/Portfile (128622 => 128623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/ddd/Portfile 2014-11-24 14:28:47 UTC (rev 128622)
+++ trunk/dports/devel/ddd/Portfile 2014-11-24 15:27:36 UTC (rev 128623)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx"> port:xorg-libXaw \
</span><span class="cx"> port:xorg-libXp
</span><span class="cx">
</span><del>-patchfiles patch-ambiguous-overload.diff
</del><ins>+patchfiles patch-ambiguous-overload.diff \
+ patch-strclass-friend.diff
</ins><span class="cx">
</span><span class="cx"> configure.args --infodir=${prefix}/share/info \
</span><span class="cx"> --mandir=${prefix}/share/man \
</span></span></pre></div>
<a id="trunkdportsdeveldddfilespatchstrclassfrienddiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/ddd/files/patch-strclass-friend.diff (0 => 128623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/ddd/files/patch-strclass-friend.diff (rev 0)
+++ trunk/dports/devel/ddd/files/patch-strclass-friend.diff 2014-11-24 15:27:36 UTC (rev 128623)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+Upstream: https://savannah.gnu.org/bugs/download.php?file_id=31132
+--- ddd/strclass.h
++++ ddd/strclass.h
+@@ -810,10 +810,10 @@ public:
+ friend int split(const string& x, string *res, int maxn,
+ const regex& sep);
+
+- friend string common_prefix(const string& x, const string& y,
+- int startpos = 0);
+- friend string common_suffix(const string& x, const string& y,
+- int startpos = -1);
++ inline string common_prefix(const string& x, const string& y);
++ friend string common_prefix(const string& x, const string& y, int startpos);
++ inline string common_suffix(const string& x, const string& y);
++ friend string common_suffix(const string& x, const string& y, int startpos);
+ friend string replicate(char c, int n);
+ friend string replicate(const string& y, int n);
+ friend string join(const string *src, int n, const string& sep);
+@@ -863,9 +863,10 @@ public:
+ friend inline std::ostream& operator<<(std::ostream& s, const subString& x);
+ friend std::istream& operator>>(std::istream& s, string& x);
+
+- friend int readline(std::istream& s, string& x,
+- char terminator = '\n',
+- int discard_terminator = 1);
++ inline int readline(std::istream& s, string& x);
++ inline int readline(std::istream& s, string& x, char terminator);
++ friend int readline(std::istream& s, string& x, char terminator,
++ int discard_terminator);
+
+ // Status
+ unsigned int length() const;
+@@ -1456,6 +1457,16 @@ inline string operator + (char x, const subString& y)
+ string r; cat(x, y, r); return r;
+ }
+
++inline string common_prefix(const string& x, const string& y)
++{
++ return common_prefix(x, y, 0);
++}
++
++inline string common_suffix(const string& x, const string& y)
++{
++ return common_suffix(x, y, -1);
++}
++
+ inline string reverse(const string& x)
+ {
+ string r; r.rep = string_Sreverse(x.rep, r.rep); return r;
+@@ -1476,6 +1487,16 @@ inline string capitalize(const string& x)
+ string r; r.rep = string_Scapitalize(x.rep, r.rep); return r;
+ }
+
++inline int readline(std::istream& s, string& x)
++{
++ return readline(s, x, '\n', 1);
++}
++
++inline int readline(std::istream& s, string& x, char terminator)
++{
++ return readline(s, x, terminator, 1);
++}
++
+ // prepend
+
+ inline string& string::prepend(const string& y)
</ins></span></pre>
</div>
</div>
</body>
</html>