Received: by mail.netbsd.org (Postfix, from userid 605) id 1210E84F77; Tue, 17 May 2022 00:42:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4CB1184F75 for ; Tue, 17 May 2022 00:42:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ei4AFYbNuuDa for ; Tue, 17 May 2022 00:42:02 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 546FE84F72 for ; Tue, 17 May 2022 00:42:02 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 67688FAEB; Tue, 17 May 2022 00:42:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1652748153211830" MIME-Version: 1.0 Date: Tue, 17 May 2022 00:42:33 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/lang/ruby To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20220517004233.67688FAEB@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1652748153211830 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gutteridge Date: Tue May 17 00:42:33 UTC 2022 Modified Files: pkgsrc/lang/ruby: gem.mk platform.mk rails.mk rubyversion.mk Log Message: ruby: fix spelling & grammar in comments, and update one To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 pkgsrc/lang/ruby/gem.mk cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/ruby/platform.mk cvs rdiff -u -r1.122 -r1.123 pkgsrc/lang/ruby/rails.mk cvs rdiff -u -r1.251 -r1.252 pkgsrc/lang/ruby/rubyversion.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1652748153211830 Content-Disposition: inline Content-Length: 8000 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ruby/gem.mk diff -u pkgsrc/lang/ruby/gem.mk:1.47 pkgsrc/lang/ruby/gem.mk:1.48 --- pkgsrc/lang/ruby/gem.mk:1.47 Sun Mar 21 12:39:52 2021 +++ pkgsrc/lang/ruby/gem.mk Tue May 17 00:42:33 2022 @@ -1,4 +1,4 @@ -# $NetBSD: gem.mk,v 1.47 2021/03/21 12:39:52 taca Exp $ +# $NetBSD: gem.mk,v 1.48 2022/05/17 00:42:33 gutteridge Exp $ # # This Makefile fragment is intended to be included by packages that build # and install Ruby gems. @@ -15,10 +15,10 @@ # OVERRIDE_GEMSPEC # Fix version of depending gem or modify files in gemspec. # -# (1) Specify as gem and dependency pattern as usual pkgsrc's one. +# (1) Specify as gem and dependency pattern as usual pkgsrc format. # # Example: -# When gemspec contains "json~>1.4.7" as runtime dependency +# When gemspec contains "json~>1.4.7" as a runtime dependency # (i.e. json>=1.4.7<1.5) and if you want to relax it to # "json>=1.4.6" then use: # @@ -29,7 +29,7 @@ # # OVERRIDE_GEMSPEC+= json:json_pure>=1.4.6 # -# You can also remove dependency: +# You can also remove a dependency: # # OVERRIDE_GEMSPEC+= json: # @@ -55,7 +55,7 @@ # # OVERRIDE_GEMSPEC+= :files ruby=ruby193 # -# Note: Because of limited parser, argumetns for (1) must preceed to (2). +# Note: Because of the limited parser, arguments for (1) must precede (2). # # Default: (empty) # @@ -88,12 +88,12 @@ # # GEM_CLEANBUILD_EXTENSIONS # A list of shell globs representing files under ${RUBY_EXTSDIR}. -# These files will be additionaly removed from the gem installed in +# These files will be additionally removed from the gem installed in # the installation root. # # GEM_KEEPBUILD -# A list of shell globs representing files not to remove even it match -# with GEM_CLEANBUILD or GEM_CLEANBUILD_EXTENSIONS. +# A list of shell globs representing files not to remove even if they +# match with GEM_CLEANBUILD or GEM_CLEANBUILD_EXTENSIONS. # # Default: (empty) # @@ -124,7 +124,7 @@ # "extensions" directory under ${GEM_HOME}. # # GEM_PLUGINSDIR -# "plguins" direcotry under ${GEM_HOME}. It is generated by +# "plugins" directory under ${GEM_HOME}. It is generated by # rubygems 3.2 and later. # In PLIST file, it will be replace to "${GEM_HOME}/plugins" or # "@comment ..." depends on the version of rubygems. @@ -135,7 +135,7 @@ .if !defined(_RUBYGEM_MK) _RUBYGEM_MK= # defined -# replace interpeter bin default +# replace interpreter bin default REPLACE_RUBY_DIRS?= bin REPLACE_RUBY_PAT?= * @@ -180,8 +180,8 @@ GEM_BUILDINFO_DIR= ${GEM_HOME}/build_inf # Installed gems have wrapper scripts that call the right interpreter, # regardless of the #! line at the head of a script, so we can skip -# the interpreter path check for gems. ANd it is also true for files' -# permission. +# the interpreter path check for gems. And it is also true for files' +# permissions. # CHECK_INTERPRETER_SKIP+= ${GEM_LIBDIR}/* CHECK_PERMS_SKIP+= ${GEM_LIBDIR}/* Index: pkgsrc/lang/ruby/platform.mk diff -u pkgsrc/lang/ruby/platform.mk:1.12 pkgsrc/lang/ruby/platform.mk:1.13 --- pkgsrc/lang/ruby/platform.mk:1.12 Sat May 7 09:36:16 2022 +++ pkgsrc/lang/ruby/platform.mk Tue May 17 00:42:33 2022 @@ -1,4 +1,4 @@ -# $NetBSD: platform.mk,v 1.12 2022/05/07 09:36:16 taca Exp $ +# $NetBSD: platform.mk,v 1.13 2022/05/17 00:42:33 gutteridge Exp $ # # @@ -47,8 +47,8 @@ SUBST_MESSAGE.conf= Fixing configuration SUBST_NOOP_OK.conf= yes # not needed for ruby-base>=2.6 # -# Don't reference pkgsrc's INSTALL macro since Ruby expect it could -# execute by unprivileged user. +# Don't reference pkgsrc's INSTALL macro since Ruby expects it could +# be executed by an unprivileged user. # CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \ INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT= @@ -80,7 +80,7 @@ USE_BUILTIN.openssl= no # DragonFly # # -# Work around for getucontext(3) +# Workaround for getucontext(3) # .if ${OPSYS} == "DragonFly" && ${OS_VERSION} == "1.8.0" CONFIGURE_ENV+= ac_cv_header_ucontext_h=no @@ -98,8 +98,7 @@ CONFIGURE_ARGS+= --disable-dtrace # # NetBSD # -# dtrace support has problem on i386. (No official NetBSD release is -# built with dtrace enabled yet, so this problem is on 7.99.* only.) +# dtrace support has a problem on i386. XXX is this still an issue? # .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+= --disable-dtrace @@ -179,7 +178,7 @@ PLIST.win32= yes .endif # -# IRIX work around which should be fixed. +# IRIX workaround which should be fixed. # PLIST_VARS+= io .if ${OPSYS} != "IRIX" Index: pkgsrc/lang/ruby/rails.mk diff -u pkgsrc/lang/ruby/rails.mk:1.122 pkgsrc/lang/ruby/rails.mk:1.123 --- pkgsrc/lang/ruby/rails.mk:1.122 Thu May 5 03:39:02 2022 +++ pkgsrc/lang/ruby/rails.mk Tue May 17 00:42:33 2022 @@ -1,4 +1,4 @@ -# $NetBSD: rails.mk,v 1.122 2022/05/05 03:39:02 taca Exp $ +# $NetBSD: rails.mk,v 1.123 2022/05/17 00:42:33 gutteridge Exp $ .if !defined(_RUBY_RAILS_MK) _RUBY_RAILS_MK= # defined @@ -108,9 +108,9 @@ _RAILS_MINOR= ${RAILS_VERSION:C/([0-9]+) _RAILS_TEENY= ${RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/} # -# If RUBY_RAILS_STRICT_DEP is defined, match exact current Ruby no Rails -# version. -# Otherwise allow greater minor version. +# If RUBY_RAILS_STRICT_DEP is defined, match exact current Ruby on Rails +# version. Otherwise allow greater minor version. +# .if !empty(RUBY_RAILS_STRICT_DEP:M[yY][eE][sS]) _RAILS_NEXT!= ${EXPR} ${_RAILS_TEENY} + 1 Index: pkgsrc/lang/ruby/rubyversion.mk diff -u pkgsrc/lang/ruby/rubyversion.mk:1.251 pkgsrc/lang/ruby/rubyversion.mk:1.252 --- pkgsrc/lang/ruby/rubyversion.mk:1.251 Thu May 5 10:15:17 2022 +++ pkgsrc/lang/ruby/rubyversion.mk Tue May 17 00:42:33 2022 @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.251 2022/05/05 10:15:17 jperkin Exp $ +# $NetBSD: rubyversion.mk,v 1.252 2022/05/17 00:42:33 gutteridge Exp $ # # This file determines which Ruby version is used as a dependency for @@ -8,13 +8,13 @@ # === User-settable variables === # # RUBY_VERSION_DEFAULT -# The preferered Ruby version to use. +# The preferred Ruby version to use. # # Possible values: 26 27 30 31 # Default: 27 # # RUBY_BUILD_DOCUMENT -# Build documentation of this package and so that install formated +# Build documentation of this package so that installs formatted # documentation. It is also used in each package. # # Possible values: Yes No @@ -45,8 +45,8 @@ # # RUBY_NOVERSION # If "Yes", the package dosen't depend on any version of Ruby, such -# as editing mode for emacs. In this case, package's name would begin -# with "ruby-". Otherwise, the package's name is begin with +# as an editing mode for Emacs. In this case, package's name would begin +# with "ruby-". Otherwise, the package's name begins with # ${RUBY_PKGPREFIX}. # # Possible values: Yes No @@ -59,7 +59,7 @@ # # RUBY_ENCODING_ARG # -# Optional encoding argument for shbang line. +# Optional encoding argument for shebang line. # # Default: (empty) # @@ -73,9 +73,9 @@ # Use this variable in pkgsrc's Makefile # # RUBY_PKGPREFIX -# Prefix part for ruby based packages. It is recommended that to -# use RUBY_PKGPREFIX with ruby related packages since you can supply -# different binary packages as each version of Ruby. +# Prefix part for Ruby-based packages. It is recommended to +# use RUBY_PKGPREFIX with Ruby-related packages since you can supply +# different binary packages for each version of Ruby. # # Possible values: ruby26 ruby27 ruby30 ruby31 # @@ -583,7 +583,7 @@ MULTI+= RUBY_VER=${RUBY_VERS:U${RUBY_VER # RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on # any specific version of ruby command. In this case, package's # name begin with "ruby-". -# If RUBY_NOVERSION is "No" (default), the package's name is begin +# If RUBY_NOVERSION is "No" (default), the package's name begins # with ${RUBY_NAME}; "ruby26", "ruby27" and so on. # # It also affects to RUBY_DOC, RUBY_EG... --_----------=_1652748153211830--