Ignore:
Timestamp:
Sep 22, 2013, 8:15:45 PM (6 years ago)
Author:
raimue@…
Message:

editors/vim, editors/vim-app:
Update to version 7.4.035

Location:
trunk/dports/editors/vim
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/editors/vim

  • trunk/dports/editors/vim/files/patch-python3.diff

    r110123 r111449  
    1 --- src/configure.in.orig       2013-01-08 12:40:52.000000000 +0100
    2 +++ src/configure.in    2013-01-08 12:43:26.000000000 +0100
    3 @@ -1162,7 +1152,11 @@
     1--- src/configure.in.orig       2013-08-04 20:00:50.000000000 +0200
     2+++ src/configure.in    2013-09-22 20:35:45.000000000 +0200
     3@@ -1162,7 +1162,11 @@
    44 AC_MSG_RESULT($enable_python3interp)
    55 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
     
    1414 
    1515     dnl -- get its version number
    16 @@ -1257,8 +1251,7 @@
    17            dnl -- delete the lines from make about Entering/Leaving directory
    18            eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
    19            rm -f -- "${tmp_mkf}"
    20 -          vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}"
    21 -          vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
    22 +          vi_cv_path_python3_plibs="`${vi_cv_path_python3}-config --ldflags`"
    23            dnl remove -ltermcap, it can conflict with an earlier -lncurses
    24            vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
    25            vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
    26 @@ -1268,11 +1261,7 @@
    27         python3_INSTSONAME="$python3_DLLLIBRARY"
    28        fi
    29        PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
    30 -      if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
    31 -        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
    32 -      else
    33 -        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
    34 -      fi
    35 +      PYTHON3_CFLAGS="`${vi_cv_path_python3}-config --includes` -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
    36        PYTHON3_SRC="if_python3.c"
    37        PYTHON3_OBJ="objects/if_python3.o"
    38  
     16@@ -1257,8 +1261,7 @@
     17             dnl -- delete the lines from make about Entering/Leaving directory
     18             eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
     19             rm -f -- "${tmp_mkf}"
     20-           vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
     21-            vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
     22+            vi_cv_path_python3_plibs="`${vi_cv_path_python3}-config --ldflags`"
     23             dnl remove -ltermcap, it can conflict with an earlier -lncurses
     24             vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
     25             vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
     26@@ -1268,11 +1271,7 @@
     27          python3_INSTSONAME="$python3_DLLLIBRARY"
     28         fi
     29         PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
     30-        if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
     31-          PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
     32-        else
     33-          PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
     34-        fi
     35+        PYTHON3_CFLAGS="`${vi_cv_path_python3}-config --includes` -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
     36         PYTHON3_SRC="if_python3.c"
     37         PYTHON3_OBJ="objects/if_python3.o"
     38  
Note: See TracChangeset for help on using the changeset viewer.