diff options
| author | taca <taca> | 2014-02-09 05:15:21 +0000 |
|---|---|---|
| committer | taca <taca> | 2014-02-09 05:15:21 +0000 |
| commit | 0eabe023705651b99f9545edc93005a1eeebd69f (patch) | |
| tree | e63943ca6d1368772d842021777acb3bf5306704 /lang/ruby | |
| parent | 4e563426ff7c81147f0775b82dea14e71349d91b (diff) | |
| download | pkgsrc-0eabe023705651b99f9545edc93005a1eeebd69f.tar.gz | |
Use versions in rubyversion.mk.
Diffstat (limited to 'lang/ruby')
| -rw-r--r-- | lang/ruby/gem.mk | 17 | ||||
| -rw-r--r-- | lang/ruby/rdoc.mk | 22 |
2 files changed, 10 insertions, 29 deletions
diff --git a/lang/ruby/gem.mk b/lang/ruby/gem.mk index 6a3a859a710..4cf5980ad1d 100644 --- a/lang/ruby/gem.mk +++ b/lang/ruby/gem.mk @@ -1,4 +1,4 @@ -# $NetBSD: gem.mk,v 1.25 2014/02/02 07:48:35 taca Exp $ +# $NetBSD: gem.mk,v 1.26 2014/02/09 05:15:21 taca Exp $ # # This Makefile fragment is intended to be included by packages that build # and install Ruby gems. @@ -11,6 +11,7 @@ # ruby18-base: none # ruby193-base: 1.8.23 # ruby200-base: 2.0.3 +# ruby210-base: 2.2.0 # # If newer version of rubygems is resuiqred, set RUBYGEMS_REQD to # minimum version. @@ -175,21 +176,11 @@ DEPENDS+= ${RUBY_PKGPREFIX}-rubygems>=1.0.1:../../misc/rubygems .else # !ruby18 . if defined(RUBYGEMS_REQD) -RUBY193_RUBYGEMS_VERS= 1.8.11 -RUBY200_RUBYGEMS_VERS= 2.0.0 - _RUBYGEMS_REQD_MAJOR= ${RUBYGEMS_REQD:C/\.[0-9\.]+$//} _RUBYGEMS_REQD_MINORS= ${RUBYGEMS_REQD:C/^([0-9]+)\.*//} -. if ${RUBY_VER} == "193" -_RUBYGEMS_MAJOR= ${RUBY193_RUBYGEMS_VERS:C/\.[0-9\.]+$//} -_RUBYGEMS_MINORS= ${RUBY193_RUBYGEMS_VERS:C/^([0-9]+)\.*//} -. elif ${RUBY_VER} == "200" -_RUBYGEMS_MAJOR= ${RUBY200_RUBYGEMS_VERS:C/\.[0-9\.]+$//} -_RUBYGEMS_MINORS= ${RUBY200_RUBYGEMS_VERS:C/^([0-9]+)\.*//} -. else -PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}." -. endif +_RUBYGEMS_MAJOR= ${RUBY_GEMS_VERSION:C/\.[0-9\.]+$//} +_RUBYGEMS_MINORS= ${RUBY_GEMS_VERSION:C/^([0-9]+)\.*//} _RUBYGEMS_REQD= NO diff --git a/lang/ruby/rdoc.mk b/lang/ruby/rdoc.mk index bbd8e940c18..c3361912537 100644 --- a/lang/ruby/rdoc.mk +++ b/lang/ruby/rdoc.mk @@ -1,4 +1,4 @@ -# $NetBSD: rdoc.mk,v 1.18 2014/02/02 07:48:35 taca Exp $ +# $NetBSD: rdoc.mk,v 1.19 2014/02/09 05:15:21 taca Exp $ .if !defined(_RUBY_RDOC_MK) _RUBY_RDOC_MK= # defined @@ -19,25 +19,15 @@ _RUBY_RDOC_MK= # defined .if !empty(RUBY_RDOC_REQD) -RUBY18_RDOC_VERS= 1.0.1 -RUBY193_RDOC_VERS= 3.9.4 -RUBY200_RDOC_VERS= 4.0.0 +. if empty(RUBY_VER) +. include "../../lang/ruby/rubyversion.mk" +. endif _RDOC_REQD_MAJOR= ${RUBY_RDOC_REQD:C/\.[0-9\.]+$//} _RDOC_REQD_MINORS= ${RUBY_RDOC_REQD:C/^([0-9]+)\.*//} -. if ${RUBY_VER} == "18" -_RUBY_RDOC_MAJOR= ${RUBY18_RDOC_VERS:C/\.[0-9\.]+$//} -_RUBY_RDOC_MINORS= ${RUBY18_RDOC_VERS:C/^([0-9]+)\.*//} -.elif ${RUBY_VER} == "193" -_RUBY_RDOC_MAJOR= ${RUBY193_RDOC_VERS:C/\.[0-9\.]+$//} -_RUBY_RDOC_MINORS= ${RUBY193_RDOC_VERS:C/^([0-9]+)\.*//} -.elif ${RUBY_VER} == "200" -_RUBY_RDOC_MAJOR= ${RUBY200_RDOC_VERS:C/\.[0-9\.]+$//} -_RUBY_RDOC_MINORS= ${RUBY200_RDOC_VERS:C/^([0-9]+)\.*//} -.else -PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}." -. endif +_RUBY_RDOC_MAJOR= ${RUBY_RDOC_VERSION:C/\.[0-9\.]+$//} +_RUBY_RDOC_MINORS= ${RUBY_RDOC_VERSION:C/^([0-9]+)\.*//} _RUBY_RDOC_REQD= NO |