diff options
| author | taca <taca@pkgsrc.org> | 2002-01-22 16:46:59 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2002-01-22 16:46:59 +0000 |
| commit | 3258d0a94f20f4aaf5cbb7ef0483cb3ff0bc7dfc (patch) | |
| tree | a6cf531131f45ddcd648da12ad6ebd928ac870a5 /devel | |
| parent | 3e57c103a38c57410a6bfc80bf44bc7965f9bd66 (diff) | |
| download | pkgsrc-3258d0a94f20f4aaf5cbb7ef0483cb3ff0bc7dfc.tar.gz | |
Make this compile with readline 4.2 and later.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ruby14-readline/distinfo | 5 | ||||
| -rw-r--r-- | devel/ruby14-readline/patches/patch-aa | 11 | ||||
| -rw-r--r-- | devel/ruby14-readline/patches/patch-ab | 45 |
3 files changed, 57 insertions, 4 deletions
diff --git a/devel/ruby14-readline/distinfo b/devel/ruby14-readline/distinfo index 078a742d12d..80751783f79 100644 --- a/devel/ruby14-readline/distinfo +++ b/devel/ruby14-readline/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/06/30 08:27:40 taca Exp $ +$NetBSD: distinfo,v 1.2 2002/01/22 16:46:59 taca Exp $ SHA1 (ruby/ruby-1.4.6.tar.gz) = 662e21cd2f6bf521a77ab179e11b669738579cc5 Size (ruby/ruby-1.4.6.tar.gz) = 775123 bytes -SHA1 (patch-aa) = 804703fc688f419073758b8634b49ace8319d5f4 +SHA1 (patch-aa) = 4ccf50dcbcb7ba752f63e548d31d22db7bf01e2d +SHA1 (patch-ab) = 6d530e2aa5e402961f4dae0e15c5b00d039c3d8b diff --git a/devel/ruby14-readline/patches/patch-aa b/devel/ruby14-readline/patches/patch-aa index a4831c2b457..113cc2f9285 100644 --- a/devel/ruby14-readline/patches/patch-aa +++ b/devel/ruby14-readline/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/06/30 08:27:40 taca Exp $ +$NetBSD: patch-aa,v 1.2 2002/01/22 16:47:00 taca Exp $ --- extconf.rb.orig Fri Jun 2 22:28:04 2000 +++ extconf.rb -@@ -2,8 +2,7 @@ +@@ -2,12 +2,14 @@ dir_config("readline") have_library("user32", nil) if /cygwin/ === RUBY_PLATFORM @@ -12,3 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/06/30 08:27:40 taca Exp $ have_library("curses", "tgetnum") if have_header("readline/readline.h") and + have_header("readline/history.h") and + have_library("readline", "readline") ++ if have_func("rl_filename_completion_function") ++ $CFLAGS += " -DREADLINE_42_OR_LATER" ++ end + create_makefile("readline") + end diff --git a/devel/ruby14-readline/patches/patch-ab b/devel/ruby14-readline/patches/patch-ab new file mode 100644 index 00000000000..dea366ac3a0 --- /dev/null +++ b/devel/ruby14-readline/patches/patch-ab @@ -0,0 +1,45 @@ +$NetBSD: patch-ab,v 1.1 2002/01/22 16:47:00 taca Exp $ + +--- readline.c.orig Fri Aug 13 14:37:50 1999 ++++ readline.c +@@ -15,11 +15,18 @@ + #define COMPLETION_PROC "completion_proc" + #define COMPLETION_CASE_FOLD "completion_case_fold" + ++#ifndef READLINE_42_OR_LATER ++# define rl_filename_completion_function filename_completion_function ++# define rl_username_completion_function username_completion_function ++# define rl_completion_matches completion_matches ++#endif ++ + static int + readline_event() + { + CHECK_INTS; + rb_thread_schedule(); ++ return 0; + } + + static VALUE +@@ -321,8 +328,8 @@ + char **matches; + int i; + +- matches = completion_matches(STR2CSTR(str), +- filename_completion_function); ++ matches = rl_completion_matches(STR2CSTR(str), ++ rl_filename_completion_function); + if (matches) { + result = rb_ary_new(); + for (i = 0; matches[i]; i++) { +@@ -348,8 +355,8 @@ + char **matches; + int i; + +- matches = completion_matches(STR2CSTR(str), +- username_completion_function); ++ matches = rl_completion_matches(STR2CSTR(str), ++ rl_username_completion_function); + if (matches) { + result = rb_ary_new(); + for (i = 0; matches[i]; i++) { |