Update vim to 7.0.0

Since Vim 6.4 many new features have been added.  To mention a few:

- Spell checking support for about 50 languages
- Intelligent completion for C, HTML, Ruby, Python, PHP, etc.
- Tab pages, each containing multiple windows
- Undo branches: never accidentally lose text again
- Vim script supports Lists and Dictionaries (similar to Python)
- Vim script profiling
- Improved Unicode support
- Highlighting of cursor line, cursor column and matching braces
- Translated manual pages support.
- Internal grep; works on all platforms, searches compressed files
- Browsing remote directories, zip and tar archives
- Printing multi-byte text

Once you have installed Vim 7.0 you can find details about the changes
since Vim 6.4 with ":help version7".

9 files changed, 296 insertions, 80 deletions

diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index a792bb90dbc..af58edd0b6c 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/05/09 06:36:48 martti Exp $
 
 PKGNAME=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		1
+#PKGREVISION=		1
 
 COMMENT=		Data files for the vim editor (vi clone)
 
@@ -9,14 +9,11 @@ COMMENT=		Data files for the vim editor (vi clone)
 
 CONFIGURE_ARGS+=	--disable-gui
 
+BUILD_TARGET=		vim
 INSTALL_TARGET=		installruntime installmacros installtutor installtools
 USE_TOOLS+=		awk
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} TOOLS_AWK=${TOOLS_AWK:Q}
 
 PLIST_SUBST+=		VIM_SUBDIR=${VIM_SUBDIR:Q}
 
-do-build:
-	@cd ${WRKSRC:Q}/xxd && \
-		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 68216e3cfa5..11c859dc108 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.57 2006/03/02 11:32:34 martti Exp $
+# $NetBSD: Makefile.common,v 1.58 2006/05/09 06:36:48 martti Exp $
 
 .include "../../editors/vim-share/version.mk"
 
@@ -13,8 +13,8 @@ SITES_vim-${VIM_VERSION}-lang.tar.gz=	ftp://ftp.vim.org/pub/vim/extra/
 DIST_SUBDIR=		vim
 EXTRACT_SUFX=		.tar.bz2
 
-PATCH_SITES=		ftp://ftp.vim.org/pub/editors/vim/patches/${VIM_VERSION:Q}/
-PATCHFILES+=		6.4.002 6.4.003 6.4.004 6.4.005 6.4.006 6.4.007 6.4.008
+#PATCH_SITES=		ftp://ftp.vim.org/pub/editors/vim/patches/${VIM_VERSION:Q}/
+#PATCHFILES+=		7.0.001
 
 MAINTAINER=		martti@NetBSD.org
 HOMEPAGE=		http://www.vim.org/
diff --git a/editors/vim-share/PLIST b/editors/vim-share/PLIST
index 6fe8dd9b4cb..524001d1d45 100644
--- a/editors/vim-share/PLIST
+++ b/editors/vim-share/PLIST
@@ -1,11 +1,42 @@
-@comment $NetBSD: PLIST,v 1.6 2005/10/17 06:49:34 martti Exp $
-bin/vimtutor
+@comment $NetBSD: PLIST,v 1.7 2006/05/09 06:36:48 martti Exp $
 bin/xxd
 man/man1/evim.1
 man/man1/vim.1
 man/man1/vimdiff.1
 man/man1/vimtutor.1
 man/man1/xxd.1
+share/vim/${VIM_SUBDIR}/autoload/README.txt
+share/vim/${VIM_SUBDIR}/autoload/ccomplete.vim
+share/vim/${VIM_SUBDIR}/autoload/csscomplete.vim
+share/vim/${VIM_SUBDIR}/autoload/gzip.vim
+share/vim/${VIM_SUBDIR}/autoload/htmlcomplete.vim
+share/vim/${VIM_SUBDIR}/autoload/javascriptcomplete.vim
+share/vim/${VIM_SUBDIR}/autoload/netrw.vim
+share/vim/${VIM_SUBDIR}/autoload/netrwFileHandlers.vim
+share/vim/${VIM_SUBDIR}/autoload/netrwSettings.vim
+share/vim/${VIM_SUBDIR}/autoload/paste.vim
+share/vim/${VIM_SUBDIR}/autoload/phpcomplete.vim
+share/vim/${VIM_SUBDIR}/autoload/pythoncomplete.vim
+share/vim/${VIM_SUBDIR}/autoload/rubycomplete.vim
+share/vim/${VIM_SUBDIR}/autoload/spellfile.vim
+share/vim/${VIM_SUBDIR}/autoload/sqlcomplete.vim
+share/vim/${VIM_SUBDIR}/autoload/syntaxcomplete.vim
+share/vim/${VIM_SUBDIR}/autoload/tar.vim
+share/vim/${VIM_SUBDIR}/autoload/vimball.vim
+share/vim/${VIM_SUBDIR}/autoload/xml/html32.vim
+share/vim/${VIM_SUBDIR}/autoload/xml/html401f.vim
+share/vim/${VIM_SUBDIR}/autoload/xml/html401s.vim
+share/vim/${VIM_SUBDIR}/autoload/xml/html401t.vim
+share/vim/${VIM_SUBDIR}/autoload/xml/html40f.vim
+share/vim/${VIM_SUBDIR}/autoload/xml/html40s.vim
+share/vim/${VIM_SUBDIR}/autoload/xml/html40t.vim
+share/vim/${VIM_SUBDIR}/autoload/xml/xhtml10f.vim
+share/vim/${VIM_SUBDIR}/autoload/xml/xhtml10s.vim
+share/vim/${VIM_SUBDIR}/autoload/xml/xhtml10t.vim
+share/vim/${VIM_SUBDIR}/autoload/xml/xhtml11.vim
+share/vim/${VIM_SUBDIR}/autoload/xml/xsl.vim
+share/vim/${VIM_SUBDIR}/autoload/xmlcomplete.vim
+share/vim/${VIM_SUBDIR}/autoload/zip.vim
 share/vim/${VIM_SUBDIR}/bugreport.vim
 share/vim/${VIM_SUBDIR}/colors/README.txt
 share/vim/${VIM_SUBDIR}/colors/blue.vim
@@ -22,6 +53,7 @@ share/vim/${VIM_SUBDIR}/colors/pablo.vim
 share/vim/${VIM_SUBDIR}/colors/peachpuff.vim
 share/vim/${VIM_SUBDIR}/colors/ron.vim
 share/vim/${VIM_SUBDIR}/colors/shine.vim
+share/vim/${VIM_SUBDIR}/colors/slate.vim
 share/vim/${VIM_SUBDIR}/colors/torte.vim
 share/vim/${VIM_SUBDIR}/colors/zellner.vim
 share/vim/${VIM_SUBDIR}/compiler/README.txt
@@ -37,6 +69,8 @@ share/vim/${VIM_SUBDIR}/compiler/fortran_cv.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_elf90.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_g77.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_lf95.vim
+share/vim/${VIM_SUBDIR}/compiler/fpc.vim
+share/vim/${VIM_SUBDIR}/compiler/gcc.vim
 share/vim/${VIM_SUBDIR}/compiler/hp_acc.vim
 share/vim/${VIM_SUBDIR}/compiler/icc.vim
 share/vim/${VIM_SUBDIR}/compiler/intel.vim
@@ -70,6 +104,7 @@ share/vim/${VIM_SUBDIR}/doc/arabic.txt
 share/vim/${VIM_SUBDIR}/doc/autocmd.txt
 share/vim/${VIM_SUBDIR}/doc/change.txt
 share/vim/${VIM_SUBDIR}/doc/cmdline.txt
+share/vim/${VIM_SUBDIR}/doc/debug.txt
 share/vim/${VIM_SUBDIR}/doc/debugger.txt
 share/vim/${VIM_SUBDIR}/doc/develop.txt
 share/vim/${VIM_SUBDIR}/doc/diff.txt
@@ -79,6 +114,7 @@ share/vim/${VIM_SUBDIR}/doc/eval.txt
 share/vim/${VIM_SUBDIR}/doc/farsi.txt
 share/vim/${VIM_SUBDIR}/doc/filetype.txt
 share/vim/${VIM_SUBDIR}/doc/fold.txt
+share/vim/${VIM_SUBDIR}/doc/getscript.txt
 share/vim/${VIM_SUBDIR}/doc/gui.txt
 share/vim/${VIM_SUBDIR}/doc/gui_w16.txt
 share/vim/${VIM_SUBDIR}/doc/gui_w32.txt
@@ -88,6 +124,7 @@ share/vim/${VIM_SUBDIR}/doc/hebrew.txt
 share/vim/${VIM_SUBDIR}/doc/help.txt
 share/vim/${VIM_SUBDIR}/doc/howto.txt
 share/vim/${VIM_SUBDIR}/doc/if_cscop.txt
+share/vim/${VIM_SUBDIR}/doc/if_mzsch.txt
 share/vim/${VIM_SUBDIR}/doc/if_ole.txt
 share/vim/${VIM_SUBDIR}/doc/if_perl.txt
 share/vim/${VIM_SUBDIR}/doc/if_pyth.txt
@@ -119,10 +156,14 @@ share/vim/${VIM_SUBDIR}/doc/os_unix.txt
 share/vim/${VIM_SUBDIR}/doc/os_vms.txt
 share/vim/${VIM_SUBDIR}/doc/os_win32.txt
 share/vim/${VIM_SUBDIR}/doc/pattern.txt
-share/vim/${VIM_SUBDIR}/doc/pi_expl.txt
 share/vim/${VIM_SUBDIR}/doc/pi_gzip.txt
 share/vim/${VIM_SUBDIR}/doc/pi_netrw.txt
+share/vim/${VIM_SUBDIR}/doc/pi_paren.txt
 share/vim/${VIM_SUBDIR}/doc/pi_spec.txt
+share/vim/${VIM_SUBDIR}/doc/pi_tar.txt
+share/vim/${VIM_SUBDIR}/doc/pi_vimball.txt
+share/vim/${VIM_SUBDIR}/doc/pi_zip.txt
+share/vim/${VIM_SUBDIR}/doc/print.txt
 share/vim/${VIM_SUBDIR}/doc/quickfix.txt
 share/vim/${VIM_SUBDIR}/doc/quickref.txt
 share/vim/${VIM_SUBDIR}/doc/quotes.txt
@@ -133,9 +174,12 @@ share/vim/${VIM_SUBDIR}/doc/rileft.txt
 share/vim/${VIM_SUBDIR}/doc/russian.txt
 share/vim/${VIM_SUBDIR}/doc/scroll.txt
 share/vim/${VIM_SUBDIR}/doc/sign.txt
+share/vim/${VIM_SUBDIR}/doc/spell.txt
 share/vim/${VIM_SUBDIR}/doc/sponsor.txt
+share/vim/${VIM_SUBDIR}/doc/sql.txt
 share/vim/${VIM_SUBDIR}/doc/starting.txt
 share/vim/${VIM_SUBDIR}/doc/syntax.txt
+share/vim/${VIM_SUBDIR}/doc/tabpage.txt
 share/vim/${VIM_SUBDIR}/doc/tags
 share/vim/${VIM_SUBDIR}/doc/tagsrch.txt
 share/vim/${VIM_SUBDIR}/doc/term.txt
@@ -167,6 +211,7 @@ share/vim/${VIM_SUBDIR}/doc/usr_28.txt
 share/vim/${VIM_SUBDIR}/doc/usr_29.txt
 share/vim/${VIM_SUBDIR}/doc/usr_30.txt
 share/vim/${VIM_SUBDIR}/doc/usr_31.txt
+share/vim/${VIM_SUBDIR}/doc/usr_32.txt
 share/vim/${VIM_SUBDIR}/doc/usr_40.txt
 share/vim/${VIM_SUBDIR}/doc/usr_41.txt
 share/vim/${VIM_SUBDIR}/doc/usr_42.txt
@@ -179,6 +224,7 @@ share/vim/${VIM_SUBDIR}/doc/various.txt
 share/vim/${VIM_SUBDIR}/doc/version4.txt
 share/vim/${VIM_SUBDIR}/doc/version5.txt
 share/vim/${VIM_SUBDIR}/doc/version6.txt
+share/vim/${VIM_SUBDIR}/doc/version7.txt
 share/vim/${VIM_SUBDIR}/doc/vi_diff.txt
 share/vim/${VIM_SUBDIR}/doc/vim2html.pl
 share/vim/${VIM_SUBDIR}/doc/visual.txt
@@ -188,87 +234,172 @@ share/vim/${VIM_SUBDIR}/evim.vim
 share/vim/${VIM_SUBDIR}/filetype.vim
 share/vim/${VIM_SUBDIR}/ftoff.vim
 share/vim/${VIM_SUBDIR}/ftplugin.vim
+share/vim/${VIM_SUBDIR}/ftplugin/AppendMatchGroup.vim
 share/vim/${VIM_SUBDIR}/ftplugin/README.txt
+share/vim/${VIM_SUBDIR}/ftplugin/a2ps.vim
 share/vim/${VIM_SUBDIR}/ftplugin/aap.vim
 share/vim/${VIM_SUBDIR}/ftplugin/abaqus.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ada.vim
+share/vim/${VIM_SUBDIR}/ftplugin/alsaconf.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ant.vim
+share/vim/${VIM_SUBDIR}/ftplugin/arch.vim
 share/vim/${VIM_SUBDIR}/ftplugin/art.vim
 share/vim/${VIM_SUBDIR}/ftplugin/aspvbs.vim
 share/vim/${VIM_SUBDIR}/ftplugin/automake.vim
-share/vim/${VIM_SUBDIR}/ftplugin/bib.vim
+share/vim/${VIM_SUBDIR}/ftplugin/bdf.vim
+share/vim/${VIM_SUBDIR}/ftplugin/btm.vim
 share/vim/${VIM_SUBDIR}/ftplugin/c.vim
+share/vim/${VIM_SUBDIR}/ftplugin/calendar.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ch.vim
 share/vim/${VIM_SUBDIR}/ftplugin/changelog.vim
+share/vim/${VIM_SUBDIR}/ftplugin/conf.vim
 share/vim/${VIM_SUBDIR}/ftplugin/config.vim
+share/vim/${VIM_SUBDIR}/ftplugin/context.vim
 share/vim/${VIM_SUBDIR}/ftplugin/cpp.vim
+share/vim/${VIM_SUBDIR}/ftplugin/crm.vim
 share/vim/${VIM_SUBDIR}/ftplugin/cs.vim
 share/vim/${VIM_SUBDIR}/ftplugin/csc.vim
 share/vim/${VIM_SUBDIR}/ftplugin/csh.vim
 share/vim/${VIM_SUBDIR}/ftplugin/css.vim
+share/vim/${VIM_SUBDIR}/ftplugin/cvsrc.vim
 share/vim/${VIM_SUBDIR}/ftplugin/debchangelog.vim
+share/vim/${VIM_SUBDIR}/ftplugin/dictconf.vim
+share/vim/${VIM_SUBDIR}/ftplugin/dictdconf.vim
+share/vim/${VIM_SUBDIR}/ftplugin/diff.vim
+share/vim/${VIM_SUBDIR}/ftplugin/dircolors.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dosbatch.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dtd.vim
+share/vim/${VIM_SUBDIR}/ftplugin/elinks.vim
 share/vim/${VIM_SUBDIR}/ftplugin/eruby.vim
+share/vim/${VIM_SUBDIR}/ftplugin/eterm.vim
+share/vim/${VIM_SUBDIR}/ftplugin/fetchmail.vim
+share/vim/${VIM_SUBDIR}/ftplugin/flexwiki.vim
 share/vim/${VIM_SUBDIR}/ftplugin/fortran.vim
+share/vim/${VIM_SUBDIR}/ftplugin/gpg.vim
+share/vim/${VIM_SUBDIR}/ftplugin/group.vim
+share/vim/${VIM_SUBDIR}/ftplugin/grub.vim
+share/vim/${VIM_SUBDIR}/ftplugin/haskell.vim
+share/vim/${VIM_SUBDIR}/ftplugin/help.vim
 share/vim/${VIM_SUBDIR}/ftplugin/html.vim
+share/vim/${VIM_SUBDIR}/ftplugin/indent.vim
+share/vim/${VIM_SUBDIR}/ftplugin/initex.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ishd.vim
 share/vim/${VIM_SUBDIR}/ftplugin/java.vim
+share/vim/${VIM_SUBDIR}/ftplugin/javascript.vim
 share/vim/${VIM_SUBDIR}/ftplugin/jsp.vim
+share/vim/${VIM_SUBDIR}/ftplugin/kconfig.vim
 share/vim/${VIM_SUBDIR}/ftplugin/kwt.vim
+share/vim/${VIM_SUBDIR}/ftplugin/ld.vim
+share/vim/${VIM_SUBDIR}/ftplugin/lftp.vim
+share/vim/${VIM_SUBDIR}/ftplugin/libao.vim
+share/vim/${VIM_SUBDIR}/ftplugin/limits.vim
 share/vim/${VIM_SUBDIR}/ftplugin/lisp.vim
+share/vim/${VIM_SUBDIR}/ftplugin/loginaccess.vim
+share/vim/${VIM_SUBDIR}/ftplugin/logindefs.vim
 share/vim/${VIM_SUBDIR}/ftplugin/lprolog.vim
 share/vim/${VIM_SUBDIR}/ftplugin/lua.vim
+share/vim/${VIM_SUBDIR}/ftplugin/m4.vim
 share/vim/${VIM_SUBDIR}/ftplugin/mail.vim
+share/vim/${VIM_SUBDIR}/ftplugin/mailaliases.vim
+share/vim/${VIM_SUBDIR}/ftplugin/mailcap.vim
 share/vim/${VIM_SUBDIR}/ftplugin/make.vim
 share/vim/${VIM_SUBDIR}/ftplugin/man.vim
+share/vim/${VIM_SUBDIR}/ftplugin/manconf.vim
+share/vim/${VIM_SUBDIR}/ftplugin/matlab.vim
 share/vim/${VIM_SUBDIR}/ftplugin/mf.vim
+share/vim/${VIM_SUBDIR}/ftplugin/modconf.vim
 share/vim/${VIM_SUBDIR}/ftplugin/mp.vim
+share/vim/${VIM_SUBDIR}/ftplugin/mplayerconf.vim
+share/vim/${VIM_SUBDIR}/ftplugin/mrxvtrc.vim
+share/vim/${VIM_SUBDIR}/ftplugin/mupad.vim
+share/vim/${VIM_SUBDIR}/ftplugin/muttrc.vim
+share/vim/${VIM_SUBDIR}/ftplugin/nanorc.vim
+share/vim/${VIM_SUBDIR}/ftplugin/netrc.vim
 share/vim/${VIM_SUBDIR}/ftplugin/objc.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ocaml.vim
 share/vim/${VIM_SUBDIR}/ftplugin/occam.vim
+share/vim/${VIM_SUBDIR}/ftplugin/pamconf.vim
 share/vim/${VIM_SUBDIR}/ftplugin/pascal.vim
+share/vim/${VIM_SUBDIR}/ftplugin/passwd.vim
 share/vim/${VIM_SUBDIR}/ftplugin/perl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/php.vim
+share/vim/${VIM_SUBDIR}/ftplugin/pinfo.vim
+share/vim/${VIM_SUBDIR}/ftplugin/plaintex.vim
 share/vim/${VIM_SUBDIR}/ftplugin/postscr.vim
+share/vim/${VIM_SUBDIR}/ftplugin/procmail.vim
+share/vim/${VIM_SUBDIR}/ftplugin/prolog.vim
+share/vim/${VIM_SUBDIR}/ftplugin/protocols.vim
 share/vim/${VIM_SUBDIR}/ftplugin/pyrex.vim
 share/vim/${VIM_SUBDIR}/ftplugin/python.vim
+share/vim/${VIM_SUBDIR}/ftplugin/quake.vim
+share/vim/${VIM_SUBDIR}/ftplugin/racc.vim
+share/vim/${VIM_SUBDIR}/ftplugin/readline.vim
+share/vim/${VIM_SUBDIR}/ftplugin/rnc.vim
 share/vim/${VIM_SUBDIR}/ftplugin/rpl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/rst.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ruby.vim
 share/vim/${VIM_SUBDIR}/ftplugin/scheme.vim
+share/vim/${VIM_SUBDIR}/ftplugin/screen.vim
+share/vim/${VIM_SUBDIR}/ftplugin/sensors.vim
+share/vim/${VIM_SUBDIR}/ftplugin/services.vim
+share/vim/${VIM_SUBDIR}/ftplugin/setserial.vim
 share/vim/${VIM_SUBDIR}/ftplugin/sgml.vim
 share/vim/${VIM_SUBDIR}/ftplugin/sh.vim
+share/vim/${VIM_SUBDIR}/ftplugin/sieve.vim
+share/vim/${VIM_SUBDIR}/ftplugin/slpconf.vim
+share/vim/${VIM_SUBDIR}/ftplugin/slpreg.vim
+share/vim/${VIM_SUBDIR}/ftplugin/slpspi.vim
 share/vim/${VIM_SUBDIR}/ftplugin/spec.vim
 share/vim/${VIM_SUBDIR}/ftplugin/sql.vim
+share/vim/${VIM_SUBDIR}/ftplugin/sshconfig.vim
+share/vim/${VIM_SUBDIR}/ftplugin/sudoers.vim
 share/vim/${VIM_SUBDIR}/ftplugin/svg.vim
+share/vim/${VIM_SUBDIR}/ftplugin/sysctl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/tcsh.vim
+share/vim/${VIM_SUBDIR}/ftplugin/terminfo.vim
 share/vim/${VIM_SUBDIR}/ftplugin/tex.vim
+share/vim/${VIM_SUBDIR}/ftplugin/udevconf.vim
+share/vim/${VIM_SUBDIR}/ftplugin/udevperm.vim
+share/vim/${VIM_SUBDIR}/ftplugin/udevrules.vim
+share/vim/${VIM_SUBDIR}/ftplugin/updatedb.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/xdefaults.vim
+share/vim/${VIM_SUBDIR}/ftplugin/xf86conf.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xhtml.vim
+share/vim/${VIM_SUBDIR}/ftplugin/xinetd.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xml.vim
+share/vim/${VIM_SUBDIR}/ftplugin/xmodmap.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xs.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xsd.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xslt.vim
+share/vim/${VIM_SUBDIR}/ftplugin/yaml.vim
+share/vim/${VIM_SUBDIR}/ftplugin/zsh.vim
 share/vim/${VIM_SUBDIR}/ftplugof.vim
 share/vim/${VIM_SUBDIR}/gvimrc_example.vim
 share/vim/${VIM_SUBDIR}/indent.vim
+share/vim/${VIM_SUBDIR}/indent/GenericIndent.vim
 share/vim/${VIM_SUBDIR}/indent/README.txt
 share/vim/${VIM_SUBDIR}/indent/aap.vim
 share/vim/${VIM_SUBDIR}/indent/ada.vim
 share/vim/${VIM_SUBDIR}/indent/ant.vim
 share/vim/${VIM_SUBDIR}/indent/automake.vim
 share/vim/${VIM_SUBDIR}/indent/awk.vim
+share/vim/${VIM_SUBDIR}/indent/bib.vim
 share/vim/${VIM_SUBDIR}/indent/c.vim
 share/vim/${VIM_SUBDIR}/indent/cdl.vim
 share/vim/${VIM_SUBDIR}/indent/ch.vim
+share/vim/${VIM_SUBDIR}/indent/changelog.vim
+share/vim/${VIM_SUBDIR}/indent/cmake.vim
 share/vim/${VIM_SUBDIR}/indent/config.vim
 share/vim/${VIM_SUBDIR}/indent/cpp.vim
 share/vim/${VIM_SUBDIR}/indent/cs.vim
 share/vim/${VIM_SUBDIR}/indent/css.vim
+share/vim/${VIM_SUBDIR}/indent/d.vim
+share/vim/${VIM_SUBDIR}/indent/dictconf.vim
+share/vim/${VIM_SUBDIR}/indent/dictdconf.vim
 share/vim/${VIM_SUBDIR}/indent/docbk.vim
 share/vim/${VIM_SUBDIR}/indent/dylan.vim
 share/vim/${VIM_SUBDIR}/indent/eiffel.vim
@@ -279,11 +410,14 @@ share/vim/${VIM_SUBDIR}/indent/html.vim
 share/vim/${VIM_SUBDIR}/indent/idlang.vim
 share/vim/${VIM_SUBDIR}/indent/ishd.vim
 share/vim/${VIM_SUBDIR}/indent/java.vim
+share/vim/${VIM_SUBDIR}/indent/ld.vim
+share/vim/${VIM_SUBDIR}/indent/lisp.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/mupad.vim
 share/vim/${VIM_SUBDIR}/indent/objc.vim
 share/vim/${VIM_SUBDIR}/indent/ocaml.vim
 share/vim/${VIM_SUBDIR}/indent/occam.vim
@@ -299,23 +433,31 @@ share/vim/${VIM_SUBDIR}/indent/readline.vim
 share/vim/${VIM_SUBDIR}/indent/rpl.vim
 share/vim/${VIM_SUBDIR}/indent/rst.vim
 share/vim/${VIM_SUBDIR}/indent/ruby.vim
+share/vim/${VIM_SUBDIR}/indent/scheme.vim
 share/vim/${VIM_SUBDIR}/indent/sdl.vim
 share/vim/${VIM_SUBDIR}/indent/sh.vim
+share/vim/${VIM_SUBDIR}/indent/sml.vim
+share/vim/${VIM_SUBDIR}/indent/sql.vim
+share/vim/${VIM_SUBDIR}/indent/sqlanywhere.vim
 share/vim/${VIM_SUBDIR}/indent/tcl.vim
 share/vim/${VIM_SUBDIR}/indent/tcsh.vim
 share/vim/${VIM_SUBDIR}/indent/tilde.vim
 share/vim/${VIM_SUBDIR}/indent/vb.vim
 share/vim/${VIM_SUBDIR}/indent/verilog.vim
+share/vim/${VIM_SUBDIR}/indent/vhdl.vim
 share/vim/${VIM_SUBDIR}/indent/vim.vim
 share/vim/${VIM_SUBDIR}/indent/xf86conf.vim
 share/vim/${VIM_SUBDIR}/indent/xhtml.vim
+share/vim/${VIM_SUBDIR}/indent/xinetd.vim
 share/vim/${VIM_SUBDIR}/indent/xml.vim
+share/vim/${VIM_SUBDIR}/indent/xsd.vim
 share/vim/${VIM_SUBDIR}/indent/xslt.vim
 share/vim/${VIM_SUBDIR}/indent/yacc.vim
 share/vim/${VIM_SUBDIR}/indent/zsh.vim
 share/vim/${VIM_SUBDIR}/indoff.vim
 share/vim/${VIM_SUBDIR}/macros/README.txt
 share/vim/${VIM_SUBDIR}/macros/dvorak
+share/vim/${VIM_SUBDIR}/macros/editexisting.vim
 share/vim/${VIM_SUBDIR}/macros/hanoi/click.me
 share/vim/${VIM_SUBDIR}/macros/hanoi/hanoi.vim
 share/vim/${VIM_SUBDIR}/macros/hanoi/poster
@@ -345,11 +487,19 @@ share/vim/${VIM_SUBDIR}/menu.vim
 share/vim/${VIM_SUBDIR}/mswin.vim
 share/vim/${VIM_SUBDIR}/optwin.vim
 share/vim/${VIM_SUBDIR}/plugin/README.txt
-share/vim/${VIM_SUBDIR}/plugin/explorer.vim
+share/vim/${VIM_SUBDIR}/plugin/getscript.vim
 share/vim/${VIM_SUBDIR}/plugin/gzip.vim
-share/vim/${VIM_SUBDIR}/plugin/netrw.vim
+share/vim/${VIM_SUBDIR}/plugin/matchparen.vim
+share/vim/${VIM_SUBDIR}/plugin/netrwPlugin.vim
 share/vim/${VIM_SUBDIR}/plugin/rrhelper.vim
+share/vim/${VIM_SUBDIR}/plugin/spellfile.vim
+share/vim/${VIM_SUBDIR}/plugin/tarPlugin.vim
 share/vim/${VIM_SUBDIR}/plugin/tohtml.vim
+share/vim/${VIM_SUBDIR}/plugin/vimballPlugin.vim
+share/vim/${VIM_SUBDIR}/plugin/zipPlugin.vim
+share/vim/${VIM_SUBDIR}/print/ascii.ps
+share/vim/${VIM_SUBDIR}/print/cidfont.ps
+share/vim/${VIM_SUBDIR}/print/cns_roman.ps
 share/vim/${VIM_SUBDIR}/print/cp1250.ps
 share/vim/${VIM_SUBDIR}/print/cp1251.ps
 share/vim/${VIM_SUBDIR}/print/cp1252.ps
@@ -359,6 +509,7 @@ share/vim/${VIM_SUBDIR}/print/cp1255.ps
 share/vim/${VIM_SUBDIR}/print/cp1257.ps
 share/vim/${VIM_SUBDIR}/print/dec-mcs.ps
 share/vim/${VIM_SUBDIR}/print/ebcdic-uk.ps
+share/vim/${VIM_SUBDIR}/print/gb_roman.ps
 share/vim/${VIM_SUBDIR}/print/hp-roman8.ps
 share/vim/${VIM_SUBDIR}/print/iso-8859-10.ps
 share/vim/${VIM_SUBDIR}/print/iso-8859-11.ps
@@ -372,17 +523,30 @@ share/vim/${VIM_SUBDIR}/print/iso-8859-5.ps
 share/vim/${VIM_SUBDIR}/print/iso-8859-7.ps
 share/vim/${VIM_SUBDIR}/print/iso-8859-8.ps
 share/vim/${VIM_SUBDIR}/print/iso-8859-9.ps
+share/vim/${VIM_SUBDIR}/print/jis_roman.ps
 share/vim/${VIM_SUBDIR}/print/koi8-r.ps
 share/vim/${VIM_SUBDIR}/print/koi8-u.ps
+share/vim/${VIM_SUBDIR}/print/ks_roman.ps
 share/vim/${VIM_SUBDIR}/print/latin1.ps
 share/vim/${VIM_SUBDIR}/print/mac-roman.ps
 share/vim/${VIM_SUBDIR}/print/prolog.ps
 share/vim/${VIM_SUBDIR}/scripts.vim
+share/vim/${VIM_SUBDIR}/spell/cleanadd.vim
+share/vim/${VIM_SUBDIR}/spell/en.ascii.spl
+share/vim/${VIM_SUBDIR}/spell/en.ascii.sug
+share/vim/${VIM_SUBDIR}/spell/en.latin1.spl
+share/vim/${VIM_SUBDIR}/spell/en.latin1.sug
+share/vim/${VIM_SUBDIR}/spell/en.utf-8.spl
+share/vim/${VIM_SUBDIR}/spell/en.utf-8.sug
+share/vim/${VIM_SUBDIR}/spell/he.vim
+share/vim/${VIM_SUBDIR}/spell/yi.vim
 share/vim/${VIM_SUBDIR}/synmenu.vim
 share/vim/${VIM_SUBDIR}/syntax/2html.vim
 share/vim/${VIM_SUBDIR}/syntax/README.txt
+share/vim/${VIM_SUBDIR}/syntax/a2ps.vim
 share/vim/${VIM_SUBDIR}/syntax/a65.vim
 share/vim/${VIM_SUBDIR}/syntax/aap.vim
+share/vim/${VIM_SUBDIR}/syntax/abap.vim
 share/vim/${VIM_SUBDIR}/syntax/abaqus.vim
 share/vim/${VIM_SUBDIR}/syntax/abc.vim
 share/vim/${VIM_SUBDIR}/syntax/abel.vim
@@ -406,6 +570,8 @@ share/vim/${VIM_SUBDIR}/syntax/asmh8300.vim
 share/vim/${VIM_SUBDIR}/syntax/asn.vim
 share/vim/${VIM_SUBDIR}/syntax/aspperl.vim
 share/vim/${VIM_SUBDIR}/syntax/aspvbs.vim
+share/vim/${VIM_SUBDIR}/syntax/asterisk.vim
+share/vim/${VIM_SUBDIR}/syntax/asteriskvm.vim
 share/vim/${VIM_SUBDIR}/syntax/atlas.vim
 share/vim/${VIM_SUBDIR}/syntax/automake.vim
 share/vim/${VIM_SUBDIR}/syntax/ave.vim
@@ -419,6 +585,7 @@ share/vim/${VIM_SUBDIR}/syntax/bdf.vim
 share/vim/${VIM_SUBDIR}/syntax/bib.vim
 share/vim/${VIM_SUBDIR}/syntax/bindzone.vim
 share/vim/${VIM_SUBDIR}/syntax/blank.vim
+share/vim/${VIM_SUBDIR}/syntax/bst.vim
 share/vim/${VIM_SUBDIR}/syntax/btm.vim
 share/vim/${VIM_SUBDIR}/syntax/c.vim
 share/vim/${VIM_SUBDIR}/syntax/calendar.vim
@@ -432,13 +599,16 @@ share/vim/${VIM_SUBDIR}/syntax/changelog.vim
 share/vim/${VIM_SUBDIR}/syntax/chaskell.vim
 share/vim/${VIM_SUBDIR}/syntax/cheetah.vim
 share/vim/${VIM_SUBDIR}/syntax/chill.vim
+share/vim/${VIM_SUBDIR}/syntax/chordpro.vim
 share/vim/${VIM_SUBDIR}/syntax/cl.vim
 share/vim/${VIM_SUBDIR}/syntax/clean.vim
 share/vim/${VIM_SUBDIR}/syntax/clipper.vim
+share/vim/${VIM_SUBDIR}/syntax/cmake.vim
 share/vim/${VIM_SUBDIR}/syntax/cobol.vim
 share/vim/${VIM_SUBDIR}/syntax/colortest.vim
 share/vim/${VIM_SUBDIR}/syntax/conf.vim
 share/vim/${VIM_SUBDIR}/syntax/config.vim
+share/vim/${VIM_SUBDIR}/syntax/context.vim
 share/vim/${VIM_SUBDIR}/syntax/cpp.vim
 share/vim/${VIM_SUBDIR}/syntax/crm.vim
 share/vim/${VIM_SUBDIR}/syntax/crontab.vim
@@ -461,12 +631,16 @@ share/vim/${VIM_SUBDIR}/syntax/dcd.vim
 share/vim/${VIM_SUBDIR}/syntax/dcl.vim
 share/vim/${VIM_SUBDIR}/syntax/debchangelog.vim
 share/vim/${VIM_SUBDIR}/syntax/debcontrol.vim
+share/vim/${VIM_SUBDIR}/syntax/debsources.vim
 share/vim/${VIM_SUBDIR}/syntax/def.vim
 share/vim/${VIM_SUBDIR}/syntax/desc.vim
 share/vim/${VIM_SUBDIR}/syntax/desktop.vim
+share/vim/${VIM_SUBDIR}/syntax/dictconf.vim
+share/vim/${VIM_SUBDIR}/syntax/dictdconf.vim
 share/vim/${VIM_SUBDIR}/syntax/diff.vim
 share/vim/${VIM_SUBDIR}/syntax/dircolors.vim
 share/vim/${VIM_SUBDIR}/syntax/diva.vim
+share/vim/${VIM_SUBDIR}/syntax/django.vim
 share/vim/${VIM_SUBDIR}/syntax/dns.vim
 share/vim/${VIM_SUBDIR}/syntax/docbk.vim
 share/vim/${VIM_SUBDIR}/syntax/docbksgml.vim
@@ -474,6 +648,7 @@ share/vim/${VIM_SUBDIR}/syntax/docbkxml.vim
 share/vim/${VIM_SUBDIR}/syntax/dosbatch.vim
 share/vim/${VIM_SUBDIR}/syntax/dosini.vim
 share/vim/${VIM_SUBDIR}/syntax/dot.vim
+share/vim/${VIM_SUBDIR}/syntax/doxygen.vim
 share/vim/${VIM_SUBDIR}/syntax/dracula.vim
 share/vim/${VIM_SUBDIR}/syntax/dsl.vim
 share/vim/${VIM_SUBDIR}/syntax/dtd.vim
@@ -493,6 +668,7 @@ 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/eviews.vim
 share/vim/${VIM_SUBDIR}/syntax/exim.vim
 share/vim/${VIM_SUBDIR}/syntax/expect.vim
 share/vim/${VIM_SUBDIR}/syntax/exports.vim
@@ -500,6 +676,7 @@ share/vim/${VIM_SUBDIR}/syntax/fasm.vim
 share/vim/${VIM_SUBDIR}/syntax/fdcc.vim
 share/vim/${VIM_SUBDIR}/syntax/fetchmail.vim
 share/vim/${VIM_SUBDIR}/syntax/fgl.vim
+share/vim/${VIM_SUBDIR}/syntax/flexwiki.vim
 share/vim/${VIM_SUBDIR}/syntax/focexec.vim
 share/vim/${VIM_SUBDIR}/syntax/form.vim
 share/vim/${VIM_SUBDIR}/syntax/forth.vim
@@ -516,7 +693,10 @@ share/vim/${VIM_SUBDIR}/syntax/gnuplot.vim
 share/vim/${VIM_SUBDIR}/syntax/gp.vim
 share/vim/${VIM_SUBDIR}/syntax/gpg.vim
 share/vim/${VIM_SUBDIR}/syntax/grads.vim
+share/vim/${VIM_SUBDIR}/syntax/gretl.vim
 share/vim/${VIM_SUBDIR}/syntax/groff.vim
+share/vim/${VIM_SUBDIR}/syntax/groovy.vim
+share/vim/${VIM_SUBDIR}/syntax/group.vim
 share/vim/${VIM_SUBDIR}/syntax/grub.vim
 share/vim/${VIM_SUBDIR}/syntax/gsp.vim
 share/vim/${VIM_SUBDIR}/syntax/gtkrc.vim
@@ -529,6 +709,7 @@ share/vim/${VIM_SUBDIR}/syntax/hitest.vim
 share/vim/${VIM_SUBDIR}/syntax/hog.vim
 share/vim/${VIM_SUBDIR}/syntax/html.vim
 share/vim/${VIM_SUBDIR}/syntax/htmlcheetah.vim
+share/vim/${VIM_SUBDIR}/syntax/htmldjango.vim
 share/vim/${VIM_SUBDIR}/syntax/htmlm4.vim
 share/vim/${VIM_SUBDIR}/syntax/htmlos.vim
 share/vim/${VIM_SUBDIR}/syntax/ia64.vim
@@ -538,6 +719,7 @@ share/vim/${VIM_SUBDIR}/syntax/idl.vim
 share/vim/${VIM_SUBDIR}/syntax/idlang.vim
 share/vim/${VIM_SUBDIR}/syntax/indent.vim
 share/vim/${VIM_SUBDIR}/syntax/inform.vim
+share/vim/${VIM_SUBDIR}/syntax/initex.vim
 share/vim/${VIM_SUBDIR}/syntax/inittab.vim
 share/vim/${VIM_SUBDIR}/syntax/ipfilter.vim
 share/vim/${VIM_SUBDIR}/syntax/ishd.vim
@@ -553,11 +735,13 @@ share/vim/${VIM_SUBDIR}/syntax/jess.vim
 share/vim/${VIM_SUBDIR}/syntax/jgraph.vim
 share/vim/${VIM_SUBDIR}/syntax/jproperties.vim
 share/vim/${VIM_SUBDIR}/syntax/jsp.vim
+share/vim/${VIM_SUBDIR}/syntax/kconfig.vim
 share/vim/${VIM_SUBDIR}/syntax/kix.vim
 share/vim/${VIM_SUBDIR}/syntax/kscript.vim
 share/vim/${VIM_SUBDIR}/syntax/kwt.vim
 share/vim/${VIM_SUBDIR}/syntax/lace.vim
 share/vim/${VIM_SUBDIR}/syntax/latte.vim
+share/vim/${VIM_SUBDIR}/syntax/ld.vim
 share/vim/${VIM_SUBDIR}/syntax/ldif.vim
 share/vim/${VIM_SUBDIR}/syntax/lex.vim
 share/vim/${VIM_SUBDIR}/syntax/lftp.vim
@@ -565,8 +749,11 @@ share/vim/${VIM_SUBDIR}/syntax/lhaskell.vim
 share/vim/${VIM_SUBDIR}/syntax/libao.vim
 share/vim/${VIM_SUBDIR}/syntax/lifelines.vim
 share/vim/${VIM_SUBDIR}/syntax/lilo.vim
+share/vim/${VIM_SUBDIR}/syntax/limits.vim
 share/vim/${VIM_SUBDIR}/syntax/lisp.vim
 share/vim/${VIM_SUBDIR}/syntax/lite.vim
+share/vim/${VIM_SUBDIR}/syntax/loginaccess.vim
+share/vim/${VIM_SUBDIR}/syntax/logindefs.vim
 share/vim/${VIM_SUBDIR}/syntax/logtalk.vim
 share/vim/${VIM_SUBDIR}/syntax/lotos.vim
 share/vim/${VIM_SUBDIR}/syntax/lout.vim
@@ -578,17 +765,21 @@ share/vim/${VIM_SUBDIR}/syntax/lua.vim
 share/vim/${VIM_SUBDIR}/syntax/lynx.vim
 share/vim/${VIM_SUBDIR}/syntax/m4.vim
 share/vim/${VIM_SUBDIR}/syntax/mail.vim
+share/vim/${VIM_SUBDIR}/syntax/mailaliases.vim
 share/vim/${VIM_SUBDIR}/syntax/mailcap.vim
 share/vim/${VIM_SUBDIR}/syntax/make.vim
 share/vim/${VIM_SUBDIR}/syntax/man.vim
+share/vim/${VIM_SUBDIR}/syntax/manconf.vim
 share/vim/${VIM_SUBDIR}/syntax/manual.vim
 share/vim/${VIM_SUBDIR}/syntax/maple.vim
 share/vim/${VIM_SUBDIR}/syntax/masm.vim
 share/vim/${VIM_SUBDIR}/syntax/mason.vim
 share/vim/${VIM_SUBDIR}/syntax/master.vim
 share/vim/${VIM_SUBDIR}/syntax/matlab.vim
+share/vim/${VIM_SUBDIR}/syntax/maxima.vim
 share/vim/${VIM_SUBDIR}/syntax/mel.vim
 share/vim/${VIM_SUBDIR}/syntax/mf.vim
+share/vim/${VIM_SUBDIR}/syntax/mgl.vim
 share/vim/${VIM_SUBDIR}/syntax/mgp.vim
 share/vim/${VIM_SUBDIR}/syntax/mib.vim
 share/vim/${VIM_SUBDIR}/syntax/mma.vim
@@ -602,17 +793,21 @@ share/vim/${VIM_SUBDIR}/syntax/monk.vim
 share/vim/${VIM_SUBDIR}/syntax/moo.vim
 share/vim/${VIM_SUBDIR}/syntax/mp.vim
 share/vim/${VIM_SUBDIR}/syntax/mplayerconf.vim
+share/vim/${VIM_SUBDIR}/syntax/mrxvtrc.vim
 share/vim/${VIM_SUBDIR}/syntax/msidl.vim
 share/vim/${VIM_SUBDIR}/syntax/msql.vim
+share/vim/${VIM_SUBDIR}/syntax/mupad.vim
 share/vim/${VIM_SUBDIR}/syntax/mush.vim
 share/vim/${VIM_SUBDIR}/syntax/muttrc.vim
 share/vim/${VIM_SUBDIR}/syntax/mysql.vim
 share/vim/${VIM_SUBDIR}/syntax/named.vim
+share/vim/${VIM_SUBDIR}/syntax/nanorc.vim
 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/netrw.vim
 share/vim/${VIM_SUBDIR}/syntax/nosyntax.vim
 share/vim/${VIM_SUBDIR}/syntax/nqc.vim
 share/vim/${VIM_SUBDIR}/syntax/nroff.vim
@@ -625,8 +820,10 @@ share/vim/${VIM_SUBDIR}/syntax/omnimark.vim
 share/vim/${VIM_SUBDIR}/syntax/openroad.vim
 share/vim/${VIM_SUBDIR}/syntax/opl.vim
 share/vim/${VIM_SUBDIR}/syntax/ora.vim
+share/vim/${VIM_SUBDIR}/syntax/pamconf.vim
 share/vim/${VIM_SUBDIR}/syntax/papp.vim
 share/vim/${VIM_SUBDIR}/syntax/pascal.vim
+share/vim/${VIM_SUBDIR}/syntax/passwd.vim
 share/vim/${VIM_SUBDIR}/syntax/pcap.vim
 share/vim/${VIM_SUBDIR}/syntax/pccts.vim
 share/vim/${VIM_SUBDIR}/syntax/perl.vim
@@ -639,6 +836,7 @@ share/vim/${VIM_SUBDIR}/syntax/pike.vim
 share/vim/${VIM_SUBDIR}/syntax/pilrc.vim
 share/vim/${VIM_SUBDIR}/syntax/pine.vim
 share/vim/${VIM_SUBDIR}/syntax/pinfo.vim
+share/vim/${VIM_SUBDIR}/syntax/plaintex.vim
 share/vim/${VIM_SUBDIR}/syntax/plm.vim
 share/vim/${VIM_SUBDIR}/syntax/plp.vim
 share/vim/${VIM_SUBDIR}/syntax/plsql.vim
@@ -653,6 +851,7 @@ 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
+share/vim/${VIM_SUBDIR}/syntax/protocols.vim
 share/vim/${VIM_SUBDIR}/syntax/psf.vim
 share/vim/${VIM_SUBDIR}/syntax/ptcap.vim
 share/vim/${VIM_SUBDIR}/syntax/purifylog.vim
@@ -661,6 +860,7 @@ share/vim/${VIM_SUBDIR}/syntax/python.vim
 share/vim/${VIM_SUBDIR}/syntax/qf.vim
 share/vim/${VIM_SUBDIR}/syntax/quake.vim
 share/vim/${VIM_SUBDIR}/syntax/r.vim
+share/vim/${VIM_SUBDIR}/syntax/racc.vim
 share/vim/${VIM_SUBDIR}/syntax/radiance.vim
 share/vim/${VIM_SUBDIR}/syntax/ratpoison.vim
 share/vim/${VIM_SUBDIR}/syntax/rc.vim
@@ -672,8 +872,10 @@ share/vim/${VIM_SUBDIR}/syntax/registry.vim
 share/vim/${VIM_SUBDIR}/syntax/remind.vim
 share/vim/${VIM_SUBDIR}/syntax/resolv.vim
 share/vim/${VIM_SUBDIR}/syntax/rexx.vim
+share/vim/${VIM_SUBDIR}/syntax/rhelp.vim
 share/vim/${VIM_SUBDIR}/syntax/rib.vim
 share/vim/${VIM_SUBDIR}/syntax/rnc.vim
+share/vim/${VIM_SUBDIR}/syntax/rnoweb.vim
 share/vim/${VIM_SUBDIR}/syntax/robots.vim
 share/vim/${VIM_SUBDIR}/syntax/rpcgen.vim
 share/vim/${VIM_SUBDIR}/syntax/rpl.vim
@@ -689,23 +891,32 @@ share/vim/${VIM_SUBDIR}/syntax/screen.vim
 share/vim/${VIM_SUBDIR}/syntax/sdl.vim
 share/vim/${VIM_SUBDIR}/syntax/sed.vim
 share/vim/${VIM_SUBDIR}/syntax/sendpr.vim
+share/vim/${VIM_SUBDIR}/syntax/sensors.vim
+share/vim/${VIM_SUBDIR}/syntax/services.vim
+share/vim/${VIM_SUBDIR}/syntax/setserial.vim
 share/vim/${VIM_SUBDIR}/syntax/sgml.vim
 share/vim/${VIM_SUBDIR}/syntax/sgmldecl.vim
 share/vim/${VIM_SUBDIR}/syntax/sgmllnx.vim
 share/vim/${VIM_SUBDIR}/syntax/sh.vim
 share/vim/${VIM_SUBDIR}/syntax/sicad.vim
+share/vim/${VIM_SUBDIR}/syntax/sieve.vim
 share/vim/${VIM_SUBDIR}/syntax/simula.vim
 share/vim/${VIM_SUBDIR}/syntax/sinda.vim
 share/vim/${VIM_SUBDIR}/syntax/sindacmp.vim
 share/vim/${VIM_SUBDIR}/syntax/sindaout.vim
+share/vim/${VIM_SUBDIR}/syntax/sisu.vim
 share/vim/${VIM_SUBDIR}/syntax/skill.vim
 share/vim/${VIM_SUBDIR}/syntax/sl.vim
 share/vim/${VIM_SUBDIR}/syntax/slang.vim
 share/vim/${VIM_SUBDIR}/syntax/slice.vim
+share/vim/${VIM_SUBDIR}/syntax/slpconf.vim
+share/vim/${VIM_SUBDIR}/syntax/slpreg.vim
+share/vim/${VIM_SUBDIR}/syntax/slpspi.vim
 share/vim/${VIM_SUBDIR}/syntax/slrnrc.vim
 share/vim/${VIM_SUBDIR}/syntax/slrnsc.vim
 share/vim/${VIM_SUBDIR}/syntax/sm.vim
 share/vim/${VIM_SUBDIR}/syntax/smarty.vim
+share/vim/${VIM_SUBDIR}/syntax/smcl.vim
 share/vim/${VIM_SUBDIR}/syntax/smil.vim
 share/vim/${VIM_SUBDIR}/syntax/smith.vim
 share/vim/${VIM_SUBDIR}/syntax/sml.vim
@@ -720,13 +931,17 @@ share/vim/${VIM_SUBDIR}/syntax/splint.vim
 share/vim/${VIM_SUBDIR}/syntax/spup.vim
 share/vim/${VIM_SUBDIR}/syntax/spyce.vim
 share/vim/${VIM_SUBDIR}/syntax/sql.vim
+share/vim/${VIM_SUBDIR}/syntax/sqlanywhere.vim
 share/vim/${VIM_SUBDIR}/syntax/sqlforms.vim
+share/vim/${VIM_SUBDIR}/syntax/sqlinformix.vim
 share/vim/${VIM_SUBDIR}/syntax/sqlj.vim
+share/vim/${VIM_SUBDIR}/syntax/sqloracle.vim
 share/vim/${VIM_SUBDIR}/syntax/sqr.vim
 share/vim/${VIM_SUBDIR}/syntax/squid.vim
 share/vim/${VIM_SUBDIR}/syntax/sshconfig.vim
 share/vim/${VIM_SUBDIR}/syntax/sshdconfig.vim
 share/vim/${VIM_SUBDIR}/syntax/st.vim
+share/vim/${VIM_SUBDIR}/syntax/stata.vim
 share/vim/${VIM_SUBDIR}/syntax/stp.vim
 share/vim/${VIM_SUBDIR}/syntax/strace.vim
 share/vim/${VIM_SUBDIR}/syntax/sudoers.vim
@@ -734,11 +949,13 @@ share/vim/${VIM_SUBDIR}/syntax/svn.vim
 share/vim/${VIM_SUBDIR}/syntax/syncolor.vim
 share/vim/${VIM_SUBDIR}/syntax/synload.vim
 share/vim/${VIM_SUBDIR}/syntax/syntax.vim
+share/vim/${VIM_SUBDIR}/syntax/sysctl.vim
 share/vim/${VIM_SUBDIR}/syntax/tads.vim
 share/vim/${VIM_SUBDIR}/syntax/tags.vim
 share/vim/${VIM_SUBDIR}/syntax/tak.vim
 share/vim/${VIM_SUBDIR}/syntax/takcmp.vim
 share/vim/${VIM_SUBDIR}/syntax/takout.vim
+share/vim/${VIM_SUBDIR}/syntax/tar.vim
 share/vim/${VIM_SUBDIR}/syntax/tasm.vim
 share/vim/${VIM_SUBDIR}/syntax/tcl.vim
 share/vim/${VIM_SUBDIR}/syntax/tcsh.vim
@@ -752,14 +969,20 @@ 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/trustees.vim
 share/vim/${VIM_SUBDIR}/syntax/tsalt.vim
 share/vim/${VIM_SUBDIR}/syntax/tsscl.vim
 share/vim/${VIM_SUBDIR}/syntax/tssgm.vim
 share/vim/${VIM_SUBDIR}/syntax/tssop.vim
 share/vim/${VIM_SUBDIR}/syntax/uc.vim
+share/vim/${VIM_SUBDIR}/syntax/udevconf.vim
+share/vim/${VIM_SUBDIR}/syntax/udevperm.vim
+share/vim/${VIM_SUBDIR}/syntax/udevrules.vim
 share/vim/${VIM_SUBDIR}/syntax/uil.vim
+share/vim/${VIM_SUBDIR}/syntax/updatedb.vim
 share/vim/${VIM_SUBDIR}/syntax/valgrind.vim
 share/vim/${VIM_SUBDIR}/syntax/vb.vim
+share/vim/${VIM_SUBDIR}/syntax/vera.vim
 share/vim/${VIM_SUBDIR}/syntax/verilog.vim
 share/vim/${VIM_SUBDIR}/syntax/verilogams.vim
 share/vim/${VIM_SUBDIR}/syntax/vgrindefs.vim
@@ -778,16 +1001,19 @@ share/vim/${VIM_SUBDIR}/syntax/whitespace.vim
 share/vim/${VIM_SUBDIR}/syntax/winbatch.vim
 share/vim/${VIM_SUBDIR}/syntax/wml.vim
 share/vim/${VIM_SUBDIR}/syntax/wsh.vim
+share/vim/${VIM_SUBDIR}/syntax/wsml.vim
 share/vim/${VIM_SUBDIR}/syntax/wvdial.vim
 share/vim/${VIM_SUBDIR}/syntax/xdefaults.vim
 share/vim/${VIM_SUBDIR}/syntax/xf86conf.vim
 share/vim/${VIM_SUBDIR}/syntax/xhtml.vim
+share/vim/${VIM_SUBDIR}/syntax/xinetd.vim
 share/vim/${VIM_SUBDIR}/syntax/xkb.vim
 share/vim/${VIM_SUBDIR}/syntax/xmath.vim
 share/vim/${VIM_SUBDIR}/syntax/xml.vim
 share/vim/${VIM_SUBDIR}/syntax/xmodmap.vim
 share/vim/${VIM_SUBDIR}/syntax/xpm.vim
 share/vim/${VIM_SUBDIR}/syntax/xpm2.vim
+share/vim/${VIM_SUBDIR}/syntax/xquery.vim
 share/vim/${VIM_SUBDIR}/syntax/xs.vim
 share/vim/${VIM_SUBDIR}/syntax/xsd.vim
 share/vim/${VIM_SUBDIR}/syntax/xslt.vim
@@ -835,14 +1061,18 @@ share/vim/${VIM_SUBDIR}/tutor/tutor.ko.utf-8
 share/vim/${VIM_SUBDIR}/tutor/tutor.no
 share/vim/${VIM_SUBDIR}/tutor/tutor.pl
 share/vim/${VIM_SUBDIR}/tutor/tutor.pl.cp1250
+share/vim/${VIM_SUBDIR}/tutor/tutor.pl.utf-8
 share/vim/${VIM_SUBDIR}/tutor/tutor.ru
 share/vim/${VIM_SUBDIR}/tutor/tutor.ru.cp1251
 share/vim/${VIM_SUBDIR}/tutor/tutor.sk
+share/vim/${VIM_SUBDIR}/tutor/tutor.sk.cp1250
 share/vim/${VIM_SUBDIR}/tutor/tutor.sv
 share/vim/${VIM_SUBDIR}/tutor/tutor.vim
 share/vim/${VIM_SUBDIR}/tutor/tutor.zh.big5
 share/vim/${VIM_SUBDIR}/tutor/tutor.zh.euc
 share/vim/${VIM_SUBDIR}/vimrc_example.vim
+@dirrm share/vim/${VIM_SUBDIR}/autoload/xml
+@dirrm share/vim/${VIM_SUBDIR}/autoload
 @dirrm share/vim/${VIM_SUBDIR}/colors
 @dirrm share/vim/${VIM_SUBDIR}/compiler
 @dirrm share/vim/${VIM_SUBDIR}/doc
@@ -855,6 +1085,7 @@ share/vim/${VIM_SUBDIR}/vimrc_example.vim
 @dirrm share/vim/${VIM_SUBDIR}/macros
 @dirrm share/vim/${VIM_SUBDIR}/plugin
 @dirrm share/vim/${VIM_SUBDIR}/print
+@dirrm share/vim/${VIM_SUBDIR}/spell
 @dirrm share/vim/${VIM_SUBDIR}/syntax
 @dirrm share/vim/${VIM_SUBDIR}/tools
 @dirrm share/vim/${VIM_SUBDIR}/tutor
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 0d5c53a8dfe..2c9f912e6ea 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,33 +1,12 @@
-$NetBSD: distinfo,v 1.44 2006/02/28 11:03:17 martti Exp $
+$NetBSD: distinfo,v 1.45 2006/05/09 06:36:48 martti Exp $
 
-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 (vim/6.4.002) = 0e397d0d217e765d4a76ae94b9bca73648d56bf2
-RMD160 (vim/6.4.002) = 9567217deb8b755aa3867f3dca11d7044981cec0
-Size (vim/6.4.002) = 7802 bytes
-SHA1 (vim/6.4.003) = e382c64d737388cbcd769a3a9d4817f824207138
-RMD160 (vim/6.4.003) = 4bd256c53b953924052e4a793114a8837343c97f
-Size (vim/6.4.003) = 1463 bytes
-SHA1 (vim/6.4.004) = 25133e91e7f647be21c36e62c11c43cec996a890
-RMD160 (vim/6.4.004) = 49256291933ca12ae62680709173612b1c370bef
-Size (vim/6.4.004) = 1581 bytes
-SHA1 (vim/6.4.005) = f58c75d14d449ba88a74ca322d5f9ccef5dcacea
-RMD160 (vim/6.4.005) = f8db4b248def7c1f6fb3328c774f5708afa78480
-Size (vim/6.4.005) = 1577 bytes
-SHA1 (vim/6.4.006) = a8e07fc7e84570ddc60d68d0a71b66aa5a95773f
-RMD160 (vim/6.4.006) = e7b9dc42d300172c3246c490d7d0f8f1c6763001
-Size (vim/6.4.006) = 2320 bytes
-SHA1 (vim/6.4.007) = df725b6141d93e884545bb8020143ad9dc91223a
-RMD160 (vim/6.4.007) = 69da6b886c3fcfdb3d58b3f9d2ba1b4e129feefa
-Size (vim/6.4.007) = 1717 bytes
-SHA1 (vim/6.4.008) = dd1ca0936295b1f81d9a10a3c9e51b0268ffb839
-RMD160 (vim/6.4.008) = db4112606089ab207f377e9526cb1a3cbe9ad0ee
-Size (vim/6.4.008) = 2199 bytes
-SHA1 (patch-aa) = 9643996d5a4bdd23994c9d1b2e85e2f886100eb7
-SHA1 (patch-ab) = cb8930aaeefd1ddbfa204290662078994dd985c0
-SHA1 (patch-ad) = 9d46d15cdb6a6a80dfc82dc49efafcdaf83a3f71
-SHA1 (patch-zb) = 3966ea9713cbf5d26072592443080c1884f48e75
+SHA1 (vim/vim-7.0.tar.bz2) = 38ef48cabf942d0dc804a794dcc6f002b9457fc8
+RMD160 (vim/vim-7.0.tar.bz2) = 5c0d6f2dbd0382a432781fe6cb224028cbb783de
+Size (vim/vim-7.0.tar.bz2) = 6575205 bytes
+SHA1 (vim/vim-7.0-lang.tar.gz) = 3db6b0004d213490cc00d361835e7a7c685adb52
+RMD160 (vim/vim-7.0-lang.tar.gz) = 954a098f2f513ccdda96fdfcd043a737e52a5366
+Size (vim/vim-7.0-lang.tar.gz) = 1180240 bytes
+SHA1 (patch-aa) = 6490dce35e099967272a84dd96b16cc3db0b4d53
+SHA1 (patch-ab) = 1ee4f14cb6c73743704d2dd2631cb3ca48f0303e
+SHA1 (patch-ad) = be66a25349341d3a538306a0a06991f0e9d850a0
+SHA1 (patch-zb) = d52bdc3b77c30c804e78c2c6a4182fad8096c9f0
diff --git a/editors/vim-share/patches/patch-aa b/editors/vim-share/patches/patch-aa
index 4018111332b..ef60b625d8c 100644
--- a/editors/vim-share/patches/patch-aa
+++ b/editors/vim-share/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2005/10/17 06:49:34 martti Exp $
+$NetBSD: patch-aa,v 1.10 2006/05/09 06:36:48 martti Exp $
 
---- 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 @@
+--- src/auto/configure.orig	2006-05-04 13:46:19.000000000 +0300
++++ src/auto/configure	2006-05-08 10:00:33.000000000 +0300
+@@ -7977,7 +7977,7 @@
  
  
  if test -z "$SKIP_MOTIF"; then
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.9 2005/10/17 06:49:34 martti Exp $
 +  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
+   echo "$as_me:$LINENO: checking for location of Motif GUI includes" >&5
diff --git a/editors/vim-share/patches/patch-ab b/editors/vim-share/patches/patch-ab
index 7cce4aa4657..ecd7b841481 100644
--- a/editors/vim-share/patches/patch-ab
+++ b/editors/vim-share/patches/patch-ab
@@ -1,32 +1,32 @@
-$NetBSD: patch-ab,v 1.4 2005/06/05 09:33:33 jmmv Exp $
+$NetBSD: patch-ab,v 1.5 2006/05/09 06:36:48 martti Exp $
 
---- runtime/syntax/fstab.vim.orig     2005-05-21 16:05:10.000000000 +0200
-+++ runtime/syntax/fstab.vim  2005-05-21 16:10:27.000000000 +0200
-@@ -32,7 +32,7 @@
+--- runtime/syntax/fstab.vim.orig	2006-04-16 19:01:27.000000000 +0300
++++ runtime/syntax/fstab.vim	2006-05-06 14:20:57.000000000 +0300
+@@ -36,7 +36,7 @@
  " Type
- syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeError
- syn match fsTypeError /\s\+\zs\w\+/ contained
--syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union vfat xfs
-+syn keyword fsTypeKeyword contained adfs ados affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext2fs ext3 fdesc ffs filecore hfs hpfs iso9660 kernfs lfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null overlay portal proc procfs ptyfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union vfat xfs
+ syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
+ syn match fsTypeUnknown /\s\+\zs\w\+/ contained
+-syn keyword fsTypeKeyword contained adfs affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext3 fdesc hfs hpfs iso9660 jffs jffs2 jfs kernfs linprocfs mfs minix msdos ncpfs nfs none none ntfs null nwfs ovlfs portal proc procfs qnx4 reiserfs romfs shm smbfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
++syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs shm smbfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
  
  " Options
  " -------
-@@ -44,7 +44,7 @@
+@@ -48,7 +48,7 @@
  syn keyword fsOptionsYesNo yes no
  syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
  syn keyword fsOptionsSize 512 1024 2048
--syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount
-+syn keyword fsOptionsGeneral async atime auto current defaults dev devmtime exec force fstab noatime noauto noclusterr noclusterw nodev nodevmtime noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount
+-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
++syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
  syn match fsOptionsGeneral /_netdev/
  
  " Options: adfs
-@@ -91,6 +91,9 @@
- syn keyword fsOptionsFatType contained 12 16 32
- syn keyword fsOptionsKeywords contained quiet sys_immutable showexec dots nodots
+@@ -101,6 +101,9 @@
+ syn match fsOptionsKeywords contained /\<\%(dir\|file\|\)_umask=/ nextgroup=fsOptionsNumberOctal
+ syn match fsOptionsKeywords contained /\<\%(session\|part\)=/ nextgroup=fsOptionsNumber
  
 +" Options: ffs
 +syn keyword fsOptionsKeyWords contained softdep
 +
  " Options: hpfs
- syn match fsOptionsKeywords contained /case=/ nextgroup=fsOptionsHpfsCase
+ syn match fsOptionsKeywords contained /\<case=/ nextgroup=fsOptionsHpfsCase
  syn keyword fsOptionsHpfsCase contained lower asis
diff --git a/editors/vim-share/patches/patch-ad b/editors/vim-share/patches/patch-ad
index 291fd523eb4..1fda5d0cba3 100644
--- a/editors/vim-share/patches/patch-ad
+++ b/editors/vim-share/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2005/10/17 06:49:34 martti Exp $
+$NetBSD: patch-ad,v 1.9 2006/05/09 06:36:48 martti Exp $
 
---- 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 @@
+--- src/Makefile.orig	2006-05-07 16:25:27.000000000 +0300
++++ src/Makefile	2006-05-08 10:01:00.000000000 +0300
+@@ -1131,26 +1131,31 @@
  ### Athena GUI
  ### Use Xaw3d to make the menus look a little bit nicer
  #XAW_LIB = -lXaw3d
@@ -42,7 +42,16 @@ $NetBSD: patch-ad,v 1.8 2005/10/17 06:49:34 martti Exp $
  ATHENA_LIBS2	= -lXt
  ATHENA_INSTALL  = install_normal
  ATHENA_TARGETS	= installglinks
-@@ -1788,7 +1793,7 @@
+@@ -1773,7 +1778,7 @@
+ 	-$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS)
+ 	@echo generating help tags
+ # Generate the help tags with ":helptags" to handle all languages.
+-	-@cd $(HELPSOURCE); $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags
++	-@cd $(HELPSOURCE); $(MAKE) VIMEXE=../../src/$(VIMTARGET) vimtags
+ 	cd $(HELPSOURCE); \
+ 		files=`ls *.txt tags`; \
+ 		files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
+@@ -1897,7 +1902,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/patches/patch-zb b/editors/vim-share/patches/patch-zb
index 18dc0185b13..7c4aadf7383 100644
--- a/editors/vim-share/patches/patch-zb
+++ b/editors/vim-share/patches/patch-zb
@@ -1,8 +1,8 @@
-$NetBSD: patch-zb,v 1.5 2003/06/02 07:27:27 martti Exp $
+$NetBSD: patch-zb,v 1.6 2006/05/09 06:36:48 martti Exp $
 
---- src/feature.h.orig	Sun May 25 20:44:49 2003
-+++ src/feature.h	Mon Jun  2 09:55:23 2003
-@@ -504,7 +504,7 @@
+--- src/feature.h.orig	2006-04-06 11:01:52.000000000 +0300
++++ src/feature.h	2006-04-17 06:02:54.000000000 +0300
+@@ -548,7 +548,7 @@
   *			(used only with NO_BUILTIN_TCAPS not defined).
   */
  #ifdef HAVE_TGETENT
diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk
index 99faff3db63..9acf878f60b 100644
--- a/editors/vim-share/version.mk
+++ b/editors/vim-share/version.mk
@@ -1,5 +1,5 @@
-# $NetBSD: version.mk,v 1.7 2006/02/28 11:03:17 martti Exp $
+# $NetBSD: version.mk,v 1.8 2006/05/09 06:36:48 martti Exp $
 
-VIM_VERSION=		6.4
-VIM_PATCHLEVEL=		8
-VIM_SUBDIR=		vim64
+VIM_VERSION=		7.0
+VIM_PATCHLEVEL=		0
+VIM_SUBDIR=		vim70