[49482] trunk/dports/editors
raimue at macports.org
raimue at macports.org
Fri Apr 10 16:36:28 PDT 2009
Revision: 49482
http://trac.macports.org/changeset/49482
Author: raimue at macports.org
Date: 2009-04-10 16:36:27 -0700 (Fri, 10 Apr 2009)
Log Message:
-----------
editors/vim, editors/vim-app:
Add new +python25 and +python26 variants, keeping +python for compatibility by
requiring +python25. Also adds a patch to vim's configure to choose which python to use.
Modified Paths:
--------------
trunk/dports/editors/vim/Portfile
trunk/dports/editors/vim-app/Portfile
Added Paths:
-----------
trunk/dports/editors/vim/files/patch-python.diff
trunk/dports/editors/vim-app/files/patch-python.diff
Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile 2009-04-10 23:11:34 UTC (rev 49481)
+++ trunk/dports/editors/vim/Portfile 2009-04-10 23:36:27 UTC (rev 49482)
@@ -123,10 +123,17 @@
configure.args-append --enable-perlinterp
depends_lib-append path:bin/perl:perl5
}
-variant python description {Enable Python scripting} {
- configure.args-append --enable-pythoninterp
+variant python requires python25 description {Compatibility variant, requires +python25} {}
+variant python25 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} {
+ configure.args-append --enable-pythoninterp --with-python=${prefix}/bin/python2.6
+ patchfiles-append patch-python.diff
+ depends_lib-append port:python26
+}
variant ruby description {Enable Ruby scripting} {
configure.args-append --enable-rubyinterp
depends_lib-append port:ruby
Added: trunk/dports/editors/vim/files/patch-python.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-python.diff (rev 0)
+++ trunk/dports/editors/vim/files/patch-python.diff 2009-04-10 23:36:27 UTC (rev 49482)
@@ -0,0 +1,43 @@
+--- src/configure.in.old 2008-12-07 02:58:32.000000000 +0100
++++ src/configure.in 2008-12-07 02:58:58.000000000 +0100
+@@ -613,7 +613,11 @@
+ AC_MSG_RESULT($enable_pythoninterp)
+ if test "$enable_pythoninterp" = "yes"; then
+ dnl -- find the python executable
+- AC_PATH_PROG(vi_cv_path_python, python)
++ 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_python" != "X"; then
+
+ dnl -- get its version number
+@@ -690,19 +690,14 @@
+ dnl -- delete the lines from make about Entering/Leaving directory
+ eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
+ rm -f -- "${tmp_mkf}"
+- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
+- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
+- vi_cv_path_python_plibs="-framework Python"
+- else
+- if test "${vi_cv_var_python_version}" = "1.4"; then
+- vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
+- else
+- vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
+- fi
+- vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+- dnl remove -ltermcap, it can conflict with an earlier -lncurses
+- vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
+- fi
++ if test "${vi_cv_var_python_version}" = "1.4"; then
++ vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
++ else
++ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
++ fi
++ vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
++ dnl remove -ltermcap, it can conflict with an earlier -lncurses
++ vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
+ ])
+
+ PYTHON_LIBS="${vi_cv_path_python_plibs}"
Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile 2009-04-10 23:11:34 UTC (rev 49481)
+++ trunk/dports/editors/vim-app/Portfile 2009-04-10 23:36:27 UTC (rev 49482)
@@ -136,10 +136,17 @@
configure.args-append --enable-perlinterp
depends_lib-append path:bin/perl:perl5
}
-variant python description {Enable Python scripting} {
- configure.args-append --enable-pythoninterp
+variant python requires python25 description {Compatibility variant, requires +python25} {}
+variant python25 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} {
+ configure.args-append --enable-pythoninterp --with-python=${prefix}/bin/python2.6
+ patchfiles-append patch-python.diff
+ depends_lib-append port:python26
+}
variant ruby description {Enable Ruby scripting} {
configure.args-append --enable-rubyinterp
depends_lib-append port:ruby
Added: trunk/dports/editors/vim-app/files/patch-python.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-python.diff (rev 0)
+++ trunk/dports/editors/vim-app/files/patch-python.diff 2009-04-10 23:36:27 UTC (rev 49482)
@@ -0,0 +1,43 @@
+--- src/configure.in.old 2008-12-07 02:58:32.000000000 +0100
++++ src/configure.in 2008-12-07 02:58:58.000000000 +0100
+@@ -613,7 +613,11 @@
+ AC_MSG_RESULT($enable_pythoninterp)
+ if test "$enable_pythoninterp" = "yes"; then
+ dnl -- find the python executable
+- AC_PATH_PROG(vi_cv_path_python, python)
++ 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_python" != "X"; then
+
+ dnl -- get its version number
+@@ -690,19 +690,14 @@
+ dnl -- delete the lines from make about Entering/Leaving directory
+ eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
+ rm -f -- "${tmp_mkf}"
+- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
+- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
+- vi_cv_path_python_plibs="-framework Python"
+- else
+- if test "${vi_cv_var_python_version}" = "1.4"; then
+- vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
+- else
+- vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
+- fi
+- vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+- dnl remove -ltermcap, it can conflict with an earlier -lncurses
+- vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
+- fi
++ if test "${vi_cv_var_python_version}" = "1.4"; then
++ vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
++ else
++ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
++ fi
++ vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
++ dnl remove -ltermcap, it can conflict with an earlier -lncurses
++ vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
+ ])
+
+ PYTHON_LIBS="${vi_cv_path_python_plibs}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090410/80ab4eeb/attachment.html>
More information about the macports-changes
mailing list