Update to 5.4.1.2

PR:		33563
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

3 files changed, 11 insertions, 14 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index be9a45c..55cdc6b 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.4.0.5
+PORTVERSION=	5.4.1.2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://imagemagick.sourceforge.net/http/ \
 		ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \
@@ -111,12 +111,12 @@ PLIST_SUB+=	X11=''
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-lc_r|g ; \
-		s|LIBLTDL=.*\n|LIBLTDL="-lltdl"\n|g ; \
-		s|INCLTDL=.*\n|INCLTDL=\n|g ; \
+		s|LIBLTDL=.*$$|LIBLTDL="-lltdl"|g ; \
+		s|INCLTDL=.*$$|INCLTDL=|g ; \
 		s|lcms/lcms.h|lcms.h|g ; \
 		s|lcms_lcms_h|lcms_h|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$$\(top_builddir\)/ltdl/libltdlc.la|\$$\(LIBLTDL\)|g'
+		's|top_builddir\)/ltdl/libltdlc.la|LIBLTDL\)|g'
 	@${PERL} -pi -e 's|lcms/lcms.h|lcms.h|g' ${WRKSRC}/magick/transform.c
 	@${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c
 
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 3167d87..255599b 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1 +1 @@
-MD5 (ImageMagick-5.4.0-5.tar.gz) = 52942fa0a6bcd7d8600436d7b2024c60
+MD5 (ImageMagick-5.4.1-2.tar.gz) = 9715a75360f8915bf13ea07c0b6f60a1
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index dc8f531..cc09a9e 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -65,6 +65,8 @@ lib/ImageMagick/delegates.mgk
 %%MODULES%%lib/ImageMagick/modules/coders/cut.so
 %%MODULES%%lib/ImageMagick/modules/coders/dcm.la
 %%MODULES%%lib/ImageMagick/modules/coders/dcm.so
+%%MODULES%%lib/ImageMagick/modules/coders/dib.la
+%%MODULES%%lib/ImageMagick/modules/coders/dib.so
 %%MODULES%%lib/ImageMagick/modules/coders/dps.la
 %%MODULES%%lib/ImageMagick/modules/coders/dps.so
 %%MODULES%%lib/ImageMagick/modules/coders/dpx.la
@@ -116,6 +118,8 @@ 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/mtv.la
@@ -158,8 +162,6 @@ lib/ImageMagick/delegates.mgk
 %%MODULES%%lib/ImageMagick/modules/coders/psd.so
 %%MODULES%%lib/ImageMagick/modules/coders/pwp.la
 %%MODULES%%lib/ImageMagick/modules/coders/pwp.so
-%%MODULES%%lib/ImageMagick/modules/coders/registry.la
-%%MODULES%%lib/ImageMagick/modules/coders/registry.so
 %%MODULES%%lib/ImageMagick/modules/coders/rgb.la
 %%MODULES%%lib/ImageMagick/modules/coders/rgb.so
 %%MODULES%%lib/ImageMagick/modules/coders/rla.la
@@ -214,6 +216,8 @@ lib/ImageMagick/delegates.mgk
 %%MODULES%%lib/ImageMagick/modules/coders/xbm.so
 %%MODULES%%lib/ImageMagick/modules/coders/xc.la
 %%MODULES%%lib/ImageMagick/modules/coders/xc.so
+%%MODULES%%lib/ImageMagick/modules/coders/xcf.la
+%%MODULES%%lib/ImageMagick/modules/coders/xcf.so
 %%MODULES%%lib/ImageMagick/modules/coders/xpm.la
 %%MODULES%%lib/ImageMagick/modules/coders/xpm.so
 %%MODULES%%lib/ImageMagick/modules/coders/xwd.la
@@ -299,7 +303,6 @@ share/ImageMagick/www/api/blob.html
 share/ImageMagick/www/api/cache.html
 share/ImageMagick/www/api/cache_view.html
 share/ImageMagick/www/api/color.html
-share/ImageMagick/www/api/compress.html
 share/ImageMagick/www/api/constitute.html
 share/ImageMagick/www/api/decorate.html
 share/ImageMagick/www/api/display.html
@@ -308,13 +311,10 @@ 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/mac.html
 share/ImageMagick/www/api/magick.html
 share/ImageMagick/www/api/memory.html
 share/ImageMagick/www/api/monitor.html
 share/ImageMagick/www/api/montage.html
-share/ImageMagick/www/api/nt.html
-share/ImageMagick/www/api/pixel_cache.html
 share/ImageMagick/www/api/quantize.html
 share/ImageMagick/www/api/registry.html
 share/ImageMagick/www/api/segment.html
@@ -323,7 +323,6 @@ share/ImageMagick/www/api/signature.html
 share/ImageMagick/www/api/stream.html
 share/ImageMagick/www/api/transform.html
 share/ImageMagick/www/api/types/ChromaticityInfo.html
-share/ImageMagick/www/api/types/ColorPacket.html
 share/ImageMagick/www/api/types/DrawInfo.html
 share/ImageMagick/www/api/types/Enumerations.html
 share/ImageMagick/www/api/types/ExceptionInfo.html
@@ -336,8 +335,6 @@ share/ImageMagick/www/api/types/PointInfo.html
 share/ImageMagick/www/api/types/ProfileInfo.html
 share/ImageMagick/www/api/types/QuantizeInfo.html
 share/ImageMagick/www/api/types/RectangleInfo.html
-share/ImageMagick/www/api/utility.html
-share/ImageMagick/www/api/vms.html
 share/ImageMagick/www/api/widget.html
 share/ImageMagick/www/api/zoom.html
 share/ImageMagick/www/api.html