CVS commit: pkgsrc/lang/ruby

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Mar 21 12:39:52 UTC 2021

Modified Files:
        pkgsrc/lang/ruby: gem.mk rubyversion.mk

Log Message:
lang/ruby: PRINT_PLIST_AWK improvement

* Move PRINT_PLIST_AWK for ${RUBY_SUFFIX} from gem.mk to rubyversion.mk.
  It was previously committed in gem.mk.

* Add support ${RUBY_SUFFIX} to online manual.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/lang/ruby/gem.mk
cvs rdiff -u -r1.224 -r1.225 pkgsrc/lang/ruby/rubyversion.mk

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/gem.mk
diff -u pkgsrc/lang/ruby/gem.mk:1.46 pkgsrc/lang/ruby/gem.mk:1.47
--- pkgsrc/lang/ruby/gem.mk:1.46        Sat Mar 20 06:01:53 2021
+++ pkgsrc/lang/ruby/gem.mk     Sun Mar 21 12:39:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: gem.mk,v 1.46 2021/03/20 06:01:53 taca Exp $
+# $NetBSD: gem.mk,v 1.47 2021/03/21 12:39:52 taca Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install Ruby gems.
@@ -384,9 +384,6 @@ _GEM_INSTALL_TARGETS+=      _gem-install
 
 USE_TOOLS+=    pax
 
-PRINT_PLIST_AWK+=      /^bin\/.*${RUBY_SUFFIX}$$/ \
-                       { sub(/${RUBY_SUFFIX}$$/, "$${RUBY_SUFFIX}"); }
-
 do-install: ${_GEM_INSTALL_TARGETS}
 
 .PHONY: _gem-install

Index: pkgsrc/lang/ruby/rubyversion.mk
diff -u pkgsrc/lang/ruby/rubyversion.mk:1.224 pkgsrc/lang/ruby/rubyversion.mk:1.225
--- pkgsrc/lang/ruby/rubyversion.mk:1.224       Sun Feb 14 14:30:07 2021
+++ pkgsrc/lang/ruby/rubyversion.mk     Sun Mar 21 12:39:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.224 2021/02/14 14:30:07 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.225 2021/03/21 12:39:52 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -803,6 +803,11 @@ PRINT_PLIST_AWK+=  /\/${RUBY_NAME}/ \
                        { sub(/${RUBY_NAME}/, "$${RUBY_NAME}"); }
 PRINT_PLIST_AWK+=      /^${GEM_HOME:S|/|\\/|g:S|.|\\.|g}/ \
                        { gsub(/${GEM_HOME:S|/|\\/|g}/, "$${GEM_HOME}"); }
+# handle ${RUBY_SUFFIX}
+PRINT_PLIST_AWK+=      /^bin\/.*${RUBY_SUFFIX}$$/ \
+                       { sub(/${RUBY_SUFFIX}$$/, "$${RUBY_SUFFIX}"); }
+PRINT_PLIST_AWK+=      /^man\/man[0-9]\/.*${RUBY_SUFFIX}.[0-9]$$/ \
+                       { sub(/${RUBY_SUFFIX}\./, "$${RUBY_SUFFIX}."); }
 
 # supporting scripts
 UPDATE_GEMSPEC=                ../../lang/ruby/files/update-gemspec.rb