From 9c52777efdfa3f3fe3b10bcb5748634c1a35fa83 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Mon, 1 Feb 2016 19:47:35 +0000 Subject: [PATCH] - Update to 7.4.1229 Changes: https://github.com/vim/vim/commits/master --- editors/vim/Makefile | 2 +- editors/vim/distinfo | 4 ++-- editors/vim/files/patch-src-auto-configure | 25 +++++++++++----------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/editors/vim/Makefile b/editors/vim/Makefile index a62750c71894..065fb697110e 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vim -PORTVERSION= 7.4.1030 +PORTVERSION= 7.4.1229 DISTVERSIONPREFIX= v CATEGORIES?= editors diff --git a/editors/vim/distinfo b/editors/vim/distinfo index 3d2c366ee55e..82d09f44d3af 100644 --- a/editors/vim/distinfo +++ b/editors/vim/distinfo @@ -1,2 +1,2 @@ -SHA256 (vim-vim-v7.4.1030_GH0.tar.bz2) = 67c503b31981d2ba09d9ad9cbb7fe7e6c148693c165d4ab87aa282ec4acb281a -SIZE (vim-vim-v7.4.1030_GH0.tar.bz2) = 12689045 +SHA256 (vim-vim-v7.4.1229_GH0.tar.bz2) = 8a782e97916d57c44dcd84d38002884e05f335311600d73500cee47908e1822d +SIZE (vim-vim-v7.4.1229_GH0.tar.bz2) = 12576784 diff --git a/editors/vim/files/patch-src-auto-configure b/editors/vim/files/patch-src-auto-configure index 4762f7343802..7c49538f8ed9 100644 --- a/editors/vim/files/patch-src-auto-configure +++ b/editors/vim/files/patch-src-auto-configure @@ -1,6 +1,6 @@ ---- src/auto/configure.orig 2015-05-14 03:56:21 UTC +--- src/auto/configure.orig 2016-01-31 19:24:32 UTC +++ src/auto/configure -@@ -889,7 +889,7 @@ pdfdir='${docdir}' +@@ -895,7 +895,7 @@ pdfdir='${docdir}' psdir='${docdir}' libdir='${exec_prefix}/lib' localedir='${datarootdir}/locale' @@ -9,7 +9,7 @@ ac_prev= ac_dashdash= -@@ -4952,7 +4952,7 @@ $as_echo_n "checking Lua version of LuaJ +@@ -4963,7 +4963,7 @@ $as_echo_n "checking Lua version of LuaJ if ${vi_cv_version_lua_luajit+:} false; then : $as_echo_n "(cached) " >&6 else @@ -18,7 +18,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua_luajit" >&5 $as_echo "$vi_cv_version_lua_luajit" >&6; } -@@ -5006,7 +5006,7 @@ $as_echo_n "checking Lua version... " >& +@@ -5017,7 +5017,7 @@ $as_echo_n "checking Lua version... " >& if ${vi_cv_version_plain_lua+:} false; then : $as_echo_n "(cached) " >&6 else @@ -27,7 +27,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_plain_lua" >&5 $as_echo "$vi_cv_version_plain_lua" >&6; } -@@ -5097,7 +5097,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -5108,7 +5108,7 @@ rm -f core conftest.err conftest.$ac_obj LIBS=$libs_save fi if test "x$lua_ok" = "xyes"; then @@ -36,7 +36,7 @@ LUA_SRC="if_lua.c" LUA_OBJ="objects/if_lua.o" LUA_PRO="if_lua.pro" -@@ -5154,7 +5154,8 @@ $as_echo "yes" >&6; } +@@ -5165,7 +5165,8 @@ $as_echo "yes" >&6; } $as_echo "#define DYNAMIC_LUA 1" >>confdefs.h LUA_LIBS="" @@ -46,7 +46,7 @@ fi if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \ test "x$MACOSX" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \ -@@ -5732,7 +5733,7 @@ if test "$enable_pythoninterp" = "yes" - +@@ -5806,7 +5807,7 @@ if test "$enable_pythoninterp" = "yes" - as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5 fi @@ -55,7 +55,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -6069,7 +6070,7 @@ if test "$enable_python3interp" = "yes" +@@ -6146,7 +6147,7 @@ if test "$enable_python3interp" = "yes" as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5 fi @@ -64,11 +64,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -6884,7 +6885,7 @@ $as_echo_n "checking for location of tcl - $as_echo "$try/tclConfig.sh" >&6; } - . $try/tclConfig.sh - TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` -- TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` +@@ -6970,6 +6971,7 @@ $as_echo "$try/tclConfig.sh" >&6; } + TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` + fi + TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` + TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` break fi