Fix ruby-readline build problem with readline 6.3 and later.

4 files changed, 34 insertions, 2 deletions

diff --git a/lang/ruby200-base/distinfo b/lang/ruby200-base/distinfo
index eea891ec85d..b4bcacc97bc 100644
--- a/lang/ruby200-base/distinfo
+++ b/lang/ruby200-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2014/03/13 18:00:02 taca Exp $
+$NetBSD: distinfo,v 1.12 2014/03/29 01:21:36 taca Exp $
 
 SHA1 (ruby-2.0.0-p451.tar.bz2) = 22b76e421fedba99267601702af74cf396110229
 RMD160 (ruby-2.0.0-p451.tar.bz2) = c7e7efd5c8e081f69c91618c72187e7f66174cc2
@@ -6,6 +6,7 @@ Size (ruby-2.0.0-p451.tar.bz2) = 10725438 bytes
 SHA1 (patch-configure) = 5e0897ef60a14073e87427911b45c2b238bbe2a3
 SHA1 (patch-defs_default__gems) = 28a47952e27c22055bac6ad151d092572b96b1ec
 SHA1 (patch-ext_dl_extconf.rb) = f6c71db3c3076216c9b5db92692c7c8dad012af0
+SHA1 (patch-ext_readline_readline.c) = a6b5f1e66218d33b4e7ad4acc53cd1aa35f8ed60
 SHA1 (patch-lib_rdoc_ri_driver.rb) = 53ce4055b4c008c8ee13d38a81334d4846debdbc
 SHA1 (patch-lib_rubygems.rb) = 0f0b8f14745998f5ed0ade9b0b5cdefc8f30d988
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e
diff --git a/lang/ruby200-base/patches/patch-ext_readline_readline.c b/lang/ruby200-base/patches/patch-ext_readline_readline.c
new file mode 100644
index 00000000000..6c9ac94059d
--- /dev/null
+++ b/lang/ruby200-base/patches/patch-ext_readline_readline.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_readline_readline.c,v 1.1 2014/03/29 01:21:36 taca Exp $
+
+* Don't use legacy type of readline.
+
+--- ext/readline/readline.c.orig	2013-02-01 05:37:29.000000000 +0000
++++ ext/readline/readline.c
+@@ -1883,7 +1883,7 @@ Init_readline()
+ 
+     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;
diff --git a/lang/ruby21-base/distinfo b/lang/ruby21-base/distinfo
index e3bff231ae8..f43dab2ae6b 100644
--- a/lang/ruby21-base/distinfo
+++ b/lang/ruby21-base/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.2 2014/03/26 13:22:44 taca Exp $
+$NetBSD: distinfo,v 1.3 2014/03/29 01:23:58 taca Exp $
 
 SHA1 (ruby-2.1.1.tar.bz2) = a7fd539f64864bc00fc64444d2d814df6c19fd4a
 RMD160 (ruby-2.1.1.tar.bz2) = b200bb8d1542f79306c5cd0760781ec9dc759998
 Size (ruby-2.1.1.tar.bz2) = 11990697 bytes
 SHA1 (patch-configure) = c7ba92b1a142c1b52dc732f8a0a2a0d2803f5dd5
 SHA1 (patch-ext_dl_extconf.rb) = f6c71db3c3076216c9b5db92692c7c8dad012af0
+SHA1 (patch-ext_readline_readline.c) = 364d3d641fa19ec4ed4e1d25ae0f55b73896a2c4
 SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
 SHA1 (patch-lib_rubygems.rb) = 9d27fa8c96f285461fbb08df7491a0a48ed612e1
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e
diff --git a/lang/ruby21-base/patches/patch-ext_readline_readline.c b/lang/ruby21-base/patches/patch-ext_readline_readline.c
new file mode 100644
index 00000000000..4ecc67e2716
--- /dev/null
+++ b/lang/ruby21-base/patches/patch-ext_readline_readline.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_readline_readline.c,v 1.1 2014/03/29 01:23:58 taca Exp $
+
+* Don't use legacy type of readline.
+
+--- ext/readline/readline.c.orig	2013-10-29 03:09:00.000000000 +0000
++++ ext/readline/readline.c
+@@ -1974,7 +1974,7 @@ Init_readline()
+ 
+     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;