21 files changed, 933 insertions, 819 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index fede796dad87..0b866aa63e76 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Sat June 29, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.39 1999/07/14 18:45:19 obrien Exp $
+# $Id: Makefile,v 1.40 1999/07/15 12:15:40 obrien Exp $
 #
 
-DISTNAME=	vim-5.3
+DISTNAME=	vim-5.4
 CATEGORIES=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
 		ftp://ftp.nuxi.com/pub/vim/unix/ \
@@ -31,8 +31,9 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRIP}
 MAKE_FLAGS=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib" -f
 ALL_TARGET=	#
-MAN1=		vim.1 xxd.1 ectags.1
-MLINKS=		vim.1 rvim.1  vim.1 rview.1
+PLIST_SUB=	VIM_VER=${DISTNAME:S/-//:S/.//}
+MAN1=		vim.1 vimtutor.1 xxd.1 ectags.1
+MLINKS=		vim.1 rvim.1  vim.1 rview.1  ectags.1 etags.1
 
 .if !defined(LITE)
 MLINKS+=	vim.1 gvim.1  vim.1 gview.1  vim.1 rgvim.1  vim.1 rgview.1  
@@ -67,6 +68,5 @@ post-install:
 .endif
 	@${RM} -f ${PREFIX}/man/man1/etags.1
 	@${MV} ${PREFIX}/man/man1/ctags.1 ${PREFIX}/man/man1/ectags.1
-	@${LN} -sf ${PREFIX}/man/man1/ectags.1.gz ${PREFIX}/man/man1/etags.1.gz
 
 .include <bsd.port.mk>
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index d816d9eabd91..281b6b18b404 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,2 +1,2 @@
-MD5 (vim-5.3-src.tar.gz) = d919bc16480599014adbcdfd19268d35
-MD5 (vim-5.3-rt.tar.gz) = 90c168f16bc87ac9d430d8137c55136f
+MD5 (vim-5.4-src.tar.gz) = 8aabff5a884ad436543fbfab70487c70
+MD5 (vim-5.4-rt.tar.gz) = 0e0c1ffa2a8afa62e8886440f015d937
diff --git a/editors/vim/files/patch-01 b/editors/vim/files/patch-01
index a6e8a32da5bd..012c17dd8c42 100644
--- a/editors/vim/files/patch-01
+++ b/editors/vim/files/patch-01
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Aug 30 09:16:50 1998
-+++ Makefile	Mon Mar 15 01:55:08 1999
-@@ -260,6 +260,7 @@
+--- Makefile.orig	Sun Aug 16 12:24:56 1998
++++ Makefile	Mon Aug 17 12:08:56 1998
+@@ -257,6 +257,7 @@
  
  # just an example:
  #CONF_ARGS = --exec-prefix=/usr
@@ -8,7 +8,7 @@
  
  # GUI - For creating Vim with GUI (gvim)
  # Uncomment the first line when you don't want to get the GUI version,
-@@ -1172,56 +1173,56 @@
+@@ -1167,28 +1168,28 @@
  installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
  
  $(BINDIR)/$(EXTARGET):
@@ -45,39 +45,3 @@
  
  # create links for the manual pages with various names to vim.  This is only
  # done when the links (or manpages with the same name) don't exist yet.
- installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(EXTARGET).1 $(MANSUBDIR)/$(VIEWTARGET).1 $(MANSUBDIR)/$(RVIMTARGET).1 $(MANSUBDIR)/$(RVIEWTARGET).1
- 
- $(MANSUBDIR)/$(EXTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(EXTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(EXTARGET).1
- 
- $(MANSUBDIR)/$(VIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(VIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(VIEWTARGET).1
- 
- $(MANSUBDIR)/$(GVIMTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIMTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(GVIMTARGET).1
- 
- $(MANSUBDIR)/$(GVIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(GVIEWTARGET).1
- 
- $(MANSUBDIR)/$(RVIMTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIMTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RVIMTARGET).1
- 
- $(MANSUBDIR)/$(RVIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RVIEWTARGET).1
- 
- $(MANSUBDIR)/$(RGVIMTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIMTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RGVIMTARGET).1
- 
- $(MANSUBDIR)/$(RGVIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RGVIEWTARGET).1
- 
- uninstall:
- 	-rm -f $(BINDIR)/$(VIMTARGET)$(SUFFIX)
diff --git a/editors/vim/files/patch-02 b/editors/vim/files/patch-02
index 1e4d4ddf502c..61cc5494e207 100644
--- a/editors/vim/files/patch-02
+++ b/editors/vim/files/patch-02
@@ -1,16 +1,7 @@
---- configure.orig	Thu Aug 13 12:59:48 1998
-+++ configure	Mon Aug 17 12:12:16 1998
-@@ -1253,7 +1253,7 @@
- if test "$enable_tclinterp" = "yes"; then
- 	
- 	# Extract the first word of "tclsh", so it can be a program name with args.
--set dummy tclsh; ac_word=$2
-+set dummy tclsh8.0; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:1259: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then
-@@ -2495,7 +2495,7 @@
-   gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$GUI_INC_LOC" | sed s/include/lib/` /local/Motif*/lib /local/lib/Motif* /usr/local/Motif*/lib /usr/local/lib/Motif* /usr/Motif*/lib /usr/lib/Motif* /usr/local/lib /usr/local/X11*/lib /usr/lib /usr/X11*/lib /usr/lib/X11* /usr/dt/lib $MOTIFHOME/lib $GUI_LIB_LOC"
+--- configure.orig	Thu Mar 11 07:11:42 1999
++++ configure	Mon Mar 22 10:45:57 1999
+@@ -3100,7 +3100,7 @@
+   gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` /local/Motif*/lib /local/lib/Motif* /usr/local/Motif*/lib /usr/local/lib/Motif* /usr/Motif*/lib /usr/lib/Motif* /usr/local/lib /usr/local/X11*/lib /usr/lib /usr/X11*/lib /usr/lib/X11* /usr/dt/lib $MOTIFHOME/lib `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
    GUI_LIB_LOC=
    for try in $gui_libs; do
 -    for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl; do
diff --git a/editors/vim/pkg-comment b/editors/vim/pkg-comment
index a341092c8d88..af8ac602b455 100644
--- a/editors/vim/pkg-comment
+++ b/editors/vim/pkg-comment
@@ -1 +1 @@
-A vi "workalike", with many additional features
+A vi "workalike", with many additional features.
diff --git a/editors/vim/pkg-descr b/editors/vim/pkg-descr
index d39d8584e3e9..b48bf2104ffa 100644
--- a/editors/vim/pkg-descr
+++ b/editors/vim/pkg-descr
@@ -21,5 +21,3 @@ Portability to all UNIX platforms, AmigaOS, Archimedes, Atari MiNT, BeOS,
 M$-DOS, MacOS, OS/2, VMS, WinNT+Win95.
 
 -- David	(obrien@cs.ucdavis.edu)
-
-WWW: http://www.vim.org
diff --git a/editors/vim/pkg-plist b/editors/vim/pkg-plist
index 37354ebc94a1..32c7492a961c 100644
--- a/editors/vim/pkg-plist
+++ b/editors/vim/pkg-plist
@@ -1,7 +1,8 @@
 bin/vim
+bin/vimtutor
 bin/ctags
-bin/xxd
 bin/etags
+bin/xxd
 @comment bin/ex
 @comment bin/gex
 bin/gview
@@ -11,213 +12,297 @@ bin/rgvim
 bin/rview
 bin/rvim
 @comment bin/view
-share/vim/doc/autocmd.txt
-share/vim/doc/change.txt
-share/vim/doc/cmdline.txt
-share/vim/doc/digraph.txt
-share/vim/doc/editing.txt
-share/vim/doc/eval.txt
-share/vim/doc/farsi.txt
-share/vim/doc/gui.txt
-share/vim/doc/gui_x11.txt
-share/vim/doc/gui_w32.txt
-share/vim/doc/help.txt
-share/vim/doc/howto.txt
-share/vim/doc/if_cscope.txt
-share/vim/doc/if_ole.txt
-share/vim/doc/if_perl.txt
-share/vim/doc/if_python.txt
-share/vim/doc/if_tcl.txt
-share/vim/doc/index.txt
-share/vim/doc/insert.txt
-share/vim/doc/intro.txt
-share/vim/doc/map.txt
-share/vim/doc/message.txt
-share/vim/doc/motion.txt
-share/vim/doc/options.txt
-share/vim/doc/os_amiga.txt
-share/vim/doc/os_beos.txt
-share/vim/doc/os_dos.txt
-share/vim/doc/os_mac.txt
-share/vim/doc/os_mint.txt
-share/vim/doc/os_msdos.txt
-share/vim/doc/os_os2.txt
-share/vim/doc/os_riscos.txt
-share/vim/doc/os_unix.txt
-share/vim/doc/os_vms.txt
-share/vim/doc/os_win32.txt
-share/vim/doc/pattern.txt
-share/vim/doc/quotes.txt
-share/vim/doc/quickfix.txt
-share/vim/doc/recover.txt
-share/vim/doc/repeat.txt
-share/vim/doc/rightleft.txt
-share/vim/doc/scroll.txt
-share/vim/doc/starting.txt
-share/vim/doc/syntax.txt
-share/vim/doc/tagsearch.txt
-share/vim/doc/term.txt
-share/vim/doc/tips.txt
-share/vim/doc/todo.txt
-share/vim/doc/uganda.txt
-share/vim/doc/undo.txt
-share/vim/doc/various.txt
-share/vim/doc/version4.txt
-share/vim/doc/version5.txt
-share/vim/doc/vi_diff.txt
-share/vim/doc/visual.txt
-share/vim/doc/windows.txt
-share/vim/doc/tags
-share/vim/macros/README.txt
-share/vim/macros/dvorak
-share/vim/macros/hanoi/click.me
-share/vim/macros/hanoi/hanoi.mac
-share/vim/macros/hanoi/poster
-share/vim/macros/html
-share/vim/macros/justify.vim
-share/vim/macros/life/click.me
-share/vim/macros/life/life.mac
-share/vim/macros/maze/Makefile
-share/vim/macros/maze/README.txt
-share/vim/macros/maze/maze.c
-share/vim/macros/maze/maze_5.78
-share/vim/macros/maze/maze_mac
-share/vim/macros/maze/mazeansi.c
-share/vim/macros/maze/poster
-share/vim/macros/rot13.vim
-share/vim/macros/shellmenu.vim
-share/vim/macros/swapmous.vim
-share/vim/macros/urm/README.txt
-share/vim/macros/urm/examples
-share/vim/macros/urm/urm
-share/vim/macros/urm/urm.mac
-share/vim/syntax/2html.vim
-share/vim/syntax/ada.vim
-share/vim/syntax/amiga.vim
-share/vim/syntax/asm.vim
-share/vim/syntax/asmselect.vim
-share/vim/syntax/asn.vim
-share/vim/syntax/asmh8300.vim
-share/vim/syntax/atlas.vim
-share/vim/syntax/awk.vim
-share/vim/syntax/basic.vim
-share/vim/syntax/bib.vim
-share/vim/syntax/c.vim
-share/vim/syntax/clean.vim
-share/vim/syntax/clipper.vim
-share/vim/syntax/cobol.vim
-share/vim/syntax/colortest.vim
-share/vim/syntax/cpp.vim
-share/vim/syntax/csh.vim
-share/vim/syntax/css.vim
-share/vim/syntax/cterm.vim
-share/vim/syntax/dcl.vim
-share/vim/syntax/diff.vim
-share/vim/syntax/dosbatch.vim
-share/vim/syntax/dosini.vim
-share/vim/syntax/dracula.vim
-share/vim/syntax/dtd.vim
-share/vim/syntax/eiffel.vim
-share/vim/syntax/elmfilt.vim
-share/vim/syntax/exports.vim
-share/vim/syntax/expect.vim
-share/vim/syntax/esqlc.vim
-share/vim/syntax/fortran.vim
-share/vim/syntax/fvwm.vim
-share/vim/syntax/gp.vim
-share/vim/syntax/help.vim
-share/vim/syntax/hitest.vim
-share/vim/syntax/html.vim
-share/vim/syntax/idl.vim
-share/vim/syntax/inform.vim
-share/vim/syntax/java.vim
-share/vim/syntax/javacc.vim
-share/vim/syntax/javascript.vim
-share/vim/syntax/jgraph.vim
-share/vim/syntax/lace.vim
-share/vim/syntax/lex.vim
-share/vim/syntax/lilo.vim
-share/vim/syntax/lisp.vim
-share/vim/syntax/lite.vim
-share/vim/syntax/lotos.vim
-share/vim/syntax/lss.vim
-share/vim/syntax/mail.vim
-share/vim/syntax/make.vim
-share/vim/syntax/man.vim
-share/vim/syntax/maple.vim
-share/vim/syntax/matlab.vim
-share/vim/syntax/mf.vim
-share/vim/syntax/mib.vim
-share/vim/syntax/model.vim
-share/vim/syntax/modula2.vim
-share/vim/syntax/mp.vim
-share/vim/syntax/msql.vim
-share/vim/syntax/muttrc.vim
-share/vim/syntax/nasm.vim
-share/vim/syntax/nosyntax.vim
-share/vim/syntax/nroff.vim
-share/vim/syntax/objc.vim
-share/vim/syntax/ocaml.vim
-share/vim/syntax/pascal.vim
-share/vim/syntax/pcap.vim
-share/vim/syntax/perl.vim
-share/vim/syntax/php3.vim
-share/vim/syntax/phtml.vim
-share/vim/syntax/pmfile.vim
-share/vim/syntax/pike.vim
-share/vim/syntax/po.vim
-share/vim/syntax/pod.vim
-share/vim/syntax/postscr.vim
-share/vim/syntax/pov.vim
-share/vim/syntax/procmail.vim
-share/vim/syntax/prolog.vim
-share/vim/syntax/purifylog.vim
-share/vim/syntax/python.vim
-share/vim/syntax/rc.vim
-share/vim/syntax/rexx.vim
-share/vim/syntax/sather.vim
-share/vim/syntax/scheme.vim
-share/vim/syntax/scripts.vim
-share/vim/syntax/sdl.vim
-share/vim/syntax/sgml.vim
-share/vim/syntax/sh.vim
-share/vim/syntax/sicad.vim
-share/vim/syntax/simula.vim
-share/vim/syntax/skill.vim
-share/vim/syntax/slang.vim
-share/vim/syntax/slrnrc.vim
-share/vim/syntax/slrnsc.vim
-share/vim/syntax/sm.vim
-share/vim/syntax/spec.vim
-share/vim/syntax/sql.vim
-share/vim/syntax/st.vim
-share/vim/syntax/syntax.vim
-share/vim/syntax/tags.vim
-share/vim/syntax/tcl.vim
-share/vim/syntax/tex.vim
-share/vim/syntax/tf.vim
-share/vim/syntax/tsalt.vim
-share/vim/syntax/uil.vim
-share/vim/syntax/verilog.vim
-share/vim/syntax/vgrindefs.vim
-share/vim/syntax/vhdl.vim
-share/vim/syntax/whitespace.vim
-share/vim/syntax/vim.vim
-share/vim/syntax/viminfo.vim
-share/vim/syntax/xdefaults.vim
-share/vim/syntax/vrml.vim
-share/vim/syntax/xmath.vim
-share/vim/syntax/xpm.vim
-share/vim/syntax/xml.vim
-share/vim/syntax/yacc.vim
-share/vim/syntax/zsh.vim
-share/vim/bugreport.vim
-share/vim/menu.vim
-@dirrm share/vim/doc
-@dirrm share/vim/macros/hanoi
-@dirrm share/vim/macros/life
-@dirrm share/vim/macros/maze
-@dirrm share/vim/macros/urm
-@dirrm share/vim/macros
-@dirrm share/vim/syntax
+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/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/gui.txt
+share/vim/%%VIM_VER%%/doc/gui_w32.txt
+share/vim/%%VIM_VER%%/doc/gui_x11.txt
+share/vim/%%VIM_VER%%/doc/hangulin.txt
+share/vim/%%VIM_VER%%/doc/help.txt
+share/vim/%%VIM_VER%%/doc/howto.txt
+share/vim/%%VIM_VER%%/doc/if_cscope.txt
+share/vim/%%VIM_VER%%/doc/if_ole.txt
+share/vim/%%VIM_VER%%/doc/if_perl.txt
+share/vim/%%VIM_VER%%/doc/if_python.txt
+share/vim/%%VIM_VER%%/doc/if_sniff.txt
+share/vim/%%VIM_VER%%/doc/if_tcl.txt
+share/vim/%%VIM_VER%%/doc/index.txt
+share/vim/%%VIM_VER%%/doc/insert.txt
+share/vim/%%VIM_VER%%/doc/intro.txt
+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/options.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
+share/vim/%%VIM_VER%%/doc/os_mac.txt
+share/vim/%%VIM_VER%%/doc/os_mint.txt
+share/vim/%%VIM_VER%%/doc/os_msdos.txt
+share/vim/%%VIM_VER%%/doc/os_os2.txt
+share/vim/%%VIM_VER%%/doc/os_riscos.txt
+share/vim/%%VIM_VER%%/doc/os_unix.txt
+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/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/starting.txt
+share/vim/%%VIM_VER%%/doc/syntax.txt
+share/vim/%%VIM_VER%%/doc/term.txt
+share/vim/%%VIM_VER%%/doc/tagsearch.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/various.txt
+share/vim/%%VIM_VER%%/doc/version4.txt
+share/vim/%%VIM_VER%%/doc/version5.txt
+share/vim/%%VIM_VER%%/doc/vi_diff.txt
+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%%/syntax
+share/vim/%%VIM_VER%%/syntax/2html.vim
+share/vim/%%VIM_VER%%/syntax/abc.vim
+share/vim/%%VIM_VER%%/syntax/ada.vim
+share/vim/%%VIM_VER%%/syntax/ahdl.vim
+share/vim/%%VIM_VER%%/syntax/amiga.vim
+share/vim/%%VIM_VER%%/syntax/asm.vim
+share/vim/%%VIM_VER%%/syntax/asmh8300.vim
+share/vim/%%VIM_VER%%/syntax/asn.vim
+share/vim/%%VIM_VER%%/syntax/atlas.vim
+share/vim/%%VIM_VER%%/syntax/ave.vim
+share/vim/%%VIM_VER%%/syntax/awk.vim
+share/vim/%%VIM_VER%%/syntax/basic.vim
+share/vim/%%VIM_VER%%/syntax/bib.vim
+share/vim/%%VIM_VER%%/syntax/btm.vim
+share/vim/%%VIM_VER%%/syntax/c.vim
+share/vim/%%VIM_VER%%/syntax/clean.vim
+share/vim/%%VIM_VER%%/syntax/clipper.vim
+share/vim/%%VIM_VER%%/syntax/cobol.vim
+share/vim/%%VIM_VER%%/syntax/colortest.vim
+share/vim/%%VIM_VER%%/syntax/config.vim
+share/vim/%%VIM_VER%%/syntax/cpp.vim
+share/vim/%%VIM_VER%%/syntax/csh.vim
+share/vim/%%VIM_VER%%/syntax/css.vim
+share/vim/%%VIM_VER%%/syntax/cterm.vim
+share/vim/%%VIM_VER%%/syntax/dcl.vim
+share/vim/%%VIM_VER%%/syntax/diff.vim
+share/vim/%%VIM_VER%%/syntax/diva.vim
+share/vim/%%VIM_VER%%/syntax/dosbatch.vim
+share/vim/%%VIM_VER%%/syntax/dosini.vim
+share/vim/%%VIM_VER%%/syntax/dracula.vim
+share/vim/%%VIM_VER%%/syntax/dtd.vim
+share/vim/%%VIM_VER%%/syntax/eiffel.vim
+share/vim/%%VIM_VER%%/syntax/elf.vim
+share/vim/%%VIM_VER%%/syntax/elmfilt.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/focexec.vim
+share/vim/%%VIM_VER%%/syntax/forth.vim
+share/vim/%%VIM_VER%%/syntax/fortran.vim
+share/vim/%%VIM_VER%%/syntax/fvwm.vim
+share/vim/%%VIM_VER%%/syntax/gdb.vim
+share/vim/%%VIM_VER%%/syntax/gdmo.vim
+share/vim/%%VIM_VER%%/syntax/gnuplot.vim
+share/vim/%%VIM_VER%%/syntax/gp.vim
+share/vim/%%VIM_VER%%/syntax/haskell.vim
+share/vim/%%VIM_VER%%/syntax/help.vim
+share/vim/%%VIM_VER%%/syntax/hitest.vim
+share/vim/%%VIM_VER%%/syntax/html.vim
+share/vim/%%VIM_VER%%/syntax/htmlm4.vim
+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/java.vim
+share/vim/%%VIM_VER%%/syntax/javacc.vim
+share/vim/%%VIM_VER%%/syntax/javascript.vim
+share/vim/%%VIM_VER%%/syntax/jgraph.vim
+share/vim/%%VIM_VER%%/syntax/kwt.vim
+share/vim/%%VIM_VER%%/syntax/lace.vim
+share/vim/%%VIM_VER%%/syntax/lex.vim
+share/vim/%%VIM_VER%%/syntax/lhaskell.vim
+share/vim/%%VIM_VER%%/syntax/lilo.vim
+share/vim/%%VIM_VER%%/syntax/lisp.vim
+share/vim/%%VIM_VER%%/syntax/lite.vim
+share/vim/%%VIM_VER%%/syntax/lotos.vim
+share/vim/%%VIM_VER%%/syntax/lout.vim
+share/vim/%%VIM_VER%%/syntax/lss.vim
+share/vim/%%VIM_VER%%/syntax/lua.vim
+share/vim/%%VIM_VER%%/syntax/m4.vim
+share/vim/%%VIM_VER%%/syntax/mail.vim
+share/vim/%%VIM_VER%%/syntax/make.vim
+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/master.vim
+share/vim/%%VIM_VER%%/syntax/matlab.vim
+share/vim/%%VIM_VER%%/syntax/mf.vim
+share/vim/%%VIM_VER%%/syntax/mib.vim
+share/vim/%%VIM_VER%%/syntax/model.vim
+share/vim/%%VIM_VER%%/syntax/modsim3.vim
+share/vim/%%VIM_VER%%/syntax/modula2.vim
+share/vim/%%VIM_VER%%/syntax/modula3.vim
+share/vim/%%VIM_VER%%/syntax/mp.vim
+share/vim/%%VIM_VER%%/syntax/msql.vim
+share/vim/%%VIM_VER%%/syntax/muttrc.vim
+share/vim/%%VIM_VER%%/syntax/nasm.vim
+share/vim/%%VIM_VER%%/syntax/ncf.vim
+share/vim/%%VIM_VER%%/syntax/nosyntax.vim
+share/vim/%%VIM_VER%%/syntax/nroff.vim
+share/vim/%%VIM_VER%%/syntax/objc.vim
+share/vim/%%VIM_VER%%/syntax/ocaml.vim
+share/vim/%%VIM_VER%%/syntax/opl.vim
+share/vim/%%VIM_VER%%/syntax/pascal.vim
+share/vim/%%VIM_VER%%/syntax/pcap.vim
+share/vim/%%VIM_VER%%/syntax/pccts.vim
+share/vim/%%VIM_VER%%/syntax/perl.vim
+share/vim/%%VIM_VER%%/syntax/php3.vim
+share/vim/%%VIM_VER%%/syntax/phtml.vim
+share/vim/%%VIM_VER%%/syntax/pike.vim
+share/vim/%%VIM_VER%%/syntax/pine.vim
+share/vim/%%VIM_VER%%/syntax/plsql.vim
+share/vim/%%VIM_VER%%/syntax/po.vim
+share/vim/%%VIM_VER%%/syntax/pod.vim
+share/vim/%%VIM_VER%%/syntax/postscr.vim
+share/vim/%%VIM_VER%%/syntax/pov.vim
+share/vim/%%VIM_VER%%/syntax/procmail.vim
+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/radiance.vim
+share/vim/%%VIM_VER%%/syntax/rc.vim
+share/vim/%%VIM_VER%%/syntax/rebol.vim
+share/vim/%%VIM_VER%%/syntax/rexx.vim
+share/vim/%%VIM_VER%%/syntax/rpcgen.vim
+share/vim/%%VIM_VER%%/syntax/sas.vim
+share/vim/%%VIM_VER%%/syntax/sather.vim
+share/vim/%%VIM_VER%%/syntax/scheme.vim
+share/vim/%%VIM_VER%%/syntax/sdl.vim
+share/vim/%%VIM_VER%%/syntax/sed.vim
+share/vim/%%VIM_VER%%/syntax/sgml.vim
+share/vim/%%VIM_VER%%/syntax/sh.vim
+share/vim/%%VIM_VER%%/syntax/sicad.vim
+share/vim/%%VIM_VER%%/syntax/simula.vim
+share/vim/%%VIM_VER%%/syntax/skill.vim
+share/vim/%%VIM_VER%%/syntax/sl.vim
+share/vim/%%VIM_VER%%/syntax/slang.vim
+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/spec.vim
+share/vim/%%VIM_VER%%/syntax/spup.vim
+share/vim/%%VIM_VER%%/syntax/sql.vim
+share/vim/%%VIM_VER%%/syntax/squid.vim
+share/vim/%%VIM_VER%%/syntax/st.vim
+share/vim/%%VIM_VER%%/syntax/synload.vim
+share/vim/%%VIM_VER%%/syntax/syntax.vim
+share/vim/%%VIM_VER%%/syntax/tags.vim
+share/vim/%%VIM_VER%%/syntax/tcl.vim
+share/vim/%%VIM_VER%%/syntax/tex.vim
+share/vim/%%VIM_VER%%/syntax/tf.vim
+share/vim/%%VIM_VER%%/syntax/tsalt.vim
+share/vim/%%VIM_VER%%/syntax/uil.vim
+share/vim/%%VIM_VER%%/syntax/vb.vim
+share/vim/%%VIM_VER%%/syntax/verilog.vim
+share/vim/%%VIM_VER%%/syntax/vgrindefs.vim
+share/vim/%%VIM_VER%%/syntax/vhdl.vim
+share/vim/%%VIM_VER%%/syntax/vim.vim
+share/vim/%%VIM_VER%%/syntax/viminfo.vim
+share/vim/%%VIM_VER%%/syntax/vrml.vim
+share/vim/%%VIM_VER%%/syntax/whitespace.vim
+share/vim/%%VIM_VER%%/syntax/xdefaults.vim
+share/vim/%%VIM_VER%%/syntax/xmath.vim
+share/vim/%%VIM_VER%%/syntax/xml.vim
+share/vim/%%VIM_VER%%/syntax/xpm.vim
+share/vim/%%VIM_VER%%/syntax/xs.vim
+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
+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
+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/hanoi
+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
+share/vim/%%VIM_VER%%/macros/life/click.me
+share/vim/%%VIM_VER%%/macros/life/life.vim
+share/vim/%%VIM_VER%%/macros/maze
+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
+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%%/tools
+share/vim/%%VIM_VER%%/tools/README.txt
+share/vim/%%VIM_VER%%/tools/blink.c
+share/vim/%%VIM_VER%%/tools/ccfilter.1
+share/vim/%%VIM_VER%%/tools/ccfilter.c
+share/vim/%%VIM_VER%%/tools/ccfilter_README.txt
+share/vim/%%VIM_VER%%/tools/efm_filter.pl
+share/vim/%%VIM_VER%%/tools/efm_filter.txt
+share/vim/%%VIM_VER%%/tools/gvimdiff
+share/vim/%%VIM_VER%%/tools/mve.awk
+share/vim/%%VIM_VER%%/tools/mve.txt
+share/vim/%%VIM_VER%%/tools/pltags.pl
+share/vim/%%VIM_VER%%/tools/ref
+share/vim/%%VIM_VER%%/tools/shtags.1
+share/vim/%%VIM_VER%%/tools/shtags.pl
+share/vim/%%VIM_VER%%/tools/tcltags
+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
+@dirrm share/vim/%%VIM_VER%%/doc
+@dirrm share/vim/%%VIM_VER%%/macros/hanoi
+@dirrm share/vim/%%VIM_VER%%/macros/life
+@dirrm share/vim/%%VIM_VER%%/macros/maze
+@dirrm share/vim/%%VIM_VER%%/macros/urm
+@dirrm share/vim/%%VIM_VER%%/macros
+@dirrm share/vim/%%VIM_VER%%/syntax
+@dirrm share/vim/%%VIM_VER%%/tools
+@dirrm share/vim/%%VIM_VER%%/tutor
+@dirrm share/vim/%%VIM_VER%%
 @dirrm share/vim
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index fede796dad87..0b866aa63e76 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Sat June 29, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.39 1999/07/14 18:45:19 obrien Exp $
+# $Id: Makefile,v 1.40 1999/07/15 12:15:40 obrien Exp $
 #
 
-DISTNAME=	vim-5.3
+DISTNAME=	vim-5.4
 CATEGORIES=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
 		ftp://ftp.nuxi.com/pub/vim/unix/ \
@@ -31,8 +31,9 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRIP}
 MAKE_FLAGS=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib" -f
 ALL_TARGET=	#
-MAN1=		vim.1 xxd.1 ectags.1
-MLINKS=		vim.1 rvim.1  vim.1 rview.1
+PLIST_SUB=	VIM_VER=${DISTNAME:S/-//:S/.//}
+MAN1=		vim.1 vimtutor.1 xxd.1 ectags.1
+MLINKS=		vim.1 rvim.1  vim.1 rview.1  ectags.1 etags.1
 
 .if !defined(LITE)
 MLINKS+=	vim.1 gvim.1  vim.1 gview.1  vim.1 rgvim.1  vim.1 rgview.1  
@@ -67,6 +68,5 @@ post-install:
 .endif
 	@${RM} -f ${PREFIX}/man/man1/etags.1
 	@${MV} ${PREFIX}/man/man1/ctags.1 ${PREFIX}/man/man1/ectags.1
-	@${LN} -sf ${PREFIX}/man/man1/ectags.1.gz ${PREFIX}/man/man1/etags.1.gz
 
 .include <bsd.port.mk>
diff --git a/editors/vim5/distinfo b/editors/vim5/distinfo
index d816d9eabd91..281b6b18b404 100644
--- a/editors/vim5/distinfo
+++ b/editors/vim5/distinfo
@@ -1,2 +1,2 @@
-MD5 (vim-5.3-src.tar.gz) = d919bc16480599014adbcdfd19268d35
-MD5 (vim-5.3-rt.tar.gz) = 90c168f16bc87ac9d430d8137c55136f
+MD5 (vim-5.4-src.tar.gz) = 8aabff5a884ad436543fbfab70487c70
+MD5 (vim-5.4-rt.tar.gz) = 0e0c1ffa2a8afa62e8886440f015d937
diff --git a/editors/vim5/files/patch-01 b/editors/vim5/files/patch-01
index a6e8a32da5bd..012c17dd8c42 100644
--- a/editors/vim5/files/patch-01
+++ b/editors/vim5/files/patch-01
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Aug 30 09:16:50 1998
-+++ Makefile	Mon Mar 15 01:55:08 1999
-@@ -260,6 +260,7 @@
+--- Makefile.orig	Sun Aug 16 12:24:56 1998
++++ Makefile	Mon Aug 17 12:08:56 1998
+@@ -257,6 +257,7 @@
  
  # just an example:
  #CONF_ARGS = --exec-prefix=/usr
@@ -8,7 +8,7 @@
  
  # GUI - For creating Vim with GUI (gvim)
  # Uncomment the first line when you don't want to get the GUI version,
-@@ -1172,56 +1173,56 @@
+@@ -1167,28 +1168,28 @@
  installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
  
  $(BINDIR)/$(EXTARGET):
@@ -45,39 +45,3 @@
  
  # create links for the manual pages with various names to vim.  This is only
  # done when the links (or manpages with the same name) don't exist yet.
- installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(EXTARGET).1 $(MANSUBDIR)/$(VIEWTARGET).1 $(MANSUBDIR)/$(RVIMTARGET).1 $(MANSUBDIR)/$(RVIEWTARGET).1
- 
- $(MANSUBDIR)/$(EXTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(EXTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(EXTARGET).1
- 
- $(MANSUBDIR)/$(VIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(VIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(VIEWTARGET).1
- 
- $(MANSUBDIR)/$(GVIMTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIMTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(GVIMTARGET).1
- 
- $(MANSUBDIR)/$(GVIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(GVIEWTARGET).1
- 
- $(MANSUBDIR)/$(RVIMTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIMTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RVIMTARGET).1
- 
- $(MANSUBDIR)/$(RVIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RVIEWTARGET).1
- 
- $(MANSUBDIR)/$(RGVIMTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIMTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RGVIMTARGET).1
- 
- $(MANSUBDIR)/$(RGVIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RGVIEWTARGET).1
- 
- uninstall:
- 	-rm -f $(BINDIR)/$(VIMTARGET)$(SUFFIX)
diff --git a/editors/vim5/files/patch-02 b/editors/vim5/files/patch-02
index 1e4d4ddf502c..61cc5494e207 100644
--- a/editors/vim5/files/patch-02
+++ b/editors/vim5/files/patch-02
@@ -1,16 +1,7 @@
---- configure.orig	Thu Aug 13 12:59:48 1998
-+++ configure	Mon Aug 17 12:12:16 1998
-@@ -1253,7 +1253,7 @@
- if test "$enable_tclinterp" = "yes"; then
- 	
- 	# Extract the first word of "tclsh", so it can be a program name with args.
--set dummy tclsh; ac_word=$2
-+set dummy tclsh8.0; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:1259: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then
-@@ -2495,7 +2495,7 @@
-   gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$GUI_INC_LOC" | sed s/include/lib/` /local/Motif*/lib /local/lib/Motif* /usr/local/Motif*/lib /usr/local/lib/Motif* /usr/Motif*/lib /usr/lib/Motif* /usr/local/lib /usr/local/X11*/lib /usr/lib /usr/X11*/lib /usr/lib/X11* /usr/dt/lib $MOTIFHOME/lib $GUI_LIB_LOC"
+--- configure.orig	Thu Mar 11 07:11:42 1999
++++ configure	Mon Mar 22 10:45:57 1999
+@@ -3100,7 +3100,7 @@
+   gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` /local/Motif*/lib /local/lib/Motif* /usr/local/Motif*/lib /usr/local/lib/Motif* /usr/Motif*/lib /usr/lib/Motif* /usr/local/lib /usr/local/X11*/lib /usr/lib /usr/X11*/lib /usr/lib/X11* /usr/dt/lib $MOTIFHOME/lib `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
    GUI_LIB_LOC=
    for try in $gui_libs; do
 -    for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl; do
diff --git a/editors/vim5/pkg-comment b/editors/vim5/pkg-comment
index a341092c8d88..af8ac602b455 100644
--- a/editors/vim5/pkg-comment
+++ b/editors/vim5/pkg-comment
@@ -1 +1 @@
-A vi "workalike", with many additional features
+A vi "workalike", with many additional features.
diff --git a/editors/vim5/pkg-descr b/editors/vim5/pkg-descr
index d39d8584e3e9..b48bf2104ffa 100644
--- a/editors/vim5/pkg-descr
+++ b/editors/vim5/pkg-descr
@@ -21,5 +21,3 @@ Portability to all UNIX platforms, AmigaOS, Archimedes, Atari MiNT, BeOS,
 M$-DOS, MacOS, OS/2, VMS, WinNT+Win95.
 
 -- David	(obrien@cs.ucdavis.edu)
-
-WWW: http://www.vim.org
diff --git a/editors/vim5/pkg-plist b/editors/vim5/pkg-plist
index 37354ebc94a1..32c7492a961c 100644
--- a/editors/vim5/pkg-plist
+++ b/editors/vim5/pkg-plist
@@ -1,7 +1,8 @@
 bin/vim
+bin/vimtutor
 bin/ctags
-bin/xxd
 bin/etags
+bin/xxd
 @comment bin/ex
 @comment bin/gex
 bin/gview
@@ -11,213 +12,297 @@ bin/rgvim
 bin/rview
 bin/rvim
 @comment bin/view
-share/vim/doc/autocmd.txt
-share/vim/doc/change.txt
-share/vim/doc/cmdline.txt
-share/vim/doc/digraph.txt
-share/vim/doc/editing.txt
-share/vim/doc/eval.txt
-share/vim/doc/farsi.txt
-share/vim/doc/gui.txt
-share/vim/doc/gui_x11.txt
-share/vim/doc/gui_w32.txt
-share/vim/doc/help.txt
-share/vim/doc/howto.txt
-share/vim/doc/if_cscope.txt
-share/vim/doc/if_ole.txt
-share/vim/doc/if_perl.txt
-share/vim/doc/if_python.txt
-share/vim/doc/if_tcl.txt
-share/vim/doc/index.txt
-share/vim/doc/insert.txt
-share/vim/doc/intro.txt
-share/vim/doc/map.txt
-share/vim/doc/message.txt
-share/vim/doc/motion.txt
-share/vim/doc/options.txt
-share/vim/doc/os_amiga.txt
-share/vim/doc/os_beos.txt
-share/vim/doc/os_dos.txt
-share/vim/doc/os_mac.txt
-share/vim/doc/os_mint.txt
-share/vim/doc/os_msdos.txt
-share/vim/doc/os_os2.txt
-share/vim/doc/os_riscos.txt
-share/vim/doc/os_unix.txt
-share/vim/doc/os_vms.txt
-share/vim/doc/os_win32.txt
-share/vim/doc/pattern.txt
-share/vim/doc/quotes.txt
-share/vim/doc/quickfix.txt
-share/vim/doc/recover.txt
-share/vim/doc/repeat.txt
-share/vim/doc/rightleft.txt
-share/vim/doc/scroll.txt
-share/vim/doc/starting.txt
-share/vim/doc/syntax.txt
-share/vim/doc/tagsearch.txt
-share/vim/doc/term.txt
-share/vim/doc/tips.txt
-share/vim/doc/todo.txt
-share/vim/doc/uganda.txt
-share/vim/doc/undo.txt
-share/vim/doc/various.txt
-share/vim/doc/version4.txt
-share/vim/doc/version5.txt
-share/vim/doc/vi_diff.txt
-share/vim/doc/visual.txt
-share/vim/doc/windows.txt
-share/vim/doc/tags
-share/vim/macros/README.txt
-share/vim/macros/dvorak
-share/vim/macros/hanoi/click.me
-share/vim/macros/hanoi/hanoi.mac
-share/vim/macros/hanoi/poster
-share/vim/macros/html
-share/vim/macros/justify.vim
-share/vim/macros/life/click.me
-share/vim/macros/life/life.mac
-share/vim/macros/maze/Makefile
-share/vim/macros/maze/README.txt
-share/vim/macros/maze/maze.c
-share/vim/macros/maze/maze_5.78
-share/vim/macros/maze/maze_mac
-share/vim/macros/maze/mazeansi.c
-share/vim/macros/maze/poster
-share/vim/macros/rot13.vim
-share/vim/macros/shellmenu.vim
-share/vim/macros/swapmous.vim
-share/vim/macros/urm/README.txt
-share/vim/macros/urm/examples
-share/vim/macros/urm/urm
-share/vim/macros/urm/urm.mac
-share/vim/syntax/2html.vim
-share/vim/syntax/ada.vim
-share/vim/syntax/amiga.vim
-share/vim/syntax/asm.vim
-share/vim/syntax/asmselect.vim
-share/vim/syntax/asn.vim
-share/vim/syntax/asmh8300.vim
-share/vim/syntax/atlas.vim
-share/vim/syntax/awk.vim
-share/vim/syntax/basic.vim
-share/vim/syntax/bib.vim
-share/vim/syntax/c.vim
-share/vim/syntax/clean.vim
-share/vim/syntax/clipper.vim
-share/vim/syntax/cobol.vim
-share/vim/syntax/colortest.vim
-share/vim/syntax/cpp.vim
-share/vim/syntax/csh.vim
-share/vim/syntax/css.vim
-share/vim/syntax/cterm.vim
-share/vim/syntax/dcl.vim
-share/vim/syntax/diff.vim
-share/vim/syntax/dosbatch.vim
-share/vim/syntax/dosini.vim
-share/vim/syntax/dracula.vim
-share/vim/syntax/dtd.vim
-share/vim/syntax/eiffel.vim
-share/vim/syntax/elmfilt.vim
-share/vim/syntax/exports.vim
-share/vim/syntax/expect.vim
-share/vim/syntax/esqlc.vim
-share/vim/syntax/fortran.vim
-share/vim/syntax/fvwm.vim
-share/vim/syntax/gp.vim
-share/vim/syntax/help.vim
-share/vim/syntax/hitest.vim
-share/vim/syntax/html.vim
-share/vim/syntax/idl.vim
-share/vim/syntax/inform.vim
-share/vim/syntax/java.vim
-share/vim/syntax/javacc.vim
-share/vim/syntax/javascript.vim
-share/vim/syntax/jgraph.vim
-share/vim/syntax/lace.vim
-share/vim/syntax/lex.vim
-share/vim/syntax/lilo.vim
-share/vim/syntax/lisp.vim
-share/vim/syntax/lite.vim
-share/vim/syntax/lotos.vim
-share/vim/syntax/lss.vim
-share/vim/syntax/mail.vim
-share/vim/syntax/make.vim
-share/vim/syntax/man.vim
-share/vim/syntax/maple.vim
-share/vim/syntax/matlab.vim
-share/vim/syntax/mf.vim
-share/vim/syntax/mib.vim
-share/vim/syntax/model.vim
-share/vim/syntax/modula2.vim
-share/vim/syntax/mp.vim
-share/vim/syntax/msql.vim
-share/vim/syntax/muttrc.vim
-share/vim/syntax/nasm.vim
-share/vim/syntax/nosyntax.vim
-share/vim/syntax/nroff.vim
-share/vim/syntax/objc.vim
-share/vim/syntax/ocaml.vim
-share/vim/syntax/pascal.vim
-share/vim/syntax/pcap.vim
-share/vim/syntax/perl.vim
-share/vim/syntax/php3.vim
-share/vim/syntax/phtml.vim
-share/vim/syntax/pmfile.vim
-share/vim/syntax/pike.vim
-share/vim/syntax/po.vim
-share/vim/syntax/pod.vim
-share/vim/syntax/postscr.vim
-share/vim/syntax/pov.vim
-share/vim/syntax/procmail.vim
-share/vim/syntax/prolog.vim
-share/vim/syntax/purifylog.vim
-share/vim/syntax/python.vim
-share/vim/syntax/rc.vim
-share/vim/syntax/rexx.vim
-share/vim/syntax/sather.vim
-share/vim/syntax/scheme.vim
-share/vim/syntax/scripts.vim
-share/vim/syntax/sdl.vim
-share/vim/syntax/sgml.vim
-share/vim/syntax/sh.vim
-share/vim/syntax/sicad.vim
-share/vim/syntax/simula.vim
-share/vim/syntax/skill.vim
-share/vim/syntax/slang.vim
-share/vim/syntax/slrnrc.vim
-share/vim/syntax/slrnsc.vim
-share/vim/syntax/sm.vim
-share/vim/syntax/spec.vim
-share/vim/syntax/sql.vim
-share/vim/syntax/st.vim
-share/vim/syntax/syntax.vim
-share/vim/syntax/tags.vim
-share/vim/syntax/tcl.vim
-share/vim/syntax/tex.vim
-share/vim/syntax/tf.vim
-share/vim/syntax/tsalt.vim
-share/vim/syntax/uil.vim
-share/vim/syntax/verilog.vim
-share/vim/syntax/vgrindefs.vim
-share/vim/syntax/vhdl.vim
-share/vim/syntax/whitespace.vim
-share/vim/syntax/vim.vim
-share/vim/syntax/viminfo.vim
-share/vim/syntax/xdefaults.vim
-share/vim/syntax/vrml.vim
-share/vim/syntax/xmath.vim
-share/vim/syntax/xpm.vim
-share/vim/syntax/xml.vim
-share/vim/syntax/yacc.vim
-share/vim/syntax/zsh.vim
-share/vim/bugreport.vim
-share/vim/menu.vim
-@dirrm share/vim/doc
-@dirrm share/vim/macros/hanoi
-@dirrm share/vim/macros/life
-@dirrm share/vim/macros/maze
-@dirrm share/vim/macros/urm
-@dirrm share/vim/macros
-@dirrm share/vim/syntax
+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/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/gui.txt
+share/vim/%%VIM_VER%%/doc/gui_w32.txt
+share/vim/%%VIM_VER%%/doc/gui_x11.txt
+share/vim/%%VIM_VER%%/doc/hangulin.txt
+share/vim/%%VIM_VER%%/doc/help.txt
+share/vim/%%VIM_VER%%/doc/howto.txt
+share/vim/%%VIM_VER%%/doc/if_cscope.txt
+share/vim/%%VIM_VER%%/doc/if_ole.txt
+share/vim/%%VIM_VER%%/doc/if_perl.txt
+share/vim/%%VIM_VER%%/doc/if_python.txt
+share/vim/%%VIM_VER%%/doc/if_sniff.txt
+share/vim/%%VIM_VER%%/doc/if_tcl.txt
+share/vim/%%VIM_VER%%/doc/index.txt
+share/vim/%%VIM_VER%%/doc/insert.txt
+share/vim/%%VIM_VER%%/doc/intro.txt
+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/options.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
+share/vim/%%VIM_VER%%/doc/os_mac.txt
+share/vim/%%VIM_VER%%/doc/os_mint.txt
+share/vim/%%VIM_VER%%/doc/os_msdos.txt
+share/vim/%%VIM_VER%%/doc/os_os2.txt
+share/vim/%%VIM_VER%%/doc/os_riscos.txt
+share/vim/%%VIM_VER%%/doc/os_unix.txt
+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/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/starting.txt
+share/vim/%%VIM_VER%%/doc/syntax.txt
+share/vim/%%VIM_VER%%/doc/term.txt
+share/vim/%%VIM_VER%%/doc/tagsearch.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/various.txt
+share/vim/%%VIM_VER%%/doc/version4.txt
+share/vim/%%VIM_VER%%/doc/version5.txt
+share/vim/%%VIM_VER%%/doc/vi_diff.txt
+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%%/syntax
+share/vim/%%VIM_VER%%/syntax/2html.vim
+share/vim/%%VIM_VER%%/syntax/abc.vim
+share/vim/%%VIM_VER%%/syntax/ada.vim
+share/vim/%%VIM_VER%%/syntax/ahdl.vim
+share/vim/%%VIM_VER%%/syntax/amiga.vim
+share/vim/%%VIM_VER%%/syntax/asm.vim
+share/vim/%%VIM_VER%%/syntax/asmh8300.vim
+share/vim/%%VIM_VER%%/syntax/asn.vim
+share/vim/%%VIM_VER%%/syntax/atlas.vim
+share/vim/%%VIM_VER%%/syntax/ave.vim
+share/vim/%%VIM_VER%%/syntax/awk.vim
+share/vim/%%VIM_VER%%/syntax/basic.vim
+share/vim/%%VIM_VER%%/syntax/bib.vim
+share/vim/%%VIM_VER%%/syntax/btm.vim
+share/vim/%%VIM_VER%%/syntax/c.vim
+share/vim/%%VIM_VER%%/syntax/clean.vim
+share/vim/%%VIM_VER%%/syntax/clipper.vim
+share/vim/%%VIM_VER%%/syntax/cobol.vim
+share/vim/%%VIM_VER%%/syntax/colortest.vim
+share/vim/%%VIM_VER%%/syntax/config.vim
+share/vim/%%VIM_VER%%/syntax/cpp.vim
+share/vim/%%VIM_VER%%/syntax/csh.vim
+share/vim/%%VIM_VER%%/syntax/css.vim
+share/vim/%%VIM_VER%%/syntax/cterm.vim
+share/vim/%%VIM_VER%%/syntax/dcl.vim
+share/vim/%%VIM_VER%%/syntax/diff.vim
+share/vim/%%VIM_VER%%/syntax/diva.vim
+share/vim/%%VIM_VER%%/syntax/dosbatch.vim
+share/vim/%%VIM_VER%%/syntax/dosini.vim
+share/vim/%%VIM_VER%%/syntax/dracula.vim
+share/vim/%%VIM_VER%%/syntax/dtd.vim
+share/vim/%%VIM_VER%%/syntax/eiffel.vim
+share/vim/%%VIM_VER%%/syntax/elf.vim
+share/vim/%%VIM_VER%%/syntax/elmfilt.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/focexec.vim
+share/vim/%%VIM_VER%%/syntax/forth.vim
+share/vim/%%VIM_VER%%/syntax/fortran.vim
+share/vim/%%VIM_VER%%/syntax/fvwm.vim
+share/vim/%%VIM_VER%%/syntax/gdb.vim
+share/vim/%%VIM_VER%%/syntax/gdmo.vim
+share/vim/%%VIM_VER%%/syntax/gnuplot.vim
+share/vim/%%VIM_VER%%/syntax/gp.vim
+share/vim/%%VIM_VER%%/syntax/haskell.vim
+share/vim/%%VIM_VER%%/syntax/help.vim
+share/vim/%%VIM_VER%%/syntax/hitest.vim
+share/vim/%%VIM_VER%%/syntax/html.vim
+share/vim/%%VIM_VER%%/syntax/htmlm4.vim
+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/java.vim
+share/vim/%%VIM_VER%%/syntax/javacc.vim
+share/vim/%%VIM_VER%%/syntax/javascript.vim
+share/vim/%%VIM_VER%%/syntax/jgraph.vim
+share/vim/%%VIM_VER%%/syntax/kwt.vim
+share/vim/%%VIM_VER%%/syntax/lace.vim
+share/vim/%%VIM_VER%%/syntax/lex.vim
+share/vim/%%VIM_VER%%/syntax/lhaskell.vim
+share/vim/%%VIM_VER%%/syntax/lilo.vim
+share/vim/%%VIM_VER%%/syntax/lisp.vim
+share/vim/%%VIM_VER%%/syntax/lite.vim
+share/vim/%%VIM_VER%%/syntax/lotos.vim
+share/vim/%%VIM_VER%%/syntax/lout.vim
+share/vim/%%VIM_VER%%/syntax/lss.vim
+share/vim/%%VIM_VER%%/syntax/lua.vim
+share/vim/%%VIM_VER%%/syntax/m4.vim
+share/vim/%%VIM_VER%%/syntax/mail.vim
+share/vim/%%VIM_VER%%/syntax/make.vim
+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/master.vim
+share/vim/%%VIM_VER%%/syntax/matlab.vim
+share/vim/%%VIM_VER%%/syntax/mf.vim
+share/vim/%%VIM_VER%%/syntax/mib.vim
+share/vim/%%VIM_VER%%/syntax/model.vim
+share/vim/%%VIM_VER%%/syntax/modsim3.vim
+share/vim/%%VIM_VER%%/syntax/modula2.vim
+share/vim/%%VIM_VER%%/syntax/modula3.vim
+share/vim/%%VIM_VER%%/syntax/mp.vim
+share/vim/%%VIM_VER%%/syntax/msql.vim
+share/vim/%%VIM_VER%%/syntax/muttrc.vim
+share/vim/%%VIM_VER%%/syntax/nasm.vim
+share/vim/%%VIM_VER%%/syntax/ncf.vim
+share/vim/%%VIM_VER%%/syntax/nosyntax.vim
+share/vim/%%VIM_VER%%/syntax/nroff.vim
+share/vim/%%VIM_VER%%/syntax/objc.vim
+share/vim/%%VIM_VER%%/syntax/ocaml.vim
+share/vim/%%VIM_VER%%/syntax/opl.vim
+share/vim/%%VIM_VER%%/syntax/pascal.vim
+share/vim/%%VIM_VER%%/syntax/pcap.vim
+share/vim/%%VIM_VER%%/syntax/pccts.vim
+share/vim/%%VIM_VER%%/syntax/perl.vim
+share/vim/%%VIM_VER%%/syntax/php3.vim
+share/vim/%%VIM_VER%%/syntax/phtml.vim
+share/vim/%%VIM_VER%%/syntax/pike.vim
+share/vim/%%VIM_VER%%/syntax/pine.vim
+share/vim/%%VIM_VER%%/syntax/plsql.vim
+share/vim/%%VIM_VER%%/syntax/po.vim
+share/vim/%%VIM_VER%%/syntax/pod.vim
+share/vim/%%VIM_VER%%/syntax/postscr.vim
+share/vim/%%VIM_VER%%/syntax/pov.vim
+share/vim/%%VIM_VER%%/syntax/procmail.vim
+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/radiance.vim
+share/vim/%%VIM_VER%%/syntax/rc.vim
+share/vim/%%VIM_VER%%/syntax/rebol.vim
+share/vim/%%VIM_VER%%/syntax/rexx.vim
+share/vim/%%VIM_VER%%/syntax/rpcgen.vim
+share/vim/%%VIM_VER%%/syntax/sas.vim
+share/vim/%%VIM_VER%%/syntax/sather.vim
+share/vim/%%VIM_VER%%/syntax/scheme.vim
+share/vim/%%VIM_VER%%/syntax/sdl.vim
+share/vim/%%VIM_VER%%/syntax/sed.vim
+share/vim/%%VIM_VER%%/syntax/sgml.vim
+share/vim/%%VIM_VER%%/syntax/sh.vim
+share/vim/%%VIM_VER%%/syntax/sicad.vim
+share/vim/%%VIM_VER%%/syntax/simula.vim
+share/vim/%%VIM_VER%%/syntax/skill.vim
+share/vim/%%VIM_VER%%/syntax/sl.vim
+share/vim/%%VIM_VER%%/syntax/slang.vim
+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/spec.vim
+share/vim/%%VIM_VER%%/syntax/spup.vim
+share/vim/%%VIM_VER%%/syntax/sql.vim
+share/vim/%%VIM_VER%%/syntax/squid.vim
+share/vim/%%VIM_VER%%/syntax/st.vim
+share/vim/%%VIM_VER%%/syntax/synload.vim
+share/vim/%%VIM_VER%%/syntax/syntax.vim
+share/vim/%%VIM_VER%%/syntax/tags.vim
+share/vim/%%VIM_VER%%/syntax/tcl.vim
+share/vim/%%VIM_VER%%/syntax/tex.vim
+share/vim/%%VIM_VER%%/syntax/tf.vim
+share/vim/%%VIM_VER%%/syntax/tsalt.vim
+share/vim/%%VIM_VER%%/syntax/uil.vim
+share/vim/%%VIM_VER%%/syntax/vb.vim
+share/vim/%%VIM_VER%%/syntax/verilog.vim
+share/vim/%%VIM_VER%%/syntax/vgrindefs.vim
+share/vim/%%VIM_VER%%/syntax/vhdl.vim
+share/vim/%%VIM_VER%%/syntax/vim.vim
+share/vim/%%VIM_VER%%/syntax/viminfo.vim
+share/vim/%%VIM_VER%%/syntax/vrml.vim
+share/vim/%%VIM_VER%%/syntax/whitespace.vim
+share/vim/%%VIM_VER%%/syntax/xdefaults.vim
+share/vim/%%VIM_VER%%/syntax/xmath.vim
+share/vim/%%VIM_VER%%/syntax/xml.vim
+share/vim/%%VIM_VER%%/syntax/xpm.vim
+share/vim/%%VIM_VER%%/syntax/xs.vim
+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
+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
+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/hanoi
+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
+share/vim/%%VIM_VER%%/macros/life/click.me
+share/vim/%%VIM_VER%%/macros/life/life.vim
+share/vim/%%VIM_VER%%/macros/maze
+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
+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%%/tools
+share/vim/%%VIM_VER%%/tools/README.txt
+share/vim/%%VIM_VER%%/tools/blink.c
+share/vim/%%VIM_VER%%/tools/ccfilter.1
+share/vim/%%VIM_VER%%/tools/ccfilter.c
+share/vim/%%VIM_VER%%/tools/ccfilter_README.txt
+share/vim/%%VIM_VER%%/tools/efm_filter.pl
+share/vim/%%VIM_VER%%/tools/efm_filter.txt
+share/vim/%%VIM_VER%%/tools/gvimdiff
+share/vim/%%VIM_VER%%/tools/mve.awk
+share/vim/%%VIM_VER%%/tools/mve.txt
+share/vim/%%VIM_VER%%/tools/pltags.pl
+share/vim/%%VIM_VER%%/tools/ref
+share/vim/%%VIM_VER%%/tools/shtags.1
+share/vim/%%VIM_VER%%/tools/shtags.pl
+share/vim/%%VIM_VER%%/tools/tcltags
+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
+@dirrm share/vim/%%VIM_VER%%/doc
+@dirrm share/vim/%%VIM_VER%%/macros/hanoi
+@dirrm share/vim/%%VIM_VER%%/macros/life
+@dirrm share/vim/%%VIM_VER%%/macros/maze
+@dirrm share/vim/%%VIM_VER%%/macros/urm
+@dirrm share/vim/%%VIM_VER%%/macros
+@dirrm share/vim/%%VIM_VER%%/syntax
+@dirrm share/vim/%%VIM_VER%%/tools
+@dirrm share/vim/%%VIM_VER%%/tutor
+@dirrm share/vim/%%VIM_VER%%
 @dirrm share/vim
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index fede796dad87..0b866aa63e76 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Sat June 29, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.39 1999/07/14 18:45:19 obrien Exp $
+# $Id: Makefile,v 1.40 1999/07/15 12:15:40 obrien Exp $
 #
 
-DISTNAME=	vim-5.3
+DISTNAME=	vim-5.4
 CATEGORIES=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
 		ftp://ftp.nuxi.com/pub/vim/unix/ \
@@ -31,8 +31,9 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRIP}
 MAKE_FLAGS=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib" -f
 ALL_TARGET=	#
-MAN1=		vim.1 xxd.1 ectags.1
-MLINKS=		vim.1 rvim.1  vim.1 rview.1
+PLIST_SUB=	VIM_VER=${DISTNAME:S/-//:S/.//}
+MAN1=		vim.1 vimtutor.1 xxd.1 ectags.1
+MLINKS=		vim.1 rvim.1  vim.1 rview.1  ectags.1 etags.1
 
 .if !defined(LITE)
 MLINKS+=	vim.1 gvim.1  vim.1 gview.1  vim.1 rgvim.1  vim.1 rgview.1  
@@ -67,6 +68,5 @@ post-install:
 .endif
 	@${RM} -f ${PREFIX}/man/man1/etags.1
 	@${MV} ${PREFIX}/man/man1/ctags.1 ${PREFIX}/man/man1/ectags.1
-	@${LN} -sf ${PREFIX}/man/man1/ectags.1.gz ${PREFIX}/man/man1/etags.1.gz
 
 .include <bsd.port.mk>
diff --git a/editors/vim6/distinfo b/editors/vim6/distinfo
index d816d9eabd91..281b6b18b404 100644
--- a/editors/vim6/distinfo
+++ b/editors/vim6/distinfo
@@ -1,2 +1,2 @@
-MD5 (vim-5.3-src.tar.gz) = d919bc16480599014adbcdfd19268d35
-MD5 (vim-5.3-rt.tar.gz) = 90c168f16bc87ac9d430d8137c55136f
+MD5 (vim-5.4-src.tar.gz) = 8aabff5a884ad436543fbfab70487c70
+MD5 (vim-5.4-rt.tar.gz) = 0e0c1ffa2a8afa62e8886440f015d937
diff --git a/editors/vim6/files/patch-01 b/editors/vim6/files/patch-01
index a6e8a32da5bd..012c17dd8c42 100644
--- a/editors/vim6/files/patch-01
+++ b/editors/vim6/files/patch-01
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Aug 30 09:16:50 1998
-+++ Makefile	Mon Mar 15 01:55:08 1999
-@@ -260,6 +260,7 @@
+--- Makefile.orig	Sun Aug 16 12:24:56 1998
++++ Makefile	Mon Aug 17 12:08:56 1998
+@@ -257,6 +257,7 @@
  
  # just an example:
  #CONF_ARGS = --exec-prefix=/usr
@@ -8,7 +8,7 @@
  
  # GUI - For creating Vim with GUI (gvim)
  # Uncomment the first line when you don't want to get the GUI version,
-@@ -1172,56 +1173,56 @@
+@@ -1167,28 +1168,28 @@
  installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
  
  $(BINDIR)/$(EXTARGET):
@@ -45,39 +45,3 @@
  
  # create links for the manual pages with various names to vim.  This is only
  # done when the links (or manpages with the same name) don't exist yet.
- installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(EXTARGET).1 $(MANSUBDIR)/$(VIEWTARGET).1 $(MANSUBDIR)/$(RVIMTARGET).1 $(MANSUBDIR)/$(RVIEWTARGET).1
- 
- $(MANSUBDIR)/$(EXTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(EXTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(EXTARGET).1
- 
- $(MANSUBDIR)/$(VIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(VIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(VIEWTARGET).1
- 
- $(MANSUBDIR)/$(GVIMTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIMTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(GVIMTARGET).1
- 
- $(MANSUBDIR)/$(GVIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(GVIEWTARGET).1
- 
- $(MANSUBDIR)/$(RVIMTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIMTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RVIMTARGET).1
- 
- $(MANSUBDIR)/$(RVIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RVIEWTARGET).1
- 
- $(MANSUBDIR)/$(RGVIMTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIMTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RGVIMTARGET).1
- 
- $(MANSUBDIR)/$(RGVIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RGVIEWTARGET).1
- 
- uninstall:
- 	-rm -f $(BINDIR)/$(VIMTARGET)$(SUFFIX)
diff --git a/editors/vim6/files/patch-02 b/editors/vim6/files/patch-02
index 1e4d4ddf502c..61cc5494e207 100644
--- a/editors/vim6/files/patch-02
+++ b/editors/vim6/files/patch-02
@@ -1,16 +1,7 @@
---- configure.orig	Thu Aug 13 12:59:48 1998
-+++ configure	Mon Aug 17 12:12:16 1998
-@@ -1253,7 +1253,7 @@
- if test "$enable_tclinterp" = "yes"; then
- 	
- 	# Extract the first word of "tclsh", so it can be a program name with args.
--set dummy tclsh; ac_word=$2
-+set dummy tclsh8.0; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:1259: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then
-@@ -2495,7 +2495,7 @@
-   gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$GUI_INC_LOC" | sed s/include/lib/` /local/Motif*/lib /local/lib/Motif* /usr/local/Motif*/lib /usr/local/lib/Motif* /usr/Motif*/lib /usr/lib/Motif* /usr/local/lib /usr/local/X11*/lib /usr/lib /usr/X11*/lib /usr/lib/X11* /usr/dt/lib $MOTIFHOME/lib $GUI_LIB_LOC"
+--- configure.orig	Thu Mar 11 07:11:42 1999
++++ configure	Mon Mar 22 10:45:57 1999
+@@ -3100,7 +3100,7 @@
+   gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` /local/Motif*/lib /local/lib/Motif* /usr/local/Motif*/lib /usr/local/lib/Motif* /usr/Motif*/lib /usr/lib/Motif* /usr/local/lib /usr/local/X11*/lib /usr/lib /usr/X11*/lib /usr/lib/X11* /usr/dt/lib $MOTIFHOME/lib `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
    GUI_LIB_LOC=
    for try in $gui_libs; do
 -    for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl; do
diff --git a/editors/vim6/pkg-comment b/editors/vim6/pkg-comment
index a341092c8d88..af8ac602b455 100644
--- a/editors/vim6/pkg-comment
+++ b/editors/vim6/pkg-comment
@@ -1 +1 @@
-A vi "workalike", with many additional features
+A vi "workalike", with many additional features.
diff --git a/editors/vim6/pkg-descr b/editors/vim6/pkg-descr
index d39d8584e3e9..b48bf2104ffa 100644
--- a/editors/vim6/pkg-descr
+++ b/editors/vim6/pkg-descr
@@ -21,5 +21,3 @@ Portability to all UNIX platforms, AmigaOS, Archimedes, Atari MiNT, BeOS,
 M$-DOS, MacOS, OS/2, VMS, WinNT+Win95.
 
 -- David	(obrien@cs.ucdavis.edu)
-
-WWW: http://www.vim.org
diff --git a/editors/vim6/pkg-plist b/editors/vim6/pkg-plist
index 37354ebc94a1..32c7492a961c 100644
--- a/editors/vim6/pkg-plist
+++ b/editors/vim6/pkg-plist
@@ -1,7 +1,8 @@
 bin/vim
+bin/vimtutor
 bin/ctags
-bin/xxd
 bin/etags
+bin/xxd
 @comment bin/ex
 @comment bin/gex
 bin/gview
@@ -11,213 +12,297 @@ bin/rgvim
 bin/rview
 bin/rvim
 @comment bin/view
-share/vim/doc/autocmd.txt
-share/vim/doc/change.txt
-share/vim/doc/cmdline.txt
-share/vim/doc/digraph.txt
-share/vim/doc/editing.txt
-share/vim/doc/eval.txt
-share/vim/doc/farsi.txt
-share/vim/doc/gui.txt
-share/vim/doc/gui_x11.txt
-share/vim/doc/gui_w32.txt
-share/vim/doc/help.txt
-share/vim/doc/howto.txt
-share/vim/doc/if_cscope.txt
-share/vim/doc/if_ole.txt
-share/vim/doc/if_perl.txt
-share/vim/doc/if_python.txt
-share/vim/doc/if_tcl.txt
-share/vim/doc/index.txt
-share/vim/doc/insert.txt
-share/vim/doc/intro.txt
-share/vim/doc/map.txt
-share/vim/doc/message.txt
-share/vim/doc/motion.txt
-share/vim/doc/options.txt
-share/vim/doc/os_amiga.txt
-share/vim/doc/os_beos.txt
-share/vim/doc/os_dos.txt
-share/vim/doc/os_mac.txt
-share/vim/doc/os_mint.txt
-share/vim/doc/os_msdos.txt
-share/vim/doc/os_os2.txt
-share/vim/doc/os_riscos.txt
-share/vim/doc/os_unix.txt
-share/vim/doc/os_vms.txt
-share/vim/doc/os_win32.txt
-share/vim/doc/pattern.txt
-share/vim/doc/quotes.txt
-share/vim/doc/quickfix.txt
-share/vim/doc/recover.txt
-share/vim/doc/repeat.txt
-share/vim/doc/rightleft.txt
-share/vim/doc/scroll.txt
-share/vim/doc/starting.txt
-share/vim/doc/syntax.txt
-share/vim/doc/tagsearch.txt
-share/vim/doc/term.txt
-share/vim/doc/tips.txt
-share/vim/doc/todo.txt
-share/vim/doc/uganda.txt
-share/vim/doc/undo.txt
-share/vim/doc/various.txt
-share/vim/doc/version4.txt
-share/vim/doc/version5.txt
-share/vim/doc/vi_diff.txt
-share/vim/doc/visual.txt
-share/vim/doc/windows.txt
-share/vim/doc/tags
-share/vim/macros/README.txt
-share/vim/macros/dvorak
-share/vim/macros/hanoi/click.me
-share/vim/macros/hanoi/hanoi.mac
-share/vim/macros/hanoi/poster
-share/vim/macros/html
-share/vim/macros/justify.vim
-share/vim/macros/life/click.me
-share/vim/macros/life/life.mac
-share/vim/macros/maze/Makefile
-share/vim/macros/maze/README.txt
-share/vim/macros/maze/maze.c
-share/vim/macros/maze/maze_5.78
-share/vim/macros/maze/maze_mac
-share/vim/macros/maze/mazeansi.c
-share/vim/macros/maze/poster
-share/vim/macros/rot13.vim
-share/vim/macros/shellmenu.vim
-share/vim/macros/swapmous.vim
-share/vim/macros/urm/README.txt
-share/vim/macros/urm/examples
-share/vim/macros/urm/urm
-share/vim/macros/urm/urm.mac
-share/vim/syntax/2html.vim
-share/vim/syntax/ada.vim
-share/vim/syntax/amiga.vim
-share/vim/syntax/asm.vim
-share/vim/syntax/asmselect.vim
-share/vim/syntax/asn.vim
-share/vim/syntax/asmh8300.vim
-share/vim/syntax/atlas.vim
-share/vim/syntax/awk.vim
-share/vim/syntax/basic.vim
-share/vim/syntax/bib.vim
-share/vim/syntax/c.vim
-share/vim/syntax/clean.vim
-share/vim/syntax/clipper.vim
-share/vim/syntax/cobol.vim
-share/vim/syntax/colortest.vim
-share/vim/syntax/cpp.vim
-share/vim/syntax/csh.vim
-share/vim/syntax/css.vim
-share/vim/syntax/cterm.vim
-share/vim/syntax/dcl.vim
-share/vim/syntax/diff.vim
-share/vim/syntax/dosbatch.vim
-share/vim/syntax/dosini.vim
-share/vim/syntax/dracula.vim
-share/vim/syntax/dtd.vim
-share/vim/syntax/eiffel.vim
-share/vim/syntax/elmfilt.vim
-share/vim/syntax/exports.vim
-share/vim/syntax/expect.vim
-share/vim/syntax/esqlc.vim
-share/vim/syntax/fortran.vim
-share/vim/syntax/fvwm.vim
-share/vim/syntax/gp.vim
-share/vim/syntax/help.vim
-share/vim/syntax/hitest.vim
-share/vim/syntax/html.vim
-share/vim/syntax/idl.vim
-share/vim/syntax/inform.vim
-share/vim/syntax/java.vim
-share/vim/syntax/javacc.vim
-share/vim/syntax/javascript.vim
-share/vim/syntax/jgraph.vim
-share/vim/syntax/lace.vim
-share/vim/syntax/lex.vim
-share/vim/syntax/lilo.vim
-share/vim/syntax/lisp.vim
-share/vim/syntax/lite.vim
-share/vim/syntax/lotos.vim
-share/vim/syntax/lss.vim
-share/vim/syntax/mail.vim
-share/vim/syntax/make.vim
-share/vim/syntax/man.vim
-share/vim/syntax/maple.vim
-share/vim/syntax/matlab.vim
-share/vim/syntax/mf.vim
-share/vim/syntax/mib.vim
-share/vim/syntax/model.vim
-share/vim/syntax/modula2.vim
-share/vim/syntax/mp.vim
-share/vim/syntax/msql.vim
-share/vim/syntax/muttrc.vim
-share/vim/syntax/nasm.vim
-share/vim/syntax/nosyntax.vim
-share/vim/syntax/nroff.vim
-share/vim/syntax/objc.vim
-share/vim/syntax/ocaml.vim
-share/vim/syntax/pascal.vim
-share/vim/syntax/pcap.vim
-share/vim/syntax/perl.vim
-share/vim/syntax/php3.vim
-share/vim/syntax/phtml.vim
-share/vim/syntax/pmfile.vim
-share/vim/syntax/pike.vim
-share/vim/syntax/po.vim
-share/vim/syntax/pod.vim
-share/vim/syntax/postscr.vim
-share/vim/syntax/pov.vim
-share/vim/syntax/procmail.vim
-share/vim/syntax/prolog.vim
-share/vim/syntax/purifylog.vim
-share/vim/syntax/python.vim
-share/vim/syntax/rc.vim
-share/vim/syntax/rexx.vim
-share/vim/syntax/sather.vim
-share/vim/syntax/scheme.vim
-share/vim/syntax/scripts.vim
-share/vim/syntax/sdl.vim
-share/vim/syntax/sgml.vim
-share/vim/syntax/sh.vim
-share/vim/syntax/sicad.vim
-share/vim/syntax/simula.vim
-share/vim/syntax/skill.vim
-share/vim/syntax/slang.vim
-share/vim/syntax/slrnrc.vim
-share/vim/syntax/slrnsc.vim
-share/vim/syntax/sm.vim
-share/vim/syntax/spec.vim
-share/vim/syntax/sql.vim
-share/vim/syntax/st.vim
-share/vim/syntax/syntax.vim
-share/vim/syntax/tags.vim
-share/vim/syntax/tcl.vim
-share/vim/syntax/tex.vim
-share/vim/syntax/tf.vim
-share/vim/syntax/tsalt.vim
-share/vim/syntax/uil.vim
-share/vim/syntax/verilog.vim
-share/vim/syntax/vgrindefs.vim
-share/vim/syntax/vhdl.vim
-share/vim/syntax/whitespace.vim
-share/vim/syntax/vim.vim
-share/vim/syntax/viminfo.vim
-share/vim/syntax/xdefaults.vim
-share/vim/syntax/vrml.vim
-share/vim/syntax/xmath.vim
-share/vim/syntax/xpm.vim
-share/vim/syntax/xml.vim
-share/vim/syntax/yacc.vim
-share/vim/syntax/zsh.vim
-share/vim/bugreport.vim
-share/vim/menu.vim
-@dirrm share/vim/doc
-@dirrm share/vim/macros/hanoi
-@dirrm share/vim/macros/life
-@dirrm share/vim/macros/maze
-@dirrm share/vim/macros/urm
-@dirrm share/vim/macros
-@dirrm share/vim/syntax
+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/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/gui.txt
+share/vim/%%VIM_VER%%/doc/gui_w32.txt
+share/vim/%%VIM_VER%%/doc/gui_x11.txt
+share/vim/%%VIM_VER%%/doc/hangulin.txt
+share/vim/%%VIM_VER%%/doc/help.txt
+share/vim/%%VIM_VER%%/doc/howto.txt
+share/vim/%%VIM_VER%%/doc/if_cscope.txt
+share/vim/%%VIM_VER%%/doc/if_ole.txt
+share/vim/%%VIM_VER%%/doc/if_perl.txt
+share/vim/%%VIM_VER%%/doc/if_python.txt
+share/vim/%%VIM_VER%%/doc/if_sniff.txt
+share/vim/%%VIM_VER%%/doc/if_tcl.txt
+share/vim/%%VIM_VER%%/doc/index.txt
+share/vim/%%VIM_VER%%/doc/insert.txt
+share/vim/%%VIM_VER%%/doc/intro.txt
+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/options.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
+share/vim/%%VIM_VER%%/doc/os_mac.txt
+share/vim/%%VIM_VER%%/doc/os_mint.txt
+share/vim/%%VIM_VER%%/doc/os_msdos.txt
+share/vim/%%VIM_VER%%/doc/os_os2.txt
+share/vim/%%VIM_VER%%/doc/os_riscos.txt
+share/vim/%%VIM_VER%%/doc/os_unix.txt
+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/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/starting.txt
+share/vim/%%VIM_VER%%/doc/syntax.txt
+share/vim/%%VIM_VER%%/doc/term.txt
+share/vim/%%VIM_VER%%/doc/tagsearch.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/various.txt
+share/vim/%%VIM_VER%%/doc/version4.txt
+share/vim/%%VIM_VER%%/doc/version5.txt
+share/vim/%%VIM_VER%%/doc/vi_diff.txt
+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%%/syntax
+share/vim/%%VIM_VER%%/syntax/2html.vim
+share/vim/%%VIM_VER%%/syntax/abc.vim
+share/vim/%%VIM_VER%%/syntax/ada.vim
+share/vim/%%VIM_VER%%/syntax/ahdl.vim
+share/vim/%%VIM_VER%%/syntax/amiga.vim
+share/vim/%%VIM_VER%%/syntax/asm.vim
+share/vim/%%VIM_VER%%/syntax/asmh8300.vim
+share/vim/%%VIM_VER%%/syntax/asn.vim
+share/vim/%%VIM_VER%%/syntax/atlas.vim
+share/vim/%%VIM_VER%%/syntax/ave.vim
+share/vim/%%VIM_VER%%/syntax/awk.vim
+share/vim/%%VIM_VER%%/syntax/basic.vim
+share/vim/%%VIM_VER%%/syntax/bib.vim
+share/vim/%%VIM_VER%%/syntax/btm.vim
+share/vim/%%VIM_VER%%/syntax/c.vim
+share/vim/%%VIM_VER%%/syntax/clean.vim
+share/vim/%%VIM_VER%%/syntax/clipper.vim
+share/vim/%%VIM_VER%%/syntax/cobol.vim
+share/vim/%%VIM_VER%%/syntax/colortest.vim
+share/vim/%%VIM_VER%%/syntax/config.vim
+share/vim/%%VIM_VER%%/syntax/cpp.vim
+share/vim/%%VIM_VER%%/syntax/csh.vim
+share/vim/%%VIM_VER%%/syntax/css.vim
+share/vim/%%VIM_VER%%/syntax/cterm.vim
+share/vim/%%VIM_VER%%/syntax/dcl.vim
+share/vim/%%VIM_VER%%/syntax/diff.vim
+share/vim/%%VIM_VER%%/syntax/diva.vim
+share/vim/%%VIM_VER%%/syntax/dosbatch.vim
+share/vim/%%VIM_VER%%/syntax/dosini.vim
+share/vim/%%VIM_VER%%/syntax/dracula.vim
+share/vim/%%VIM_VER%%/syntax/dtd.vim
+share/vim/%%VIM_VER%%/syntax/eiffel.vim
+share/vim/%%VIM_VER%%/syntax/elf.vim
+share/vim/%%VIM_VER%%/syntax/elmfilt.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/focexec.vim
+share/vim/%%VIM_VER%%/syntax/forth.vim
+share/vim/%%VIM_VER%%/syntax/fortran.vim
+share/vim/%%VIM_VER%%/syntax/fvwm.vim
+share/vim/%%VIM_VER%%/syntax/gdb.vim
+share/vim/%%VIM_VER%%/syntax/gdmo.vim
+share/vim/%%VIM_VER%%/syntax/gnuplot.vim
+share/vim/%%VIM_VER%%/syntax/gp.vim
+share/vim/%%VIM_VER%%/syntax/haskell.vim
+share/vim/%%VIM_VER%%/syntax/help.vim
+share/vim/%%VIM_VER%%/syntax/hitest.vim
+share/vim/%%VIM_VER%%/syntax/html.vim
+share/vim/%%VIM_VER%%/syntax/htmlm4.vim
+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/java.vim
+share/vim/%%VIM_VER%%/syntax/javacc.vim
+share/vim/%%VIM_VER%%/syntax/javascript.vim
+share/vim/%%VIM_VER%%/syntax/jgraph.vim
+share/vim/%%VIM_VER%%/syntax/kwt.vim
+share/vim/%%VIM_VER%%/syntax/lace.vim
+share/vim/%%VIM_VER%%/syntax/lex.vim
+share/vim/%%VIM_VER%%/syntax/lhaskell.vim
+share/vim/%%VIM_VER%%/syntax/lilo.vim
+share/vim/%%VIM_VER%%/syntax/lisp.vim
+share/vim/%%VIM_VER%%/syntax/lite.vim
+share/vim/%%VIM_VER%%/syntax/lotos.vim
+share/vim/%%VIM_VER%%/syntax/lout.vim
+share/vim/%%VIM_VER%%/syntax/lss.vim
+share/vim/%%VIM_VER%%/syntax/lua.vim
+share/vim/%%VIM_VER%%/syntax/m4.vim
+share/vim/%%VIM_VER%%/syntax/mail.vim
+share/vim/%%VIM_VER%%/syntax/make.vim
+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/master.vim
+share/vim/%%VIM_VER%%/syntax/matlab.vim
+share/vim/%%VIM_VER%%/syntax/mf.vim
+share/vim/%%VIM_VER%%/syntax/mib.vim
+share/vim/%%VIM_VER%%/syntax/model.vim
+share/vim/%%VIM_VER%%/syntax/modsim3.vim
+share/vim/%%VIM_VER%%/syntax/modula2.vim
+share/vim/%%VIM_VER%%/syntax/modula3.vim
+share/vim/%%VIM_VER%%/syntax/mp.vim
+share/vim/%%VIM_VER%%/syntax/msql.vim
+share/vim/%%VIM_VER%%/syntax/muttrc.vim
+share/vim/%%VIM_VER%%/syntax/nasm.vim
+share/vim/%%VIM_VER%%/syntax/ncf.vim
+share/vim/%%VIM_VER%%/syntax/nosyntax.vim
+share/vim/%%VIM_VER%%/syntax/nroff.vim
+share/vim/%%VIM_VER%%/syntax/objc.vim
+share/vim/%%VIM_VER%%/syntax/ocaml.vim
+share/vim/%%VIM_VER%%/syntax/opl.vim
+share/vim/%%VIM_VER%%/syntax/pascal.vim
+share/vim/%%VIM_VER%%/syntax/pcap.vim
+share/vim/%%VIM_VER%%/syntax/pccts.vim
+share/vim/%%VIM_VER%%/syntax/perl.vim
+share/vim/%%VIM_VER%%/syntax/php3.vim
+share/vim/%%VIM_VER%%/syntax/phtml.vim
+share/vim/%%VIM_VER%%/syntax/pike.vim
+share/vim/%%VIM_VER%%/syntax/pine.vim
+share/vim/%%VIM_VER%%/syntax/plsql.vim
+share/vim/%%VIM_VER%%/syntax/po.vim
+share/vim/%%VIM_VER%%/syntax/pod.vim
+share/vim/%%VIM_VER%%/syntax/postscr.vim
+share/vim/%%VIM_VER%%/syntax/pov.vim
+share/vim/%%VIM_VER%%/syntax/procmail.vim
+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/radiance.vim
+share/vim/%%VIM_VER%%/syntax/rc.vim
+share/vim/%%VIM_VER%%/syntax/rebol.vim
+share/vim/%%VIM_VER%%/syntax/rexx.vim
+share/vim/%%VIM_VER%%/syntax/rpcgen.vim
+share/vim/%%VIM_VER%%/syntax/sas.vim
+share/vim/%%VIM_VER%%/syntax/sather.vim
+share/vim/%%VIM_VER%%/syntax/scheme.vim
+share/vim/%%VIM_VER%%/syntax/sdl.vim
+share/vim/%%VIM_VER%%/syntax/sed.vim
+share/vim/%%VIM_VER%%/syntax/sgml.vim
+share/vim/%%VIM_VER%%/syntax/sh.vim
+share/vim/%%VIM_VER%%/syntax/sicad.vim
+share/vim/%%VIM_VER%%/syntax/simula.vim
+share/vim/%%VIM_VER%%/syntax/skill.vim
+share/vim/%%VIM_VER%%/syntax/sl.vim
+share/vim/%%VIM_VER%%/syntax/slang.vim
+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/spec.vim
+share/vim/%%VIM_VER%%/syntax/spup.vim
+share/vim/%%VIM_VER%%/syntax/sql.vim
+share/vim/%%VIM_VER%%/syntax/squid.vim
+share/vim/%%VIM_VER%%/syntax/st.vim
+share/vim/%%VIM_VER%%/syntax/synload.vim
+share/vim/%%VIM_VER%%/syntax/syntax.vim
+share/vim/%%VIM_VER%%/syntax/tags.vim
+share/vim/%%VIM_VER%%/syntax/tcl.vim
+share/vim/%%VIM_VER%%/syntax/tex.vim
+share/vim/%%VIM_VER%%/syntax/tf.vim
+share/vim/%%VIM_VER%%/syntax/tsalt.vim
+share/vim/%%VIM_VER%%/syntax/uil.vim
+share/vim/%%VIM_VER%%/syntax/vb.vim
+share/vim/%%VIM_VER%%/syntax/verilog.vim
+share/vim/%%VIM_VER%%/syntax/vgrindefs.vim
+share/vim/%%VIM_VER%%/syntax/vhdl.vim
+share/vim/%%VIM_VER%%/syntax/vim.vim
+share/vim/%%VIM_VER%%/syntax/viminfo.vim
+share/vim/%%VIM_VER%%/syntax/vrml.vim
+share/vim/%%VIM_VER%%/syntax/whitespace.vim
+share/vim/%%VIM_VER%%/syntax/xdefaults.vim
+share/vim/%%VIM_VER%%/syntax/xmath.vim
+share/vim/%%VIM_VER%%/syntax/xml.vim
+share/vim/%%VIM_VER%%/syntax/xpm.vim
+share/vim/%%VIM_VER%%/syntax/xs.vim
+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
+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
+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/hanoi
+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
+share/vim/%%VIM_VER%%/macros/life/click.me
+share/vim/%%VIM_VER%%/macros/life/life.vim
+share/vim/%%VIM_VER%%/macros/maze
+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
+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%%/tools
+share/vim/%%VIM_VER%%/tools/README.txt
+share/vim/%%VIM_VER%%/tools/blink.c
+share/vim/%%VIM_VER%%/tools/ccfilter.1
+share/vim/%%VIM_VER%%/tools/ccfilter.c
+share/vim/%%VIM_VER%%/tools/ccfilter_README.txt
+share/vim/%%VIM_VER%%/tools/efm_filter.pl
+share/vim/%%VIM_VER%%/tools/efm_filter.txt
+share/vim/%%VIM_VER%%/tools/gvimdiff
+share/vim/%%VIM_VER%%/tools/mve.awk
+share/vim/%%VIM_VER%%/tools/mve.txt
+share/vim/%%VIM_VER%%/tools/pltags.pl
+share/vim/%%VIM_VER%%/tools/ref
+share/vim/%%VIM_VER%%/tools/shtags.1
+share/vim/%%VIM_VER%%/tools/shtags.pl
+share/vim/%%VIM_VER%%/tools/tcltags
+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
+@dirrm share/vim/%%VIM_VER%%/doc
+@dirrm share/vim/%%VIM_VER%%/macros/hanoi
+@dirrm share/vim/%%VIM_VER%%/macros/life
+@dirrm share/vim/%%VIM_VER%%/macros/maze
+@dirrm share/vim/%%VIM_VER%%/macros/urm
+@dirrm share/vim/%%VIM_VER%%/macros
+@dirrm share/vim/%%VIM_VER%%/syntax
+@dirrm share/vim/%%VIM_VER%%/tools
+@dirrm share/vim/%%VIM_VER%%/tutor
+@dirrm share/vim/%%VIM_VER%%
 @dirrm share/vim