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.

3 files changed, 27 insertions, 14 deletions

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