Date: Sat, 22 Sep 2018 07:49:35 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480358 - in head/graphics: ImageMagick ImageMagick7 Message-ID: <201809220749.w8M7nZxs030916@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sat Sep 22 07:49:35 2018 New Revision: 480358 URL: https://svnweb.freebsd.org/changeset/ports/480358 Log: graphics/ImageMagick[7]: remove CONFLICTS with lang/execline, 2nd try - lang/execline dropped their bin/import, so it no longer conflicts PR: 185818 Submitted by: mj@netauth.com Approved by: kwm (maintainer timeout) Modified: head/graphics/ImageMagick/Makefile head/graphics/ImageMagick7/Makefile Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Sat Sep 22 07:33:24 2018 (r480357) +++ head/graphics/ImageMagick/Makefile Sat Sep 22 07:49:35 2018 (r480358) @@ -38,8 +38,7 @@ LIB_DEPENDS= libltdl.so:devel/libltdl PORTSCOUT?= limit:^6\.9\. -CONFLICTS_INSTALL= execline-[0-9]* # bin/import -CONFLICTS_INSTALL+= ImageMagick7 ImageMagick7-nox11 # bin/Magick++-config +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 Sat Sep 22 07:33:24 2018 (r480357) +++ head/graphics/ImageMagick7/Makefile Sat Sep 22 07:49:35 2018 (r480358) @@ -36,8 +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 +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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809220749.w8M7nZxs030916>