Updated VIM to version 6.0.11. The following problems were fixed since 6.0:

* Loading the sh.vim syntax file causes error messages
* Using a '@' item in 'viminfo' doesn't work
* The configure check for ACLs on AIX doesn't work
* The find/replace dialog doesn't reuse a previous argument properly
* In Insert mode, "CTRL-O :ls" has a delay before redrawing
* With a vertical split, 'number' set and 'scrolloff' non-zero, making
  the window width very small causes a crash
* When setting 'filetype' while there is no FileType autocommand, a
  following ":setfiletype" would set 'filetype' again
* 'imdisable' is missing from the options window
* Nextstep doesn't have S_ISBLK
* Using "gf" on a file name starting with "./" or "../" in a buffer
  without a name causes a crash
* Python: After replacing or deleting lines get an ml_get error

5 files changed, 50 insertions, 18 deletions

diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index a1df1e34359..cc6c18cb79d 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,17 +1,27 @@
-# $NetBSD: Makefile.common,v 1.11 2001/10/04 12:38:02 agc Exp $
-VIM_VERSION=		6.0
-DISTNAME=		vim-${VIM_VERSION}
+# $NetBSD: Makefile.common,v 1.12 2001/10/09 10:11:33 martti Exp $
+VIM_VERSION=		6.0.11
+DISTNAME=		vim-${VIM_VERSION:C/\.[0-9]*$//}
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
 			ftp://ftp.fu-berlin.de/misc/editors/vim/unix/ \
 			ftp://ftp.twics.co.jp/pub/vim/unix/
+DIST_SUBDIR=		vim
 EXTRACT_SUFX=		.tar.bz2
 
+PATCH_SITES=		${MASTER_SITES:S/unix/patches/}
+.for p in		01 02 03 04 05 06 07 08 09 10 11
+PATCHFILES+=		${VIM_VERSION:C/\.[0-9]*$//}.0${p}
+.endfor
+
 MAINTAINER=		martti@netbsd.org
 HOMEPAGE=		http://www.vim.org/
 
 GNU_CONFIGURE=		yes
 WRKSRC=			${WRKDIR}/vim60/src
 
+PATCH_ARGS=		-d ${WRKDIR}/vim60 --forward --quiet \
+				-E ${PATCH_STRIP}
+PATCH_DIST_ARGS=	-d ${WRKDIR}/vim60 --forward --quiet \
+				-E ${PATCH_DIST_STRIP}
 PATCHDIR?=		${.CURDIR}/../vim-share/patches
 DISTINFO_FILE?=		${.CURDIR}/../vim-share/distinfo
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 616341af441..fb0127c72eb 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,7 +1,29 @@
-$NetBSD: distinfo,v 1.8 2001/10/04 13:25:49 agc Exp $
+$NetBSD: distinfo,v 1.9 2001/10/09 10:11:33 martti Exp $
 
-SHA1 (vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a
-Size (vim-6.0.tar.bz2) = 2776551 bytes
-SHA1 (patch-aa) = 6effc801a6454870fb694d380949a23f11272f1c
-SHA1 (patch-ad) = 48fbd96a410a54efb53e9cac00dc4cee91cf4f91
-SHA1 (patch-zb) = c4fb1eb259ec96a4e349d0feb3b520c2fa8a7782
+SHA1 (vim/vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a
+Size (vim/vim-6.0.tar.bz2) = 2776551 bytes
+SHA1 (vim/6.0.001) = b8832e827afeac6743c2a051da152b1dd6087d09
+Size (vim/6.0.001) = 3502 bytes
+SHA1 (vim/6.0.002) = 76c5f78e6f31a44b3969020740c61bddfd772fb8
+Size (vim/6.0.002) = 1392 bytes
+SHA1 (vim/6.0.003) = dbf721b1dc91a0f31d9d2fae87bbf7a3a0113c0e
+Size (vim/6.0.003) = 2435 bytes
+SHA1 (vim/6.0.004) = 78438406cbe5642748d79bf6406b83c857396783
+Size (vim/6.0.004) = 1392 bytes
+SHA1 (vim/6.0.005) = cea754412a50ec76e8cedeae73a8eb13c9be2496
+Size (vim/6.0.005) = 2758 bytes
+SHA1 (vim/6.0.006) = c09f75cf5d1257f0865848574f619979e6e98c30
+Size (vim/6.0.006) = 1278 bytes
+SHA1 (vim/6.0.007) = 9d5c077e1387d0cd3409535be3f7114a3cf9e89b
+Size (vim/6.0.007) = 1389 bytes
+SHA1 (vim/6.0.008) = d5cfd173a44da26bc9209f1550634ff84c7780ea
+Size (vim/6.0.008) = 1827 bytes
+SHA1 (vim/6.0.009) = 7f2a2bfe8d64155c3acb2c7ace6dad0b137f8b0b
+Size (vim/6.0.009) = 1258 bytes
+SHA1 (vim/6.0.010) = 5ec4254a396b751b7d137de6982644d876d23cae
+Size (vim/6.0.010) = 1613 bytes
+SHA1 (vim/6.0.011) = 8aa4126baba5689740a8163fac35ecac68d2f165
+Size (vim/6.0.011) = 2653 bytes
+SHA1 (patch-aa) = 8176260aff9176f350c4534f52bce0080fedd28b
+SHA1 (patch-ad) = 34e1420b7cbf25fb0394a36c32faf2e03c54b386
+SHA1 (patch-zb) = 41f58d90a14f47b0bf242bb90178f0c872e4b022
diff --git a/editors/vim-share/patches/patch-aa b/editors/vim-share/patches/patch-aa
index 69df7a63233..d545a2b335b 100644
--- a/editors/vim-share/patches/patch-aa
+++ b/editors/vim-share/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2001/10/04 13:25:50 agc Exp $
+$NetBSD: patch-aa,v 1.5 2001/10/09 10:11:34 martti Exp $
 
---- auto/configure.orig	Thu Oct  4 14:19:08 2001
-+++ auto/configure	Thu Oct  4 14:20:12 2001
+--- 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 @@
    # 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.
diff --git a/editors/vim-share/patches/patch-ad b/editors/vim-share/patches/patch-ad
index 0ad1cc99620..9d3d6c77be7 100644
--- a/editors/vim-share/patches/patch-ad
+++ b/editors/vim-share/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2001/10/04 13:25:51 agc Exp $
+$NetBSD: patch-ad,v 1.2 2001/10/09 10:11:34 martti Exp $
 
---- Makefile.orig	Wed Sep 26 13:10:59 2001
-+++ Makefile	Thu Oct  4 14:14:32 2001
+--- src/Makefile.orig	Wed Sep 26 13:10:59 2001
++++ src/Makefile	Thu Oct  4 14:14:32 2001
 @@ -990,26 +990,31 @@
  ### Athena GUI
  ### Use Xaw3d to make the menus look a little bit nicer
diff --git a/editors/vim-share/patches/patch-zb b/editors/vim-share/patches/patch-zb
index efa7f2784ea..034c8644e36 100644
--- a/editors/vim-share/patches/patch-zb
+++ b/editors/vim-share/patches/patch-zb
@@ -1,7 +1,7 @@
-$NetBSD: patch-zb,v 1.3 2001/10/04 13:25:51 agc Exp $
+$NetBSD: patch-zb,v 1.4 2001/10/09 10:11:34 martti Exp $
 
---- feature.h.orig	Tue Sep 25 19:51:26 2001
-+++ feature.h	Thu Oct  4 14:10:53 2001
+--- src/feature.h.orig	Tue Sep 25 19:51:26 2001
++++ src/feature.h	Thu Oct  4 14:10:53 2001
 @@ -489,7 +489,7 @@
   *			(used only with NO_BUILTIN_TCAPS not defined).
   */