Updating Ruby to 1.8.6; ruby18-readline

- discontinue use of RUBY_PATCH_DATE.
- Introduce RUBY_PATCH_LEVEL.

pkgsrc's ruby tracks Ruby's patch release and avoid to maintain
its own patch files (with RUBY_PATCH_DATE).

Changes are too much, please see ChangeLog file.

4 files changed, 7 insertions, 34 deletions

diff --git a/devel/ruby-readline/Makefile b/devel/ruby-readline/Makefile
index d4a25b150a9..81ddf878f6c 100644
--- a/devel/ruby-readline/Makefile
+++ b/devel/ruby-readline/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2006/12/13 10:55:51 taca Exp $
+# $NetBSD: Makefile,v 1.22 2007/03/15 16:42:59 taca Exp $
 #
 
 DISTNAME=		${RUBY_DISTNAME}
 PKGNAME=		${RUBY_PKGPREFIX}-readline-${RUBY_VERSION_SUFFIX}
-PKGREVISION=		1
 CATEGORIES=		devel ruby
 MASTER_SITES=		${MASTER_SITE_RUBY}
 
diff --git a/devel/ruby-readline/distinfo b/devel/ruby-readline/distinfo
index 136e5b93ece..b1b7be6c837 100644
--- a/devel/ruby-readline/distinfo
+++ b/devel/ruby-readline/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.15 2006/12/17 16:57:09 pooka Exp $
+$NetBSD: distinfo,v 1.16 2007/03/15 16:42:59 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) = bd3df7b0e1be643bb449b6c5e15d95a39a812479
-SHA1 (patch-ab) = 03b7d59d7c7553f383e7e452a980849e600165f8
+SHA1 (ruby-1.8.6.tar.bz2) = 5c2e10c3f5f0cbbd72c9b8df8f402e7613de641b
+RMD160 (ruby-1.8.6.tar.bz2) = b5be823179def82eff8436ce2bffef2e453cc8d2
+Size (ruby-1.8.6.tar.bz2) = 3946186 bytes
+SHA1 (patch-aa) = 3fa6c4454e05e75b3fb82b53736ef7ba5f54529f
diff --git a/devel/ruby-readline/patches/patch-aa b/devel/ruby-readline/patches/patch-aa
index 75a9a0fdab2..c6fbf4fd766 100644
--- a/devel/ruby-readline/patches/patch-aa
+++ b/devel/ruby-readline/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2006/12/13 10:55:51 taca Exp $
+$NetBSD: patch-aa,v 1.7 2007/03/15 16:42:59 taca Exp $
 
 This patch is generated with "diff -u -U 2".
 
@@ -20,12 +20,3 @@ This patch is generated with "diff -u -U 2".
  
  if enable_libedit
    unless (have_readline_header("editline/readline.h") ||
-@@ -43,6 +40,8 @@ else
- end
- 
- 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 --git a/devel/ruby-readline/patches/patch-ab b/devel/ruby-readline/patches/patch-ab
deleted file mode 100644
index 527c9fc7294..00000000000
--- a/devel/ruby-readline/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/12/13 11:44:12 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_RL_USERNAME_COMPLETION_FUNCTION
- # define rl_username_completion_function username_completion_function
-+#endif
-+#ifndef HAVE_RL_COMPLETION_MATCHES
- # define rl_completion_matches completion_matches
- #endif
-