Upgrade vim packages to version 5.7. Use internal curses if possible.

New since version 5.6
---------------------
Not much:
- 19 new syntax files.
- "explorer.vim" script, works like a file browser.

And many bug fixes!  This version is aimed at stability.

15 files changed, 371 insertions, 319 deletions

diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 5186a666170..0ba932dd201 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/02/15 16:08:23 agc Exp $
+# $NetBSD: Makefile,v 1.16 2000/06/25 11:50:34 pooka Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -23,11 +23,25 @@ INSTALL_TARGET=		installvimbin
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
-DEPENDS+=		ncurses>=4.2:../../devel/ncurses
-CONFIGURE_ARGS+=	--with-tlib=ncurses
-.elif ${OPSYS} == "SunOS"
+GOOD_CURSES=    1.4[Y-Z] 1.4Z[A-Z] 1.[5-9]*
+
+.for PATTERN in ${GOOD_CURSES}
+.if ${OS_VERSION:M${PATTERN}} != ""
+CURSES_GOOD?=   #defined
+.endif
+.endfor
+.endif
+
+.if ${OPSYS} == "SunOS"
+CURSES_GOOD?=   #defined
+.endif
+
+.if defined(CURSES_GOOD)
 CPPFLAGS=
-CONFIGURE_ARGS+=	--with-tlib=curses
+CONFIGURE_ARGS+=        --with-tlib=curses
+.else
+DEPENDS+=               ncurses>=4.2:../../devel/ncurses
+CONFIGURE_ARGS+=        --with-tlib=ncurses
 .endif
 
 post-install:
diff --git a/editors/vim-gtk/files/patch-sum b/editors/vim-gtk/files/patch-sum
index 617017a9a50..68389708194 100644
--- a/editors/vim-gtk/files/patch-sum
+++ b/editors/vim-gtk/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/01/17 17:36:35 pooka Exp $
+$NetBSD: patch-sum,v 1.5 2000/06/25 11:50:35 pooka Exp $
 
 MD5 (patch-aa) = 97cd1d6e7839e794826a32d477314554
-MD5 (patch-za) = e53e72a98abbb723d60c03b8bf1fc55d
-MD5 (patch-zb) = 221296b5d4e7413473f9cc4098a611fd
+MD5 (patch-zb) = 7bfdfff0821780edc31108e66e566216
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 1042fd8b7b5..e44246050ce 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.2 2000/01/17 17:36:31 pooka Exp $
+# $NetBSD: Makefile.common,v 1.3 2000/06/25 11:50:35 pooka Exp $
 
-VIM_VERSION=		5.6
+VIM_VERSION=		5.7
 
 DISTNAME=		vim-${VIM_VERSION}
 CATEGORIES=		editors
diff --git a/editors/vim-share/files/md5 b/editors/vim-share/files/md5
index c7b75963622..9c590949c66 100644
--- a/editors/vim-share/files/md5
+++ b/editors/vim-share/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.2 2000/01/17 17:36:32 pooka Exp $
+$NetBSD: md5,v 1.3 2000/06/25 11:50:36 pooka Exp $
 
-MD5 (vim-5.6-src.tar.gz) = 80d0f9948e86db01d024419735b62e85
-MD5 (vim-5.6-rt.tar.gz) = ce439bd4f37acc27cb2b2d20ef7164bc
+MD5 (vim-5.7-src.tar.gz) = 0b2bca69c7018a8777d8d5390e23d06e
+MD5 (vim-5.7-rt.tar.gz) = b7d9cbc64479e26f52e2bc58d312bd84
diff --git a/editors/vim-share/files/patch-sum b/editors/vim-share/files/patch-sum
index 18024a10718..ff204828b94 100644
--- a/editors/vim-share/files/patch-sum
+++ b/editors/vim-share/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.3 2000/01/25 17:13:17 pooka Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/25 11:50:36 pooka Exp $
 
-MD5 (patch-aa) = 951d4e8cdc4a7405601c21515c013af8
-MD5 (patch-ac) = f08e5029ca1409c64e5ea60d22c89b21
-MD5 (patch-za) = e53e72a98abbb723d60c03b8bf1fc55d
-MD5 (patch-zb) = 221296b5d4e7413473f9cc4098a611fd
+MD5 (patch-aa) = 2bbbf849c316e084b3ee77caab41c796
+MD5 (patch-ac) = 7b62ceb02d53c880e5422cdee7132b71
+MD5 (patch-zb) = 7bfdfff0821780edc31108e66e566216
diff --git a/editors/vim-share/patches.common/patch-za b/editors/vim-share/patches.common/patch-za
deleted file mode 100644
index f19f68db71c..00000000000
--- a/editors/vim-share/patches.common/patch-za
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-za,v 1.1 2000/01/17 17:36:34 pooka Exp $
-
---- config.mk.in.orig	Sat Jun 20 15:22:37 1998
-+++ config.mk.in	Sun Jan 10 23:22:48 1999
-@@ -14,7 +14,7 @@
- @SET_MAKE@
- CC		= @CC@
- DEFS		= @DEFS@
--CFLAGS		= @CFLAGS@
-+CFLAGS		= @CFLAGS@ @CPPFLAGS@
- srcdir		= @srcdir@
- VPATH		= @srcdir@
- LDFLAGS		= @LDFLAGS@
diff --git a/editors/vim-share/patches.common/patch-zb b/editors/vim-share/patches.common/patch-zb
index 8eee11e43e7..bb0795f10b5 100644
--- a/editors/vim-share/patches.common/patch-zb
+++ b/editors/vim-share/patches.common/patch-zb
@@ -1,7 +1,7 @@
-$NetBSD: patch-zb,v 1.1 2000/01/17 17:36:34 pooka Exp $
+$NetBSD: patch-zb,v 1.2 2000/06/25 11:50:39 pooka Exp $
 
---- feature.h.orig	Sun Jan  9 20:59:08 2000
-+++ feature.h	Mon Jan 17 18:41:34 2000
+--- feature.h.orig	Wed Mar 29 17:10:34 2000
++++ feature.h	Sun Jun 25 12:42:47 2000
 @@ -349,7 +349,7 @@
   *			(used only with NO_BUILTIN_TCAPS not defined).
   */
diff --git a/editors/vim-share/patches/patch-aa b/editors/vim-share/patches/patch-aa
index 1516bcddc05..fbc6f7b6ac4 100644
--- a/editors/vim-share/patches/patch-aa
+++ b/editors/vim-share/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/21 13:20:33 pooka Exp $
+$NetBSD: patch-aa,v 1.2 2000/06/25 11:50:37 pooka Exp $
 
---- ctags/Makefile.in.orig	Thu Sep 16 08:02:20 1999
-+++ ctags/Makefile.in	Sat Nov 20 11:42:47 1999
+--- ctags/Makefile.in.orig	Fri Oct  1 07:11:06 1999
++++ ctags/Makefile.in	Sun Jun 25 12:35:39 2000
 @@ -79,14 +79,14 @@
  #
  manext	= 1
diff --git a/editors/vim-share/patches/patch-ac b/editors/vim-share/patches/patch-ac
index de2a4a0f3ce..d256ee44ac5 100644
--- a/editors/vim-share/patches/patch-ac
+++ b/editors/vim-share/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.3 2000/01/25 17:13:18 pooka Exp $
+$NetBSD: patch-ac,v 1.4 2000/06/25 11:50:37 pooka Exp $
 
---- Makefile.orig	Sun Jan 16 16:03:04 2000
-+++ Makefile	Tue Jan 25 18:56:02 2000
-@@ -737,7 +737,7 @@
+--- Makefile.orig	Sat Jun 24 12:28:59 2000
++++ Makefile	Sun Jun 25 13:42:51 2000
+@@ -752,7 +752,7 @@
  ### might not work when they are changed!)
  VIMDIR = /vim
- VIMRTDIR = /vim56
+ VIMRTDIR = /vim57
 -HELPSUBDIR = /doc
 +HELPSUBDIR = /../../doc/vim
  SYNSUBDIR = /syntax
  MACROSUBDIR = /macros
  TOOLSSUBDIR = /tools
-@@ -1349,6 +1349,7 @@
+@@ -1367,6 +1367,7 @@
  
  # install the help files; first adjust the contents for the location
  installvimhelp: $(HELPSOURCE)/vim.1 $(MANSUBDIR) $(VIMLOC) $(VIMRTLOC) $(HELPSUBLOC) $(SYNSUBLOC) $(TUTORSUBLOC)
@@ -19,7 +19,7 @@ $NetBSD: patch-ac,v 1.3 2000/01/25 17:13:18 pooka Exp $
  	@echo generating $(MANSUBDIR)/$(VIMNAME).1
  	@sed -e s+/usr/local/lib/vim+$(VIMLOC)+ \
  		-e s+$(VIMLOC)/doc+$(HELPENDLOC)+ \
-@@ -1469,13 +1470,7 @@
+@@ -1487,13 +1488,7 @@
  
  # 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.
diff --git a/editors/vim-share/pkg/PLIST b/editors/vim-share/pkg/PLIST
index 280d242bca4..256b5197dcf 100644
--- a/editors/vim-share/pkg/PLIST
+++ b/editors/vim-share/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/01/25 17:13:18 pooka Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/06/25 11:50:40 pooka Exp $
 bin/vimtutor
 bin/vim-ctags
 bin/vim-etags
@@ -72,257 +72,284 @@ share/doc/vim/cmdline.txt
 share/doc/vim/change.txt
 share/doc/vim/tags
 share/doc/vim/vim2html.pl
-share/vim/vim56/syntax/2html.vim
-share/vim/vim56/syntax/z8a.vim
-share/vim/vim56/syntax/yacc.vim
-share/vim/vim56/syntax/xxd.vim
-share/vim/vim56/syntax/xs.vim
-share/vim/vim56/syntax/xpm.vim
-share/vim/vim56/syntax/xml.vim
-share/vim/vim56/syntax/xmath.vim
-share/vim/vim56/syntax/xdefaults.vim
-share/vim/vim56/syntax/winbatch.vim
-share/vim/vim56/syntax/whitespace.vim
-share/vim/vim56/syntax/web.vim
-share/vim/vim56/syntax/vrml.vim
-share/vim/vim56/syntax/viminfo.vim
-share/vim/vim56/syntax/vim.vim
-share/vim/vim56/syntax/vhdl.vim
-share/vim/vim56/syntax/vgrindefs.vim
-share/vim/vim56/syntax/verilog.vim
-share/vim/vim56/syntax/vb.vim
-share/vim/vim56/syntax/uil.vim
-share/vim/vim56/syntax/tsalt.vim
-share/vim/vim56/syntax/tf.vim
-share/vim/vim56/syntax/tex.vim
-share/vim/vim56/syntax/tcl.vim
-share/vim/vim56/syntax/tags.vim
-share/vim/vim56/syntax/syntax.vim
-share/vim/vim56/syntax/synload.vim
-share/vim/vim56/syntax/st.vim
-share/vim/vim56/syntax/squid.vim
-share/vim/vim56/syntax/sql.vim
-share/vim/vim56/syntax/spup.vim
-share/vim/vim56/syntax/spice.vim
-share/vim/vim56/syntax/spec.vim
-share/vim/vim56/syntax/smil.vim
-share/vim/vim56/syntax/sm.vim
-share/vim/vim56/syntax/slrnsc.vim
-share/vim/vim56/syntax/slrnrc.vim
-share/vim/vim56/syntax/slang.vim
-share/vim/vim56/syntax/sl.vim
-share/vim/vim56/syntax/skill.vim
-share/vim/vim56/syntax/simula.vim
-share/vim/vim56/syntax/sicad.vim
-share/vim/vim56/syntax/sh.vim
-share/vim/vim56/syntax/sgmllnx.vim
-share/vim/vim56/syntax/sgml.vim
-share/vim/vim56/syntax/sed.vim
-share/vim/vim56/syntax/sdl.vim
-share/vim/vim56/syntax/scheme.vim
-share/vim/vim56/syntax/sather.vim
-share/vim/vim56/syntax/sas.vim
-share/vim/vim56/syntax/rpcgen.vim
-share/vim/vim56/syntax/rexx.vim
-share/vim/vim56/syntax/rebol.vim
-share/vim/vim56/syntax/rc.vim
-share/vim/vim56/syntax/radiance.vim
-share/vim/vim56/syntax/python.vim
-share/vim/vim56/syntax/purifylog.vim
-share/vim/vim56/syntax/ptcap.vim
-share/vim/vim56/syntax/prolog.vim
-share/vim/vim56/syntax/procmail.vim
-share/vim/vim56/syntax/pov.vim
-share/vim/vim56/syntax/postscr.vim
-share/vim/vim56/syntax/pod.vim
-share/vim/vim56/syntax/po.vim
-share/vim/vim56/syntax/plsql.vim
-share/vim/vim56/syntax/pine.vim
-share/vim/vim56/syntax/pike.vim
-share/vim/vim56/syntax/phtml.vim
-share/vim/vim56/syntax/php3.vim
-share/vim/vim56/syntax/perl.vim
-share/vim/vim56/syntax/pccts.vim
-share/vim/vim56/syntax/pcap.vim
-share/vim/vim56/syntax/pascal.vim
-share/vim/vim56/syntax/opl.vim
-share/vim/vim56/syntax/ocaml.vim
-share/vim/vim56/syntax/objc.vim
-share/vim/vim56/syntax/nroff.vim
-share/vim/vim56/syntax/nosyntax.vim
-share/vim/vim56/syntax/ncf.vim
-share/vim/vim56/syntax/nasm.vim
-share/vim/vim56/syntax/muttrc.vim
-share/vim/vim56/syntax/msql.vim
-share/vim/vim56/syntax/mp.vim
-share/vim/vim56/syntax/modula3.vim
-share/vim/vim56/syntax/modula2.vim
-share/vim/vim56/syntax/modsim3.vim
-share/vim/vim56/syntax/model.vim
-share/vim/vim56/syntax/mib.vim
-share/vim/vim56/syntax/mf.vim
-share/vim/vim56/syntax/matlab.vim
-share/vim/vim56/syntax/master.vim
-share/vim/vim56/syntax/masm.vim
-share/vim/vim56/syntax/maple.vim
-share/vim/vim56/syntax/manual.vim
-share/vim/vim56/syntax/man.vim
-share/vim/vim56/syntax/make.vim
-share/vim/vim56/syntax/mail.vim
-share/vim/vim56/syntax/m4.vim
-share/vim/vim56/syntax/lua.vim
-share/vim/vim56/syntax/lss.vim
-share/vim/vim56/syntax/lout.vim
-share/vim/vim56/syntax/lotos.vim
-share/vim/vim56/syntax/lite.vim
-share/vim/vim56/syntax/lisp.vim
-share/vim/vim56/syntax/lilo.vim
-share/vim/vim56/syntax/lex.vim
-share/vim/vim56/syntax/lhaskell.vim
-share/vim/vim56/syntax/lace.vim
-share/vim/vim56/syntax/kwt.vim
-share/vim/vim56/syntax/jgraph.vim
-share/vim/vim56/syntax/javascript.vim
-share/vim/vim56/syntax/javacc.vim
-share/vim/vim56/syntax/java.vim
-share/vim/vim56/syntax/ishd.vim
-share/vim/vim56/syntax/inform.vim
-share/vim/vim56/syntax/idlang.vim
-share/vim/vim56/syntax/idl.vim
-share/vim/vim56/syntax/htmlm4.vim
-share/vim/vim56/syntax/html.vim
-share/vim/vim56/syntax/hitest.vim
-share/vim/vim56/syntax/help.vim
-share/vim/vim56/syntax/haskell.vim
-share/vim/vim56/syntax/gp.vim
-share/vim/vim56/syntax/gnuplot.vim
-share/vim/vim56/syntax/gdmo.vim
-share/vim/vim56/syntax/gdb.vim
-share/vim/vim56/syntax/fvwm.vim
-share/vim/vim56/syntax/fortran.vim
-share/vim/vim56/syntax/forth.vim
-share/vim/vim56/syntax/focexec.vim
-share/vim/vim56/syntax/exports.vim
-share/vim/vim56/syntax/expect.vim
-share/vim/vim56/syntax/esqlc.vim
-share/vim/vim56/syntax/elmfilt.vim
-share/vim/vim56/syntax/elf.vim
-share/vim/vim56/syntax/eiffel.vim
-share/vim/vim56/syntax/dtd.vim
-share/vim/vim56/syntax/dracula.vim
-share/vim/vim56/syntax/dosini.vim
-share/vim/vim56/syntax/dosbatch.vim
-share/vim/vim56/syntax/diva.vim
-share/vim/vim56/syntax/diff.vim
-share/vim/vim56/syntax/def.vim
-share/vim/vim56/syntax/dcl.vim
-share/vim/vim56/syntax/cweb.vim
-share/vim/vim56/syntax/cterm.vim
-share/vim/vim56/syntax/css.vim
-share/vim/vim56/syntax/csh.vim
-share/vim/vim56/syntax/cpp.vim
-share/vim/vim56/syntax/config.vim
-share/vim/vim56/syntax/colortest.vim
-share/vim/vim56/syntax/cobol.vim
-share/vim/vim56/syntax/clipper.vim
-share/vim/vim56/syntax/clean.vim
-share/vim/vim56/syntax/change.vim
-share/vim/vim56/syntax/c.vim
-share/vim/vim56/syntax/btm.vim
-share/vim/vim56/syntax/bib.vim
-share/vim/vim56/syntax/basic.vim
-share/vim/vim56/syntax/awk.vim
-share/vim/vim56/syntax/ave.vim
-share/vim/vim56/syntax/atlas.vim
-share/vim/vim56/syntax/aspvbs.vim
-share/vim/vim56/syntax/asn.vim
-share/vim/vim56/syntax/asmh8300.vim
-share/vim/vim56/syntax/asm.vim
-share/vim/vim56/syntax/amiga.vim
-share/vim/vim56/syntax/ahdl.vim
-share/vim/vim56/syntax/ada.vim
-share/vim/vim56/syntax/abc.vim
-share/vim/vim56/syntax/zsh.vim
-share/vim/vim56/syntax/xpm2.vim
-share/vim/vim56/syntax/texinfo.vim
-share/vim/vim56/syntax/tads.vim
-share/vim/vim56/syntax/sqr.vim
-share/vim/vim56/syntax/remind.vim
-share/vim/vim56/syntax/rcslog.vim
-share/vim/vim56/syntax/jsp.vim
-share/vim/vim56/syntax/ist.vim
-share/vim/vim56/syntax/icon.vim
-share/vim/vim56/syntax/gedcom.vim
-share/vim/vim56/syntax/erlang.vim
-share/vim/vim56/syntax/cuplsim.vim
-share/vim/vim56/syntax/cupl.vim
-share/vim/vim56/syntax/ctrlh.vim
-share/vim/vim56/syntax/cf.vim
-share/vim/vim56/syntax/apachestyle.vim
-share/vim/vim56/syntax/aml.vim
-share/vim/vim56/syntax/abel.vim
-share/vim/vim56/tutor/tutor
-share/vim/vim56/tutor/README.txt
-share/vim/vim56/menu.vim
-share/vim/vim56/bugreport.vim
-share/vim/vim56/vimrc_example.vim
-share/vim/vim56/gvimrc_example.vim
-share/vim/vim56/filetype.vim
-share/vim/vim56/ftoff.vim
-share/vim/vim56/scripts.vim
-share/vim/vim56/optwin.vim
-share/vim/vim56/macros/hanoi/poster
-share/vim/vim56/macros/hanoi/click.me
-share/vim/vim56/macros/hanoi/hanoi.vim
-share/vim/vim56/macros/maze/maze_5.78
-share/vim/vim56/macros/maze/Makefile
-share/vim/vim56/macros/maze/maze.c
-share/vim/vim56/macros/maze/README.txt
-share/vim/vim56/macros/maze/mazeansi.c
-share/vim/vim56/macros/maze/maze_mac
-share/vim/vim56/macros/maze/poster
-share/vim/vim56/macros/life/click.me
-share/vim/vim56/macros/life/life.vim
-share/vim/vim56/macros/urm/urm
-share/vim/vim56/macros/urm/urm.vim
-share/vim/vim56/macros/urm/examples
-share/vim/vim56/macros/urm/README.txt
-share/vim/vim56/macros/html
-share/vim/vim56/macros/dvorak
-share/vim/vim56/macros/diffwin.vim
-share/vim/vim56/macros/README.txt
-share/vim/vim56/macros/swapmous.vim
-share/vim/vim56/macros/shellmenu.vim
-share/vim/vim56/macros/justify.vim
-share/vim/vim56/tools/README.txt
-share/vim/vim56/tools/vimspell.sh
-share/vim/vim56/tools/vimm
-share/vim/vim56/tools/vim132
-share/vim/vim56/tools/tcltags
-share/vim/vim56/tools/shtags.pl
-share/vim/vim56/tools/shtags.1
-share/vim/vim56/tools/ref
-share/vim/vim56/tools/pltags.pl
-share/vim/vim56/tools/mve.txt
-share/vim/vim56/tools/mve.awk
-share/vim/vim56/tools/gvimdiff
-share/vim/vim56/tools/efm_filter.txt
-share/vim/vim56/tools/efm_filter.pl
-share/vim/vim56/tools/ccfilter_README.txt
-share/vim/vim56/tools/ccfilter.c
-share/vim/vim56/tools/ccfilter.1
-share/vim/vim56/tools/blink.c
-share/vim/vim56/tools/vimspell.txt
-@exec ln -fs ../../doc/vim %D/share/vim/vim56/doc
-@unexec rm -f %D/share/vim/vim56/doc
-@dirrm share/vim/vim56/tools
-@dirrm share/vim/vim56/tutor
-@dirrm share/vim/vim56/syntax
-@dirrm share/vim/vim56/macros/urm
-@dirrm share/vim/vim56/macros/maze
-@dirrm share/vim/vim56/macros/life
-@dirrm share/vim/vim56/macros/hanoi
-@dirrm share/vim/vim56/macros
-@dirrm share/vim/vim56
+share/vim/vim57/syntax/2html.vim
+share/vim/vim57/syntax/z8a.vim
+share/vim/vim57/syntax/yacc.vim
+share/vim/vim57/syntax/xxd.vim
+share/vim/vim57/syntax/xs.vim
+share/vim/vim57/syntax/xpm.vim
+share/vim/vim57/syntax/xml.vim
+share/vim/vim57/syntax/xmath.vim
+share/vim/vim57/syntax/xdefaults.vim
+share/vim/vim57/syntax/winbatch.vim
+share/vim/vim57/syntax/whitespace.vim
+share/vim/vim57/syntax/web.vim
+share/vim/vim57/syntax/vrml.vim
+share/vim/vim57/syntax/viminfo.vim
+share/vim/vim57/syntax/vim.vim
+share/vim/vim57/syntax/vhdl.vim
+share/vim/vim57/syntax/vgrindefs.vim
+share/vim/vim57/syntax/verilog.vim
+share/vim/vim57/syntax/vb.vim
+share/vim/vim57/syntax/uil.vim
+share/vim/vim57/syntax/tsalt.vim
+share/vim/vim57/syntax/tf.vim
+share/vim/vim57/syntax/tex.vim
+share/vim/vim57/syntax/tcl.vim
+share/vim/vim57/syntax/tags.vim
+share/vim/vim57/syntax/syntax.vim
+share/vim/vim57/syntax/synload.vim
+share/vim/vim57/syntax/st.vim
+share/vim/vim57/syntax/squid.vim
+share/vim/vim57/syntax/sql.vim
+share/vim/vim57/syntax/spup.vim
+share/vim/vim57/syntax/spice.vim
+share/vim/vim57/syntax/spec.vim
+share/vim/vim57/syntax/smil.vim
+share/vim/vim57/syntax/sm.vim
+share/vim/vim57/syntax/slrnsc.vim
+share/vim/vim57/syntax/slrnrc.vim
+share/vim/vim57/syntax/slang.vim
+share/vim/vim57/syntax/sl.vim
+share/vim/vim57/syntax/skill.vim
+share/vim/vim57/syntax/simula.vim
+share/vim/vim57/syntax/sicad.vim
+share/vim/vim57/syntax/sh.vim
+share/vim/vim57/syntax/sgmllnx.vim
+share/vim/vim57/syntax/sgml.vim
+share/vim/vim57/syntax/sed.vim
+share/vim/vim57/syntax/sdl.vim
+share/vim/vim57/syntax/scheme.vim
+share/vim/vim57/syntax/sather.vim
+share/vim/vim57/syntax/sas.vim
+share/vim/vim57/syntax/rpcgen.vim
+share/vim/vim57/syntax/rexx.vim
+share/vim/vim57/syntax/rebol.vim
+share/vim/vim57/syntax/rc.vim
+share/vim/vim57/syntax/radiance.vim
+share/vim/vim57/syntax/python.vim
+share/vim/vim57/syntax/purifylog.vim
+share/vim/vim57/syntax/ptcap.vim
+share/vim/vim57/syntax/prolog.vim
+share/vim/vim57/syntax/procmail.vim
+share/vim/vim57/syntax/pov.vim
+share/vim/vim57/syntax/postscr.vim
+share/vim/vim57/syntax/pod.vim
+share/vim/vim57/syntax/po.vim
+share/vim/vim57/syntax/plsql.vim
+share/vim/vim57/syntax/pine.vim
+share/vim/vim57/syntax/pike.vim
+share/vim/vim57/syntax/phtml.vim
+share/vim/vim57/syntax/php3.vim
+share/vim/vim57/syntax/perl.vim
+share/vim/vim57/syntax/pccts.vim
+share/vim/vim57/syntax/pcap.vim
+share/vim/vim57/syntax/pascal.vim
+share/vim/vim57/syntax/opl.vim
+share/vim/vim57/syntax/ocaml.vim
+share/vim/vim57/syntax/objc.vim
+share/vim/vim57/syntax/nroff.vim
+share/vim/vim57/syntax/nosyntax.vim
+share/vim/vim57/syntax/ncf.vim
+share/vim/vim57/syntax/nasm.vim
+share/vim/vim57/syntax/muttrc.vim
+share/vim/vim57/syntax/msql.vim
+share/vim/vim57/syntax/mp.vim
+share/vim/vim57/syntax/modula3.vim
+share/vim/vim57/syntax/modula2.vim
+share/vim/vim57/syntax/modsim3.vim
+share/vim/vim57/syntax/model.vim
+share/vim/vim57/syntax/mib.vim
+share/vim/vim57/syntax/mf.vim
+share/vim/vim57/syntax/matlab.vim
+share/vim/vim57/syntax/master.vim
+share/vim/vim57/syntax/masm.vim
+share/vim/vim57/syntax/maple.vim
+share/vim/vim57/syntax/manual.vim
+share/vim/vim57/syntax/man.vim
+share/vim/vim57/syntax/make.vim
+share/vim/vim57/syntax/mail.vim
+share/vim/vim57/syntax/m4.vim
+share/vim/vim57/syntax/lua.vim
+share/vim/vim57/syntax/lss.vim
+share/vim/vim57/syntax/lout.vim
+share/vim/vim57/syntax/lotos.vim
+share/vim/vim57/syntax/lite.vim
+share/vim/vim57/syntax/lisp.vim
+share/vim/vim57/syntax/lilo.vim
+share/vim/vim57/syntax/lex.vim
+share/vim/vim57/syntax/lhaskell.vim
+share/vim/vim57/syntax/lace.vim
+share/vim/vim57/syntax/kwt.vim
+share/vim/vim57/syntax/jgraph.vim
+share/vim/vim57/syntax/javascript.vim
+share/vim/vim57/syntax/javacc.vim
+share/vim/vim57/syntax/java.vim
+share/vim/vim57/syntax/ishd.vim
+share/vim/vim57/syntax/inform.vim
+share/vim/vim57/syntax/idlang.vim
+share/vim/vim57/syntax/idl.vim
+share/vim/vim57/syntax/htmlm4.vim
+share/vim/vim57/syntax/html.vim
+share/vim/vim57/syntax/hitest.vim
+share/vim/vim57/syntax/help.vim
+share/vim/vim57/syntax/haskell.vim
+share/vim/vim57/syntax/gp.vim
+share/vim/vim57/syntax/gnuplot.vim
+share/vim/vim57/syntax/gdmo.vim
+share/vim/vim57/syntax/gdb.vim
+share/vim/vim57/syntax/fvwm.vim
+share/vim/vim57/syntax/fortran.vim
+share/vim/vim57/syntax/forth.vim
+share/vim/vim57/syntax/focexec.vim
+share/vim/vim57/syntax/exports.vim
+share/vim/vim57/syntax/expect.vim
+share/vim/vim57/syntax/esqlc.vim
+share/vim/vim57/syntax/elmfilt.vim
+share/vim/vim57/syntax/elf.vim
+share/vim/vim57/syntax/eiffel.vim
+share/vim/vim57/syntax/dtd.vim
+share/vim/vim57/syntax/dracula.vim
+share/vim/vim57/syntax/dosini.vim
+share/vim/vim57/syntax/dosbatch.vim
+share/vim/vim57/syntax/diva.vim
+share/vim/vim57/syntax/diff.vim
+share/vim/vim57/syntax/def.vim
+share/vim/vim57/syntax/dcl.vim
+share/vim/vim57/syntax/cweb.vim
+share/vim/vim57/syntax/cterm.vim
+share/vim/vim57/syntax/css.vim
+share/vim/vim57/syntax/csh.vim
+share/vim/vim57/syntax/cpp.vim
+share/vim/vim57/syntax/config.vim
+share/vim/vim57/syntax/colortest.vim
+share/vim/vim57/syntax/cobol.vim
+share/vim/vim57/syntax/clipper.vim
+share/vim/vim57/syntax/clean.vim
+share/vim/vim57/syntax/change.vim
+share/vim/vim57/syntax/c.vim
+share/vim/vim57/syntax/btm.vim
+share/vim/vim57/syntax/bib.vim
+share/vim/vim57/syntax/basic.vim
+share/vim/vim57/syntax/awk.vim
+share/vim/vim57/syntax/ave.vim
+share/vim/vim57/syntax/atlas.vim
+share/vim/vim57/syntax/aspvbs.vim
+share/vim/vim57/syntax/asn.vim
+share/vim/vim57/syntax/asmh8300.vim
+share/vim/vim57/syntax/asm.vim
+share/vim/vim57/syntax/amiga.vim
+share/vim/vim57/syntax/ahdl.vim
+share/vim/vim57/syntax/ada.vim
+share/vim/vim57/syntax/abc.vim
+share/vim/vim57/syntax/zsh.vim
+share/vim/vim57/syntax/xpm2.vim
+share/vim/vim57/syntax/texinfo.vim
+share/vim/vim57/syntax/tads.vim
+share/vim/vim57/syntax/sqr.vim
+share/vim/vim57/syntax/remind.vim
+share/vim/vim57/syntax/rcslog.vim
+share/vim/vim57/syntax/jsp.vim
+share/vim/vim57/syntax/ist.vim
+share/vim/vim57/syntax/icon.vim
+share/vim/vim57/syntax/gedcom.vim
+share/vim/vim57/syntax/erlang.vim
+share/vim/vim57/syntax/cuplsim.vim
+share/vim/vim57/syntax/cupl.vim
+share/vim/vim57/syntax/ctrlh.vim
+share/vim/vim57/syntax/cf.vim
+share/vim/vim57/syntax/apachestyle.vim
+share/vim/vim57/syntax/aml.vim
+share/vim/vim57/syntax/abel.vim
+share/vim/vim57/syntax/wml.vim
+share/vim/vim57/syntax/webmacro.vim
+share/vim/vim57/syntax/tli.vim
+share/vim/vim57/syntax/stp.vim
+share/vim/vim57/syntax/snnsres.vim
+share/vim/vim57/syntax/snnspat.vim
+share/vim/vim57/syntax/snnsnet.vim
+share/vim/vim57/syntax/sml.vim
+share/vim/vim57/syntax/samba.vim
+share/vim/vim57/syntax/ruby.vim
+share/vim/vim57/syntax/ora.vim
+share/vim/vim57/syntax/nastran.vim
+share/vim/vim57/syntax/mel.vim
+share/vim/vim57/syntax/latte.vim
+share/vim/vim57/syntax/kscript.vim
+share/vim/vim57/syntax/jproperties.vim
+share/vim/vim57/syntax/hb.vim
+share/vim/vim57/syntax/form.vim
+share/vim/vim57/syntax/cvs.vim
+share/vim/vim57/syntax/csp.vim
+share/vim/vim57/syntax/conf.vim
+share/vim/vim57/syntax/ch.vim
+share/vim/vim57/syntax/bc.vim
+share/vim/vim57/syntax/aspperl.vim
+share/vim/vim57/syntax/apache.vim
+share/vim/vim57/syntax/abaqus.vim
+share/vim/vim57/tutor/tutor
+share/vim/vim57/tutor/README.txt
+share/vim/vim57/menu.vim
+share/vim/vim57/bugreport.vim
+share/vim/vim57/vimrc_example.vim
+share/vim/vim57/gvimrc_example.vim
+share/vim/vim57/filetype.vim
+share/vim/vim57/ftoff.vim
+share/vim/vim57/scripts.vim
+share/vim/vim57/optwin.vim
+share/vim/vim57/macros/hanoi/poster
+share/vim/vim57/macros/hanoi/click.me
+share/vim/vim57/macros/hanoi/hanoi.vim
+share/vim/vim57/macros/maze/maze_5.78
+share/vim/vim57/macros/maze/Makefile
+share/vim/vim57/macros/maze/maze.c
+share/vim/vim57/macros/maze/README.txt
+share/vim/vim57/macros/maze/mazeansi.c
+share/vim/vim57/macros/maze/maze_mac
+share/vim/vim57/macros/maze/poster
+share/vim/vim57/macros/life/click.me
+share/vim/vim57/macros/life/life.vim
+share/vim/vim57/macros/urm/urm
+share/vim/vim57/macros/urm/urm.vim
+share/vim/vim57/macros/urm/examples
+share/vim/vim57/macros/urm/README.txt
+share/vim/vim57/macros/html
+share/vim/vim57/macros/dvorak
+share/vim/vim57/macros/diffwin.vim
+share/vim/vim57/macros/README.txt
+share/vim/vim57/macros/swapmous.vim
+share/vim/vim57/macros/shellmenu.vim
+share/vim/vim57/macros/justify.vim
+share/vim/vim57/macros/explorer.vim
+share/vim/vim57/tools/README.txt
+share/vim/vim57/tools/vimspell.sh
+share/vim/vim57/tools/vimm
+share/vim/vim57/tools/vim132
+share/vim/vim57/tools/tcltags
+share/vim/vim57/tools/shtags.pl
+share/vim/vim57/tools/shtags.1
+share/vim/vim57/tools/ref
+share/vim/vim57/tools/pltags.pl
+share/vim/vim57/tools/mve.txt
+share/vim/vim57/tools/mve.awk
+share/vim/vim57/tools/gvimdiff
+share/vim/vim57/tools/efm_filter.txt
+share/vim/vim57/tools/efm_filter.pl
+share/vim/vim57/tools/ccfilter_README.txt
+share/vim/vim57/tools/ccfilter.c
+share/vim/vim57/tools/ccfilter.1
+share/vim/vim57/tools/blink.c
+share/vim/vim57/tools/vimspell.txt
+@exec ln -fs ../../doc/vim %D/share/vim/vim57/doc
+@unexec rm -f %D/share/vim/vim57/doc
+@dirrm share/vim/vim57/tools
+@dirrm share/vim/vim57/tutor
+@dirrm share/vim/vim57/syntax
+@dirrm share/vim/vim57/macros/urm
+@dirrm share/vim/vim57/macros/maze
+@dirrm share/vim/vim57/macros/life
+@dirrm share/vim/vim57/macros/hanoi
+@dirrm share/vim/vim57/macros
+@dirrm share/vim/vim57
 @dirrm share/doc/vim
 @dirrm share/vim
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index b76d6ecc851..7e90b9e3d37 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/02/18 14:37:44 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2000/06/25 11:50:40 pooka Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -20,12 +20,26 @@ INSTALL_TARGET=		installvimbin
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} == "NetBSD")
-DEPENDS+=		ncurses>=4.2:../../devel/ncurses
-CONFIGURE_ARGS+=	--with-tlib=ncurses
-.elif ${OPSYS} == "SunOS"
+.if ${OPSYS} == "NetBSD"
+GOOD_CURSES=    1.4[Y-Z] 1.4Z[A-Z] 1.[5-9]*
+
+.for PATTERN in ${GOOD_CURSES}
+.if ${OS_VERSION:M${PATTERN}} != ""
+CURSES_GOOD?=   #defined
+.endif
+.endfor
+.endif
+
+.if ${OPSYS} == "SunOS"
+CURSES_GOOD?=   #defined
+.endif
+
+.if defined(CURSES_GOOD)
 CPPFLAGS=
-CONFIGURE_ARGS+=	--with-tlib=curses
+CONFIGURE_ARGS+=        --with-tlib=curses
+.else
+DEPENDS+=               ncurses>=4.2:../../devel/ncurses
+CONFIGURE_ARGS+=        --with-tlib=ncurses
 .endif
 
 post-install:
diff --git a/editors/vim-xaw/files/patch-sum b/editors/vim-xaw/files/patch-sum
index e3660656a93..c798a7c20a7 100644
--- a/editors/vim-xaw/files/patch-sum
+++ b/editors/vim-xaw/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.2 2000/01/17 17:36:37 pooka Exp $
+$NetBSD: patch-sum,v 1.3 2000/06/25 11:50:41 pooka Exp $
 
 MD5 (patch-aa) = 97cd1d6e7839e794826a32d477314554
-MD5 (patch-ad) = 7f99381d2ab5c53db6df89ee1e4151b8
-MD5 (patch-za) = e53e72a98abbb723d60c03b8bf1fc55d
-MD5 (patch-zb) = 221296b5d4e7413473f9cc4098a611fd
+MD5 (patch-ad) = 07c54572faa36ae59e8b05878ef1f255
+MD5 (patch-zb) = 7bfdfff0821780edc31108e66e566216
diff --git a/editors/vim-xaw/patches/patch-ad b/editors/vim-xaw/patches/patch-ad
index 2cb1e6811c8..18f8b0a8366 100644
--- a/editors/vim-xaw/patches/patch-ad
+++ b/editors/vim-xaw/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/12/21 13:26:29 pooka Exp $
+$NetBSD: patch-ad,v 1.2 2000/06/25 11:50:41 pooka Exp $
 
---- Makefile.orig	Sun Sep 19 13:27:33 1999
-+++ Makefile	Thu Nov 25 21:03:25 1999
-@@ -902,23 +902,26 @@
+--- Makefile.orig	Sat Jun 24 12:28:59 2000
++++ Makefile	Sun Jun 25 14:31:51 2000
+@@ -936,23 +936,26 @@
  ### Athena Widget GUI interface.
  ### Use Xaw3d to make the menus look a little bit nicer
  #XAW_LIB = -lXaw3d
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 31181a43bed..d22ba349717 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2000/02/18 14:37:43 pooka Exp $
+# $NetBSD: Makefile,v 1.33 2000/06/25 11:50:32 pooka Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -18,12 +18,26 @@ INSTALL_TARGET=		installvimbin
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} == "NetBSD")
-DEPENDS+=               ncurses>=4.2:../../devel/ncurses
-CONFIGURE_ARGS+=	--with-tlib=ncurses
-.elif ${OPSYS} == "SunOS"
+.if ${OPSYS} == "NetBSD"
+GOOD_CURSES=    1.4[Y-Z] 1.4Z[A-Z] 1.[5-9]*
+
+.for PATTERN in ${GOOD_CURSES}
+.if ${OS_VERSION:M${PATTERN}} != ""
+CURSES_GOOD?=   #defined
+.endif
+.endfor
+.endif
+
+.if ${OPSYS} == "SunOS"
+CURSES_GOOD?=	#defined
+.endif
+
+.if defined(CURSES_GOOD)
 CPPFLAGS=
 CONFIGURE_ARGS+=	--with-tlib=curses
+.else
+DEPENDS+=               ncurses>=4.2:../../devel/ncurses
+CONFIGURE_ARGS+=	--with-tlib=ncurses
 .endif
 
 post-install:
diff --git a/editors/vim/files/patch-sum b/editors/vim/files/patch-sum
index 7cf88a08943..88a1d021a69 100644
--- a/editors/vim/files/patch-sum
+++ b/editors/vim/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.9 2000/01/17 17:36:35 pooka Exp $
+$NetBSD: patch-sum,v 1.10 2000/06/25 11:50:34 pooka Exp $
 
-MD5 (patch-za) = e53e72a98abbb723d60c03b8bf1fc55d
-MD5 (patch-zb) = 221296b5d4e7413473f9cc4098a611fd
+MD5 (patch-zb) = 7bfdfff0821780edc31108e66e566216