diff options
| author | taca <taca@pkgsrc.org> | 2014-02-02 07:48:35 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2014-02-02 07:48:35 +0000 |
| commit | 4d002a7234abab1e4d68efb2a44612a3d8ae891d (patch) | |
| tree | c9c672951f623e8c76572bf1e10aa05d4892307a /lang/ruby | |
| parent | b372c955085f57e1c73ed0055b6247677a9bf79c (diff) | |
| download | pkgsrc-4d002a7234abab1e4d68efb2a44612a3d8ae891d.tar.gz | |
Revert accidently commit files which not yet ready.
Diffstat (limited to 'lang/ruby')
| -rw-r--r-- | lang/ruby/gem.mk | 7 | ||||
| -rw-r--r-- | lang/ruby/json.mk | 4 | ||||
| -rw-r--r-- | lang/ruby/rdoc.mk | 6 |
3 files changed, 3 insertions, 14 deletions
diff --git a/lang/ruby/gem.mk b/lang/ruby/gem.mk index 53b3d7b412d..6a3a859a710 100644 --- a/lang/ruby/gem.mk +++ b/lang/ruby/gem.mk @@ -1,4 +1,4 @@ -# $NetBSD: gem.mk,v 1.24 2014/02/02 07:46:16 taca Exp $ +# $NetBSD: gem.mk,v 1.25 2014/02/02 07:48:35 taca Exp $ # # This Makefile fragment is intended to be included by packages that build # and install Ruby gems. @@ -11,7 +11,6 @@ # 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. @@ -178,7 +177,6 @@ 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]+)\.*//} @@ -189,9 +187,6 @@ _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 468c7637a6e..69657b5d4fd 100644 --- a/lang/ruby/json.mk +++ b/lang/ruby/json.mk @@ -1,4 +1,4 @@ -# $NetBSD: json.mk,v 1.4 2014/02/02 07:46:16 taca Exp $ +# $NetBSD: json.mk,v 1.5 2014/02/02 07:48:35 taca Exp $ # This file handles appropriate dependency to ruby-json pacakge. # @@ -36,8 +36,6 @@ _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 4be5e7cb9be..bbd8e940c18 100644 --- a/lang/ruby/rdoc.mk +++ b/lang/ruby/rdoc.mk @@ -1,4 +1,4 @@ -# $NetBSD: rdoc.mk,v 1.17 2014/02/02 07:46:16 taca Exp $ +# $NetBSD: rdoc.mk,v 1.18 2014/02/02 07:48:35 taca Exp $ .if !defined(_RUBY_RDOC_MK) _RUBY_RDOC_MK= # defined @@ -22,7 +22,6 @@ _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]+)\.*//} @@ -36,9 +35,6 @@ _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 |