Index: editors/vim/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/vim/Makefile,v
retrieving revision 1.57
diff -u -u -r1.57 Makefile
--- editors/vim/Makefile	6 Jan 2005 20:39:28 -0000	1.57
+++ editors/vim/Makefile	23 Jan 2005 23:15:52 -0000
@@ -1,11 +1,12 @@
 # $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
 
 COMMENT=		Vim editor (vi clone) without GUI
 
+.include		"../vim-share/Makefile.common"
+
 DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 
 CONFLICTS+=		vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
Index: editors/vim-gtk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/vim-gtk/Makefile,v
retrieving revision 1.44
diff -u -u -r1.44 Makefile
--- editors/vim-gtk/Makefile	6 Jan 2005 20:40:04 -0000	1.44
+++ editors/vim-gtk/Makefile	23 Jan 2005 23:15:52 -0000
@@ -1,11 +1,12 @@
 # $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
 
 COMMENT=		Vim editor (vi clone) with X11 GTK+ GUI
 
+.include		"../vim-share/Makefile.common"
+
 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]* vim-kde-[0-9]*
Index: editors/vim-gtk2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/vim-gtk2/Makefile,v
retrieving revision 1.11
diff -u -u -r1.11 Makefile
--- editors/vim-gtk2/Makefile	6 Jan 2005 20:40:38 -0000	1.11
+++ editors/vim-gtk2/Makefile	23 Jan 2005 23:15:52 -0000
@@ -1,11 +1,12 @@
 # $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
 
 COMMENT=		Vim editor (vi clone) with X11 GTK2 GUI
 
+.include		"../vim-share/Makefile.common"
+
 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]* vim-kde-[0-9]*
Index: editors/vim-motif/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/vim-motif/Makefile,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile
--- editors/vim-motif/Makefile	6 Jan 2005 20:41:11 -0000	1.10
+++ editors/vim-motif/Makefile	23 Jan 2005 23:15:53 -0000
@@ -1,11 +1,12 @@
 # $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
 
 COMMENT=		Vim editor (vi clone) with X11 Motif GUI
 
+.include		"../vim-share/Makefile.common"
+
 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]* vim-kde-[0-9]*
Index: editors/vim-share/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/vim-share/Makefile,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile
--- editors/vim-share/Makefile	21 Jun 2004 08:23:48 -0000	1.10
+++ editors/vim-share/Makefile	23 Jan 2005 23:15:53 -0000
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.10 2004/06/21 08:23:48 martti Exp $
 
-.include		"Makefile.common"
-
 PKGNAME=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
 COMMENT=		Data files for the vim editor (vi clone)
 
+.include		"Makefile.common"
+
 CONFIGURE_ARGS+=	--disable-gui
 
 INSTALL_TARGET=		installruntime installmacros installtutor installtools
Index: editors/vim-share/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/editors/vim-share/Makefile.common,v
retrieving revision 1.39
diff -u -u -r1.39 Makefile.common
--- editors/vim-share/Makefile.common	6 Jan 2005 20:38:06 -0000	1.39
+++ editors/vim-share/Makefile.common	23 Jan 2005 23:15:53 -0000
@@ -38,3 +38,9 @@
 				-E ${PATCH_DIST_STRIP}
 PATCHDIR?=		${.CURDIR}/../vim-share/patches
 DISTINFO_FILE?=		${.CURDIR}/../vim-share/distinfo
+
+.if empty(PKGNAME:Mvim-share*)
+ALTERNATIVES_SRC=	${.CURDIR}/../../editors/vim-share/ALTERNATIVES
+.else
+ALTERNATIVES_SRC=
+.endif
Index: editors/vim-xaw/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/vim-xaw/Makefile,v
retrieving revision 1.33
diff -u -u -r1.33 Makefile
--- editors/vim-xaw/Makefile	6 Jan 2005 20:42:15 -0000	1.33
+++ editors/vim-xaw/Makefile	23 Jan 2005 23:15:53 -0000
@@ -1,8 +1,9 @@
 # $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
+
+.include		"../vim-share/Makefile.common"
 
 COMMENT=		Vim editor (vi clone) with X11 Athena GUI
 
Index: editors/nvi/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/nvi/Makefile,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile
--- editors/nvi/Makefile	28 Nov 2004 13:46:50 -0000	1.14
+++ editors/nvi/Makefile	23 Jan 2005 23:15:53 -0000
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	nvi-1.81.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://www.kotnet.org/~skimo/nvi/devel/
 EXTRACT_SUFX=	.tar.bz2
Index: lang/kaffe/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/kaffe/Makefile,v
retrieving revision 1.57
diff -u -u -r1.57 Makefile
--- lang/kaffe/Makefile	17 Oct 2004 15:34:56 -0000	1.57
+++ lang/kaffe/Makefile	23 Jan 2005 23:15:53 -0000
@@ -3,7 +3,7 @@
 
 .include "Makefile.common"
 
-PKGREVISION=		5
+PKGREVISION=		6
 
 CONFLICTS+=		kaffe-nox11-[0-9]*
 
Index: lang/sun-jdk15/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jdk15/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- lang/sun-jdk15/Makefile	15 Jan 2005 21:56:46 -0000	1.4
+++ lang/sun-jdk15/Makefile	23 Jan 2005 23:15:53 -0000
@@ -2,6 +2,7 @@
 
 DISTNAME=	jdk-1_5_0_01-linux-i586
 PKGNAME=	sun-jdk15-5.0.1
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 SDK, Standard Edition 1.5.0
Index: lang/sun-jre15/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jre15/Makefile,v
retrieving revision 1.11
diff -u -u -r1.11 Makefile
--- lang/sun-jre15/Makefile	17 Jan 2005 16:17:24 -0000	1.11
+++ lang/sun-jre15/Makefile	23 Jan 2005 23:15:53 -0000
@@ -4,7 +4,7 @@
 
 DISTNAME=	jre-1_5_0_01-linux-i586
 PKGNAME=	sun-jre15-5.0.1
-PKGREVISION=	1
+PKGREVISION=	2
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.5.0
FILE ADDED TO REPOSITORY: editors/vim-share/ALTERNATIVES
--- /dev/null	2005-01-24 00:15:40.000000000 +0100
+++ editors/vim-share/ALTERNATIVES	2005-01-23 23:42:17.000000000 +0100
@@ -0,0 +1 @@
+bin/vi @PREFIX@/bin/vim
FILE ADDED TO REPOSITORY: editors/nvi/ALTERNATIVES
--- /dev/null	2005-01-24 00:15:40.000000000 +0100
+++ editors/nvi/ALTERNATIVES	2005-01-23 18:52:50.000000000 +0100
@@ -0,0 +1 @@
+bin/vi @PREFIX@/bin/nvi