From owner-svn-ports-head@FreeBSD.ORG  Sun Jan 25 00:32:16 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E6899F34;
 Sun, 25 Jan 2015 00:32:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D2792853;
 Sun, 25 Jan 2015 00:32:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0P0WG1n098695;
 Sun, 25 Jan 2015 00:32:16 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0P0WGXU098684;
 Sun, 25 Jan 2015 00:32:16 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201501250032.t0P0WGXU098684@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 25 Jan 2015 00:32:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r377844 - in head/devel: editline libedit
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.18-1
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: Sun, 25 Jan 2015 00:32:17 -0000

Author: bapt
Date: Sun Jan 25 00:32:15 2015
New Revision: 377844
URL: https://svnweb.freebsd.org/changeset/ports/377844
QAT: https://qat.redports.org/buildarchive/r377844/

Log:
  Register conflicts

Modified:
  head/devel/editline/Makefile
  head/devel/libedit/Makefile

Modified: head/devel/editline/Makefile
==============================================================================
--- head/devel/editline/Makefile	Sun Jan 25 00:10:22 2015	(r377843)
+++ head/devel/editline/Makefile	Sun Jan 25 00:32:15 2015	(r377844)
@@ -20,4 +20,6 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
+CONFLICTS_INSTALL=	libedit-*
+
 .include <bsd.port.mk>

Modified: head/devel/libedit/Makefile
==============================================================================
--- head/devel/libedit/Makefile	Sun Jan 25 00:10:22 2015	(r377843)
+++ head/devel/libedit/Makefile	Sun Jan 25 00:32:15 2015	(r377844)
@@ -23,4 +23,6 @@ INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--enable-widec
 MAKE_ENV=	LC_ALL=C
 
+CONFLICT_INSTALL=	editline-*
+
 .include <bsd.port.mk>