[83056] trunk/dports/editors
raimue at macports.org
raimue at macports.org
Wed Aug 24 15:56:09 PDT 2011
Revision: 83056
http://trac.macports.org/changeset/83056
Author: raimue at macports.org
Date: 2011-08-24 15:56:08 -0700 (Wed, 24 Aug 2011)
Log Message:
-----------
editors/vim, editors/vim-app, editors/MacVim:
Allow use of python 2.x and 3.x at the same time.
Add +python32 variant.
Modified Paths:
--------------
trunk/dports/editors/MacVim/Portfile
trunk/dports/editors/MacVim/files/patch-python3.diff
trunk/dports/editors/vim/Portfile
trunk/dports/editors/vim/files/patch-python3.diff
trunk/dports/editors/vim-app/Portfile
trunk/dports/editors/vim-app/files/patch-python3.diff
Modified: trunk/dports/editors/MacVim/Portfile
===================================================================
--- trunk/dports/editors/MacVim/Portfile 2011-08-24 22:25:01 UTC (rev 83055)
+++ trunk/dports/editors/MacVim/Portfile 2011-08-24 22:56:08 UTC (rev 83056)
@@ -7,6 +7,7 @@
set snapshot 61
set gitcommit snapshot-${snapshot}
version ${vim_version}.snapshot${snapshot}
+revision 1
categories editors
platforms darwin
license VimLicense GPL-2+
@@ -96,34 +97,43 @@
depends_lib-append path:bin/perl:perl5
}
variant python requires python25 description {Compatibility variant, requires +python25} {}
-variant python25 conflicts python26 python27 python31 description {Enable Python scripting} {
+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 python31 description {Enable Python scripting} {
+variant python26 conflicts python25 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 python31 description {Enable Python scripting} {
+variant python27 conflicts python25 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 python25 python26 python27 description {Enable Python scripting} {
- configure.args-append --enable-python3interp --with-python=${prefix}/bin/python3.1
+variant python31 conflicts python32 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 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 ruby description {Enable Ruby scripting} {
configure.args-append --enable-rubyinterp
depends_lib-append port:ruby
Modified: trunk/dports/editors/MacVim/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-python3.diff 2011-08-24 22:25:01 UTC (rev 83055)
+++ trunk/dports/editors/MacVim/files/patch-python3.diff 2011-08-24 22:56:08 UTC (rev 83056)
@@ -5,11 +5,11 @@
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
dnl -- find the python3 executable
- AC_PATH_PROG(vi_cv_path_python3, python3)
-+ AC_MSG_CHECKING(--with-python argument)
-+ AC_ARG_WITH(python, [ --with-python=PATH which python to use (default: python)],
++ AC_MSG_CHECKING(--with-python3 argument)
++ AC_ARG_WITH(python3, [ --with-python3=PATH which python to use (default: python3)],
+ python_name="$withval"; AC_MSG_RESULT($python_name),
-+ python_name="python"; AC_MSG_RESULT(no))
-+ AC_SUBST(vi_cv_path_python, $python_name)
++ python_name="python3"; AC_MSG_RESULT(no))
++ AC_SUBST(vi_cv_path_python3, $python_name)
if test "X$vi_cv_path_python3" != "X"; then
dnl -- get its version number
Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile 2011-08-24 22:25:01 UTC (rev 83055)
+++ trunk/dports/editors/vim/Portfile 2011-08-24 22:56:08 UTC (rev 83056)
@@ -6,7 +6,7 @@
set vim_version 7.3
set vim_patchlevel 237
version ${vim_version}.${vim_patchlevel}
-revision 1
+revision 2
categories editors
platforms darwin freebsd
license VimLicense GPL-2+
@@ -376,7 +376,7 @@
depends_lib-append path:bin/perl:perl5
}
variant python requires python25 description {Compatibility variant, requires +python25} {}
-variant python25 conflicts python26 python27 python31 description {Enable Python scripting} {
+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
@@ -385,7 +385,7 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python26 conflicts python25 python27 python31 description {Enable Python scripting} {
+variant python26 conflicts python25 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
@@ -394,7 +394,7 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python27 conflicts python25 python26 python31 description {Enable Python scripting} {
+variant python27 conflicts python25 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
@@ -403,8 +403,8 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python31 conflicts python25 python26 python27 description {Enable Python scripting} {
- configure.args-append --enable-python3interp --with-python=${prefix}/bin/python3.1
+variant python31 conflicts python32 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
@@ -412,6 +412,15 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
+variant python32 conflicts python31 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 ruby description {Enable Ruby scripting} {
configure.args-append --enable-rubyinterp
depends_lib-append port:ruby
Modified: trunk/dports/editors/vim/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-python3.diff 2011-08-24 22:25:01 UTC (rev 83055)
+++ trunk/dports/editors/vim/files/patch-python3.diff 2011-08-24 22:56:08 UTC (rev 83056)
@@ -5,11 +5,11 @@
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
dnl -- find the python3 executable
- AC_PATH_PROG(vi_cv_path_python3, python3)
-+ AC_MSG_CHECKING(--with-python argument)
-+ AC_ARG_WITH(python, [ --with-python=PATH which python to use (default: python)],
++ AC_MSG_CHECKING(--with-python3 argument)
++ AC_ARG_WITH(python3, [ --with-python3=PATH which python to use (default: python3)],
+ python_name="$withval"; AC_MSG_RESULT($python_name),
-+ python_name="python"; AC_MSG_RESULT(no))
-+ AC_SUBST(vi_cv_path_python, $python_name)
++ python_name="python3"; AC_MSG_RESULT(no))
++ AC_SUBST(vi_cv_path_python3, $python_name)
if test "X$vi_cv_path_python3" != "X"; then
dnl -- get its version number
Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile 2011-08-24 22:25:01 UTC (rev 83055)
+++ trunk/dports/editors/vim-app/Portfile 2011-08-24 22:56:08 UTC (rev 83056)
@@ -7,7 +7,7 @@
set vim_version 7.3
set vim_patchlevel 237
version ${vim_version}.${vim_patchlevel}
-revision 1
+revision 2
categories editors
platforms darwin
license VimLicense GPL-2+
@@ -396,7 +396,7 @@
depends_lib-append path:bin/perl:perl5
}
variant python requires python25 description {Compatibility variant, requires +python25} {}
-variant python25 conflicts python26 python27 python31 description {Enable Python scripting} {
+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
@@ -405,7 +405,7 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python26 conflicts python25 python27 python31 description {Enable Python scripting} {
+variant python26 conflicts python25 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
@@ -414,7 +414,7 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python27 conflicts python25 python26 python31 description {Enable Python scripting} {
+variant python27 conflicts python25 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
@@ -423,8 +423,8 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python31 conflicts python25 python26 python27 description {Enable Python scripting} {
- configure.args-append --enable-python3interp --with-python=${prefix}/bin/python3.1
+variant python31 conflicts python32 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
@@ -432,6 +432,15 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
+variant python32 conflicts python31 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 ruby description {Enable Ruby scripting} {
configure.args-append --enable-rubyinterp
depends_lib-append port:ruby
Modified: trunk/dports/editors/vim-app/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-python3.diff 2011-08-24 22:25:01 UTC (rev 83055)
+++ trunk/dports/editors/vim-app/files/patch-python3.diff 2011-08-24 22:56:08 UTC (rev 83056)
@@ -5,11 +5,11 @@
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
dnl -- find the python3 executable
- AC_PATH_PROG(vi_cv_path_python3, python3)
-+ AC_MSG_CHECKING(--with-python argument)
-+ AC_ARG_WITH(python, [ --with-python=PATH which python to use (default: python)],
++ AC_MSG_CHECKING(--with-python3 argument)
++ AC_ARG_WITH(python3, [ --with-python3=PATH which python to use (default: python3)],
+ python_name="$withval"; AC_MSG_RESULT($python_name),
-+ python_name="python"; AC_MSG_RESULT(no))
-+ AC_SUBST(vi_cv_path_python, $python_name)
++ python_name="python3"; AC_MSG_RESULT(no))
++ AC_SUBST(vi_cv_path_python3, $python_name)
if test "X$vi_cv_path_python3" != "X"; then
dnl -- get its version number
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110824/27f8f1f6/attachment.html>
More information about the macports-changes
mailing list