Sun Mar 30 00:18:09 2014 UTC ()
More care was needed to the case of editline(3).
Base on r45240 in Ruby's repository with one critical correction.


(taca)
diff -r1.3 -r1.4 pkgsrc/lang/ruby21-base/distinfo
diff -r0 -r1.1 pkgsrc/lang/ruby21-base/patches/patch-ext_readline_extconf.rb
cvs diff -r1.3 -r1.4 pkgsrc/lang/ruby21-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby21-base/Attic/distinfo 2014/03/29 01:23:58 1.3
+++ pkgsrc/lang/ruby21-base/Attic/distinfo 2014/03/30 00:18:08 1.4
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: distinfo,v 1.3 2014/03/29 01:23:58 taca Exp $ 1$NetBSD: distinfo,v 1.4 2014/03/30 00:18:08 taca Exp $
2 2
3SHA1 (ruby-2.1.1.tar.bz2) = a7fd539f64864bc00fc64444d2d814df6c19fd4a 3SHA1 (ruby-2.1.1.tar.bz2) = a7fd539f64864bc00fc64444d2d814df6c19fd4a
4RMD160 (ruby-2.1.1.tar.bz2) = b200bb8d1542f79306c5cd0760781ec9dc759998 4RMD160 (ruby-2.1.1.tar.bz2) = b200bb8d1542f79306c5cd0760781ec9dc759998
5Size (ruby-2.1.1.tar.bz2) = 11990697 bytes 5Size (ruby-2.1.1.tar.bz2) = 11990697 bytes
6SHA1 (patch-configure) = c7ba92b1a142c1b52dc732f8a0a2a0d2803f5dd5 6SHA1 (patch-configure) = c7ba92b1a142c1b52dc732f8a0a2a0d2803f5dd5
7SHA1 (patch-ext_dl_extconf.rb) = f6c71db3c3076216c9b5db92692c7c8dad012af0 7SHA1 (patch-ext_dl_extconf.rb) = f6c71db3c3076216c9b5db92692c7c8dad012af0
 8SHA1 (patch-ext_readline_extconf.rb) = 6db3292f19a2df9e3623bc89c8c2430e12290532
8SHA1 (patch-ext_readline_readline.c) = 364d3d641fa19ec4ed4e1d25ae0f55b73896a2c4 9SHA1 (patch-ext_readline_readline.c) = 364d3d641fa19ec4ed4e1d25ae0f55b73896a2c4
9SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 10SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
10SHA1 (patch-lib_rubygems.rb) = 9d27fa8c96f285461fbb08df7491a0a48ed612e1 11SHA1 (patch-lib_rubygems.rb) = 9d27fa8c96f285461fbb08df7491a0a48ed612e1
11SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e 12SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e
12SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 13b7f3bceb2876228027447640d51fde2700a970 13SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 13b7f3bceb2876228027447640d51fde2700a970
13SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = 48824278d5a0f0435d44755fbfcda55032792ea0 14SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = 48824278d5a0f0435d44755fbfcda55032792ea0
14SHA1 (patch-lib_rubygems_config__file.rb) = 0d863d3f886c1ed83585d96064725e7db7bec1bc 15SHA1 (patch-lib_rubygems_config__file.rb) = 0d863d3f886c1ed83585d96064725e7db7bec1bc
15SHA1 (patch-lib_rubygems_defaults.rb) = 5a55a54988b360b995e05e6dda7ed25d9cd1d90f 16SHA1 (patch-lib_rubygems_defaults.rb) = 5a55a54988b360b995e05e6dda7ed25d9cd1d90f
16SHA1 (patch-lib_rubygems_dependency__installer.rb) = 840626e388dae2e2059b38ef300edecf60f80100 17SHA1 (patch-lib_rubygems_dependency__installer.rb) = 840626e388dae2e2059b38ef300edecf60f80100
17SHA1 (patch-lib_rubygems_install__update__options.rb) = 9a15d509928aa0440691bef8ad43bbfd2688542f 18SHA1 (patch-lib_rubygems_install__update__options.rb) = 9a15d509928aa0440691bef8ad43bbfd2688542f
18SHA1 (patch-lib_rubygems_installer.rb) = b9f5f83db56e89e0996acd9677a090cf0856bf75 19SHA1 (patch-lib_rubygems_installer.rb) = b9f5f83db56e89e0996acd9677a090cf0856bf75
19SHA1 (patch-lib_rubygems_platform.rb) = 5150a27be7d637dc2ffa44c1d053a39d5f8c9059 20SHA1 (patch-lib_rubygems_platform.rb) = 5150a27be7d637dc2ffa44c1d053a39d5f8c9059
20SHA1 (patch-lib_rubygems_specification.rb) = 034ad0404e8cdfed42def4cfb5c1f98a1597b0c0 21SHA1 (patch-lib_rubygems_specification.rb) = 034ad0404e8cdfed42def4cfb5c1f98a1597b0c0
File Added: pkgsrc/lang/ruby21-base/patches/Attic/patch-ext_readline_extconf.rb
$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")