diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2018-09-21 18:37:30 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2018-09-21 18:37:30 +0000 |
| commit | 4d45bea2d787ec638163d7dbefcccb3c7ecd3c59 (patch) | |
| tree | 7a37189dfa4ece7b4a4771be10171384f3e7aa7b /graphics/ImageMagick7 | |
| parent | 4b9e4cc27b8f7afef05c527c4e2e711997027c42 (diff) | |
| download | ports-4d45bea2d787ec638163d7dbefcccb3c7ecd3c59.tar.gz ports-4d45bea2d787ec638163d7dbefcccb3c7ecd3c59.zip | |
graphics/ImageMagick[7]: remove CONFLICTS with lang/execline
- lang/execline dropped their bin/import, so it no longer conflicts
PR: 185818
Submitted by: mj@netauth.com
Approved by: koobs (maintainer timeout)
Notes
Notes:
svn path=/head/; revision=480301
Diffstat (limited to 'graphics/ImageMagick7')
| -rw-r--r-- | graphics/ImageMagick7/Makefile | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index 98b35362ba76..d9a11e822a3f 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 7.0.7-16 +DISTVERSION= 7.0.8-10 PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ @@ -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 \ @@ -61,7 +60,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION:R} OPTIONS_DEFINE= BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \ GRAPHVIZ GSLIB JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \ OPENEXR OPENMP PANGO PDF PERL PNG SVG TESTS TIFF WEBP WMF \ - THREADS X11 16BIT_PIXEL HDRI + THREADS X11 16BIT_PIXEL HDRI HEIF OPTIONS_DEFAULT= 16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE \ JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG \ TIFF WEBP WMF THREADS X11 HDRI @@ -364,6 +363,18 @@ USES+= ghostscript . endif .endif +## HEIF (High EfficiencImage Format) support +HEIF_DESC= High Efficiency Image File support (e.g. from iPhone) + +.if ${PORT_OPTIONS:MHEIF} +LIB_DEPENDS+= libheif.so:graphics/libheif +CONFIGURE_ARGS+= --with-heic +PLIST_SUB+= HEIF="" +.else +CONFIGURE_ARGS+= --without-heic +PLIST_SUB+= HEIF="@comment " +.endif + .if ! ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+= --without-x CONFLICTS+= ImageMagick7-* |