svn commit: r480301 - in head/graphics: ImageMagick ImageMagick7

[Jan Beich]

Kurt Jaeger <pi at FreeBSD.org> writes:

> Author: pi
> Date: Fri Sep 21 18:37:30 2018
> New Revision: 480301
> URL: https://svnweb.freebsd.org/changeset/ports/480301
>
> Log:
>   graphics/ImageMagick[7]: remove CONFLICTS with lang/execline
>   
>   - lang/execline dropped their bin/import, so it no longer conflicts
>   
>   PR:		185818
>   Submitted by:	mj at netauth.com
>   Approved by:	koobs (maintainer timeout)

Did you mean kwm, not koobs? I'm pretty sure the important bit during
timeout is how much time elapsed rather than who the maintainer is.

> Modified: head/graphics/ImageMagick7/Makefile
> ==============================================================================
> --- head/graphics/ImageMagick7/Makefile	Fri Sep 21 18:20:32 2018	(r480300)
> +++ head/graphics/ImageMagick7/Makefile	Fri Sep 21 18:37:30 2018	(r480301)
> @@ -1,7 +1,7 @@
>  # $FreeBSD$
>  
>  PORTNAME=	ImageMagick
> -DISTVERSION=	7.0.7-16
> +DISTVERSION=	7.0.8-10

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230788 has been submitted
just a day ago. Not enough for maintainer timeout.

Maybe back the commit out and reland properly. It's unlikely to build at
all because distinfo wasn't updated.

>  PORTREVISION=	1

Kinda late but PORTREVISION bump should have been reset.

>  CATEGORIES=	graphics perl5
>  MASTER_SITES=	http://www.imagemagick.org/download/ \
> @@ -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
> @@ -362,6 +361,18 @@ USES+=		ghostscript:x11
>  . else
>  USES+=		ghostscript
>  . endif
> +.endif
> +
> +## HEIF (High EfficiencImage Format) support
> +HEIF_DESC=		High Efficiency Image File support (e.g. from iPhone)

Why are you breaking existing style by adding _DESC in the middle of conditionals?

> +
> +.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

Why do you need PLIST_SUB without lines in pkg-plist?