svn commit: r355492 - in head: archivers/arc devel/arcanist

[Sofian Brabez]

Author: sbz
Date: Tue May 27 12:06:54 2014
New Revision: 355492
URL: http://svnweb.freebsd.org/changeset/ports/355492
QAT: https://qat.redports.org/buildarchive/r355492/

Log:
  - Add CONFLICTS
  
  CR:		D70
  Approved by:	bapt (portmgr)

Modified:
  head/archivers/arc/Makefile
  head/devel/arcanist/Makefile

Modified: head/archivers/arc/Makefile
==============================================================================
--- head/archivers/arc/Makefile	Tue May 27 11:55:36 2014	(r355491)
+++ head/archivers/arc/Makefile	Tue May 27 12:06:54 2014	(r355492)
@@ -11,6 +11,8 @@ COMMENT=	Create & extract files from DOS
 
 LICENSE=	GPLv2
 
+CONFLICTS=	php5-arcanist-*
+
 PLIST_FILES=	bin/arc bin/marc man/man1/arc.1.gz
 PORTDOCS=	Arc521.doc
 

Modified: head/devel/arcanist/Makefile
==============================================================================
--- head/devel/arcanist/Makefile	Tue May 27 11:55:36 2014	(r355491)
+++ head/devel/arcanist/Makefile	Tue May 27 12:06:54 2014	(r355492)
@@ -11,6 +11,8 @@ COMMENT=	Command line interface for Phab
 
 LICENSE=	APACHE20
 
+CONFLICTS=	arc-*
+
 PHP_DESTDIR=	lib/php/arcanist
 RUN_DEPENDS=	php5-libphutil>0:${PORTSDIR}/devel/libphutil \
 		bash:${PORTSDIR}/shells/bash