[109320] users/larryv/dports/editors/vim/files/patch-python.diff

[larryv at macports.org]

Revision: 109320
          https://trac.macports.org/changeset/109320
Author:   larryv at macports.org
Date:     2013-08-12 19:59:44 -0700 (Mon, 12 Aug 2013)
Log Message:
-----------
[users/larryv] vim: Fix Python patch from r109318.

Revision Links:
--------------
    https://trac.macports.org/changeset/109318

Modified Paths:
--------------
    users/larryv/dports/editors/vim/files/patch-python.diff

Modified: users/larryv/dports/editors/vim/files/patch-python.diff
===================================================================
--- users/larryv/dports/editors/vim/files/patch-python.diff	2013-08-13 02:54:05 UTC (rev 109319)
+++ users/larryv/dports/editors/vim/files/patch-python.diff	2013-08-13 02:59:44 UTC (rev 109320)
@@ -1,5 +1,5 @@
 --- src/configure.in.orig	2013-08-04 14:00:50.000000000 -0400
-+++ src/configure.in	2013-08-12 22:03:16.000000000 -0400
++++ src/configure.in	2013-08-12 22:58:33.000000000 -0400
 @@ -965,7 +965,11 @@
  AC_MSG_RESULT($enable_pythoninterp)
  if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
@@ -13,16 +13,14 @@
    if test "X$vi_cv_path_python" != "X"; then
  
      dnl -- get its version number
-@@ -1049,19 +1053,14 @@
+@@ -1049,19 +1053,9 @@
  	    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"
-+	    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
+-	    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
@@ -31,9 +29,8 @@
 -	      vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${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//`
-+	      vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
-+	      vi_cv_path_python_plibs="`${vi_cv_path_python}-config --ldflags`"
- 	    fi
+-	    fi
++	    vi_cv_path_python_plibs="`${vi_cv_path_python}-config --ldflags`"
 +	    dnl remove -ltermcap, it can conflict with an earlier -lncurses
 +	    vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
  	])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130812/dcd587e3/attachment.html>