From owner-svn-ports-head@FreeBSD.ORG  Fri Jul 12 05:12:43 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B249F912;
 Fri, 12 Jul 2013 05:12:43 +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 A367519E7;
 Fri, 12 Jul 2013 05:12:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6C5ChSX067177;
 Fri, 12 Jul 2013 05:12:43 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6C5Ch9R067176;
 Fri, 12 Jul 2013 05:12:43 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201307120512.r6C5Ch9R067176@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 12 Jul 2013 05:12:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322814 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jul 2013 05:12:43 -0000

Author: obrien
Date: Fri Jul 12 05:12:42 2013
New Revision: 322814
URL: http://svnweb.freebsd.org/changeset/ports/322814

Log:
  Remove useless "libsysinfo" CONFLICTS statement.
  (it needed to be "libsysinfo*" to have any effect)

Modified:
  head/editors/vim/Makefile

Modified: head/editors/vim/Makefile
==============================================================================
--- head/editors/vim/Makefile	Fri Jul 12 04:33:25 2013	(r322813)
+++ head/editors/vim/Makefile	Fri Jul 12 05:12:42 2013	(r322814)
@@ -50,12 +50,13 @@ PORT_OPTIONS?=	${VIM_PORT_OPTIONS}
 
 .include <bsd.port.options.mk>
 
-CONFLICTS=	vim6* vim*-gnome libsysinfo
+CONFLICTS=	vim6* vim*-gnome
 .if defined(LITE)
 CONFLICTS+=	vim*
 .else
 CONFLICTS+=	vim*-lite
 .endif
+
 MAKE_JOBS_UNSAFE=	yes
 USE_BZIP2=	yes
 DIST_SUBDIR=	vim