pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/ruby lang/ruby: PRINT_PLIST_AWK improvement
details: https://anonhg.NetBSD.org/pkgsrc/rev/2c0247ad0cc8
branches: trunk
changeset: 449123:2c0247ad0cc8
user: taca <taca%pkgsrc.org@localhost>
date: Sun Mar 21 12:39:52 2021 +0000
description:
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:
lang/ruby/gem.mk | 5 +----
lang/ruby/rubyversion.mk | 7 ++++++-
2 files changed, 7 insertions(+), 5 deletions(-)
diffs (40 lines):
diff -r 702a4959085a -r 2c0247ad0cc8 lang/ruby/gem.mk
--- a/lang/ruby/gem.mk Sun Mar 21 10:21:19 2021 +0000
+++ b/lang/ruby/gem.mk Sun Mar 21 12:39:52 2021 +0000
@@ -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 @@
USE_TOOLS+= pax
-PRINT_PLIST_AWK+= /^bin\/.*${RUBY_SUFFIX}$$/ \
- { sub(/${RUBY_SUFFIX}$$/, "$${RUBY_SUFFIX}"); }
-
do-install: ${_GEM_INSTALL_TARGETS}
.PHONY: _gem-install
diff -r 702a4959085a -r 2c0247ad0cc8 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk Sun Mar 21 10:21:19 2021 +0000
+++ b/lang/ruby/rubyversion.mk Sun Mar 21 12:39:52 2021 +0000
@@ -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 @@
{ 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
Home |
Main Index |
Thread Index |
Old Index