diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2018-09-22 07:49:35 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2018-09-22 07:49:35 +0000 |
| commit | 298ca7be4ec1b5ee844039a3ba4a1d1b7cb397dc (patch) | |
| tree | 6796651d77e314e3c27d8dbf375bf0524e77cde7 | |
| parent | caeffdd43a6d85849af5cf63cc1cc087a1c259c0 (diff) | |
| download | ports-298ca7be4ec1b5ee844039a3ba4a1d1b7cb397dc.tar.gz ports-298ca7be4ec1b5ee844039a3ba4a1d1b7cb397dc.zip | |
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)
Notes
Notes:
svn path=/head/; revision=480358
| -rw-r--r-- | graphics/ImageMagick/Makefile | 3 | ||||
| -rw-r--r-- | graphics/ImageMagick7/Makefile | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index cecdcb894df5..e5d665a0f2d9 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -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 \ diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index 98b35362ba76..11cf55b07e0f 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -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 \ |