diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2013-07-12 06:22:46 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2013-07-12 06:22:46 +0000 |
| commit | b75913b0f903991381c4bb7b49aa90218c028b56 (patch) | |
| tree | c52886652f420f99dc50252493341ea488d17c1d /editors | |
| parent | - Instead of patching the code just use C89 and stop the problems with inline. (diff) | |
Catch up with how we install Lua.
PR: 180367
Notes
Notes:
svn path=/head/; revision=322816
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/vim/Makefile | 3 | ||||
| -rw-r--r-- | editors/vim/files/patch-configure | 35 |
2 files changed, 31 insertions, 7 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 5b709d7e91ab..48e1044d1bfc 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -188,7 +188,8 @@ pre-configure: @${REINPLACE_CMD} -e ' \ s|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \ s|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \ - s|/usr/local|${LOCALBASE}|g' \ + s|/usr/local|${LOCALBASE}|g; \ + s|set dummy lua;|set dummy lua-${LUA_VER};|g' \ ${WRKSRC}/auto/configure .if ${PORT_OPTIONS:MXTERM_SAVE} @${REINPLACE_CMD} -e ' \ diff --git a/editors/vim/files/patch-configure b/editors/vim/files/patch-configure index 1ac6015c1cb1..6837ad09658f 100644 --- a/editors/vim/files/patch-configure +++ b/editors/vim/files/patch-configure @@ -1,19 +1,42 @@ ---- auto/configure.orig 2008-07-24 05:40:36.000000000 -0700 -+++ auto/configure 2008-08-25 07:37:37.000000000 -0700 -@@ -882 +882 @@ localedir='${datarootdir}/locale' +--- 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}' + psdir='${docdir}' + libdir='${exec_prefix}/lib' + localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' +mandir='${prefix}/man' -@@ -4710,2 +4710,3 @@ $as_echo "no" >&6; } + + ac_prev= + ac_dashdash= +@@ -4694,7 +4694,7 @@ $as_echo_n "checking Lua version... " >& + if test "${vi_cv_version_lua+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 '.'` + 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" + fi LUA_CFLAGS="-I${vi_cv_path_lua_pfx}/include${LUA_INC}" + LUA_CFLAGS="-I${LUA_INCDIR}" LUA_SRC="if_lua.c" -@@ -4725,3 +4726,4 @@ $as_echo "no" >&6; } + LUA_OBJ="objects/if_lua.o" + LUA_PRO="if_lua.pro" +@@ -4759,7 +4760,8 @@ $as_echo "no" >&6; } + $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" fi -@@ -5599,7 +5599,7 @@ $as_echo_n "checking for location of tcl + fi + if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then +@@ -6285,7 +6287,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"` |