From a9066711c7d08598f6371bdf0c60a823e540b9bd Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Tue, 29 Jan 2013 17:18:40 +0000
Subject: Update conflicts and avoid duplication.

---
 editors/vim/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'editors')

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index ebe14ebf775d..6d53515ebc99 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -38,10 +38,11 @@ SLAVEDIRS=	editors/vim-lite
 .include <bsd.port.options.mk>
 .endif
 
+CONFLICTS=	vim6* vim*-gnome libsysinfo
 .if defined(LITE)
-CONFLICTS=	vim6* vim* vim*-gnome
+CONFLICTS+=	vim*
 .else
-CONFLICTS=	vim6* vim*-lite vim*-gnome
+CONFLICTS+=	vim*-lite
 .endif
 MAKE_JOBS_UNSAFE=	yes
 USE_BZIP2=	yes
-- 
cgit