Pullup ticket #6085 - requested by wiz

graphics/ImageMagick: security fix

Revisions pulled up:
- graphics/ImageMagick/Makefile                                 1.262
- graphics/ImageMagick/Makefile.common                          1.195-1.196
- graphics/ImageMagick/PLIST                                    1.106
- graphics/ImageMagick/distinfo                                 1.212-1.213

---
   Module Name:    pkgsrc
   Committed By:   wiz
   Date:           Thu Oct 10 13:28:02 UTC 2019

   Modified Files:
           pkgsrc/graphics/ImageMagick: Makefile.common distinfo

   Log Message:
   ImageMagick: update to 7.0.8.68.

   2019-10-05  7.0.8-68 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.8-68, GIT revision 16184:b75b0e5:20191005.

   2019-09-30  7.0.8-68 Cristy  <quetzlzacatenango@image...>
     * Support animated WebP encoding/decoding (reference
       https://github.com/ImageMagick/ImageMagick/pull/1708).
     * Text stroke cut off (reference
       https://imagemagick.org/discourse-server/viewtopic.php?f=1&t=36829).
     * Adds support for lossless JPEG1 recompression (reference
       https://imagemagick.org/discourse-server/viewtopic.php?f=2&t=36828).

   2019-09-29  7.0.8-67 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.8-67, GIT revision 16145:6f2feb9:20190929.

   2019-09-28  7.0.8-67 Cristy  <quetzlzacatenango@image...>
     * line endings renedered as empty boxes (reference
       https://github.com/ImageMagick/ImageMagick/issues/1704).

   2019-09-21  7.0.8-66 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.8-66, GIT revision 16134:f6ce80a:20190921.

   2019-09-09  7.0.8-66 Cristy  <quetzlzacatenango@image...>
     * Support compound statements in FX while() (reference
       https://github.com/ImageMagick/ImageMagick/issues/1701).

   2019-09-15  7.0.8-65 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.8-65, GIT revision 16130:254db34:20190915.

   2019-09-09  7.0.8-65 Cristy  <quetzlzacatenango@image...>
     * Eliminate fault when trace delegate is not available.
     * Properly distinquish linear and non-linear gray colorspaces (reference
       https://github.com/ImageMagick/ImageMagick/issues/1680).

   2019-09-07  7.0.8-64 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.8-64, GIT revision 16108:2ad3cbc:20190907.

   2019-09-02  7.0.8-64 Cristy  <quetzlzacatenango@image...>
     * Support XPM symbolic (reference
       https://github.com/ImageMagick/ImageMagick/issues/1684).
     * DilateIntensity is channel independent (reference
       https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=36641).

   2019-08-31  7.0.8-63 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.8-63, GIT revision 16088:3b7a33d:20190831.

   2019-08-24  7.0.8-63 Cristy  <quetzlzacatenango@image...>
     * Properly identify the DNG and AI image format (reference
       https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=36581).

   2019-08-23  7.0.8-62 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.8-62, GIT revision 16061:7525595:20190823.

   2019-08-23  7.0.8-62 Dirk Lemstra <dirk@lem.....org>
     * Added option to limit the maximum point size with -define
       caption:max-pointsize=pointsize.
     * Corrected JP2 numresolution calculation (reference:
       https://github.com/ImageMagick/ImageMagick/issues/1673)

   2019-08-19  7.0.8-62 Cristy  <quetzlzacatenango@image...>
     * Conditionally compile call to AcquireCLocale() (reference
       https://github.com/ImageMagick/ImageMagick/issues/1669).
     * More robust support for converting bitmap to vector.

---
   Module Name:    pkgsrc
   Committed By:   rillig
   Date:           Sat Oct 12 20:55:58 UTC 2019

   Modified Files:
           pkgsrc/graphics/ImageMagick: Makefile

   Log Message:
   graphics/ImageMagick: remove unknown configure options

---
   Module Name:    pkgsrc
   Committed By:   wiz
   Date:           Thu Nov  7 13:01:32 UTC 2019

   Modified Files:
           pkgsrc/graphics/ImageMagick: Makefile.common PLIST distinfo

   Log Message:
   ImageMagick: update to 7.0.9.2.

   2019-10-30  7.0.9-2 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.9-2, GIT revision 16325:6f84d89:20191030.

   2019-10-29  7.0.9-2 Cristy  <quetzlzacatenango@image...>
     * JPEG and JPG are aliases in coder security policy.
     * Fixed numerous issues  posted to GitHub (reference
       https://github.com/ImageMagick/ImageMagick/issues).

   2019-10-27  7.0.9-1 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.9-1, GIT revision 16313:e068be3:20191027.

   2019-10-27  7.0.9-1 Cristy  <quetzlzacatenango@image...>
     * Fixed numerous issues  posted to GitHub (reference
       https://github.com/ImageMagick/ImageMagick/issues).

   2019-10-23  7.0.9-0 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.9-0, GIT revision 16297:8744fd9:20191024

   2019-10-06  7.0.9-0 Cristy  <quetzlzacatenango@image...>
     * Fixed numerous issues  posted to GitHub (reference
       https://github.com/ImageMagick/ImageMagick/issues).
     * Support trim:background-color define for -trim option.

4 files changed, 11 insertions, 13 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 067fbf01689..0ff7871fb15 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.261 2019/08/16 11:58:17 wiz Exp $
+# $NetBSD: Makefile,v 1.261.2.1 2019/11/16 22:09:58 bsiegert Exp $
 
 .include "Makefile.common"
 
@@ -14,8 +14,6 @@ USE_TOOLS+=		gmake pkg-config:run
 CONFIGURE_ARGS+=	--disable-assert
 CONFIGURE_ARGS+=	--with-fontconfig
 CONFIGURE_ARGS+=	--with-jpeg
-CONFIGURE_ARGS+=	--with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
-CONFIGURE_ARGS+=	--with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
 CONFIGURE_ARGS+=	--with-xml=yes
 CONFIGURE_ARGS+=	--without-perl
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 2cc48a53ec8..ceb0d1a3f1b 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.194 2019/08/20 11:38:38 wiz Exp $
+# $NetBSD: Makefile.common,v 1.194.2.1 2019/11/16 22:09:58 bsiegert Exp $
 #
 # When updating this package, please upload the distfile
 # since they disappear immediately when new releases happen,
@@ -6,8 +6,8 @@
 #
 # used by graphics/p5-PerlMagick/Makefile
 
-IM_MAJOR_VER=		7.0.8
-IM_MINOR_VER=		61
+IM_MAJOR_VER=		7.0.9
+IM_MINOR_VER=		2
 IM_MAJOR_LIB_VER=	7
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index ab59afcbd84..bcba51f4760 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.105 2019/01/29 09:52:27 leot Exp $
+@comment $NetBSD: PLIST,v 1.105.6.1 2019/11/16 22:09:58 bsiegert Exp $
 bin/Magick++-config
 bin/MagickCore-config
 bin/MagickWand-config
@@ -151,7 +151,7 @@ include/ImageMagick-7/MagickWand/pixel-wand.h
 include/ImageMagick-7/MagickWand/stream.h
 include/ImageMagick-7/MagickWand/wand-view.h
 include/ImageMagick-7/MagickWand/wandcli.h
-lib/ImageMagick-7.0.8/config-Q16HDRI/configure.xml
+lib/ImageMagick-7.0.9/config-Q16HDRI/configure.xml
 lib/libMagick++-7.Q16HDRI.la
 lib/libMagickCore-7.Q16HDRI.la
 lib/libMagickWand-7.Q16HDRI.la
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 23467d18bc0..edb1efd8a5a 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.211 2019/08/20 11:38:38 wiz Exp $
+$NetBSD: distinfo,v 1.211.2.1 2019/11/16 22:09:58 bsiegert Exp $
 
-SHA1 (ImageMagick-7.0.8-61.tar.xz) = 8e915783fb403254117b61b2a985af10fa0656b8
-RMD160 (ImageMagick-7.0.8-61.tar.xz) = 241fec0ef860fa8bbb46f736776991bf6077c22e
-SHA512 (ImageMagick-7.0.8-61.tar.xz) = 17faefa05e8535afc4636fca0228e8f903a2a3696943fbcdf9e541d5cc9072a98cf8070598be0baa19fa99609d207fc8314b274ea0baaa5395cb561c442a8ffc
-Size (ImageMagick-7.0.8-61.tar.xz) = 9462864 bytes
+SHA1 (ImageMagick-7.0.9-2.tar.xz) = 878a22648de212093475220704c34f7791205e93
+RMD160 (ImageMagick-7.0.9-2.tar.xz) = d08100668e516295a652c8daef2106d267965f69
+SHA512 (ImageMagick-7.0.9-2.tar.xz) = d584e467bc9e7ff90b1a4f715c792ffd272574da2efefb0cc39fbaa2ad225eed2fc12936785dea44755158a23c3a8397754feba07e442249e535a7b12388ae90
+Size (ImageMagick-7.0.9-2.tar.xz) = 9475956 bytes
 SHA1 (patch-config_policy.xml) = 2c446a00fc00f85ab33eae0691d4d8989a46289f