Updated vim to 6.1

* several bug fixes
* new and updated syntax files
* translated menus and messages
* license has been made compatible with the GNU GPL

9 files changed, 84 insertions, 44 deletions

diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 0bb995c2463..9a09ed4481d 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.30 2001/10/25 07:34:05 martti Exp $
+# $NetBSD: Makefile,v 1.31 2002/03/24 19:38:54 martti Exp $
 
 .include		"../vim-share/Makefile.common"
 
-PKGNAME=		vim-gtk-${VIM_VERSION}
+PKGNAME=		vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
 COMMENT=		Vim editor (vi clone) with X11 GTK+ GUI
 
-DEPENDS+=		vim-share-${VIM_VERSION}:../vim-share
+DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 CONFLICTS+=		vim-[0-9]* vim-xaw-[0-9]*
 
 USE_BUILDLINK_ONLY=	yes
diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index 66588da3dc3..1a86579e14f 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/10/04 10:18:12 martti Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/24 19:39:08 martti Exp $
 
 .include		"Makefile.common"
 
-PKGNAME=		vim-share-${VIM_VERSION}
+PKGNAME=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
 COMMENT=		Data files for the vim editor (vi clone)
 
@@ -10,7 +10,7 @@ CONFIGURE_ARGS+=	--disable-gui
 
 INSTALL_TARGET=		installruntime installmacros installtutor installtools
 
-PLIST_SUBST+=		VIM_SUBDIR="vim60"
+PLIST_SUBST+=		VIM_SUBDIR="vim61"
 
 do-build:
 	@cd ${WRKSRC}/xxd && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 0972acb2e1c..a49c7aa22aa 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.26 2002/02/12 09:24:38 martti Exp $
+# $NetBSD: Makefile.common,v 1.27 2002/03/24 19:39:08 martti Exp $
 
-VIM_VERSION=		6.0.220
-DISTNAME=		vim-${VIM_VERSION:C/\.[0-9]*$//}
+VIM_VERSION=		6.1
+VIM_PATCHLEVEL=		0
+DISTNAME=		vim-${VIM_VERSION}
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
 			ftp://ftp.fu-berlin.de/misc/editors/vim/unix/ \
@@ -9,21 +10,22 @@ MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
 DIST_SUBDIR=		vim
 EXTRACT_SUFX=		.tar.bz2
 
-#
-# Combine the first 220 patches into one big patch
-#
-PATCH_SITES+=		ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/
-PATCHFILES+=		vim-6.0-001-220.diff.gz
+##PATCH_SITES+=		${MASTER_SITES:S/unix/patches/}
+##PATCHFILES!=		jot -s " " -w ${VIM_VERSION}.%03d ${VIM_PATCHLEVEL}
+##SKIP_PATCHES=		
+##.for p in ${SKIP_PATCHES}
+##PATCHFILES:=		${PATCHFILES:N${VIM_VERSION}.${p}}
+##.endif
 
 MAINTAINER=		martti@netbsd.org
 HOMEPAGE=		http://www.vim.org/
 
 GNU_CONFIGURE=		yes
-WRKSRC=			${WRKDIR}/vim60/src
+WRKSRC=			${WRKDIR}/vim61/src
 
-PATCH_ARGS=		-d ${WRKDIR}/vim60 --forward --quiet \
+PATCH_ARGS=		-d ${WRKDIR}/vim61 --forward --quiet \
 				-E ${PATCH_STRIP}
-PATCH_DIST_ARGS=	-d ${WRKDIR}/vim60 --forward --quiet \
+PATCH_DIST_ARGS=	-d ${WRKDIR}/vim61 --forward --quiet \
 				-E ${PATCH_DIST_STRIP}
 PATCHDIR?=		${.CURDIR}/../vim-share/patches
 DISTINFO_FILE?=		${.CURDIR}/../vim-share/distinfo
diff --git a/editors/vim-share/PLIST b/editors/vim-share/PLIST
index d7cbda35df3..f036eaaaca8 100644
--- a/editors/vim-share/PLIST
+++ b/editors/vim-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:24:13 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/03/24 19:39:08 martti Exp $
 bin/vimtutor
 bin/xxd
 man/man1/evim.1
@@ -9,6 +9,7 @@ man/man1/xxd.1
 share/vim/${VIM_SUBDIR}/bugreport.vim
 share/vim/${VIM_SUBDIR}/colors/README.txt
 share/vim/${VIM_SUBDIR}/colors/blue.vim
+share/vim/${VIM_SUBDIR}/colors/darkblue.vim
 share/vim/${VIM_SUBDIR}/colors/default.vim
 share/vim/${VIM_SUBDIR}/colors/elflord.vim
 share/vim/${VIM_SUBDIR}/colors/evening.vim
@@ -19,12 +20,19 @@ share/vim/${VIM_SUBDIR}/colors/pablo.vim
 share/vim/${VIM_SUBDIR}/colors/peachpuff.vim
 share/vim/${VIM_SUBDIR}/colors/ron.vim
 share/vim/${VIM_SUBDIR}/colors/shine.vim
+share/vim/${VIM_SUBDIR}/colors/torte.vim
 share/vim/${VIM_SUBDIR}/colors/zellner.vim
 share/vim/${VIM_SUBDIR}/compiler/README.txt
 share/vim/${VIM_SUBDIR}/compiler/ant.vim
 share/vim/${VIM_SUBDIR}/compiler/bcc.vim
+share/vim/${VIM_SUBDIR}/compiler/irix5_c.vim
+share/vim/${VIM_SUBDIR}/compiler/irix5_cpp.vim
 share/vim/${VIM_SUBDIR}/compiler/jikes.vim
+share/vim/${VIM_SUBDIR}/compiler/mips_c.vim
+share/vim/${VIM_SUBDIR}/compiler/mipspro_c89.vim
+share/vim/${VIM_SUBDIR}/compiler/mipspro_cpp.vim
 share/vim/${VIM_SUBDIR}/compiler/msvc.vim
+share/vim/${VIM_SUBDIR}/compiler/splint.vim
 share/vim/${VIM_SUBDIR}/compiler/tex.vim
 share/vim/${VIM_SUBDIR}/compiler/tidy.vim
 share/vim/${VIM_SUBDIR}/delmenu.vim
@@ -148,10 +156,12 @@ share/vim/${VIM_SUBDIR}/filetype.vim
 share/vim/${VIM_SUBDIR}/ftoff.vim
 share/vim/${VIM_SUBDIR}/ftplugin.vim
 share/vim/${VIM_SUBDIR}/ftplugin/README.txt
+share/vim/${VIM_SUBDIR}/ftplugin/abaqus.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ada.vim
 share/vim/${VIM_SUBDIR}/ftplugin/c.vim
 share/vim/${VIM_SUBDIR}/ftplugin/changelog.vim
 share/vim/${VIM_SUBDIR}/ftplugin/cpp.vim
+share/vim/${VIM_SUBDIR}/ftplugin/cs.vim
 share/vim/${VIM_SUBDIR}/ftplugin/debchangelog.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dosbatch.vim
 share/vim/${VIM_SUBDIR}/ftplugin/fortran.vim
@@ -167,6 +177,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/ocaml.vim
 share/vim/${VIM_SUBDIR}/ftplugin/perl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/postscr.vim
 share/vim/${VIM_SUBDIR}/ftplugin/python.vim
+share/vim/${VIM_SUBDIR}/ftplugin/rpl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ruby.vim
 share/vim/${VIM_SUBDIR}/ftplugin/spec.vim
 share/vim/${VIM_SUBDIR}/ftplugin/tex.vim
@@ -174,18 +185,22 @@ share/vim/${VIM_SUBDIR}/ftplugin/vb.vim
 share/vim/${VIM_SUBDIR}/ftplugin/verilog.vim
 share/vim/${VIM_SUBDIR}/ftplugin/vim.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xs.vim
+share/vim/${VIM_SUBDIR}/ftplugin/xslt.vim
 share/vim/${VIM_SUBDIR}/ftplugof.vim
 share/vim/${VIM_SUBDIR}/gvimrc_example.vim
 share/vim/${VIM_SUBDIR}/indent.vim
 share/vim/${VIM_SUBDIR}/indent/ada.vim
 share/vim/${VIM_SUBDIR}/indent/automake.vim
 share/vim/${VIM_SUBDIR}/indent/c.vim
+share/vim/${VIM_SUBDIR}/indent/cdl.vim
 share/vim/${VIM_SUBDIR}/indent/config.vim
 share/vim/${VIM_SUBDIR}/indent/cpp.vim
+share/vim/${VIM_SUBDIR}/indent/cs.vim
 share/vim/${VIM_SUBDIR}/indent/css.vim
 share/vim/${VIM_SUBDIR}/indent/eterm.vim
 share/vim/${VIM_SUBDIR}/indent/fortran.vim
 share/vim/${VIM_SUBDIR}/indent/html.vim
+share/vim/${VIM_SUBDIR}/indent/idlang.vim
 share/vim/${VIM_SUBDIR}/indent/ishd.vim
 share/vim/${VIM_SUBDIR}/indent/java.vim
 share/vim/${VIM_SUBDIR}/indent/lua.vim
@@ -194,9 +209,12 @@ share/vim/${VIM_SUBDIR}/indent/matlab.vim
 share/vim/${VIM_SUBDIR}/indent/ocaml.vim
 share/vim/${VIM_SUBDIR}/indent/perl.vim
 share/vim/${VIM_SUBDIR}/indent/postscr.vim
+share/vim/${VIM_SUBDIR}/indent/pov.vim
+share/vim/${VIM_SUBDIR}/indent/prolog.vim
 share/vim/${VIM_SUBDIR}/indent/python.vim
 share/vim/${VIM_SUBDIR}/indent/readline.vim
 share/vim/${VIM_SUBDIR}/indent/ruby.vim
+share/vim/${VIM_SUBDIR}/indent/scheme.vim
 share/vim/${VIM_SUBDIR}/indent/sdl.vim
 share/vim/${VIM_SUBDIR}/indent/sh.vim
 share/vim/${VIM_SUBDIR}/indent/tcl.vim
@@ -252,6 +270,8 @@ share/vim/${VIM_SUBDIR}/syntax/aflex.vim
 share/vim/${VIM_SUBDIR}/syntax/ahdl.vim
 share/vim/${VIM_SUBDIR}/syntax/amiga.vim
 share/vim/${VIM_SUBDIR}/syntax/aml.vim
+share/vim/${VIM_SUBDIR}/syntax/ampl.vim
+share/vim/${VIM_SUBDIR}/syntax/ant.vim
 share/vim/${VIM_SUBDIR}/syntax/antlr.vim
 share/vim/${VIM_SUBDIR}/syntax/apache.vim
 share/vim/${VIM_SUBDIR}/syntax/apachestyle.vim
@@ -267,6 +287,7 @@ share/vim/${VIM_SUBDIR}/syntax/ave.vim
 share/vim/${VIM_SUBDIR}/syntax/awk.vim
 share/vim/${VIM_SUBDIR}/syntax/ayacc.vim
 share/vim/${VIM_SUBDIR}/syntax/b.vim
+share/vim/${VIM_SUBDIR}/syntax/baan.vim
 share/vim/${VIM_SUBDIR}/syntax/basic.vim
 share/vim/${VIM_SUBDIR}/syntax/bc.vim
 share/vim/${VIM_SUBDIR}/syntax/bdf.vim
@@ -276,11 +297,13 @@ share/vim/${VIM_SUBDIR}/syntax/blank.vim
 share/vim/${VIM_SUBDIR}/syntax/btm.vim
 share/vim/${VIM_SUBDIR}/syntax/c.vim
 share/vim/${VIM_SUBDIR}/syntax/catalog.vim
+share/vim/${VIM_SUBDIR}/syntax/cdl.vim
 share/vim/${VIM_SUBDIR}/syntax/cf.vim
 share/vim/${VIM_SUBDIR}/syntax/cfg.vim
 share/vim/${VIM_SUBDIR}/syntax/ch.vim
 share/vim/${VIM_SUBDIR}/syntax/change.vim
 share/vim/${VIM_SUBDIR}/syntax/changelog.vim
+share/vim/${VIM_SUBDIR}/syntax/chaskell.vim
 share/vim/${VIM_SUBDIR}/syntax/cl.vim
 share/vim/${VIM_SUBDIR}/syntax/clean.vim
 share/vim/${VIM_SUBDIR}/syntax/clipper.vim
@@ -290,6 +313,7 @@ share/vim/${VIM_SUBDIR}/syntax/conf.vim
 share/vim/${VIM_SUBDIR}/syntax/config.vim
 share/vim/${VIM_SUBDIR}/syntax/cpp.vim
 share/vim/${VIM_SUBDIR}/syntax/crontab.vim
+share/vim/${VIM_SUBDIR}/syntax/cs.vim
 share/vim/${VIM_SUBDIR}/syntax/csc.vim
 share/vim/${VIM_SUBDIR}/syntax/csh.vim
 share/vim/${VIM_SUBDIR}/syntax/csp.vim
@@ -380,12 +404,14 @@ share/vim/${VIM_SUBDIR}/syntax/latte.vim
 share/vim/${VIM_SUBDIR}/syntax/lex.vim
 share/vim/${VIM_SUBDIR}/syntax/lftp.vim
 share/vim/${VIM_SUBDIR}/syntax/lhaskell.vim
+share/vim/${VIM_SUBDIR}/syntax/lifelines.vim
 share/vim/${VIM_SUBDIR}/syntax/lilo.vim
 share/vim/${VIM_SUBDIR}/syntax/lisp.vim
 share/vim/${VIM_SUBDIR}/syntax/lite.vim
 share/vim/${VIM_SUBDIR}/syntax/lotos.vim
 share/vim/${VIM_SUBDIR}/syntax/lout.vim
 share/vim/${VIM_SUBDIR}/syntax/lprolog.vim
+share/vim/${VIM_SUBDIR}/syntax/lscript.vim
 share/vim/${VIM_SUBDIR}/syntax/lss.vim
 share/vim/${VIM_SUBDIR}/syntax/lua.vim
 share/vim/${VIM_SUBDIR}/syntax/lynx.vim
@@ -408,6 +434,8 @@ share/vim/${VIM_SUBDIR}/syntax/model.vim
 share/vim/${VIM_SUBDIR}/syntax/modsim3.vim
 share/vim/${VIM_SUBDIR}/syntax/modula2.vim
 share/vim/${VIM_SUBDIR}/syntax/modula3.vim
+share/vim/${VIM_SUBDIR}/syntax/monk.vim
+share/vim/${VIM_SUBDIR}/syntax/moo.vim
 share/vim/${VIM_SUBDIR}/syntax/mp.vim
 share/vim/${VIM_SUBDIR}/syntax/msql.vim
 share/vim/${VIM_SUBDIR}/syntax/mush.vim
@@ -420,6 +448,7 @@ share/vim/${VIM_SUBDIR}/syntax/ncf.vim
 share/vim/${VIM_SUBDIR}/syntax/nosyntax.vim
 share/vim/${VIM_SUBDIR}/syntax/nqc.vim
 share/vim/${VIM_SUBDIR}/syntax/nroff.vim
+share/vim/${VIM_SUBDIR}/syntax/nsis.vim
 share/vim/${VIM_SUBDIR}/syntax/objc.vim
 share/vim/${VIM_SUBDIR}/syntax/ocaml.vim
 share/vim/${VIM_SUBDIR}/syntax/omnimark.vim
@@ -445,6 +474,7 @@ share/vim/${VIM_SUBDIR}/syntax/pod.vim
 share/vim/${VIM_SUBDIR}/syntax/postscr.vim
 share/vim/${VIM_SUBDIR}/syntax/pov.vim
 share/vim/${VIM_SUBDIR}/syntax/povini.vim
+share/vim/${VIM_SUBDIR}/syntax/ppd.vim
 share/vim/${VIM_SUBDIR}/syntax/ppwiz.vim
 share/vim/${VIM_SUBDIR}/syntax/procmail.vim
 share/vim/${VIM_SUBDIR}/syntax/progress.vim
@@ -466,15 +496,18 @@ share/vim/${VIM_SUBDIR}/syntax/remind.vim
 share/vim/${VIM_SUBDIR}/syntax/rexx.vim
 share/vim/${VIM_SUBDIR}/syntax/robots.vim
 share/vim/${VIM_SUBDIR}/syntax/rpcgen.vim
+share/vim/${VIM_SUBDIR}/syntax/rpl.vim
 share/vim/${VIM_SUBDIR}/syntax/rtf.vim
 share/vim/${VIM_SUBDIR}/syntax/ruby.vim
 share/vim/${VIM_SUBDIR}/syntax/samba.vim
 share/vim/${VIM_SUBDIR}/syntax/sas.vim
 share/vim/${VIM_SUBDIR}/syntax/sather.vim
 share/vim/${VIM_SUBDIR}/syntax/scheme.vim
+share/vim/${VIM_SUBDIR}/syntax/scilab.vim
 share/vim/${VIM_SUBDIR}/syntax/screen.vim
 share/vim/${VIM_SUBDIR}/syntax/sdl.vim
 share/vim/${VIM_SUBDIR}/syntax/sed.vim
+share/vim/${VIM_SUBDIR}/syntax/sendpr.vim
 share/vim/${VIM_SUBDIR}/syntax/sgml.vim
 share/vim/${VIM_SUBDIR}/syntax/sgmldecl.vim
 share/vim/${VIM_SUBDIR}/syntax/sgmllnx.vim
@@ -500,9 +533,11 @@ share/vim/${VIM_SUBDIR}/syntax/snobol4.vim
 share/vim/${VIM_SUBDIR}/syntax/spec.vim
 share/vim/${VIM_SUBDIR}/syntax/specman.vim
 share/vim/${VIM_SUBDIR}/syntax/spice.vim
+share/vim/${VIM_SUBDIR}/syntax/splint.vim
 share/vim/${VIM_SUBDIR}/syntax/spup.vim
 share/vim/${VIM_SUBDIR}/syntax/sql.vim
 share/vim/${VIM_SUBDIR}/syntax/sqlforms.vim
+share/vim/${VIM_SUBDIR}/syntax/sqlj.vim
 share/vim/${VIM_SUBDIR}/syntax/sqr.vim
 share/vim/${VIM_SUBDIR}/syntax/squid.vim
 share/vim/${VIM_SUBDIR}/syntax/st.vim
@@ -549,13 +584,18 @@ share/vim/${VIM_SUBDIR}/syntax/whitespace.vim
 share/vim/${VIM_SUBDIR}/syntax/winbatch.vim
 share/vim/${VIM_SUBDIR}/syntax/wml.vim
 share/vim/${VIM_SUBDIR}/syntax/wsh.vim
+share/vim/${VIM_SUBDIR}/syntax/wvdial.vim
 share/vim/${VIM_SUBDIR}/syntax/xdefaults.vim
+share/vim/${VIM_SUBDIR}/syntax/xf86conf.vim
 share/vim/${VIM_SUBDIR}/syntax/xkb.vim
 share/vim/${VIM_SUBDIR}/syntax/xmath.vim
 share/vim/${VIM_SUBDIR}/syntax/xml.vim
+share/vim/${VIM_SUBDIR}/syntax/xmodmap.vim
 share/vim/${VIM_SUBDIR}/syntax/xpm.vim
 share/vim/${VIM_SUBDIR}/syntax/xpm2.vim
 share/vim/${VIM_SUBDIR}/syntax/xs.vim
+share/vim/${VIM_SUBDIR}/syntax/xsd.vim
+share/vim/${VIM_SUBDIR}/syntax/xslt.vim
 share/vim/${VIM_SUBDIR}/syntax/xxd.vim
 share/vim/${VIM_SUBDIR}/syntax/yacc.vim
 share/vim/${VIM_SUBDIR}/syntax/z8a.vim
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 7539ca94a89..e0f958f37a5 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.23 2002/02/12 09:24:39 martti Exp $
+$NetBSD: distinfo,v 1.24 2002/03/24 19:39:09 martti Exp $
 
-SHA1 (vim/vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a
-Size (vim/vim-6.0.tar.bz2) = 2776551 bytes
-SHA1 (vim/vim-6.0-001-220.diff.gz) = 0adb64cd9cb4e87b3ec2082285d18b427c612ee1
-Size (vim/vim-6.0-001-220.diff.gz) = 101670 bytes
-SHA1 (patch-aa) = 8176260aff9176f350c4534f52bce0080fedd28b
-SHA1 (patch-ad) = 34e1420b7cbf25fb0394a36c32faf2e03c54b386
+SHA1 (vim/vim-6.1.tar.bz2) = 110629d4072c1e2e64a4baef7aaa15ebe726b02c
+Size (vim/vim-6.1.tar.bz2) = 2890049 bytes
+SHA1 (patch-aa) = 1c824f222a05c858dd4619d122364de35338e9ae
+SHA1 (patch-ad) = c4be7ae53ee6308b3d3077320f4de7a7a5ad3c32
 SHA1 (patch-zb) = 41f58d90a14f47b0bf242bb90178f0c872e4b022
diff --git a/editors/vim-share/patches/patch-aa b/editors/vim-share/patches/patch-aa
index d545a2b335b..5334e3393be 100644
--- a/editors/vim-share/patches/patch-aa
+++ b/editors/vim-share/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2001/10/09 10:11:34 martti Exp $
+$NetBSD: patch-aa,v 1.6 2002/03/24 19:39:09 martti Exp $
 
---- src/auto/configure.orig	Thu Oct  4 14:19:08 2001
-+++ src/auto/configure	Thu Oct  4 14:20:12 2001
-@@ -2212,6 +2212,7 @@
+--- src/auto/configure.orig	Mon Feb  4 19:21:35 2002
++++ src/auto/configure	Thu Mar  7 08:52:13 2002
+@@ -2236,6 +2236,7 @@
    # Look for the header file in a standard set of common directories.
  # Check X11 before X11Rn because it is often a symlink to the current release.
    for ac_dir in               \
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.5 2001/10/09 10:11:34 martti Exp $
      /usr/X11/include          \
      /usr/X11R6/include        \
      /usr/X11R5/include        \
-@@ -2287,6 +2288,7 @@
+@@ -2311,6 +2312,7 @@
  # First see if replacing the include by lib works.
  # Check X11 before X11Rn because it is often a symlink to the current release.
  for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
diff --git a/editors/vim-share/patches/patch-ad b/editors/vim-share/patches/patch-ad
index 9d3d6c77be7..9cb8bae561c 100644
--- a/editors/vim-share/patches/patch-ad
+++ b/editors/vim-share/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2001/10/09 10:11:34 martti Exp $
+$NetBSD: patch-ad,v 1.3 2002/03/24 19:39:09 martti Exp $
 
---- src/Makefile.orig	Wed Sep 26 13:10:59 2001
-+++ src/Makefile	Thu Oct  4 14:14:32 2001
-@@ -990,26 +990,31 @@
+--- src/Makefile.orig	Sun Mar 24 11:41:30 2002
++++ src/Makefile	Sun Mar 24 20:04:32 2002
+@@ -1000,26 +1000,31 @@
  ### Athena GUI
  ### Use Xaw3d to make the menus look a little bit nicer
  #XAW_LIB = -lXaw3d
@@ -11,17 +11,17 @@ $NetBSD: patch-ad,v 1.2 2001/10/09 10:11:34 martti Exp $
  
  ### When using Xaw3d, uncomment/comment the following lines to also get the
  ### scrollbars from Xaw3d.
--#ATHENA_SRC	= gui.c gui_athena.c gui_x11.c pty.c gui_at_fs.c
+-#ATHENA_SRC	= gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c
 -#ATHENA_OBJ	= objects/gui.o objects/gui_athena.o objects/gui_x11.o \
--#			objects/pty.o objects/gui_at_fs.o
+-#			objects/pty.o objects/gui_beval.o objects/gui_at_fs.o
 -#ATHENA_DEFS	= -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
 -#		    -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
 -#		    -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
 +.if defined(XAW_LIB)
 +.if (${XAW_LIB} != "Xaw")
-+ATHENA_SRC	= gui.c gui_athena.c gui_x11.c pty.c gui_at_fs.c
++ATHENA_SRC	= gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c
 +ATHENA_OBJ	= objects/gui.o objects/gui_athena.o objects/gui_x11.o \
-+			objects/pty.o objects/gui_at_fs.o
++			objects/pty.o objects/gui_beval.o objects/gui_at_fs.o
 +ATHENA_DEFS	= -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
 +		    -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
 +		    -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index c7c7d2e2771..d7827916b03 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2001/10/25 07:34:06 martti Exp $
+# $NetBSD: Makefile,v 1.21 2002/03/24 19:39:19 martti Exp $
 
 .include		"../vim-share/Makefile.common"
 
-PKGNAME=		vim-xaw-${VIM_VERSION}
+PKGNAME=		vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
 COMMENT=		Vim editor (vi clone) with X11 Athena GUI
 
-DEPENDS+=		vim-share-${VIM_VERSION}:../vim-share
+DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk-[0-9]*
 
 USE_BUILDLINK_ONLY=	yes
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 4f454e98756..b0b8697e71f 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.41 2001/09/27 23:18:02 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2002/03/24 19:38:25 martti Exp $
 
 .include		"../vim-share/Makefile.common"
 
-PKGNAME=		vim-${VIM_VERSION}
+PKGNAME=		vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
 COMMENT=		Vim editor (vi clone) without gui
 
-DEPENDS+=		vim-share-${VIM_VERSION}:../vim-share
+DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 
 CONFLICTS+=		vim-xaw-[0-9]* vim-gtk-[0-9]*