From 906bb452d27c6ccbd9ce0a97032f86d1f99f86b8 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 19 Feb 2015 02:29:06 +0000 Subject: [PATCH] Register CONFLICTS between execline and ImageMagick Differential Revision: https://reviews.freebsd.org/D1820 Approved by: bapt (mentor) Approved by: portmgr blanket --- graphics/ImageMagick/Makefile | 2 ++ lang/execline/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 72f51737a5c1..6e625aa45eb8 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -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 diff --git a/lang/execline/Makefile b/lang/execline/Makefile index 5e8a008483fe..e43a14976b85 100644 --- a/lang/execline/Makefile +++ b/lang/execline/Makefile @@ -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