* Make rdoc compatible with newer version of rdoc (on Ruby 1.9.2) about

  handling of none existing files.

This should be fix build problem of www/ruby-rails3 with ruby18-base.

Bump PKGREVISION.

4 files changed, 35 insertions, 2 deletions

diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 372644f946b..adeb46ecba9 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.58 2010/09/10 03:29:00 taca Exp $
+# $NetBSD: Makefile,v 1.59 2011/03/28 14:10:25 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
+PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index fa0406c5857..792bf49ffe5 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2011/02/21 14:35:37 taca Exp $
+$NetBSD: distinfo,v 1.48 2011/03/28 14:10:25 taca Exp $
 
 SHA1 (ruby-1.8.7-p334.tar.bz2) = 4311ce257f2e54f247bfe07b48e799d293d041f2
 RMD160 (ruby-1.8.7-p334.tar.bz2) = f3d078d526f1b19d3255dc236f5a46062883e7c9
@@ -48,3 +48,5 @@ SHA1 (patch-ev) = 6178be681ca1cf2647cab9a61c8ef989ff5b23cb
 SHA1 (patch-ew) = ddb8066a3e63b049e43c569e8d95b872eea0c247
 SHA1 (patch-ga) = 73f50504baf74ee77d00dcfb5a9446bbaf122726
 SHA1 (patch-gb) = 345ad3e5df6fd9febe7b398f091662fd7c300dc4
+SHA1 (patch-lib_rdoc_options.rb) = 0f14417733ad6fc6fbc93af1c8463ecd59abce7c
+SHA1 (patch-lib_rdoc_rdoc.rb) = bef895245cc06ca84fd1e5d506c3c65932921b3a
diff --git a/lang/ruby18-base/patches/patch-lib_rdoc_options.rb b/lang/ruby18-base/patches/patch-lib_rdoc_options.rb
new file mode 100644
index 00000000000..2b5e5f7665d
--- /dev/null
+++ b/lang/ruby18-base/patches/patch-lib_rdoc_options.rb
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_rdoc_options.rb,v 1.1 2011/03/28 14:10:25 taca Exp $
+
+* Ignore none existing files as newer version of rdoc.
+
+--- lib/rdoc/options.rb.orig	2008-01-11 01:24:05.000000000 +0000
++++ lib/rdoc/options.rb
+@@ -573,7 +573,7 @@ class Options
+   
+   def check_files
+     @files.each do |f|
+-      stat = File.stat f rescue error("File not found: #{f}")
++      stat = File.stat f rescue next
+       error("File '#{f}' not readable") unless stat.readable?
+     end
+   end
diff --git a/lang/ruby18-base/patches/patch-lib_rdoc_rdoc.rb b/lang/ruby18-base/patches/patch-lib_rdoc_rdoc.rb
new file mode 100644
index 00000000000..27890e8a20d
--- /dev/null
+++ b/lang/ruby18-base/patches/patch-lib_rdoc_rdoc.rb
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_rdoc_rdoc.rb,v 1.1 2011/03/28 14:10:25 taca Exp $
+
+* Ignore none existing files as newer version of rdoc.
+
+--- lib/rdoc/rdoc.rb.orig	2007-02-12 23:01:19.000000000 +0000
++++ lib/rdoc/rdoc.rb
+@@ -174,7 +174,7 @@ module RDoc
+ 
+       relative_files.each do |rel_file_name|
+         next if exclude_pattern && exclude_pattern =~ rel_file_name
+-        stat = File.stat(rel_file_name)
++        stat = File.stat(rel_file_name) rescue next
+         case type = stat.ftype
+         when "file"
+           next if @last_created and stat.mtime < @last_created