Update ruby to 1.4.5

Changes: Several bug fixes.

use MACHINE_GNU_ARCH instead of MACHINE_ARCH in PLIST,
patch from Paul Clifford <paul@plasma.demon.co.uk>.

8 files changed, 43 insertions, 65 deletions

diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 44542e30460..11f5507e355 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2000/06/13 10:40:26 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2000/07/03 07:31:35 sakamoto Exp $
 #
 
-DISTNAME=	ruby-1.4.4
+DISTNAME=	ruby-1.4.5
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/ \
 		ftp://ftp.iij.ad.jp/pub/lang/ruby/ \
diff --git a/lang/ruby/files/md5 b/lang/ruby/files/md5
index e30b9e12f0c..1195cea90e2 100644
--- a/lang/ruby/files/md5
+++ b/lang/ruby/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 2000/04/18 10:46:16 sakamoto Exp $
+$NetBSD: md5,v 1.7 2000/07/03 07:31:35 sakamoto Exp $
 
-MD5 (ruby-1.4.4.tar.gz) = 066f5270077eac7737426a688354017f
+MD5 (ruby-1.4.5.tar.gz) = 0322a805a8fb7bef23127ad29fa1d537
diff --git a/lang/ruby/files/patch-sum b/lang/ruby/files/patch-sum
index 4faec576c1e..5222f9a2e74 100644
--- a/lang/ruby/files/patch-sum
+++ b/lang/ruby/files/patch-sum
@@ -1,6 +1,4 @@
-$NetBSD: patch-sum,v 1.6 2000/06/02 00:13:53 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.7 2000/07/03 07:31:35 sakamoto Exp $
 
-MD5 (patch-aa) = 35666a8ac46e4e8a75665c17997118f5
-MD5 (patch-ab) = 8ed85175e1fd46b288d818aae1f20cb3
-MD5 (patch-ae) = 9b69e6da375997341a3d3d691dd57393
-MD5 (patch-af) = f38f1dc0bb7333800b6844d620018444
+MD5 (patch-ae) = 3074478484d2b2c420cc712b68b76e30
+MD5 (patch-af) = 759e4805a9569dca7b2b2eecd5a6874b
diff --git a/lang/ruby/patches/patch-aa b/lang/ruby/patches/patch-aa
deleted file mode 100644
index 321fe6bd02b..00000000000
--- a/lang/ruby/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2000/06/02 00:13:54 dmcmahill Exp $
-
---- configure.in.orig	Tue Apr 11 12:13:32 2000
-+++ configure.in	Thu Jun  1 13:56:23 2000
-@@ -401,4 +401,5 @@
-      case "$host_cpu" in
-      mips*) CCDLFLAGS=-fPIC ;;
-+     sparc) CCDLFLAGS=-fPIC ;;
-      *) ;;
-      esac ;;
diff --git a/lang/ruby/patches/patch-ab b/lang/ruby/patches/patch-ab
deleted file mode 100644
index 05a88abbd3a..00000000000
--- a/lang/ruby/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2000/06/02 00:13:54 dmcmahill Exp $
-
---- configure.orig	Fri Apr 14 04:30:57 2000
-+++ configure	Thu Jun  1 13:57:08 2000
-@@ -4062,4 +4062,5 @@
-      case "$host_cpu" in
-      mips*) CCDLFLAGS=-fPIC ;;
-+     sparc) CCDLFLAGS=-fPIC ;;
-      *) ;;
-      esac ;;
diff --git a/lang/ruby/patches/patch-ae b/lang/ruby/patches/patch-ae
index 10e8d477f75..1cbea7ee249 100644
--- a/lang/ruby/patches/patch-ae
+++ b/lang/ruby/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2000/04/11 07:30:58 sakamoto Exp $
+$NetBSD: patch-ae,v 1.2 2000/07/03 07:31:36 sakamoto Exp $
 
---- ext/extmk.rb.in.orig	Tue Oct 12 18:11:24 1999
-+++ ext/extmk.rb.in	Tue Apr 11 14:32:34 2000
+--- ext/extmk.rb.in.orig	Tue Jun 20 01:23:36 2000
++++ ext/extmk.rb.in	Mon Jul  3 12:48:17 2000
 @@ -79,5 +79,5 @@
    cfile.print src
    cfile.close
diff --git a/lang/ruby/patches/patch-af b/lang/ruby/patches/patch-af
index 01e2b29d85f..ba0afa6dd5e 100644
--- a/lang/ruby/patches/patch-af
+++ b/lang/ruby/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 2000/04/11 07:35:16 sakamoto Exp $
+$NetBSD: patch-af,v 1.2 2000/07/03 07:31:36 sakamoto Exp $
 
 --- ext/curses/extconf.rb.orig	Tue Oct 12 18:11:25 1999
-+++ ext/curses/extconf.rb	Tue Apr 11 14:53:51 2000
++++ ext/curses/extconf.rb	Mon Jul  3 12:48:17 2000
 @@ -3,15 +3,7 @@
  make=false
  have_library("mytinfo", "tgetent") if /bow/ =~ PLATFORM
diff --git a/lang/ruby/pkg/PLIST b/lang/ruby/pkg/PLIST
index 7f5b081314d..b287934aa14 100644
--- a/lang/ruby/pkg/PLIST
+++ b/lang/ruby/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2000/04/18 10:46:17 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/07/03 07:31:37 sakamoto Exp $
 bin/ruby
 lib/libruby.so.${RUBY_VERSION}
 lib/ruby/${RUBY_VERSION}/English.rb
@@ -22,33 +22,33 @@ lib/ruby/${RUBY_VERSION}/ftools.rb
 lib/ruby/${RUBY_VERSION}/ftplib.rb
 lib/ruby/${RUBY_VERSION}/getoptlong.rb
 lib/ruby/${RUBY_VERSION}/getopts.rb
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/config.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/curses.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/dbm.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/defines.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/dln.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/env.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/etc.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/fcntl.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/gdbm.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/intern.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/libruby.a
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/md5.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/nkf.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/node.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/pty.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/rbconfig.rb
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/re.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/readline.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/regex.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/ruby.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/rubyio.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/rubysig.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/sdbm.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/socket.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/st.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/util.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/version.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/config.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/curses.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/dbm.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/defines.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/dln.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/env.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/etc.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/fcntl.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/gdbm.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/intern.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/libruby.a
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/md5.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/nkf.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/node.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/pty.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/rbconfig.rb
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/re.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/readline.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/regex.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/ruby.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/rubyio.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/rubysig.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/sdbm.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/socket.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/st.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/util.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/version.h
 lib/ruby/${RUBY_VERSION}/importenv.rb
 lib/ruby/${RUBY_VERSION}/irb/completion.rb
 lib/ruby/${RUBY_VERSION}/irb/frame.rb
@@ -153,15 +153,15 @@ share/examples/ruby/time.rb
 share/examples/ruby/trojan.rb
 share/examples/ruby/tsvr.rb
 share/examples/ruby/uumerge.rb
-@exec mkdir -p %D/lib/ruby/site_ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}
+@exec mkdir -p %D/lib/ruby/site_ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}
 @dirrm share/examples/ruby/misc
 @dirrm share/examples/ruby
-@dirrm lib/ruby/site_ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}
+@dirrm lib/ruby/site_ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}
 @dirrm lib/ruby/site_ruby/${RUBY_VERSION}
 @dirrm lib/ruby/site_ruby
 @dirrm lib/ruby/${RUBY_VERSION}/net
 @dirrm lib/ruby/${RUBY_VERSION}/irb
-@dirrm lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}
+@dirrm lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}
 @dirrm lib/ruby/${RUBY_VERSION}/cgi
 @dirrm lib/ruby/${RUBY_VERSION}
 @dirrm lib/ruby