Ooops, an old patch file from 5.8 was causing troubles with

the documentation, i.e. the :help command didn't work.

3 files changed, 116 insertions, 130 deletions

diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 25fb5f478c2..a92cddd3704 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/10/04 10:18:12 martti Exp $
+$NetBSD: distinfo,v 1.6 2001/10/04 11:34:14 martti Exp $
 
 SHA1 (vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a
 Size (vim-6.0.tar.bz2) = 2776551 bytes
-SHA1 (patch-ac) = 82167d94d5a0c300d490aaa102c15762ebde7908
diff --git a/editors/vim-share/patches/patch-ac b/editors/vim-share/patches/patch-ac
deleted file mode 100644
index d6b68b8d08b..00000000000
--- a/editors/vim-share/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2001/10/04 10:18:12 martti Exp $
-
---- Makefile.orig	Wed Sep 26 14:10:59 2001
-+++ Makefile	Thu Oct  4 08:44:19 2001
-@@ -772,7 +772,7 @@
- ### some things might not work when they are changed!)
- VIMDIR = /vim
- VIMRTDIR = /vim60
--HELPSUBDIR = /doc
-+HELPSUBDIR = /../../doc/vim
- COLSUBDIR = /colors
- SYNSUBDIR = /syntax
- INDSUBDIR = /indent
diff --git a/editors/vim-share/pkg/PLIST b/editors/vim-share/pkg/PLIST
index de21a0f15c8..9a5f94520ab 100644
--- a/editors/vim-share/pkg/PLIST
+++ b/editors/vim-share/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2001/10/04 10:18:12 martti Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/10/04 11:34:16 martti Exp $
 bin/vimtutor
 bin/xxd
 man/man1/evim.1
@@ -6,119 +6,6 @@ man/man1/vim.1
 man/man1/vimdiff.1
 man/man1/vimtutor.1
 man/man1/xxd.1
-share/doc/vim/autocmd.txt
-share/doc/vim/change.txt
-share/doc/vim/cmdline.txt
-share/doc/vim/debugger.txt
-share/doc/vim/develop.txt
-share/doc/vim/diff.txt
-share/doc/vim/digraph.txt
-share/doc/vim/editing.txt
-share/doc/vim/eval.txt
-share/doc/vim/farsi.txt
-share/doc/vim/filetype.txt
-share/doc/vim/fold.txt
-share/doc/vim/gui.txt
-share/doc/vim/gui_w16.txt
-share/doc/vim/gui_w32.txt
-share/doc/vim/gui_x11.txt
-share/doc/vim/hangulin.txt
-share/doc/vim/help.txt
-share/doc/vim/howto.txt
-share/doc/vim/if_cscop.txt
-share/doc/vim/if_ole.txt
-share/doc/vim/if_perl.txt
-share/doc/vim/if_pyth.txt
-share/doc/vim/if_ruby.txt
-share/doc/vim/if_sniff.txt
-share/doc/vim/if_tcl.txt
-share/doc/vim/indent.txt
-share/doc/vim/index.txt
-share/doc/vim/insert.txt
-share/doc/vim/intro.txt
-share/doc/vim/map.txt
-share/doc/vim/mbyte.txt
-share/doc/vim/message.txt
-share/doc/vim/mlang.txt
-share/doc/vim/motion.txt
-share/doc/vim/options.txt
-share/doc/vim/os_390.txt
-share/doc/vim/os_amiga.txt
-share/doc/vim/os_beos.txt
-share/doc/vim/os_dos.txt
-share/doc/vim/os_mac.txt
-share/doc/vim/os_mint.txt
-share/doc/vim/os_msdos.txt
-share/doc/vim/os_os2.txt
-share/doc/vim/os_qnx.txt
-share/doc/vim/os_risc.txt
-share/doc/vim/os_unix.txt
-share/doc/vim/os_vms.txt
-share/doc/vim/os_win32.txt
-share/doc/vim/pattern.txt
-share/doc/vim/pi_expl.txt
-share/doc/vim/pi_gzip.txt
-share/doc/vim/pi_netrw.txt
-share/doc/vim/pi_spec.txt
-share/doc/vim/quickfix.txt
-share/doc/vim/quickref.txt
-share/doc/vim/quotes.txt
-share/doc/vim/recover.txt
-share/doc/vim/remote.txt
-share/doc/vim/repeat.txt
-share/doc/vim/rileft.txt
-share/doc/vim/scroll.txt
-share/doc/vim/sign.txt
-share/doc/vim/starting.txt
-share/doc/vim/syntax.txt
-share/doc/vim/tags
-share/doc/vim/tagsrch.txt
-share/doc/vim/term.txt
-share/doc/vim/tips.txt
-share/doc/vim/todo.txt
-share/doc/vim/uganda.txt
-share/doc/vim/undo.txt
-share/doc/vim/usr_01.txt
-share/doc/vim/usr_02.txt
-share/doc/vim/usr_03.txt
-share/doc/vim/usr_04.txt
-share/doc/vim/usr_05.txt
-share/doc/vim/usr_06.txt
-share/doc/vim/usr_07.txt
-share/doc/vim/usr_08.txt
-share/doc/vim/usr_09.txt
-share/doc/vim/usr_10.txt
-share/doc/vim/usr_11.txt
-share/doc/vim/usr_12.txt
-share/doc/vim/usr_20.txt
-share/doc/vim/usr_21.txt
-share/doc/vim/usr_22.txt
-share/doc/vim/usr_23.txt
-share/doc/vim/usr_24.txt
-share/doc/vim/usr_25.txt
-share/doc/vim/usr_26.txt
-share/doc/vim/usr_27.txt
-share/doc/vim/usr_28.txt
-share/doc/vim/usr_29.txt
-share/doc/vim/usr_30.txt
-share/doc/vim/usr_31.txt
-share/doc/vim/usr_40.txt
-share/doc/vim/usr_41.txt
-share/doc/vim/usr_42.txt
-share/doc/vim/usr_43.txt
-share/doc/vim/usr_44.txt
-share/doc/vim/usr_45.txt
-share/doc/vim/usr_90.txt
-share/doc/vim/usr_toc.txt
-share/doc/vim/various.txt
-share/doc/vim/version4.txt
-share/doc/vim/version5.txt
-share/doc/vim/version6.txt
-share/doc/vim/vi_diff.txt
-share/doc/vim/vim2html.pl
-share/doc/vim/visual.txt
-share/doc/vim/windows.txt
-share/doc/vim/workshop.txt
 share/vim/${VIM_SUBDIR}/bugreport.vim
 share/vim/${VIM_SUBDIR}/colors/README.txt
 share/vim/${VIM_SUBDIR}/colors/blue.vim
@@ -141,6 +28,119 @@ share/vim/${VIM_SUBDIR}/compiler/msvc.vim
 share/vim/${VIM_SUBDIR}/compiler/tex.vim
 share/vim/${VIM_SUBDIR}/compiler/tidy.vim
 share/vim/${VIM_SUBDIR}/delmenu.vim
+share/vim/${VIM_SUBDIR}/doc/autocmd.txt
+share/vim/${VIM_SUBDIR}/doc/change.txt
+share/vim/${VIM_SUBDIR}/doc/cmdline.txt
+share/vim/${VIM_SUBDIR}/doc/debugger.txt
+share/vim/${VIM_SUBDIR}/doc/develop.txt
+share/vim/${VIM_SUBDIR}/doc/diff.txt
+share/vim/${VIM_SUBDIR}/doc/digraph.txt
+share/vim/${VIM_SUBDIR}/doc/editing.txt
+share/vim/${VIM_SUBDIR}/doc/eval.txt
+share/vim/${VIM_SUBDIR}/doc/farsi.txt
+share/vim/${VIM_SUBDIR}/doc/filetype.txt
+share/vim/${VIM_SUBDIR}/doc/fold.txt
+share/vim/${VIM_SUBDIR}/doc/gui.txt
+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/help.txt
+share/vim/${VIM_SUBDIR}/doc/howto.txt
+share/vim/${VIM_SUBDIR}/doc/if_cscop.txt
+share/vim/${VIM_SUBDIR}/doc/if_ole.txt
+share/vim/${VIM_SUBDIR}/doc/if_perl.txt
+share/vim/${VIM_SUBDIR}/doc/if_pyth.txt
+share/vim/${VIM_SUBDIR}/doc/if_ruby.txt
+share/vim/${VIM_SUBDIR}/doc/if_sniff.txt
+share/vim/${VIM_SUBDIR}/doc/if_tcl.txt
+share/vim/${VIM_SUBDIR}/doc/indent.txt
+share/vim/${VIM_SUBDIR}/doc/index.txt
+share/vim/${VIM_SUBDIR}/doc/insert.txt
+share/vim/${VIM_SUBDIR}/doc/intro.txt
+share/vim/${VIM_SUBDIR}/doc/map.txt
+share/vim/${VIM_SUBDIR}/doc/mbyte.txt
+share/vim/${VIM_SUBDIR}/doc/message.txt
+share/vim/${VIM_SUBDIR}/doc/mlang.txt
+share/vim/${VIM_SUBDIR}/doc/motion.txt
+share/vim/${VIM_SUBDIR}/doc/options.txt
+share/vim/${VIM_SUBDIR}/doc/os_390.txt
+share/vim/${VIM_SUBDIR}/doc/os_amiga.txt
+share/vim/${VIM_SUBDIR}/doc/os_beos.txt
+share/vim/${VIM_SUBDIR}/doc/os_dos.txt
+share/vim/${VIM_SUBDIR}/doc/os_mac.txt
+share/vim/${VIM_SUBDIR}/doc/os_mint.txt
+share/vim/${VIM_SUBDIR}/doc/os_msdos.txt
+share/vim/${VIM_SUBDIR}/doc/os_os2.txt
+share/vim/${VIM_SUBDIR}/doc/os_qnx.txt
+share/vim/${VIM_SUBDIR}/doc/os_risc.txt
+share/vim/${VIM_SUBDIR}/doc/os_unix.txt
+share/vim/${VIM_SUBDIR}/doc/os_vms.txt
+share/vim/${VIM_SUBDIR}/doc/os_win32.txt
+share/vim/${VIM_SUBDIR}/doc/pattern.txt
+share/vim/${VIM_SUBDIR}/doc/pi_expl.txt
+share/vim/${VIM_SUBDIR}/doc/pi_gzip.txt
+share/vim/${VIM_SUBDIR}/doc/pi_netrw.txt
+share/vim/${VIM_SUBDIR}/doc/pi_spec.txt
+share/vim/${VIM_SUBDIR}/doc/quickfix.txt
+share/vim/${VIM_SUBDIR}/doc/quickref.txt
+share/vim/${VIM_SUBDIR}/doc/quotes.txt
+share/vim/${VIM_SUBDIR}/doc/recover.txt
+share/vim/${VIM_SUBDIR}/doc/remote.txt
+share/vim/${VIM_SUBDIR}/doc/repeat.txt
+share/vim/${VIM_SUBDIR}/doc/rileft.txt
+share/vim/${VIM_SUBDIR}/doc/scroll.txt
+share/vim/${VIM_SUBDIR}/doc/sign.txt
+share/vim/${VIM_SUBDIR}/doc/starting.txt
+share/vim/${VIM_SUBDIR}/doc/syntax.txt
+share/vim/${VIM_SUBDIR}/doc/tags
+share/vim/${VIM_SUBDIR}/doc/tagsrch.txt
+share/vim/${VIM_SUBDIR}/doc/term.txt
+share/vim/${VIM_SUBDIR}/doc/tips.txt
+share/vim/${VIM_SUBDIR}/doc/todo.txt
+share/vim/${VIM_SUBDIR}/doc/uganda.txt
+share/vim/${VIM_SUBDIR}/doc/undo.txt
+share/vim/${VIM_SUBDIR}/doc/usr_01.txt
+share/vim/${VIM_SUBDIR}/doc/usr_02.txt
+share/vim/${VIM_SUBDIR}/doc/usr_03.txt
+share/vim/${VIM_SUBDIR}/doc/usr_04.txt
+share/vim/${VIM_SUBDIR}/doc/usr_05.txt
+share/vim/${VIM_SUBDIR}/doc/usr_06.txt
+share/vim/${VIM_SUBDIR}/doc/usr_07.txt
+share/vim/${VIM_SUBDIR}/doc/usr_08.txt
+share/vim/${VIM_SUBDIR}/doc/usr_09.txt
+share/vim/${VIM_SUBDIR}/doc/usr_10.txt
+share/vim/${VIM_SUBDIR}/doc/usr_11.txt
+share/vim/${VIM_SUBDIR}/doc/usr_12.txt
+share/vim/${VIM_SUBDIR}/doc/usr_20.txt
+share/vim/${VIM_SUBDIR}/doc/usr_21.txt
+share/vim/${VIM_SUBDIR}/doc/usr_22.txt
+share/vim/${VIM_SUBDIR}/doc/usr_23.txt
+share/vim/${VIM_SUBDIR}/doc/usr_24.txt
+share/vim/${VIM_SUBDIR}/doc/usr_25.txt
+share/vim/${VIM_SUBDIR}/doc/usr_26.txt
+share/vim/${VIM_SUBDIR}/doc/usr_27.txt
+share/vim/${VIM_SUBDIR}/doc/usr_28.txt
+share/vim/${VIM_SUBDIR}/doc/usr_29.txt
+share/vim/${VIM_SUBDIR}/doc/usr_30.txt
+share/vim/${VIM_SUBDIR}/doc/usr_31.txt
+share/vim/${VIM_SUBDIR}/doc/usr_40.txt
+share/vim/${VIM_SUBDIR}/doc/usr_41.txt
+share/vim/${VIM_SUBDIR}/doc/usr_42.txt
+share/vim/${VIM_SUBDIR}/doc/usr_43.txt
+share/vim/${VIM_SUBDIR}/doc/usr_44.txt
+share/vim/${VIM_SUBDIR}/doc/usr_45.txt
+share/vim/${VIM_SUBDIR}/doc/usr_90.txt
+share/vim/${VIM_SUBDIR}/doc/usr_toc.txt
+share/vim/${VIM_SUBDIR}/doc/various.txt
+share/vim/${VIM_SUBDIR}/doc/version4.txt
+share/vim/${VIM_SUBDIR}/doc/version5.txt
+share/vim/${VIM_SUBDIR}/doc/version6.txt
+share/vim/${VIM_SUBDIR}/doc/vi_diff.txt
+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
@@ -584,9 +584,9 @@ share/vim/${VIM_SUBDIR}/tutor/README.txt
 share/vim/${VIM_SUBDIR}/tutor/tutor
 share/vim/${VIM_SUBDIR}/tutor/tutor.vim
 share/vim/${VIM_SUBDIR}/vimrc_example.vim
-@dirrm share/doc/vim
 @dirrm share/vim/${VIM_SUBDIR}/colors
 @dirrm share/vim/${VIM_SUBDIR}/compiler
+@dirrm share/vim/${VIM_SUBDIR}/doc
 @dirrm share/vim/${VIM_SUBDIR}/ftplugin
 @dirrm share/vim/${VIM_SUBDIR}/indent
 @dirrm share/vim/${VIM_SUBDIR}/macros/hanoi