Updated vim to 6.4.0

This is a bugfix release of Vim. Since Vim 6.3 dozens of reported
problems have been fixed. Also included are new and updated syntax
files, translated menus and messages.

There are no new features. This release is only fixing bugs.

7 files changed, 56 insertions, 246 deletions

diff --git a/editors/vim-lang/PLIST b/editors/vim-lang/PLIST
index 583a99f299e..d59435e1e82 100644
--- a/editors/vim-lang/PLIST
+++ b/editors/vim-lang/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/07/07 08:07:39 martti Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/10/17 06:49:34 martti Exp $
 share/vim/${VIM_SUBDIR}/keymap/README.txt
 share/vim/${VIM_SUBDIR}/keymap/accents.vim
 share/vim/${VIM_SUBDIR}/keymap/arabic.vim
 share/vim/${VIM_SUBDIR}/keymap/arabic_utf-8.vim
+share/vim/${VIM_SUBDIR}/keymap/bulgarian.vim
+share/vim/${VIM_SUBDIR}/keymap/canfr-win.vim
 share/vim/${VIM_SUBDIR}/keymap/czech.vim
 share/vim/${VIM_SUBDIR}/keymap/czech_utf-8.vim
 share/vim/${VIM_SUBDIR}/keymap/esperanto.vim
@@ -47,6 +49,7 @@ share/vim/${VIM_SUBDIR}/lang/de/LC_MESSAGES/vim.mo
 share/vim/${VIM_SUBDIR}/lang/en_GB/LC_MESSAGES/vim.mo
 share/vim/${VIM_SUBDIR}/lang/es/LC_MESSAGES/vim.mo
 share/vim/${VIM_SUBDIR}/lang/fr/LC_MESSAGES/vim.mo
+share/vim/${VIM_SUBDIR}/lang/ga/LC_MESSAGES/vim.mo
 share/vim/${VIM_SUBDIR}/lang/it/LC_MESSAGES/vim.mo
 share/vim/${VIM_SUBDIR}/lang/ja/LC_MESSAGES/vim.mo
 share/vim/${VIM_SUBDIR}/lang/ko/LC_MESSAGES/vim.mo
@@ -88,7 +91,10 @@ share/vim/${VIM_SUBDIR}/lang/menu_fr_fr.latin1.vim
 share/vim/${VIM_SUBDIR}/lang/menu_fr_fr.utf-8.vim
 share/vim/${VIM_SUBDIR}/lang/menu_french_france.1252.vim
 share/vim/${VIM_SUBDIR}/lang/menu_german_germany.1252.vim
+share/vim/${VIM_SUBDIR}/lang/menu_hu.iso_8859-2.vim
+share/vim/${VIM_SUBDIR}/lang/menu_hu.utf-8.vim
 share/vim/${VIM_SUBDIR}/lang/menu_hu_hu.iso_8859-2.vim
+share/vim/${VIM_SUBDIR}/lang/menu_hu_hu.utf-8.vim
 share/vim/${VIM_SUBDIR}/lang/menu_it.latin1.vim
 share/vim/${VIM_SUBDIR}/lang/menu_it.utf-8.vim
 share/vim/${VIM_SUBDIR}/lang/menu_it_it.latin1.vim
@@ -144,6 +150,7 @@ share/vim/${VIM_SUBDIR}/lang/menu_sv.latin1.vim
 share/vim/${VIM_SUBDIR}/lang/menu_sv.utf-8.vim
 share/vim/${VIM_SUBDIR}/lang/menu_sv_se.latin1.vim
 share/vim/${VIM_SUBDIR}/lang/menu_sv_se.utf-8.vim
+share/vim/${VIM_SUBDIR}/lang/menu_uk_ua.cp1251.vim
 share/vim/${VIM_SUBDIR}/lang/menu_uk_ua.koi8-u.vim
 share/vim/${VIM_SUBDIR}/lang/menu_zh.big5.vim
 share/vim/${VIM_SUBDIR}/lang/menu_zh.cp936.vim
@@ -182,6 +189,8 @@ share/vim/${VIM_SUBDIR}/lang/zh_TW/LC_MESSAGES/vim.mo
 @dirrm share/vim/${VIM_SUBDIR}/lang/es
 @dirrm share/vim/${VIM_SUBDIR}/lang/fr/LC_MESSAGES
 @dirrm share/vim/${VIM_SUBDIR}/lang/fr
+@dirrm share/vim/${VIM_SUBDIR}/lang/ga/LC_MESSAGES
+@dirrm share/vim/${VIM_SUBDIR}/lang/ga
 @dirrm share/vim/${VIM_SUBDIR}/lang/it/LC_MESSAGES
 @dirrm share/vim/${VIM_SUBDIR}/lang/it
 @dirrm share/vim/${VIM_SUBDIR}/lang/ja/LC_MESSAGES
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 6a4887ffd13..72e517d27ff 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.49 2005/07/27 06:29:55 martti Exp $
+# $NetBSD: Makefile.common,v 1.50 2005/10/17 06:49:34 martti Exp $
 
 .include "../../editors/vim-share/version.mk"
 
@@ -14,16 +14,7 @@ DIST_SUBDIR=		vim
 EXTRACT_SUFX=		.tar.bz2
 
 PATCH_SITES=		ftp://ftp.vim.org/pub/editors/vim/patches/${VIM_VERSION}/
-PATCHFILES+=		6.3.001 6.3.002 6.3.003 6.3.004 6.3.005 6.3.006 6.3.007\
-			6.3.008 6.3.009 6.3.010 6.3.011 6.3.012 6.3.013 6.3.014\
-			6.3.015 6.3.016 6.3.017 6.3.018 6.3.019 6.3.020 6.3.021\
-			6.3.023 6.3.024 6.3.026 6.3.027 6.3.028 6.3.029 6.3.030\
-			6.3.031 6.3.032 6.3.033 6.3.034 6.3.036 6.3.037 6.3.039\
-			6.3.040 6.3.042 6.3.043 6.3.045 6.3.046 6.3.049 6.3.050\
-			6.3.051 6.3.054 6.3.055 6.3.056 6.3.057 6.3.058 6.3.059\
-			6.3.060 6.3.061 6.3.062 6.3.063 6.3.064 6.3.065 6.3.066\
-			6.3.067 6.3.068 6.3.069 6.3.070 6.3.071 6.3.072 6.3.074\
-			6.3.075 6.3.076 6.3.079 6.3.081 6.3.082 6.3.083 6.3.085
+PATCHFILES+=
 
 MAINTAINER=		martti@NetBSD.org
 HOMEPAGE=		http://www.vim.org/
diff --git a/editors/vim-share/PLIST b/editors/vim-share/PLIST
index ee3f0f53673..6fe8dd9b4cb 100644
--- a/editors/vim-share/PLIST
+++ b/editors/vim-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/06/21 08:23:48 martti Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/10/17 06:49:34 martti Exp $
 bin/vimtutor
 bin/xxd
 man/man1/evim.1
@@ -31,6 +31,7 @@ share/vim/${VIM_SUBDIR}/compiler/bdf.vim
 share/vim/${VIM_SUBDIR}/compiler/checkstyle.vim
 share/vim/${VIM_SUBDIR}/compiler/cs.vim
 share/vim/${VIM_SUBDIR}/compiler/dot.vim
+share/vim/${VIM_SUBDIR}/compiler/eruby.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_F.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_cv.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_elf90.vim
@@ -52,9 +53,11 @@ share/vim/${VIM_SUBDIR}/compiler/neato.vim
 share/vim/${VIM_SUBDIR}/compiler/onsgmls.vim
 share/vim/${VIM_SUBDIR}/compiler/pbx.vim
 share/vim/${VIM_SUBDIR}/compiler/perl.vim
+share/vim/${VIM_SUBDIR}/compiler/php.vim
 share/vim/${VIM_SUBDIR}/compiler/pyunit.vim
 share/vim/${VIM_SUBDIR}/compiler/rst.vim
 share/vim/${VIM_SUBDIR}/compiler/ruby.vim
+share/vim/${VIM_SUBDIR}/compiler/rubyunit.vim
 share/vim/${VIM_SUBDIR}/compiler/se.vim
 share/vim/${VIM_SUBDIR}/compiler/splint.vim
 share/vim/${VIM_SUBDIR}/compiler/tcl.vim
@@ -206,6 +209,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/css.vim
 share/vim/${VIM_SUBDIR}/ftplugin/debchangelog.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dosbatch.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dtd.vim
+share/vim/${VIM_SUBDIR}/ftplugin/eruby.vim
 share/vim/${VIM_SUBDIR}/ftplugin/fortran.vim
 share/vim/${VIM_SUBDIR}/ftplugin/html.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ishd.vim
@@ -242,6 +246,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/tcsh.vim
 share/vim/${VIM_SUBDIR}/ftplugin/tex.vim
 share/vim/${VIM_SUBDIR}/ftplugin/vb.vim
 share/vim/${VIM_SUBDIR}/ftplugin/verilog.vim
+share/vim/${VIM_SUBDIR}/ftplugin/vhdl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/vim.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xhtml.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xml.vim
@@ -267,6 +272,7 @@ share/vim/${VIM_SUBDIR}/indent/css.vim
 share/vim/${VIM_SUBDIR}/indent/docbk.vim
 share/vim/${VIM_SUBDIR}/indent/dylan.vim
 share/vim/${VIM_SUBDIR}/indent/eiffel.vim
+share/vim/${VIM_SUBDIR}/indent/eruby.vim
 share/vim/${VIM_SUBDIR}/indent/eterm.vim
 share/vim/${VIM_SUBDIR}/indent/fortran.vim
 share/vim/${VIM_SUBDIR}/indent/html.vim
@@ -276,10 +282,12 @@ share/vim/${VIM_SUBDIR}/indent/java.vim
 share/vim/${VIM_SUBDIR}/indent/lua.vim
 share/vim/${VIM_SUBDIR}/indent/make.vim
 share/vim/${VIM_SUBDIR}/indent/matlab.vim
+share/vim/${VIM_SUBDIR}/indent/mma.vim
 share/vim/${VIM_SUBDIR}/indent/mp.vim
 share/vim/${VIM_SUBDIR}/indent/objc.vim
 share/vim/${VIM_SUBDIR}/indent/ocaml.vim
 share/vim/${VIM_SUBDIR}/indent/occam.vim
+share/vim/${VIM_SUBDIR}/indent/pascal.vim
 share/vim/${VIM_SUBDIR}/indent/perl.vim
 share/vim/${VIM_SUBDIR}/indent/php.vim
 share/vim/${VIM_SUBDIR}/indent/postscr.vim
@@ -382,6 +390,7 @@ share/vim/${VIM_SUBDIR}/syntax/acedb.vim
 share/vim/${VIM_SUBDIR}/syntax/ada.vim
 share/vim/${VIM_SUBDIR}/syntax/aflex.vim
 share/vim/${VIM_SUBDIR}/syntax/ahdl.vim
+share/vim/${VIM_SUBDIR}/syntax/alsaconf.vim
 share/vim/${VIM_SUBDIR}/syntax/amiga.vim
 share/vim/${VIM_SUBDIR}/syntax/aml.vim
 share/vim/${VIM_SUBDIR}/syntax/ampl.vim
@@ -479,7 +488,10 @@ share/vim/${VIM_SUBDIR}/syntax/elf.vim
 share/vim/${VIM_SUBDIR}/syntax/elinks.vim
 share/vim/${VIM_SUBDIR}/syntax/elmfilt.vim
 share/vim/${VIM_SUBDIR}/syntax/erlang.vim
+share/vim/${VIM_SUBDIR}/syntax/eruby.vim
+share/vim/${VIM_SUBDIR}/syntax/esmtprc.vim
 share/vim/${VIM_SUBDIR}/syntax/esqlc.vim
+share/vim/${VIM_SUBDIR}/syntax/esterel.vim
 share/vim/${VIM_SUBDIR}/syntax/eterm.vim
 share/vim/${VIM_SUBDIR}/syntax/exim.vim
 share/vim/${VIM_SUBDIR}/syntax/expect.vim
@@ -600,6 +612,7 @@ share/vim/${VIM_SUBDIR}/syntax/nasm.vim
 share/vim/${VIM_SUBDIR}/syntax/nastran.vim
 share/vim/${VIM_SUBDIR}/syntax/natural.vim
 share/vim/${VIM_SUBDIR}/syntax/ncf.vim
+share/vim/${VIM_SUBDIR}/syntax/netrc.vim
 share/vim/${VIM_SUBDIR}/syntax/nosyntax.vim
 share/vim/${VIM_SUBDIR}/syntax/nqc.vim
 share/vim/${VIM_SUBDIR}/syntax/nroff.vim
@@ -636,6 +649,7 @@ share/vim/${VIM_SUBDIR}/syntax/pov.vim
 share/vim/${VIM_SUBDIR}/syntax/povini.vim
 share/vim/${VIM_SUBDIR}/syntax/ppd.vim
 share/vim/${VIM_SUBDIR}/syntax/ppwiz.vim
+share/vim/${VIM_SUBDIR}/syntax/prescribe.vim
 share/vim/${VIM_SUBDIR}/syntax/procmail.vim
 share/vim/${VIM_SUBDIR}/syntax/progress.vim
 share/vim/${VIM_SUBDIR}/syntax/prolog.vim
@@ -715,6 +729,7 @@ share/vim/${VIM_SUBDIR}/syntax/sshdconfig.vim
 share/vim/${VIM_SUBDIR}/syntax/st.vim
 share/vim/${VIM_SUBDIR}/syntax/stp.vim
 share/vim/${VIM_SUBDIR}/syntax/strace.vim
+share/vim/${VIM_SUBDIR}/syntax/sudoers.vim
 share/vim/${VIM_SUBDIR}/syntax/svn.vim
 share/vim/${VIM_SUBDIR}/syntax/syncolor.vim
 share/vim/${VIM_SUBDIR}/syntax/synload.vim
@@ -735,6 +750,7 @@ share/vim/${VIM_SUBDIR}/syntax/tf.vim
 share/vim/${VIM_SUBDIR}/syntax/tidy.vim
 share/vim/${VIM_SUBDIR}/syntax/tilde.vim
 share/vim/${VIM_SUBDIR}/syntax/tli.vim
+share/vim/${VIM_SUBDIR}/syntax/tpp.vim
 share/vim/${VIM_SUBDIR}/syntax/trasys.vim
 share/vim/${VIM_SUBDIR}/syntax/tsalt.vim
 share/vim/${VIM_SUBDIR}/syntax/tsscl.vim
@@ -745,6 +761,7 @@ share/vim/${VIM_SUBDIR}/syntax/uil.vim
 share/vim/${VIM_SUBDIR}/syntax/valgrind.vim
 share/vim/${VIM_SUBDIR}/syntax/vb.vim
 share/vim/${VIM_SUBDIR}/syntax/verilog.vim
+share/vim/${VIM_SUBDIR}/syntax/verilogams.vim
 share/vim/${VIM_SUBDIR}/syntax/vgrindefs.vim
 share/vim/${VIM_SUBDIR}/syntax/vhdl.vim
 share/vim/${VIM_SUBDIR}/syntax/vim.vim
@@ -793,7 +810,6 @@ share/vim/${VIM_SUBDIR}/tools/pltags.pl
 share/vim/${VIM_SUBDIR}/tools/ref
 share/vim/${VIM_SUBDIR}/tools/shtags.1
 share/vim/${VIM_SUBDIR}/tools/shtags.pl
-share/vim/${VIM_SUBDIR}/tools/tcltags
 share/vim/${VIM_SUBDIR}/tools/vim132
 share/vim/${VIM_SUBDIR}/tools/vim_vs_net.cmd
 share/vim/${VIM_SUBDIR}/tools/vimm
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index d174be882c9..5e07accf69b 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,222 +1,12 @@
-$NetBSD: distinfo,v 1.40 2005/07/27 06:29:55 martti Exp $
+$NetBSD: distinfo,v 1.41 2005/10/17 06:49:34 martti Exp $
 
-SHA1 (vim/vim-6.3.tar.bz2) = 76f663277140d314ecfafecb0307e832bdbbaf06
-RMD160 (vim/vim-6.3.tar.bz2) = 321c59d62f6fce99396be33875ec5a7d84944525
-Size (vim/vim-6.3.tar.bz2) = 3699397 bytes
-SHA1 (vim/vim-6.3-lang.tar.gz) = f265365b6075d7887c2000a3b90dac8c0b4222db
-RMD160 (vim/vim-6.3-lang.tar.gz) = e8e332657a4773396f143b341edaf587c1bba0c7
-Size (vim/vim-6.3-lang.tar.gz) = 1057792 bytes
-SHA1 (vim/6.3.001) = 09a75ac41d4c454092b716ff6838768ef8665e5c
-RMD160 (vim/6.3.001) = d3b36602eb6c61771df870bf1f9d0e2330fbd76b
-Size (vim/6.3.001) = 2672 bytes
-SHA1 (vim/6.3.002) = 12f439f886151c85b29ab3db58a2fefc88c32ee4
-RMD160 (vim/6.3.002) = d6f090f94968ba96ebfdaf0d784775729e515aed
-Size (vim/6.3.002) = 3913 bytes
-SHA1 (vim/6.3.003) = a65e590e48497aedb989fed46dcbcb149f4c3798
-RMD160 (vim/6.3.003) = ec78f2240e76e99a06da8d10a890371777dc7e0f
-Size (vim/6.3.003) = 1891 bytes
-SHA1 (vim/6.3.004) = 010b948a80976578332fc16a8296e0f0859078c1
-RMD160 (vim/6.3.004) = 432faf1b7a7b86d27df09cfefb58b3549f25d1a9
-Size (vim/6.3.004) = 2438 bytes
-SHA1 (vim/6.3.005) = 9aaa3c327e3348c5c17ea32bc3689d43ac5fccaf
-RMD160 (vim/6.3.005) = d5ac875a90af5ac6f042ee8725f5564eb85b57bb
-Size (vim/6.3.005) = 2809 bytes
-SHA1 (vim/6.3.006) = 9fe6f70ba7ebfe94509037525cc5588cdf402d1c
-RMD160 (vim/6.3.006) = f6e05a5bea7fa11d48465e9a19dfd4b236d6c4da
-Size (vim/6.3.006) = 1566 bytes
-SHA1 (vim/6.3.007) = 9dac94e8da5aa4ee4170126c0e6b159ec1ec3205
-RMD160 (vim/6.3.007) = 965d522cd7bc37642d63e14bd4648fa1529472f9
-Size (vim/6.3.007) = 1755 bytes
-SHA1 (vim/6.3.008) = a6b6d109acf38dc6f563d164b5eabd0e00f9e58f
-RMD160 (vim/6.3.008) = 542144f9cb9f8718fed2ab1b90e02ceba97a3930
-Size (vim/6.3.008) = 1865 bytes
-SHA1 (vim/6.3.009) = 0f9bc4330cacf5229765c248b83ecc71a1f0e873
-RMD160 (vim/6.3.009) = a0b84b515e0345601de4bc9efe88f96eb499526e
-Size (vim/6.3.009) = 3670 bytes
-SHA1 (vim/6.3.010) = 8668bb2c08e1c89dee85faef2d61c64287edc92e
-RMD160 (vim/6.3.010) = 538f04b78f8de6902c664a0da250b58d9e03961a
-Size (vim/6.3.010) = 2450 bytes
-SHA1 (vim/6.3.011) = 8ba388268773323f242cdc999658e807a0d03940
-RMD160 (vim/6.3.011) = 96d590900d448390b026dfd4a9af93bf006c9987
-Size (vim/6.3.011) = 1896 bytes
-SHA1 (vim/6.3.012) = cd6033a41b70de956a4113dbd6f29c9eed8893cc
-RMD160 (vim/6.3.012) = fe75cf069886c0a30724c89bb4767e741f354804
-Size (vim/6.3.012) = 2882 bytes
-SHA1 (vim/6.3.013) = 8a66ee66cbcf67fb95b91e010e5f2bdf06b7dace
-RMD160 (vim/6.3.013) = 6b574ca3dfeaa3778cc49cb05cb9d19385f4e1ba
-Size (vim/6.3.013) = 11947 bytes
-SHA1 (vim/6.3.014) = 3438ee1ec543852a539f1f16b4d7f8c37d1c32b0
-RMD160 (vim/6.3.014) = 996dd934e2571fadba2e6753e7f8b1ff1cd756de
-Size (vim/6.3.014) = 1566 bytes
-SHA1 (vim/6.3.015) = 7e6cff03e6e428a906471f930ba15fd3af5cce02
-RMD160 (vim/6.3.015) = f5621f488ab21e5baa7d42a9db829743ef048d67
-Size (vim/6.3.015) = 1207 bytes
-SHA1 (vim/6.3.016) = bbb5ce23e394b07e288ae2aab1c48f4b88cc18a9
-RMD160 (vim/6.3.016) = fa7d328042b7abb79b064f1733901f8ffd5a882a
-Size (vim/6.3.016) = 1735 bytes
-SHA1 (vim/6.3.017) = eca6d058184e0beb5dca8333c9550cf800127ea2
-RMD160 (vim/6.3.017) = 4f412f14e340103bf1881f85296c979bda2fea63
-Size (vim/6.3.017) = 1364 bytes
-SHA1 (vim/6.3.018) = 477f288aad3b16df988875b8f7a4c998a7ce0cc9
-RMD160 (vim/6.3.018) = 1fbb6f66c3fa6ef0df76b93e1c14e7f17c56e984
-Size (vim/6.3.018) = 1844 bytes
-SHA1 (vim/6.3.019) = a03681db9f12402bc67d52604912e707c317e12e
-RMD160 (vim/6.3.019) = aec3c5ce405cebce74eda8cd7a9a4ffb159440c3
-Size (vim/6.3.019) = 1992 bytes
-SHA1 (vim/6.3.020) = 76ac9c7a6a9446e555b9fb768f2e6f84f6aff2d8
-RMD160 (vim/6.3.020) = 46d9c77b6790d5f51413625e11ab79a322b3af85
-Size (vim/6.3.020) = 1915 bytes
-SHA1 (vim/6.3.021) = b00ed5c710ef3bfb517e2d909e8b331f2baae9fb
-RMD160 (vim/6.3.021) = cbdd3f8ae7f02e17a0ee33ceb0489f4498af5c8d
-Size (vim/6.3.021) = 2822 bytes
-SHA1 (vim/6.3.023) = 7a85db8fba2ba8cbbe8482b3d811bd58c5aac49f
-RMD160 (vim/6.3.023) = cf0e4b25ca03539827e537918c2e3480ac5440e2
-Size (vim/6.3.023) = 6419 bytes
-SHA1 (vim/6.3.024) = 761ba6711beb4556ff9d2f7d676b549cf98eafaf
-RMD160 (vim/6.3.024) = 68c5519596dc520e327a10bb0f917dab166145fd
-Size (vim/6.3.024) = 2456 bytes
-SHA1 (vim/6.3.026) = 8b3119de38548b81df1fb2d9d717511eecafeb29
-RMD160 (vim/6.3.026) = eabea7050e05dd4c11f1ea5ad46dc85c26816100
-Size (vim/6.3.026) = 3070 bytes
-SHA1 (vim/6.3.027) = 2ce1df5151b1f84731e599bb7fd8313c264ac733
-RMD160 (vim/6.3.027) = f5e2ebf9d2690fc40caf3ef7f958aa236f0607b2
-Size (vim/6.3.027) = 7500 bytes
-SHA1 (vim/6.3.028) = e80fd139422059f69a59dcf77f01b81a5583a15e
-RMD160 (vim/6.3.028) = bc462b9af851c037cb00bb0fb5ffded1c28948a9
-Size (vim/6.3.028) = 2128 bytes
-SHA1 (vim/6.3.029) = 893c33c802f79830278475a313734b225f02d336
-RMD160 (vim/6.3.029) = b1a1a3501479ce1053637f73db2bfff04dab6c91
-Size (vim/6.3.029) = 2173 bytes
-SHA1 (vim/6.3.030) = d01dc7d392cef1a6661bc05e4859a915e592679a
-RMD160 (vim/6.3.030) = a72db86fda6190300ce71ee70fb9346969d988bb
-Size (vim/6.3.030) = 4579 bytes
-SHA1 (vim/6.3.031) = 23f492500186564660907078e8a2e5c5c4fab3c1
-RMD160 (vim/6.3.031) = cccddb2b79ac9fc4faa8b68de45a55340d6bace2
-Size (vim/6.3.031) = 1483 bytes
-SHA1 (vim/6.3.032) = c6079719111ac1804383c620e08a0aa5fce8f3e3
-RMD160 (vim/6.3.032) = 1241a00bd2e860a3a81bfd3307110d005da99ea0
-Size (vim/6.3.032) = 2094 bytes
-SHA1 (vim/6.3.033) = cfa3f49b01bf12e48f7281d4f27dacacd1f7bb04
-RMD160 (vim/6.3.033) = 27d02502c9f713f99d605a1be5f29e2f639e64f1
-Size (vim/6.3.033) = 1552 bytes
-SHA1 (vim/6.3.034) = 05482ed58f6a6b5ee062de585152f1ea00825ed6
-RMD160 (vim/6.3.034) = 441160831bc7e6e1af6a366f634cf49b810b0cbe
-Size (vim/6.3.034) = 1618 bytes
-SHA1 (vim/6.3.036) = 443822a03fc7313e97459a2142a4078103f03b91
-RMD160 (vim/6.3.036) = 80db342e60e2e8eec2a4dafbe1d3fcfa228943b5
-Size (vim/6.3.036) = 1770 bytes
-SHA1 (vim/6.3.037) = b8dba3125202799bf56d5c6e71382e2c4987ee33
-RMD160 (vim/6.3.037) = 2950841803e5c8c63234410f711abe93bf463ab0
-Size (vim/6.3.037) = 2889 bytes
-SHA1 (vim/6.3.039) = 21b8d58ad5e2f6d5ad16e7cd421c6614997c0762
-RMD160 (vim/6.3.039) = 6a7c24b31c099ac2abe64b26366b797cfa3e061e
-Size (vim/6.3.039) = 2749 bytes
-SHA1 (vim/6.3.040) = bafa7413ad7af8d8a9cdbfd06a12faf5278ad4e4
-RMD160 (vim/6.3.040) = 6463403fb98e75a0ede13328e5a616b7eb70c8fb
-Size (vim/6.3.040) = 18020 bytes
-SHA1 (vim/6.3.042) = 54f7e15ce39b7fcc5408fd11cb406e567fc03be7
-RMD160 (vim/6.3.042) = c57cce122f5b6ebef2f84da8a5baee206b78d56b
-Size (vim/6.3.042) = 1760 bytes
-SHA1 (vim/6.3.043) = 0f158d92782f1b11e6be3b8664c8dd2cff7a0efd
-RMD160 (vim/6.3.043) = 8f67b5432850d13792e1dd62e29b9b741d0013be
-Size (vim/6.3.043) = 8053 bytes
-SHA1 (vim/6.3.045) = 6354d0a0353055052d4e53c53b2c79e8964cd37a
-RMD160 (vim/6.3.045) = 918a4c5a02f1be65bc49314fb9f32ca7bdb8517a
-Size (vim/6.3.045) = 12283 bytes
-SHA1 (vim/6.3.046) = 4c89515d66645d51a8179205b6f6a385197abe97
-RMD160 (vim/6.3.046) = dea5e8a0642b1ca05f42a5a56ba40a8d37ce5028
-Size (vim/6.3.046) = 2231 bytes
-SHA1 (vim/6.3.049) = 30abe56ee682553000382d4b3aa11f0dc9b0967a
-RMD160 (vim/6.3.049) = 0e4c4ccb4a55bade03298e5709238b29ad53ca70
-Size (vim/6.3.049) = 1776 bytes
-SHA1 (vim/6.3.050) = 38b09d8637169d353db30cfc7bcd61456fdb10f2
-RMD160 (vim/6.3.050) = 28b35c702eda86482b5cef869666dc3a03ca8999
-Size (vim/6.3.050) = 2225 bytes
-SHA1 (vim/6.3.051) = 598987c3d141570e8fd8ab93862168fe9b92a020
-RMD160 (vim/6.3.051) = 981a665e04c08f8bc359e0fcc41462ec6bdecd1a
-Size (vim/6.3.051) = 1661 bytes
-SHA1 (vim/6.3.054) = c64492b0e36221b6a2c06d795501ec33629efa6d
-RMD160 (vim/6.3.054) = 4a89cd7960798ea55712b479169a67e4e3f34af3
-Size (vim/6.3.054) = 1981 bytes
-SHA1 (vim/6.3.055) = f2005d1ff38bb062f34d7f6a44eea7559e9f08e6
-RMD160 (vim/6.3.055) = 08eb783a6edf87e39ef3b546fdd20a12e46f0248
-Size (vim/6.3.055) = 8844 bytes
-SHA1 (vim/6.3.056) = 138f12ad324a0f8b96a17306e1b883962a050eea
-RMD160 (vim/6.3.056) = 1383f20f7eb2612070feef49a835ecc22d2f6cbe
-Size (vim/6.3.056) = 2091 bytes
-SHA1 (vim/6.3.057) = 4ecbb4bbc1fe7dcf3aca60d1bff40064a1f95ad7
-RMD160 (vim/6.3.057) = 3755dc7e2008c0ee999286ea46bf4d4b5ee19332
-Size (vim/6.3.057) = 1748 bytes
-SHA1 (vim/6.3.058) = 0ea7dc762c984e714d5d6534f5deffa9a79a91f3
-RMD160 (vim/6.3.058) = 4c73b4686f9fbb1854b3d1cf48ca18aa20555eb9
-Size (vim/6.3.058) = 4440 bytes
-SHA1 (vim/6.3.059) = 93247ac7bae66c75952f9609bec8e1ae61420ad6
-RMD160 (vim/6.3.059) = c2273b8a1abd5b3e83b0decddb9787dcea8d54d3
-Size (vim/6.3.059) = 2286 bytes
-SHA1 (vim/6.3.060) = 4907b03ac2cfa8f9e4b0f397230371fcb4d69363
-RMD160 (vim/6.3.060) = 024dda054dacea1dd5bd2a9198c32e4d87eae82c
-Size (vim/6.3.060) = 1609 bytes
-SHA1 (vim/6.3.061) = ade434a1b588647e16a9f4659ba47e10217030a3
-RMD160 (vim/6.3.061) = fc2bb92c10694acb84f88c2775c1753489d946cc
-Size (vim/6.3.061) = 1984 bytes
-SHA1 (vim/6.3.062) = 96051975dda2253e470c33c80168f7454677ad85
-RMD160 (vim/6.3.062) = 3eb4cfad31348939744d5a8590a609b0bdece990
-Size (vim/6.3.062) = 2337 bytes
-SHA1 (vim/6.3.063) = 3b54715101d1d4d24ee3551f8bec3867b9f32984
-RMD160 (vim/6.3.063) = d1955fb7f41a009814985fa5f150394ed353a434
-Size (vim/6.3.063) = 1434 bytes
-SHA1 (vim/6.3.064) = 8eb9d438c5759d9aaf4b8c1e91da78377b1f6b41
-RMD160 (vim/6.3.064) = 1f55dce76c78c5bef0dc594d34a5e488803510d8
-Size (vim/6.3.064) = 1586 bytes
-SHA1 (vim/6.3.065) = de8b00dbb217ef766aa5686d8cc45553fbcdbe34
-RMD160 (vim/6.3.065) = c439009d0253c03f8ff362a9ab893daec18b563f
-Size (vim/6.3.065) = 4436 bytes
-SHA1 (vim/6.3.066) = 3e25407fa61c042941a7e91a817c62541d8df89b
-RMD160 (vim/6.3.066) = 9f891571679c99d8317afe28f5f6b027d0bba8fd
-Size (vim/6.3.066) = 4728 bytes
-SHA1 (vim/6.3.067) = a506f7abbef7f4e57e3dfceb4718be6610ab0325
-RMD160 (vim/6.3.067) = 0d7f674f0b4ca1fa638ae2fc5569722cf4c836a7
-Size (vim/6.3.067) = 2200 bytes
-SHA1 (vim/6.3.068) = e10cab9f1591c3a5f0b3648897f0b77c976d6e01
-RMD160 (vim/6.3.068) = 241eef237974069c5fd19a0c56d75c29a7ff5cba
-Size (vim/6.3.068) = 2247 bytes
-SHA1 (vim/6.3.069) = a47cde42aee641bba18f73997859ca0f6bbe3a3f
-RMD160 (vim/6.3.069) = f0875e21fab73cdc8d7cd73b09be2ea042ea03ff
-Size (vim/6.3.069) = 1710 bytes
-SHA1 (vim/6.3.070) = 29b8e92a7add533400a92aedc6293cb4ae47b257
-RMD160 (vim/6.3.070) = 68ec1d7d58f627bc0b8797b1e0fab01b8656d44a
-Size (vim/6.3.070) = 1928 bytes
-SHA1 (vim/6.3.071) = b7939f9b10ced7def3f1bf3d6389d53c740b2149
-RMD160 (vim/6.3.071) = 77eebeb49892a2595ebd87e532a524bf0ce1f112
-Size (vim/6.3.071) = 1722 bytes
-SHA1 (vim/6.3.072) = 5f196cd6f730fb233cb8644d73fbb20405de9027
-RMD160 (vim/6.3.072) = 82bbe943432599d93092052f6601672cbbd9a409
-Size (vim/6.3.072) = 2083 bytes
-SHA1 (vim/6.3.074) = 42d51d2e7f7db314e25e656f2154c348ee38b284
-RMD160 (vim/6.3.074) = 8f12301e801f94346c3e73b00546ae35f3e8b526
-Size (vim/6.3.074) = 2365 bytes
-SHA1 (vim/6.3.075) = c56e07b4949872c444aa40a52ebe257737758c00
-RMD160 (vim/6.3.075) = e46917ae6f15563f1ef5040501f067bfeaa6791f
-Size (vim/6.3.075) = 1745 bytes
-SHA1 (vim/6.3.076) = 1df1a0423da5fb4c90edac4848eee47b9a527548
-RMD160 (vim/6.3.076) = c6521d68e9f31af6553f92c9374fc3bba6cf8298
-Size (vim/6.3.076) = 3546 bytes
-SHA1 (vim/6.3.079) = 359e571776c085bcf1ea04417bee9f62aaafeab0
-RMD160 (vim/6.3.079) = ecce1c0acc43f02dc2c4dfb251bc8ccd0f7b3c3c
-Size (vim/6.3.079) = 1853 bytes
-SHA1 (vim/6.3.081) = 1e2b184af09ee23ffa4b1d959ed625e2ccf2e6d4
-RMD160 (vim/6.3.081) = 8f9b67208026185ff698638c9f06ff8f3eaf76d6
-Size (vim/6.3.081) = 1729 bytes
-SHA1 (vim/6.3.082) = af5f267bd2f7db970c672deea62a81c92528b3fc
-RMD160 (vim/6.3.082) = bc52881512112bcaee5c5ef80415df18ff5b08e7
-Size (vim/6.3.082) = 2102 bytes
-SHA1 (vim/6.3.083) = 8f3b78a6df68aeaef174f5fcdd99373167b76a56
-RMD160 (vim/6.3.083) = 6cd3477d2598784096d7cca2472b385fe764479d
-Size (vim/6.3.083) = 5053 bytes
-SHA1 (vim/6.3.085) = f319ec7b1d8ff7553935b8c5f1a2758e4d49cf1c
-RMD160 (vim/6.3.085) = 521b5f08b013e8b91f8324f1980ace1dc7d4af57
-Size (vim/6.3.085) = 3408 bytes
-SHA1 (patch-aa) = 226983cd130c91de83f46baa38d18b243bd029c8
+SHA1 (vim/vim-6.4.tar.bz2) = 4ecc16d704b303db25c52c6bc33ab65e661ace93
+RMD160 (vim/vim-6.4.tar.bz2) = 739d4bb92306864b1a454358988d03c294ed88cf
+Size (vim/vim-6.4.tar.bz2) = 3737338 bytes
+SHA1 (vim/vim-6.4-lang.tar.gz) = 4b80d0f2a0643ab942a9297b88a5447f654e998e
+RMD160 (vim/vim-6.4-lang.tar.gz) = 1e4b134332d1e866890cb58240449fecb6ae7cac
+Size (vim/vim-6.4-lang.tar.gz) = 1118790 bytes
+SHA1 (patch-aa) = 9643996d5a4bdd23994c9d1b2e85e2f886100eb7
 SHA1 (patch-ab) = cb8930aaeefd1ddbfa204290662078994dd985c0
-SHA1 (patch-ad) = 7a4eb1027a0018bdda51b1d0de9dfce60794cc02
+SHA1 (patch-ad) = 9d46d15cdb6a6a80dfc82dc49efafcdaf83a3f71
 SHA1 (patch-zb) = 3966ea9713cbf5d26072592443080c1884f48e75
diff --git a/editors/vim-share/patches/patch-aa b/editors/vim-share/patches/patch-aa
index afea2010bdd..4018111332b 100644
--- a/editors/vim-share/patches/patch-aa
+++ b/editors/vim-share/patches/patch-aa
@@ -1,9 +1,13 @@
-$NetBSD: patch-aa,v 1.8 2004/06/21 08:23:48 martti Exp $
+$NetBSD: patch-aa,v 1.9 2005/10/17 06:49:34 martti Exp $
 
---- src/auto/configure.orig	2004-06-12 00:47:47.000000000 +0000
-+++ src/auto/configure	2004-06-12 00:49:00.000000000 +0000
-@@ -4546,3 +4546,3 @@
+--- src/auto/configure.orig	2005-10-15 15:55:10.000000000 +0300
++++ src/auto/configure	2005-10-17 04:16:25.000000000 +0300
+@@ -4593,7 +4593,7 @@
+ 
+ 
  if test -z "$SKIP_MOTIF"; then
 -  gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX"
 +  gui_XXX="${BUILDLINK_DIR}/include"
      GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"
+ 
+   echo $ac_n "checking for location of Motif GUI includes""... $ac_c" 1>&6
diff --git a/editors/vim-share/patches/patch-ad b/editors/vim-share/patches/patch-ad
index ac21e1b00fe..291fd523eb4 100644
--- a/editors/vim-share/patches/patch-ad
+++ b/editors/vim-share/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2005/06/23 17:49:40 kristerw Exp $
+$NetBSD: patch-ad,v 1.8 2005/10/17 06:49:34 martti Exp $
 
---- src//Makefile.orig	2004-06-07 12:03:56.000000000 +0200
-+++ src//Makefile	2005-06-23 19:43:26.000000000 +0200
-@@ -1074,26 +1074,31 @@
+--- src/Makefile.orig	2005-10-15 14:52:15.000000000 +0300
++++ src/Makefile	2005-10-17 04:16:59.000000000 +0300
+@@ -1076,26 +1076,31 @@
  ### Athena GUI
  ### Use Xaw3d to make the menus look a little bit nicer
  #XAW_LIB = -lXaw3d
@@ -42,7 +42,7 @@ $NetBSD: patch-ad,v 1.7 2005/06/23 17:49:40 kristerw Exp $
  ATHENA_LIBS2	= -lXt
  ATHENA_INSTALL  = install_normal
  ATHENA_TARGETS	= installglinks
-@@ -1779,7 +1784,7 @@
+@@ -1788,7 +1793,7 @@
  	-chmod $(FILEMOD) $(DEST_TOOLS)/*
  # replace the path in some tools
  	perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk
index 60338cbfa8a..b2cc34a70c9 100644
--- a/editors/vim-share/version.mk
+++ b/editors/vim-share/version.mk
@@ -1,5 +1,5 @@
-# $NetBSD: version.mk,v 1.3 2005/07/27 06:29:55 martti Exp $
+# $NetBSD: version.mk,v 1.4 2005/10/17 06:49:34 martti Exp $
 
-VIM_VERSION=		6.3
-VIM_PATCHLEVEL=		085
-VIM_SUBDIR=		vim63
+VIM_VERSION=		6.4
+VIM_PATCHLEVEL=		0
+VIM_SUBDIR=		vim64