diff options
| -rw-r--r-- | lang/ruby/gem.mk | 7 | ||||
| -rw-r--r-- | lang/ruby/json.mk | 4 | ||||
| -rw-r--r-- | lang/ruby/rdoc.mk | 6 | ||||
| -rw-r--r-- | lang/ruby/rubyversion.mk | 6 |
4 files changed, 19 insertions, 4 deletions
diff --git a/lang/ruby/gem.mk b/lang/ruby/gem.mk index d701651c662..53b3d7b412d 100644 --- a/lang/ruby/gem.mk +++ b/lang/ruby/gem.mk @@ -1,4 +1,4 @@ -# $NetBSD: gem.mk,v 1.23 2013/09/11 13:22:15 taca Exp $ +# $NetBSD: gem.mk,v 1.24 2014/02/02 07:46:16 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. @@ -177,6 +178,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-rubygems>=1.0.1:../../misc/rubygems RUBY193_RUBYGEMS_VERS= 1.8.11 RUBY200_RUBYGEMS_VERS= 2.0.0 +RUBY210_RUBYGEMS_VERS= 2.1.0 _RUBYGEMS_REQD_MAJOR= ${RUBYGEMS_REQD:C/\.[0-9\.]+$//} _RUBYGEMS_REQD_MINORS= ${RUBYGEMS_REQD:C/^([0-9]+)\.*//} @@ -187,6 +189,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]+)\.*//} +. elif ${RUBY_VER} == "210" +_RUBYGEMS_MAJOR= ${RUBY210_RUBYGEMS_VERS:C/\.[0-9\.]+$//} +_RUBYGEMS_MINORS= ${RUBY210_RUBYGEMS_VERS:C/^([0-9]+)\.*//} . else PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}." . endif diff --git a/lang/ruby/json.mk b/lang/ruby/json.mk index f53202b62a9..468c7637a6e 100644 --- a/lang/ruby/json.mk +++ b/lang/ruby/json.mk @@ -1,4 +1,4 @@ -# $NetBSD: json.mk,v 1.3 2013/11/24 14:05:08 taca Exp $ +# $NetBSD: json.mk,v 1.4 2014/02/02 07:46:16 taca Exp $ # This file handles appropriate dependency to ruby-json pacakge. # @@ -36,6 +36,8 @@ _RUBY_JSON_REQD= true RUBY_JSON_VERSION= 1.5.5 . elif ${RUBY_VER} == "200" RUBY_JSON_VERSION= 1.7.7 +. elif ${RUBY_VER} == "210" +RUBY_JSON_VERSION= 1.8.1 . endif _RUBY_JSON_MAJOR= ${RUBY_JSON_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} diff --git a/lang/ruby/rdoc.mk b/lang/ruby/rdoc.mk index d404c561abc..4be5e7cb9be 100644 --- a/lang/ruby/rdoc.mk +++ b/lang/ruby/rdoc.mk @@ -1,4 +1,4 @@ -# $NetBSD: rdoc.mk,v 1.16 2014/01/19 12:57:42 taca Exp $ +# $NetBSD: rdoc.mk,v 1.17 2014/02/02 07:46:16 taca Exp $ .if !defined(_RUBY_RDOC_MK) _RUBY_RDOC_MK= # defined @@ -22,6 +22,7 @@ _RUBY_RDOC_MK= # defined RUBY18_RDOC_VERS= 1.0.1 RUBY193_RDOC_VERS= 3.9.4 RUBY200_RDOC_VERS= 4.0.0 +RUBY210_RDOC_VERS= 4.1.0 _RDOC_REQD_MAJOR= ${RUBY_RDOC_REQD:C/\.[0-9\.]+$//} _RDOC_REQD_MINORS= ${RUBY_RDOC_REQD:C/^([0-9]+)\.*//} @@ -35,6 +36,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]+)\.*//} +.elif ${RUBY_VER} == "210" +_RUBY_RDOC_MAJOR= ${RUBY210_RDOC_VERS:C/\.[0-9\.]+$//} +_RUBY_RDOC_MINORS= ${RUBY210_RDOC_VERS:C/^([0-9]+)\.*//} .else PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}." . endif diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index ff19b1fb169..fe6dc8a6215 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.107 2014/01/14 11:14:07 obache Exp $ +# $NetBSD: rubyversion.mk,v 1.108 2014/02/02 07:46:16 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -200,6 +200,10 @@ _RUBYVERSION_MK= # defined .include "../../mk/bsd.prefs.mk" +.if defined(PKGNAME_REQD) && (!empty(PKGNAME_REQD:Mruby[0-9][0-9][0-9]-*) || !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*)) +RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/} +.endif + # current supported Ruby's version RUBY18_VERSION= 1.8.7 RUBY193_VERSION= 1.9.3 |