Update ImageMagick to 6.9.0.4.

- Normalize the ImageMagick library name so it stays the same regardless of
  what the 16-bit and HDRI option are set to [1]. Teach cmake to look for
  the new name. Bump ports that link to the libraries due to this.
- As a result do away with the "HALFSUPPORTED" option block, and list
  16-bit and HDRI with the other options.
- ImageMagick ships a basic SVG plugin when not using librsvg2 for SVG
  support. This basic SVG plugin needs libxml2 to work [2]. Make libxml2
  a mandatory dependency (instead of only when the SVG option was selected).
- Don't touch .keep files in the modules directory, there files there so
  it useless.

PR:		194949 [1]
PR:		195227 [2]
Requested by:	many [1]
Submitted by:	software-freebsd@interfasys.ch [2]

7 files changed, 57 insertions, 87 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 6d80b8190416..72f51737a5c1 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.9.0-2
+DISTVERSION=	6.9.0-4
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
@@ -44,6 +44,7 @@ CONFIGURE_ENV=	MAKE=${MAKE_CMD}
 CONFIGURE_ARGS=	--without-dps \
 		--without-lcms
 USE_LDCONFIG=	yes
+USE_GNOME=	libxml2
 
 CPPFLAGS+=	-isystem${LOCALBASE}/include
 LDFLAGS+=	-Wl,-Y${LOCALBASE}/lib
@@ -52,26 +53,23 @@ SAMPLE_FILES=	coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \
 		policy.xml quantization-table.xml thresholds.xml type-dejavu.xml \
 		type-ghostscript.xml type-windows.xml type.xml
 
-
 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
+		THREADS X11 16BIT_PIXEL HDRI
 OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FPX FREETYPE \
 		JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG \
 		TIFF WEBP WMF THREADS X11
-OPTIONS_GROUP=	HALFSUPPORTED
-OPTIONS_GROUP_HALFSUPPORTED=	16BIT_PIXEL HDRI
 
-HALFSUPPORTED_DESC=	Half supported options (see help dialog)
 16BIT_PIXEL_DESC=	16bit pixel support
 JPEG2000_DESC=		OpenJPEG 2000 support via openjpeg
 DJVU_DESC=		DJVU format support (needs THREADS)
 GSLIB_DESC=		libgs (Postscript SHLIB) support
 HDRI_DESC=		High dynamic range images support
 MODULES_DESC=		Modules support
+SVG_DESC=		SVG vector image format support (via librsvg)
 TESTS_DESC=		Run bundled self-tests after build
 #SIMD_CONFIGURE_WITH=	gcc-arch
 CONFIGURE_ARGS+=	--without-gcc-arch
@@ -338,13 +336,10 @@ PLIST_SUB+=		WMF="@comment "
 
 # SVG (Scalable Vector Graphics) requires both libxml2 and X11
 .if ${PORT_OPTIONS:MSVG} && ${PORT_OPTIONS:MX11}
-USE_GNOME+=		libxml2
 LIB_DEPENDS+=		librsvg-2.so:${PORTSDIR}/graphics/librsvg2
-CONFIGURE_ARGS+=	--with-rsvg --with-xml
-CONFIGURE_ENV+=		RSVG_CFLAGS="-I${LOCALBASE}/include/librsvg-2.0" \
-			RSVG_LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--with-rsvg
 .else
-CONFIGURE_ARGS+=	--without-rsvg --without-xml
+CONFIGURE_ARGS+=	--without-rsvg
 .endif
 
 # Pango support
@@ -384,6 +379,22 @@ INSTALL_TARGET=	install-strip
 USE_GHOSTSCRIPT_BUILD=yes
 .endif
 
+post-patch:
+# strip library name of variable parts that can change due to
+# the HDRI and Q16 option
+	@${REINPLACE_CMD}  -e 's|_@MAGICK_ABI_SUFFIX@||g; \
+		s|\.@MAGICK_ABI_SUFFIX@||g' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|@\.@MAGICK_ABI_SUFFIX@|@|g' \
+		${WRKSRC}/PerlMagick/Makefile.PL.in \
+		${WRKSRC}/PerlMagick/quantum/Makefile.PL.in \
+		${WRKSRC}/Magick++/lib/Magick++.pc.in \
+		${WRKSRC}/Magick++/lib/ImageMagick++.pc.in \
+		${WRKSRC}/magick/ImageMagick.pc.in \
+		${WRKSRC}/magick/MagickCore.pc.in \
+		${WRKSRC}/wand/Wand.pc.in \
+		${WRKSRC}/wand/MagickWand.pc.in
+
 pre-configure:
 .if defined(_IMAGEMAGICK_THREADS_PERL_MSG)
 	@${ECHO_CMD} '###################################################################'
@@ -396,10 +407,6 @@ pre-configure:
 .endif
 
 post-install: test
-.if ${PORT_OPTIONS:MMODULES}
-	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-${_QBIT}${_HDRI}/coders/.keep
-	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-${_QBIT}${_HDRI}/filters/.keep
-.endif
 .for i in ${SAMPLE_FILES}
 	@${MV} ${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${i} \
 		${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${i}.sample
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index b07de72e6db0..b53151bf081d 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ImageMagick-6.9.0-2.tar.xz) = ce7ced11cc1019cd37518ebc4ea03ffaff8e6891aaf41a05615689dafe854ff6
-SIZE (ImageMagick-6.9.0-2.tar.xz) = 7896448
+SHA256 (ImageMagick-6.9.0-4.tar.xz) = 996aa8081dced3f3bbf23d90fca861b30332f734329f89367c6fc35173a74957
+SIZE (ImageMagick-6.9.0-4.tar.xz) = 7901680
diff --git a/graphics/ImageMagick/files/patch-coders_palm.c b/graphics/ImageMagick/files/patch-coders_palm.c
deleted file mode 100644
index a5cd0c32f710..000000000000
--- a/graphics/ImageMagick/files/patch-coders_palm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- coders/palm.c	2014-12-25 19:05:34.000000000 +0100
-+++ coders/palm.c	2014-12-31 09:38:35.499493971 +0100
-@@ -510,7 +510,7 @@
-       {
-         IndexPacket index=ConstrainColormapIndex(image,(mask-transparentIndex));
-         if (bits_per_pixel != 16)
--          SetMagickPixelPacket(image,image->colormap+index,
-+          SetMagickPixelPacket(image,image->colormap+(ssize_t) index,
-             (const IndexPacket *) NULL,&transpix);
-         (void) TransparentPaintImage(image,&transpix,(Quantum)
-           TransparentOpacity,MagickFalse);
diff --git a/graphics/ImageMagick/files/patch-coders_rle.c b/graphics/ImageMagick/files/patch-coders_rle.c
deleted file mode 100644
index 184ddb77c96f..000000000000
--- a/graphics/ImageMagick/files/patch-coders_rle.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- coders/rle.c.orig	2015-01-01 22:58:53.775440763 +0100
-+++ coders/rle.c	2015-01-01 23:00:50.825507571 +0100
-@@ -456,7 +456,7 @@
-             if (IsValidColormapIndex(image,*p & mask,&index,exception) ==
-                 MagickFalse)
-               break;
--            *p=colormap[index];
-+            *p=colormap[(ssize_t)index];
-             p++;
-           }
-         else
-@@ -467,7 +467,7 @@
-                 if (IsValidColormapIndex(image,(size_t) (x*map_length+
-                     (*p & mask)),&index,exception) == MagickFalse)
-                   break;
--                *p=colormap[index];
-+                *p=colormap[(ssize_t)index];
-                 p++;
-               }
-         if ((i < (ssize_t) number_pixels) || (x < (ssize_t) number_planes))
diff --git a/graphics/ImageMagick/files/patch-configure b/graphics/ImageMagick/files/patch-configure
new file mode 100644
index 000000000000..cbd21aa8d1bd
--- /dev/null
+++ b/graphics/ImageMagick/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2015-01-16 22:45:09.000000000 +0100
++++ configure	2015-01-17 22:55:31.590059586 +0100
+@@ -33096,7 +33096,7 @@
+ 
+ 
+ if test "x$SHAREARCH_DIRNAME" = "x"; then
+-  SHAREARCH_DIRNAME=${SHAREARCH_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
++  SHAREARCH_DIRNAME=${SHAREARCH_BASEDIRNAME}
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
diff --git a/graphics/ImageMagick/files/patch-magick_distribute-cache.c b/graphics/ImageMagick/files/patch-magick_distribute-cache.c
deleted file mode 100644
index 6a83cbd576fa..000000000000
--- a/graphics/ImageMagick/files/patch-magick_distribute-cache.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: magick/distribute-cache.c
-===================================================================
---- magick/distribute-cache.c	(revision 17523)
-+++ magick/distribute-cache.c	(working copy)
-@@ -92,6 +92,10 @@
- #define SOCKET_TYPE SOCKET
- #define MAGICKCORE_HAVE_DISTRIBUTE_CACHE
- #else
-+#define CLOSE_SOCKET(socket) 
-+#define HANDLER_RETURN_TYPE  void *
-+#define HANDLER_RETURN_VALUE  (void *) NULL
-+#define SOCKET_TYPE  int
- #undef send
- #undef recv
- #define send(file,buffer,length,flags)  0
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 348e4875e27e..ab0be32c4651 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -163,8 +163,7 @@ include/ImageMagick-6/wand/pixel-iterator.h
 include/ImageMagick-6/wand/pixel-wand.h
 include/ImageMagick-6/wand/stream.h
 include/ImageMagick-6/wand/wand-view.h
-lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/.keep
+lib/ImageMagick-%%PORTVERSION%%/config/configure.xml
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/aai.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/aai.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/art.la
@@ -409,36 +408,35 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/ycbcr.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/yuv.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/yuv.so
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/filters/.keep
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/filters/analyze.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/filters/analyze.so
-lib/libMagick++-6.%%QBIT%%%%HDRI%%.a
-lib/libMagick++-6.%%QBIT%%%%HDRI%%.la
-lib/libMagick++-6.%%QBIT%%%%HDRI%%.so
-lib/libMagick++-6.%%QBIT%%%%HDRI%%.so.5
-lib/libMagick++-6.%%QBIT%%%%HDRI%%.so.5.0.0
-lib/libMagickCore-6.%%QBIT%%%%HDRI%%.a
-lib/libMagickCore-6.%%QBIT%%%%HDRI%%.la
-lib/libMagickCore-6.%%QBIT%%%%HDRI%%.so
-lib/libMagickCore-6.%%QBIT%%%%HDRI%%.so.2
-lib/libMagickCore-6.%%QBIT%%%%HDRI%%.so.2.0.0
-lib/libMagickWand-6.%%QBIT%%%%HDRI%%.a
-lib/libMagickWand-6.%%QBIT%%%%HDRI%%.la
-lib/libMagickWand-6.%%QBIT%%%%HDRI%%.so
-lib/libMagickWand-6.%%QBIT%%%%HDRI%%.so.2
-lib/libMagickWand-6.%%QBIT%%%%HDRI%%.so.2.0.0
+lib/libMagick++-6.a
+lib/libMagick++-6.la
+lib/libMagick++-6.so
+lib/libMagick++-6.so.5
+lib/libMagick++-6.so.5.0.0
+lib/libMagickCore-6.a
+lib/libMagickCore-6.la
+lib/libMagickCore-6.so
+lib/libMagickCore-6.so.2
+lib/libMagickCore-6.so.2.0.0
+lib/libMagickWand-6.a
+lib/libMagickWand-6.la
+lib/libMagickWand-6.so
+lib/libMagickWand-6.so.2
+lib/libMagickWand-6.so.2.0.0
 libdata/pkgconfig/ImageMagick++.pc
 libdata/pkgconfig/Magick++.pc
 libdata/pkgconfig/ImageMagick.pc
 libdata/pkgconfig/MagickCore.pc
 libdata/pkgconfig/MagickWand.pc
 libdata/pkgconfig/Wand.pc
-libdata/pkgconfig/ImageMagick++-6.%%QBIT%%%%HDRI%%.pc
-libdata/pkgconfig/ImageMagick-6.%%QBIT%%%%HDRI%%.pc
-libdata/pkgconfig/Magick++-6.%%QBIT%%%%HDRI%%.pc
-libdata/pkgconfig/MagickCore-6.%%QBIT%%%%HDRI%%.pc
-libdata/pkgconfig/MagickWand-6.%%QBIT%%%%HDRI%%.pc
-libdata/pkgconfig/Wand-6.%%QBIT%%%%HDRI%%.pc
+libdata/pkgconfig/ImageMagick++-6.pc
+libdata/pkgconfig/ImageMagick-6.pc
+libdata/pkgconfig/Magick++-6.pc
+libdata/pkgconfig/MagickCore-6.pc
+libdata/pkgconfig/MagickWand-6.pc
+libdata/pkgconfig/Wand-6.pc
 %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick.pm
 %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm
 %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/Magick.so