- Update to 7.4.316

- Fix patch: merge patch-configure into patch-src-auto-configure

Changes:	https://code.google.com/p/vim/source/list

4 files changed, 78 insertions, 62 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 7f673bc1117e..4a23c2f24bd5 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -39,7 +39,7 @@ REINPLACE_ARGS=	-i ''
 USES=		iconv pkgconfig shebangfix tar:bzip2
 WANT_GNOME=	yes
 
-PATCHLEVEL=	307
+PATCHLEVEL=	316
 PATCHFILES!=	/usr/bin/jot -s " " -w "%03d" ${PATCHLEVEL} 1 ${PATCHLEVEL}
 #POSTPONED_PATCHES=	064 087 147	# patch files postponed to be applied in post-patch:
 SKIPPED_PATCHES=	208		# patch files skipped
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index 13b5ab5be4b3..ebfca75975ca 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -612,3 +612,21 @@ SHA256 (vim/7.4.306) = b2e41d17a8e87a020a679c77867ec4d258f432f3fc70661a237dc3eee
 SIZE (vim/7.4.306) = 2660
 SHA256 (vim/7.4.307) = 6d67a4f40cd3d5ea29862bf61c4a0a3d3176ef0783b25e99cfe1c69017fc1bf9
 SIZE (vim/7.4.307) = 4150
+SHA256 (vim/7.4.308) = 29e4ce5bac533ab91273816871f2f7ec8c8efcf4e38637702a2e2b45fd6a9ba9
+SIZE (vim/7.4.308) = 1420
+SHA256 (vim/7.4.309) = f8d68c36df281ef61fb7fcad2aeade0fdc7fecd9b8422a86b178e3ed32dd5967
+SIZE (vim/7.4.309) = 2095
+SHA256 (vim/7.4.310) = 9f224f438cff96498c1432a5d113cacd1c5693bf9cf8f008b63a6e3c3f8118ad
+SIZE (vim/7.4.310) = 11194
+SHA256 (vim/7.4.311) = 7982e4c82c5d7122bdacce47e546666a10b80f8333a15a83d3fd15bf81b155be
+SIZE (vim/7.4.311) = 4740
+SHA256 (vim/7.4.312) = 080714a89324bc27d0aba830a3abfa25ff0f599a5f036ab781e98d25ab68e220
+SIZE (vim/7.4.312) = 6272
+SHA256 (vim/7.4.313) = 72b08c8bbc7b82acb8da42db178c401d602b54952406c4fbacaf0585263c57f0
+SIZE (vim/7.4.313) = 10912
+SHA256 (vim/7.4.314) = 825f9202cceff3e3d4edbdb907a292b6671bf7615133fefd67de5cfbbac0f8df
+SIZE (vim/7.4.314) = 5875
+SHA256 (vim/7.4.315) = 0f3cb4e299a142231659cc962780752ea679301d38a257e3c48fa13f09ea029a
+SIZE (vim/7.4.315) = 8020
+SHA256 (vim/7.4.316) = 3db629b829835ac12d594fe5198fd24692bbaa68b5ca56f2604a09f4c42a1e6a
+SIZE (vim/7.4.316) = 1537
diff --git a/editors/vim/files/patch-configure b/editors/vim/files/patch-configure
deleted file mode 100644
index 1d260f37c11d..000000000000
--- a/editors/vim/files/patch-configure
+++ /dev/null
@@ -1,57 +0,0 @@
---- src/auto/configure.orig	2013-10-17 12:11:54.000000000 +0200
-+++ src/auto/configure	2013-10-17 12:12:56.000000000 +0200
-@@ -858,7 +858,7 @@
- psdir='${docdir}'
- libdir='${exec_prefix}/lib'
- localedir='${datarootdir}/locale'
--mandir='${datarootdir}/man'
-+mandir='${prefix}/man'
- 
- ac_prev=
- ac_dashdash=
-@@ -4739,7 +4739,7 @@
- if test "${vi_cv_version_lua_luajit+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--   vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'`
-+   vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //' | tr d '.'`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua_luajit" >&5
- $as_echo "$vi_cv_version_lua_luajit" >&6; }
-@@ -4793,7 +4793,7 @@
- if test "${vi_cv_version_plain_lua+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--   vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //'`
-+   vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //' | tr -d '.'`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_plain_lua" >&5
- $as_echo "$vi_cv_version_plain_lua" >&6; }
-@@ -4884,7 +4884,7 @@
-       LIBS=$libs_save
-     fi
-     if test "x$lua_ok" = "xyes"; then
--      LUA_CFLAGS="-I${vi_cv_path_lua_pfx}/include${LUA_INC}"
-+      LUA_CFLAGS="-I${LUA_INCDIR}"
-       LUA_SRC="if_lua.c"
-       LUA_OBJ="objects/if_lua.o"
-       LUA_PRO="if_lua.pro"
-@@ -4941,7 +4941,8 @@
-       $as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
- 
-       LUA_LIBS=""
--      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
-+      vi_cv_version_lua=${LUA_VER}
-+      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua-${vi_cv_version_lua}.so\\\" $LUA_CFLAGS"
-     fi
-     if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
-        test "x$MACOSX" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
-@@ -6610,7 +6611,7 @@
- $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'`
-+	    	    	    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
- 	done
diff --git a/editors/vim/files/patch-src-auto-configure b/editors/vim/files/patch-src-auto-configure
index 49cded407f42..b1dc234a4cc6 100644
--- a/editors/vim/files/patch-src-auto-configure
+++ b/editors/vim/files/patch-src-auto-configure
@@ -1,6 +1,52 @@
---- src/auto/configure.orig	2014-02-18 03:23:18.386325000 +0800
-+++ src/auto/configure	2014-02-18 05:46:24.780735971 +0800
-@@ -5511,7 +5511,7 @@
+--- src/auto/configure.orig	2014-05-31 15:02:24.446323494 +0800
++++ src/auto/configure	2014-05-31 15:02:24.593321540 +0800
+@@ -888,7 +888,7 @@
+ psdir='${docdir}'
+ libdir='${exec_prefix}/lib'
+ localedir='${datarootdir}/locale'
+-mandir='${datarootdir}/man'
++mandir='${prefix}/man'
+ 
+ ac_prev=
+ ac_dashdash=
+@@ -4951,7 +4951,7 @@
+ if ${vi_cv_version_lua_luajit+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-   vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'`
++   vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //' | tr d '.'`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua_luajit" >&5
+ $as_echo "$vi_cv_version_lua_luajit" >&6; }
+@@ -5005,7 +5005,7 @@
+ if ${vi_cv_version_plain_lua+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-   vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //'`
++   vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //' | tr -d '.'`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_plain_lua" >&5
+ $as_echo "$vi_cv_version_plain_lua" >&6; }
+@@ -5096,7 +5096,7 @@
+       LIBS=$libs_save
+     fi
+     if test "x$lua_ok" = "xyes"; then
+-      LUA_CFLAGS="-I${vi_cv_path_lua_pfx}/include${LUA_INC}"
++      LUA_CFLAGS="-I${LUA_INCDIR}"
+       LUA_SRC="if_lua.c"
+       LUA_OBJ="objects/if_lua.o"
+       LUA_PRO="if_lua.pro"
+@@ -5153,7 +5153,8 @@
+       $as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
+ 
+       LUA_LIBS=""
+-      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
++      vi_cv_version_lua=${LUA_VER}
++      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua-${vi_cv_version_lua}.so\\\" $LUA_CFLAGS"
+     fi
+     if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
+        test "x$MACOSX" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
+@@ -5719,7 +5720,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5
  $as_echo "$enable_pythoninterp" >&6; }
  if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
@@ -9,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
-@@ -5818,7 +5818,7 @@
+@@ -6035,7 +6036,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5
  $as_echo "$enable_python3interp" >&6; }
  if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
@@ -18,3 +64,12 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
+@@ -6850,7 +6851,7 @@
+ $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'`
++	    	    	    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
+ 	done