Update to 5.4.4.5

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

4 files changed, 28 insertions, 30 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 17100e49e032..1afc54105652 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.4.4
+PORTVERSION=	5.4.4.5
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://imagemagick.sourceforge.net/http/ \
 		ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \
@@ -26,30 +26,34 @@ MASTER_SITES=	http://imagemagick.sourceforge.net/http/ \
 		ftp://ftp.fifi.org/pub/%SUBDIR%/ \
 		ftp://ftp.simplesystems.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
-LIB_DEPENDS=	fpx:${PORTSDIR}/graphics/libfpx \
-		jbig:${PORTSDIR}/graphics/jbigkit \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		lcms:${PORTSDIR}/graphics/lcms \
-		png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	fpx.1:${PORTSDIR}/graphics/libfpx \
+		jbig.1:${PORTSDIR}/graphics/jbigkit \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		lcms.1:${PORTSDIR}/graphics/lcms \
+		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		freetype:${PORTSDIR}/print/freetype2 \
-		xml2:${PORTSDIR}/textproc/libxml2
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 .if !exists(/usr/bin/bzip2)
-LIB_DEPENDS+=	bz2:${PORTSDIR}/archivers/bzip2
+LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+
 USE_GCC295=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFLAGS=	# none
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shared --with-perl=${PERL5} \
-		--without-gslib --without-jp2
+		--without-gslib --without-hdf --without-jp2
 INSTALLS_SHLIB=	yes
 
 MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.1 \
@@ -92,12 +96,6 @@ PLIST_SUB+=	MODULES=''
 PLIST_SUB+=	MODULES='@comment '
 .endif
 
-.if defined(WITH_HDF)
-CONFIGURE_ARGS+=	--with-hdf 
-.else
-CONFIGURE_ARGS+=	--without-hdf 
-.endif
-
 .if defined(WITHOUT_X11)
 PKGNAMESUFFIX+=	-nox11
 BUILD_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu-nox11
@@ -105,7 +103,7 @@ RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu-nox11
 CONFIGURE_ARGS+=	--without-x --without-mpeg2 --without-wmf
 PLIST_SUB+=	X11='@comment '
 .else
-LIB_DEPENDS+=	mpeg2:${PORTSDIR}/graphics/libmpeg2 \
+LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/graphics/libmpeg2 \
 		wmf.2:${PORTSDIR}/graphics/libwmf
 BUILD_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu
 RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu
@@ -126,7 +124,7 @@ pre-patch:
 		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 \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
 		's|top_builddir\)/ltdl/libltdlc.la|LIBLTDL\)|g ; \
 		 s|pkgdocdir =.*$$|pkgdocdir = ${DOCSDIR}/|g ; \
 		 s| install-data-html||g'
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 8975fc326e04..2a1035fff629 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1 +1 @@
-MD5 (ImageMagick-5.4.4.tar.gz) = 2d9d956f04ebd0f091a12b9470d68b73
+MD5 (ImageMagick-5.4.4-5.tar.gz) = 210158dddeb73d26dec21220ef57ad7c
diff --git a/graphics/ImageMagick/files/patch-an b/graphics/ImageMagick/files/patch-an
deleted file mode 100644
index 1ec3082acd8e..000000000000
--- a/graphics/ImageMagick/files/patch-an
+++ /dev/null
@@ -1,10 +0,0 @@
---- ltmain.sh.orig	Tue Jan 29 22:40:33 2002
-+++ ltmain.sh	Mon Mar  4 18:18:00 2002
-@@ -1140,6 +1140,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
diff --git a/graphics/ImageMagick/files/patch-configure b/graphics/ImageMagick/files/patch-configure
new file mode 100644
index 000000000000..be4b07896ab8
--- /dev/null
+++ b/graphics/ImageMagick/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Apr  6 04:06:38 2002
++++ configure	Fri May  3 04:10:56 2002
+@@ -14424,6 +14424,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'