CVS commit: pkgsrc

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Mon Oct 10 03:44:54 UTC 2022

Modified Files:
        pkgsrc/lang/ruby: Makefile rubyversion.mk
        pkgsrc/textproc/ruby-review: Makefile

Log Message:
Treat RUBY_VER as number instead of string.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/lang/ruby/Makefile
cvs rdiff -u -r1.253 -r1.254 pkgsrc/lang/ruby/rubyversion.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/ruby-review/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby/Makefile
diff -u pkgsrc/lang/ruby/Makefile:1.72 pkgsrc/lang/ruby/Makefile:1.73
--- pkgsrc/lang/ruby/Makefile:1.72      Mon Oct 10 03:31:44 2022
+++ pkgsrc/lang/ruby/Makefile   Mon Oct 10 03:44:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2022/10/10 03:31:44 taca Exp $
+# $NetBSD: Makefile,v 1.73 2022/10/10 03:44:54 taca Exp $
 
 DISTNAME=      # empty
 PKGNAME=       ruby-${RUBY_VERSION}
@@ -20,11 +20,11 @@ NO_BUILD=   yes
 
 DEPENDS+=      ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 
-.if ${RUBY_VER} == "27"
+.if ${RUBY_VER} == 27
 RUBY_COMMANDS= bundle bundler erb gem irb racc rake racc2y rdoc ri ruby y2racc
-.elif ${RUBY_VER} == "30"
+.elif ${RUBY_VER} == 30
 RUBY_COMMANDS= bundle bundler erb gem irb racc rake rbs rdoc ri ruby typeprof
-.elif ${RUBY_VER} == "31"
+.elif ${RUBY_VER} == 31
 RUBY_COMMANDS= bundle bundler erb gem irb racc rake rbs rdbg rdoc ri ruby typeprof
 .endif
 

Index: pkgsrc/lang/ruby/rubyversion.mk
diff -u pkgsrc/lang/ruby/rubyversion.mk:1.253 pkgsrc/lang/ruby/rubyversion.mk:1.254
--- pkgsrc/lang/ruby/rubyversion.mk:1.253       Mon Oct 10 03:31:44 2022
+++ pkgsrc/lang/ruby/rubyversion.mk     Mon Oct 10 03:44:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.253 2022/10/10 03:31:44 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.254 2022/10/10 03:44:54 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -267,7 +267,7 @@ RUBY_VER:=  ${RUBY_VER_MAP.${RUBY_VER}:U$
 
 RUBY_SUFFIX?=  ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}${_RUBY_VER_TEENY}
 
-.if ${RUBY_VER} == "27"
+.if ${RUBY_VER} == 27
 RUBY_VERSION=          ${RUBY27_VERSION}
 RUBY_ABI_VERSION=      ${RUBY_VERSION}
 RUBY_SUFFIX=           ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
@@ -329,7 +329,7 @@ RUBY_YAML_VER=                      0.1.0
 RUBY_ZLIB_VER=                 1.1.0
 
 
-.elif ${RUBY_VER} == "30"
+.elif ${RUBY_VER} == 30
 RUBY_VERSION=          ${RUBY30_VERSION}
 RUBY_ABI_VERSION=      ${RUBY_VERSION}
 RUBY_SUFFIX=           ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
@@ -421,7 +421,7 @@ RUBY_WEAKREF_VER=           0.1.1
 RUBY_YAML_VER=                 0.1.1
 RUBY_ZLIB_VER=                 2.0.0
 
-.elif ${RUBY_VER} == "31"
+.elif ${RUBY_VER} == 31
 RUBY_VERSION=          ${RUBY31_VERSION}
 RUBY_ABI_VERSION=      ${RUBY_VERSION}
 RUBY_SUFFIX=           ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}

Index: pkgsrc/textproc/ruby-review/Makefile
diff -u pkgsrc/textproc/ruby-review/Makefile:1.9 pkgsrc/textproc/ruby-review/Makefile:1.10
--- pkgsrc/textproc/ruby-review/Makefile:1.9    Mon Oct 10 03:42:14 2022
+++ pkgsrc/textproc/ruby-review/Makefile        Mon Oct 10 03:44:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/10/10 03:42:14 taca Exp $
+# $NetBSD: Makefile,v 1.10 2022/10/10 03:44:54 taca Exp $
 
 DISTNAME=      review-5.5.0
 CATEGORIES=    textproc
@@ -20,7 +20,7 @@ pre-configure:
        cd ${WRKSRC}/bin && ${CHMOD} ${BINMODE} *
 
 .include "../../lang/ruby/rubyversion.mk"
-.if ${RUBY_VER} == "27"
+.if ${RUBY_VER} == 27
 DEPENDS+=      ${RUBY_PKGPREFIX}-rexml>=3.2<4:../../textproc/ruby-rexml
 .endif