My last commit, intended to fix -current, did not do so, and broke

-stable :-( Upgrade the port to the latest to compensate.

The port now installs things in version specific directories, so
add the version number to PLIST_SUB.

Remove USE_REINPLACE -- the port uses PERL anyway.

As usual, the hardest thing to do is to fix the pkg-plist.

5 files changed, 226 insertions, 217 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 4b94ebd95d7b..16c3f5ee5168 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.4.8.3
+PORTVERSION=	5.5.1.1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://imagemagick.sourceforge.net/http/ \
@@ -47,7 +47,7 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 USE_PERL5=	yes
-USE_REINPLACE=	yes
+PLIST_SUB+=	MVERSION=${PORTVERSION:R}
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	# none
@@ -124,16 +124,16 @@ INSTALL_TARGET=	install install-data-html
 
 post-patch:
 # Do not use PTHREAD_LIBS here
-	@${REINPLACE_CMD} -e 's|-lpthread|-lc_r|g ; \
+	@${PERL} -pi -e 's|-lpthread|-lc_r|g ; \
 		 s|^tagnames=|#tagnames=|g ; \
 		 s|lcms/lcms.h|lcms.h|g ; \
 		 s|lcms_lcms_h|lcms_h|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
 		's|pkgdocdir =.*$$|pkgdocdir = ${DOCSDIR}/|g ; \
 		 s| install-data-html||g'
-	@${REINPLACE_CMD} -e 's|lcms/lcms.h|lcms.h|g' ${WRKSRC}/magick/transform.c
-	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c
-	@${REINPLACE_CMD} -e 's|timestamp: %ld|timestamp: %d|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
 
 .include <bsd.port.mk>
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index a910ded597d5..d141673f0586 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1 +1 @@
-MD5 (ImageMagick-5.4.8-3.tar.gz) = fc2770393d04b65504d8b9b1b8637007
+MD5 (ImageMagick-5.5.1-1.tar.gz) = b5de02e4e07e6d8a98b60eb80205e624
diff --git a/graphics/ImageMagick/files/patch-ak b/graphics/ImageMagick/files/patch-ak
deleted file mode 100644
index fd19d77540f0..000000000000
--- a/graphics/ImageMagick/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- magick/Makefile.in.orig	Fri Jun 30 11:05:56 2000
-+++ magick/Makefile.in	Sat Jul 15 10:01:31 2000
-@@ -248,7 +248,7 @@
- 
- 
- # Where modules are installed
--pkgdir = $(libdir)/ImageMagick/modules/coders
-+@WITH_MODULES_TRUE@pkgdir = $(libdir)/ImageMagick/modules/coders
- 
- # Architecture-dependent data files installed with modules
- pkg_DATA = 
diff --git a/graphics/ImageMagick/files/patch-mi b/graphics/ImageMagick/files/patch-mi
index 6cc6540e31c1..7a02f9a6d61a 100644
--- a/graphics/ImageMagick/files/patch-mi
+++ b/graphics/ImageMagick/files/patch-mi
@@ -5,3 +5,15 @@
 -#include <sys/ipc.h>
 -#include <sys/shm.h>
  #include <X11/extensions/XShm.h>
+--- magick/xwindow.c	Thu Oct 17 10:08:02 2002
++++ magick/xwindow.c	Thu Oct 17 10:11:42 2002
+@@ -58,4 +58,11 @@
+ #include "xwindow.h"
+ #if defined(HasX11)
++#if defined(HasSharedMemory)
++#include <machine/param.h>
++typedef unsigned short ushort;	/* needed for sys/ipc.h at the moment */
++#include <sys/types.h>
++#include <sys/ipc.h>
++#include <sys/shm.h>
++#endif
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index fe514f8f8f36..47ba444d13dd 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -15,15 +15,12 @@ include/Magick++/CoderInfo.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++/TypeMetric.h
 include/magick/PreRvIcccm.h
 include/magick/api.h
@@ -31,15 +28,16 @@ include/magick/attribute.h
 include/magick/blob.h
 include/magick/cache.h
 include/magick/cache_view.h
-include/magick/classify.h
 include/magick/command.h
 include/magick/compress.h
 include/magick/delegate.h
+include/magick/deprecate.h
 include/magick/draw.h
 include/magick/error.h
 include/magick/gem.h
 include/magick/image.h
 include/magick/list.h
+include/magick/log.h
 include/magick/magic.h
 include/magick/magick.h
 include/magick/magick_config.h
@@ -48,204 +46,208 @@ include/magick/monitor.h
 include/magick/quantize.h
 include/magick/registry.h
 include/magick/render.h
+include/magick/resource.h
 include/magick/semaphore.h
 include/magick/timer.h
 include/magick/utility.h
 include/magick/version.h
 include/magick/widget.h
 include/magick/xwindow.h
-lib/ImageMagick/delegates.mgk
-%%MODULES%%lib/ImageMagick/modules/coders/art.la
-%%MODULES%%lib/ImageMagick/modules/coders/art.so
-%%MODULES%%lib/ImageMagick/modules/coders/avi.la
-%%MODULES%%lib/ImageMagick/modules/coders/avi.so
-%%MODULES%%lib/ImageMagick/modules/coders/avs.la
-%%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
-%%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
-%%MODULES%%lib/ImageMagick/modules/coders/dpx.so
-%%MODULES%%lib/ImageMagick/modules/coders/ept.la
-%%MODULES%%lib/ImageMagick/modules/coders/ept.so
-%%MODULES%%lib/ImageMagick/modules/coders/fax.la
-%%MODULES%%lib/ImageMagick/modules/coders/fax.so
-%%MODULES%%lib/ImageMagick/modules/coders/fits.la
-%%MODULES%%lib/ImageMagick/modules/coders/fits.so
-%%MODULES%%lib/ImageMagick/modules/coders/fpx.la
-%%MODULES%%lib/ImageMagick/modules/coders/fpx.so
-%%MODULES%%lib/ImageMagick/modules/coders/gif.la
-%%MODULES%%lib/ImageMagick/modules/coders/gif.so
-%%MODULES%%lib/ImageMagick/modules/coders/gradient.la
-%%MODULES%%lib/ImageMagick/modules/coders/gradient.so
-%%MODULES%%lib/ImageMagick/modules/coders/gray.la
-%%MODULES%%lib/ImageMagick/modules/coders/gray.so
-%%MODULES%%lib/ImageMagick/modules/coders/hdf.la
-%%MODULES%%lib/ImageMagick/modules/coders/hdf.so
-%%MODULES%%lib/ImageMagick/modules/coders/histogram.la
-%%MODULES%%lib/ImageMagick/modules/coders/histogram.so
-%%MODULES%%lib/ImageMagick/modules/coders/html.la
-%%MODULES%%lib/ImageMagick/modules/coders/html.so
-%%MODULES%%lib/ImageMagick/modules/coders/icon.la
-%%MODULES%%lib/ImageMagick/modules/coders/icon.so
-%%MODULES%%lib/ImageMagick/modules/coders/jbig.la
-%%MODULES%%lib/ImageMagick/modules/coders/jbig.so
-%%MODULES%%lib/ImageMagick/modules/coders/jp2.la
-%%MODULES%%lib/ImageMagick/modules/coders/jp2.so
-%%MODULES%%lib/ImageMagick/modules/coders/jpeg.la
-%%MODULES%%lib/ImageMagick/modules/coders/jpeg.so
-%%MODULES%%lib/ImageMagick/modules/coders/label.la
-%%MODULES%%lib/ImageMagick/modules/coders/label.so
-%%MODULES%%lib/ImageMagick/modules/coders/logo.la
-%%MODULES%%lib/ImageMagick/modules/coders/logo.so
-%%MODULES%%lib/ImageMagick/modules/coders/map.la
-%%MODULES%%lib/ImageMagick/modules/coders/map.so
-%%MODULES%%lib/ImageMagick/modules/coders/mat.la
-%%MODULES%%lib/ImageMagick/modules/coders/mat.so
-%%MODULES%%lib/ImageMagick/modules/coders/matte.la
-%%MODULES%%lib/ImageMagick/modules/coders/matte.so
-%%MODULES%%lib/ImageMagick/modules/coders/meta.la
-%%MODULES%%lib/ImageMagick/modules/coders/meta.so
-%%MODULES%%lib/ImageMagick/modules/coders/miff.la
-%%MODULES%%lib/ImageMagick/modules/coders/miff.so
-%%MODULES%%lib/ImageMagick/modules/coders/modules.mgk
-%%MODULES%%lib/ImageMagick/modules/coders/mono.la
-%%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/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
-%%MODULES%%lib/ImageMagick/modules/coders/mvg.so
-%%MODULES%%lib/ImageMagick/modules/coders/null.la
-%%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
-%%MODULES%%lib/ImageMagick/modules/coders/pcl.so
-%%MODULES%%lib/ImageMagick/modules/coders/pcx.la
-%%MODULES%%lib/ImageMagick/modules/coders/pcx.so
-%%MODULES%%lib/ImageMagick/modules/coders/pdb.la
-%%MODULES%%lib/ImageMagick/modules/coders/pdb.so
-%%MODULES%%lib/ImageMagick/modules/coders/pdf.la
-%%MODULES%%lib/ImageMagick/modules/coders/pdf.so
-%%MODULES%%lib/ImageMagick/modules/coders/pict.la
-%%MODULES%%lib/ImageMagick/modules/coders/pict.so
-%%MODULES%%lib/ImageMagick/modules/coders/pix.la
-%%MODULES%%lib/ImageMagick/modules/coders/pix.so
-%%MODULES%%lib/ImageMagick/modules/coders/plasma.la
-%%MODULES%%lib/ImageMagick/modules/coders/plasma.so
-%%MODULES%%lib/ImageMagick/modules/coders/png.la
-%%MODULES%%lib/ImageMagick/modules/coders/png.so
-%%MODULES%%lib/ImageMagick/modules/coders/pnm.la
-%%MODULES%%lib/ImageMagick/modules/coders/pnm.so
-%%MODULES%%lib/ImageMagick/modules/coders/preview.la
-%%MODULES%%lib/ImageMagick/modules/coders/preview.so
-%%MODULES%%lib/ImageMagick/modules/coders/ps.la
-%%MODULES%%lib/ImageMagick/modules/coders/ps.so
-%%MODULES%%lib/ImageMagick/modules/coders/ps2.la
-%%MODULES%%lib/ImageMagick/modules/coders/ps2.so
-%%MODULES%%lib/ImageMagick/modules/coders/ps3.la
-%%MODULES%%lib/ImageMagick/modules/coders/ps3.so
-%%MODULES%%lib/ImageMagick/modules/coders/psd.la
-%%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/rgb.la
-%%MODULES%%lib/ImageMagick/modules/coders/rgb.so
-%%MODULES%%lib/ImageMagick/modules/coders/rla.la
-%%MODULES%%lib/ImageMagick/modules/coders/rla.so
-%%MODULES%%lib/ImageMagick/modules/coders/rle.la
-%%MODULES%%lib/ImageMagick/modules/coders/rle.so
-%%MODULES%%lib/ImageMagick/modules/coders/sct.la
-%%MODULES%%lib/ImageMagick/modules/coders/sct.so
-%%MODULES%%lib/ImageMagick/modules/coders/sfw.la
-%%MODULES%%lib/ImageMagick/modules/coders/sfw.so
-%%MODULES%%lib/ImageMagick/modules/coders/sgi.la
-%%MODULES%%lib/ImageMagick/modules/coders/sgi.so
-%%MODULES%%lib/ImageMagick/modules/coders/stegano.la
-%%MODULES%%lib/ImageMagick/modules/coders/stegano.so
-%%MODULES%%lib/ImageMagick/modules/coders/sun.la
-%%MODULES%%lib/ImageMagick/modules/coders/sun.so
-%%MODULES%%lib/ImageMagick/modules/coders/svg.la
-%%MODULES%%lib/ImageMagick/modules/coders/svg.so
-%%MODULES%%lib/ImageMagick/modules/coders/tga.la
-%%MODULES%%lib/ImageMagick/modules/coders/tga.so
-%%MODULES%%lib/ImageMagick/modules/coders/tiff.la
-%%MODULES%%lib/ImageMagick/modules/coders/tiff.so
-%%MODULES%%lib/ImageMagick/modules/coders/tile.la
-%%MODULES%%lib/ImageMagick/modules/coders/tile.so
-%%MODULES%%lib/ImageMagick/modules/coders/tim.la
-%%MODULES%%lib/ImageMagick/modules/coders/tim.so
-%%MODULES%%lib/ImageMagick/modules/coders/ttf.la
-%%MODULES%%lib/ImageMagick/modules/coders/ttf.so
-%%MODULES%%lib/ImageMagick/modules/coders/txt.la
-%%MODULES%%lib/ImageMagick/modules/coders/txt.so
-%%MODULES%%lib/ImageMagick/modules/coders/uil.la
-%%MODULES%%lib/ImageMagick/modules/coders/uil.so
-%%MODULES%%lib/ImageMagick/modules/coders/url.la
-%%MODULES%%lib/ImageMagick/modules/coders/url.so
-%%MODULES%%lib/ImageMagick/modules/coders/uyvy.la
-%%MODULES%%lib/ImageMagick/modules/coders/uyvy.so
-%%MODULES%%lib/ImageMagick/modules/coders/vicar.la
-%%MODULES%%lib/ImageMagick/modules/coders/vicar.so
-%%MODULES%%lib/ImageMagick/modules/coders/vid.la
-%%MODULES%%lib/ImageMagick/modules/coders/vid.so
-%%MODULES%%lib/ImageMagick/modules/coders/viff.la
-%%MODULES%%lib/ImageMagick/modules/coders/viff.so
-%%MODULES%%lib/ImageMagick/modules/coders/wbmp.la
-%%MODULES%%lib/ImageMagick/modules/coders/wbmp.so
-%%MODULES%%lib/ImageMagick/modules/coders/wmf.la
-%%MODULES%%lib/ImageMagick/modules/coders/wmf.so
-%%MODULES%%lib/ImageMagick/modules/coders/wpg.la
-%%MODULES%%lib/ImageMagick/modules/coders/wpg.so
-%%MODULES%%lib/ImageMagick/modules/coders/x.la
-%%MODULES%%lib/ImageMagick/modules/coders/x.so
-%%MODULES%%lib/ImageMagick/modules/coders/xbm.la
-%%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
-%%MODULES%%lib/ImageMagick/modules/coders/xwd.so
-%%MODULES%%lib/ImageMagick/modules/coders/yuv.la
-%%MODULES%%lib/ImageMagick/modules/coders/yuv.so
-lib/ImageMagick/type-ghostscript.mgk
-lib/ImageMagick/type-solaris.mgk
-lib/ImageMagick/type-windows.mgk
-lib/ImageMagick/type.mgk
+lib/ImageMagick-%%MVERSION%%/colors.mgk
+lib/ImageMagick-%%MVERSION%%/delegates.mgk
+lib/ImageMagick-%%MVERSION%%/log.mgk
+lib/ImageMagick-%%MVERSION%%/magic.mgk
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/art.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/art.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/avi.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/avi.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/avs.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/avs.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/bmp.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/bmp.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/caption.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/caption.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/cmyk.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/cmyk.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/cut.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/cut.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/dcm.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/dcm.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/dib.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/dib.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/dps.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/dps.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/dpx.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/dpx.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/ept.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/ept.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/fax.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/fax.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/fits.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/fits.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/fpx.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/fpx.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/gif.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/gif.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/gradient.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/gradient.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/gray.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/gray.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/hdf.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/hdf.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/histogram.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/histogram.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/html.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/html.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/icon.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/icon.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/jbig.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/jbig.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/jp2.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/jp2.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/jpeg.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/jpeg.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/label.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/label.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/logo.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/logo.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/map.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/map.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mat.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mat.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/matte.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/matte.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/meta.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/meta.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/miff.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/miff.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/modules.mgk
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mono.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mono.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mpc.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mpc.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mpeg.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mpeg.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mpr.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mpr.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/msl.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/msl.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mtv.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mtv.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mvg.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/mvg.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/null.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/null.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/otb.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/otb.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/palm.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/palm.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pcd.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pcd.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pcl.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pcl.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pcx.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pcx.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pdb.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pdb.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pdf.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pdf.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pict.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pict.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pix.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pix.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/plasma.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/plasma.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/png.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/png.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pnm.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pnm.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/preview.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/preview.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/ps.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/ps.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/ps2.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/ps2.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/ps3.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/ps3.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/psd.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/psd.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pwp.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/pwp.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/rgb.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/rgb.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/rla.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/rla.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/rle.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/rle.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/sct.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/sct.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/sfw.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/sfw.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/sgi.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/sgi.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/stegano.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/stegano.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/sun.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/sun.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/svg.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/svg.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/tga.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/tga.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/tiff.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/tiff.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/tile.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/tile.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/tim.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/tim.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/ttf.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/ttf.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/txt.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/txt.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/uil.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/uil.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/url.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/url.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/uyvy.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/uyvy.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/vicar.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/vicar.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/vid.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/vid.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/viff.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/viff.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/wbmp.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/wbmp.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/wmf.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/wmf.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/wpg.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/wpg.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/x.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/x.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/xbm.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/xbm.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/xc.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/xc.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/xcf.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/xcf.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/xpm.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/xpm.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/xwd.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/xwd.so
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/yuv.la
+%%MODULES%%lib/ImageMagick-%%MVERSION%%/modules/coders/yuv.so
+lib/ImageMagick-%%MVERSION%%/type-ghostscript.mgk
+lib/ImageMagick-%%MVERSION%%/type-solaris.mgk
+lib/ImageMagick-%%MVERSION%%/type-windows.mgk
+lib/ImageMagick-%%MVERSION%%/type.mgk
 lib/libMagick++.a
 lib/libMagick++.la
 lib/libMagick++.so
-lib/libMagick++.so.5
+lib/libMagick++-%%MVERSION%%.so
 lib/libMagick.a
 lib/libMagick.la
+lib/libMagick-%%MVERSION%%.so
 lib/libMagick.so
-lib/libMagick.so.5
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image/Magick.pm
 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
@@ -253,10 +255,7 @@ 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/QuickStart.txt
-share/ImageMagick/colors.mgk
-share/ImageMagick/magic.mgk
 %%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
@@ -264,13 +263,21 @@ share/ImageMagick/magic.mgk
 %%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_button_120x60.png
+%%PORTDOCS%%share/doc/ImageMagick/images/magick_button_88x31.png
+%%PORTDOCS%%share/doc/ImageMagick/images/magick_icon_16x16.png
+%%PORTDOCS%%share/doc/ImageMagick/images/magick_icon_32x32.png
+%%PORTDOCS%%share/doc/ImageMagick/images/magick_icons.ico
 %%PORTDOCS%%share/doc/ImageMagick/images/magick_small.png
 %%PORTDOCS%%share/doc/ImageMagick/images/mail.png
+%%PORTDOCS%%share/doc/ImageMagick/images/pair.png
+%%PORTDOCS%%share/doc/ImageMagick/images/promote.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/Copyright.html
+%%PORTDOCS%%share/doc/ImageMagick/www/FAQ.html
 %%PORTDOCS%%share/doc/ImageMagick/www/ImageMagick.html
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Blob.html
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Cache.fig
@@ -310,8 +317,9 @@ share/ImageMagick/magic.mgk
 %%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/QuickStart.html
 %%PORTDOCS%%share/doc/ImageMagick/www/animate.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api.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
@@ -338,6 +346,7 @@ share/ImageMagick/magic.mgk
 %%PORTDOCS%%share/doc/ImageMagick/www/api/registry.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/render.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/resize.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/resource.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
@@ -357,7 +366,6 @@ share/ImageMagick/magic.mgk
 %%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.html
 %%PORTDOCS%%share/doc/ImageMagick/www/archives.html
 %%PORTDOCS%%share/doc/ImageMagick/www/cd.html
 %%PORTDOCS%%share/doc/ImageMagick/www/color.html
@@ -393,8 +401,8 @@ share/ImageMagick/magic.mgk
 @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
-%%MODULES%%@dirrm lib/ImageMagick/modules/coders
-%%MODULES%%@dirrm lib/ImageMagick/modules
-@dirrm lib/ImageMagick
+@dirrm lib/ImageMagick-%%MVERSION%%/modules/coders
+@dirrm lib/ImageMagick-%%MVERSION%%/modules
+@dirrm lib/ImageMagick-%%MVERSION%%
 @dirrm include/magick
 @dirrm include/Magick++