More care was needed to the case of editline(3).

Base on r45240 in Ruby's repository with one critical correction.

4 files changed, 63 insertions, 2 deletions

diff --git a/lang/ruby200-base/distinfo b/lang/ruby200-base/distinfo
index b4bcacc97bc..db6c9a14ee9 100644
--- a/lang/ruby200-base/distinfo
+++ b/lang/ruby200-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2014/03/29 01:21:36 taca Exp $
+$NetBSD: distinfo,v 1.13 2014/03/30 00:17:57 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_extconf.rb) = 81f1a5ed7f184adb7b0c19727e0a4e9ca2eae219
 SHA1 (patch-ext_readline_readline.c) = a6b5f1e66218d33b4e7ad4acc53cd1aa35f8ed60
 SHA1 (patch-lib_rdoc_ri_driver.rb) = 53ce4055b4c008c8ee13d38a81334d4846debdbc
 SHA1 (patch-lib_rubygems.rb) = 0f0b8f14745998f5ed0ade9b0b5cdefc8f30d988
diff --git a/lang/ruby200-base/patches/patch-ext_readline_extconf.rb b/lang/ruby200-base/patches/patch-ext_readline_extconf.rb
new file mode 100644
index 00000000000..019b0994ee4
--- /dev/null
+++ b/lang/ruby200-base/patches/patch-ext_readline_extconf.rb
@@ -0,0 +1,29 @@
+$NetBSD: patch-ext_readline_extconf.rb,v 1.1 2014/03/30 00:17:57 taca Exp $
+
+* Handle rl_hook_func_t old/new GNU readline and editline(3).
+
+--- ext/readline/extconf.rb.orig	2013-02-01 05:37:29.000000000 +0000
++++ ext/readline/extconf.rb
+@@ -19,6 +19,10 @@ def readline.have_func(func)
+   return super(func, headers)
+ end
+ 
++def readline.have_type(type)
++  return super(type, headers)
++end
++
+ dir_config('curses')
+ dir_config('ncurses')
+ dir_config('termcap')
+@@ -93,4 +97,11 @@ readline.have_func("remove_history")
+ readline.have_func("clear_history")
+ readline.have_func("rl_redisplay")
+ readline.have_func("rl_insert_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")
diff --git a/lang/ruby21-base/distinfo b/lang/ruby21-base/distinfo
index f43dab2ae6b..d46234db3bb 100644
--- a/lang/ruby21-base/distinfo
+++ b/lang/ruby21-base/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.3 2014/03/29 01:23:58 taca Exp $
+$NetBSD: distinfo,v 1.4 2014/03/30 00:18:08 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_extconf.rb) = 6db3292f19a2df9e3623bc89c8c2430e12290532
 SHA1 (patch-ext_readline_readline.c) = 364d3d641fa19ec4ed4e1d25ae0f55b73896a2c4
 SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
 SHA1 (patch-lib_rubygems.rb) = 9d27fa8c96f285461fbb08df7491a0a48ed612e1
diff --git a/lang/ruby21-base/patches/patch-ext_readline_extconf.rb b/lang/ruby21-base/patches/patch-ext_readline_extconf.rb
new file mode 100644
index 00000000000..2cc35c0291d
--- /dev/null
+++ b/lang/ruby21-base/patches/patch-ext_readline_extconf.rb
@@ -0,0 +1,30 @@
+$NetBSD: patch-ext_readline_extconf.rb,v 1.1 2014/03/30 00:18:09 taca Exp $
+
+* Handle rl_hook_func_t old/new GNU readline and editline(3).
+
+--- ext/readline/extconf.rb.orig	2013-07-22 00:37:10.000000000 +0000
++++ ext/readline/extconf.rb
+@@ -19,6 +19,10 @@ def readline.have_func(func)
+   return super(func, headers)
+ end
+ 
++def readline.have_type(type)
++  return super(type, headers)
++end
++
+ dir_config('curses')
+ dir_config('ncurses')
+ dir_config('termcap')
+@@ -93,5 +97,12 @@ readline.have_func("remove_history")
+ readline.have_func("clear_history")
+ readline.have_func("rl_redisplay")
+ readline.have_func("rl_insert_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
++
+ readline.have_func("rl_delete_text")
+ create_makefile("readline")