svn commit: r311174 - head/editors/vim

[David E. O'Brien]

Author: obrien
Date: Tue Jan 29 17:18:40 2013
New Revision: 311174
URL: http://svnweb.freebsd.org/changeset/ports/311174

Log:
  Update conflicts and avoid duplication.

Modified:
  head/editors/vim/Makefile

Modified: head/editors/vim/Makefile
==============================================================================
--- head/editors/vim/Makefile	Tue Jan 29 16:52:25 2013	(r311173)
+++ head/editors/vim/Makefile	Tue Jan 29 17:18:40 2013	(r311174)
@@ -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