From e09f446092ab3239f56ec13f3921dfc03cf6501f Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Wed, 2 Nov 2005 08:59:04 +0000
Subject: - Update to Ruby 1.8.3. - Don't make always use GNU readline.

---
 devel/ruby-readline/Makefile         |  3 +--
 devel/ruby-readline/distinfo         | 10 +++++-----
 devel/ruby-readline/patches/patch-aa | 24 ++++++++++++++++--------
 3 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'devel/ruby-readline')

diff --git a/devel/ruby-readline/Makefile b/devel/ruby-readline/Makefile
index e611cbe8030..f7362cb91a5 100644
--- a/devel/ruby-readline/Makefile
+++ b/devel/ruby-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:38 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/11/02 08:59:04 taca Exp $
 #
 
 DISTNAME=		${RUBY_DISTNAME}
@@ -12,7 +12,6 @@ HOMEPAGE=		${RUBY_HOMEPAGE}
 COMMENT=		Ruby extension to readline library
 
 RUBY_HAS_ARCHLIB=	yes
-USE_GNU_READLINE=	# uses rl_event_hook interface to GNU readline
 USE_RUBY_EXTCONF=	yes
 EXTRACT_ELEMENTS=	${RUBY_DISTNAME}/ext/readline
 WRKSRC=			${RUBY_WRKSRC}/ext/readline
diff --git a/devel/ruby-readline/distinfo b/devel/ruby-readline/distinfo
index 5f152c7e841..e507acacc69 100644
--- a/devel/ruby-readline/distinfo
+++ b/devel/ruby-readline/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/10/20 18:02:52 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/11/02 08:59:05 taca Exp $
 
 SHA1 (ruby/ruby-1.6.8.tar.gz) = 4b475ac1c837cd62b6dfe85359e1502a71b08cd1
 RMD160 (ruby/ruby-1.6.8.tar.gz) = be087ca8f852caf9fc7a35b51839f5af079dbbc1
 Size (ruby/ruby-1.6.8.tar.gz) = 1023403 bytes
-SHA1 (ruby/ruby-1.8.2.tar.gz) = 409a917d3a0aba41f45bd053b767c85b2bc35ffa
-RMD160 (ruby/ruby-1.8.2.tar.gz) = fc4dcdc2dda9bfbcf8ca19ca090aa55a18ea06a4
-Size (ruby/ruby-1.8.2.tar.gz) = 3627349 bytes
-SHA1 (patch-aa) = 04081e55e51c8b93b5bb5e77b180091747edaf01
+SHA1 (ruby/ruby-1.8.3.tar.gz) = 407e70377214fcb812cdbb86a3e1b735e69b7cff
+RMD160 (ruby/ruby-1.8.3.tar.gz) = b4244a288d04fca29556144636b5e093b78a8cd5
+Size (ruby/ruby-1.8.3.tar.gz) = 4227276 bytes
+SHA1 (patch-aa) = 3fa6c4454e05e75b3fb82b53736ef7ba5f54529f
diff --git a/devel/ruby-readline/patches/patch-aa b/devel/ruby-readline/patches/patch-aa
index 3dcfd14f986..c25b873479f 100644
--- a/devel/ruby-readline/patches/patch-aa
+++ b/devel/ruby-readline/patches/patch-aa
@@ -1,14 +1,22 @@
-$NetBSD: patch-aa,v 1.3 2005/02/19 05:12:24 taca Exp $
+$NetBSD: patch-aa,v 1.4 2005/11/02 08:59:05 taca Exp $
 
 This patch is generated with "diff -u -U 2".
 
---- extconf.rb.orig	2004-07-15 23:11:38.000000000 +0900
-+++ extconf.rb	2005-02-19 01:51:38.000000000 +0900
-@@ -6,6 +6,5 @@
+--- extconf.rb.orig	2005-05-25 22:01:56.000000000 +0900
++++ extconf.rb
+@@ -16,14 +16,11 @@ def have_readline_var(var)
+ end
+ 
+ dir_config('curses')
+-dir_config('ncurses')
+ dir_config('termcap')
  dir_config("readline")
+ enable_libedit = enable_config("libedit")
  have_library("user32", nil) if /cygwin/ === RUBY_PLATFORM
--have_library("ncurses", "tgetnum") or
--  have_library("termcap", "tgetnum") or
-+have_library("termcap", "tgetnum") or
-   have_library("curses", "tgetnum")
+-have_library("ncurses", "tgetnum") ||
+-  have_library("termcap", "tgetnum") ||
+-  have_library("curses", "tgetnum")
++have_library("curses", "tgetnum")
  
+ if enable_libedit
+   unless (have_readline_header("editline/readline.h") ||
-- 
cgit v1.2.3