From owner-svn-ports-head@freebsd.org  Sun Jul 16 16:28:53 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB524C082AD;
 Sun, 16 Jul 2017 16:28:53 +0000 (UTC)
 (envelope-from pawel@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 97EB783D22;
 Sun, 16 Jul 2017 16:28:53 +0000 (UTC)
 (envelope-from pawel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6GGSq1P042088;
 Sun, 16 Jul 2017 16:28:52 GMT (envelope-from pawel@FreeBSD.org)
Received: (from pawel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6GGSqUw042086;
 Sun, 16 Jul 2017 16:28:52 GMT (envelope-from pawel@FreeBSD.org)
Message-Id: <201707161628.v6GGSqUw042086@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pawel set sender to
 pawel@FreeBSD.org using -f
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sun, 16 Jul 2017 16:28:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r446034 - in head/graphics: ImageMagick ImageMagick7
X-SVN-Group: ports-head
X-SVN-Commit-Author: pawel
X-SVN-Commit-Paths: in head/graphics: ImageMagick ImageMagick7
X-SVN-Commit-Revision: 446034
X-SVN-Commit-Repository: ports
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Jul 2017 16:28:53 -0000

Author: pawel
Date: Sun Jul 16 16:28:52 2017
New Revision: 446034
URL: https://svnweb.freebsd.org/changeset/ports/446034

Log:
  Register CONFLICTS
  
  Approved by:	portmgr blanket

Modified:
  head/graphics/ImageMagick/Makefile
  head/graphics/ImageMagick7/Makefile

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Sun Jul 16 16:12:21 2017	(r446033)
+++ head/graphics/ImageMagick/Makefile	Sun Jul 16 16:28:52 2017	(r446034)
@@ -38,6 +38,7 @@ LIB_DEPENDS=	libltdl.so:devel/libltdl
 PORTSCOUT?=	limit:6.*$$
 
 CONFLICTS_INSTALL=	execline-[0-9]* # bin/import
+CONFLICTS_INSTALL+=	ImageMagick7 ImageMagick7-nox11 # bin/Magick++-config
 
 # This port uses .la files, keep libtool:keepla! (magick/module.c)
 USES=		cpe gettext-runtime gmake gnome libtool:keepla \

Modified: head/graphics/ImageMagick7/Makefile
==============================================================================
--- head/graphics/ImageMagick7/Makefile	Sun Jul 16 16:12:21 2017	(r446033)
+++ head/graphics/ImageMagick7/Makefile	Sun Jul 16 16:28:52 2017	(r446034)
@@ -36,6 +36,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 CONFLICTS_INSTALL=	execline-[0-9]* # bin/import
+CONFLICTS_INSTALL+=	ImageMagick ImageMagick-nox11 # bin/Magick++-config
 
 # This port uses .la files, keep libtool:keepla! (magick/module.c)
 USES=		cpe gettext-runtime gmake gnome libtool:keepla \