source: build-files/ports-overlay/editors/vim/files/patch-configure @ 1e102bd

9.2-releasereleng/10.0releng/10.0.1
Last change on this file since 1e102bd was 1e102bd, checked in by Kris Moore <kris@…>, 6 months ago

Add a bunch of modified ports for 10.0, so we can fix the building

  • Property mode set to 100644
File size: 2.0 KB
Line 
1--- auto/configure.orig 2013-07-11 22:23:02.000000000 -0700
2+++ auto/configure      2013-07-11 22:51:08.000000000 -0700
3@@ -855,7 +855,7 @@ pdfdir='${docdir}'
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@@ -4694,7 +4694,7 @@ $as_echo_n "checking Lua version... " >&
13 if test "${vi_cv_version_lua+set}" = set; then :
14   $as_echo_n "(cached) " >&6
15 else
16-   vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //'`
17+   vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //' | tr -d '.'`
18 fi
19 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua" >&5
20 $as_echo "$vi_cv_version_lua" >&6; }
21@@ -4728,6 +4728,7 @@ $as_echo "no" >&6; }
22       LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
23     fi
24     LUA_CFLAGS="-I${vi_cv_path_lua_pfx}/include${LUA_INC}"
25+    LUA_CFLAGS="-I${LUA_INCDIR}"
26     LUA_SRC="if_lua.c"
27     LUA_OBJ="objects/if_lua.o"
28     LUA_PRO="if_lua.pro"
29@@ -4759,7 +4760,8 @@ $as_echo "no" >&6; }
30       $as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
31 
32       LUA_LIBS=""
33-      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
34+      vi_cv_version_lua=${LUA_VER}
35+      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua-${vi_cv_version_lua}.so.$LUA_VER_SH\\\" $LUA_CFLAGS"
36     fi
37   fi
38   if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then
39@@ -6285,7 +6287,7 @@ $as_echo_n "checking for location of tcl
40 $as_echo "$try/tclConfig.sh" >&6; }
41            . $try/tclConfig.sh
42                    TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
43-                           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'`
44+                           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'`
45            break
46          fi
47        done
Note: See TracBrowser for help on using the repository browser.