diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2013-12-02 19:48:37 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2013-12-02 19:48:37 +0000 |
| commit | 1e2e0f57d534cfaa1e7f5ad7fa94ea64d17d05eb (patch) | |
| tree | 85751c3bd9fa334ee73fb4a701c65aba32976b8b /editors/vim/files | |
| parent | Update to 0.10.9. (diff) | |
- Update to 7.4.110
- While I'm here:
- Remove RELEASE and simplify PATCH_SITES, WRKSRC and _DATADIR
- Simplify Makefile
- Remove contiguous blank lines
Changes: https://code.google.com/p/vim/source/list
PR: ports/183076
Submitted by: Rick van der Zwet <info@rickvanderzwet.nl>
Notes
Notes:
svn path=/head/; revision=335537
Diffstat (limited to 'editors/vim/files')
| -rw-r--r-- | editors/vim/files/patch-configure | 54 |
1 files changed, 32 insertions, 22 deletions
diff --git a/editors/vim/files/patch-configure b/editors/vim/files/patch-configure index 6837ad09658f..af86862677af 100644 --- a/editors/vim/files/patch-configure +++ b/editors/vim/files/patch-configure @@ -1,6 +1,6 @@ ---- auto/configure.orig 2013-07-11 22:23:02.000000000 -0700 -+++ auto/configure 2013-07-11 22:51:08.000000000 -0700 -@@ -855,7 +855,7 @@ pdfdir='${docdir}' +--- auto/configure.orig 2013-10-17 12:11:54.000000000 +0200 ++++ auto/configure 2013-10-17 12:12:56.000000000 +0200 +@@ -858,7 +858,7 @@ psdir='${docdir}' libdir='${exec_prefix}/lib' localedir='${datarootdir}/locale' @@ -9,39 +9,49 @@ ac_prev= ac_dashdash= -@@ -4694,7 +4694,7 @@ $as_echo_n "checking Lua version... " >& - if test "${vi_cv_version_lua+set}" = set; then : +@@ -4739,7 +4739,7 @@ + if test "${vi_cv_version_lua_luajit+set}" = set; then : $as_echo_n "(cached) " >&6 else -- vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //'` -+ vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //' | tr -d '.'` +- 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" >&5 - $as_echo "$vi_cv_version_lua" >&6; } -@@ -4728,6 +4728,7 @@ $as_echo "no" >&6; } - LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua" + { $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 - 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" -@@ -4759,7 +4760,8 @@ $as_echo "no" >&6; } + 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_VER_SH\\\" $LUA_CFLAGS" ++ LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua-${vi_cv_version_lua}\\\" $LUA_CFLAGS" fi - fi - if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then -@@ -6285,7 +6287,7 @@ $as_echo_n "checking for location of tcl + 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'` ++ 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 |