diff options
| author | taca <taca@pkgsrc.org> | 2021-03-21 12:39:52 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2021-03-21 12:39:52 +0000 |
| commit | 1910922f5b240a95a3eb1293e3224aa1842c1d02 (patch) | |
| tree | e9a2b87fd91b04c58d946d2e7dd2cb111431eb1c /lang | |
| parent | ebc19cff4f010bf8e291899965765c01111bdc8c (diff) | |
| download | pkgsrc-1910922f5b240a95a3eb1293e3224aa1842c1d02.tar.gz | |
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.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby/gem.mk | 5 | ||||
| -rw-r--r-- | lang/ruby/rubyversion.mk | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lang/ruby/gem.mk b/lang/ruby/gem.mk index 68462920693..f2c7a983860 100644 --- a/lang/ruby/gem.mk +++ b/lang/ruby/gem.mk @@ -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 diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 6b85cd9c992..e764974e2c5 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -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 |