[70728] trunk/dports/editors
raimue at macports.org
raimue at macports.org
Thu Aug 19 05:29:56 PDT 2010
Revision: 70728
http://trac.macports.org/changeset/70728
Author: raimue at macports.org
Date: 2010-08-19 05:29:56 -0700 (Thu, 19 Aug 2010)
Log Message:
-----------
editors/vim, editors/vim-app:
Add +python31 variant, see #26140
Modified Paths:
--------------
trunk/dports/editors/vim/Portfile
trunk/dports/editors/vim/files/patch-python3.diff
trunk/dports/editors/vim-app/Portfile
Added Paths:
-----------
trunk/dports/editors/vim-app/files/patch-python3.diff
Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile 2010-08-19 12:29:02 UTC (rev 70727)
+++ trunk/dports/editors/vim/Portfile 2010-08-19 12:29:56 UTC (rev 70728)
@@ -133,7 +133,7 @@
depends_lib-append path:bin/perl:perl5
}
variant python requires python25 description {Compatibility variant, requires +python25} {}
-variant python25 conflicts python26 description {Enable Python scripting} {
+variant python25 conflicts python26 python31 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
@@ -142,7 +142,7 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python26 conflicts python25 description {Enable Python scripting} {
+variant python26 conflicts python25 python31 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
@@ -151,6 +151,15 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
+variant python31 conflicts python25 python26 description {Enable Python scripting} {
+ configure.args-append --enable-python3interp --with-python=${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 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 2010-08-19 12:29:02 UTC (rev 70727)
+++ trunk/dports/editors/vim/files/patch-python3.diff 2010-08-19 12:29:56 UTC (rev 70728)
@@ -1,10 +1,10 @@
--- src/configure.in.old 2008-12-07 02:58:32.000000000 +0100
+++ src/configure.in 2008-12-07 02:58:58.000000000 +0100
@@ -949,7 +949,11 @@
-AC_MSG_RESULT($enable_python3interp)
-if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
+ AC_MSG_RESULT($enable_python3interp)
+ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
dnl -- find the python3 executable
-- AC_PATH_PROG(vi_cv_path_python, python)
+- 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)],
+ python_name="$withval"; AC_MSG_RESULT($python_name),
Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile 2010-08-19 12:29:02 UTC (rev 70727)
+++ trunk/dports/editors/vim-app/Portfile 2010-08-19 12:29:56 UTC (rev 70728)
@@ -148,7 +148,7 @@
depends_lib-append path:bin/perl:perl5
}
variant python requires python25 description {Compatibility variant, requires +python25} {}
-variant python25 conflicts python26 description {Enable Python scripting} {
+variant python25 conflicts python26 python31 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
@@ -157,7 +157,7 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
-variant python26 conflicts python25 description {Enable Python scripting} {
+variant python26 conflicts python25 python31 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
@@ -166,6 +166,15 @@
# Overwriting autoconf.cmd above removes dependency, add it again
depends_build-append port:autoconf
}
+variant python31 conflicts python25 python26 description {Enable Python scripting} {
+ configure.args-append --enable-python3interp --with-python=${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 ruby description {Enable Ruby scripting} {
configure.args-append --enable-rubyinterp
depends_lib-append port:ruby
Added: trunk/dports/editors/vim-app/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-python3.diff (rev 0)
+++ trunk/dports/editors/vim-app/files/patch-python3.diff 2010-08-19 12:29:56 UTC (rev 70728)
@@ -0,0 +1,15 @@
+--- src/configure.in.old 2008-12-07 02:58:32.000000000 +0100
++++ src/configure.in 2008-12-07 02:58:58.000000000 +0100
+@@ -949,7 +949,11 @@
+ AC_MSG_RESULT($enable_python3interp)
+ 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)],
++ python_name="$withval"; AC_MSG_RESULT($python_name),
++ python_name="python"; AC_MSG_RESULT(no))
++ AC_SUBST(vi_cv_path_python, $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/20100819/e36d00df/attachment.html>
More information about the macports-changes
mailing list