<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/515c61021960c790e0eb54d39a1cddf3333a575e">https://github.com/macports/macports-ports/commit/515c61021960c790e0eb54d39a1cddf3333a575e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 515c61021960c790e0eb54d39a1cddf3333a575e
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Feb 1 10:15:49 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> swig-ruby: make +ruby23 the default.
</span>---
devel/swig/Portfile | 45 +++++++++++++++++++++++++--------------------
1 file changed, 25 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/swig/Portfile b/devel/swig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f59576e..6ad58de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/swig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/swig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,7 @@ array set bindings {
</span> pike {port:pike pike}
python {port:python_select python}
r {port:R r}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ruby {port:ruby "ruby=${prefix}/bin/ruby1.8"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ruby {port:ruby23 "ruby=${prefix}/bin/ruby2.3"}
</span> tcl {port:tcl tcl}
}
array set prettynames {chicken Chicken clisp CLISP csharp "C#"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -188,53 +188,58 @@ subport swig-ruby {
</span> revision 1
variant ruby186 conflicts ruby187 ruby19 ruby20 ruby21 ruby22 ruby23 ruby24 description {build using Ruby 1.8.6} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:ruby23
</span> depends_lib-append port:ruby186
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
</span> configure.args-append --with-ruby=${prefix}/bin/ruby
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ruby187 conflicts ruby186 ruby19 ruby20 ruby21 ruby22 ruby23 ruby24 description {build using Ruby 1.8.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ruby187 conflicts ruby186 ruby19 ruby20 ruby21 ruby22 ruby23 ruby24 description {build using Ruby 1.8.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:ruby23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ruby187
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-ruby=${prefix}/bin/ruby1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
variant ruby19 conflicts ruby186 ruby187 ruby20 ruby21 ruby22 ruby23 ruby24 description {build using Ruby 1.9} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:ruby23
</span> depends_lib-append port:ruby19
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
</span> configure.args-append --with-ruby=${prefix}/bin/ruby1.9
}
variant ruby20 conflicts ruby186 ruby187 ruby19 ruby21 ruby22 ruby23 ruby24 description {build using Ruby 2.0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:ruby23
</span> depends_lib-append port:ruby20
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
</span> configure.args-append --with-ruby=${prefix}/bin/ruby2.0
}
variant ruby21 conflicts ruby186 ruby187 ruby19 ruby20 ruby22 ruby23 ruby24 description {build using Ruby 2.1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:ruby23
</span> depends_lib-append port:ruby21
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
</span> configure.args-append --with-ruby=${prefix}/bin/ruby2.1
}
variant ruby22 conflicts ruby186 ruby187 ruby19 ruby20 ruby21 ruby23 ruby24 description {build using Ruby 2.2} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:ruby23
</span> depends_lib-append port:ruby22
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
</span> configure.args-append --with-ruby=${prefix}/bin/ruby2.2
}
variant ruby23 conflicts ruby186 ruby187 ruby19 ruby20 ruby21 ruby22 ruby24 description {build using Ruby 2.3} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:ruby
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:ruby23
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-ruby=${prefix}/bin/ruby2.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# depends_lib-delete port:ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# depends_lib-append port:ruby23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-append --with-ruby=${prefix}/bin/ruby2.3
</span> }
variant ruby24 conflicts ruby186 ruby187 ruby19 ruby20 ruby21 ruby22 ruby23 description {build using Ruby 2.4} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:ruby23
</span> depends_lib-append port:ruby24
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
</span> configure.args-append --with-ruby=${prefix}/bin/ruby2.4
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -242,13 +247,13 @@ subport swig-ruby {
</span> ![variant_isset ruby19] && ![variant_isset ruby20] &&
![variant_isset ruby21] && ![variant_isset ruby22] &&
![variant_isset ruby23] && ![variant_isset ruby24]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +ruby187
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +ruby23
</span> }
if {![variant_isset ruby186] && ![variant_isset ruby187] &&
![variant_isset ruby19] && ![variant_isset ruby20] &&
![variant_isset ruby21] && ![variant_isset ruby22] &&
![variant_isset ruby23] && ![variant_isset ruby24]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nA +rubyXY variant must be selected; the variant '-ruby187' cannot be used alone.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nA +rubyXY variant must be selected; the variant '-ruby23' cannot be used alone.\n"
</span> return -code error "Invalid variant selection"
}
}
</pre><pre style='margin:0'>
</pre>