From owner-svn-ports-all@FreeBSD.ORG  Tue Jan 29 17:18:40 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C0184537;
 Tue, 29 Jan 2013 17:18:40 +0000 (UTC)
 (envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9BA67A15;
 Tue, 29 Jan 2013 17:18:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0THIeh0082353;
 Tue, 29 Jan 2013 17:18:40 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0THIeu6082352;
 Tue, 29 Jan 2013 17:18:40 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201301291718.r0THIeu6082352@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Tue, 29 Jan 2013 17:18:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311174 - head/editors/vim
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jan 2013 17:18:40 -0000

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