From owner-svn-ports-all@FreeBSD.ORG  Thu Nov 27 19:04:49 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2FDC3A5F;
 Thu, 27 Nov 2014 19:04:49 +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 1C7C6F1E;
 Thu, 27 Nov 2014 19:04:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sARJ4mu5097699;
 Thu, 27 Nov 2014 19:04:48 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sARJ4mrV097698;
 Thu, 27 Nov 2014 19:04:48 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201411271904.sARJ4mrV097698@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Thu, 27 Nov 2014 19:04:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r373512 - head/sysutils/py-salt-api
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-1
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: Thu, 27 Nov 2014 19:04:49 -0000

Author: antoine
Date: Thu Nov 27 19:04:48 2014
New Revision: 373512
URL: https://svnweb.freebsd.org/changeset/ports/373512
QAT: https://qat.redports.org/buildarchive/r373512/

Log:
  Mark BROKEN: Conflicts with py27-salt-2014.7.0
  
  pkg-static: py27-salt-api-0.8.4 conflicts with py27-salt-2014.7.0 (installs files into the same place).  Problematic file: /usr/local/bin/salt-api

Modified:
  head/sysutils/py-salt-api/Makefile

Modified: head/sysutils/py-salt-api/Makefile
==============================================================================
--- head/sysutils/py-salt-api/Makefile	Thu Nov 27 19:00:47 2014	(r373511)
+++ head/sysutils/py-salt-api/Makefile	Thu Nov 27 19:04:48 2014	(r373512)
@@ -11,6 +11,8 @@ COMMENT=	Exposes the fundamental aspects
 
 LICENSE=	APACHE20
 
+BROKEN=		Conflicts with py27-salt-2014.7.0
+
 USES=		python:2
 USE_PYTHON=	distutils autoplist