[141301] trunk/dports/editors

12 Dec 2015

Revision: 141301
          https://trac.macports.org/changeset/141301
Author:   raimue@macports.org
Date:     2015-10-15 12:10:08 -0700 (Thu, 15 Oct 2015)
Log Message:
-----------
editors/vim, editors/vim-app, editors/MacVim:
Add variants +python35, +ruby21, and +ruby22

Modified Paths:
--------------
    trunk/dports/editors/MacVim/Portfile
    trunk/dports/editors/vim/Portfile
    trunk/dports/editors/vim-app/Portfile

Modified: trunk/dports/editors/MacVim/Portfile
===================================================================

--- trunk/dports/editors/MacVim/Portfile	2015-10-15 18:20:02 UTC (rev 141300)
+++ trunk/dports/editors/MacVim/Portfile	2015-10-15 19:10:08 UTC (rev 141301)
@@ -96,7 +96,6 @@
 }
 
 variant big description {Build big feature set} conflicts huge {
-    configure.args-append --with-features=big
 }
 variant huge description {Build huge feature set} conflicts big {
     configure.args-append --with-features=huge
@@ -129,7 +128,7 @@
 
     use_autoconf yes
 }
-variant python33 conflicts python34 description {Enable Python scripting} {
+variant python33 conflicts python34 python35 description {Enable Python scripting} {
     configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.3
     patchfiles-append       patch-python3.diff
     depends_lib-append      port:python33
@@ -138,7 +137,7 @@
     # Overwriting autoconf.cmd above removes dependency, add it again
     depends_build-append port:autoconf
 }
-variant python34 conflicts python33 description {Enable Python scripting} {
+variant python34 conflicts python33 python35 description {Enable Python scripting} {
     configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.4
     patchfiles-append       patch-python3.diff
     depends_lib-append      port:python34
@@ -147,22 +146,44 @@
     # Overwriting autoconf.cmd above removes dependency, add it again
     depends_build-append port:autoconf
 }
+
+variant python35 conflicts python33 python34 description {Enable Python scripting} {
+    configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.5
+    patchfiles-append       patch-python3.diff
+    depends_lib-append      port:python35
+
+    use_autoconf yes
+    # Overwriting autoconf.cmd above removes dependency, add it again
+    depends_build-append port:autoconf
+}
+
 variant ruby requires ruby18 description {Compatibility variant, requires +ruby18} {}
-variant ruby18 conflicts ruby19 ruby20 description {Enable Ruby scripting} {
+variant ruby18 conflicts ruby19 ruby20 ruby21 ruby22 description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp
     configure.args-append   --with-ruby-command=${prefix}/bin/ruby1.8
     depends_lib-append      port:ruby
 }
-variant ruby19 conflicts ruby18 ruby20 description {Enable Ruby scripting} {
+variant ruby19 conflicts ruby18 ruby20 ruby21 ruby22 description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp
     configure.args-append   --with-ruby-command=${prefix}/bin/ruby1.9
     depends_lib-append      port:ruby19
 }
-variant ruby20 conflicts ruby18 ruby19 description {Enable Ruby scripting} {
+variant ruby20 conflicts ruby18 ruby19 ruby21 ruby22 description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp
     configure.args-append   --with-ruby-command=${prefix}/bin/ruby2.0
     depends_lib-append      port:ruby20
 }
+variant ruby21 conflicts ruby18 ruby19 ruby20 ruby22 description {Enable Ruby scripting} {
+    configure.args-append   --enable-rubyinterp
+    configure.args-append   --with-ruby-command=${prefix}/bin/ruby2.1
+    depends_lib-append      port:ruby21
+}
+variant ruby22 conflicts ruby18 ruby19 ruby20 ruby21 description {Enable Ruby scripting} {
+    configure.args-append   --enable-rubyinterp
+    configure.args-append   --with-ruby-command=${prefix}/bin/ruby2.2
+    depends_lib-append      port:ruby22
+}
+
 variant tcl description {Enable Tcl scripting} {
     configure.args-append   --enable-tclinterp \
                             --with-tclsh=${prefix}/bin/tclsh

Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile	2015-10-15 18:20:02 UTC (rev 141300)
+++ trunk/dports/editors/vim/Portfile	2015-10-15 19:10:08 UTC (rev 141301)
@@ -887,7 +887,7 @@
     # Overwriting autoconf.cmd above removes dependency, add it again
     depends_build-append port:autoconf
 }
-variant python33 conflicts python34 description {Enable Python scripting} {
+variant python33 conflicts python34 python35 description {Enable Python scripting} {
     configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.3
     patchfiles-append       patch-python3.diff
     depends_lib-append      port:python33
@@ -896,7 +896,7 @@
     # Overwriting autoconf.cmd above removes dependency, add it again
     depends_build-append port:autoconf
 }
-variant python34 conflicts python33 description {Enable Python scripting} {
+variant python34 conflicts python33 python35 description {Enable Python scripting} {
     configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.4
     patchfiles-append       patch-python3.diff
     depends_lib-append      port:python34
@@ -906,22 +906,42 @@
     depends_build-append port:autoconf
 }
 
+variant python35 conflicts python33 python34 description {Enable Python scripting} {
+    configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.5
+    patchfiles-append       patch-python3.diff
+    depends_lib-append      port:python35
+
+    use_autoconf yes
+    # Overwriting autoconf.cmd above removes dependency, add it again
+    depends_build-append port:autoconf
+}
+
 variant ruby requires ruby18 description {Compatibility variant, requires +ruby18} {}
-variant ruby18 conflicts ruby19 ruby20 description {Enable Ruby scripting} {
+variant ruby18 conflicts ruby19 ruby20 ruby21 ruby22 description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp
     configure.args-append   --with-ruby-command=${prefix}/bin/ruby1.8
     depends_lib-append      port:ruby
 }
-variant ruby19 conflicts ruby18 ruby20 description {Enable Ruby scripting} {
+variant ruby19 conflicts ruby18 ruby20 ruby21 ruby22 description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp
     configure.args-append   --with-ruby-command=${prefix}/bin/ruby1.9
     depends_lib-append      port:ruby19
 }
-variant ruby20 conflicts ruby18 ruby19 description {Enable Ruby scripting} {
+variant ruby20 conflicts ruby18 ruby19 ruby21 ruby22 description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp
     configure.args-append   --with-ruby-command=${prefix}/bin/ruby2.0
     depends_lib-append      port:ruby20
 }
+variant ruby21 conflicts ruby18 ruby19 ruby20 ruby22 description {Enable Ruby scripting} {
+    configure.args-append   --enable-rubyinterp
+    configure.args-append   --with-ruby-command=${prefix}/bin/ruby2.1
+    depends_lib-append      port:ruby21
+}
+variant ruby22 conflicts ruby18 ruby19 ruby20 ruby21 description {Enable Ruby scripting} {
+    configure.args-append   --enable-rubyinterp
+    configure.args-append   --with-ruby-command=${prefix}/bin/ruby2.2
+    depends_lib-append      port:ruby22
+}
 
 variant tcl description {Enable Tcl scripting} {
     configure.args-append   --enable-tclinterp \

Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile	2015-10-15 18:20:02 UTC (rev 141300)
+++ trunk/dports/editors/vim-app/Portfile	2015-10-15 19:10:08 UTC (rev 141301)
@@ -908,7 +908,7 @@
     # Overwriting autoconf.cmd above removes dependency, add it again
     depends_build-append port:autoconf
 }
-variant python33 conflicts python34 description {Enable Python scripting} {
+variant python33 conflicts python34 python35 description {Enable Python scripting} {
     configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.3
     patchfiles-append       patch-python3.diff
     depends_lib-append      port:python33
@@ -917,7 +917,7 @@
     # Overwriting autoconf.cmd above removes dependency, add it again
     depends_build-append port:autoconf
 }
-variant python34 conflicts python33 description {Enable Python scripting} {
+variant python34 conflicts python33 python35 description {Enable Python scripting} {
     configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.4
     patchfiles-append       patch-python3.diff
     depends_lib-append      port:python34
@@ -927,22 +927,42 @@
     depends_build-append port:autoconf
 }
 
+variant python35 conflicts python33 python34 description {Enable Python scripting} {
+    configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.5
+    patchfiles-append       patch-python3.diff
+    depends_lib-append      port:python35
+
+    use_autoconf yes
+    # Overwriting autoconf.cmd above removes dependency, add it again
+    depends_build-append port:autoconf
+}
+
 variant ruby requires ruby18 description {Compatibility variant, requires +ruby18} {}
-variant ruby18 conflicts ruby19 ruby20 description {Enable Ruby scripting} {
+variant ruby18 conflicts ruby19 ruby20 ruby21 ruby22 description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp
     configure.args-append   --with-ruby-command=${prefix}/bin/ruby1.8
     depends_lib-append      port:ruby
 }
-variant ruby19 conflicts ruby18 ruby20 description {Enable Ruby scripting} {
+variant ruby19 conflicts ruby18 ruby20 ruby21 ruby22 description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp
     configure.args-append   --with-ruby-command=${prefix}/bin/ruby1.9
     depends_lib-append      port:ruby19
 }
-variant ruby20 conflicts ruby18 ruby19 description {Enable Ruby scripting} {
+variant ruby20 conflicts ruby18 ruby19 ruby21 ruby22 description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp
     configure.args-append   --with-ruby-command=${prefix}/bin/ruby2.0
     depends_lib-append      port:ruby20
 }
+variant ruby21 conflicts ruby18 ruby19 ruby20 ruby22 description {Enable Ruby scripting} {
+    configure.args-append   --enable-rubyinterp
+    configure.args-append   --with-ruby-command=${prefix}/bin/ruby2.1
+    depends_lib-append      port:ruby21
+}
+variant ruby22 conflicts ruby18 ruby19 ruby20 ruby21 description {Enable Ruby scripting} {
+    configure.args-append   --enable-rubyinterp
+    configure.args-append   --with-ruby-command=${prefix}/bin/ruby2.2
+    depends_lib-append      port:ruby22
+}
 
 variant tcl description {Enable Tcl scripting} {
     configure.args-append   --enable-tclinterp \

    

raimue＠macports.org

tags

participants (1)