Bump to 6.3.045 for recent security issue.

  2672  6.3.001  ":browse split" gives file selection dialog twice
  3913  6.3.002  utf-8 detection in translated help files is wrong
  1891  6.3.003  crash when using console dialog without default choice
  2438  6.3.004  too many hit-enter prompts when searching for long string
  2809  6.3.005  crash when searching with character offset in closed fold
  1566  6.3.006  the current directory is prepended to the ":breakadd" argument
  1755  6.3.007  swap file is not deleted for a "nofile" buffer after ":cd"
  1865  6.3.008  OS/2: can't compile, missing error message
  3670  6.3.009  (after 6.3.006) ":breakadd file" does not match for a symlink
  2450  6.3.010  writing to a named pipe causes an error message for fsync()
  1896  6.3.011  crash when user command completion uses "normal :cmd"
  2882  6.3.012  lalloc(0) error for substitute command with multi-line pattern
 11947  6.3.013  crash when using CTRL-R = in command line uses "normal :cmd"
  1566  6.3.014  default value of 'helplang' is wrong for Chinese and Taiwanese
  1207  6.3.015  the string returned by winrestcmd() may end in garbage
  1735  6.3.016  'define' default had "\s" before #, breaks "[d"
  1364  6.3.017  "9zz" could place the cursor beyond the end of a line
  1844  6.3.018  ":0argadd zero" added the argument after the first one
  1992  6.3.019  crash during startup when compiled for debugging
  1915  6.3.020  "dw" doesn't work right for UTF-8 when 'delcombine' is set
  2822  6.3.021  can't edit file with path separator in trail byte of last char
  6419  6.3.023  when <Space> is remapped abbreviations are not expanded
  2456  6.3.024  missing NUL for strings created with ga_concat()
  3070  6.3.026  setting 'bg' in syncolor.vim may cause endless loop or crash
  7500  6.3.027  VMS: Writing a file may insert extra CR characters
  2128  6.3.028  the BOM marker is written when appending to a file
  2173  6.3.029  crash in syntax highlighting code when inserting a line break
  4579  6.3.030  GTK 2: crash when 'enc' is set to "utf-8" and menus redefined
  1483  6.3.031  pressing Tab when entering a mapping may cause a display error
  2094  6.3.032  with Python 2.3 using threads doesn't work
  1552  6.3.033  mapping ending in two-char command doesn't restart Insert mode
  1618  6.3.034  VMS: crash in RTL when using :help, caused by ? wildcard
  1770  6.3.036  ml_get errors when fold was deleted
  2889  6.3.037  (after 6.3.032) warning for unused variable
  2749  6.3.039  line numbers not updated when inserting a line above window
 18020  6.3.040  window count for a buffer was wrong after error handling
  1760  6.3.042  CTRL-X CTRL-E in Insert mode does not scroll fold correctly
  8053  6.3.043  'hlsearch' highlighting sometimes disappears
 12283  6.3.045  some option values may cause trouble in a modeline

5 files changed, 10 insertions, 20 deletions

diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 6580405aa64..d8053fa7d6e 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.43 2004/12/03 15:14:56 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2005/01/06 20:40:04 adrianp Exp $
 
 .include		"../vim-share/Makefile.common"
 
 PKGNAME=		vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=	1
-#PKGREVISION=		1
 
 COMMENT=		Vim editor (vi clone) with X11 GTK+ GUI
 
 DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
-CONFLICTS+=		vim-xaw-[0-9]*
+CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
 
 USE_X11=		yes
 CONFIGURE_ARGS+=	--enable-gui=gtk
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index f231c58e16e..d6c8762aaf8 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2004/12/03 15:14:56 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/06 20:40:38 adrianp Exp $
 
 .include		"../vim-share/Makefile.common"
 
 PKGNAME=		vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=	1
-#PKGREVISION=		1
 
 COMMENT=		Vim editor (vi clone) with X11 GTK2 GUI
 
 DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]*
-CONFLICTS+=		vim-xaw-[0-9]*
+CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
 
 USE_X11=		yes
 CONFIGURE_ARGS+=	--enable-gui=gtk2
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index 22bbb66e0a0..f492e98e39a 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2004/12/03 15:14:56 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/01/06 20:41:11 adrianp Exp $
 
 .include		"../vim-share/Makefile.common"
 
 PKGNAME=		vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=	1
-#PKGREVISION=		1
 
 COMMENT=		Vim editor (vi clone) with X11 Motif GUI
 
 DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
-CONFLICTS+=		vim-xaw-[0-9]*
+CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
 
 USE_X11=		yes
 CONFIGURE_ARGS+=	--enable-gui=motif
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index b5bae9efcce..1b984680175 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.32 2004/12/03 15:14:56 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2005/01/06 20:42:15 adrianp Exp $
 
 .include		"../vim-share/Makefile.common"
 
 PKGNAME=		vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=	1
-#PKGREVISION=		1
 
 COMMENT=		Vim editor (vi clone) with X11 Athena GUI
 
 DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
-CONFLICTS+=		vim-motif-[0-9]*
+CONFLICTS+=		vim-motif-[0-9]* vim-kde-[0-9]*
 
 USE_X11=		yes
 CONFIGURE_ARGS+=	--enable-gui=athena
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 7cba315737f..bfc6252fc83 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.56 2005/01/05 11:03:44 cjs Exp $
+# $NetBSD: Makefile,v 1.57 2005/01/06 20:39:28 adrianp Exp $
 
 .include		"../vim-share/Makefile.common"
 
 PKGNAME=		vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=	1
-#PKGREVISION=		1
 
 COMMENT=		Vim editor (vi clone) without GUI
 
 DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 
 CONFLICTS+=		vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
-CONFLICTS+=		vim-xaw-[0-9]*
+CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
 
 CONFIGURE_ARGS+=	--enable-gui=no --without-x
 CONFIGURE_ARGS+=	--with-tlib=ncurses