Tue May 17 00:42:33 2022 UTC ()
ruby: fix spelling & grammar in comments, and update one


(gutteridge)
diff -r1.47 -r1.48 pkgsrc/lang/ruby/gem.mk
diff -r1.12 -r1.13 pkgsrc/lang/ruby/platform.mk
diff -r1.122 -r1.123 pkgsrc/lang/ruby/rails.mk
diff -r1.251 -r1.252 pkgsrc/lang/ruby/rubyversion.mk
cvs diff -r1.47 -r1.48 pkgsrc/lang/ruby/gem.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/gem.mk 2021/03/21 12:39:52 1.47
+++ pkgsrc/lang/ruby/gem.mk 2022/05/17 00:42:33 1.48
@@ -1,71 +1,71 @@ @@ -1,71 +1,71 @@
1# $NetBSD: gem.mk,v 1.47 2021/03/21 12:39:52 taca Exp $ 1# $NetBSD: gem.mk,v 1.48 2022/05/17 00:42:33 gutteridge Exp $
2# 2#
3# This Makefile fragment is intended to be included by packages that build 3# This Makefile fragment is intended to be included by packages that build
4# and install Ruby gems. 4# and install Ruby gems.
5# 5#
6# === User-settable variables === 6# === User-settable variables ===
7# 7#
8# RUBYGEM_VERBOSE 8# RUBYGEM_VERBOSE
9# Execute gem with verbose option. 9# Execute gem with verbose option.
10# Possible values: Yes No 10# Possible values: Yes No
11# Default: No 11# Default: No
12# 12#
13# Package-settable variables: 13# Package-settable variables:
14# 14#
15# OVERRIDE_GEMSPEC 15# OVERRIDE_GEMSPEC
16# Fix version of depending gem or modify files in gemspec. 16# Fix version of depending gem or modify files in gemspec.
17# 17#
18# (1) Specify as gem and dependency pattern as usual pkgsrc's one. 18# (1) Specify as gem and dependency pattern as usual pkgsrc format.
19# 19#
20# Example: 20# Example:
21# When gemspec contains "json~>1.4.7" as runtime dependency 21# When gemspec contains "json~>1.4.7" as a runtime dependency
22# (i.e. json>=1.4.7<1.5) and if you want to relax it to 22# (i.e. json>=1.4.7<1.5) and if you want to relax it to
23# "json>=1.4.6" then use: 23# "json>=1.4.6" then use:
24# 24#
25# OVERRIDE_GEMSPEC+= json>=1.4.6 25# OVERRIDE_GEMSPEC+= json>=1.4.6
26# 26#
27# If you want to change depending gem to "json_pure>=1.4.6" 27# If you want to change depending gem to "json_pure>=1.4.6"
28# then use: 28# then use:
29# 29#
30# OVERRIDE_GEMSPEC+= json:json_pure>=1.4.6 30# OVERRIDE_GEMSPEC+= json:json_pure>=1.4.6
31# 31#
32# You can also remove dependency: 32# You can also remove a dependency:
33# 33#
34# OVERRIDE_GEMSPEC+= json: 34# OVERRIDE_GEMSPEC+= json:
35# 35#
36# (2) Modify instance of gemspec. 36# (2) Modify instance of gemspec.
37# 37#
38# Example: 38# Example:
39# Rename gem's name to "foo" (setting instance @name): 39# Rename gem's name to "foo" (setting instance @name):
40# 40#
41# OVERRIDE_GEMSPEC+= :name=foo 41# OVERRIDE_GEMSPEC+= :name=foo
42# 42#
43# Example: 43# Example:
44# Remove files (a.rb and b.rb) from 'files': 44# Remove files (a.rb and b.rb) from 'files':
45# 45#
46# OVERRIDE_GEMSPEC+= :files a.rb= b.rb= 46# OVERRIDE_GEMSPEC+= :files a.rb= b.rb=
47# 47#
48# Example: 48# Example:
49# Add a file (exec.rb) to 'executables': 49# Add a file (exec.rb) to 'executables':
50# 50#
51# OVERRIDE_GEMSPEC+= :executables exec.rb 51# OVERRIDE_GEMSPEC+= :executables exec.rb
52# 52#
53# Example: 53# Example:
54# Rename a file (from 'ruby' to 'ruby193') in 'files': 54# Rename a file (from 'ruby' to 'ruby193') in 'files':
55# 55#
56# OVERRIDE_GEMSPEC+= :files ruby=ruby193 56# OVERRIDE_GEMSPEC+= :files ruby=ruby193
57# 57#
58# Note: Because of limited parser, argumetns for (1) must preceed to (2). 58# Note: Because of the limited parser, arguments for (1) must precede (2).
59# 59#
60# Default: (empty) 60# Default: (empty)
61# 61#
62# GEM_PATH 62# GEM_PATH
63# Set GEM_PATH; search path for rubygems 63# Set GEM_PATH; search path for rubygems
64# 64#
65# Default: ${PREFIX}/${GEM_HOME} 65# Default: ${PREFIX}/${GEM_HOME}
66# 66#
67# BUILD_TARGET 67# BUILD_TARGET
68# The Rakefile target that creates a local gem if using the 68# The Rakefile target that creates a local gem if using the
69# ``rake'' GEM_BUILD method. 69# ``rake'' GEM_BUILD method.
70# 70#
71# Default: gem 71# Default: gem
@@ -78,32 +78,32 @@ @@ -78,32 +78,32 @@
78# 78#
79# GEM_CLEANBUILD 79# GEM_CLEANBUILD
80# A list of shell globs representing files to remove from the 80# A list of shell globs representing files to remove from the
81# gem installed in the installation root. The file is removed 81# gem installed in the installation root. The file is removed
82# if the path matches the glob and is not in ${WRKSRC}. The 82# if the path matches the glob and is not in ${WRKSRC}. The
83# default is "ext/*" 83# default is "ext/*"
84# 84#
85# Example: 85# Example:
86# 86#
87# GEM_CLEANBUILD= *.o *.${RUBY_DLEXT} mkmf.log 87# GEM_CLEANBUILD= *.o *.${RUBY_DLEXT} mkmf.log
88# 88#
89# GEM_CLEANBUILD_EXTENSIONS 89# GEM_CLEANBUILD_EXTENSIONS
90# A list of shell globs representing files under ${RUBY_EXTSDIR}. 90# A list of shell globs representing files under ${RUBY_EXTSDIR}.
91# These files will be additionaly removed from the gem installed in 91# These files will be additionally removed from the gem installed in
92# the installation root. 92# the installation root.
93# 93#
94# GEM_KEEPBUILD 94# GEM_KEEPBUILD
95# A list of shell globs representing files not to remove even it match 95# A list of shell globs representing files not to remove even if they
96# with GEM_CLEANBUILD or GEM_CLEANBUILD_EXTENSIONS. 96# match with GEM_CLEANBUILD or GEM_CLEANBUILD_EXTENSIONS.
97# 97#
98# Default: (empty) 98# Default: (empty)
99# 99#
100# GEM_NAME 100# GEM_NAME
101# The name of the gem to install. The default value is ${DISTNAME}. 101# The name of the gem to install. The default value is ${DISTNAME}.
102# gem installed in the installation root. 102# gem installed in the installation root.
103# 103#
104# GEM_SPECFILE 104# GEM_SPECFILE
105# The path to the gemspec file to use when building a gem using 105# The path to the gemspec file to use when building a gem using
106# the ``gemspec'' GEM_BUILD method. It defaults to 106# the ``gemspec'' GEM_BUILD method. It defaults to
107# ${WRKDIR}/${DISTNAME}.gemspec. 107# ${WRKDIR}/${DISTNAME}.gemspec.
108# 108#
109# RUBYGEM_OPTIONS 109# RUBYGEM_OPTIONS
@@ -114,38 +114,38 @@ @@ -114,38 +114,38 @@
114# 114#
115# GEM_DOCDIR 115# GEM_DOCDIR
116# The relative path from PREFIX to the directory in the local gem 116# The relative path from PREFIX to the directory in the local gem
117# repository that holds the documentation for the installed gem. 117# repository that holds the documentation for the installed gem.
118# 118#
119# GEM_LIBDIR 119# GEM_LIBDIR
120# The relative path from PREFIX to the directory in the local gem 120# The relative path from PREFIX to the directory in the local gem
121# repository that holds the contents of the installed gem. 121# repository that holds the contents of the installed gem.
122# 122#
123# GEM_EXTSDIR 123# GEM_EXTSDIR
124# "extensions" directory under ${GEM_HOME}. 124# "extensions" directory under ${GEM_HOME}.
125# 125#
126# GEM_PLUGINSDIR 126# GEM_PLUGINSDIR
127# "plguins" direcotry under ${GEM_HOME}. It is generated by 127# "plugins" directory under ${GEM_HOME}. It is generated by
128# rubygems 3.2 and later. 128# rubygems 3.2 and later.
129# In PLIST file, it will be replace to "${GEM_HOME}/plugins" or 129# In PLIST file, it will be replace to "${GEM_HOME}/plugins" or
130# "@comment ..." depends on the version of rubygems. 130# "@comment ..." depends on the version of rubygems.
131# 131#
132# RUBYGEM 132# RUBYGEM
133# The path to the rubygems ``gem'' script. 133# The path to the rubygems ``gem'' script.
134# 134#
135.if !defined(_RUBYGEM_MK) 135.if !defined(_RUBYGEM_MK)
136_RUBYGEM_MK= # defined 136_RUBYGEM_MK= # defined
137 137
138# replace interpeter bin default 138# replace interpreter bin default
139REPLACE_RUBY_DIRS?= bin 139REPLACE_RUBY_DIRS?= bin
140REPLACE_RUBY_PAT?= * 140REPLACE_RUBY_PAT?= *
141 141
142# Default to using rake to build the local gem from the unpacked files. 142# Default to using rake to build the local gem from the unpacked files.
143GEM_BUILD?= gemspec 143GEM_BUILD?= gemspec
144 144
145OVERRIDE_GEMSPEC?= # default is empty 145OVERRIDE_GEMSPEC?= # default is empty
146 146
147# Include this early in case some of its target are needed 147# Include this early in case some of its target are needed
148.include "../../lang/ruby/modules.mk" 148.include "../../lang/ruby/modules.mk"
149 149
150# Build and run-time dependencies for Ruby prior to 1.9. 150# Build and run-time dependencies for Ruby prior to 1.9.
151# 151#
@@ -170,28 +170,28 @@ DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} @@ -170,28 +170,28 @@ DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}
170EXTRACT_ONLY?= # empty 170EXTRACT_ONLY?= # empty
171.endif 171.endif
172 172
173# Directory for the Gem to install 173# Directory for the Gem to install
174GEM_NAME?= ${DISTNAME} 174GEM_NAME?= ${DISTNAME}
175GEM_CACHEDIR= ${GEM_HOME}/cache 175GEM_CACHEDIR= ${GEM_HOME}/cache
176GEM_DOCDIR= ${GEM_HOME}/doc/${GEM_NAME} 176GEM_DOCDIR= ${GEM_HOME}/doc/${GEM_NAME}
177GEM_LIBDIR= ${GEM_HOME}/gems/${GEM_NAME} 177GEM_LIBDIR= ${GEM_HOME}/gems/${GEM_NAME}
178 178
179GEM_BUILDINFO_DIR= ${GEM_HOME}/build_info 179GEM_BUILDINFO_DIR= ${GEM_HOME}/build_info
180 180
181# Installed gems have wrapper scripts that call the right interpreter, 181# Installed gems have wrapper scripts that call the right interpreter,
182# regardless of the #! line at the head of a script, so we can skip 182# regardless of the #! line at the head of a script, so we can skip
183# the interpreter path check for gems. ANd it is also true for files' 183# the interpreter path check for gems. And it is also true for files'
184# permission. 184# permissions.
185# 185#
186CHECK_INTERPRETER_SKIP+= ${GEM_LIBDIR}/* 186CHECK_INTERPRETER_SKIP+= ${GEM_LIBDIR}/*
187CHECK_PERMS_SKIP+= ${GEM_LIBDIR}/* 187CHECK_PERMS_SKIP+= ${GEM_LIBDIR}/*
188 188
189# PLIST support 189# PLIST support
190PLIST_SUBST+= GEM_NAME=${GEM_NAME} 190PLIST_SUBST+= GEM_NAME=${GEM_NAME}
191PLIST_SUBST+= GEM_LIBDIR=${GEM_LIBDIR} 191PLIST_SUBST+= GEM_LIBDIR=${GEM_LIBDIR}
192PLIST_SUBST+= GEM_DOCDIR=${GEM_DOCDIR} 192PLIST_SUBST+= GEM_DOCDIR=${GEM_DOCDIR}
193 193
194# Add indirect support for print-PLIST 194# Add indirect support for print-PLIST
195_RUBY_PRINT_PLIST_GEM= /${GEM_NAME}\.info$$/ \ 195_RUBY_PRINT_PLIST_GEM= /${GEM_NAME}\.info$$/ \
196 { gsub(/${GEM_NAME}\.info/, "$${GEM_NAME}.info"); } 196 { gsub(/${GEM_NAME}\.info/, "$${GEM_NAME}.info"); }
197_RUBY_PRINT_PLIST_GEM+= /${GEM_NAME}\.(gem|gemspec)$$/ \ 197_RUBY_PRINT_PLIST_GEM+= /${GEM_NAME}\.(gem|gemspec)$$/ \
cvs diff -r1.12 -r1.13 pkgsrc/lang/ruby/platform.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/platform.mk 2022/05/07 09:36:16 1.12
+++ pkgsrc/lang/ruby/platform.mk 2022/05/17 00:42:33 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: platform.mk,v 1.12 2022/05/07 09:36:16 taca Exp $ 1# $NetBSD: platform.mk,v 1.13 2022/05/17 00:42:33 gutteridge Exp $
2# 2#
3 3
4# 4#
5# Common definition for ruby*-base package. 5# Common definition for ruby*-base package.
6# 6#
7 7
8.if !defined(_RUBY_PLATFORM_MK) 8.if !defined(_RUBY_PLATFORM_MK)
9_RUBY_PLATFORM_MK= # defined 9_RUBY_PLATFORM_MK= # defined
10 10
11.include "../../lang/ruby/rubyversion.mk" 11.include "../../lang/ruby/rubyversion.mk"
12.include "../../mk/compiler.mk" 12.include "../../mk/compiler.mk"
13 13
14# 14#
@@ -37,28 +37,28 @@ REQD_DIRS+= ${GEM_HOME}/cache @@ -37,28 +37,28 @@ REQD_DIRS+= ${GEM_HOME}/cache
37REQD_DIRS+= ${GEM_HOME}/doc 37REQD_DIRS+= ${GEM_HOME}/doc
38 38
39# 39#
40# substitute path in rubygems. 40# substitute path in rubygems.
41# 41#
42SUBST_CLASSES+= conf 42SUBST_CLASSES+= conf
43SUBST_STAGE.conf= pre-install 43SUBST_STAGE.conf= pre-install
44SUBST_FILES.conf= lib/rubygems/config_file.rb 44SUBST_FILES.conf= lib/rubygems/config_file.rb
45SUBST_VARS.conf= PKG_SYSCONFDIR 45SUBST_VARS.conf= PKG_SYSCONFDIR
46SUBST_MESSAGE.conf= Fixing configuration files. 46SUBST_MESSAGE.conf= Fixing configuration files.
47SUBST_NOOP_OK.conf= yes # not needed for ruby-base>=2.6 47SUBST_NOOP_OK.conf= yes # not needed for ruby-base>=2.6
48 48
49# 49#
50# Don't reference pkgsrc's INSTALL macro since Ruby expect it could 50# Don't reference pkgsrc's INSTALL macro since Ruby expects it could
51# execute by unprivileged user. 51# be executed by an unprivileged user.
52# 52#
53CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \ 53CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \
54 INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT= 54 INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT=
55CONFIGURE_ENV+= ac_cv_prog_PKG_CONFIG="" 55CONFIGURE_ENV+= ac_cv_prog_PKG_CONFIG=""
56 56
57# 57#
58# prevent unwanted mkdir recorded in rbconfig.rb 58# prevent unwanted mkdir recorded in rbconfig.rb
59# 59#
60CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q} 60CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q}
61 61
62# Ruby build process depends on config.status's content 62# Ruby build process depends on config.status's content
63CONFIG_STATUS_OVERRIDE= # empty 63CONFIG_STATUS_OVERRIDE= # empty
64 64
@@ -70,46 +70,45 @@ CONFIG_STATUS_OVERRIDE= # empty @@ -70,46 +70,45 @@ CONFIG_STATUS_OVERRIDE= # empty
70# 70#
71# Darwin 71# Darwin
72# 72#
73# Don't like Apple's builtin OpenSSL. 73# Don't like Apple's builtin OpenSSL.
74# 74#
75.if ${OPSYS} == "Darwin" 75.if ${OPSYS} == "Darwin"
76USE_BUILTIN.openssl= no 76USE_BUILTIN.openssl= no
77.endif 77.endif
78 78
79# 79#
80# DragonFly 80# DragonFly
81# 81#
82# 82#
83# Work around for getucontext(3) 83# Workaround for getucontext(3)
84# 84#
85.if ${OPSYS} == "DragonFly" && ${OS_VERSION} == "1.8.0" 85.if ${OPSYS} == "DragonFly" && ${OS_VERSION} == "1.8.0"
86CONFIGURE_ENV+= ac_cv_header_ucontext_h=no 86CONFIGURE_ENV+= ac_cv_header_ucontext_h=no
87.endif 87.endif
88 88
89# 89#
90# Linux 90# Linux
91# 91#
92# /usr/bin/dtrace is not DTrace. 92# /usr/bin/dtrace is not DTrace.
93# 93#
94.if ${OPSYS} == "Linux" && exists(/usr/bin/dtrace) 94.if ${OPSYS} == "Linux" && exists(/usr/bin/dtrace)
95CONFIGURE_ARGS+= --disable-dtrace 95CONFIGURE_ARGS+= --disable-dtrace
96.endif 96.endif
97 97
98# 98#
99# NetBSD 99# NetBSD
100# 100#
101# dtrace support has problem on i386. (No official NetBSD release is 101# dtrace support has a problem on i386. XXX is this still an issue?
102# built with dtrace enabled yet, so this problem is on 7.99.* only.) 
103# 102#
104.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" 103.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
105CONFIGURE_ARGS+= --disable-dtrace 104CONFIGURE_ARGS+= --disable-dtrace
106.endif 105.endif
107 106
108# 107#
109# NetBSD 108# NetBSD
110# 109#
111# dtrace support can cause problems with miniruby on arm. 110# dtrace support can cause problems with miniruby on arm.
112# 111#
113.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) || !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) 112.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) || !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*)
114CONFIGURE_ARGS+= --disable-dtrace 113CONFIGURE_ARGS+= --disable-dtrace
115.endif 114.endif
@@ -169,21 +168,21 @@ MAKE_FILE= GNUmakefile @@ -169,21 +168,21 @@ MAKE_FILE= GNUmakefile
169######## 168########
170# 169#
171# PLIST 170# PLIST
172# 171#
173 172
174# Win32 support (for Cygwin) 173# Win32 support (for Cygwin)
175# 174#
176PLIST_VARS+= win32 175PLIST_VARS+= win32
177.if ${OPSYS} == "Cygwin" 176.if ${OPSYS} == "Cygwin"
178PLIST.win32= yes 177PLIST.win32= yes
179.endif 178.endif
180 179
181# 180#
182# IRIX work around which should be fixed. 181# IRIX workaround which should be fixed.
183# 182#
184PLIST_VARS+= io 183PLIST_VARS+= io
185.if ${OPSYS} != "IRIX" 184.if ${OPSYS} != "IRIX"
186PLIST.io= yes 185PLIST.io= yes
187.endif 186.endif
188 187
189.endif # _RUBY_REPLACE_MK 188.endif # _RUBY_REPLACE_MK
cvs diff -r1.122 -r1.123 pkgsrc/lang/ruby/rails.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rails.mk 2022/05/05 03:39:02 1.122
+++ pkgsrc/lang/ruby/rails.mk 2022/05/17 00:42:33 1.123
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rails.mk,v 1.122 2022/05/05 03:39:02 taca Exp $ 1# $NetBSD: rails.mk,v 1.123 2022/05/17 00:42:33 gutteridge Exp $
2 2
3.if !defined(_RUBY_RAILS_MK) 3.if !defined(_RUBY_RAILS_MK)
4_RUBY_RAILS_MK= # defined 4_RUBY_RAILS_MK= # defined
5 5
6# 6#
7# === User-settable variables === 7# === User-settable variables ===
8# 8#
9# RUBY_RAILS_DEFAULT 9# RUBY_RAILS_DEFAULT
10# Select default Ruby on Rails version. 10# Select default Ruby on Rails version.
11# 11#
12# Possible values: 52 60 61 70 12# Possible values: 52 60 61 70
13# Default: 52 13# Default: 52
14# 14#
@@ -98,29 +98,29 @@ RAILS_VERSION:= ${RUBY_RAILS61_VERSION} @@ -98,29 +98,29 @@ RAILS_VERSION:= ${RUBY_RAILS61_VERSION}
98RAILS_VERSION:= ${RUBY_RAILS60_VERSION} 98RAILS_VERSION:= ${RUBY_RAILS60_VERSION}
99.elif ${RUBY_RAILS} == "52" 99.elif ${RUBY_RAILS} == "52"
100RAILS_VERSION:= ${RUBY_RAILS52_VERSION} 100RAILS_VERSION:= ${RUBY_RAILS52_VERSION}
101.endif 101.endif
102 102
103# 103#
104# Components of Ruby's version. 104# Components of Ruby's version.
105# 105#
106_RAILS_MAJOR= ${RAILS_VERSION:C/([0-9]+)\..*/\1/} 106_RAILS_MAJOR= ${RAILS_VERSION:C/([0-9]+)\..*/\1/}
107_RAILS_MINOR= ${RAILS_VERSION:C/([0-9]+)\.([0-9]+)\..*/\2/} 107_RAILS_MINOR= ${RAILS_VERSION:C/([0-9]+)\.([0-9]+)\..*/\2/}
108_RAILS_TEENY= ${RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/} 108_RAILS_TEENY= ${RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/}
109 109
110# 110#
111# If RUBY_RAILS_STRICT_DEP is defined, match exact current Ruby no Rails 111# If RUBY_RAILS_STRICT_DEP is defined, match exact current Ruby on Rails
112# version. 112# version. Otherwise allow greater minor version.
113# Otherwise allow greater minor version. 113#
114 114
115.if !empty(RUBY_RAILS_STRICT_DEP:M[yY][eE][sS]) 115.if !empty(RUBY_RAILS_STRICT_DEP:M[yY][eE][sS])
116_RAILS_NEXT!= ${EXPR} ${_RAILS_TEENY} + 1 116_RAILS_NEXT!= ${EXPR} ${_RAILS_TEENY} + 1
117_RAILS_DEP= \ 117_RAILS_DEP= \
118 ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_MINOR}.${_RAILS_NEXT} 118 ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_MINOR}.${_RAILS_NEXT}
119.else 119.else
120_RAILS_NEXT!= ${EXPR} ${_RAILS_MINOR} + 1 120_RAILS_NEXT!= ${EXPR} ${_RAILS_MINOR} + 1
121_RAILS_DEP= ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_NEXT} 121_RAILS_DEP= ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_NEXT}
122.endif 122.endif
123 123
124# 124#
125MAKE_ENV+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \ 125MAKE_ENV+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \
126 RUBY_RAILS_ACCEPTED=${RUBY_RAILS} 126 RUBY_RAILS_ACCEPTED=${RUBY_RAILS}
cvs diff -r1.251 -r1.252 pkgsrc/lang/ruby/rubyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2022/05/05 10:15:17 1.251
+++ pkgsrc/lang/ruby/rubyversion.mk 2022/05/17 00:42:33 1.252
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: rubyversion.mk,v 1.251 2022/05/05 10:15:17 jperkin Exp $ 1# $NetBSD: rubyversion.mk,v 1.252 2022/05/17 00:42:33 gutteridge Exp $
2# 2#
3 3
4# This file determines which Ruby version is used as a dependency for 4# This file determines which Ruby version is used as a dependency for
5# a package. 5# a package.
6# 6#
7# 7#
8# === User-settable variables === 8# === User-settable variables ===
9# 9#
10# RUBY_VERSION_DEFAULT 10# RUBY_VERSION_DEFAULT
11# The preferered Ruby version to use. 11# The preferred Ruby version to use.
12# 12#
13# Possible values: 26 27 30 31 13# Possible values: 26 27 30 31
14# Default: 27 14# Default: 27
15# 15#
16# RUBY_BUILD_DOCUMENT 16# RUBY_BUILD_DOCUMENT
17# Build documentation of this package and so that install formated 17# Build documentation of this package so that installs formatted
18# documentation. It is also used in each package. 18# documentation. It is also used in each package.
19# 19#
20# Possible values: Yes No 20# Possible values: Yes No
21# Default: Yes 21# Default: Yes
22# 22#
23# === Infrastructure variables === 23# === Infrastructure variables ===
24# 24#
25# RUBY_VERSION_REQD 25# RUBY_VERSION_REQD
26# Ruby version to use. This variable should not be set in 26# Ruby version to use. This variable should not be set in
27# packages. Normally it is used by bulk build tools. 27# packages. Normally it is used by bulk build tools.
28# 28#
29# Possible values: ${RUBY_VERSIONS_ACCEPTED} 29# Possible values: ${RUBY_VERSIONS_ACCEPTED}
30# Default: ${RUBY_VERSION_DEFAULT} 30# Default: ${RUBY_VERSION_DEFAULT}
@@ -35,57 +35,57 @@ @@ -35,57 +35,57 @@
35# The Ruby versions that are acceptable for the package. 35# The Ruby versions that are acceptable for the package.
36# 36#
37# Possible values: 26 27 30 31 37# Possible values: 26 27 30 31
38# Default: 27 30 31 26 38# Default: 27 30 31 26
39# 39#
40# RUBY_VERSIONS_INCOMPATIBLE 40# RUBY_VERSIONS_INCOMPATIBLE
41# The Ruby versions that are incompatible for the package. 41# The Ruby versions that are incompatible for the package.
42# 42#
43# Possible values: 26 27 30 31 43# Possible values: 26 27 30 31
44# Default: empty 44# Default: empty
45# 45#
46# RUBY_NOVERSION 46# RUBY_NOVERSION
47# If "Yes", the package dosen't depend on any version of Ruby, such 47# If "Yes", the package dosen't depend on any version of Ruby, such
48# as editing mode for emacs. In this case, package's name would begin 48# as an editing mode for Emacs. In this case, package's name would begin
49# with "ruby-". Otherwise, the package's name is begin with 49# with "ruby-". Otherwise, the package's name begins with
50# ${RUBY_PKGPREFIX}. 50# ${RUBY_PKGPREFIX}.
51# 51#
52# Possible values: Yes No 52# Possible values: Yes No
53# Default: No 53# Default: No
54# 54#
55# RUBY_DYNAMIC_DIRS 55# RUBY_DYNAMIC_DIRS
56# Build dynamic PLIST from directories. 56# Build dynamic PLIST from directories.
57# 57#
58# Default: (empty) 58# Default: (empty)
59# 59#
60# RUBY_ENCODING_ARG 60# RUBY_ENCODING_ARG
61# 61#
62# Optional encoding argument for shbang line. 62# Optional encoding argument for shebang line.
63# 63#
64# Default: (empty) 64# Default: (empty)
65# 65#
66# === Defined variables === 66# === Defined variables ===
67# 67#
68# RUBY_VER 68# RUBY_VER
69# Really selected version of ruby. 69# Really selected version of ruby.
70# 70#
71# Possible values: 26 27 30 31 71# Possible values: 26 27 30 31
72# 72#
73# Use this variable in pkgsrc's Makefile 73# Use this variable in pkgsrc's Makefile
74# 74#
75# RUBY_PKGPREFIX 75# RUBY_PKGPREFIX
76# Prefix part for ruby based packages. It is recommended that to 76# Prefix part for Ruby-based packages. It is recommended to
77# use RUBY_PKGPREFIX with ruby related packages since you can supply 77# use RUBY_PKGPREFIX with Ruby-related packages since you can supply
78# different binary packages as each version of Ruby. 78# different binary packages for each version of Ruby.
79# 79#
80# Possible values: ruby26 ruby27 ruby30 ruby31 80# Possible values: ruby26 ruby27 ruby30 ruby31
81# 81#
82# RUBY_ABI_VERSION 82# RUBY_ABI_VERSION
83# Ruby's ABI version. 83# Ruby's ABI version.
84# 84#
85# RUBY_DLEXT 85# RUBY_DLEXT
86# Suffix of extention library. 86# Suffix of extention library.
87# 87#
88# RUBY_SLEXT 88# RUBY_SLEXT
89# Suffix of shared library. 89# Suffix of shared library.
90# 90#
91# RUBY 91# RUBY
@@ -573,27 +573,27 @@ PKG_FAIL_REASON+= "Unknown Ruby version  @@ -573,27 +573,27 @@ PKG_FAIL_REASON+= "Unknown Ruby version
573.endif 573.endif
574 574
575.if !empty(RUBY_VERSION) 575.if !empty(RUBY_VERSION)
576RUBY_PATCHLEVEL= ${RUBY${RUBY_VER}_PATCHLEVEL} 576RUBY_PATCHLEVEL= ${RUBY${RUBY_VER}_PATCHLEVEL}
577RUBY_API_VERSION= ${RUBY${RUBY_VER}_API_VERSION} 577RUBY_API_VERSION= ${RUBY${RUBY_VER}_API_VERSION}
578.endif 578.endif
579 579
580# Variable assignment for multi-ruby packages 580# Variable assignment for multi-ruby packages
581MULTI+= RUBY_VER=${RUBY_VERS:U${RUBY_VERSION_DEFAULT}} 581MULTI+= RUBY_VER=${RUBY_VERS:U${RUBY_VERSION_DEFAULT}}
582 582
583# RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on 583# RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on
584# any specific version of ruby command. In this case, package's 584# any specific version of ruby command. In this case, package's
585# name begin with "ruby-". 585# name begin with "ruby-".
586# If RUBY_NOVERSION is "No" (default), the package's name is begin 586# If RUBY_NOVERSION is "No" (default), the package's name begins
587# with ${RUBY_NAME}; "ruby26", "ruby27" and so on. 587# with ${RUBY_NAME}; "ruby26", "ruby27" and so on.
588# 588#
589# It also affects to RUBY_DOC, RUBY_EG... 589# It also affects to RUBY_DOC, RUBY_EG...
590# 590#
591RUBY_NOVERSION?= No 591RUBY_NOVERSION?= No
592 592
593# _RUBY_VER_MAJOR, _RUBY_VER_MINOR 593# _RUBY_VER_MAJOR, _RUBY_VER_MINOR
594# is defined from version of Ruby. It should not be used in packages' 594# is defined from version of Ruby. It should not be used in packages'
595# Makefile. 595# Makefile.
596# 596#
597_RUBY_VER_MAJOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} 597_RUBY_VER_MAJOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
598_RUBY_VER_MINOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} 598_RUBY_VER_MINOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
599 599