From owner-svn-ports-all@FreeBSD.ORG  Tue May 27 12:06:54 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F15FEBC7;
 Tue, 27 May 2014 12:06:54 +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 DE916215C;
 Tue, 27 May 2014 12:06:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4RC6sRr073325;
 Tue, 27 May 2014 12:06:54 GMT (envelope-from sbz@svn.freebsd.org)
Received: (from sbz@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4RC6s67073323;
 Tue, 27 May 2014 12:06:54 GMT (envelope-from sbz@svn.freebsd.org)
Message-Id: <201405271206.s4RC6s67073323@svn.freebsd.org>
From: Sofian Brabez <sbz@FreeBSD.org>
Date: Tue, 27 May 2014 12:06:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355492 - in head: archivers/arc devel/arcanist
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 May 2014 12:06:55 -0000

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