* No need to require rubygems anymore.

* Work comment view again, taken form upstream.

Bump PKGREVISION.

6 files changed, 20 insertions, 56 deletions

diff --git a/graphics/rabbit/Makefile b/graphics/rabbit/Makefile
index dab7d155815..1732a294dbf 100644
--- a/graphics/rabbit/Makefile
+++ b/graphics/rabbit/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/05/16 12:23:48 obache Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/18 09:16:08 obache Exp $
 #
 
 DISTNAME=	rabbit-0.6.4
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www.cozmixng.org/~kou/download/
 
diff --git a/graphics/rabbit/distinfo b/graphics/rabbit/distinfo
index 99cbc4473b6..4260b85dace 100644
--- a/graphics/rabbit/distinfo
+++ b/graphics/rabbit/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.15 2010/01/30 00:59:30 obache Exp $
+$NetBSD: distinfo,v 1.16 2010/06/18 09:16:08 obache Exp $
 
 SHA1 (rabbit-0.6.4.tar.gz) = 77b9850a2a616b45790735ec544d039503fd2327
 RMD160 (rabbit-0.6.4.tar.gz) = 0243187185641923232c71fffd16d4ce22cf73bb
 Size (rabbit-0.6.4.tar.gz) = 5895707 bytes
-SHA1 (patch-ab) = 848ccd627644dde7e36d27032ab318af729dc3ce
-SHA1 (patch-ac) = 8e9e5a831f54e4a350a422d3c0027aa7dfa85d35
-SHA1 (patch-ad) = ee455a7c34587fa68fc8152d6ad0a6f48b608222
+SHA1 (patch-ae) = 301505f066dfe2a7911a6bbbd07a4ee224e6d040
diff --git a/graphics/rabbit/patches/patch-ab b/graphics/rabbit/patches/patch-ab
deleted file mode 100644
index 49af1494d00..00000000000
--- a/graphics/rabbit/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2008/03/31 15:26:34 jlam Exp $
-
---- bin/rabbit.orig	2008-03-01 04:54:40.000000000 -0500
-+++ bin/rabbit
-@@ -4,6 +4,12 @@
- GC.disable
- require "rbconfig"
- 
-+begin
-+  require "rubygems"
-+rescue LoadError
-+  nil
-+end
-+
- require "rabbit/console"
- require "rabbit/source"
- require "rabbit/renderer"
diff --git a/graphics/rabbit/patches/patch-ac b/graphics/rabbit/patches/patch-ac
deleted file mode 100644
index 69f34c64943..00000000000
--- a/graphics/rabbit/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2008/03/31 15:26:34 jlam Exp $
-
---- bin/rabbit-theme-manager.orig	2008-03-01 04:54:40.000000000 -0500
-+++ bin/rabbit-theme-manager
-@@ -1,6 +1,12 @@
- #!/usr/bin/env ruby
- # -*- ruby -*-
- 
-+begin
-+  require "rubygems"
-+rescue LoadError
-+  nil
-+end
-+
- require "fileutils"
- 
- require "rabbit/console"
diff --git a/graphics/rabbit/patches/patch-ad b/graphics/rabbit/patches/patch-ad
deleted file mode 100644
index 37b65b77bd5..00000000000
--- a/graphics/rabbit/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2008/03/31 15:26:34 jlam Exp $
-
---- bin/rabrick.orig	2008-03-01 04:54:40.000000000 -0500
-+++ bin/rabrick
-@@ -1,6 +1,12 @@
- #!/usr/bin/env ruby
- # -*- ruby -*-
- 
-+begin
-+  require "rubygems"
-+rescue LoadError
-+  nil
-+end
-+
- require "webrick"
- 
- require 'tofu/tofulet'
diff --git a/graphics/rabbit/patches/patch-ae b/graphics/rabbit/patches/patch-ae
new file mode 100644
index 00000000000..e66d806a0dd
--- /dev/null
+++ b/graphics/rabbit/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2010/06/18 09:16:08 obache Exp $
+
+work comment view again.
+http://www.cozmixng.org/retro/projects/rabbit/changesets/1376
+
+--- lib/rabbit/renderer/display/comment-drawing-area.rb.orig	2010-01-29 14:09:05.000000000 +0000
++++ lib/rabbit/renderer/display/comment-drawing-area.rb
+@@ -36,6 +36,8 @@ module Rabbit
+ 
+         def_delegators(:@pixmap, :x_dpi, :y_dpi)
+ 
++        def_delegators(:@pixmap, :set_font_resolution)
++
+         attr_accessor :direction
+ 
+         def width