* vim-gtk and vim-xaw: added dependency to xpm (Should fix pkg/14341)

* Added two new patches (instead of adding nb1 to the version number).

  6.0.024  inserting a char with CTRL-V u 9900 may cause a crash
  6.0.025  using "$" after "\v" in a regexp doesn't always work

And now I'll switch to a not-so-frequent vim patching mode, maybe once
a month is enough (although vim is almost like Linux, new patches are
needed all the time to make it stable :-)

4 files changed, 12 insertions, 6 deletions

diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 540c8eef5b3..0bb995c2463 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/10/24 22:10:54 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2001/10/25 07:34:05 martti Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -28,6 +28,7 @@ post-install:
 	done
 
 .include "../../devel/ncurses/buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 255a855373d..3449a445db8 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.14 2001/10/24 10:55:21 martti Exp $
+# $NetBSD: Makefile.common,v 1.15 2001/10/25 07:34:05 martti Exp $
 # Obtained from:	FreeBSD vim port (obrien)
 
-VIM_VERSION=		6.0.23
+VIM_VERSION=		6.0.25
 DISTNAME=		vim-${VIM_VERSION:C/\.[0-9]*$//}
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
@@ -16,7 +16,7 @@ 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 13 14 15 16 17 18 \
-			19 20 21 22 23
+			19 20 21 22 23 24 25
 PATCHFILES+=		${VIM_VERSION:C/\.[0-9]*$//}.0${p}
 .endfor
 
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index d96e9a991f9..4f1451cb645 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2001/10/24 10:55:21 martti Exp $
+$NetBSD: distinfo,v 1.12 2001/10/25 07:34:05 martti Exp $
 
 SHA1 (vim/vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a
 Size (vim/vim-6.0.tar.bz2) = 2776551 bytes
@@ -46,6 +46,10 @@ SHA1 (vim/6.0.022) = c25c822f57d46e660c94d7648e7a4fa8e14215d8
 Size (vim/6.0.022) = 1365 bytes
 SHA1 (vim/6.0.023) = 1d051cc274fdee219d6068a256056d2545fae415
 Size (vim/6.0.023) = 1833 bytes
+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 (patch-aa) = 8176260aff9176f350c4534f52bce0080fedd28b
 SHA1 (patch-ad) = 34e1420b7cbf25fb0394a36c32faf2e03c54b386
 SHA1 (patch-zb) = 41f58d90a14f47b0bf242bb90178f0c872e4b022
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 52a67ca9b31..c7c7d2e2771 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/10/24 22:10:54 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/10/25 07:34:06 martti Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -36,6 +36,7 @@ post-install:
 	done
 
 .include "../../devel/ncurses/buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/xaw.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"