Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Jan 2013 17:18:40 +0000 (UTC)
From:      "David E. O'Brien" <obrien@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r311174 - head/editors/vim
Message-ID:  <201301291718.r0THIeu6082352@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301291718.r0THIeu6082352>