[pkgsrc/trunk]: pkgsrc/devel/ruby-readline Improve checking of some "rl_*" gn...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf150e0239b1
branches:  trunk
changeset: 522577:cf150e0239b1
user:      taca <taca%pkgsrc.org@localhost>
date:      Wed Dec 13 10:55:51 2006 +0000

description:
Improve checking of some "rl_*" gnu readline compatible functions.
It should fix PR pkg/35244.

Bump PKGREVISION.

diffstat:

 devel/ruby-readline/Makefile         |   3 ++-
 devel/ruby-readline/distinfo         |   5 +++--
 devel/ruby-readline/patches/patch-aa |   9 +++++----
 devel/ruby-readline/patches/patch-ab |  16 ++++++++++++++++
 4 files changed, 26 insertions(+), 7 deletions(-)

diffs (72 lines):

diff -r 65e3345b7258 -r cf150e0239b1 devel/ruby-readline/Makefile
--- a/devel/ruby-readline/Makefile      Wed Dec 13 07:48:17 2006 +0000
+++ b/devel/ruby-readline/Makefile      Wed Dec 13 10:55:51 2006 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2006/12/06 16:31:34 taca Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/13 10:55:51 taca Exp $
 #
 
 DISTNAME=              ${RUBY_DISTNAME}
 PKGNAME=               ${RUBY_PKGPREFIX}-readline-${RUBY_VERSION_SUFFIX}
+PKGREVISION=           1
 CATEGORIES=            devel ruby
 MASTER_SITES=          ${MASTER_SITE_RUBY}
 
diff -r 65e3345b7258 -r cf150e0239b1 devel/ruby-readline/distinfo
--- a/devel/ruby-readline/distinfo      Wed Dec 13 07:48:17 2006 +0000
+++ b/devel/ruby-readline/distinfo      Wed Dec 13 10:55:51 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13 2006/12/06 16:31:34 taca Exp $
+$NetBSD: distinfo,v 1.14 2006/12/13 10:55:51 taca Exp $
 
 SHA1 (ruby-1.8.5.tar.gz) = 0638ea26e1088fc9f4237abde8c85331689ce77c
 RMD160 (ruby-1.8.5.tar.gz) = 991899146c23c9ea30ac09f41b7077fa0c8686b6
 Size (ruby-1.8.5.tar.gz) = 4438603 bytes
-SHA1 (patch-aa) = d13708667777361c792710c78f0a991ea1d6250f
+SHA1 (patch-aa) = bd3df7b0e1be643bb449b6c5e15d95a39a812479
+SHA1 (patch-ab) = 10a72f16b5e24eb8a29e0b8ce1904a36614d0aa8
diff -r 65e3345b7258 -r cf150e0239b1 devel/ruby-readline/patches/patch-aa
--- a/devel/ruby-readline/patches/patch-aa      Wed Dec 13 07:48:17 2006 +0000
+++ b/devel/ruby-readline/patches/patch-aa      Wed Dec 13 10:55:51 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2006/12/06 16:31:34 taca Exp $
+$NetBSD: patch-aa,v 1.6 2006/12/13 10:55:51 taca Exp $
 
 This patch is generated with "diff -u -U 2".
 
@@ -20,11 +20,12 @@
  
  if enable_libedit
    unless (have_readline_header("editline/readline.h") ||
-@@ -42,7 +39,6 @@ else
-   end
+@@ -43,6 +40,8 @@ else
  end
  
--have_readline_var("rl_filename_completion_function")
+ have_readline_var("rl_filename_completion_function")
++have_readline_var("rl_username_completion_function")
++have_readline_var("rl_completion_matches")
  have_readline_var("rl_deprep_term_function")
  have_readline_var("rl_completion_append_character")
  have_readline_var("rl_basic_word_break_characters")
diff -r 65e3345b7258 -r cf150e0239b1 devel/ruby-readline/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ruby-readline/patches/patch-ab      Wed Dec 13 10:55:51 2006 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2006/12/13 10:55:51 taca Exp $
+
+--- readline.c.orig    2006-08-07 18:01:27.000000000 +0900
++++ readline.c
+@@ -34,7 +34,11 @@ static ID completion_proc, completion_ca
+ 
+ #ifndef HAVE_RL_FILENAME_COMPLETION_FUNCTION
+ # define rl_filename_completion_function filename_completion_function
++#endif
++#ifndef HAVE_RLUSERNAME_COMPLETION_FUNCTION
+ # define rl_username_completion_function username_completion_function
++#endif
++#ifndef HAVE_RL_COMPLETION_MATCHES
+ # define rl_completion_matches completion_matches
+ #endif
+