- I got some comments about the second line of Makefile.common (the

  "obtained from..." line). Based on those comments I removed that line
  and note hereby the following thing to give credit for the previous work:

	The idea for the patch management was taken from the FreeBSD
	vim port (by obrien@freebsd.org)

- Upgraded to 6.0.92
- Ignored patches 27, 48, 53, 64, 70, 73, 87

Changes since 6.0.25:

6.0.026  GTK: menu separators could be selected with the cursor keys
6.0.027  VMS: fix printing, compiling with VAXC and other things
6.0.028  compilation error with +visualextra but without +virtualedit
6.0.029  undo doesn't work correctly in specific situations
6.0.030  "source! file" doesn't work after ":argdo" or in a loop
6.0.031  define putenv() also for non-GUI for systems that lack it
6.0.032  no redraw after a fold setting was changed
6.0.033  MS-Windows: 'wildmenu' shows name with embedded space wrong
6.0.034  calling searchpair() with three arguments could crash
6.0.035  menu to toggle toolbar didn't work when 'ignorecase' is set
6.0.036  DOS/Windows/OS/2: path in 'tags' relative to drive didn't work
6.0.037  the default syntax menu was defined even when disabled
6.0.038  when 'selection' is "exclusive" the cursor can be beyond EOL
6.0.039  "c" in blockwise Visual and "gP" left cursor in wrong position
6.0.040  when 'fileencoding' is invalid, writing may remove the file
6.0.041  if LC_MESSAGES isn't defined ":lang messages en" doesn't work
6.0.042  ":mksession" can't handle a file name with a space
6.0.043  patch 6.0.041 used vim_getenv() instead of mch_getenv()
6.0.044  syntax argument "containedin" doesn't always work properly
6.0.045  creating fold with Visual mode doesn't redraw other window
6.0.046  the stack check fails when the limit doesn't fit in a long
6.0.047  using nested regexp item in \%[] can cause a crash
6.0.048  Win32 console: mouse sometimes doesn't work right
6.0.049  the intro screen is misleading when running evim
6.0.050  "viw" doesn't include multi-byte characters before the cursor
6.0.051  UTF-8: CTRL-R on the command line skips composing characters
6.0.052  requires 6.0.046: also look in sys/resource.h for rlim_t
6.0.053  extra: various fixes for QNX
6.0.054  CTRL-V in mswin.vim and Paste menu didn't paste block of text
6.0.055  GTK: copying a selection didn't work the first time
6.0.056  CTRL-O cw results in a nested Insert mode
6.0.057  ":wincmd g}" didn't work inside a function
6.0.058  after CursorHold autocommand the ruler wasn't updated
6.0.059  'hlsearch' highlighting is not visible in diff lines
6.0.060  Motif: if fontset cannot be allocated tooltip may crash Vim
6.0.061  v:this_session wasn't used correctly in menu.vim
6.0.062  ":shell" crashes when 'verbose' is > 3
6.0.063  when 'cpo' includes "$" "cw)" didn't update syntax highlight
6.0.064  extra: improve self-installing exe made with NSIS
6.0.065  ":normal" can read redo characters before its argument
6.0.066  undo for one command can be split into two pieces
6.0.067  if_xcmdsrv.c doesn't compile on AIX
6.0.068  using "gq" on a Visual area doesn't always redraw correctly
6.0.069  "K" on a word that includes a "!" gives an error message
6.0.070  Win32: failing library load didn't give a clear error message
6.0.071  the "iris-ansi" builtin termcap isn't very good
6.0.072  Visual area not redraw correctly when 'lazyredraw' is set
6.0.073  extra: CTRL-Z doesn't position cursor for DJGPP version
6.0.074  "&" in substitute string is wrong with a few multi-byte chars
6.0.075  could equalize too many windows when closing a window
6.0.076  compiler warning in version.c (depends on 6.0.049)
6.0.077  patch 6.0.075 was incomplete
6.0.078  "daw" didn't always work at the end of a line
6.0.079  still possible to overwrite a read-only file with "W" in 'cpo'
6.0.080  session with same file in two windows gives hit-enter prompt
6.0.081  buffers menu has wrong buffer number after ":saveas file"
6.0.082  shell prompt is sometimes right after a message from vimrc
6.0.083  GTK: dialog buttons are empty when compiled without menus
6.0.084  UTF-8: "r" with composing character can't be redone
6.0.085  with "s" and using 'mousefocus' Insert mode is stopped
6.0.086  "gu" gives a wrong message
6.0.087  lang: update message translations
6.0.088  "rx" in Visual mode could not be repeated with "."
6.0.089  "==" in a C file with a dashed list in a comment works wrong
6.0.090  a wrapping line that doesn't fit and 'so' set flashes badly
6.0.091  CTRL-O in Insert mode with 've' set moves cursor unnecessary
6.0.092  MS-Windows: explorer plugin didn't ignore case of 'suffixes'

2 files changed, 136 insertions, 9 deletions

diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 3449a445db8..e1787c0a6f1 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.15 2001/10/25 07:34:05 martti Exp $
-# Obtained from:	FreeBSD vim port (obrien)
+# $NetBSD: Makefile.common,v 1.16 2001/11/07 16:39:15 martti Exp $
 
-VIM_VERSION=		6.0.25
+VIM_VERSION=		6.0.92
 DISTNAME=		vim-${VIM_VERSION:C/\.[0-9]*$//}
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
@@ -11,13 +10,21 @@ DIST_SUBDIR=		vim
 EXTRACT_SUFX=		.tar.bz2
 
 #
-# Notes:
-# - patch 12 was ignored
+# Following patches were ignored:
+# 12, 27, 48, 53, 64, 70, 73, 87
 #
 PATCH_SITES=		${MASTER_SITES:S/unix/patches/}
-.for p in		01 02 03 04 05 06 07 08 09 10 11 13 14 15 16 17 18 \
-			19 20 21 22 23 24 25
-PATCHFILES+=		${VIM_VERSION:C/\.[0-9]*$//}.0${p}
+.for p in		001 002 003 004 005 006 007 008 009 010 \
+			011 013 014 015 016 017 018 019 020 \
+			021 022 023 024 025 026 028 029 030 \
+			031 032 033 034 035 036 037 038 039 040 \
+			041 042 043 044 045 046 047 049 050 \
+			051 052 054 055 056 057 058 059 060 \
+			061 062 063 065 066 067 068 069 \
+			071 072 074 075 076 077 078 079 080 \
+			081 082 083 084 085 086 088 089 090 \
+			091 092
+PATCHFILES+=		${VIM_VERSION:C/\.[0-9]*$//}.${p}
 .endfor
 
 MAINTAINER=		martti@netbsd.org
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 4f1451cb645..df811d01927 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2001/10/25 07:34:05 martti Exp $
+$NetBSD: distinfo,v 1.13 2001/11/07 16:39:15 martti Exp $
 
 SHA1 (vim/vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a
 Size (vim/vim-6.0.tar.bz2) = 2776551 bytes
@@ -50,6 +50,126 @@ SHA1 (vim/6.0.024) = 19df877a255f4b525746e894830f49909fc72622
 Size (vim/6.0.024) = 1313 bytes
 SHA1 (vim/6.0.025) = 08cc0b871c652792bb76dc786cd42e98c7fcabb0
 Size (vim/6.0.025) = 2007 bytes
+SHA1 (vim/6.0.026) = bbd2411af55221d5b3938ef876af50a2a6ef6be1
+Size (vim/6.0.026) = 1712 bytes
+SHA1 (vim/6.0.028) = 48a16c49ecbc24d2a4f1237b10e67d9af0bfe80e
+Size (vim/6.0.028) = 1894 bytes
+SHA1 (vim/6.0.029) = 17886f6724eff218731b149a462d7152ae953a3f
+Size (vim/6.0.029) = 6778 bytes
+SHA1 (vim/6.0.030) = 3714fefa3e71dac891b040c22e671065d7361d93
+Size (vim/6.0.030) = 9808 bytes
+SHA1 (vim/6.0.031) = d30db983ea0ad92d6acd3a5daf7c2ee6fa8d7c91
+Size (vim/6.0.031) = 10146 bytes
+SHA1 (vim/6.0.032) = f11962d1a67b64b6e35962b3ab70ee8d141ddd15
+Size (vim/6.0.032) = 1407 bytes
+SHA1 (vim/6.0.033) = 17f102c3a9ae4a52d5311a044fa763d210b80bbf
+Size (vim/6.0.033) = 1584 bytes
+SHA1 (vim/6.0.034) = fe829c89cc8f6eeff1e410acbb1392a8d1ee52e2
+Size (vim/6.0.034) = 1673 bytes
+SHA1 (vim/6.0.035) = 105db410dbe6e2ae579829fdfa20cc5c164dcd54
+Size (vim/6.0.035) = 1574 bytes
+SHA1 (vim/6.0.036) = a73caf80eac5a91418d1ee4c703acdeabaa8425c
+Size (vim/6.0.036) = 2566 bytes
+SHA1 (vim/6.0.037) = fabe048f0ebadd5d8fada91d78f74ef481dac49d
+Size (vim/6.0.037) = 2536 bytes
+SHA1 (vim/6.0.038) = 9264d677cde73ebf2891369906e53cbf36a6c162
+Size (vim/6.0.038) = 1793 bytes
+SHA1 (vim/6.0.039) = 2ff961f706ee338d29637be1bda964edbe0fa43e
+Size (vim/6.0.039) = 3563 bytes
+SHA1 (vim/6.0.040) = ced9927cb04293af8d830866539a1483052a5e83
+Size (vim/6.0.040) = 5949 bytes
+SHA1 (vim/6.0.041) = 174795f659d4aaba5cf6a19a770b794ed95c0541
+Size (vim/6.0.041) = 3730 bytes
+SHA1 (vim/6.0.042) = c23450569cdc9cae6fa19593476ffceb1dcbc6f6
+Size (vim/6.0.042) = 2895 bytes
+SHA1 (vim/6.0.043) = b195b65e375097511c9e651436cca77e25b30d69
+Size (vim/6.0.043) = 2038 bytes
+SHA1 (vim/6.0.044) = 376641575ddc3cab5a9dacdb5922f33682d27866
+Size (vim/6.0.044) = 6277 bytes
+SHA1 (vim/6.0.045) = 569a7b46a28c19760fffb19f36a7fb743a35fe27
+Size (vim/6.0.045) = 1752 bytes
+SHA1 (vim/6.0.046) = a4cc94ee71eac67a61a2d5135deb449652d073b7
+Size (vim/6.0.046) = 4573 bytes
+SHA1 (vim/6.0.047) = 4f813d36fe8be93939c3751c83b5b467d8379042
+Size (vim/6.0.047) = 2607 bytes
+SHA1 (vim/6.0.049) = 4d9ca87e49878b6de1dde0b146a61fa24f571dc7
+Size (vim/6.0.049) = 4583 bytes
+SHA1 (vim/6.0.050) = 2aae0294a2bf82312cbaaa28f878fa2b5fdbfa83
+Size (vim/6.0.050) = 1541 bytes
+SHA1 (vim/6.0.051) = eec24d7373395196ba62527b4465466257ce3916
+Size (vim/6.0.051) = 2322 bytes
+SHA1 (vim/6.0.052) = 516c9ebfa1a2ddfdfc7d059304aa26a2f2d2283c
+Size (vim/6.0.052) = 4883 bytes
+SHA1 (vim/6.0.054) = 60992aa645377d11166d6a1db471bc05a918e033
+Size (vim/6.0.054) = 7766 bytes
+SHA1 (vim/6.0.055) = 7684f88fb05342bd8978067ac98f04053fc96b00
+Size (vim/6.0.055) = 3243 bytes
+SHA1 (vim/6.0.056) = 0bd9a83e8e26426bd5ca776bd08e32292e21221a
+Size (vim/6.0.056) = 1919 bytes
+SHA1 (vim/6.0.057) = 5dca6afa37a835c6e88eaaf340138fb2bf908a7c
+Size (vim/6.0.057) = 3100 bytes
+SHA1 (vim/6.0.058) = e79db61764fe4a716b7bcd420f86cbd28109f321
+Size (vim/6.0.058) = 1422 bytes
+SHA1 (vim/6.0.059) = e779b9c5e6f5289d3d42bc09722db88283cd0fa6
+Size (vim/6.0.059) = 1766 bytes
+SHA1 (vim/6.0.060) = 0cf322b9d36e0f74a985f0653850c90421b62cdc
+Size (vim/6.0.060) = 1817 bytes
+SHA1 (vim/6.0.061) = 1b28574fec86f6c0caa061f778cad089ffe1e94b
+Size (vim/6.0.061) = 2292 bytes
+SHA1 (vim/6.0.062) = 713dfbe8999ebafeb7b0db23c0a5551db07d5ba6
+Size (vim/6.0.062) = 1696 bytes
+SHA1 (vim/6.0.063) = 429024a1e947ba3abd55ecf78aa44780373b20af
+Size (vim/6.0.063) = 2011 bytes
+SHA1 (vim/6.0.065) = 8faa47ed0066050a7ae775eae6948951ee7e3a90
+Size (vim/6.0.065) = 4983 bytes
+SHA1 (vim/6.0.066) = 1bae4e91b3da149f68475f4d40254b48ae4b51f3
+Size (vim/6.0.066) = 1823 bytes
+SHA1 (vim/6.0.067) = 1fbd26bbef969baabe90bff070eabb01eaa3ea2a
+Size (vim/6.0.067) = 1622 bytes
+SHA1 (vim/6.0.068) = 2404d1a0c865bb8b9dfec0b14542c7278cb00f6e
+Size (vim/6.0.068) = 2490 bytes
+SHA1 (vim/6.0.069) = ce1087bd3d4e812a37473565633c6c84b77fb186
+Size (vim/6.0.069) = 1751 bytes
+SHA1 (vim/6.0.071) = 1812a588e6e4612577a3390f0100d87361364a92
+Size (vim/6.0.071) = 4523 bytes
+SHA1 (vim/6.0.072) = 76fbc734ca846f283a8d1cff9b85eaafa210160a
+Size (vim/6.0.072) = 2445 bytes
+SHA1 (vim/6.0.074) = 4d3e415c0078c6eb0a6488c8da62343b863ff3b4
+Size (vim/6.0.074) = 2031 bytes
+SHA1 (vim/6.0.075) = 77979192d1ecc56fdf238730b8cfe5e962c2862b
+Size (vim/6.0.075) = 8703 bytes
+SHA1 (vim/6.0.076) = 079f9f6a9704e826f5fb36959494ad0fb3004f59
+Size (vim/6.0.076) = 1134 bytes
+SHA1 (vim/6.0.077) = c75b44b2f762cb439aa8fffe1ac6bce5fde27cda
+Size (vim/6.0.077) = 1343 bytes
+SHA1 (vim/6.0.078) = 296d3829289b8744271527c172f22d75ce8cbcfb
+Size (vim/6.0.078) = 2512 bytes
+SHA1 (vim/6.0.079) = 46975d9c8af1b718de7c6909b9f83ca786331b9c
+Size (vim/6.0.079) = 3532 bytes
+SHA1 (vim/6.0.080) = daf26e6799af10d711297abf4710a107d0258b62
+Size (vim/6.0.080) = 1797 bytes
+SHA1 (vim/6.0.081) = d457950061cbe4bf3f9b20bc9381cfd7b646b302
+Size (vim/6.0.081) = 2481 bytes
+SHA1 (vim/6.0.082) = 24a0788b8abb094da1db502f19936f695ad068a6
+Size (vim/6.0.082) = 2027 bytes
+SHA1 (vim/6.0.083) = 9bfcff55c65c64329d06f16060d76e12d9288c99
+Size (vim/6.0.083) = 2005 bytes
+SHA1 (vim/6.0.084) = d684e8163200d7efd0840bd9957cec1b0671a998
+Size (vim/6.0.084) = 1762 bytes
+SHA1 (vim/6.0.085) = 54c3ba5fb975660ca6081ae6bd2a8d00c6f1e190
+Size (vim/6.0.085) = 1533 bytes
+SHA1 (vim/6.0.086) = 8f4b3e700d8c69237f3ff9ac76cb764ee8fee220
+Size (vim/6.0.086) = 2232 bytes
+SHA1 (vim/6.0.088) = f520e9ebe55e95ee1db3bb2b30718d0eccb7330d
+Size (vim/6.0.088) = 1692 bytes
+SHA1 (vim/6.0.089) = 956bb16984785c6f69bffcffdff98065c16112d7
+Size (vim/6.0.089) = 4894 bytes
+SHA1 (vim/6.0.090) = b3c92ebb06a06a1d49a5bdc9c8ed4c02d790cdca
+Size (vim/6.0.090) = 4112 bytes
+SHA1 (vim/6.0.091) = 04e83459ee232193ac65981907dce6ce59a9d9ae
+Size (vim/6.0.091) = 1908 bytes
+SHA1 (vim/6.0.092) = d2dd36ba881235949e97855b0e412fb31ef7a6d1
+Size (vim/6.0.092) = 3094 bytes
 SHA1 (patch-aa) = 8176260aff9176f350c4534f52bce0080fedd28b
 SHA1 (patch-ad) = 34e1420b7cbf25fb0394a36c32faf2e03c54b386
 SHA1 (patch-zb) = 41f58d90a14f47b0bf242bb90178f0c872e4b022