Update to 5.2.1.

PR:		ports/19944
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp> (the defacto Maintainer)

4 files changed, 42 insertions, 31 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 57694a455b40..3481831e9680 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.1.1
+PORTVERSION=	5.2.1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \
@@ -19,42 +19,39 @@ MASTER_SITE_SUBDIR=	jseger
 
 MAINTAINER=	jseger@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	bz2.1:${PORTSDIR}/archivers/bzip2 \
 		df.1:${PORTSDIR}/graphics/hdf \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		png.4:${PORTSDIR}/graphics/png \
 		jbig.1:${PORTSDIR}/graphics/jbigkit \
-		ttf.4:${PORTSDIR}/print/freetype
-
-# bzip2 for bzlib
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2 \
-		fig2dev:${PORTSDIR}/print/transfig \
-		picttoppm:${PORTSDIR}/graphics/netpbm \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.3:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		ttf.4:${PORTSDIR}/print/freetype \
+		xml.5:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=	gs:${PORTSDIR}/print/ghostscript55 \
 		mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \
-		gs:${PORTSDIR}/print/ghostscript55
-
-MAN1=		ImageMagick.1 animate.1 combine.1 convert.1 display.1 \
-		identify.1 import.1 mogrify.1 montage.1
-MAN3=		Image::Magick.3
-MAN4=		miff.4
-MAN5=		quantize.5
+		picttoppm:${PORTSDIR}/graphics/netpbm \
+		fig2dev:${PORTSDIR}/print/transfig
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+USE_PERL5=	yes
+USE_XLIB=	yes
+USE_LIBTOOL=	yes
 USE_AUTOCONF=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--enable-shared --enable-16bit-pixel --without-modules \
+		--with-perl=${PERL5}
 INSTALLS_SHLIB=	yes
 
-CONFIGURE_ARGS= --prefix=${PREFIX} --enable-shared --with-perl=${PERL5} \
-		--enable-16bit-pixel
-
 .if defined(HAVE_UNISYS_LICENSE)
 CONFIGURE_ARGS+= --enable-lzw
 .endif
 
-USE_PERL5=	YES
-USE_XLIB=	YES
-CONFIGURE_ENV=	LDFLAGS="$(LDFLAGS) -L${WRKSRC}/magick/.libs"
+MAN1=		ImageMagick.1 animate.1 combine.1 convert.1 display.1 \
+		identify.1 import.1 mogrify.1 montage.1
+MAN3=		Image::Magick.3
+MAN4=		miff.4
+MAN5=		quantize.5
 
-pre-configure:
-	${RM} -f ${WRKSRC}/config.cache
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 1b1721ae96dc..7cc47c0c803f 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1 +1 @@
-MD5 (ImageMagick-5.1.1.tar.gz) = 04a606d99dfa8db3e5aa5e31cf074482
+MD5 (ImageMagick-5.2.1.tar.gz) = fe33bc5b95ec9bc4336e0a6249f93ba9
diff --git a/graphics/ImageMagick/files/patch-ak b/graphics/ImageMagick/files/patch-ak
new file mode 100644
index 000000000000..fd19d77540f0
--- /dev/null
+++ b/graphics/ImageMagick/files/patch-ak
@@ -0,0 +1,11 @@
+--- magick/Makefile.in.orig	Fri Jun 30 11:05:56 2000
++++ magick/Makefile.in	Sat Jul 15 10:01:31 2000
+@@ -248,7 +248,7 @@
+ 
+ 
+ # Where modules are installed
+-pkgdir = $(libdir)/ImageMagick/modules/coders
++@WITH_MODULES_TRUE@pkgdir = $(libdir)/ImageMagick/modules/coders
+ 
+ # Architecture-dependent data files installed with modules
+ pkg_DATA = 
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 7258ea040273..6ce7dca63967 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -7,10 +7,12 @@ bin/identify
 bin/import
 bin/mogrify
 bin/montage
+include/magick/PreRvIcccm.h
 include/magick/api.h
+include/magick/attributes.h
 include/magick/blob.h
 include/magick/cache.h
-include/magick/cache_io.h
+include/magick/cache_view.h
 include/magick/classify.h
 include/magick/compress.h
 include/magick/config.h
@@ -19,15 +21,15 @@ include/magick/error.h
 include/magick/gems.h
 include/magick/image.h
 include/magick/magick.h
-include/magick/memory.h
 include/magick/monitor.h
 include/magick/quantize.h
+include/magick/semaphore.h
 include/magick/timer.h
 include/magick/utility.h
 include/magick/version.h
+include/magick/widget.h
 include/magick/xwindows.h
 lib/libMagick.a
-lib/libMagick.la
 lib/libMagick.so
 lib/libMagick.so.5
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image/Magick.pm
@@ -36,8 +38,9 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/autosplit.ix
 share/ImageMagick/delegates.mgk
+share/ImageMagick/magic.mgk
+@dirrm share/ImageMagick
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image
 @dirrm include/magick
-@dirrm share/ImageMagick