CVS commit: pkgsrc/graphics/ImageMagick

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Oct  3 12:39:20 UTC 2020

Modified Files:
        pkgsrc/graphics/ImageMagick: Makefile options.mk

Log Message:
graphics/ImageMagick: fix configure option for HEIC/HEIF

Found by GNU_CONFIGURE_STRICT=yes.

The configure option is called --with-heic now, but the environment
variables are still called HEIF_CFLAGS and HEIF_LIBS.


To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 pkgsrc/graphics/ImageMagick/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/ImageMagick/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/ImageMagick/Makefile
diff -u pkgsrc/graphics/ImageMagick/Makefile:1.276 pkgsrc/graphics/ImageMagick/Makefile:1.277
--- pkgsrc/graphics/ImageMagick/Makefile:1.276  Sun Sep 13 13:29:24 2020
+++ pkgsrc/graphics/ImageMagick/Makefile        Sat Oct  3 12:39:20 2020
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.276 2020/09/13 13:29:24 wiz Exp $
+# $NetBSD: Makefile,v 1.277 2020/10/03 12:39:20 rillig Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       ImageMagick-${DISTVERSION}
+PKGREVISION=   1
 
 MAINTAINER=    adam%NetBSD.org@localhost
 COMMENT=       Package for display and interactive manipulation of images

Index: pkgsrc/graphics/ImageMagick/options.mk
diff -u pkgsrc/graphics/ImageMagick/options.mk:1.21 pkgsrc/graphics/ImageMagick/options.mk:1.22
--- pkgsrc/graphics/ImageMagick/options.mk:1.21 Tue Sep  1 12:21:03 2020
+++ pkgsrc/graphics/ImageMagick/options.mk      Sat Oct  3 12:39:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2020/09/01 12:21:03 ryoon Exp $
+# $NetBSD: options.mk,v 1.22 2020/10/03 12:39:20 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ImageMagick
 PKG_SUPPORTED_OPTIONS=         x11 jp2 djvu openexr wmf liblqr heif
@@ -52,7 +52,7 @@ CONFIGURE_ARGS+=      --without-wmf
 
 .if !empty(PKG_OPTIONS:Mheif)
 .include "../../graphics/libheif/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-heif
+CONFIGURE_ARGS+=       --with-heic
 .else
-CONFIGURE_ARGS+=       --without-heif
+CONFIGURE_ARGS+=       --without-heic
 .endif