source: build-files/ports-overlay/editors/vim/files/patch-configure @ 842ff9c

9.2-releasereleng/10.0releng/10.0.1releng/10.0.2
Last change on this file since 842ff9c was 842ff9c, checked in by Kris Moore <kris@…>, 9 months ago

Update editors/vim to 7.4, see if it fixes build on 10

  • Property mode set to 100644
File size: 2.4 KB
Line 
1--- auto/configure.orig 2013-10-17 12:11:54.000000000 +0200
2+++ auto/configure      2013-10-17 12:12:56.000000000 +0200
3@@ -858,7 +858,7 @@
4 psdir='${docdir}'
5 libdir='${exec_prefix}/lib'
6 localedir='${datarootdir}/locale'
7-mandir='${datarootdir}/man'
8+mandir='${prefix}/man'
9 
10 ac_prev=
11 ac_dashdash=
12@@ -4739,7 +4739,7 @@
13 if test "${vi_cv_version_lua_luajit+set}" = set; then :
14   $as_echo_n "(cached) " >&6
15 else
16-   vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'`
17+   vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //' | tr d '.'`
18 fi
19 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua_luajit" >&5
20 $as_echo "$vi_cv_version_lua_luajit" >&6; }
21@@ -4793,7 +4793,7 @@
22 if test "${vi_cv_version_plain_lua+set}" = set; then :
23   $as_echo_n "(cached) " >&6
24 else
25-   vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //'`
26+   vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //' | tr -d '.'`
27 fi
28 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_plain_lua" >&5
29 $as_echo "$vi_cv_version_plain_lua" >&6; }
30@@ -4884,7 +4884,7 @@
31       LIBS=$libs_save
32     fi
33     if test "x$lua_ok" = "xyes"; then
34-      LUA_CFLAGS="-I${vi_cv_path_lua_pfx}/include${LUA_INC}"
35+      LUA_CFLAGS="-I${LUA_INCDIR}"
36       LUA_SRC="if_lua.c"
37       LUA_OBJ="objects/if_lua.o"
38       LUA_PRO="if_lua.pro"
39@@ -4941,7 +4941,8 @@
40       $as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
41 
42       LUA_LIBS=""
43-      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
44+      vi_cv_version_lua=${LUA_VER}
45+      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua-${vi_cv_version_lua}\\\" $LUA_CFLAGS"
46     fi
47     if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
48        test "x$MACOSX" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
49@@ -6610,7 +6611,7 @@
50 $as_echo "$try/tclConfig.sh" >&6; }
51            . $try/tclConfig.sh
52                    TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
53-                           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'`
54+                           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'`
55            break
56          fi
57        done
Note: See TracBrowser for help on using the repository browser.