From owner-svn-ports-head@FreeBSD.ORG  Thu Feb 19 02:29:07 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 E8ED633A;
 Thu, 19 Feb 2015 02:29:07 +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 D3BB2922;
 Thu, 19 Feb 2015 02:29:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1J2T7Tk058721;
 Thu, 19 Feb 2015 02:29:07 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1J2T7Od058719;
 Thu, 19 Feb 2015 02:29:07 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201502190229.t1J2T7Od058719@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 19 Feb 2015 02:29:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r379331 - in head: graphics/ImageMagick lang/execline
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Feb 2015 02:29:08 -0000

Author: jbeich
Date: Thu Feb 19 02:29:06 2015
New Revision: 379331
URL: https://svnweb.freebsd.org/changeset/ports/379331
QAT: https://qat.redports.org/buildarchive/r379331/

Log:
  Register CONFLICTS between execline and ImageMagick
  
  Differential Revision:	https://reviews.freebsd.org/D1820
  Approved by:	bapt (mentor)
  Approved by:	portmgr blanket

Modified:
  head/graphics/ImageMagick/Makefile
  head/lang/execline/Makefile

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Thu Feb 19 00:59:57 2015	(r379330)
+++ head/graphics/ImageMagick/Makefile	Thu Feb 19 02:29:06 2015	(r379331)
@@ -36,6 +36,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
+CONFLICTS_INSTALL=	execline-[0-9]* # bin/import
+
 # This port uses .la files, keep libtool:keepla! (magick/module.c)
 USES=		gmake libtool:keepla pathfix perl5 pkgconfig shebangfix tar:xz
 SHEBANG_FILES=	www/source/examples.pl

Modified: head/lang/execline/Makefile
==============================================================================
--- head/lang/execline/Makefile	Thu Feb 19 00:59:57 2015	(r379330)
+++ head/lang/execline/Makefile	Thu Feb 19 02:29:06 2015	(r379331)
@@ -13,6 +13,8 @@ LICENSE=	ISCL
 
 BUILD_DEPENDS=	skalibs>=2.2.1.0:${PORTSDIR}/devel/skalibs
 
+CONFLICTS_INSTALL=	ImageMagick-* # bin/import
+
 USES=		gmake
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes