diff options
| author | taca <taca@pkgsrc.org> | 2013-11-24 14:05:08 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2013-11-24 14:05:08 +0000 |
| commit | ce3dc66fadc00c0068b29722f11c3ce4bc4b9fb7 (patch) | |
| tree | 632e43acddf97ccbf7cabddf3d98966c9bac1f1b /lang/ruby | |
| parent | d88dd01eb3f23779c50dc24f7969e584e1a2ae39 (diff) | |
| download | pkgsrc-ce3dc66fadc00c0068b29722f11c3ce4bc4b9fb7.tar.gz | |
Correct versions of json as bundled with Ruby.
Diffstat (limited to 'lang/ruby')
| -rw-r--r-- | lang/ruby/json.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lang/ruby/json.mk b/lang/ruby/json.mk index af292cafbe1..f53202b62a9 100644 --- a/lang/ruby/json.mk +++ b/lang/ruby/json.mk @@ -1,4 +1,4 @@ -# $NetBSD: json.mk,v 1.2 2011/12/14 13:13:18 taca Exp $ +# $NetBSD: json.mk,v 1.3 2013/11/24 14:05:08 taca Exp $ # This file handles appropriate dependency to ruby-json pacakge. # @@ -28,11 +28,15 @@ WARNINGS+= "[lang/ruby/json.mk] No needs to include ../../lang/ruby/json.mk" .include "../../lang/ruby/rubyversion.mk" -. if ${RUBY_VER} != "193" +. if ${RUBY_VER} == "18" _RUBY_JSON_REQD= true . else -RUBY_JSON_VERSION= 1.5.4 +. if ${RUBY_VER} == "193" +RUBY_JSON_VERSION= 1.5.5 +. elif ${RUBY_VER} == "200" +RUBY_JSON_VERSION= 1.7.7 +. endif _RUBY_JSON_MAJOR= ${RUBY_JSON_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} _RUBY_JSON_MINOR= ${RUBY_JSON_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} @@ -63,7 +67,7 @@ _RUBY_JSON_REQD= true . endif . endif . endif -. endif # ${RUBY_VER} == "193" +. endif # ${RUBY_VER} != "18" . if !empty(_RUBY_JSON_REQD) . if ${RUBY_JSON_TYPE} == "json" || ${RUBY_JSON_TYPE} == "both" |