Update ruby-base package to 1.6.6. Changes from 1.6.4 are too many,

see ${LOCALBASE}/share/doc/ruby/NEWS file.

plus two fixes noted on ruby-dev@ruby-lang.org.

[ruby-dev:15549] lib/irb/locale.rb
[ruby-dev:15551] lib/weakref.rb

And some ruby pakcage own changes:

- Handle proper RUBY_ARCH variable on current.
- REPLACE_RUBY is processed by sed(1) not ruby.
- Proper handle with RUBY_EXTCONF.
- USE_RUBY_SETUP dosen't implicit define USE_RUBY_AMSTD now.

7 files changed, 46 insertions, 83 deletions

diff --git a/lang/ruby-base/patches/patch-aa b/lang/ruby-base/patches/patch-aa
index 352048ed7f6..2b56289f4e2 100644
--- a/lang/ruby-base/patches/patch-aa
+++ b/lang/ruby-base/patches/patch-aa
@@ -1,63 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
+$NetBSD: patch-aa,v 1.2 2001/12/30 16:21:52 taca Exp $
 
---- configure.in.orig	Fri Jun  1 11:34:50 2001
+--- configure.in.orig	Tue Dec  4 13:51:50 2001
 +++ configure.in
-@@ -501,12 +501,7 @@
-     beos*)	;;
-     cygwin*)	;;
-     mingw*)	;;
--    netbsd*) CCDLFLAGS=-fpic
--     case "$target_cpu" in
--     mips*) CCDLFLAGS=-fPIC ;;
--     sparc) CCDLFLAGS=-fPIC ;;
--     *) ;;
--     esac ;;
-+    netbsd*) CCDLFLAGS=-fPIC;;
-     *) CCDLFLAGS=-fPIC;;
-     esac
-   else
-@@ -553,10 +548,8 @@
- 			  test "$GCC" = yes && `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null || LDSHARED="ld -Bshareable"
- 			fi
- 			rb_cv_dlopen=yes ;;
--	netbsd*)	LDSHARED="ld -shared"
--			if test "$rb_cv_binary_elf" = yes; then
--                          LDFLAGS="-export-dynamic"
--			fi
-+	netbsd*)	LDSHARED='${CC} -shared'
-+			LDFLAGS=""
- 			rb_cv_dlopen=yes ;;
- 	openbsd*) 	LDSHARED="ld -Bforcearchive -Bshareable"
- 			rb_cv_dlopen=yes ;;
-@@ -823,11 +816,13 @@
- 	;;
-     netbsd*)
- 	SOLIBS='$(LIBS)'
--	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)'
-+	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
-+	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR)'
-+	LIBRUBYARG='-Wl,-R -Wl,${prefix}/lib -L${prefix}/lib -L. -l$(RUBY_INSTALL_NAME) -Wl,-R -Wl,${X11BASE}/lib -L${X11BASE}/lib'
- 	if test "$rb_cv_binary_elf" = yes; then # ELF platforms
--	   LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so'
--	else
--	   LIBRUBY_ALIASES=  # a.out platforms
-+	   LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_INSTALL_NAME).so'
-+	else	# a.out platforms
-+	   LIBRUBY_ALIASES=""
- 	fi
-  	;;
-     openbsd*)
-@@ -871,6 +866,9 @@
- fi
- 
- case "$target_os" in
-+    netbsd*)
-+    	CFLAGS="$CFLAGS -pipe"
-+	;;
-     nextstep*)
-     	CFLAGS="$CFLAGS -pipe"
- 	;;
-@@ -938,6 +936,7 @@
+@@ -941,6 +941,7 @@
  	;;	
  esac
  
diff --git a/lang/ruby-base/patches/patch-ac b/lang/ruby-base/patches/patch-ac
index dd51bdb8e94..49dc9c8985e 100644
--- a/lang/ruby-base/patches/patch-ac
+++ b/lang/ruby-base/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
+$NetBSD: patch-ac,v 1.2 2001/12/30 16:21:52 taca Exp $
 
---- ext/curses/extconf.rb.orig	Wed Mar 21 17:04:11 2001
+--- ext/curses/extconf.rb.orig	Mon Dec  3 19:04:46 2001
 +++ ext/curses/extconf.rb
 @@ -6,17 +6,9 @@
  
@@ -8,7 +8,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
  have_library("mytinfo", "tgetent") if /bow/ =~ RUBY_PLATFORM
 -if have_header("ncurses.h") and have_library("ncurses", "initscr")
 +have_library("termcap", "tgetent") 
-+if have_library("curses", "initscr")
++if have_header("curses.h") and have_library("curses", "initscr")
    make=true
 -elsif have_header("ncurses/curses.h") and have_library("ncurses", "initscr")
 -  make=true
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
 -  make=true
 -else
 -  have_library("termcap", "tgetent") 
--  if have_library("curses", "initscr")
+-  if have_header("curses.h") and have_library("curses", "initscr")
 -    make=true
 -  end
  end
diff --git a/lang/ruby-base/patches/patch-ad b/lang/ruby-base/patches/patch-ad
deleted file mode 100644
index 5cac9399819..00000000000
--- a/lang/ruby-base/patches/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
-
---- ext/socket/extconf.rb.orig	Mon May 21 13:19:49 2001
-+++ ext/socket/extconf.rb
-@@ -1,6 +1,5 @@
- require 'mkmf'
- 
--$LIBPATH << "/usr/local/lib" if File.directory?("/usr/local/lib")
- $CPPFLAGS += " -Dss_family=__ss_family -Dss_len=__ss_len"
- 
- case RUBY_PLATFORM
diff --git a/lang/ruby-base/patches/patch-af b/lang/ruby-base/patches/patch-af
index 41c4bcb128d..33a68c69091 100644
--- a/lang/ruby-base/patches/patch-af
+++ b/lang/ruby-base/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
+$NetBSD: patch-af,v 1.2 2001/12/30 16:21:52 taca Exp $
 
---- lib/mkmf.rb.orig	Mon May 21 13:19:49 2001
+--- lib/mkmf.rb.orig	Fri Dec 21 18:19:47 2001
 +++ lib/mkmf.rb
-@@ -160,7 +160,7 @@
+@@ -158,7 +158,7 @@
    for f in path
      d = '/' + File::dirname(f)
      d = '' if d == '/.' 
diff --git a/lang/ruby-base/patches/patch-ag b/lang/ruby-base/patches/patch-ag
new file mode 100644
index 00000000000..b582f2319af
--- /dev/null
+++ b/lang/ruby-base/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2001/12/30 16:21:52 taca Exp $
+
+--- lib/irb/locale.rb.orig	Fri Jun 29 17:25:29 2001
++++ lib/irb/locale.rb
+@@ -135,6 +135,7 @@
+       end
+       lc_file.close
+       toplevel_load lc_file.path, priv
++      lc_file.close(true)
+     end
+     private :real_load
+ 
diff --git a/lang/ruby-base/patches/patch-ah b/lang/ruby-base/patches/patch-ah
new file mode 100644
index 00000000000..68dea922a4e
--- /dev/null
+++ b/lang/ruby-base/patches/patch-ah
@@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.1 2001/12/30 16:21:52 taca Exp $
+
+--- lib/weakref.rb.orig	Thu Jul 27 18:49:33 2000
++++ lib/weakref.rb
+@@ -60,7 +60,11 @@
+     unless ID_MAP[@__id]
+       raise RefError, "Illegal Reference - probably recycled", caller(2)
+     end
+-    ObjectSpace._id2ref(@__id)
++    begin
++      ObjectSpace._id2ref(@__id)
++    rescue RangeError
++      raise RefError, "Illegal Reference - probably recycled", caller(2)
++    end
+   end
+ 
+   def weakref_alive?
diff --git a/lang/ruby-base/patches/patch-aj b/lang/ruby-base/patches/patch-aj
index 28cb9fd1c18..f85c370659d 100644
--- a/lang/ruby-base/patches/patch-aj
+++ b/lang/ruby-base/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
+$NetBSD: patch-aj,v 1.2 2001/12/30 16:21:52 taca Exp $
 
---- ext/extmk.rb.in.orig	Tue May 29 17:57:26 2001
-+++ ext/extmk.rb.in	Fri Jun 29 00:09:27 2001
-@@ -177,7 +177,7 @@
-     mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(DESTDIR)$(pkglibdir)/%s\n", f
+--- ext/extmk.rb.in.orig	Fri Jul 27 17:52:19 2001
++++ ext/extmk.rb.in
+@@ -175,7 +175,7 @@
+     end
    end
    for f in path
--    mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)/%s\n", f, f
-+    mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0444, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)/%s\n", f, f
+-    mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)$(target_prefix)/%s\n", f, f
++    mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0444, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)$(target_prefix)/%s\n", f, f
    end
  end