9 files changed, 32 insertions, 21 deletions
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index a11d89dfef7..4cf539a588e 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2005/05/26 20:09:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.48 2005/05/30 14:18:14 martti Exp $
 
 PKGNAME=		vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		1
+#PKGREVISION=		1
 
 COMMENT=		Vim editor (vi clone) with X11 GTK+ GUI
 
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index e592d1be9e0..4b33878010c 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/05/26 20:09:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/30 14:18:14 martti Exp $
 
 PKGNAME=		vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		1
+#PKGREVISION=		1
 
 COMMENT=		Vim editor (vi clone) with X11 GTK2 GUI
 
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index b0e3642b13d..090d35a4244 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2005/05/26 20:09:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/30 14:18:14 martti Exp $
 
 PKGNAME=		vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		1
+#PKGREVISION=		1
 
 COMMENT=		Vim editor (vi clone) with X11 Motif GUI
 
diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index b1d36698e80..80d102098e0 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/05/26 20:09:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/30 14:18:14 martti Exp $
 
 PKGNAME=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		1
+#PKGREVISION=		1
 
 COMMENT=		Data files for the vim editor (vi clone)
 
@@ -11,7 +11,7 @@ CONFIGURE_ARGS+=	--disable-gui
 
 INSTALL_TARGET=		installruntime installmacros installtutor installtools
 
-PLIST_SUBST+=		VIM_SUBDIR="vim63"
+PLIST_SUBST+=		VIM_SUBDIR="${VIM_SUBDIR}"
 
 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 518de4c4acd..abc54ada420 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.45 2005/05/16 13:39:04 martti Exp $
+# $NetBSD: Makefile.common,v 1.46 2005/05/30 14:18:14 martti Exp $
+
+.include "../../editors/vim-share/version.mk"
 
-VIM_VERSION=		6.3
-VIM_PATCHLEVEL=		071
 DISTNAME=		vim-${VIM_VERSION}
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
@@ -19,14 +19,14 @@ PATCHFILES+=		6.3.001 6.3.002 6.3.003 6.3.004 6.3.005 6.3.006 6.3.007\
 			6.3.040 6.3.042 6.3.043 6.3.045 6.3.046 6.3.049 6.3.050\
 			6.3.051 6.3.054 6.3.055 6.3.056 6.3.057 6.3.058 6.3.059\
 			6.3.060 6.3.061 6.3.062 6.3.063 6.3.064 6.3.065 6.3.066\
-			6.3.067 6.3.068 6.3.069 6.3.070 6.3.071
+			6.3.067 6.3.068 6.3.069 6.3.070 6.3.071 6.3.072 6.3.074
 
 MAINTAINER=		martti@NetBSD.org
 HOMEPAGE=		http://www.vim.org/
 
 CONFLICTS+=		vim-kde-[0-9]*
 
-WRKSRC=			${WRKDIR}/vim63/src
+WRKSRC=			${WRKDIR}/${VIM_SUBDIR}/src
 GNU_CONFIGURE=		yes
 
 # See "configure --help" extra options. These might affect the installed
@@ -34,9 +34,9 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	${VIM_EXTRA_OPTS}
 CONFIGURE_ARGS+=	--enable-multibyte
 
-PATCH_ARGS=		-d ${WRKDIR}/vim63 --forward --quiet \
+PATCH_ARGS=		-d ${WRKDIR}/${VIM_SUBDIR} --forward --quiet \
 				-E ${PATCH_STRIP}
-PATCH_DIST_ARGS=	-d ${WRKDIR}/vim63 --forward --quiet \
+PATCH_DIST_ARGS=	-d ${WRKDIR}/${VIM_SUBDIR} --forward --quiet \
 				-E ${PATCH_DIST_STRIP}
 PATCHDIR?=		${.CURDIR}/../../editors/vim-share/patches
 DISTINFO_FILE?=		${.CURDIR}/../../editors/vim-share/distinfo
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 665ae652365..366d6ebf39f 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2005/05/26 20:09:35 jmmv Exp $
+$NetBSD: distinfo,v 1.35 2005/05/30 14:18:14 martti Exp $
 
 SHA1 (vim/vim-6.3.tar.bz2) = 76f663277140d314ecfafecb0307e832bdbbaf06
 RMD160 (vim/vim-6.3.tar.bz2) = 321c59d62f6fce99396be33875ec5a7d84944525
@@ -186,6 +186,12 @@ Size (vim/6.3.070) = 1928 bytes
 SHA1 (vim/6.3.071) = b7939f9b10ced7def3f1bf3d6389d53c740b2149
 RMD160 (vim/6.3.071) = 77eebeb49892a2595ebd87e532a524bf0ce1f112
 Size (vim/6.3.071) = 1722 bytes
+SHA1 (vim/6.3.072) = 5f196cd6f730fb233cb8644d73fbb20405de9027
+RMD160 (vim/6.3.072) = 82bbe943432599d93092052f6601672cbbd9a409
+Size (vim/6.3.072) = 2083 bytes
+SHA1 (vim/6.3.074) = 42d51d2e7f7db314e25e656f2154c348ee38b284
+RMD160 (vim/6.3.074) = 8f12301e801f94346c3e73b00546ae35f3e8b526
+Size (vim/6.3.074) = 2365 bytes
 SHA1 (patch-aa) = 226983cd130c91de83f46baa38d18b243bd029c8
 SHA1 (patch-ab) = 2f748490348d0bc39a005bd7cbb784fd4709da75
 SHA1 (patch-ad) = 305b3f9cd2837482362c0176b8e2025ffb0eb254
diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk
new file mode 100644
index 00000000000..15875dd5402
--- /dev/null
+++ b/editors/vim-share/version.mk
@@ -0,0 +1,5 @@
+# $NetBSD: version.mk,v 1.1 2005/05/30 14:18:14 martti Exp $
+
+VIM_VERSION=		6.3
+VIM_PATCHLEVEL=		074
+VIM_SUBDIR=		vim63
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 877825eb109..bbed1f1ad94 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2005/05/26 20:09:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2005/05/30 14:18:14 martti Exp $
 
 PKGNAME=		vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		1
+#PKGREVISION=		1
 
 .include		"../vim-share/Makefile.common"
 
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index e566fbebf04..75ae283f2dd 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2005/05/26 20:09:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.61 2005/05/30 14:18:14 martti Exp $
 
 PKGNAME=		vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		1
+#PKGREVISION=		1
 
 COMMENT=		Vim editor (vi clone) without GUI