Mon Mar 28 14:10:26 2011 UTC ()
* 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.


(taca)
diff -r1.58 -r1.59 pkgsrc/lang/ruby18-base/Makefile
diff -r1.47 -r1.48 pkgsrc/lang/ruby18-base/distinfo
diff -r0 -r1.1 pkgsrc/lang/ruby18-base/patches/patch-lib_rdoc_options.rb
diff -r0 -r1.1 pkgsrc/lang/ruby18-base/patches/patch-lib_rdoc_rdoc.rb
cvs diff -r1.58 -r1.59 pkgsrc/lang/ruby18-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby18-base/Attic/Makefile 2010/09/10 03:29:00 1.58
+++ pkgsrc/lang/ruby18-base/Attic/Makefile 2011/03/28 14:10:25 1.59
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.58 2010/09/10 03:29:00 taca Exp $ 1# $NetBSD: Makefile,v 1.59 2011/03/28 14:10:25 taca Exp $
2# 2#
3 3
4DISTNAME= ${RUBY_DISTNAME} 4DISTNAME= ${RUBY_DISTNAME}
5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX} 5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
 6PKGREVISION= 1
6CATEGORIES= lang ruby 7CATEGORIES= lang ruby
7MASTER_SITES= ${MASTER_SITE_RUBY} 8MASTER_SITES= ${MASTER_SITE_RUBY}
8 9
9MAINTAINER= taca@NetBSD.org 10MAINTAINER= taca@NetBSD.org
10HOMEPAGE= ${RUBY_HOMEPAGE} 11HOMEPAGE= ${RUBY_HOMEPAGE}
11COMMENT= Ruby 1.8 based release minimum package 12COMMENT= Ruby 1.8 based release minimum package
12LICENSE= gnu-gpl-v2 OR ruby-license 13LICENSE= gnu-gpl-v2 OR ruby-license
13 14
14RUBY_VERSION= ${RUBY18_VERSION} 15RUBY_VERSION= ${RUBY18_VERSION}
15 16
16CONFLICTS= ${RUBY_PKGPREFIX}-dbm-[0-9]* \ 17CONFLICTS= ${RUBY_PKGPREFIX}-dbm-[0-9]* \
17 ${RUBY_PKGPREFIX}-digest-[0-9]* \ 18 ${RUBY_PKGPREFIX}-digest-[0-9]* \
18 ${RUBY_PKGPREFIX}-iconv-[0-9]* \ 19 ${RUBY_PKGPREFIX}-iconv-[0-9]* \
cvs diff -r1.47 -r1.48 pkgsrc/lang/ruby18-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby18-base/Attic/distinfo 2011/02/21 14:35:37 1.47
+++ pkgsrc/lang/ruby18-base/Attic/distinfo 2011/03/28 14:10:25 1.48
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.47 2011/02/21 14:35:37 taca Exp $ 1$NetBSD: distinfo,v 1.48 2011/03/28 14:10:25 taca Exp $
2 2
3SHA1 (ruby-1.8.7-p334.tar.bz2) = 4311ce257f2e54f247bfe07b48e799d293d041f2 3SHA1 (ruby-1.8.7-p334.tar.bz2) = 4311ce257f2e54f247bfe07b48e799d293d041f2
4RMD160 (ruby-1.8.7-p334.tar.bz2) = f3d078d526f1b19d3255dc236f5a46062883e7c9 4RMD160 (ruby-1.8.7-p334.tar.bz2) = f3d078d526f1b19d3255dc236f5a46062883e7c9
5Size (ruby-1.8.7-p334.tar.bz2) = 4190857 bytes 5Size (ruby-1.8.7-p334.tar.bz2) = 4190857 bytes
6SHA1 (patch-aa) = 4c1572b5a1eb65e89a98c60540433a69cb96dd23 6SHA1 (patch-aa) = 4c1572b5a1eb65e89a98c60540433a69cb96dd23
7SHA1 (patch-ab) = b56b6c2ba182414492c803d36433730602e0a591 7SHA1 (patch-ab) = b56b6c2ba182414492c803d36433730602e0a591
8SHA1 (patch-ac) = 0119134d778bb85c58ef5bfe30d337dc76ed47e0 8SHA1 (patch-ac) = 0119134d778bb85c58ef5bfe30d337dc76ed47e0
9SHA1 (patch-ad) = 2b194a26f3a7b9bdf3afcc0819ab239479f47c5b 9SHA1 (patch-ad) = 2b194a26f3a7b9bdf3afcc0819ab239479f47c5b
10SHA1 (patch-aw) = d3dc491da64426ff72a9417a65eb99bee2d21044 10SHA1 (patch-aw) = d3dc491da64426ff72a9417a65eb99bee2d21044
11SHA1 (patch-az) = 55c9cba404add5293168ae7fae7ae7aaf4df6550 11SHA1 (patch-az) = 55c9cba404add5293168ae7fae7ae7aaf4df6550
12SHA1 (patch-bd) = 4bdf2230fd8a6ea21f28150ba5705ebd0db4af99 12SHA1 (patch-bd) = 4bdf2230fd8a6ea21f28150ba5705ebd0db4af99
13SHA1 (patch-be) = 2286b14b5992686481d1d7a964c43cfc72118a45 13SHA1 (patch-be) = 2286b14b5992686481d1d7a964c43cfc72118a45
14SHA1 (patch-dj) = 9d67b57daf6111361c478481f39ee8764a861106 14SHA1 (patch-dj) = 9d67b57daf6111361c478481f39ee8764a861106
@@ -38,13 +38,15 @@ SHA1 (patch-ek) = a5de28017bc57d4e01ec98 @@ -38,13 +38,15 @@ SHA1 (patch-ek) = a5de28017bc57d4e01ec98
38SHA1 (patch-el) = c071250196cff37c413e724ce4fc149b920e6dde 38SHA1 (patch-el) = c071250196cff37c413e724ce4fc149b920e6dde
39SHA1 (patch-em) = 13ccef1c981c9bf312a104c9eb0a9e2339f38461 39SHA1 (patch-em) = 13ccef1c981c9bf312a104c9eb0a9e2339f38461
40SHA1 (patch-en) = 5f92c80c321149055b962a4c2ba97105c00706e2 40SHA1 (patch-en) = 5f92c80c321149055b962a4c2ba97105c00706e2
41SHA1 (patch-eo) = 41a1ff4e1037415eb50373eff64322f6e1423e27 41SHA1 (patch-eo) = 41a1ff4e1037415eb50373eff64322f6e1423e27
42SHA1 (patch-ep) = f881aece8ec0836c75df3be567d57ffc3ad8bce1 42SHA1 (patch-ep) = f881aece8ec0836c75df3be567d57ffc3ad8bce1
43SHA1 (patch-eq) = d9dfa070d1f12de4f5f48f07d5a32d649035a657 43SHA1 (patch-eq) = d9dfa070d1f12de4f5f48f07d5a32d649035a657
44SHA1 (patch-er) = 666fc6c22544c7f74f7c17ffef30563effcb4df7 44SHA1 (patch-er) = 666fc6c22544c7f74f7c17ffef30563effcb4df7
45SHA1 (patch-et) = eba90415e5279c9eb8bea67635f5f8cab5d1e7ac 45SHA1 (patch-et) = eba90415e5279c9eb8bea67635f5f8cab5d1e7ac
46SHA1 (patch-eu) = dbf65258dcdc619d220ab39864389c4ec4c5c625 46SHA1 (patch-eu) = dbf65258dcdc619d220ab39864389c4ec4c5c625
47SHA1 (patch-ev) = 6178be681ca1cf2647cab9a61c8ef989ff5b23cb 47SHA1 (patch-ev) = 6178be681ca1cf2647cab9a61c8ef989ff5b23cb
48SHA1 (patch-ew) = ddb8066a3e63b049e43c569e8d95b872eea0c247 48SHA1 (patch-ew) = ddb8066a3e63b049e43c569e8d95b872eea0c247
49SHA1 (patch-ga) = 73f50504baf74ee77d00dcfb5a9446bbaf122726 49SHA1 (patch-ga) = 73f50504baf74ee77d00dcfb5a9446bbaf122726
50SHA1 (patch-gb) = 345ad3e5df6fd9febe7b398f091662fd7c300dc4 50SHA1 (patch-gb) = 345ad3e5df6fd9febe7b398f091662fd7c300dc4
 51SHA1 (patch-lib_rdoc_options.rb) = 0f14417733ad6fc6fbc93af1c8463ecd59abce7c
 52SHA1 (patch-lib_rdoc_rdoc.rb) = bef895245cc06ca84fd1e5d506c3c65932921b3a
File Added: pkgsrc/lang/ruby18-base/patches/Attic/patch-lib_rdoc_options.rb
$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
File Added: pkgsrc/lang/ruby18-base/patches/Attic/patch-lib_rdoc_rdoc.rb
$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