svn commit: r446034 - in head/graphics: ImageMagick ImageMagick7

[Pawel Pekala]

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 \