Updated vim to 6.2.0

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

The main new features are:
- Support for GTK 2. (Daniel Elstner)
- Support for editing Arabic text. (Nadim Shaikli & Isam Bayazidi)
- ":try" command and exception handling. (Servatius Brandt)
- Support for the neXtaw GUI toolkit (mostly like Athena). (Alexey Froloff)
- Support for PostScript printing in various 8-bit encodings. (Mike Williams)

6 files changed, 148 insertions, 27 deletions

diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index 1a86579e14f..04502e4dc41 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/03/24 19:39:08 martti Exp $
+# $NetBSD: Makefile,v 1.9 2003/06/02 07:27:25 martti Exp $
 
 .include		"Makefile.common"
 
@@ -10,7 +10,7 @@ CONFIGURE_ARGS+=	--disable-gui
 
 INSTALL_TARGET=		installruntime installmacros installtutor installtools
 
-PLIST_SUBST+=		VIM_SUBDIR="vim61"
+PLIST_SUBST+=		VIM_SUBDIR="vim62"
 
 do-build:
 	@cd ${WRKSRC}/xxd && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 4cc7012066d..3bad3e4ee32 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.32 2003/03/29 12:40:47 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.33 2003/06/02 07:27:25 martti Exp $
 
-VIM_VERSION=		6.1
-VIM_PATCHLEVEL=		405
-DISTNAME=		vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
-WRKSRC=			${WRKDIR}/vim61/src
+VIM_VERSION=		6.2
+VIM_PATCHLEVEL=		0
+DISTNAME=		vim-${VIM_VERSION}
+WRKSRC=			${WRKDIR}/vim62/src
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
 			ftp://ftp.fu-berlin.de/misc/editors/vim/unix/ \
@@ -30,9 +30,9 @@ GNU_CONFIGURE=		yes
 # files (and PLIST might not include all files) so use at your own risk!
 CONFIGURE_ARGS+=	${VIM_EXTRA_OPTS}
 
-PATCH_ARGS=		-d ${WRKDIR}/vim61 --forward --quiet \
+PATCH_ARGS=		-d ${WRKDIR}/vim62 --forward --quiet \
 				-E ${PATCH_STRIP}
-PATCH_DIST_ARGS=	-d ${WRKDIR}/vim61 --forward --quiet \
+PATCH_DIST_ARGS=	-d ${WRKDIR}/vim62 --forward --quiet \
 				-E ${PATCH_DIST_STRIP}
 PATCHDIR?=		${.CURDIR}/../vim-share/patches
 DISTINFO_FILE?=		${.CURDIR}/../vim-share/distinfo
diff --git a/editors/vim-share/PLIST b/editors/vim-share/PLIST
index 37635870683..528683464f2 100644
--- a/editors/vim-share/PLIST
+++ b/editors/vim-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/16 08:02:39 martti Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/06/02 07:27:26 martti Exp $
 bin/vimtutor
 bin/xxd
 man/man1/evim.1
@@ -11,6 +11,7 @@ share/vim/${VIM_SUBDIR}/colors/README.txt
 share/vim/${VIM_SUBDIR}/colors/blue.vim
 share/vim/${VIM_SUBDIR}/colors/darkblue.vim
 share/vim/${VIM_SUBDIR}/colors/default.vim
+share/vim/${VIM_SUBDIR}/colors/desert.vim
 share/vim/${VIM_SUBDIR}/colors/elflord.vim
 share/vim/${VIM_SUBDIR}/colors/evening.vim
 share/vim/${VIM_SUBDIR}/colors/koehler.vim
@@ -25,17 +26,30 @@ share/vim/${VIM_SUBDIR}/colors/zellner.vim
 share/vim/${VIM_SUBDIR}/compiler/README.txt
 share/vim/${VIM_SUBDIR}/compiler/ant.vim
 share/vim/${VIM_SUBDIR}/compiler/bcc.vim
+share/vim/${VIM_SUBDIR}/compiler/checkstyle.vim
+share/vim/${VIM_SUBDIR}/compiler/cs.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
+share/vim/${VIM_SUBDIR}/compiler/fortran_g77.vim
+share/vim/${VIM_SUBDIR}/compiler/fortran_lf95.vim
+share/vim/${VIM_SUBDIR}/compiler/hp_acc.vim
 share/vim/${VIM_SUBDIR}/compiler/irix5_c.vim
 share/vim/${VIM_SUBDIR}/compiler/irix5_cpp.vim
 share/vim/${VIM_SUBDIR}/compiler/jikes.vim
 share/vim/${VIM_SUBDIR}/compiler/mips_c.vim
 share/vim/${VIM_SUBDIR}/compiler/mipspro_c89.vim
 share/vim/${VIM_SUBDIR}/compiler/mipspro_cpp.vim
+share/vim/${VIM_SUBDIR}/compiler/modelsim_vcom.vim
 share/vim/${VIM_SUBDIR}/compiler/msvc.vim
+share/vim/${VIM_SUBDIR}/compiler/pyunit.vim
+share/vim/${VIM_SUBDIR}/compiler/ruby.vim
 share/vim/${VIM_SUBDIR}/compiler/splint.vim
 share/vim/${VIM_SUBDIR}/compiler/tex.vim
 share/vim/${VIM_SUBDIR}/compiler/tidy.vim
+share/vim/${VIM_SUBDIR}/compiler/xmllint.vim
 share/vim/${VIM_SUBDIR}/delmenu.vim
+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
@@ -53,6 +67,7 @@ share/vim/${VIM_SUBDIR}/doc/gui_w16.txt
 share/vim/${VIM_SUBDIR}/doc/gui_w32.txt
 share/vim/${VIM_SUBDIR}/doc/gui_x11.txt
 share/vim/${VIM_SUBDIR}/doc/hangulin.txt
+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
@@ -150,55 +165,84 @@ share/vim/${VIM_SUBDIR}/doc/vim2html.pl
 share/vim/${VIM_SUBDIR}/doc/visual.txt
 share/vim/${VIM_SUBDIR}/doc/windows.txt
 share/vim/${VIM_SUBDIR}/doc/workshop.txt
-share/vim/${VIM_SUBDIR}/evebcdic.ps
 share/vim/${VIM_SUBDIR}/evim.vim
-share/vim/${VIM_SUBDIR}/eviso.ps
 share/vim/${VIM_SUBDIR}/filetype.vim
 share/vim/${VIM_SUBDIR}/ftoff.vim
 share/vim/${VIM_SUBDIR}/ftplugin.vim
 share/vim/${VIM_SUBDIR}/ftplugin/README.txt
 share/vim/${VIM_SUBDIR}/ftplugin/abaqus.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ada.vim
+share/vim/${VIM_SUBDIR}/ftplugin/ant.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/c.vim
 share/vim/${VIM_SUBDIR}/ftplugin/changelog.vim
+share/vim/${VIM_SUBDIR}/ftplugin/config.vim
 share/vim/${VIM_SUBDIR}/ftplugin/cpp.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/debchangelog.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dosbatch.vim
+share/vim/${VIM_SUBDIR}/ftplugin/dtd.vim
 share/vim/${VIM_SUBDIR}/ftplugin/fortran.vim
+share/vim/${VIM_SUBDIR}/ftplugin/html.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ishd.vim
 share/vim/${VIM_SUBDIR}/ftplugin/java.vim
+share/vim/${VIM_SUBDIR}/ftplugin/jsp.vim
 share/vim/${VIM_SUBDIR}/ftplugin/kwt.vim
+share/vim/${VIM_SUBDIR}/ftplugin/lisp.vim
 share/vim/${VIM_SUBDIR}/ftplugin/lprolog.vim
 share/vim/${VIM_SUBDIR}/ftplugin/lua.vim
 share/vim/${VIM_SUBDIR}/ftplugin/mail.vim
 share/vim/${VIM_SUBDIR}/ftplugin/make.vim
 share/vim/${VIM_SUBDIR}/ftplugin/man.vim
+share/vim/${VIM_SUBDIR}/ftplugin/mf.vim
+share/vim/${VIM_SUBDIR}/ftplugin/mp.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/pascal.vim
 share/vim/${VIM_SUBDIR}/ftplugin/perl.vim
+share/vim/${VIM_SUBDIR}/ftplugin/php.vim
 share/vim/${VIM_SUBDIR}/ftplugin/postscr.vim
 share/vim/${VIM_SUBDIR}/ftplugin/python.vim
 share/vim/${VIM_SUBDIR}/ftplugin/rpl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ruby.vim
+share/vim/${VIM_SUBDIR}/ftplugin/scheme.vim
+share/vim/${VIM_SUBDIR}/ftplugin/sgml.vim
+share/vim/${VIM_SUBDIR}/ftplugin/sh.vim
 share/vim/${VIM_SUBDIR}/ftplugin/spec.vim
+share/vim/${VIM_SUBDIR}/ftplugin/sql.vim
+share/vim/${VIM_SUBDIR}/ftplugin/svg.vim
+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/vim.vim
+share/vim/${VIM_SUBDIR}/ftplugin/xhtml.vim
+share/vim/${VIM_SUBDIR}/ftplugin/xml.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}/ftplugof.vim
 share/vim/${VIM_SUBDIR}/gvimrc_example.vim
 share/vim/${VIM_SUBDIR}/indent.vim
 share/vim/${VIM_SUBDIR}/indent/README.txt
 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/c.vim
 share/vim/${VIM_SUBDIR}/indent/cdl.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/dylan.vim
+share/vim/${VIM_SUBDIR}/indent/eiffel.vim
 share/vim/${VIM_SUBDIR}/indent/eterm.vim
 share/vim/${VIM_SUBDIR}/indent/fortran.vim
 share/vim/${VIM_SUBDIR}/indent/html.vim
@@ -209,21 +253,26 @@ 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/ocaml.vim
+share/vim/${VIM_SUBDIR}/indent/occam.vim
 share/vim/${VIM_SUBDIR}/indent/perl.vim
+share/vim/${VIM_SUBDIR}/indent/php.vim
 share/vim/${VIM_SUBDIR}/indent/postscr.vim
 share/vim/${VIM_SUBDIR}/indent/pov.vim
 share/vim/${VIM_SUBDIR}/indent/prolog.vim
 share/vim/${VIM_SUBDIR}/indent/python.vim
 share/vim/${VIM_SUBDIR}/indent/readline.vim
+share/vim/${VIM_SUBDIR}/indent/rpl.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/tcl.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/vim.vim
+share/vim/${VIM_SUBDIR}/indent/xhtml.vim
 share/vim/${VIM_SUBDIR}/indent/xml.vim
+share/vim/${VIM_SUBDIR}/indent/xslt.vim
 share/vim/${VIM_SUBDIR}/indent/yacc.vim
 share/vim/${VIM_SUBDIR}/indoff.vim
 share/vim/${VIM_SUBDIR}/macros/README.txt
@@ -259,11 +308,40 @@ share/vim/${VIM_SUBDIR}/plugin/explorer.vim
 share/vim/${VIM_SUBDIR}/plugin/gzip.vim
 share/vim/${VIM_SUBDIR}/plugin/netrw.vim
 share/vim/${VIM_SUBDIR}/plugin/rrhelper.vim
-share/vim/${VIM_SUBDIR}/procset.ps
+share/vim/${VIM_SUBDIR}/plugin/tohtml.vim
+share/vim/${VIM_SUBDIR}/print/cp1250.ps
+share/vim/${VIM_SUBDIR}/print/cp1251.ps
+share/vim/${VIM_SUBDIR}/print/cp1252.ps
+share/vim/${VIM_SUBDIR}/print/cp1253.ps
+share/vim/${VIM_SUBDIR}/print/cp1254.ps
+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/hp-roman8.ps
+share/vim/${VIM_SUBDIR}/print/iso-8859-10.ps
+share/vim/${VIM_SUBDIR}/print/iso-8859-11.ps
+share/vim/${VIM_SUBDIR}/print/iso-8859-13.ps
+share/vim/${VIM_SUBDIR}/print/iso-8859-14.ps
+share/vim/${VIM_SUBDIR}/print/iso-8859-15.ps
+share/vim/${VIM_SUBDIR}/print/iso-8859-2.ps
+share/vim/${VIM_SUBDIR}/print/iso-8859-3.ps
+share/vim/${VIM_SUBDIR}/print/iso-8859-4.ps
+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/koi8-r.ps
+share/vim/${VIM_SUBDIR}/print/koi8-u.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}/synmenu.vim
 share/vim/${VIM_SUBDIR}/syntax/2html.vim
 share/vim/${VIM_SUBDIR}/syntax/README.txt
+share/vim/${VIM_SUBDIR}/syntax/a65.vim
+share/vim/${VIM_SUBDIR}/syntax/aap.vim
 share/vim/${VIM_SUBDIR}/syntax/abaqus.vim
 share/vim/${VIM_SUBDIR}/syntax/abc.vim
 share/vim/${VIM_SUBDIR}/syntax/abel.vim
@@ -278,6 +356,7 @@ share/vim/${VIM_SUBDIR}/syntax/ant.vim
 share/vim/${VIM_SUBDIR}/syntax/antlr.vim
 share/vim/${VIM_SUBDIR}/syntax/apache.vim
 share/vim/${VIM_SUBDIR}/syntax/apachestyle.vim
+share/vim/${VIM_SUBDIR}/syntax/art.vim
 share/vim/${VIM_SUBDIR}/syntax/asm.vim
 share/vim/${VIM_SUBDIR}/syntax/asm68k.vim
 share/vim/${VIM_SUBDIR}/syntax/asmh8300.vim
@@ -307,6 +386,7 @@ share/vim/${VIM_SUBDIR}/syntax/ch.vim
 share/vim/${VIM_SUBDIR}/syntax/change.vim
 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/cl.vim
 share/vim/${VIM_SUBDIR}/syntax/clean.vim
 share/vim/${VIM_SUBDIR}/syntax/clipper.vim
@@ -326,17 +406,22 @@ share/vim/${VIM_SUBDIR}/syntax/ctrlh.vim
 share/vim/${VIM_SUBDIR}/syntax/cupl.vim
 share/vim/${VIM_SUBDIR}/syntax/cuplsim.vim
 share/vim/${VIM_SUBDIR}/syntax/cvs.vim
+share/vim/${VIM_SUBDIR}/syntax/cvsrc.vim
 share/vim/${VIM_SUBDIR}/syntax/cweb.vim
 share/vim/${VIM_SUBDIR}/syntax/cynlib.vim
 share/vim/${VIM_SUBDIR}/syntax/cynpp.vim
+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/def.vim
+share/vim/${VIM_SUBDIR}/syntax/desc.vim
 share/vim/${VIM_SUBDIR}/syntax/diff.vim
 share/vim/${VIM_SUBDIR}/syntax/diva.vim
 share/vim/${VIM_SUBDIR}/syntax/dns.vim
 share/vim/${VIM_SUBDIR}/syntax/docbk.vim
+share/vim/${VIM_SUBDIR}/syntax/docbksgml.vim
+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
@@ -348,36 +433,46 @@ share/vim/${VIM_SUBDIR}/syntax/dylan.vim
 share/vim/${VIM_SUBDIR}/syntax/dylanintr.vim
 share/vim/${VIM_SUBDIR}/syntax/dylanlid.vim
 share/vim/${VIM_SUBDIR}/syntax/ecd.vim
+share/vim/${VIM_SUBDIR}/syntax/edif.vim
 share/vim/${VIM_SUBDIR}/syntax/eiffel.vim
 share/vim/${VIM_SUBDIR}/syntax/elf.vim
 share/vim/${VIM_SUBDIR}/syntax/elmfilt.vim
 share/vim/${VIM_SUBDIR}/syntax/erlang.vim
 share/vim/${VIM_SUBDIR}/syntax/esqlc.vim
 share/vim/${VIM_SUBDIR}/syntax/eterm.vim
+share/vim/${VIM_SUBDIR}/syntax/exim.vim
 share/vim/${VIM_SUBDIR}/syntax/expect.vim
 share/vim/${VIM_SUBDIR}/syntax/exports.vim
+share/vim/${VIM_SUBDIR}/syntax/fetchmail.vim
 share/vim/${VIM_SUBDIR}/syntax/fgl.vim
 share/vim/${VIM_SUBDIR}/syntax/focexec.vim
 share/vim/${VIM_SUBDIR}/syntax/form.vim
 share/vim/${VIM_SUBDIR}/syntax/forth.vim
 share/vim/${VIM_SUBDIR}/syntax/fortran.vim
 share/vim/${VIM_SUBDIR}/syntax/foxpro.vim
+share/vim/${VIM_SUBDIR}/syntax/fstab.vim
 share/vim/${VIM_SUBDIR}/syntax/fvwm.vim
+share/vim/${VIM_SUBDIR}/syntax/fvwm2m4.vim
 share/vim/${VIM_SUBDIR}/syntax/gdb.vim
 share/vim/${VIM_SUBDIR}/syntax/gdmo.vim
 share/vim/${VIM_SUBDIR}/syntax/gedcom.vim
+share/vim/${VIM_SUBDIR}/syntax/gkrellmrc.vim
 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/groff.vim
+share/vim/${VIM_SUBDIR}/syntax/grub.vim
 share/vim/${VIM_SUBDIR}/syntax/gsp.vim
 share/vim/${VIM_SUBDIR}/syntax/gtkrc.vim
 share/vim/${VIM_SUBDIR}/syntax/haskell.vim
 share/vim/${VIM_SUBDIR}/syntax/hb.vim
 share/vim/${VIM_SUBDIR}/syntax/help.vim
 share/vim/${VIM_SUBDIR}/syntax/hercules.vim
+share/vim/${VIM_SUBDIR}/syntax/hex.vim
 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/htmlm4.vim
 share/vim/${VIM_SUBDIR}/syntax/htmlos.vim
 share/vim/${VIM_SUBDIR}/syntax/ia64.vim
@@ -387,9 +482,11 @@ 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/inittab.vim
+share/vim/${VIM_SUBDIR}/syntax/ipfilter.vim
 share/vim/${VIM_SUBDIR}/syntax/ishd.vim
 share/vim/${VIM_SUBDIR}/syntax/iss.vim
 share/vim/${VIM_SUBDIR}/syntax/ist.vim
+share/vim/${VIM_SUBDIR}/syntax/jal.vim
 share/vim/${VIM_SUBDIR}/syntax/jam.vim
 share/vim/${VIM_SUBDIR}/syntax/jargon.vim
 share/vim/${VIM_SUBDIR}/syntax/java.vim
@@ -411,8 +508,10 @@ share/vim/${VIM_SUBDIR}/syntax/lifelines.vim
 share/vim/${VIM_SUBDIR}/syntax/lilo.vim
 share/vim/${VIM_SUBDIR}/syntax/lisp.vim
 share/vim/${VIM_SUBDIR}/syntax/lite.vim
+share/vim/${VIM_SUBDIR}/syntax/logtalk.vim
 share/vim/${VIM_SUBDIR}/syntax/lotos.vim
 share/vim/${VIM_SUBDIR}/syntax/lout.vim
+share/vim/${VIM_SUBDIR}/syntax/lpc.vim
 share/vim/${VIM_SUBDIR}/syntax/lprolog.vim
 share/vim/${VIM_SUBDIR}/syntax/lscript.vim
 share/vim/${VIM_SUBDIR}/syntax/lss.vim
@@ -420,6 +519,7 @@ 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/mailcap.vim
 share/vim/${VIM_SUBDIR}/syntax/make.vim
 share/vim/${VIM_SUBDIR}/syntax/man.vim
 share/vim/${VIM_SUBDIR}/syntax/manual.vim
@@ -433,6 +533,8 @@ share/vim/${VIM_SUBDIR}/syntax/mf.vim
 share/vim/${VIM_SUBDIR}/syntax/mgp.vim
 share/vim/${VIM_SUBDIR}/syntax/mib.vim
 share/vim/${VIM_SUBDIR}/syntax/mma.vim
+share/vim/${VIM_SUBDIR}/syntax/mmix.vim
+share/vim/${VIM_SUBDIR}/syntax/modconf.vim
 share/vim/${VIM_SUBDIR}/syntax/model.vim
 share/vim/${VIM_SUBDIR}/syntax/modsim3.vim
 share/vim/${VIM_SUBDIR}/syntax/modula2.vim
@@ -440,9 +542,11 @@ share/vim/${VIM_SUBDIR}/syntax/modula3.vim
 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/msidl.vim
 share/vim/${VIM_SUBDIR}/syntax/msql.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/nasm.vim
 share/vim/${VIM_SUBDIR}/syntax/nastran.vim
@@ -453,7 +557,9 @@ share/vim/${VIM_SUBDIR}/syntax/nqc.vim
 share/vim/${VIM_SUBDIR}/syntax/nroff.vim
 share/vim/${VIM_SUBDIR}/syntax/nsis.vim
 share/vim/${VIM_SUBDIR}/syntax/objc.vim
+share/vim/${VIM_SUBDIR}/syntax/objcpp.vim
 share/vim/${VIM_SUBDIR}/syntax/ocaml.vim
+share/vim/${VIM_SUBDIR}/syntax/occam.vim
 share/vim/${VIM_SUBDIR}/syntax/omnimark.vim
 share/vim/${VIM_SUBDIR}/syntax/openroad.vim
 share/vim/${VIM_SUBDIR}/syntax/opl.vim
@@ -463,6 +569,7 @@ share/vim/${VIM_SUBDIR}/syntax/pascal.vim
 share/vim/${VIM_SUBDIR}/syntax/pcap.vim
 share/vim/${VIM_SUBDIR}/syntax/pccts.vim
 share/vim/${VIM_SUBDIR}/syntax/perl.vim
+share/vim/${VIM_SUBDIR}/syntax/pf.vim
 share/vim/${VIM_SUBDIR}/syntax/pfmain.vim
 share/vim/${VIM_SUBDIR}/syntax/php.vim
 share/vim/${VIM_SUBDIR}/syntax/phtml.vim
@@ -471,6 +578,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/plm.vim
+share/vim/${VIM_SUBDIR}/syntax/plp.vim
 share/vim/${VIM_SUBDIR}/syntax/plsql.vim
 share/vim/${VIM_SUBDIR}/syntax/po.vim
 share/vim/${VIM_SUBDIR}/syntax/pod.vim
@@ -487,16 +595,20 @@ share/vim/${VIM_SUBDIR}/syntax/ptcap.vim
 share/vim/${VIM_SUBDIR}/syntax/purifylog.vim
 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/radiance.vim
 share/vim/${VIM_SUBDIR}/syntax/ratpoison.vim
 share/vim/${VIM_SUBDIR}/syntax/rc.vim
+share/vim/${VIM_SUBDIR}/syntax/rcs.vim
 share/vim/${VIM_SUBDIR}/syntax/rcslog.vim
 share/vim/${VIM_SUBDIR}/syntax/readline.vim
 share/vim/${VIM_SUBDIR}/syntax/rebol.vim
 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/rib.vim
 share/vim/${VIM_SUBDIR}/syntax/robots.vim
 share/vim/${VIM_SUBDIR}/syntax/rpcgen.vim
 share/vim/${VIM_SUBDIR}/syntax/rpl.vim
@@ -526,6 +638,7 @@ share/vim/${VIM_SUBDIR}/syntax/slang.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/smil.vim
 share/vim/${VIM_SUBDIR}/syntax/smith.vim
 share/vim/${VIM_SUBDIR}/syntax/sml.vim
@@ -538,14 +651,18 @@ share/vim/${VIM_SUBDIR}/syntax/specman.vim
 share/vim/${VIM_SUBDIR}/syntax/spice.vim
 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/sqlforms.vim
 share/vim/${VIM_SUBDIR}/syntax/sqlj.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/stp.vim
 share/vim/${VIM_SUBDIR}/syntax/strace.vim
+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
@@ -562,6 +679,7 @@ share/vim/${VIM_SUBDIR}/syntax/texinfo.vim
 share/vim/${VIM_SUBDIR}/syntax/texmf.vim
 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/trasys.vim
 share/vim/${VIM_SUBDIR}/syntax/tsalt.vim
@@ -570,6 +688,7 @@ 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/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/vgrindefs.vim
@@ -590,6 +709,7 @@ share/vim/${VIM_SUBDIR}/syntax/wsh.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/xkb.vim
 share/vim/${VIM_SUBDIR}/syntax/xmath.vim
 share/vim/${VIM_SUBDIR}/syntax/xml.vim
@@ -638,6 +758,7 @@ share/vim/${VIM_SUBDIR}/vimrc_example.vim
 @dirrm share/vim/${VIM_SUBDIR}/macros/urm
 @dirrm share/vim/${VIM_SUBDIR}/macros
 @dirrm share/vim/${VIM_SUBDIR}/plugin
+@dirrm share/vim/${VIM_SUBDIR}/print
 @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 e2adff6f063..74f6e901573 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.26 2003/03/16 08:02:39 martti Exp $
+$NetBSD: distinfo,v 1.27 2003/06/02 07:27:26 martti Exp $
 
-SHA1 (vim/vim-6.1.405.tar.bz2) = 00d204857c21373d1415402a0aeafa823d1558b5
-Size (vim/vim-6.1.405.tar.bz2) = 2948337 bytes
-SHA1 (patch-ad) = c6db0db257ca40e990f7a34ca6545a1068c61c6a
-SHA1 (patch-zb) = 41f58d90a14f47b0bf242bb90178f0c872e4b022
+SHA1 (vim/vim-6.2.tar.bz2) = 6ce353635e1ae9194bb9bf8dd5226c5a8334bffb
+Size (vim/vim-6.2.tar.bz2) = 3269791 bytes
+SHA1 (patch-ad) = ea5585ac44b1696d1e1e848d7a038c1126f7ab7d
+SHA1 (patch-zb) = 3966ea9713cbf5d26072592443080c1884f48e75
diff --git a/editors/vim-share/patches/patch-ad b/editors/vim-share/patches/patch-ad
index 9e089d8a0e0..563f9bf99db 100644
--- a/editors/vim-share/patches/patch-ad
+++ b/editors/vim-share/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2003/03/16 08:02:40 martti Exp $
+$NetBSD: patch-ad,v 1.5 2003/06/02 07:27:26 martti Exp $
 
---- src/Makefile.orig	Sat Mar 15 16:55:18 2003
-+++ src/Makefile	Sun Mar 16 09:12:33 2003
-@@ -1013,26 +1013,31 @@
+--- src/Makefile.orig	Sun Jun  1 16:18:29 2003
++++ src/Makefile	Mon Jun  2 09:54:45 2003
+@@ -1045,26 +1045,31 @@
  ### Athena GUI
  ### Use Xaw3d to make the menus look a little bit nicer
  #XAW_LIB = -lXaw3d
diff --git a/editors/vim-share/patches/patch-zb b/editors/vim-share/patches/patch-zb
index 034c8644e36..18dc0185b13 100644
--- a/editors/vim-share/patches/patch-zb
+++ b/editors/vim-share/patches/patch-zb
@@ -1,8 +1,8 @@
-$NetBSD: patch-zb,v 1.4 2001/10/09 10:11:34 martti Exp $
+$NetBSD: patch-zb,v 1.5 2003/06/02 07:27:27 martti Exp $
 
---- src/feature.h.orig	Tue Sep 25 19:51:26 2001
-+++ src/feature.h	Thu Oct  4 14:10:53 2001
-@@ -489,7 +489,7 @@
+--- 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 @@
   *			(used only with NO_BUILTIN_TCAPS not defined).
   */
  #ifdef HAVE_TGETENT