- Update to 6.3.3-5 [1]

- SVG support requires X11 support, so mark as IGNORE if WITHOUT_X11
  is defined [2]
- Correct set CPPFLAGS for fontconfig, librsvg, and graphviz [3]

PR:		ports/109862 [2], ports/110141[3]
Submitted by:	rafan [1], chinsan [2], Maxim Samsonov <xors at mne.ru> [3]
Approved by:	shuan

5 files changed, 52 insertions, 10 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index f4fa7f3b7100..f14c2df9583c 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.3.2-0
-PORTREVISION=	2
+DISTVERSION=	6.3.3-5
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.imagemagick.org/pub/ImageMagick/ \
 		ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
@@ -243,6 +242,9 @@ CONFIGURE_ARGS+=	--with-xml
 CONFIGURE_ARGS+=	--without-xml
 .endif
 .if defined(WITH_IMAGEMAGICK_SVG)
+.if defined(WITHOUT_X11)
+IGNORE=			SVG support requires X11 libraries, please unset WITHOUT_X11
+.endif
 LIB_DEPENDS+=		rsvg-2.2:${PORTSDIR}/graphics/librsvg2
 CONFIGURE_ARGS+=	--with-rsvg
 CONFIGURE_ENV+=		RSVG_CFLAGS="-I${X11BASE}/include/librsvg-2" \
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index cea84b792806..47da3acb8f04 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,3 +1,3 @@
-MD5 (ImageMagick-6.3.2-0.tar.bz2) = 8f901b63da07e1f3e913b324d9642be1
-SHA256 (ImageMagick-6.3.2-0.tar.bz2) = ddbd7f303ec4c5c9554ab3d5472902d29ff74aa458a59752e053eb9bd927aca7
-SIZE (ImageMagick-6.3.2-0.tar.bz2) = 5421608
+MD5 (ImageMagick-6.3.3-5.tar.bz2) = 16b376defdb7c3feb14a59644bf63a20
+SHA256 (ImageMagick-6.3.3-5.tar.bz2) = 306b8dfef26bc0a16f264cf3eaa99eb00fb4c8de4a53896ee6c5f7e878d3003d
+SIZE (ImageMagick-6.3.3-5.tar.bz2) = 5622230
diff --git a/graphics/ImageMagick/files/patch-configure b/graphics/ImageMagick/files/patch-configure
index b90ca456650c..956dba820e54 100644
--- a/graphics/ImageMagick/files/patch-configure
+++ b/graphics/ImageMagick/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.bak	Fri Feb  6 09:19:49 2004
-+++ configure	Wed Apr 21 16:47:25 2004
-@@ -23161,6 +23161,7 @@
+--- configure.orig	Tue Apr  3 21:30:12 2007
++++ configure	Tue Apr  3 21:31:01 2007
+@@ -18904,6 +18904,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,30 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -34622,7 +34623,7 @@
+ #define HasFONTCONFIG 1
+ _ACEOF
+ 
+-    if test "$with_modules" == 'no' ; then
++    if test "$with_modules" = 'no' ; then
+     CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS"
+     fi
+ fi
+@@ -36794,7 +36795,7 @@
+ #define HasGVC 1
+ _ACEOF
+ 
+-    if test "$with_modules" == 'no' ; then
++    if test "$with_modules" = 'no' ; then
+         CPPFLAGS="$GVC_CFLAGS $CPPFLAGS"
+     fi
+ fi
+@@ -37337,7 +37338,7 @@
+ #define HasRSVG 1
+ _ACEOF
+ 
+-    if test "$with_modules" == 'no' ; then
++    if test "$with_modules" = 'no' ; then
+         CPPFLAGS="$RSVG_CFLAGS $CPPFLAGS"
+     fi
+ fi
diff --git a/graphics/ImageMagick/files/patch-wand-Wand-config.in b/graphics/ImageMagick/files/patch-wand-Wand-config.in
new file mode 100644
index 000000000000..c8b65f62408a
--- /dev/null
+++ b/graphics/ImageMagick/files/patch-wand-Wand-config.in
@@ -0,0 +1,11 @@
+--- wand/Wand-config.in.orig	Tue Apr  3 22:32:19 2007
++++ wand/Wand-config.in	Tue Apr  3 22:31:54 2007
+@@ -21,7 +21,7 @@
+       pkg-config --variable exec_prefix Wand
+       ;;
+     --version)
+-      pkg-config --modversion Wan
++      pkg-config --modversion Wand
+       ;;
+     --cflags)
+       pkg-config --cflags Wand
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 029fa055b545..c0656b88069b 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -31,7 +31,6 @@ include/magick/PreRvIcccm.h
 include/magick/animate.h
 include/magick/annotate.h
 include/magick/api.h
-include/magick/attribute.h
 include/magick/blob.h
 include/magick/cache.h
 include/magick/cache-view.h
@@ -68,6 +67,7 @@ include/magick/magick-config.h
 include/magick/magick-type.h
 include/magick/memory_.h
 include/magick/methods.h
+include/magick/mime.h
 include/magick/module.h
 include/magick/monitor.h
 include/magick/montage.h
@@ -449,6 +449,7 @@ libdata/pkgconfig/Wand.pc
 %%DATADIR%%/config/coder.xml
 %%DATADIR%%/config/log.xml
 %%DATADIR%%/config/magic.xml
+%%DATADIR%%/config/mime.xml
 %%DATADIR%%/config/sRGB.icm
 %%DATADIR%%/config/thresholds.xml
 %%DATADIR%%-%%PORTVERSION%%/LICENSE
@@ -491,6 +492,7 @@ libdata/pkgconfig/Wand.pc
 %%PORTDOCS%%%%DOCSDIR%%/images/wand.ico
 %%PORTDOCS%%%%DOCSDIR%%/images/white-highlight.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ImageMagickObject.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Blob.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.fig
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.png
@@ -536,7 +538,6 @@ libdata/pkgconfig/Wand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/architecture.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/animate.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/annotate.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/attribute.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/blob.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/cache.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/color.html
@@ -559,6 +560,7 @@ libdata/pkgconfig/Wand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/api/magick.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/magick-image.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/magick-property.php
+%%PORTDOCS%%%%DOCSDIR%%/www/api/magick-property.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/memory.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/module.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/monitor.html