- Reset PKGREVISION by updating Ruby 1.8.3.

- Add one fix from ruby_1_8 branch.

3 files changed, 22 insertions, 120 deletions

diff --git a/x11/ruby-tk/patches/patch-ab b/x11/ruby-tk/patches/patch-ab
index f0a4e1cb2df..89e08b5766f 100644
--- a/x11/ruby-tk/patches/patch-ab
+++ b/x11/ruby-tk/patches/patch-ab
@@ -1,90 +1,25 @@
-$NetBSD: patch-ab,v 1.1 2005/01/23 17:37:48 taca Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/02 08:59:42 taca Exp $
 
---- lib/multi-tk.rb.orig	2004-12-20 14:10:33.000000000 +0900
-+++ lib/multi-tk.rb
-@@ -189,7 +189,9 @@ class MultiTkIp
-     unless ip.deleted?
-       ip._split_tklist(ip._invoke('interp', 'slaves')).each{|name|
-         begin
--          ip._eval_without_enc("#{name} eval {foreach i [after info] {after cancel $i}}")
-+          # ip._eval_without_enc("#{name} eval {foreach i [after info] {after cancel $i}}")
-+          after_ids = ip._eval_without_enc("#{name} eval {after info}")
-+          ip._eval_without_enc("#{name} eval {foreach i {#{after_ids}} {after cancel $i}}")
-         rescue Exception
-         end
-         begin
-@@ -236,7 +238,9 @@ class MultiTkIp
-         @slave_ip_tbl.each{|name, subip| 
-           _destroy_slaves_of_slaveIP(subip)
-           begin
--            subip._eval_without_enc("foreach i [after info] {after cancel $i}")
-+            # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
-+            after_ids = subip._eval_without_enc("after info")
-+            subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-           rescue Exception
-           end
- =begin
-@@ -270,7 +274,9 @@ class MultiTkIp
-         }
+--- lib/tkextlib/tktable/tktable.rb.orig	2005-08-09 15:16:04.000000000 +0900
++++ lib/tkextlib/tktable/tktable.rb
+@@ -360,16 +360,16 @@ class Tk::TkTable
+   end
  
-         begin
--          @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
-+          # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
-+          after_ids = @interp._eval_without_enc("after info")
-+          @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-         rescue Exception
-         end
-         begin
-@@ -310,7 +316,9 @@ class MultiTkIp
-           @slave_ip_tbl.each{|name, subip|
-             _destroy_slaves_of_slaveIP(subip)
-             begin
--              subip._eval_without_enc("foreach i [after info] {after cancel $i}")
-+              # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
-+              after_ids = subip._eval_without_enc("after info")
-+              subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-             rescue Exception
-             end
- =begin
-@@ -344,7 +352,9 @@ class MultiTkIp
-           }
+   def border_mark(x, y)
+-    simplelist(tk_send('scan', 'mark', x, y))
++    simplelist(tk_send('border', 'mark', x, y))
+   end
+   def border_mark_row(x, y)
+-    tk_send('scan', 'mark', x, y, 'row')
++    tk_send('border', 'mark', x, y, 'row')
+   end
+   def border_mark_col(x, y)
+-    tk_send('scan', 'mark', x, y, 'col')
++    tk_send('border', 'mark', x, y, 'col')
+   end
+   def border_dragto(x, y)
+-    tk_send('scan', 'dragto', x, y)
++    tk_send('border', 'dragto', x, y)
+   end
  
-           begin
--            @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
-+            # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
-+            after_ids = @interp._eval_without_enc("after info")
-+            @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-           rescue Exception
-           end
- =begin
-@@ -1315,7 +1325,7 @@ class MultiTkIp
-         @cmd_queue.enq([nil, cmd, *args])
-       rescue Exception => e
-         # ignore
--        if $DEBUG || true
-+        if $DEBUG
-           warn("Warning: " + e.class.inspect + 
-                ((e.message.length > 0)? ' "' + e.message + '"': '') +  
-                " on " + self.inspect) 
-@@ -1821,7 +1831,9 @@ class MultiTkIp
-       end
- =end
-       begin
--        subip._eval_without_enc("foreach i [after info] {after cancel $i}")
-+        # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
-+        after_ids = subip._eval_without_enc("after info")
-+        subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-       rescue Exception
-       end
- 
-@@ -1850,7 +1862,9 @@ class MultiTkIp
-     }
- 
-     begin
--      @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
-+      # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
-+      after_ids = @interp._eval_without_enc("after info")
-+      @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-     rescue Exception
-     end
- =begin
+   def clear_cache(first=None, last=None)
diff --git a/x11/ruby-tk/patches/patch-ac b/x11/ruby-tk/patches/patch-ac
deleted file mode 100644
index 960e56ed57f..00000000000
--- a/x11/ruby-tk/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/01/23 17:37:48 taca Exp $
-
---- lib/tk/bindtag.rb.orig	2004-12-16 16:12:44.000000000 +0900
-+++ lib/tk/bindtag.rb
-@@ -23,6 +23,7 @@ class TkBindTag
-       @id = name
-       BTagID_TBL[@id] = self
-       bind(*args, &b) if args != []
-+      self
-     }
-   end
- 
diff --git a/x11/ruby-tk/patches/patch-ad b/x11/ruby-tk/patches/patch-ad
deleted file mode 100644
index af8cc900a75..00000000000
--- a/x11/ruby-tk/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/01/23 17:37:48 taca Exp $
-
---- lib/tk/menu.rb.orig	2004-12-09 03:13:37.000000000 +0900
-+++ lib/tk/menu.rb
-@@ -437,14 +437,14 @@ class TkOptionMenubutton<TkMenubutton
-     keys = _symbolkey2str(keys)
- 
-     parent = nil
--    if args[0].kind_of?(TkWindow) || args[0] == nil
-+    if !args.empty? && (args[0].kind_of?(TkWindow) || args[0] == nil)
-       parent = args.shift 
-     else
-       parent = keys.delete('parent')
-     end
- 
-     @variable = nil
--    if args[0].kind_of?(TkVariable) || args[0] == nil
-+    if !args.empty? && (args[0].kind_of?(TkVariable) || args[0] == nil)
-       @variable = args.shift 
-     else
-       @variable = keys.delete('variable')