<!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>[118728] trunk/dports/lang/ruby21</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/118728">118728</a></dd>
<dt>Author</dt> <dd>kimuraw@macports.org</dd>
<dt>Date</dt> <dd>2014-04-09 05:37:33 -0700 (Wed, 09 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>lang/ruby21: fix build error with readline-6.3 (#43296)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangruby21Portfile">trunk/dports/lang/ruby21/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangruby21filespatchreadline63diff">trunk/dports/lang/ruby21/files/patch-readline63.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangruby21Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/ruby21/Portfile (118727 => 118728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/ruby21/Portfile 2014-04-09 12:19:51 UTC (rev 118727)
+++ trunk/dports/lang/ruby21/Portfile 2014-04-09 12:37:33 UTC (rev 118728)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name ruby21
</span><span class="cx"> version 2.1.1
</span><del>-revision 0
</del><ins>+revision 1
</ins><span class="cx">
</span><span class="cx"> categories lang ruby
</span><span class="cx"> maintainers kimuraw openmaintainer
</span><span class="lines">@@ -55,6 +55,9 @@
</span><span class="cx"> --program-suffix=2.1 \
</span><span class="cx"> --with-rubylibprefix="${prefix}/lib/ruby2.1"
</span><span class="cx">
</span><ins>+# patch-readline63.diff: support readline-6.3 (#43296) from ruby-trunk r45540
+patchfiles patch-readline63.diff
+
</ins><span class="cx"> # Ignore minor version for archdir, like i686-darwin9.
</span><span class="cx"> # Port "ruby" and "ruby19" does the same.
</span><span class="cx"> configure.env-append UNAME_RELEASE=${os.major}
</span></span></pre></div>
<a id="trunkdportslangruby21filespatchreadline63diff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/ruby21/files/patch-readline63.diff (0 => 118728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/ruby21/files/patch-readline63.diff (rev 0)
+++ trunk/dports/lang/ruby21/files/patch-readline63.diff 2014-04-09 12:37:33 UTC (rev 118728)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+Index: ext/readline/extconf.rb
+===================================================================
+--- ext/readline/extconf.rb (revision 45540)
++++ ext/readline/extconf.rb (working copy)
+@@ -19,6 +19,10 @@
+ return super(func, headers)
+ end
+
++def readline.have_type(type)
++ return super(type, headers)
++end
++
+ dir_config('curses')
+ dir_config('ncurses')
+ dir_config('termcap')
+@@ -94,4 +98,11 @@
+ readline.have_func("rl_redisplay")
+ readline.have_func("rl_insert_text")
+ readline.have_func("rl_delete_text")
++unless readline.have_type("rl_hook_func_t*")
++ # rl_hook_func_t is available since readline-4.2 (2001).
++ # Function is removed at readline-6.3 (2014).
++ # However, editline (NetBSD 6.1.3, 2014) doesn't have rl_hook_func_t.
++ $defs << "-Drl_hook_func_t=Function"
++end
++
+ create_makefile("readline")
+Index: ext/readline/readline.c
+===================================================================
+--- ext/readline/readline.c (revision 45540)
++++ ext/readline/readline.c (working copy)
+@@ -1974,7 +1974,7 @@
+
+ rl_attempted_completion_function = readline_attempted_completion_function;
+ #if defined(HAVE_RL_PRE_INPUT_HOOK)
+- rl_pre_input_hook = (Function *)readline_pre_input_hook;
++ rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
+ #endif
+ #ifdef HAVE_RL_CATCH_SIGNALS
+ rl_catch_signals = 0;
</ins></span></pre>
</div>
</div>
</body>
</html>