Ticket #37305: Snapshot-66.patch

File Snapshot-66.patch, 7.7 KB (added by robsonpeixoto@…, 11 years ago)

  • Portfile

     
    44
    55name                MacVim
    66set vim_version     7.3
    7 set snapshot        65
     7set snapshot        66
    88set gitcommit       snapshot-${snapshot}
    99version             ${vim_version}.snapshot${snapshot}
    1010revision            1
    … …  
    1919homepage            http://code.google.com/p/macvim
    2020
    2121master_sites        http://github.com/b4winckler/macvim/zipball/${gitcommit}
    22 checksums           rmd160  fa99000846f2eee8fea41093eb74f539ee774607 \
    23                     sha256  b926c1c034dcb4e40e2bc70d85e6325f6b4e0ec59ad7a1313e74cb8de2dc59f0
     22checksums           rmd160  a5c33364634a349099092cae4b60a115ad94f438 \
     23                    sha256  910608b81fbea75495c03472ef2214ed4dd1354279dd7afd9c369a99797332b5
    2424use_zip             yes
    2525worksrcdir          ${name}
    2626

  • files/patch-MacVim-GCC-VERSION.diff

     
    1 --- src/MacVim/MacVim.xcodeproj/project.pbxproj.orig    2011-10-16 16:14:43.000000000 +0200
    2 +++ src/MacVim/MacVim.xcodeproj/project.pbxproj 2011-10-16 16:14:56.000000000 +0200
    3 @@ -679,7 +679,7 @@
     1--- src/MacVim/MacVim.xcodeproj/project.pbxproj
     2+++ src/MacVim/MacVim.xcodeproj/project.pbxproj
     3@@ -673,7 +673,7 @@
    44                        isa = XCBuildConfiguration;
    55                        buildSettings = {
    66                                ARCHS = "$(NATIVE_ARCH_ACTUAL)";
    … …  
    99                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
    1010                                GCC_WARN_UNUSED_VARIABLE = YES;
    1111                                ONLY_ACTIVE_ARCH = YES;
    12 @@ -692,7 +692,7 @@
     12@@ -686,7 +686,7 @@
    1313                        isa = XCBuildConfiguration;
    1414                        buildSettings = {
    1515                                ARCHS = "$(NATIVE_ARCH_ACTUAL)";

  • files/patch-python.diff

     
    1 --- src/configure.in.orig       2010-08-04 20:32:32.000000000 +0200
    2 +++ src/configure.in    2010-08-04 20:34:27.000000000 +0200
    3 @@ -762,7 +762,11 @@
     1--- src/configure.in
     2+++ src/configure.in
     3@@ -862,7 +862,11 @@ AC_ARG_ENABLE(pythoninterp,
    44 AC_MSG_RESULT($enable_pythoninterp)
    5  if test "$enable_pythoninterp" = "yes"; then
     5 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
    66   dnl -- find the python executable
    77-  AC_PATH_PROG(vi_cv_path_python, python)
    88+  AC_MSG_CHECKING(--with-python argument)
    … …  
    1313   if test "X$vi_cv_path_python" != "X"; then
    1414 
    1515     dnl -- get its version number
    16 @@ -840,19 +844,14 @@
     16@@ -941,19 +945,15 @@ eof
    1717            dnl -- delete the lines from make about Entering/Leaving directory
    1818            eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
    1919            rm -f -- "${tmp_mkf}"
    … …  
    3030-             dnl remove -ltermcap, it can conflict with an earlier -lncurses
    3131-             vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
    3232-           fi
    33 +            if test "${vi_cv_var_python_version}" = "1.4"; then
    34 +                vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
    35 +            else
    36 +                vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
    37 +            fi
    38 +            vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
    39 +            dnl remove -ltermcap, it can conflict with an earlier -lncurses
    40 +            vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
     33+      if test "${vi_cv_var_python_version}" = "1.4"; then
     34+          vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
     35+      else
     36+          vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
     37+      fi
     38+      vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
     39+      dnl remove -ltermcap, it can conflict with an earlier -lncurses
     40+      vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
     41+
    4142        ])
    4243 
    43         PYTHON_LIBS="${vi_cv_path_python_plibs}"
    44 --- src/if_python.c.orig        2012-09-12 12:42:42.000000000 +0200
    45 +++ src/if_python.c     2012-09-12 12:45:22.000000000 +0200
    46 @@ -46,12 +46,7 @@
     44        if test "X$python_DLLLIBRARY" != "X"; then
     45diff --git a/src/if_python.c b/src/if_python.c
     46index 5c89593..504558e 100644
     47--- src/if_python.c
     48+++ src/if_python.c
     49@@ -44,11 +44,7 @@
     50 # undef _XOPEN_SOURCE  /* pyconfig.h defines it as well. */
     51 #endif
    4752 
    48  #define PY_SSIZE_T_CLEAN
    49  
    5053-#ifdef FEAT_GUI_MACVIM
    5154-# include <Python/Python.h>
    5255-#else
    5356-# include <Python.h>
    5457-#endif
    55 -
    5658+#include <Python.h>
     59 
    5760 #if defined(MACOS) && !defined(MACOS_X_UNIX)
    5861 # include "macglue.h"
    59  # include <CodeFragments.h>

  • files/patch-python3.diff

     
    1 --- src/configure.in.old        2008-12-07 02:58:32.000000000 +0100
    2 +++ src/configure.in    2008-12-07 02:58:58.000000000 +0100
    3 @@ -949,7 +949,11 @@
     1--- src/configure.in
     2+++ src/configure.in
     3@@ -1062,7 +1062,11 @@ AC_ARG_ENABLE(python3interp,
    44 AC_MSG_RESULT($enable_python3interp)
    55 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
    66   dnl -- find the python3 executable

  • files/patch-src-MacVim-icons-python.diff

     
    1 --- src/MacVim/icons/Makefile.orig      2011-07-10 08:06:34.000000000 +0200
    2 +++ src/MacVim/icons/Makefile   2011-07-12 18:47:07.000000000 +0200
     1--- src/MacVim/icons/Makefile
     2+++ src/MacVim/icons/Makefile
    33@@ -1,5 +1,6 @@
    44 .PHONY: clean getenvy
    55 
    … …  
    77 OUTDIR ?= .
    88 
    99 # This script is called during the build phase with OUTDIR set to the Resources
    10 @@ -21,10 +22,10 @@
     10@@ -21,10 +22,10 @@ $(OUTDIR)/MacVim-generic.icns:
    1111 all: make_icons.py vim-noshadow-512.png loadfont.so
    1212        rm -f MacVim-*.icns
    1313        $(MAKE) -C makeicns

  • files/patch-tcl.diff

     
    1 --- src/configure.in.orig       2010-04-18 00:11:11.000000000 +0200
    2 +++ src/configure.in    2010-04-18 00:17:10.000000000 +0200
    3 @@ -1213,12 +1213,7 @@
     1--- src/configure.in
     2+++ src/configure.in
     3@@ -1390,12 +1390,7 @@ if test "$enable_tclinterp" = "yes"; then
    44       tclloc=`echo 'set l [[info library]];set i [[string last lib $l]];incr i -2;puts [[string range $l 0 $i]]' | $vi_cv_path_tcl -`
    55 
    66       AC_MSG_CHECKING(for location of Tcl include)
    … …  
    1414       TCL_INC=
    1515       for try in $tclinc; do
    1616        if test -f "$try/tcl.h"; then
    17 @@ -1233,13 +1233,8 @@
     17@@ -1410,13 +1405,8 @@ if test "$enable_tclinterp" = "yes"; then
    1818       fi
    1919       if test -z "$SKIP_TCL"; then
    2020        AC_MSG_CHECKING(for location of tclConfig.sh script)
    … …  
    2525-         dnl For Mac OS X 10.3, use the OS-provided framework location
    2626-         tclcnf="/System/Library/Frameworks/Tcl.framework"
    2727-       fi
    28 +       tclcnf=`echo $tclinc | sed s/include/lib/g`
    29 +       tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
     28+  tclcnf=`echo $tclinc | sed s/include/lib/g`
     29+  tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
    3030        for try in $tclcnf; do
    3131          if test -f $try/tclConfig.sh; then
    3232            AC_MSG_RESULT($try/tclConfig.sh)