Update to version 6.0 Beta G.

3 files changed, 76 insertions, 66 deletions

diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index 2fb5ae82044e..f1aed7da4689 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	vim
-PORTVERSION=	6.0e
+PORTVERSION=	6.0g
 CATEGORIES=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unreleased/unix/ \
 		ftp://ftp.nuxi.com/pub/vim/unreleased/unix/ \
diff --git a/editors/vim6/distinfo b/editors/vim6/distinfo
index c670e9a6c77f..3ef9253f082f 100644
--- a/editors/vim6/distinfo
+++ b/editors/vim6/distinfo
@@ -1,2 +1,2 @@
-MD5 (vim/vim-6.0e-src.tar.gz) = e46fd205917c230ffe1940b1f526ef09
-MD5 (vim/vim-6.0e-rt.tar.gz) = cfd7d526d1e53043363a132db6212396
+MD5 (vim/vim-6.0g-src.tar.gz) = 71ce77c018fecf1ebc254e98cced5cd4
+MD5 (vim/vim-6.0g-rt.tar.gz) = 34b7ec6e7676476ec25f53b8becbdc93
diff --git a/editors/vim6/pkg-plist b/editors/vim6/pkg-plist
index e9becbc8a2c7..092897653344 100644
--- a/editors/vim6/pkg-plist
+++ b/editors/vim6/pkg-plist
@@ -13,15 +13,20 @@ bin/rgvim
 bin/rview
 bin/rvim
 @comment bin/view
+share/vim/%%VIM_VER%%/bugreport.vim
 share/vim/%%VIM_VER%%/doc/autocmd.txt
 share/vim/%%VIM_VER%%/doc/change.txt
 share/vim/%%VIM_VER%%/doc/cmdline.txt
+share/vim/%%VIM_VER%%/doc/debugger.txt
 share/vim/%%VIM_VER%%/doc/develop.txt
 share/vim/%%VIM_VER%%/doc/digraph.txt
 share/vim/%%VIM_VER%%/doc/editing.txt
 share/vim/%%VIM_VER%%/doc/eval.txt
 share/vim/%%VIM_VER%%/doc/farsi.txt
+share/vim/%%VIM_VER%%/doc/filetype.txt
+share/vim/%%VIM_VER%%/doc/fold.txt
 share/vim/%%VIM_VER%%/doc/gui.txt
+share/vim/%%VIM_VER%%/doc/gui_w16.txt
 share/vim/%%VIM_VER%%/doc/gui_w32.txt
 share/vim/%%VIM_VER%%/doc/gui_x11.txt
 share/vim/%%VIM_VER%%/doc/hangulin.txt
@@ -40,7 +45,9 @@ share/vim/%%VIM_VER%%/doc/map.txt
 share/vim/%%VIM_VER%%/doc/message.txt
 share/vim/%%VIM_VER%%/doc/motion.txt
 share/vim/%%VIM_VER%%/doc/multibyte.txt
+share/vim/%%VIM_VER%%/doc/multilang.txt
 share/vim/%%VIM_VER%%/doc/options.txt
+share/vim/%%VIM_VER%%/doc/os_390.txt
 share/vim/%%VIM_VER%%/doc/os_amiga.txt
 share/vim/%%VIM_VER%%/doc/os_beos.txt
 share/vim/%%VIM_VER%%/doc/os_dos.txt
@@ -54,35 +61,82 @@ share/vim/%%VIM_VER%%/doc/os_vms.txt
 share/vim/%%VIM_VER%%/doc/os_win32.txt
 share/vim/%%VIM_VER%%/doc/pattern.txt
 share/vim/%%VIM_VER%%/doc/quickfix.txt
+share/vim/%%VIM_VER%%/doc/quickref.txt
 share/vim/%%VIM_VER%%/doc/quotes.txt
 share/vim/%%VIM_VER%%/doc/recover.txt
 share/vim/%%VIM_VER%%/doc/repeat.txt
 share/vim/%%VIM_VER%%/doc/rightleft.txt
 share/vim/%%VIM_VER%%/doc/scroll.txt
+share/vim/%%VIM_VER%%/doc/sign.txt
 share/vim/%%VIM_VER%%/doc/starting.txt
 share/vim/%%VIM_VER%%/doc/syntax.txt
-share/vim/%%VIM_VER%%/doc/term.txt
+share/vim/%%VIM_VER%%/doc/tags
 share/vim/%%VIM_VER%%/doc/tagsearch.txt
+share/vim/%%VIM_VER%%/doc/term.txt
 share/vim/%%VIM_VER%%/doc/tips.txt
 share/vim/%%VIM_VER%%/doc/todo.txt
 share/vim/%%VIM_VER%%/doc/uganda.txt
 share/vim/%%VIM_VER%%/doc/undo.txt
+share/vim/%%VIM_VER%%/doc/usr_01.txt
+share/vim/%%VIM_VER%%/doc/usr_02.txt
+share/vim/%%VIM_VER%%/doc/usr_03.txt
+share/vim/%%VIM_VER%%/doc/usr_04.txt
+share/vim/%%VIM_VER%%/doc/usr_06.txt
+share/vim/%%VIM_VER%%/doc/usr_07.txt
+share/vim/%%VIM_VER%%/doc/usr_28.txt
+share/vim/%%VIM_VER%%/doc/usr_40.txt
+share/vim/%%VIM_VER%%/doc/usr_43.txt
+share/vim/%%VIM_VER%%/doc/usr_90.txt
+share/vim/%%VIM_VER%%/doc/usr_toc.txt
 share/vim/%%VIM_VER%%/doc/various.txt
 share/vim/%%VIM_VER%%/doc/version4.txt
 share/vim/%%VIM_VER%%/doc/version5.txt
+share/vim/%%VIM_VER%%/doc/version6.txt
 share/vim/%%VIM_VER%%/doc/vi_diff.txt
+share/vim/%%VIM_VER%%/doc/vim2html.pl
 share/vim/%%VIM_VER%%/doc/visual.txt
 share/vim/%%VIM_VER%%/doc/windows.txt
-share/vim/%%VIM_VER%%/doc/tags
-share/vim/%%VIM_VER%%/doc/vim2html.pl
+share/vim/%%VIM_VER%%/doc/workshop.txt
+share/vim/%%VIM_VER%%/filetype.vim
+share/vim/%%VIM_VER%%/ftoff.vim
+share/vim/%%VIM_VER%%/gvimrc_example.vim
+share/vim/%%VIM_VER%%/macros/README.txt
+share/vim/%%VIM_VER%%/macros/diffwin.vim
+share/vim/%%VIM_VER%%/macros/dvorak
+share/vim/%%VIM_VER%%/macros/explorer.vim
+share/vim/%%VIM_VER%%/macros/hanoi/click.me
+share/vim/%%VIM_VER%%/macros/hanoi/hanoi.vim
+share/vim/%%VIM_VER%%/macros/hanoi/poster
+share/vim/%%VIM_VER%%/macros/html
+share/vim/%%VIM_VER%%/macros/justify.vim
+share/vim/%%VIM_VER%%/macros/life/click.me
+share/vim/%%VIM_VER%%/macros/life/life.vim
+share/vim/%%VIM_VER%%/macros/maze/Makefile
+share/vim/%%VIM_VER%%/macros/maze/README.txt
+share/vim/%%VIM_VER%%/macros/maze/maze.c
+share/vim/%%VIM_VER%%/macros/maze/maze_5.78
+share/vim/%%VIM_VER%%/macros/maze/maze_mac
+share/vim/%%VIM_VER%%/macros/maze/mazeansi.c
+share/vim/%%VIM_VER%%/macros/maze/poster
+share/vim/%%VIM_VER%%/macros/shellmenu.vim
+share/vim/%%VIM_VER%%/macros/swapmous.vim
+share/vim/%%VIM_VER%%/macros/urm/README.txt
+share/vim/%%VIM_VER%%/macros/urm/examples
+share/vim/%%VIM_VER%%/macros/urm/urm
+share/vim/%%VIM_VER%%/macros/urm/urm.vim
+share/vim/%%VIM_VER%%/menu.vim
+share/vim/%%VIM_VER%%/optwin.vim
+share/vim/%%VIM_VER%%/scripts.vim
 share/vim/%%VIM_VER%%/syntax/2html.vim
 share/vim/%%VIM_VER%%/syntax/abaqus.vim
 share/vim/%%VIM_VER%%/syntax/abc.vim
 share/vim/%%VIM_VER%%/syntax/abel.vim
 share/vim/%%VIM_VER%%/syntax/ada.vim
+share/vim/%%VIM_VER%%/syntax/aflex.vim
 share/vim/%%VIM_VER%%/syntax/ahdl.vim
 share/vim/%%VIM_VER%%/syntax/amiga.vim
 share/vim/%%VIM_VER%%/syntax/aml.vim
+share/vim/%%VIM_VER%%/syntax/antlr.vim
 share/vim/%%VIM_VER%%/syntax/apache.vim
 share/vim/%%VIM_VER%%/syntax/apachestyle.vim
 share/vim/%%VIM_VER%%/syntax/asm.vim
@@ -91,11 +145,15 @@ share/vim/%%VIM_VER%%/syntax/asn.vim
 share/vim/%%VIM_VER%%/syntax/aspperl.vim
 share/vim/%%VIM_VER%%/syntax/aspvbs.vim
 share/vim/%%VIM_VER%%/syntax/atlas.vim
+share/vim/%%VIM_VER%%/syntax/automake.vim
 share/vim/%%VIM_VER%%/syntax/ave.vim
 share/vim/%%VIM_VER%%/syntax/awk.vim
+share/vim/%%VIM_VER%%/syntax/ayacc.vim
+share/vim/%%VIM_VER%%/syntax/b.vim
 share/vim/%%VIM_VER%%/syntax/basic.vim
 share/vim/%%VIM_VER%%/syntax/bc.vim
 share/vim/%%VIM_VER%%/syntax/bib.vim
+share/vim/%%VIM_VER%%/syntax/blank.vim
 share/vim/%%VIM_VER%%/syntax/btm.vim
 share/vim/%%VIM_VER%%/syntax/c.vim
 share/vim/%%VIM_VER%%/syntax/cf.vim
@@ -132,6 +190,7 @@ share/vim/%%VIM_VER%%/syntax/erlang.vim
 share/vim/%%VIM_VER%%/syntax/esqlc.vim
 share/vim/%%VIM_VER%%/syntax/expect.vim
 share/vim/%%VIM_VER%%/syntax/exports.vim
+share/vim/%%VIM_VER%%/syntax/fgl.vim
 share/vim/%%VIM_VER%%/syntax/focexec.vim
 share/vim/%%VIM_VER%%/syntax/form.vim
 share/vim/%%VIM_VER%%/syntax/forth.vim
@@ -153,6 +212,7 @@ share/vim/%%VIM_VER%%/syntax/idl.vim
 share/vim/%%VIM_VER%%/syntax/idlang.vim
 share/vim/%%VIM_VER%%/syntax/inform.vim
 share/vim/%%VIM_VER%%/syntax/ishd.vim
+share/vim/%%VIM_VER%%/syntax/iss.vim
 share/vim/%%VIM_VER%%/syntax/ist.vim
 share/vim/%%VIM_VER%%/syntax/java.vim
 share/vim/%%VIM_VER%%/syntax/javacc.vim
@@ -180,6 +240,7 @@ share/vim/%%VIM_VER%%/syntax/man.vim
 share/vim/%%VIM_VER%%/syntax/manual.vim
 share/vim/%%VIM_VER%%/syntax/maple.vim
 share/vim/%%VIM_VER%%/syntax/masm.vim
+share/vim/%%VIM_VER%%/syntax/mason.vim
 share/vim/%%VIM_VER%%/syntax/master.vim
 share/vim/%%VIM_VER%%/syntax/matlab.vim
 share/vim/%%VIM_VER%%/syntax/mel.vim
@@ -219,10 +280,12 @@ share/vim/%%VIM_VER%%/syntax/prolog.vim
 share/vim/%%VIM_VER%%/syntax/ptcap.vim
 share/vim/%%VIM_VER%%/syntax/purifylog.vim
 share/vim/%%VIM_VER%%/syntax/python.vim
+share/vim/%%VIM_VER%%/syntax/qf.vim
 share/vim/%%VIM_VER%%/syntax/radiance.vim
 share/vim/%%VIM_VER%%/syntax/rc.vim
 share/vim/%%VIM_VER%%/syntax/rcslog.vim
 share/vim/%%VIM_VER%%/syntax/rebol.vim
+share/vim/%%VIM_VER%%/syntax/registry.vim
 share/vim/%%VIM_VER%%/syntax/remind.vim
 share/vim/%%VIM_VER%%/syntax/rexx.vim
 share/vim/%%VIM_VER%%/syntax/rpcgen.vim
@@ -245,10 +308,12 @@ share/vim/%%VIM_VER%%/syntax/slrnrc.vim
 share/vim/%%VIM_VER%%/syntax/slrnsc.vim
 share/vim/%%VIM_VER%%/syntax/sm.vim
 share/vim/%%VIM_VER%%/syntax/smil.vim
+share/vim/%%VIM_VER%%/syntax/smith.vim
 share/vim/%%VIM_VER%%/syntax/sml.vim
 share/vim/%%VIM_VER%%/syntax/snnsnet.vim
 share/vim/%%VIM_VER%%/syntax/snnspat.vim
 share/vim/%%VIM_VER%%/syntax/snnsres.vim
+share/vim/%%VIM_VER%%/syntax/snobol4.vim
 share/vim/%%VIM_VER%%/syntax/spec.vim
 share/vim/%%VIM_VER%%/syntax/spice.vim
 share/vim/%%VIM_VER%%/syntax/spup.vim
@@ -290,66 +355,6 @@ share/vim/%%VIM_VER%%/syntax/xxd.vim
 share/vim/%%VIM_VER%%/syntax/yacc.vim
 share/vim/%%VIM_VER%%/syntax/z8a.vim
 share/vim/%%VIM_VER%%/syntax/zsh.vim
-share/vim/%%VIM_VER%%/tutor/README.txt
-share/vim/%%VIM_VER%%/tutor/tutor
-share/vim/%%VIM_VER%%/menu.vim
-share/vim/%%VIM_VER%%/bugreport.vim
-share/vim/%%VIM_VER%%/vimrc_example.vim
-share/vim/%%VIM_VER%%/gvimrc_example.vim
-share/vim/%%VIM_VER%%/filetype.vim
-share/vim/%%VIM_VER%%/ftoff.vim
-share/vim/%%VIM_VER%%/scripts.vim
-share/vim/%%VIM_VER%%/optwin.vim
-share/vim/%%VIM_VER%%/macros/README.txt
-share/vim/%%VIM_VER%%/macros/diffwin.vim
-share/vim/%%VIM_VER%%/macros/dvorak
-share/vim/%%VIM_VER%%/macros/explorer.vim
-share/vim/%%VIM_VER%%/macros/hanoi/poster
-share/vim/%%VIM_VER%%/macros/hanoi/click.me
-share/vim/%%VIM_VER%%/macros/hanoi/hanoi.vim
-share/vim/%%VIM_VER%%/macros/html
-share/vim/%%VIM_VER%%/macros/justify.vim
-share/vim/%%VIM_VER%%/macros/life/click.me
-share/vim/%%VIM_VER%%/macros/life/life.vim
-share/vim/%%VIM_VER%%/macros/maze/README.txt
-share/vim/%%VIM_VER%%/macros/maze/Makefile
-share/vim/%%VIM_VER%%/macros/maze/maze.c
-share/vim/%%VIM_VER%%/macros/maze/maze_5.78
-share/vim/%%VIM_VER%%/macros/maze/mazeansi.c
-share/vim/%%VIM_VER%%/macros/maze/maze_mac
-share/vim/%%VIM_VER%%/macros/maze/poster
-share/vim/%%VIM_VER%%/macros/shellmenu.vim
-share/vim/%%VIM_VER%%/macros/swapmous.vim
-share/vim/%%VIM_VER%%/macros/urm/urm
-share/vim/%%VIM_VER%%/macros/urm/urm.vim
-share/vim/%%VIM_VER%%/macros/urm/examples
-share/vim/%%VIM_VER%%/macros/urm/README.txt
-share/vim/%%VIM_VER%%/syntax/abaqus.vim
-share/vim/%%VIM_VER%%/syntax/apache.vim
-share/vim/%%VIM_VER%%/syntax/aspperl.vim
-share/vim/%%VIM_VER%%/syntax/bc.vim
-share/vim/%%VIM_VER%%/syntax/ch.vim
-share/vim/%%VIM_VER%%/syntax/conf.vim
-share/vim/%%VIM_VER%%/syntax/csp.vim
-share/vim/%%VIM_VER%%/syntax/cvs.vim
-share/vim/%%VIM_VER%%/syntax/form.vim
-share/vim/%%VIM_VER%%/syntax/hb.vim
-share/vim/%%VIM_VER%%/syntax/jproperties.vim
-share/vim/%%VIM_VER%%/syntax/kscript.vim
-share/vim/%%VIM_VER%%/syntax/latte.vim
-share/vim/%%VIM_VER%%/syntax/mel.vim
-share/vim/%%VIM_VER%%/syntax/nastran.vim
-share/vim/%%VIM_VER%%/syntax/ora.vim
-share/vim/%%VIM_VER%%/syntax/ruby.vim
-share/vim/%%VIM_VER%%/syntax/samba.vim
-share/vim/%%VIM_VER%%/syntax/sml.vim
-share/vim/%%VIM_VER%%/syntax/snnsnet.vim
-share/vim/%%VIM_VER%%/syntax/snnspat.vim
-share/vim/%%VIM_VER%%/syntax/snnsres.vim
-share/vim/%%VIM_VER%%/syntax/stp.vim
-share/vim/%%VIM_VER%%/syntax/tli.vim
-share/vim/%%VIM_VER%%/syntax/webmacro.vim
-share/vim/%%VIM_VER%%/syntax/wml.vim
 share/vim/%%VIM_VER%%/tools/README.txt
 share/vim/%%VIM_VER%%/tools/blink.c
 share/vim/%%VIM_VER%%/tools/ccfilter.1
@@ -369,7 +374,12 @@ share/vim/%%VIM_VER%%/tools/vim132
 share/vim/%%VIM_VER%%/tools/vimm
 share/vim/%%VIM_VER%%/tools/vimspell.sh
 share/vim/%%VIM_VER%%/tools/vimspell.txt
+share/vim/%%VIM_VER%%/tutor/README.txt
+share/vim/%%VIM_VER%%/tutor/tutor
+share/vim/%%VIM_VER%%/vimrc_example.vim
+@exec mkdir share/vim/%%VIM_VER%%/lang
 @dirrm share/vim/%%VIM_VER%%/doc
+@dirrm share/vim/%%VIM_VER%%/lang
 @dirrm share/vim/%%VIM_VER%%/macros/hanoi
 @dirrm share/vim/%%VIM_VER%%/macros/life
 @dirrm share/vim/%%VIM_VER%%/macros/maze