From c14bec2f7500fcb75800d6b5c5054949ed5ac6b2 Mon Sep 17 00:00:00 2001 From: taca Date: Wed, 21 May 2014 03:08:34 +0000 Subject: Instead of comparing _RUBY_VERSION_REQD to "211", compare "18" or "193". --- lang/ruby/rubyversion.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 4cb13e214c8..7292c66818c 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.118 2014/05/17 11:34:35 obache Exp $ +# $NetBSD: rubyversion.mk,v 1.119 2014/05/21 03:08:34 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -203,10 +203,10 @@ _RUBYVERSION_MK= # defined .if defined(PKGNAME_REQD) . if !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/} -. if ${_RUBY_VERSION_REQD} != "211" -RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/} -. else +. if ${_RUBY_VERSION_REQD} == "18" || ${_RUBY_VERSION_REQD} == "193" RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])[0-9]-.*/\1/} +. else +RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/} . endif . endif .endif -- cgit v1.2.3