kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some confusion about handling for RUBY_VERSION_DEFAULT and RUBY_VER.

Browse source 
Really fix the pkglint problem with ruby19-base and ruby193-base, and
pbulk.  Thanks to joerg@ to teache me pbulk-index!
This commit is contained in:
taca 2011-12-25 02:18:09 +00:00
parent 909095633e
commit 81e40c90b0
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lang/ruby/rubyversion.mk
View file

@ -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 # 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 RUBY193_API_VERSION= 1.9.1
# #
RUBY_VERSION_DEFAULT?= 19 RUBY_VERSION_DEFAULT?= 192
RUBY_VERSION_SUPPORTED?= 18 192 193 RUBY_VERSION_SUPPORTED?= 18 192 193
RUBY_VER?= ${RUBY_VERSION_DEFAULT} RUBY_VER?= ${RUBY_VERSION_DEFAULT}
@ -232,11 +232,8 @@ RUBY_VER= ${rv}
. endfor . endfor
.endif .endif
# For backward compatibility .if ${RUBY_VER} == "192"
.if ${RUBY_VER} == "1.9" || ${RUBY_VER} == "192" RUBY_VER:= 19
RUBY_VER= 19
.elif ${RUBY_VER} == "1.8"
RUBY_VER= 18
.endif .endif
.if ${RUBY_VER} == "18" .if ${RUBY_VER} == "18"