[131243] trunk/dports/editors
raimue at macports.org
raimue at macports.org
Wed Jan 7 05:53:26 PST 2015
Revision: 131243
https://trac.macports.org/changeset/131243
Author: raimue at macports.org
Date: 2015-01-07 05:53:26 -0800 (Wed, 07 Jan 2015)
Log Message:
-----------
editors/vim, editors/vim-app, editors/MacVim:
Remove +python, +python25, +python31, +python32 variants
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-01-07 13:26:22 UTC (rev 131242)
+++ trunk/dports/editors/MacVim/Portfile 2015-01-07 13:53:26 UTC (rev 131243)
@@ -8,6 +8,7 @@
set snapshot 73
set gitcommit snapshot-${snapshot}
version ${vim_version}.snapshot${snapshot}
+revision 1
categories editors
platforms darwin
license Vim GPL-2+
@@ -124,45 +125,27 @@
configure.args-append --enable-perlinterp
depends_lib-append path:bin/perl:perl5
}
-variant python requires python25 description {Compatibility variant, requires +python25} {}
-variant python25 conflicts python26 python27 description {Enable Python scripting} {
- configure.args-append --enable-pythoninterp --with-python=${prefix}/bin/python2.5
- patchfiles-append patch-python.diff
- depends_lib-append port:python25
- use_autoconf yes
-}
-variant python26 conflicts python25 python27 description {Enable Python scripting} {
+# Compatibility variants, can be removed after 2015-12-26
+variant python25 requires python27 description {Legacy variant} {}
+variant python31 requires python34 description {Legacy variant} {}
+variant python32 requires python34 description {Legacy variant} {}
+
+variant python26 conflicts python27 description {Enable Python scripting} {
configure.args-append --enable-pythoninterp --with-python=${prefix}/bin/python2.6
patchfiles-append patch-python.diff
depends_lib-append port:python26
use_autoconf yes
}
-variant python27 conflicts python25 python26 description {Enable Python scripting} {
+variant python27 conflicts python26 description {Enable Python scripting} {
configure.args-append --enable-pythoninterp --with-python=${prefix}/bin/python2.7
patchfiles-append patch-python.diff
depends_lib-append port:python27
use_autoconf yes
}
-variant python31 conflicts python32 python33 python34 description {Enable Python scripting} {
- configure.args-append --enable-python3interp --with-python3=${prefix}/bin/python3.1
- patchfiles-append patch-python3.diff
- depends_lib-append port:python31
-
- use_autoconf yes
-}
-variant python32 conflicts python31 python33 python34 description {Enable Python scripting} {
- configure.args-append --enable-python3interp --with-python3=${prefix}/bin/python3.2
- patchfiles-append patch-python3.diff
- depends_lib-append port:python32
-
- use_autoconf yes
- # Overwriting autoconf.cmd above removes dependency, add it again
- depends_build-append port:autoconf
-}
-variant python33 conflicts python31 python32 python34 description {Enable Python scripting} {
+variant python33 conflicts python34 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
@@ -171,7 +154,7 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python34 conflicts python31 python32 python33 description {Enable Python scripting} {
+variant python34 conflicts python33 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
Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile 2015-01-07 13:26:22 UTC (rev 131242)
+++ trunk/dports/editors/vim/Portfile 2015-01-07 13:53:26 UTC (rev 131243)
@@ -6,6 +6,7 @@
set vim_version 7.4
set vim_patchlevel 258
version ${vim_version}.${vim_patchlevel}
+revision 1
categories editors
platforms darwin freebsd
license Vim GPL-2+
@@ -409,17 +410,13 @@
configure.args-append --enable-perlinterp
depends_lib-append path:bin/perl:perl5
}
-variant python requires python25 description {Compatibility variant, requires +python25} {}
-variant python25 conflicts python26 python27 description {Enable Python scripting} {
- configure.args-append --enable-pythoninterp --with-python=${prefix}/bin/python2.5
- patchfiles-append patch-python.diff
- depends_lib-append port:python25
- use_autoconf yes
- # Overwriting autoconf.cmd above removes dependency, add it again
- depends_build-append port:autoconf
-}
-variant python26 conflicts python25 python27 description {Enable Python scripting} {
+# Compatibility variants, can be removed after 2015-12-26
+variant python25 requires python27 description {Legacy variant} {}
+variant python31 requires python34 description {Legacy variant} {}
+variant python32 requires python34 description {Legacy variant} {}
+
+variant python26 conflicts python27 description {Enable Python scripting} {
configure.args-append --enable-pythoninterp --with-python=${prefix}/bin/python2.6
patchfiles-append patch-python.diff
depends_lib-append port:python26
@@ -428,7 +425,7 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python27 conflicts python25 python26 description {Enable Python scripting} {
+variant python27 conflicts python26 description {Enable Python scripting} {
configure.args-append --enable-pythoninterp --with-python=${prefix}/bin/python2.7
patchfiles-append patch-python.diff
depends_lib-append port:python27
@@ -437,25 +434,7 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python31 conflicts python32 python33 python34 description {Enable Python scripting} {
- configure.args-append --enable-python3interp --with-python3=${prefix}/bin/python3.1
- patchfiles-append patch-python3.diff
- depends_lib-append port:python31
-
- use_autoconf yes
- # Overwriting autoconf.cmd above removes dependency, add it again
- depends_build-append port:autoconf
-}
-variant python32 conflicts python31 python33 python34 description {Enable Python scripting} {
- configure.args-append --enable-python3interp --with-python3=${prefix}/bin/python3.2
- patchfiles-append patch-python3.diff
- depends_lib-append port:python32
-
- use_autoconf yes
- # Overwriting autoconf.cmd above removes dependency, add it again
- depends_build-append port:autoconf
-}
-variant python33 conflicts python31 python32 python34 description {Enable Python scripting} {
+variant python33 conflicts python34 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
@@ -464,7 +443,7 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python34 conflicts python31 python32 python33 description {Enable Python scripting} {
+variant python34 conflicts python33 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
Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile 2015-01-07 13:26:22 UTC (rev 131242)
+++ trunk/dports/editors/vim-app/Portfile 2015-01-07 13:53:26 UTC (rev 131243)
@@ -7,6 +7,7 @@
set vim_version 7.4
set vim_patchlevel 258
version ${vim_version}.${vim_patchlevel}
+revision 1
categories editors
platforms darwin
license Vim GPL-2+
@@ -430,17 +431,13 @@
configure.args-append --enable-perlinterp
depends_lib-append path:bin/perl:perl5
}
-variant python requires python25 description {Compatibility variant, requires +python25} {}
-variant python25 conflicts python26 python27 description {Enable Python scripting} {
- configure.args-append --enable-pythoninterp --with-python=${prefix}/bin/python2.5
- patchfiles-append patch-python.diff
- depends_lib-append port:python25
- use_autoconf yes
- # Overwriting autoconf.cmd above removes dependency, add it again
- depends_build-append port:autoconf
-}
-variant python26 conflicts python25 python27 description {Enable Python scripting} {
+# Compatibility variants, can be removed after 2015-12-26
+variant python25 requires python27 description {Legacy variant} {}
+variant python31 requires python34 description {Legacy variant} {}
+variant python32 requires python34 description {Legacy variant} {}
+
+variant python26 conflicts python27 description {Enable Python scripting} {
configure.args-append --enable-pythoninterp --with-python=${prefix}/bin/python2.6
patchfiles-append patch-python.diff
depends_lib-append port:python26
@@ -449,7 +446,7 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python27 conflicts python25 python26 description {Enable Python scripting} {
+variant python27 conflicts python26 description {Enable Python scripting} {
configure.args-append --enable-pythoninterp --with-python=${prefix}/bin/python2.7
patchfiles-append patch-python.diff
depends_lib-append port:python27
@@ -458,25 +455,7 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python31 conflicts python32 python33 python34 description {Enable Python scripting} {
- configure.args-append --enable-python3interp --with-python3=${prefix}/bin/python3.1
- patchfiles-append patch-python3.diff
- depends_lib-append port:python31
-
- use_autoconf yes
- # Overwriting autoconf.cmd above removes dependency, add it again
- depends_build-append port:autoconf
-}
-variant python32 conflicts python31 python33 python34 description {Enable Python scripting} {
- configure.args-append --enable-python3interp --with-python3=${prefix}/bin/python3.2
- patchfiles-append patch-python3.diff
- depends_lib-append port:python32
-
- use_autoconf yes
- # Overwriting autoconf.cmd above removes dependency, add it again
- depends_build-append port:autoconf
-}
-variant python33 conflicts python31 python32 python34 description {Enable Python scripting} {
+variant python33 conflicts python34 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
@@ -485,7 +464,7 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python34 conflicts python31 python32 python33 description {Enable Python scripting} {
+variant python34 conflicts python33 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150107/cf6ebfea/attachment.html>
More information about the macports-changes
mailing list