Index: head/devel/editline/Makefile
===================================================================
--- head/devel/editline/Makefile	(revision 377843)
+++ head/devel/editline/Makefile	(revision 377844)
@@ -1,23 +1,25 @@
 # $FreeBSD$
 
 PORTNAME=	editline
 PORTVERSION=	1.14.2
 CATEGORIES=	devel
 MASTER_SITES=	GHR
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Minix editline: A free readline() for UNIX
 
 LICENSE=	BSD4CLAUSE
 
 USES=		libtool
 USE_GITHUB=	yes
 GH_ACCOUNT=	troglobit
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
+CONFLICTS_INSTALL=	libedit-*
+
 .include <bsd.port.mk>
Index: head/devel/libedit/Makefile
===================================================================
--- head/devel/libedit/Makefile	(revision 377843)
+++ head/devel/libedit/Makefile	(revision 377844)
@@ -1,26 +1,28 @@
 # Created by: jasone
 # $FreeBSD$
 
 PORTNAME=	libedit
 PORTVERSION=	${EDITVERSION}.${EDITDATE}
 DISTVERSION=	${EDITDATE}-${EDITVERSION}
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://thrysoee.dk/editline/
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Command line editor library
 
 LICENSE=	BSD2CLAUSE
 
 USES=		libtool pathfix
 EDITVERSION=	3.1
 EDITDATE=	20141030
 WRKSRC=		${WRKDIR}/${PORTNAME}-20141029-${EDITVERSION}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--enable-widec
 MAKE_ENV=	LC_ALL=C
 
+CONFLICT_INSTALL=	editline-*
+
 .include <bsd.port.mk>