pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Treat RUBY_VER as number instead of string.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e79672f1847d
branches:  trunk
changeset: 386559:e79672f1847d
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon Oct 10 03:44:54 2022 +0000

description:
Treat RUBY_VER as number instead of string.

diffstat:

 lang/ruby/Makefile            |  8 ++++----
 lang/ruby/rubyversion.mk      |  8 ++++----
 textproc/ruby-review/Makefile |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (78 lines):

diff -r 79a85913017f -r e79672f1847d lang/ruby/Makefile
--- a/lang/ruby/Makefile        Mon Oct 10 03:42:14 2022 +0000
+++ b/lang/ruby/Makefile        Mon Oct 10 03:44:54 2022 +0000
@@ -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 @@
 
 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
 
diff -r 79a85913017f -r e79672f1847d lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Mon Oct 10 03:42:14 2022 +0000
+++ b/lang/ruby/rubyversion.mk  Mon Oct 10 03:44:54 2022 +0000
@@ -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_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_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_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}
diff -r 79a85913017f -r e79672f1847d textproc/ruby-review/Makefile
--- a/textproc/ruby-review/Makefile     Mon Oct 10 03:42:14 2022 +0000
+++ b/textproc/ruby-review/Makefile     Mon Oct 10 03:44:54 2022 +0000
@@ -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 @@
        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
 



Home | Main Index | Thread Index | Old Index