Upgrade to version 5.3.1 .

PR:	26622
Submitted by:	ports fury

4 files changed, 57 insertions, 32 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index dce389d546f..443b357ab36 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.2.9
-PORTREVISION=	1
+PORTVERSION=	5.3.1
 CATEGORIES=	graphics perl5
-MASTER_SITES=	ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \
-		ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
-		ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
-		ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/ \
-		ftp://ftp.fifi.org/pub/ImageMagick/ \
-		ftp://ftp.simplesystems.org/pub/ImageMagick/ \
-		${MASTER_SITE_RINGSERVER}
-MASTER_SITE_SUBDIR=	graphics/ImageMagick
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,imagemagick,} \
+		ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \
+		ftp://gd.tuwien.ac.at/pub/graphics/%SUBDIR%/ \
+		ftp://ftp.sunet.se/pub/multimedia/graphics/%SUBDIR%/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/ImageMagick,} \
+		ftp://ftp.simplesystems.org/pub/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -88,9 +86,11 @@ PLIST_SUB+=	X11=''
 .endif
 
 pre-patch:
+	@${PERL} -pi -e 's|\(pthread,|\(c_r,|g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|-D_REENTRANT|${PTHREAD_CFLAGS}|g' ${WRKSRC}/configure.in
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$$\(top_builddir\)/ltdl/libltdlc.la|\$$\(LIBLTDL\)|g'
-	${PERL} -pi -e 's|lcms/lcms.h|lcms.h|g' \
-		${WRKSRC}/configure.in ${WRKSRC}/magick/transform.c
+	@${PERL} -pi -e 's|lcms/lcms.h|lcms.h|g' ${WRKSRC}/magick/transform.c
 
 .include <bsd.port.mk>
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 03b59a98cb1..ccf1e066579 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1 +1 @@
-MD5 (ImageMagick-5.2.9.tar.gz) = a8a414d7579d967d938a1cb03b915118
+MD5 (ImageMagick-5.3.1.tar.gz) = a0c3590e924f001498285a316dd7bda8
diff --git a/graphics/ImageMagick/files/patch-al b/graphics/ImageMagick/files/patch-al
index 61cd2169371..c3c0e625d69 100644
--- a/graphics/ImageMagick/files/patch-al
+++ b/graphics/ImageMagick/files/patch-al
@@ -1,5 +1,5 @@
---- configure.in.orig	Tue Feb 13 02:19:24 2001
-+++ configure.in	Sat Feb 17 05:17:02 2001
+--- configure.in.orig	Sun Mar  4 11:07:42 2001
++++ configure.in	Wed Mar 28 05:33:09 2001
 @@ -65,7 +65,7 @@
  #
  AC_ENABLE_SHARED(no)
@@ -9,21 +9,7 @@
  # Substitute INCLTDL and LIBLTDL in the Makefiles
  AC_SUBST(INCLTDL)
  AC_SUBST(LIBLTDL)
-@@ -487,10 +487,10 @@
- LIB_THREAD=''
- if test "$with_threads" != 'no'
- then
--  AC_CHECK_LIB(pthread,pthread_attr_init,
-+  AC_CHECK_LIB(c_r,pthread_attr_init,
-     [AC_DEFINE(HasPTHREADS,,Define if you have Posix thread methods.)
--     LIB_THREAD="-lpthread"
--     DEF_THREAD="-D_REENTRANT"],,)
-+     LIB_THREAD="-pthread"
-+     DEF_THREAD="-D_THREAD_SAFE"],,)
-   LIBS="$LIB_THREAD $LIBS"
-   CPPFLAGS="$DEF_THREAD $CPPFLAGS"
- fi
-@@ -1021,6 +1021,22 @@
+@@ -1021,6 +1027,22 @@
      AC_MSG_RESULT()
      failed=0;
      passed=0;
@@ -46,7 +32,7 @@
      AC_CHECK_HEADER(libxml/parser.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
      AC_CHECK_LIB(xml2,xmlParseExternalEntity,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
      AC_MSG_CHECKING(if XML package is complete)
-@@ -1030,6 +1046,8 @@
+@@ -1030,6 +1052,8 @@
      then
  	AC_MSG_RESULT(no -- some components failed test)
          have_xml='no (failed tests)'
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 2dfb051fee0..c0ec1aada39 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -67,6 +67,8 @@ lib/ImageMagick/delegates.mgk
 %%MODULES%%lib/ImageMagick/modules/coders/dcm.so
 %%MODULES%%lib/ImageMagick/modules/coders/dps.la
 %%MODULES%%lib/ImageMagick/modules/coders/dps.so
+%%MODULES%%lib/ImageMagick/modules/coders/dpx.la
+%%MODULES%%lib/ImageMagick/modules/coders/dpx.so
 %%MODULES%%lib/ImageMagick/modules/coders/ept.la
 %%MODULES%%lib/ImageMagick/modules/coders/ept.so
 %%MODULES%%lib/ImageMagick/modules/coders/fax.la
@@ -226,10 +228,10 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/autosplit.ix
 share/ImageMagick/Copyright.txt
 share/ImageMagick/ImageMagick.html
 share/ImageMagick/QuickStart.txt
+share/ImageMagick/images/appligent.jpg
 share/ImageMagick/images/authentica.jpg
 share/ImageMagick/images/ball.png
 share/ImageMagick/images/corbis.png
-share/ImageMagick/images/digital-applications.png
 share/ImageMagick/images/examples.jpg
 share/ImageMagick/images/home.png
 share/ImageMagick/images/logo.png
@@ -241,6 +243,42 @@ share/ImageMagick/images/right_triangle_option.png
 share/ImageMagick/images/screen.png
 share/ImageMagick/magic.mgk
 share/ImageMagick/www/Changelog.html
+share/ImageMagick/www/Magick++/Blob.html
+share/ImageMagick/www/Magick++/Cache.fig
+share/ImageMagick/www/Magick++/Cache.png
+share/ImageMagick/www/Magick++/Cache.svg
+share/ImageMagick/www/Magick++/Color.html
+share/ImageMagick/www/Magick++/Documentation.html
+share/ImageMagick/www/Magick++/Drawable.html
+share/ImageMagick/www/Magick++/Drawable_example_1.png
+share/ImageMagick/www/Magick++/Enumerations.html
+share/ImageMagick/www/Magick++/Exception.html
+share/ImageMagick/www/Magick++/FormatCharacters.html
+share/ImageMagick/www/Magick++/Future.html
+share/ImageMagick/www/Magick++/Geometry.html
+share/ImageMagick/www/Magick++/Image.fig
+share/ImageMagick/www/Magick++/Image.html
+share/ImageMagick/www/Magick++/Image.png
+share/ImageMagick/www/Magick++/Image.svg
+share/ImageMagick/www/Magick++/ImageDesign.html
+share/ImageMagick/www/Magick++/ImageMagick.png
+share/ImageMagick/www/Magick++/Install.html
+share/ImageMagick/www/Magick++/Magick++.png
+share/ImageMagick/www/Magick++/Montage.html
+share/ImageMagick/www/Magick++/NEWS.html
+share/ImageMagick/www/Magick++/PixelPacket.html
+share/ImageMagick/www/Magick++/Pixels.html
+share/ImageMagick/www/Magick++/README.txt
+share/ImageMagick/www/Magick++/STL.html
+share/ImageMagick/www/Magick++/index.html
+share/ImageMagick/www/Magick++/montage-sample-framed.jpg
+share/ImageMagick/www/Magick++/right_triangle.png
+share/ImageMagick/www/Magick++/thumbnail-anatomy-framed.fig
+share/ImageMagick/www/Magick++/thumbnail-anatomy-framed.jpg
+share/ImageMagick/www/Magick++/thumbnail-anatomy-plain.fig
+share/ImageMagick/www/Magick++/thumbnail-anatomy-plain.jpg
+share/ImageMagick/www/Magick++/thumbnail-sample-framed.jpg
+share/ImageMagick/www/Magick++/thumbnail-sample-plain.jpg
 share/ImageMagick/www/Magick.html
 share/ImageMagick/www/animate.html
 share/ImageMagick/www/api/animate.html
@@ -319,6 +357,7 @@ share/ImageMagick/www/sponsor.html
 share/ImageMagick/www/tools.html
 @dirrm share/ImageMagick/www/api/types
 @dirrm share/ImageMagick/www/api
+@dirrm share/ImageMagick/www/Magick++
 @dirrm share/ImageMagick/www
 @dirrm share/ImageMagick/images
 @dirrm share/ImageMagick