Update to 5.4.3.4

svn path=/head/; revision=55024

graphics/ImageMagick/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.4.1.2
+PORTVERSION=	5.4.3.4
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://imagemagick.sourceforge.net/http/ \
 		ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \
@@ -47,6 +47,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shared --with-perl=${PERL5} \
@@ -54,7 +55,7 @@ CONFIGURE_ARGS=	--enable-shared --with-perl=${PERL5} \
 INSTALLS_SHLIB=	yes
 
 MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.1 \
-		composite.1 convert.1 identify.1 mogrify.1 montage.1
+		composite.1 conjure.1 convert.1 identify.1 mogrify.1 montage.1
 MAN3=		Image::Magick.3
 MAN4=		miff.4
 MAN5=		quantize.5

graphics/ImageMagick/distinfo

@@ -1 +1 @@
-MD5 (ImageMagick-5.4.1-2.tar.gz) = 9715a75360f8915bf13ea07c0b6f60a1
+MD5 (ImageMagick-5.4.3-4.tar.gz) = b4fa5ef0d5ea184d3643566f92f42e0a

graphics/ImageMagick/files/patch-an

@@ -1,6 +1,6 @@
---- ltmain.sh.orig	Mon Sep 24 07:11:39 2001
-+++ ltmain.sh	Sat Sep 29 19:58:41 2001
-@@ -1138,6 +1138,7 @@
+--- ltmain.sh.orig	Tue Jan 29 22:40:33 2002
++++ ltmain.sh	Wed Feb 20 23:52:30 2002
+@@ -1140,6 +1140,7 @@
  	;;
  
        -avoid-version)
@@ -8,21 +8,3 @@
  	avoid_version=yes
  	continue
  	;;
-@@ -1225,7 +1226,7 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -2829,7 +2835,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;

graphics/ImageMagick/pkg-plist

@@ -2,6 +2,7 @@ bin/Magick++-config
 bin/Magick-config
 %%X11%%bin/animate
 bin/composite
+bin/conjure
 bin/convert
 %%X11%%bin/display
 bin/identify
@@ -37,6 +38,7 @@ include/magick/draw.h
 include/magick/error.h
 include/magick/gem.h
 include/magick/image.h
+include/magick/list.h
 include/magick/magic.h
 include/magick/magick.h
 include/magick/magick_config.h
@@ -51,6 +53,9 @@ include/magick/version.h
 include/magick/widget.h
 include/magick/xwindow.h
 lib/ImageMagick/delegates.mgk
+lib/ImageMagick/type-ghostscript.mgk
+lib/ImageMagick/type-solaris.mgk
+lib/ImageMagick/type-windows.mgk
 %%MODULES%%lib/ImageMagick/modules/coders/art.la
 %%MODULES%%lib/ImageMagick/modules/coders/art.so
 %%MODULES%%lib/ImageMagick/modules/coders/avi.la
@@ -59,6 +64,8 @@ lib/ImageMagick/delegates.mgk
 %%MODULES%%lib/ImageMagick/modules/coders/avs.so
 %%MODULES%%lib/ImageMagick/modules/coders/bmp.la
 %%MODULES%%lib/ImageMagick/modules/coders/bmp.so
+%%MODULES%%lib/ImageMagick/modules/coders/caption.la
+%%MODULES%%lib/ImageMagick/modules/coders/caption.so
 %%MODULES%%lib/ImageMagick/modules/coders/cmyk.la
 %%MODULES%%lib/ImageMagick/modules/coders/cmyk.so
 %%MODULES%%lib/ImageMagick/modules/coders/cut.la
@@ -118,10 +125,12 @@ lib/ImageMagick/delegates.mgk
 %%MODULES%%lib/ImageMagick/modules/coders/mono.so
 %%MODULES%%lib/ImageMagick/modules/coders/mpc.la
 %%MODULES%%lib/ImageMagick/modules/coders/mpc.so
-%%MODULES%%lib/ImageMagick/modules/coders/mpr.la
-%%MODULES%%lib/ImageMagick/modules/coders/mpr.so
 %%MODULES%%lib/ImageMagick/modules/coders/mpeg.la
 %%MODULES%%lib/ImageMagick/modules/coders/mpeg.so
+%%MODULES%%lib/ImageMagick/modules/coders/mpr.la
+%%MODULES%%lib/ImageMagick/modules/coders/mpr.so
+%%MODULES%%lib/ImageMagick/modules/coders/msl.la
+%%MODULES%%lib/ImageMagick/modules/coders/msl.so
 %%MODULES%%lib/ImageMagick/modules/coders/mtv.la
 %%MODULES%%lib/ImageMagick/modules/coders/mtv.so
 %%MODULES%%lib/ImageMagick/modules/coders/mvg.la
@@ -130,6 +139,8 @@ lib/ImageMagick/delegates.mgk
 %%MODULES%%lib/ImageMagick/modules/coders/null.so
 %%MODULES%%lib/ImageMagick/modules/coders/otb.la
 %%MODULES%%lib/ImageMagick/modules/coders/otb.so
+%%MODULES%%lib/ImageMagick/modules/coders/palm.la
+%%MODULES%%lib/ImageMagick/modules/coders/palm.so
 %%MODULES%%lib/ImageMagick/modules/coders/pcd.la
 %%MODULES%%lib/ImageMagick/modules/coders/pcd.so
 %%MODULES%%lib/ImageMagick/modules/coders/pcl.la
@@ -261,6 +272,7 @@ 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++/CoderInfo.html
 share/ImageMagick/www/Magick++/Color.html
 share/ImageMagick/www/Magick++/Documentation.html
 share/ImageMagick/www/Magick++/Drawable.html
@@ -311,6 +323,7 @@ share/ImageMagick/www/api/effect.html
 share/ImageMagick/www/api/enhance.html
 share/ImageMagick/www/api/error.html
 share/ImageMagick/www/api/image.html
+share/ImageMagick/www/api/list.html
 share/ImageMagick/www/api/magick.html
 share/ImageMagick/www/api/memory.html
 share/ImageMagick/www/api/monitor.html
@@ -342,6 +355,7 @@ share/ImageMagick/www/archives.html
 share/ImageMagick/www/cd.html
 share/ImageMagick/www/color.html
 share/ImageMagick/www/composite.html
+share/ImageMagick/www/conjure.html
 share/ImageMagick/www/convert.html
 share/ImageMagick/www/cvs.html
 share/ImageMagick/www/display.html