Pullup ticket #3505 - requested by taca

devel/ruby-railties: bug fix update

Revisions pulled up:
- devel/ruby-railties/Makefile                                  1.6
- devel/ruby-rdoc/PLIST                                         1.2
- devel/ruby-rdoc/distinfo                                      1.2
- lang/ruby/rdoc.mk                                             1.2-1.3

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Jul 22 03:18:45 UTC 2011

   Modified Files:
   	pkgsrc/devel/ruby-rdoc: PLIST distinfo
   	pkgsrc/lang/ruby: rdoc.mk

   Log Message:
   Update ruby-rdoc pacakge to 3.8.

   It was really needed by devel/ruby-railties, sigh.

   === 3.8 / ??

   * Minor enhancements
     * RDoc::Parser::C can now discover methods on ENV and ARGF.
     * RDoc::Parser::C now knows about rb_cSocket and rb_mDL.
   * Bug fixes
     * Updating Object in an ri data store with new data now removes methods,
       includes, constants and aliases.

   === 3.7 / 2011-06-27

   * Minor enhancements
     * New directive :category: which allows methods to be grouped into sections
       more cleanly.  See RDoc::Markup for details.
     * Document-class for RDoc::Parser::C now supports Foo::CONST as well as
       CONST.
     * ri method output is now a comma-separated list when displayed
       interactively.  Pull Request #39 by Benoit Daloze.
     * RDoc::ClassModule#merge now prefers the argument's information over the
       receiver's (it now behaves like Hash#merge! instead of a backwards
       Hash#merge!).
     * RDoc::Markup#convert now accepts an RDoc::Markup::Document instance
     * RDoc now owns the code for generating RDoc and ri data when gems install
     * Added RDoc::RDoc::reset
     * Added RDoc::CodeObject#file_name
   * Bug fixes
     * ri no longer crashes when attempting to complete a plain [.
     * ri data now tracks which file information came from so it can process
       removals and changes to:
       * Classes and Modules
       * Methods
       * Attributes
       * Includes
       * Constants
       You will need to rebuild your ri data for it to update properly.  Issue
       #21 by Sven Riedel
     * Signal and SignalException no longer clobber each other
     * RDoc::Parser::C no longer creates classes when processing aliases.
     * RDoc::Text#strip_stars handles Document-method for methods with =, ! and ?
       now.
     * RDoc::Parser::C now allows .cpp files to be used with the "in" comment on
       rb_define_method.  Bug #35 by Hanmac.
     * RDoc::Parser::Ruby no longer eats content when =begin/=end documentation
       blocks are followed by a documentable item.  Issue #41 by mfn.
     * RDoc::Markup::Formatter and subclasses now allow an optional +markup+
       parameter for adding custom markup.  The example in
       RDoc::Markup::Formatter will now work.  Issue #38 by tsilen.
     * RDoc::Parser::C can now distinguish between class methods and instance
       methods in Document-method.  Issue #36 by Vincent Batts.
     * RDoc now encodes file names in the output encoding.  Issue #33 by Perry
       Smith.
     * ri data generation for method aliases no longer duplicates the class in
       #full_name

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Jul 22 03:36:11 UTC 2011

   Modified Files:
   	pkgsrc/lang/ruby: rdoc.mk

   Log Message:
   * Fix dependency condition to inverse when RUBY_RDOC_REQD is defined.
   * Minor clean up.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Jul 22 03:40:52 UTC 2011

   Modified Files:
   	pkgsrc/devel/ruby-railties: Makefile

   Log Message:
   Set RUBY_RDOC_REQD to 3.4 as for gemspec and now rails command of
   www/ruby-rails3 package should be work.

   Bump PKGREVISION.

4 files changed, 21 insertions, 13 deletions

diff --git a/devel/ruby-railties/Makefile b/devel/ruby-railties/Makefile
index 5897f93b764..d8d00922825 100644
--- a/devel/ruby-railties/Makefile
+++ b/devel/ruby-railties/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2011/06/11 03:25:00 taca Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2011/08/23 09:12:11 tron Exp $
 
 DISTNAME=	railties-${RUBY_RAILS3_VERSION}
+PKGREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -9,6 +10,7 @@ COMMENT=	Tools for creating, working with, and running Rails applications
 LICENSE=	mit
 
 RUBY_RAILS=	3
+RUBY_RDOC_REQD=	3.4
 
 DEPENDS+=	${RUBY_PKGPREFIX}-thor>=0.14.4<0.15:../../devel/ruby-thor
 #DEPENDS+=	${RUBY_ACTIVESUPPORT_DEPENDS}
diff --git a/devel/ruby-rdoc/PLIST b/devel/ruby-rdoc/PLIST
index 6a790ac43a8..ef431cf516e 100644
--- a/devel/ruby-rdoc/PLIST
+++ b/devel/ruby-rdoc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/06/16 15:06:49 taca Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2011/08/23 09:12:11 tron Exp $
 bin/rdoc
 bin/ri
 ${GEM_HOME}/cache/${GEM_NAME}.gem
@@ -69,6 +69,7 @@ ${GEM_LIBDIR}/lib/rdoc/markup/document.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/formatter.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/formatter_test_case.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/heading.rb
+${GEM_LIBDIR}/lib/rdoc/markup/indented_paragraph.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/inline.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/list.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/list_item.rb
@@ -105,6 +106,7 @@ ${GEM_LIBDIR}/lib/rdoc/ri/paths.rb
 ${GEM_LIBDIR}/lib/rdoc/ri/store.rb
 ${GEM_LIBDIR}/lib/rdoc/ruby_lex.rb
 ${GEM_LIBDIR}/lib/rdoc/ruby_token.rb
+${GEM_LIBDIR}/lib/rdoc/rubygems_hook.rb
 ${GEM_LIBDIR}/lib/rdoc/single_class.rb
 ${GEM_LIBDIR}/lib/rdoc/stats.rb
 ${GEM_LIBDIR}/lib/rdoc/stats/normal.rb
@@ -137,6 +139,7 @@ ${GEM_LIBDIR}/test/test_rdoc_include.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_attribute_manager.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_document.rb
+${GEM_LIBDIR}/test/test_rdoc_markup_indented_paragraph.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_paragraph.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_parser.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_pre_process.rb
@@ -161,6 +164,7 @@ ${GEM_LIBDIR}/test/test_rdoc_ri_driver.rb
 ${GEM_LIBDIR}/test/test_rdoc_ri_paths.rb
 ${GEM_LIBDIR}/test/test_rdoc_ri_store.rb
 ${GEM_LIBDIR}/test/test_rdoc_ruby_lex.rb
+${GEM_LIBDIR}/test/test_rdoc_rubygems_hook.rb
 ${GEM_LIBDIR}/test/test_rdoc_single_class.rb
 ${GEM_LIBDIR}/test/test_rdoc_stats.rb
 ${GEM_LIBDIR}/test/test_rdoc_task.rb
diff --git a/devel/ruby-rdoc/distinfo b/devel/ruby-rdoc/distinfo
index a962f1019e0..509375c530e 100644
--- a/devel/ruby-rdoc/distinfo
+++ b/devel/ruby-rdoc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/06/16 15:06:49 taca Exp $
+$NetBSD: distinfo,v 1.1.1.1.2.1 2011/08/23 09:12:11 tron Exp $
 
-SHA1 (rdoc-3.6.1.gem) = 8e4ae75c72674f84a126bca04535063bc568fbc3
-RMD160 (rdoc-3.6.1.gem) = 6528e3019d9d5968489267a61dc942c6b0890d41
-Size (rdoc-3.6.1.gem) = 235520 bytes
+SHA1 (rdoc-3.8.gem) = 7cdc98c0633b7b471482e582d409cbc4e17aaa98
+RMD160 (rdoc-3.8.gem) = b36ab031605c229f331f61b65047ad4051e249b6
+Size (rdoc-3.8.gem) = 248320 bytes
diff --git a/lang/ruby/rdoc.mk b/lang/ruby/rdoc.mk
index 2b2df615e9d..08cc50c2148 100644
--- a/lang/ruby/rdoc.mk
+++ b/lang/ruby/rdoc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rdoc.mk,v 1.1 2011/06/16 15:03:29 taca Exp $
+# $NetBSD: rdoc.mk,v 1.1.2.1 2011/08/23 09:12:11 tron Exp $
 
 .if !defined(_RUBY_RDOC_MK)
 _RUBY_RDOC_MK=	# defined
@@ -19,7 +19,7 @@ _RUBY_RDOC_MK=	# defined
 #
 # current rdoc versions.
 #
-RUBY_RDOC_VERSION=	3.6.1
+RUBY_RDOC_VERSION=	3.8
 
 .if !empty(RUBY_RDOC_REQD)
 
@@ -37,18 +37,20 @@ _RUBY_RDOC_MAJOR=	${RUBY19_RDOC_VERS:C/\.[0-9\.]+$//}
 _RUBY_RDOC_MINORS=	${RUBY19_RDOC_VERS:C/^([0-9]+)\.*//}
 . endif
 
+_RUBY_RDOC_REQD=	NO
+
 . if ${_RDOC_REQD_MAJOR} > ${_RUBY_RDOC_MAJOR}
-_RUBY_RDOC_REQD=	yes
+_RUBY_RDOC_REQD=	YES
 . elif ${_RDOC_REQD_MAJOR} == ${_RUBY_RDOC_MAJOR}
 .  if !empty(_RUBY_RDOC_MINORS) && ${_RDOC_REQD_MINORS} > ${_RUBY_RDOC_MINORS}
-_RUBY_RDOC_REQD=	yes
+_RUBY_RDOC_REQD=	YES
 .  endif
 . endif
 
-. if defined(_RUBY_RDOC_REQD)
+. if empty(_RUBY_RDOC_REQD:M[nN][oO])
 RDOC=			${PREFIX}/bin/rdoc
-.  if !empty(RUBY_BUILD_RI:M[nN][oO]) || !empty(RUBY_BUILD_RDOC:M[nN][oO])
-# for safety, use newer rdoc on runtime, too.
+.  if empty(RUBY_BUILD_RI:M[nN][oO]) && empty(RUBY_BUILD_RDOC:M[nN][oO])
+# rdoc will be required at runtime, too.
 DEPENDS+= ${RUBY_PKGPREFIX}-rdoc>=${RUBY_RDOC_REQD}:../../devel/ruby-rdoc
 .  endif
 . endif