Index: head/archivers/arc/Makefile
===================================================================
--- head/archivers/arc/Makefile	(revision 355491)
+++ head/archivers/arc/Makefile	(revision 355492)
@@ -1,28 +1,30 @@
 # Created by: ache
 # $FreeBSD$
 
 PORTNAME=	arc
 PORTVERSION=	5.21p
 CATEGORIES=	archivers
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	Create & extract files from DOS .ARC files
 
 LICENSE=	GPLv2
 
+CONFLICTS=	php5-arcanist-*
+
 PLIST_FILES=	bin/arc bin/marc man/man1/arc.1.gz
 PORTDOCS=	Arc521.doc
 
 .include <bsd.port.pre.mk>
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/arc ${WRKSRC}/marc\
 		${STAGEDIR}/${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/arc.1 ${STAGEDIR}/${PREFIX}/man/man1
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Arc521.doc ${STAGEDIR}/${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/devel/arcanist/Makefile
===================================================================
--- head/devel/arcanist/Makefile	(revision 355491)
+++ head/devel/arcanist/Makefile	(revision 355492)
@@ -1,30 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	arcanist
 PORTVERSION=	20140508
 PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	php5-
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Command line interface for Phabricator
 
 LICENSE=	APACHE20
 
+CONFLICTS=	arc-*
+
 PHP_DESTDIR=	lib/php/arcanist
 RUN_DEPENDS=	php5-libphutil>0:${PORTSDIR}/devel/libphutil \
 		bash:${PORTSDIR}/shells/bash
 USE_PHP=	curl json simplexml
 USE_GITHUB=	yes
 NO_BUILD=	yes
 GH_ACCOUNT=	facebook
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	1591b21
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 	cd ${WRKSRC} ; ${PAX} -rw * ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 	${LN} -sf ${PREFIX}/${PHP_DESTDIR}/bin/arc ${STAGEDIR}${PREFIX}/bin
 	${CHMOD} 755 ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/bin/arc
 
 .include <bsd.port.mk>