[49504] trunk/dports/editors

[raimue at macports.org]

Revision: 49504
          http://trac.macports.org/changeset/49504
Author:   raimue at macports.org
Date:     2009-04-11 02:31:14 -0700 (Sat, 11 Apr 2009)
Log Message:
-----------
editors/vim, editors/vim-app, editors/MacVim:
Mark variants +python25 and +python26 as conflicting

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	2009-04-11 03:52:50 UTC (rev 49503)
+++ trunk/dports/editors/MacVim/Portfile	2009-04-11 09:31:14 UTC (rev 49504)
@@ -77,12 +77,12 @@
     depends_lib-append      path:bin/perl:perl5
 }
 variant python requires python25 description {Compatibility variant, requires +python25} {}
-variant python25 description {Enable Python scripting} {
+variant python25 conflicts python26 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
 }
-variant python26 description {Enable Python scripting} {
+variant python26 conflicts python25 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

Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile	2009-04-11 03:52:50 UTC (rev 49503)
+++ trunk/dports/editors/vim/Portfile	2009-04-11 09:31:14 UTC (rev 49504)
@@ -124,12 +124,12 @@
     depends_lib-append      path:bin/perl:perl5
 }
 variant python requires python25 description {Compatibility variant, requires +python25} {}
-variant python25 description {Enable Python scripting} {
+variant python25 conflicts python26 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
 }
-variant python26 description {Enable Python scripting} {
+variant python26 conflicts python25 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

Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile	2009-04-11 03:52:50 UTC (rev 49503)
+++ trunk/dports/editors/vim-app/Portfile	2009-04-11 09:31:14 UTC (rev 49504)
@@ -137,12 +137,12 @@
     depends_lib-append      path:bin/perl:perl5
 }
 variant python requires python25 description {Compatibility variant, requires +python25} {}
-variant python25 description {Enable Python scripting} {
+variant python25 conflicts python26 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
 }
-variant python26 description {Enable Python scripting} {
+variant python26 conflicts python25 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090411/b81033e2/attachment.html>