diff options
| author | taca <taca> | 2012-03-20 06:14:30 +0000 |
|---|---|---|
| committer | taca <taca> | 2012-03-20 06:14:30 +0000 |
| commit | 58b5140734ad0a3513115523b1a66b4a42fa745e (patch) | |
| tree | f27165109022651faf75fd13e009db5cac81b4ce /lang | |
| parent | 2050e0828bf5e004e994be087fd99e61bc484bde (diff) | |
| download | pkgsrc-58b5140734ad0a3513115523b1a66b4a42fa745e.tar.gz | |
* Move some rails related part from gem.mk to module.mk.
* Require rdoc 2.5.0 and later with Ruby on Rails version 3.1 and later.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby/gem.mk | 10 | ||||
| -rw-r--r-- | lang/ruby/modules.mk | 13 |
2 files changed, 13 insertions, 10 deletions
diff --git a/lang/ruby/gem.mk b/lang/ruby/gem.mk index 0b0aa0181b2..33f6591303d 100644 --- a/lang/ruby/gem.mk +++ b/lang/ruby/gem.mk @@ -1,4 +1,4 @@ -# $NetBSD: gem.mk,v 1.13 2012/03/18 02:24:13 taca Exp $ +# $NetBSD: gem.mk,v 1.14 2012/03/20 06:14:30 taca Exp $ # # This Makefile fragment is intended to be included by packages that build # and install Ruby gems. @@ -132,10 +132,6 @@ UPDATE_GEMSPEC= ../../lang/ruby/files/update-gemspec.rb USE_RAKE?= YES .endif -.if defined(RUBY_RAILS_SUPPORTED) -USE_TOOLS+= expr -.endif - # print-PLIST support PRINT_PLIST_AWK+= /${GEM_NAME}\.(gem|gemspec)$$/ \ { gsub(/${GEM_NAME}\.gem/, "$${GEM_NAME}.gem"); } @@ -155,10 +151,6 @@ PRINT_PLIST_AWK+= /^${RUBY_GEM_BASE:S|/|\\/|g}/ \ # Include this early in case some of its target are needed .include "../../lang/ruby/modules.mk" -.if defined(RUBY_RAILS_SUPPORTED) -.include "../../lang/ruby/rails.mk" -.endif - # Build and run-time dependencies for Ruby prior to 1.9. # # We need rubygems>=1.1.0 to actually build the package, but the diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk index 2f954008124..dfd625667ca 100644 --- a/lang/ruby/modules.mk +++ b/lang/ruby/modules.mk @@ -1,8 +1,12 @@ -# $NetBSD: modules.mk,v 1.32 2012/03/17 13:53:01 taca Exp $ +# $NetBSD: modules.mk,v 1.33 2012/03/20 06:14:30 taca Exp $ .if !defined(_RUBY_MODULE_MK) _RUBY_MODULE_MK= # defined +.if defined(RUBY_RAILS_SUPPORTED) +USE_TOOLS+= expr +.endif + .include "../../lang/ruby/rubyversion.mk" # @@ -16,6 +20,13 @@ DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_VERSION}:../../lang/${RUBY_BASE} .include "../../lang/ruby/buildlink3.mk" .endif +.if defined(RUBY_RAILS_SUPPORTED) +.include "../../lang/ruby/rails.mk" +.if ${RUBY_RAILS} > 3 +RUBY_RDOC_REQD?= 2.5.0 +.endif +.endif + # # rdoc version # |