From 6166f74853b1f6851459bb343c43998ca4a3a5e5 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Wed, 14 Nov 2007 16:42:06 +0000
Subject: [PATCH] Note conflicts with vim6 (and vim-lite).

PR:		108369
Submitted by:	alex<azen@izb.net>
Approved by:	portmgr(pav)
---
 editors/vim/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 9f21cab7eb40..946accb98ca6 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -33,6 +33,7 @@ SLAVEDIRS=	editors/vim-lite
 .include "${.CURDIR}/options"
 .endif
 
+CONFLICTS=	vim6* vim*-lite
 USE_BZIP2=	yes
 DIST_SUBDIR=	vim
 WRKSRC=		${WRKDIR}/vim${PORTVERSION:C/\.[0-9]*$//:S/.//g}/src