diff options
author | tron <tron> | 2011-08-23 09:12:11 +0000 |
---|---|---|
committer | tron <tron> | 2011-08-23 09:12:11 +0000 |
commit | 2775b57ab462103c70c78eaa98fd145aeab66bb6 (patch) | |
tree | fdda61a94c1dcf386d31e20e0f7cc7fa8c7e5790 /lang | |
parent | 5508ed01c269ce57e739e43a7ad834b435283277 (diff) | |
download | pkgsrc-2775b57ab462103c70c78eaa98fd145aeab66bb6.tar.gz |
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.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/ruby/rdoc.mk | 16 |
1 files changed, 9 insertions, 7 deletions
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 |