swig-ruby: make +ruby23 the default.

macports · Feb 1, 2017 · 515c610 · 515c610
1 parent 236e551
commit 515c610
Showing 1 changed file with 25 additions and 20 deletions.
diff --git a/devel/swig/Portfile b/devel/swig/Portfile
@@ -62,7 +62,7 @@ array set bindings {
     pike        {port:pike              pike}
     python      {port:python_select     python}
     r           {port:R                 r}
-    ruby        {port:ruby              "ruby=${prefix}/bin/ruby1.8"}
+    ruby        {port:ruby23            "ruby=${prefix}/bin/ruby2.3"}
     tcl         {port:tcl               tcl}
 }
 array set prettynames {chicken Chicken clisp CLISP csharp "C#"
@@ -188,67 +188,72 @@ subport swig-ruby {
     revision 1
 
     variant ruby186 conflicts ruby187 ruby19 ruby20 ruby21 ruby22 ruby23 ruby24 description {build using Ruby 1.8.6} {
-        depends_lib-delete port:ruby
+        depends_lib-delete port:ruby23
         depends_lib-append port:ruby186
-        configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
+        configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
         configure.args-append --with-ruby=${prefix}/bin/ruby
     }
 
-    variant ruby187 conflicts ruby186 ruby19 ruby20 ruby21 ruby22 ruby23 ruby24 description {build using Ruby 1.8.7} {}
+    variant ruby187 conflicts ruby186 ruby19 ruby20 ruby21 ruby22 ruby23 ruby24 description {build using Ruby 1.8.7} {
+        depends_lib-delete port:ruby23
+        depends_lib-append port:ruby187
+        configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
+        configure.args-append --with-ruby=${prefix}/bin/ruby1.8
+    }
 
     variant ruby19 conflicts ruby186 ruby187 ruby20 ruby21 ruby22 ruby23 ruby24 description {build using Ruby 1.9} {
-        depends_lib-delete port:ruby
+        depends_lib-delete port:ruby23
         depends_lib-append port:ruby19
-        configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
+        configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
         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} {
-        depends_lib-delete port:ruby
+        depends_lib-delete port:ruby23
         depends_lib-append port:ruby20
-        configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
+        configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
         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} {
-        depends_lib-delete port:ruby
+        depends_lib-delete port:ruby23
         depends_lib-append port:ruby21
-        configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
+        configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
         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} {
-        depends_lib-delete port:ruby
+        depends_lib-delete port:ruby23
         depends_lib-append port:ruby22
-        configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
+        configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
         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} {
-        depends_lib-delete port:ruby
-        depends_lib-append port:ruby23
-        configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
-        configure.args-append --with-ruby=${prefix}/bin/ruby2.3
+#        depends_lib-delete port:ruby
+#        depends_lib-append port:ruby23
+#        configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
+#        configure.args-append --with-ruby=${prefix}/bin/ruby2.3
     }
 
     variant ruby24 conflicts ruby186 ruby187 ruby19 ruby20 ruby21 ruby22 ruby23 description {build using Ruby 2.4} {
-        depends_lib-delete port:ruby
+        depends_lib-delete port:ruby23
         depends_lib-append port:ruby24
-        configure.args-delete --with-ruby=${prefix}/bin/ruby1.8
+        configure.args-delete --with-ruby=${prefix}/bin/ruby2.3
         configure.args-append --with-ruby=${prefix}/bin/ruby2.4
     }
 
     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]} {
-        default_variants +ruby187
+        default_variants +ruby23
     }
     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]} {
-        ui_error "\n\nA +rubyXY variant must be selected; the variant '-ruby187' cannot be used alone.\n"
+        ui_error "\n\nA +rubyXY variant must be selected; the variant '-ruby23' cannot be used alone.\n"
         return -code error "Invalid variant selection"
     }
 }