svn commit: r379331 - in head: graphics/ImageMagick lang/execline

[Jan Beich]

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