<pre style='margin:0'>
kimura wataru (kimuraw) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e5a6f55b084f79e8336d85c0e044f9db2deb68a4">https://github.com/macports/macports-ports/commit/e5a6f55b084f79e8336d85c0e044f9db2deb68a4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e5a6f55b084f79e8336d85c0e044f9db2deb68a4
</span>Author: kimura wataru <kimuraw@macports.org>
AuthorDate: Mon Aug 7 10:02:33 2017 +0900
<span style='display:block; white-space:pre;color:#404040;'> _resources/port1.0/group/ruby-1.0.tcl: install only stub port for rb-*, when subport is enabled (same as PortGroup php-1.1)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> stop replaced_by for rb-*, when subport is defined ruby.branches and ruby.setup.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> note: now, only port:rb-bundler uses ruby.branches.
</span>---
_resources/port1.0/group/ruby-1.0.tcl | 15 ++++++---------
1 file changed, 6 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 d8e86f0..1ba5c07 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;'>@@ -38,7 +38,6 @@
</span> # ruby.branches 2.3 2.2
# ruby.setup module version type
# # - adds subport "rb23-module" and "rb22-module"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# # - sets replaced_by to rb23-moudle (apply first item of branches)
</span> #
# 2. use ruby.branch
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,6 +167,9 @@ proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"} {im
</span> # for setup.rb +universal
global ruby.config_rubyprog_name
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ version ${vers}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ categories ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # define ruby global names and lists
# check if module is a list or string
if {[llength ${module}] > 1} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,6 +191,7 @@ proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"} {im
</span> name rb-[string tolower ${ruby.module}]
}
if {[string match rb-* $name]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # stub port
</span> set rootname [string range $name 3 end]
foreach v ${ruby.branches} {
set suffix [join [split ${v} .] {}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -198,19 +201,16 @@ proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"} {im
</span> }
}
if {$subport eq $name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # set first item in ${ruby.branches} to ruby.branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ruby.branch [lindex [split ${ruby.branches}] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set suffix [join [split ${ruby.branch} .] {}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ruby.link_binaries no
</span> distfiles
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by rb${suffix}-${rootname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:rb${suffix}-${rootname}
</span> use_configure no
build {}
destroot {
xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
system "echo $name is a stub port > ${destroot}${prefix}/share/doc/${name}/README"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ return
</span> }
}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,9 +233,6 @@ proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"} {im
</span>
set ruby.docs ${docs}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${vers}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- categories ruby
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # set source to rubygems by default for type "gem"
if {(${type} eq "gem") && (${source} eq "custom")} {
set source rubygems
</pre><pre style='margin:0'>
</pre>