diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2008-08-25 15:34:09 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2008-08-25 15:34:09 +0000 |
| commit | 8230564e1f11bd79c6ffc3d400962f6f35ee8538 (patch) | |
| tree | 395317ab44a2acb3ef9f87ed50c3d451e93834d8 /editors/vim/files | |
| parent | - Force commit (diff) | |
Update Vim to version 7.2 (and patchlevel 6 at that).
Notes
Notes:
svn path=/head/; revision=219152
Diffstat (limited to 'editors/vim/files')
| -rw-r--r-- | editors/vim/files/patch-configure | 16 | ||||
| -rw-r--r-- | editors/vim/files/patch-src_vim.h | 31 |
2 files changed, 11 insertions, 36 deletions
diff --git a/editors/vim/files/patch-configure b/editors/vim/files/patch-configure index 276eb1ce3dc4..37d7fa678e14 100644 --- a/editors/vim/files/patch-configure +++ b/editors/vim/files/patch-configure @@ -1,8 +1,14 @@ ---- auto/configure.orig Thu May 4 03:46:19 2006 -+++ auto/configure Mon Jun 19 03:01:38 2006 -@@ -4644,3 +4644,4 @@ echo "${ECHO_T}$try/tclConfig.sh" >&6 +--- 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' +-mandir='${datarootdir}/man' ++mandir='${prefix}/man' +@@ -5599,7 +5599,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"` -- 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' -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_vim.h b/editors/vim/files/patch-src_vim.h deleted file mode 100644 index 0004a53d2fa8..000000000000 --- a/editors/vim/files/patch-src_vim.h +++ /dev/null @@ -1,31 +0,0 @@ ---- vim.h.orig 2007-05-12 11:53:29.000000000 +0200 -+++ vim.h 2008-08-04 22:52:27.000000000 +0200 -@@ -355,16 +355,19 @@ - * On Win64 longs are 32 bit and pointers 64 bit. - * For printf() and scanf() we need to take care of long_u specifically. */ - #ifdef _WIN64 --typedef unsigned __int64 long_u; --typedef __int64 long_i; --# define SCANF_HEX_LONG_U "%Ix" --# define PRINTF_HEX_LONG_U "0x%Ix" --#else --typedef unsigned long long_u; --typedef long long_i; --# define SCANF_HEX_LONG_U "%lx" --# define PRINTF_HEX_LONG_U "0x%lx" -+typedef unsigned __int64 long_u; -+typedef __int64 long_i; -+# define SCANF_HEX_LONG_U "%Ix" -+# define SCANF_DECIMAL_LONG_U "%Iu" -+# define PRINTF_HEX_LONG_U "0x%Ix" -+#else -+typedef unsigned long long_u; -+typedef long long_i; -+# define SCANF_HEX_LONG_U "%lx" -+# define SCANF_DECIMAL_LONG_U "%lu" -+# define PRINTF_HEX_LONG_U "0x%lx" - #endif -+#define PRINTF_DECIMAL_LONG_U SCANF_DECIMAL_LONG_U - - /* - * The characters and attributes cached for the screen. |