ImageMagick: update to 7.1.0.32.

Make tiff optional (default on, like before)

Merged

    Add support for FITS images with NaN values #5084
    Fixes grammar/typos/markdown #5083

Commits

    prep Beta release d2c4a6f
    ImageMagick/ImageMagick#3661 9090b17
    possible obscure memory leak 8e0c95e
    check event mask before logging eab8155
    check event mask before logging 7dcb276
    Also create changelog in the daily build. 878a667
    Removed %GITHUB_WORKSPACE% from other builds. 2540c48
    improve/optimize logging 7ba113a
    ImageMagick/ImageMagick#5041 c942d53
    need Changelog.md, referenced by web pages 6b6e7f3
    ilatest autoconf update 9dfee98
    move to wbsite repo 3e445a0
    optimize thumbnail resizing 09ab692
    ImageMagick/ImageMagick#4533 (comment) d13f844
    Rename extent to length. b056cec
    Allow exif profile that has a zero length (#5082). 0433d6e
    Moved length check. 267a891
    Removed code that was used to create a test image. bf925e6
    Use consistent code style. c4c031b
    revert bca2fb8
    Added missing CoderEndianSupportFlag (#5090). 0952c6a
    Sort commits by date instead. 7b95dda
    https://oss-fuzz.com/testcase?key=5120317075357696 5622990
    Removed unused arguments. c704997
    Added missing typecasts. 6820800
    check for image width/height exceeding INT_MAX 6d2c75e
    eliminate compiler exception 8649f4f
    add comment c506f55
    Use set_arg_encoding as suggestion in #5092. 67a2613
    optimize logging b2eaec1
    fix copyright c2fc57a
    initalize logging variable 263bfae
    possible divide by zero dce1bcf
    more informative exception message b7d240b
    more informative exception message 354669f
    make some logging coditional 372b5df
    ImageMagick/ImageMagick#3859 f49b826
    release a2b2c08

5 files changed, 23 insertions, 14 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index d5dab884c16..002e3a65407 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.302 2022/04/20 20:52:05 wiz Exp $
+# $NetBSD: Makefile,v 1.303 2022/05/03 08:27:11 wiz Exp $
 
 .include "Makefile.common"
 
@@ -94,7 +94,6 @@ CTF_FILES_SKIP+=	lib/libMagickWand-7.Q16HDRI.so.*
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index d7b63dd8037..2d1da0aaa2f 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile.common,v 1.252 2022/04/25 09:26:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.253 2022/05/03 08:27:11 wiz Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
+#
+# Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
 
 IM_MAJOR_VER=		7.1.0
-IM_MINOR_VER=		31
+IM_MINOR_VER=		32
 IM_MAJOR_LIB_VER=	7
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index d51270d36f8..c76e578f9f2 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.91 2022/04/18 19:09:52 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.92 2022/05/03 08:27:11 wiz Exp $
 
 BUILDLINK_TREE+=	ImageMagick
 
@@ -27,6 +27,9 @@ pkgbase := ImageMagick
 .if ${PKG_BUILD_OPTIONS.ImageMagick:Mopenexr}
 .include "../../graphics/openexr/buildlink3.mk"
 .endif
+.if ${PKG_BUILD_OPTIONS.ImageMagick:Mtiff}
+.include "../../graphics/tiff/buildlink3.mk"
+.endif
 .if ${PKG_BUILD_OPTIONS.ImageMagick:Mwmf}
 .include "../../graphics/libwmf/buildlink3.mk"
 .endif
@@ -45,7 +48,6 @@ pkgbase := ImageMagick
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index ea62372656b..17653e16159 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.273 2022/04/25 09:26:14 wiz Exp $
+$NetBSD: distinfo,v 1.274 2022/05/03 08:27:11 wiz Exp $
 
-BLAKE2s (ImageMagick-7.1.0-31.tar.xz) = c24c9d3a89358d15ff0c4defcb1b5ae669ebc42c3502975683314e3a25787d1a
-SHA512 (ImageMagick-7.1.0-31.tar.xz) = faadb20340d70c695c1019788c6f51bc2a4419c6fa9a3f4149e34f9408ec44ad4e390ddb0f4d1fad7ef2808ed7fb72236c001b856cb2980b5711479676a85315
-Size (ImageMagick-7.1.0-31.tar.xz) = 10344660 bytes
+BLAKE2s (ImageMagick-7.1.0-32.tar.xz) = b9e70c6c4fb79660e7e4679633737b7ca400d173323e25b7e157e5b4d85e7473
+SHA512 (ImageMagick-7.1.0-32.tar.xz) = b670c96b4755073caa8537fe4f42015da3ebac7761105273cc04efa6d03f945ca131292e3243fbb2e32159b54820892ade8f338e7bd3826ed7a9819c5feefb23
+Size (ImageMagick-7.1.0-32.tar.xz) = 10348108 bytes
 SHA1 (patch-config_policy.xml) = f8d130dcb1e81cd78a7856ca9b334f6ebf95c18f
diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk
index d26125deea5..9a5fe271c1d 100644
--- a/graphics/ImageMagick/options.mk
+++ b/graphics/ImageMagick/options.mk
@@ -1,9 +1,8 @@
-# $NetBSD: options.mk,v 1.23 2021/02/26 12:48:29 nia Exp $
+# $NetBSD: options.mk,v 1.24 2022/05/03 08:27:11 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ImageMagick
-PKG_SUPPORTED_OPTIONS=		doc x11 jp2 djvu openexr wmf liblqr heif
-PKG_SUGGESTED_OPTIONS=		doc x11 jp2 liblqr heif
-PKG_OPTIONS_LEGACY_OPTS+=	jasper:jp2
+PKG_SUPPORTED_OPTIONS=		djvu doc heif jp2 liblqr openexr tiff wmf x11
+PKG_SUGGESTED_OPTIONS=		doc heif jp2 liblqr tiff x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -51,6 +50,13 @@ CONFIGURE_ARGS+=	--with-openexr
 CONFIGURE_ARGS+=	--without-openexr
 .endif
 
+.if !empty(PKG_OPTIONS:Mtiff)
+.include "../../graphics/tiff/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-tiff
+.else
+CONFIGURE_ARGS+=	--without-tiff
+.endif
+
 .if !empty(PKG_OPTIONS:Mwmf)
 .include "../../graphics/libwmf/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-wmf