<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b815e266ccf819ba725812c17b963f5ac7dcf92d">https://github.com/macports/macports-ports/commit/b815e266ccf819ba725812c17b963f5ac7dcf92d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b815e266ccf819ba725812c17b963f5ac7dcf92d
</span>Author: Aaron Madlon-Kay <aaron@madlon-kay.com>
AuthorDate: Tue Apr 25 22:11:16 2017 +0900
<span style='display:block; white-space:pre;color:#404040;'> Make ruby.link_binaries_suffix an option
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: #382
</span>---
_resources/port1.0/group/ruby-1.0.tcl | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/ruby-1.0.tcl b/_resources/port1.0/group/ruby-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 58813c6..85ea123 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/ruby-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/ruby-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +53,8 @@
</span> # ruby.branch: select ruby version. 2.3, 2.2, 2.1, 2.0, 1.9 or 1.8.
# ruby.link_binaries: whether generate suffixed symlink under ${prefix}/bin
# or not.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ruby.link_binaries_suffix: suffix of commands from rb-foo under
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ${prefix}/bin. such as "-2.2" or "-2.1".
</span> # values:
# ruby.bin, ruby.rdoc, ruby.gem ruby.rake: fullpath to commands for ${ruby.branch}.
# ruby.suffix: suffix of portname. port:ruby${ruby.suffix} or
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,8 +62,6 @@
</span> # ruby.bindir: install location of commands without suffix from rb-foo.
# ruby.gemdir: install location of rubygems.
# such as "${prefix}/lib/ruby2.2/gems/2.2.0".
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# ruby.link_binaries_suffix: suffix of commands from rb-foo under
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${prefix}/bin. such as "-2.2" or "-2.1".
</span> # (obsoleted values)
# ruby.prog_suffix: use ruby.branch.
# ruby.version: use ruby.api_version.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,8 +89,8 @@ proc ruby_set_branch {option action args} {
</span> }
global prefix ruby.branch \
ruby.bin ruby.rdoc ruby.gem ruby.rake ruby.bindir ruby.gemdir \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ruby.suffix ruby.link_binaries_suffix ruby.prog_suffix \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ruby.api_version ruby.lib ruby.archlib ruby.arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ruby.suffix ruby.prog_suffix ruby.api_version ruby.lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ruby.archlib ruby.arch
</span> set ruby.bin ${prefix}/bin/ruby${ruby.branch}
set ruby.rdoc ${prefix}/bin/rdoc${ruby.branch}
set ruby.gem ${prefix}/bin/gem${ruby.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,7 +105,6 @@ proc ruby_set_branch {option action args} {
</span> if {${ruby.branch} eq "1.8"} {
set ruby.suffix ""
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set ruby.link_binaries_suffix -${ruby.branch}
</span> set ruby.prog_suffix ${ruby.branch}
if {${ruby.branch} eq "1.8"} {
set ruby.prog_suffix ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,9 +140,6 @@ set ruby.docs {}
</span> set ruby.srcdir ""
set ruby.prog_suffix ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options ruby.link_binaries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default ruby.link_binaries yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # detect setup.rb config option name of --rubyprog.
# some setup.rb accepts this option by other name, such as --ruby-prog.
# NOTE: set the value *before ruby.setup* to use ohter name.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,6 +148,10 @@ default ruby.config_rubyprog_name --rubyprog
</span>
default ruby.branch ${ruby.default_branch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+options ruby.link_binaries ruby.link_binaries_suffix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default ruby.link_binaries yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default ruby.link_binaries_suffix {-${ruby.branch}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # ruby group setup procedure; optional for ruby 1.8 if you want only
# basic variables, like ruby.lib and ruby.archlib.
proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"} {implementation "ruby"}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,7 +160,6 @@ proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"} {im
</span> global ruby.bin ruby.rdoc ruby.gem ruby.rake ruby.branch
global ruby.api_version ruby.lib ruby.suffix ruby.bindir ruby.gemdir
global ruby.module ruby.filename ruby.project ruby.docs ruby.srcdir
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global ruby.link_binaries_suffix
</span> # ruby.version is obsoleted. use ruby.gemdir.
global ruby.prog_suffix
# from muniversal
</pre><pre style='margin:0'>
</pre>