Update to 5.4.3.9. Obey DOCSDIR and NOPORTDOCS. Fix some warnings --

time_t is rather int than long.

3 files changed, 146 insertions, 146 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 58c066b9e2a5..b0a85588e918 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.4.3.6
+PORTVERSION=	5.4.3.9
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://imagemagick.sourceforge.net/http/ \
 		ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \
@@ -51,7 +51,10 @@ USE_GMAKE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shared --with-perl=${PERL5} \
-		--without-gslib --without-hdf --without-jp2
+		--without-gslib --without-jp2
+.ifndef WITH_HDF
+CONFIGURE_ARGS+=--without-hdf 
+.endif
 INSTALLS_SHLIB=	yes
 
 MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.1 \
@@ -95,7 +98,7 @@ PLIST_SUB+=	MODULES='@comment '
 .endif
 
 .if defined(WITHOUT_X11)
-PKGNAMESUFFIX=	-nox11
+PKGNAMESUFFIX+=	-nox11
 BUILD_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu-nox11
 RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu-nox11
 CONFIGURE_ARGS+=	--without-x --without-mpeg2 --without-wmf
@@ -120,5 +123,15 @@ pre-patch:
 		'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
+	@${PERL} -pi -e 's|timestamp: %ld|timestamp: %d|g' \
+		${WRKSRC}/magick/xwindow.c
+	@${PERL} -pi -e 's|pkgdocdir = (.+)|pkgdocdir = ${DOCSDIR}/|' \
+		${WRKSRC}/Makefile.in
+
+.if defined(NOPORTDOCS)
+pre-install:
+# Don't install the HTML documentation...
+	${TOUCH} ${WRKSRC}/install-data-html
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 353b907a9bb9..ce5924405214 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1 +1 @@
-MD5 (ImageMagick-5.4.3-6.tar.gz) = 11606794a9fd535b4b6a581f7a741537
+MD5 (ImageMagick-5.4.3-9.tar.gz) = d7efc18d9510f5b1b2b767dff487cc0a
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 1e51531cf540..3b6c9ca8f957 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -41,7 +41,6 @@ include/magick/image.h
 include/magick/list.h
 include/magick/magic.h
 include/magick/magick.h
-include/magick/memory.h
 include/magick/magick_config.h
 include/magick/module.h
 include/magick/monitor.h
@@ -251,151 +250,139 @@ 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/Copyright.txt
-share/ImageMagick/ImageMagick.html
 share/ImageMagick/QuickStart.txt
 share/ImageMagick/colors.mgk
-share/ImageMagick/images/appligent.jpg
-share/ImageMagick/images/authentica.jpg
-share/ImageMagick/images/ball.png
-share/ImageMagick/images/corbis.png
-share/ImageMagick/images/examples.jpg
-share/ImageMagick/images/home.png
-share/ImageMagick/images/logo.png
-share/ImageMagick/images/magick.png
-share/ImageMagick/images/magick_small.png
-share/ImageMagick/images/mail.png
-share/ImageMagick/images/right_triangle.png
-share/ImageMagick/images/right_triangle_option.png
-share/ImageMagick/images/screen.png
 share/ImageMagick/magic.mgk
-share/ImageMagick/www/Changelog.html
-share/ImageMagick/www/ImageMagick.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++/CoderInfo.html
-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++/TypeMetric.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
-share/ImageMagick/www/api/annotate.html
-share/ImageMagick/www/api/attribute.html
-share/ImageMagick/www/api/attributes.html
-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/colors.html
-share/ImageMagick/www/api/compress.html
-share/ImageMagick/www/api/constitute.html
-share/ImageMagick/www/api/decorate.html
-share/ImageMagick/www/api/delegates.html
-share/ImageMagick/www/api/display.html
-share/ImageMagick/www/api/draw.html
-share/ImageMagick/www/api/effect.html
-share/ImageMagick/www/api/effects.html
-share/ImageMagick/www/api/enhance.html
-share/ImageMagick/www/api/error.html
-share/ImageMagick/www/api/gems.html
-share/ImageMagick/www/api/image.html
-share/ImageMagick/www/api/list.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/quantize.html
-share/ImageMagick/www/api/registry.html
-share/ImageMagick/www/api/pixel_cache.html
-share/ImageMagick/www/api/pixels.html
-share/ImageMagick/www/api/segment.html
-share/ImageMagick/www/api/shear.html
-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/DrawInfo.html
-share/ImageMagick/www/api/types/Enumerations.html
-share/ImageMagick/www/api/types/ExceptionInfo.html
-share/ImageMagick/www/api/types/Image.html
-share/ImageMagick/www/api/types/ImageAttribute.html
-share/ImageMagick/www/api/types/ImageInfo.html
-share/ImageMagick/www/api/types/MagickInfo.html
-share/ImageMagick/www/api/types/PixelPacket.html
-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/xwindows.html
-share/ImageMagick/www/api/zoom.html
-share/ImageMagick/www/api.html
-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
-share/ImageMagick/www/formats.html
-share/ImageMagick/www/help.html
-share/ImageMagick/www/identify.html
-share/ImageMagick/www/import.html
-share/ImageMagick/www/install.html
-share/ImageMagick/www/magick-list.html
-share/ImageMagick/www/magick.css
-share/ImageMagick/www/miff.html
-share/ImageMagick/www/mogrify.html
-share/ImageMagick/www/montage.html
-share/ImageMagick/www/new.html
-share/ImageMagick/www/perl.html
-share/ImageMagick/www/quantize.html
-share/ImageMagick/www/smile.c
-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
+%%PORTDOCS%%share/doc/ImageMagick/ImageMagick.html
+%%PORTDOCS%%share/doc/ImageMagick/images/appligent.jpg
+%%PORTDOCS%%share/doc/ImageMagick/images/authentica.jpg
+%%PORTDOCS%%share/doc/ImageMagick/images/ball.png
+%%PORTDOCS%%share/doc/ImageMagick/images/corbis.png
+%%PORTDOCS%%share/doc/ImageMagick/images/examples.jpg
+%%PORTDOCS%%share/doc/ImageMagick/images/home.png
+%%PORTDOCS%%share/doc/ImageMagick/images/logo.png
+%%PORTDOCS%%share/doc/ImageMagick/images/magick.png
+%%PORTDOCS%%share/doc/ImageMagick/images/magick_small.png
+%%PORTDOCS%%share/doc/ImageMagick/images/mail.png
+%%PORTDOCS%%share/doc/ImageMagick/images/right_triangle.png
+%%PORTDOCS%%share/doc/ImageMagick/images/right_triangle_option.png
+%%PORTDOCS%%share/doc/ImageMagick/images/screen.png
+%%PORTDOCS%%share/doc/ImageMagick/www/Changelog.html
+%%PORTDOCS%%share/doc/ImageMagick/www/ImageMagick.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Blob.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Cache.fig
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Cache.png
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Cache.svg
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/CoderInfo.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Color.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Documentation.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Drawable.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Drawable_example_1.png
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Enumerations.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Exception.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/FormatCharacters.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Future.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Geometry.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Image.fig
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Image.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Image.png
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Image.svg
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/ImageDesign.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/ImageMagick.png
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Install.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Magick++.png
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Montage.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/NEWS.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/PixelPacket.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Pixels.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/README.txt
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/STL.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/TypeMetric.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/index.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/montage-sample-framed.jpg
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/right_triangle.png
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-framed.fig
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-framed.jpg
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-plain.fig
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-plain.jpg
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/thumbnail-sample-framed.jpg
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick++/thumbnail-sample-plain.jpg
+%%PORTDOCS%%share/doc/ImageMagick/www/Magick.html
+%%PORTDOCS%%share/doc/ImageMagick/www/animate.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/animate.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/annotate.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/attribute.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/blob.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/cache.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/cache_view.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/color.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/constitute.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/decorate.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/display.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/draw.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/effect.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/enhance.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/error.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/image.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/list.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/magick.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/memory.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/monitor.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/montage.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/quantize.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/registry.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/segment.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/shear.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/signature.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/stream.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/transform.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/types/ChromaticityInfo.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/types/DrawInfo.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/types/Enumerations.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/types/ExceptionInfo.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/types/Image.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/types/ImageAttribute.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/types/ImageInfo.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/types/MagickInfo.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/types/PixelPacket.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/types/PointInfo.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/types/ProfileInfo.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/types/QuantizeInfo.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/types/RectangleInfo.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/widget.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/zoom.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api.html
+%%PORTDOCS%%share/doc/ImageMagick/www/archives.html
+%%PORTDOCS%%share/doc/ImageMagick/www/cd.html
+%%PORTDOCS%%share/doc/ImageMagick/www/color.html
+%%PORTDOCS%%share/doc/ImageMagick/www/composite.html
+%%PORTDOCS%%share/doc/ImageMagick/www/conjure.html
+%%PORTDOCS%%share/doc/ImageMagick/www/convert.html
+%%PORTDOCS%%share/doc/ImageMagick/www/cvs.html
+%%PORTDOCS%%share/doc/ImageMagick/www/display.html
+%%PORTDOCS%%share/doc/ImageMagick/www/formats.html
+%%PORTDOCS%%share/doc/ImageMagick/www/help.html
+%%PORTDOCS%%share/doc/ImageMagick/www/identify.html
+%%PORTDOCS%%share/doc/ImageMagick/www/import.html
+%%PORTDOCS%%share/doc/ImageMagick/www/install.html
+%%PORTDOCS%%share/doc/ImageMagick/www/magick-list.html
+%%PORTDOCS%%share/doc/ImageMagick/www/magick.css
+%%PORTDOCS%%share/doc/ImageMagick/www/miff.html
+%%PORTDOCS%%share/doc/ImageMagick/www/mogrify.html
+%%PORTDOCS%%share/doc/ImageMagick/www/montage.html
+%%PORTDOCS%%share/doc/ImageMagick/www/new.html
+%%PORTDOCS%%share/doc/ImageMagick/www/perl.html
+%%PORTDOCS%%share/doc/ImageMagick/www/quantize.html
+%%PORTDOCS%%share/doc/ImageMagick/www/smile.c
+%%PORTDOCS%%share/doc/ImageMagick/www/sponsor.html
+%%PORTDOCS%%share/doc/ImageMagick/www/tools.html
+%%PORTDOCS%%@dirrm share/doc/ImageMagick/www/api/types
+%%PORTDOCS%%@dirrm share/doc/ImageMagick/www/api
+%%PORTDOCS%%@dirrm share/doc/ImageMagick/www/Magick++
+%%PORTDOCS%%@dirrm share/doc/ImageMagick/www
+%%PORTDOCS%%@dirrm share/doc/ImageMagick/images
+%%PORTDOCS%%@dirrm share/doc/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