5 files changed, 374 insertions, 21 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 2d9c61a93d95..938a3a9edcb6 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,65 +6,74 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.2.7
-PORTREVISION=	2
+PORTVERSION=	5.2.9
 CATEGORIES=	graphics perl5
-MASTER_SITES=	ftp://ftp.simplesystems.org/pub/ImageMagick/ \
+MASTER_SITES=	ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \
 		ftp://ftp.cdrom.com/pub/ImageMagick/ \
 		ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/ \
 		ftp://ftp.fifi.org/pub/ImageMagick/ \
 		ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
-		ftp://ftp.ms.mff.cuni.cz/MIRRORS/ftp.wizards.dupont.com/pub/ImageMagick/ \
-		ftp://ftp.oce.nl/pub/Internet/audio+video/ImageMagick/
+		ftp://ftp.simplesystems.org/pub/ImageMagick/ \
+		${MASTER_SITE_RINGSERVER}
+MASTER_SITE_SUBDIR=	graphics/ImageMagick
 
-MAINTAINER=	jseger@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	bz2.1:${PORTSDIR}/archivers/bzip2 \
+		ltdl.1:${PORTSDIR}/devel/libtool \
 		df.1:${PORTSDIR}/graphics/hdf \
 		jbig.1:${PORTSDIR}/graphics/jbigkit \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		lcms.1:${PORTSDIR}/graphics/lcms \
 		wmf.1:${PORTSDIR}/graphics/libwmf \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		freetype.6:${PORTSDIR}/print/freetype2
+		freetype.6:${PORTSDIR}/print/freetype2 \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 BUILD_DEPENDS=	gs:${PORTSDIR}/print/ghostscript55 \
 		mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \
 		picttoppm:${PORTSDIR}/graphics/netpbm \
 		fig2dev:${PORTSDIR}/print/transfig
-RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript55 \
-		mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \
-		picttoppm:${PORTSDIR}/graphics/netpbm \
-		fig2dev:${PORTSDIR}/print/transfig
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PERL5=	yes
 USE_XLIB=	yes
 USE_LIBTOOL=	yes
+LIBTOOLFLAGS=	# empty
 USE_AUTOCONF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-shared --without-modules \
-		--without-magick-plus-plus \
-		--with-perl=${PERL5} --without-xml
+CONFIGURE_ARGS=	--enable-shared --with-modules \
+		--with-perl=${PERL5}
 INSTALLS_SHLIB=	yes
 
 .if defined(PERL_THREADED) && ${PERL_THREADED} == "true"
 CONFIGURE_ARGS+=	--with-threads
+.else
+CONFIGURE_ARGS+=	--without-threads
 .endif
 
 .if defined(WITH_16BIT_PIXEL)
 CONFIGURE_ARGS+=	--enable-16bit-pixel
+.else
+CONFIGURE_ARGS+=	--disable-16bit-pixel
 .endif
 
 .if defined(HAVE_UNISYS_LICENSE)
 CONFIGURE_ARGS+=	--enable-lzw
 .endif
 
-MAN1=		ImageMagick.1 Magick-config.1 animate.1 combine.1 convert.1 \
-		display.1 identify.1 import.1 mogrify.1 montage.1
+MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.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
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
+pre-patch:
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(top_builddir\)/ltdl/libltdlc.la|\$$\(LIBLTDL\)|g'
+
 .include <bsd.port.mk>
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 0b8f854b5210..03b59a98cb1b 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1 +1 @@
-MD5 (ImageMagick-5.2.7.tar.gz) = df997328774872982b0249f66bc7b8ff
+MD5 (ImageMagick-5.2.9.tar.gz) = a8a414d7579d967d938a1cb03b915118
diff --git a/graphics/ImageMagick/files/patch-al b/graphics/ImageMagick/files/patch-al
index 44d2a4409968..61cd2169371c 100644
--- a/graphics/ImageMagick/files/patch-al
+++ b/graphics/ImageMagick/files/patch-al
@@ -1,6 +1,15 @@
---- configure.in.orig	Fri Dec  1 02:14:22 2000
-+++ configure.in	Tue Dec  5 02:43:13 2000
-@@ -471,10 +471,10 @@
+--- configure.in.orig	Tue Feb 13 02:19:24 2001
++++ configure.in	Sat Feb 17 05:17:02 2001
+@@ -65,7 +65,7 @@
+ #
+ AC_ENABLE_SHARED(no)
+ AC_ENABLE_STATIC(yes)
+-AC_LIBLTDL_CONVENIENCE
++AC_LIBLTDL_INSTALLABLE
+ # Substitute INCLTDL and LIBLTDL in the Makefiles
+ AC_SUBST(INCLTDL)
+ AC_SUBST(LIBLTDL)
+@@ -487,10 +487,10 @@
  LIB_THREAD=''
  if test "$with_threads" != 'no'
  then
@@ -14,3 +23,35 @@
    LIBS="$LIB_THREAD $LIBS"
    CPPFLAGS="$DEF_THREAD $CPPFLAGS"
  fi
+@@ -1021,6 +1021,22 @@
+     AC_MSG_RESULT()
+     failed=0;
+     passed=0;
++
++    OLD_LDFLAGS="$LDFLAGS"
++    OLD_CPPFLAGS="$CPPFLAGS"
++    if test -d "$builddir/libxml/include"
++    then
++       :
++    else
++       xml_config=''
++       AC_CHECK_PROGS(xml_config,xml2-config,)dnl
++       if test -n "$xml_config"
++       then
++          LDFLAGS=-L`$xml_config --prefix`/lib" $LDFLAGS" 2> /dev/null
++          CPPFLAGS=`$xml_config --cflags`" $CPPFLAGS" 2> /dev/null
++       fi
++    fi
++
+     AC_CHECK_HEADER(libxml/parser.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
+     AC_CHECK_LIB(xml2,xmlParseExternalEntity,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+     AC_MSG_CHECKING(if XML package is complete)
+@@ -1030,6 +1046,8 @@
+     then
+ 	AC_MSG_RESULT(no -- some components failed test)
+         have_xml='no (failed tests)'
++        CPPFLAGS="$OLD_CPPFLAGS"
++        LDFLAGS="$OLD_LDFLAGS"
+     else
+ 	LIB_XML='-lxml2'
+ 	LIBS="$LIB_XML $LIBS"
diff --git a/graphics/ImageMagick/files/patch-am b/graphics/ImageMagick/files/patch-am
new file mode 100644
index 000000000000..09f25edc5025
--- /dev/null
+++ b/graphics/ImageMagick/files/patch-am
@@ -0,0 +1,20 @@
+--- aclocal.m4.orig	Mon Dec 11 06:02:45 2000
++++ aclocal.m4	Sat Feb 17 05:30:40 2001
+@@ -1474,7 +1474,7 @@
+ deplibs_check_method="$deplibs_check_method" \
+ file_magic_cmd="$file_magic_cmd" \
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
+---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
++--build="$build" $ac_aux_dir/ltmain.sh $host \
+ || AC_MSG_ERROR([libtool tag configuration failed])
+ CC="$lt_save_CC"
+ CFLAGS="$lt_save_CFLAGS"
+@@ -1508,7 +1508,7 @@
+ deplibs_check_method="$deplibs_check_method" \
+ file_magic_cmd="$file_magic_cmd" \
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
+---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
++--build="$build" $ac_aux_dir/ltmain.sh $host \
+ || AC_MSG_ERROR([libtool tag configuration failed])
+ CC="$lt_save_CC"
+ CFLAGS="$lt_save_CFLAGS"
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index c3fc0e82bb30..37dffbd089f5 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -1,3 +1,4 @@
+bin/Magick++-config
 bin/Magick-config
 bin/animate
 bin/cgimagick
@@ -9,6 +10,21 @@ bin/import
 bin/iptcutil
 bin/mogrify
 bin/montage
+include/Magick++.h
+include/Magick++/Blob.h
+include/Magick++/Coder.h
+include/Magick++/Color.h
+include/Magick++/Drawable.h
+include/Magick++/Exception.h
+include/Magick++/Functions.h
+include/Magick++/Geometry.h
+include/Magick++/Image.h
+include/Magick++/Include.h
+include/Magick++/Montage.h
+include/Magick++/Options.h
+include/Magick++/Pixels.h
+include/Magick++/STL.h
+include/Magick++/Thread.h
 include/magick/PreRvIcccm.h
 include/magick/api.h
 include/magick/attributes.h
@@ -32,7 +48,174 @@ include/magick/utility.h
 include/magick/version.h
 include/magick/widget.h
 include/magick/xwindows.h
+lib/ImageMagick/delegates.mgk
+lib/ImageMagick/modules/coders/8bim.la
+lib/ImageMagick/modules/coders/8bim.so
+lib/ImageMagick/modules/coders/art.la
+lib/ImageMagick/modules/coders/art.so
+lib/ImageMagick/modules/coders/avi.la
+lib/ImageMagick/modules/coders/avi.so
+lib/ImageMagick/modules/coders/avs.la
+lib/ImageMagick/modules/coders/avs.so
+lib/ImageMagick/modules/coders/bmp.la
+lib/ImageMagick/modules/coders/bmp.so
+lib/ImageMagick/modules/coders/cmyk.la
+lib/ImageMagick/modules/coders/cmyk.so
+lib/ImageMagick/modules/coders/cut.la
+lib/ImageMagick/modules/coders/cut.so
+lib/ImageMagick/modules/coders/dcm.la
+lib/ImageMagick/modules/coders/dcm.so
+lib/ImageMagick/modules/coders/dps.la
+lib/ImageMagick/modules/coders/dps.so
+lib/ImageMagick/modules/coders/ept.la
+lib/ImageMagick/modules/coders/ept.so
+lib/ImageMagick/modules/coders/fax.la
+lib/ImageMagick/modules/coders/fax.so
+lib/ImageMagick/modules/coders/fits.la
+lib/ImageMagick/modules/coders/fits.so
+lib/ImageMagick/modules/coders/fpx.la
+lib/ImageMagick/modules/coders/fpx.so
+lib/ImageMagick/modules/coders/gif.la
+lib/ImageMagick/modules/coders/gif.so
+lib/ImageMagick/modules/coders/gradient.la
+lib/ImageMagick/modules/coders/gradient.so
+lib/ImageMagick/modules/coders/gray.la
+lib/ImageMagick/modules/coders/gray.so
+lib/ImageMagick/modules/coders/hdf.la
+lib/ImageMagick/modules/coders/hdf.so
+lib/ImageMagick/modules/coders/histogram.la
+lib/ImageMagick/modules/coders/histogram.so
+lib/ImageMagick/modules/coders/html.la
+lib/ImageMagick/modules/coders/html.so
+lib/ImageMagick/modules/coders/icm.la
+lib/ImageMagick/modules/coders/icm.so
+lib/ImageMagick/modules/coders/icon.la
+lib/ImageMagick/modules/coders/icon.so
+lib/ImageMagick/modules/coders/iptc.la
+lib/ImageMagick/modules/coders/iptc.so
+lib/ImageMagick/modules/coders/jbig.la
+lib/ImageMagick/modules/coders/jbig.so
+lib/ImageMagick/modules/coders/jpeg.la
+lib/ImageMagick/modules/coders/jpeg.so
+lib/ImageMagick/modules/coders/label.la
+lib/ImageMagick/modules/coders/label.so
+lib/ImageMagick/modules/coders/logo.la
+lib/ImageMagick/modules/coders/logo.so
+lib/ImageMagick/modules/coders/map.la
+lib/ImageMagick/modules/coders/map.so
+lib/ImageMagick/modules/coders/matte.la
+lib/ImageMagick/modules/coders/matte.so
+lib/ImageMagick/modules/coders/miff.la
+lib/ImageMagick/modules/coders/miff.so
+lib/ImageMagick/modules/coders/modules.mgk
+lib/ImageMagick/modules/coders/mono.la
+lib/ImageMagick/modules/coders/mono.so
+lib/ImageMagick/modules/coders/mpc.la
+lib/ImageMagick/modules/coders/mpc.so
+lib/ImageMagick/modules/coders/mtv.la
+lib/ImageMagick/modules/coders/mtv.so
+lib/ImageMagick/modules/coders/mvg.la
+lib/ImageMagick/modules/coders/mvg.so
+lib/ImageMagick/modules/coders/null.la
+lib/ImageMagick/modules/coders/null.so
+lib/ImageMagick/modules/coders/pcd.la
+lib/ImageMagick/modules/coders/pcd.so
+lib/ImageMagick/modules/coders/pcl.la
+lib/ImageMagick/modules/coders/pcl.so
+lib/ImageMagick/modules/coders/pcx.la
+lib/ImageMagick/modules/coders/pcx.so
+lib/ImageMagick/modules/coders/pdb.la
+lib/ImageMagick/modules/coders/pdb.so
+lib/ImageMagick/modules/coders/pdf.la
+lib/ImageMagick/modules/coders/pdf.so
+lib/ImageMagick/modules/coders/pict.la
+lib/ImageMagick/modules/coders/pict.so
+lib/ImageMagick/modules/coders/pix.la
+lib/ImageMagick/modules/coders/pix.so
+lib/ImageMagick/modules/coders/plasma.la
+lib/ImageMagick/modules/coders/plasma.so
+lib/ImageMagick/modules/coders/png.la
+lib/ImageMagick/modules/coders/png.so
+lib/ImageMagick/modules/coders/pnm.la
+lib/ImageMagick/modules/coders/pnm.so
+lib/ImageMagick/modules/coders/preview.la
+lib/ImageMagick/modules/coders/preview.so
+lib/ImageMagick/modules/coders/ps.la
+lib/ImageMagick/modules/coders/ps.so
+lib/ImageMagick/modules/coders/ps2.la
+lib/ImageMagick/modules/coders/ps2.so
+lib/ImageMagick/modules/coders/ps3.la
+lib/ImageMagick/modules/coders/ps3.so
+lib/ImageMagick/modules/coders/psd.la
+lib/ImageMagick/modules/coders/psd.so
+lib/ImageMagick/modules/coders/pwp.la
+lib/ImageMagick/modules/coders/pwp.so
+lib/ImageMagick/modules/coders/rgb.la
+lib/ImageMagick/modules/coders/rgb.so
+lib/ImageMagick/modules/coders/rla.la
+lib/ImageMagick/modules/coders/rla.so
+lib/ImageMagick/modules/coders/rle.la
+lib/ImageMagick/modules/coders/rle.so
+lib/ImageMagick/modules/coders/sct.la
+lib/ImageMagick/modules/coders/sct.so
+lib/ImageMagick/modules/coders/sfw.la
+lib/ImageMagick/modules/coders/sfw.so
+lib/ImageMagick/modules/coders/sgi.la
+lib/ImageMagick/modules/coders/sgi.so
+lib/ImageMagick/modules/coders/stegano.la
+lib/ImageMagick/modules/coders/stegano.so
+lib/ImageMagick/modules/coders/sun.la
+lib/ImageMagick/modules/coders/sun.so
+lib/ImageMagick/modules/coders/svg.la
+lib/ImageMagick/modules/coders/svg.so
+lib/ImageMagick/modules/coders/tga.la
+lib/ImageMagick/modules/coders/tga.so
+lib/ImageMagick/modules/coders/tiff.la
+lib/ImageMagick/modules/coders/tiff.so
+lib/ImageMagick/modules/coders/tile.la
+lib/ImageMagick/modules/coders/tile.so
+lib/ImageMagick/modules/coders/tim.la
+lib/ImageMagick/modules/coders/tim.so
+lib/ImageMagick/modules/coders/ttf.la
+lib/ImageMagick/modules/coders/ttf.so
+lib/ImageMagick/modules/coders/txt.la
+lib/ImageMagick/modules/coders/txt.so
+lib/ImageMagick/modules/coders/uil.la
+lib/ImageMagick/modules/coders/uil.so
+lib/ImageMagick/modules/coders/url.la
+lib/ImageMagick/modules/coders/url.so
+lib/ImageMagick/modules/coders/uyvy.la
+lib/ImageMagick/modules/coders/uyvy.so
+lib/ImageMagick/modules/coders/vicar.la
+lib/ImageMagick/modules/coders/vicar.so
+lib/ImageMagick/modules/coders/vid.la
+lib/ImageMagick/modules/coders/vid.so
+lib/ImageMagick/modules/coders/viff.la
+lib/ImageMagick/modules/coders/viff.so
+lib/ImageMagick/modules/coders/wbmp.la
+lib/ImageMagick/modules/coders/wbmp.so
+lib/ImageMagick/modules/coders/wmf.la
+lib/ImageMagick/modules/coders/wmf.so
+lib/ImageMagick/modules/coders/wpg.la
+lib/ImageMagick/modules/coders/wpg.so
+lib/ImageMagick/modules/coders/x.la
+lib/ImageMagick/modules/coders/x.so
+lib/ImageMagick/modules/coders/xbm.la
+lib/ImageMagick/modules/coders/xbm.so
+lib/ImageMagick/modules/coders/xc.la
+lib/ImageMagick/modules/coders/xc.so
+lib/ImageMagick/modules/coders/xpm.la
+lib/ImageMagick/modules/coders/xpm.so
+lib/ImageMagick/modules/coders/xwd.la
+lib/ImageMagick/modules/coders/xwd.so
+lib/ImageMagick/modules/coders/yuv.la
+lib/ImageMagick/modules/coders/yuv.so
+lib/libMagick++.a
+lib/libMagick++.la
+lib/libMagick++.so
+lib/libMagick++.so.5
 lib/libMagick.a
+lib/libMagick.la
 lib/libMagick.so
 lib/libMagick.so.5
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image/Magick.pm
@@ -40,10 +223,110 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/.packlist
 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/Copyright.txt
+share/ImageMagick/ImageMagick.html
+share/ImageMagick/QuickStart.txt
+share/ImageMagick/images/authentica.jpg
+share/ImageMagick/images/ball.png
+share/ImageMagick/images/corbis.png
+share/ImageMagick/images/digital-applications.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/Magick.html
+share/ImageMagick/www/animate.html
+share/ImageMagick/www/api/animate.html
+share/ImageMagick/www/api/annotate.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/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/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/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/pixels.html
+share/ImageMagick/www/api/quantize.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/AnnotateInfo.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
+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/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/combine.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/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
+@dirrm share/ImageMagick/images
 @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 lib/ImageMagick/modules/coders
+@dirrm lib/ImageMagick/modules
+@dirrm lib/ImageMagick
 @dirrm include/magick
+@dirrm include/Magick++