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

editors/MacVim:
Update to version 7.4.snapshot71

Location:
trunk/dports/editors/MacVim
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/editors/MacVim/Portfile

    r110389 r111451  
    55
    66name                MacVim
    7 set vim_version     7.3
    8 set snapshot        66
     7set vim_version     7.4
     8set snapshot        71
    99set gitcommit       snapshot-${snapshot}
    1010version             ${vim_version}.snapshot${snapshot}
    11 revision            4
    1211categories          editors
    1312platforms           darwin
     
    2120
    2221master_sites        http://github.com/b4winckler/macvim/zipball/${gitcommit}
    23 checksums           rmd160  7837828c4ca5ee4bbbd36be724fc3029de989885 \
    24                     sha256  f8e317393a2cb78e459f8a430d392bcba85b89e19afc5e9692b1b239aee8b8fe
     22checksums           rmd160  37b601eb9489d90ab92886a53624bd13417f6b16 \
     23                    sha256  b3d0ff9990d7beac3763107c31f505302c5c7a5abacb15a92eb4485e7efa45e6
    2524use_zip             yes
    2625worksrcdir          ${name}
    27 
    28 # 7.3.snapshot66 had a stealth update
    29 dist_subdir         ${name}/${version}_1
    30 
    3126
    3227depends_build       bin:gnutar:gnutar \
     
    4439
    4540patchfiles          patch-src-MacVim-icons-python.diff \
    46                     patch-reverse-7.3.245.diff \
    4741                    patch-MacVim-GCC-VERSION.diff
    4842
  • trunk/dports/editors/MacVim/files/patch-python.diff

    r110123 r111451  
    1 --- src/configure.in.orig       2013-08-04 14:00:50.000000000 -0400
    2 +++ src/configure.in    2013-08-12 22:03:16.000000000 -0400
     1--- src/configure.in.orig       2013-08-04 20:00:50.000000000 +0200
     2+++ src/configure.in    2013-09-22 20:28:50.000000000 +0200
    33@@ -965,7 +965,11 @@
    44 AC_MSG_RESULT($enable_pythoninterp)
    55 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
    66   dnl -- find the python executable
    7 -  AC_PATH_PROG(vi_cv_path_python, python)
     7-  AC_PATH_PROGS(vi_cv_path_python, python2 python)
    88+  AC_MSG_CHECKING(--with-python argument)
    99+  AC_ARG_WITH(python, [  --with-python=PATH       which python to use (default: python)],
     
    4141        PYTHON_LIBS="${vi_cv_path_python_plibs}"
    4242-       if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
    43 -         PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
     43-         PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
    4444-       else
    45 -         PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
     45-         PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
    4646-       fi
    4747+       PYTHON_CFLAGS="`${vi_cv_path_python}-config --includes` -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
     
    4949        PYTHON_OBJ="objects/if_python.o"
    5050        if test "${vi_cv_var_python_version}" = "1.4"; then
    51 --- src/if_python.c.orig        2012-09-12 12:42:42.000000000 +0200
    52 +++ src/if_python.c     2012-09-12 12:45:22.000000000 +0200
    53 @@ -46,12 +46,7 @@
     51--- src/if_python.c.orig        2013-09-06 18:00:40.000000000 +0200
     52+++ src/if_python.c     2013-09-22 22:01:06.000000000 +0200
     53@@ -55,11 +55,7 @@
    5454 
    5555 #define PY_SSIZE_T_CLEAN
     
    6060-# include <Python.h>
    6161-#endif
    62 -
    6362+#include <Python.h>
    64  #if defined(MACOS) && !defined(MACOS_X_UNIX)
    65  # include "macglue.h"
    66  # include <CodeFragments.h>
     63 
     64 #if !defined(PY_VERSION_HEX) || PY_VERSION_HEX < 0x02050000
     65 # undef PY_SSIZE_T_CLEAN
  • trunk/dports/editors/MacVim/files/patch-python3.diff

    r110123 r111451  
    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
    66   dnl -- find the python3 executable
    7 -  AC_PATH_PROG(vi_cv_path_python3, python3)
     7-  AC_PATH_PROGS(vi_cv_path_python3, python3 python)
    88+  AC_MSG_CHECKING(--with-python3 argument)
    99+  AC_ARG_WITH(python3, [  --with-python3=PATH       which python to use (default: python3)],
     
    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.