diff options
| author | taca <taca@pkgsrc.org> | 2011-12-25 02:18:09 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2011-12-25 02:18:09 +0000 |
| commit | 81e40c90b0758d53e0def87a4a1e3f9ca20ed8ec (patch) | |
| tree | 5f1b152be09e47f7f8737a6c05038beeb6c8b51d /lang/ruby | |
| parent | 909095633e344fc3e47064f4f635284afebd797f (diff) | |
| download | pkgsrc-81e40c90b0758d53e0def87a4a1e3f9ca20ed8ec.tar.gz | |
Fix some confusion about handling for RUBY_VERSION_DEFAULT and RUBY_VER.
Really fix the pkglint problem with ruby19-base and ruby193-base, and
pbulk. Thanks to joerg@ to teache me pbulk-index!
Diffstat (limited to 'lang/ruby')
| -rw-r--r-- | lang/ruby/rubyversion.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 8d0fb25380d..5dd9fde2b74 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.67 2011/12/24 23:16:04 joerg Exp $ +# $NetBSD: rubyversion.mk,v 1.68 2011/12/25 02:18:09 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -214,7 +214,7 @@ RUBY19_API_VERSION= 1.9.1 RUBY193_API_VERSION= 1.9.1 # -RUBY_VERSION_DEFAULT?= 19 +RUBY_VERSION_DEFAULT?= 192 RUBY_VERSION_SUPPORTED?= 18 192 193 RUBY_VER?= ${RUBY_VERSION_DEFAULT} @@ -232,11 +232,8 @@ RUBY_VER= ${rv} . endfor .endif -# For backward compatibility -.if ${RUBY_VER} == "1.9" || ${RUBY_VER} == "192" -RUBY_VER= 19 -.elif ${RUBY_VER} == "1.8" -RUBY_VER= 18 +.if ${RUBY_VER} == "192" +RUBY_VER:= 19 .endif .if ${RUBY_VER} == "18" |