--- a/components/imagemagick/Makefile	Tue Apr 09 15:40:14 2013 -0700
+++ b/components/imagemagick/Makefile	Tue Apr 09 22:03:20 2013 -0700
@@ -20,23 +20,20 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
-# The archive untars to directory without the '-2' suffix, so
-# COMPONENT_SUBVERSION had to be introduced
-#
 COMPONENT_NAME=			ImageMagick
-COMPONENT_VERSION=		6.3.4
-COMPONENT_SUBVERSION=	2
+COMPONENT_VERSION=		6.8.3
+COMPONENT_SUBVERSION=		5
 HUMAN_VERSION=			$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
 COMPONENT_PROJECT_URL=		http://www.imagemagick.org/
 COMPONENT_SRC=			$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=		$(COMPONENT_SRC)-$(COMPONENT_SUBVERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:25fb373ac3889e81555e5b48c8a22a3deabeac8b6129387cec9dc7e13804914e
+    sha256:daead80170bc6d44cf6a54b4817446cbb7211b8ee445532b64033af190265fe3
 COMPONENT_ARCHIVE_URL=	http://image_magick.veidrodis.com/image_magick/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/imagemagick
 
@@ -51,21 +48,23 @@
 #
 IPS_COMPONENT_VERSION=	$(COMPONENT_VERSION).$(COMPONENT_SUBVERSION)
 
-# The archive contains pre-generated magick-config.h header, which is later on
-# being used and the build fails.  However, we want to use the header generated
-# by configure from BUILD_DIR_32 / BUILD_DIR_64 directory, so the pre-generated
-# header file needs to be deleted.
-#
-COMPONENT_PREP_ACTION= (cd $(@D) ; $(RM) magick/magick-config.h)
+COMPONENT_POST_UNPACK_ACTION= ( $(MV) $(COMPONENT_SRC)-$(COMPONENT_SUBVERSION) \
+    $(COMPONENT_SRC))
 
 # To get the Perl modules built it is necessary to copy the PerlMagick directory
 # to the build directory
 #
-COMPONENT_PRE_CONFIGURE_ACTION= ($(CP) -R $(SOURCE_DIR)/PerlMagick $(@D); cd $(SOURCE_DIR); $(AUTORECONF) -f)
+COMPONENT_PRE_CONFIGURE_ACTION= ($(CP) -R $(SOURCE_DIR)/PerlMagick $(@D))
+
+LIBS += -lsocket -lnsl
+CONFIGURE_ENV += LIBS="$(LIBS)"
 
 # Show name of "error tag" as part of the warning
 #
-CFLAGS+= -errtags
+CFLAGS += -errtags=yes
+# To remove the complier complaints about __restrict keyword,
+# -D_magickcore_restrict should be used.
+CFLAGS += -xc99=%all -D_magickcore_restrict=
 
 # Needed to generate a decent RUNPATH for Magick.so
 #
@@ -78,6 +77,12 @@
 CONFIGURE_OPTIONS+= --enable-shared=yes
 CONFIGURE_OPTIONS+= --enable-static=no
 CONFIGURE_OPTIONS+= --without-gvc
+# Using option 'with-fontconfig=no' so that the fonts/fonts path specified in
+# configuration file 'type-ghostscript.xml' is being used.
+CONFIGURE_OPTIONS+= --with-fontconfig=no
+# Configure option 'with-gs-font-dir' is required because some build systems might 
+# not have ghostscript fonts installed.
+CONFIGURE_OPTIONS+= --with-gs-font-dir="/usr/share/ghostscript/fonts"
 CONFIGURE_OPTIONS+= --x-libraries=$(CONFIGURE_LIBDIR.$(BITS)) 
 CONFIGURE_OPTIONS.32+= --with-perl=$(PERL)
 CONFIGURE_OPTIONS.32+= --with-perl-options="INSTALLDIRS=vendor"
@@ -87,7 +92,16 @@
 #
 build:		$(BUILD_32_and_64)
 
+# Remove build machine runpath from libMagick++-6.Q16.so.1.0.0
 install:	$(INSTALL_32_and_64)
+	/usr/bin/elfedit -e 'dyn:delete RUNPATH' \
+	    $(PROTO_DIR)/usr/lib/libMagick++-6.Q16.so.1.0.0; \
+	/usr/bin/elfedit -e 'dyn:delete RUNPATH' \
+	    $(PROTO_DIR)/usr/lib/$(MACH64)/libMagick++-6.Q16.so.1.0.0; \
+	/usr/bin/elfedit -e 'dyn:delete RPATH' \
+	    $(PROTO_DIR)/usr/lib/libMagick++-6.Q16.so.1.0.0; \
+	/usr/bin/elfedit -e 'dyn:delete RPATH' \
+	    $(PROTO_DIR)/usr/lib/$(MACH64)/libMagick++-6.Q16.so.1.0.0
 
 # ImageMagick tests have hard-coded absolute paths inside, so essentially they
 # can be run only after ImageMagick is actually installed and this is not 

--- a/components/imagemagick/imagemagick.p5m	Tue Apr 09 15:40:14 2013 -0700
+++ b/components/imagemagick/imagemagick.p5m	Tue Apr 09 22:03:20 2013 -0700
@@ -51,140 +51,148 @@
 file path=usr/bin/mogrify
 file path=usr/bin/montage
 file path=usr/bin/stream
-file path=usr/include/Magick++.h
-file path=usr/include/Magick++/Blob.h
-file path=usr/include/Magick++/CoderInfo.h
-file path=usr/include/Magick++/Color.h
-file path=usr/include/Magick++/Drawable.h
-file path=usr/include/Magick++/Exception.h
-file path=usr/include/Magick++/Geometry.h
-file path=usr/include/Magick++/Image.h
-file path=usr/include/Magick++/Include.h
-file path=usr/include/Magick++/Montage.h
-file path=usr/include/Magick++/Pixels.h
-file path=usr/include/Magick++/STL.h
-file path=usr/include/Magick++/TypeMetric.h
-file path=usr/include/magick/ImageMagick.h
-file path=usr/include/magick/MagickCore.h
-file path=usr/include/magick/PreRvIcccm.h
-file path=usr/include/magick/animate.h
-file path=usr/include/magick/annotate.h
-file path=usr/include/magick/api.h
-file path=usr/include/magick/blob.h
-file path=usr/include/magick/cache-view.h
-file path=usr/include/magick/cache.h
-file path=usr/include/magick/client.h
-file path=usr/include/magick/coder.h
-file path=usr/include/magick/color.h
-file path=usr/include/magick/colorspace.h
-file path=usr/include/magick/compare.h
-file path=usr/include/magick/composite.h
-file path=usr/include/magick/compress.h
-file path=usr/include/magick/configure.h
-file path=usr/include/magick/constitute.h
-file path=usr/include/magick/decorate.h
-file path=usr/include/magick/delegate.h
-file path=usr/include/magick/deprecate.h
-file path=usr/include/magick/display.h
-file path=usr/include/magick/draw.h
-file path=usr/include/magick/effect.h
-file path=usr/include/magick/enhance.h
-file path=usr/include/magick/exception.h
-file path=usr/include/magick/fx.h
-file path=usr/include/magick/gem.h
-file path=usr/include/magick/geometry.h
-file path=usr/include/magick/hashmap.h
-file path=usr/include/magick/identify.h
-file path=usr/include/magick/image.h
-file path=usr/include/magick/layer.h
-file path=usr/include/magick/list.h
-file path=usr/include/magick/locale_.h
-file path=usr/include/magick/log.h
-file path=usr/include/magick/magic.h
-file path=usr/include/magick/magick-config.h
-file path=usr/include/magick/magick-type.h
-file path=usr/include/magick/magick.h
-file path=usr/include/magick/memory_.h
-file path=usr/include/magick/methods.h
-file path=usr/include/magick/mime.h
-file path=usr/include/magick/module.h
-file path=usr/include/magick/monitor.h
-file path=usr/include/magick/montage.h
-file path=usr/include/magick/option.h
-file path=usr/include/magick/paint.h
-file path=usr/include/magick/pixel.h
-file path=usr/include/magick/prepress.h
-file path=usr/include/magick/profile.h
-file path=usr/include/magick/property.h
-file path=usr/include/magick/quantize.h
-file path=usr/include/magick/quantum.h
-file path=usr/include/magick/random_.h
-file path=usr/include/magick/registry.h
-file path=usr/include/magick/resize.h
-file path=usr/include/magick/resource_.h
-file path=usr/include/magick/segment.h
-file path=usr/include/magick/semaphore.h
-file path=usr/include/magick/shear.h
-file path=usr/include/magick/signature.h
-file path=usr/include/magick/splay-tree.h
-file path=usr/include/magick/statistic.h
-file path=usr/include/magick/stream.h
-file path=usr/include/magick/string_.h
-file path=usr/include/magick/threshold.h
-file path=usr/include/magick/timer.h
-file path=usr/include/magick/token.h
-file path=usr/include/magick/transform.h
-file path=usr/include/magick/type.h
-file path=usr/include/magick/utility.h
-file path=usr/include/magick/version.h
-file path=usr/include/magick/widget.h
-file path=usr/include/magick/xml-tree.h
-file path=usr/include/magick/xwindow.h
-file path=usr/include/wand/MagickWand.h
-file path=usr/include/wand/animate.h
-file path=usr/include/wand/compare.h
-file path=usr/include/wand/composite.h
-file path=usr/include/wand/conjure.h
-file path=usr/include/wand/convert.h
-file path=usr/include/wand/deprecate.h
-file path=usr/include/wand/display.h
-file path=usr/include/wand/drawing-wand.h
-file path=usr/include/wand/identify.h
-file path=usr/include/wand/import.h
-file path=usr/include/wand/magick-image.h
-file path=usr/include/wand/magick-property.h
-file path=usr/include/wand/magick-wand.h
-file path=usr/include/wand/magick_wand.h
-file path=usr/include/wand/mogrify.h
-file path=usr/include/wand/montage.h
-file path=usr/include/wand/pixel-iterator.h
-file path=usr/include/wand/pixel-wand.h
-file path=usr/include/wand/stream.h
-file path=usr/include/wand/wand-config.h
-file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config/colors.xml
+file path=usr/include/ImageMagick-6/Magick++.h
+file path=usr/include/ImageMagick-6/Magick++/Blob.h
+file path=usr/include/ImageMagick-6/Magick++/CoderInfo.h
+file path=usr/include/ImageMagick-6/Magick++/Color.h
+file path=usr/include/ImageMagick-6/Magick++/Drawable.h
+file path=usr/include/ImageMagick-6/Magick++/Exception.h
+file path=usr/include/ImageMagick-6/Magick++/Geometry.h
+file path=usr/include/ImageMagick-6/Magick++/Image.h
+file path=usr/include/ImageMagick-6/Magick++/Include.h
+file path=usr/include/ImageMagick-6/Magick++/Montage.h
+file path=usr/include/ImageMagick-6/Magick++/Pixels.h
+file path=usr/include/ImageMagick-6/Magick++/STL.h
+file path=usr/include/ImageMagick-6/Magick++/TypeMetric.h
+file path=usr/include/ImageMagick-6/magick/ImageMagick.h
+file path=usr/include/ImageMagick-6/magick/MagickCore.h
+file path=usr/include/ImageMagick-6/magick/PreRvIcccm.h
+file path=usr/include/ImageMagick-6/magick/animate.h
+file path=usr/include/ImageMagick-6/magick/annotate.h
+file path=usr/include/ImageMagick-6/magick/api.h
+file path=usr/include/ImageMagick-6/magick/blob.h
+file path=usr/include/ImageMagick-6/magick/cache-view.h
+file path=usr/include/ImageMagick-6/magick/cache.h
+file path=usr/include/ImageMagick-6/magick/client.h
+file path=usr/include/ImageMagick-6/magick/coder.h
+file path=usr/include/ImageMagick-6/magick/color.h
+file path=usr/include/ImageMagick-6/magick/colorspace.h
+file path=usr/include/ImageMagick-6/magick/compare.h
+file path=usr/include/ImageMagick-6/magick/composite.h
+file path=usr/include/ImageMagick-6/magick/compress.h
+file path=usr/include/ImageMagick-6/magick/configure.h
+file path=usr/include/ImageMagick-6/magick/constitute.h
+file path=usr/include/ImageMagick-6/magick/decorate.h
+file path=usr/include/ImageMagick-6/magick/delegate.h
+file path=usr/include/ImageMagick-6/magick/deprecate.h
+file path=usr/include/ImageMagick-6/magick/display.h
+file path=usr/include/ImageMagick-6/magick/draw.h
+file path=usr/include/ImageMagick-6/magick/effect.h
+file path=usr/include/ImageMagick-6/magick/enhance.h
+file path=usr/include/ImageMagick-6/magick/exception.h
+file path=usr/include/ImageMagick-6/magick/fx.h
+file path=usr/include/ImageMagick-6/magick/gem.h
+file path=usr/include/ImageMagick-6/magick/geometry.h
+file path=usr/include/ImageMagick-6/magick/hashmap.h
+file path=usr/include/ImageMagick-6/magick/identify.h
+file path=usr/include/ImageMagick-6/magick/image.h
+file path=usr/include/ImageMagick-6/magick/layer.h
+file path=usr/include/ImageMagick-6/magick/list.h
+file path=usr/include/ImageMagick-6/magick/locale_.h
+file path=usr/include/ImageMagick-6/magick/log.h
+file path=usr/include/ImageMagick-6/magick/magic.h
+file path=usr/include/ImageMagick-6/magick/magick-config.h
+file path=usr/include/ImageMagick-6/magick/magick-type.h
+file path=usr/include/ImageMagick-6/magick/magick.h
+file path=usr/include/ImageMagick-6/magick/memory_.h
+file path=usr/include/ImageMagick-6/magick/methods.h
+file path=usr/include/ImageMagick-6/magick/mime.h
+file path=usr/include/ImageMagick-6/magick/module.h
+file path=usr/include/ImageMagick-6/magick/monitor.h
+file path=usr/include/ImageMagick-6/magick/montage.h
+file path=usr/include/ImageMagick-6/magick/option.h
+file path=usr/include/ImageMagick-6/magick/paint.h
+file path=usr/include/ImageMagick-6/magick/pixel.h
+file path=usr/include/ImageMagick-6/magick/prepress.h
+file path=usr/include/ImageMagick-6/magick/profile.h
+file path=usr/include/ImageMagick-6/magick/property.h
+file path=usr/include/ImageMagick-6/magick/quantize.h
+file path=usr/include/ImageMagick-6/magick/quantum.h
+file path=usr/include/ImageMagick-6/magick/random_.h
+file path=usr/include/ImageMagick-6/magick/registry.h
+file path=usr/include/ImageMagick-6/magick/resize.h
+file path=usr/include/ImageMagick-6/magick/resource_.h
+file path=usr/include/ImageMagick-6/magick/segment.h
+file path=usr/include/ImageMagick-6/magick/semaphore.h
+file path=usr/include/ImageMagick-6/magick/shear.h
+file path=usr/include/ImageMagick-6/magick/signature.h
+file path=usr/include/ImageMagick-6/magick/splay-tree.h
+file path=usr/include/ImageMagick-6/magick/statistic.h
+file path=usr/include/ImageMagick-6/magick/stream.h
+file path=usr/include/ImageMagick-6/magick/string_.h
+file path=usr/include/ImageMagick-6/magick/threshold.h
+file path=usr/include/ImageMagick-6/magick/timer.h
+file path=usr/include/ImageMagick-6/magick/token.h
+file path=usr/include/ImageMagick-6/magick/transform.h
+file path=usr/include/ImageMagick-6/magick/type.h
+file path=usr/include/ImageMagick-6/magick/utility.h
+file path=usr/include/ImageMagick-6/magick/version.h
+file path=usr/include/ImageMagick-6/magick/widget.h
+file path=usr/include/ImageMagick-6/magick/xml-tree.h
+file path=usr/include/ImageMagick-6/magick/xwindow.h
+file path=usr/include/ImageMagick-6/wand/MagickWand.h
+file path=usr/include/ImageMagick-6/wand/animate.h
+file path=usr/include/ImageMagick-6/wand/compare.h
+file path=usr/include/ImageMagick-6/wand/composite.h
+file path=usr/include/ImageMagick-6/wand/conjure.h
+file path=usr/include/ImageMagick-6/wand/convert.h
+file path=usr/include/ImageMagick-6/wand/deprecate.h
+file path=usr/include/ImageMagick-6/wand/display.h
+file path=usr/include/ImageMagick-6/wand/drawing-wand.h
+file path=usr/include/ImageMagick-6/wand/identify.h
+file path=usr/include/ImageMagick-6/wand/import.h
+file path=usr/include/ImageMagick-6/wand/magick-image.h
+file path=usr/include/ImageMagick-6/wand/magick-property.h
+file path=usr/include/ImageMagick-6/wand/magick-wand.h
+file path=usr/include/ImageMagick-6/wand/magick_wand.h
+file path=usr/include/ImageMagick-6/wand/mogrify.h
+file path=usr/include/ImageMagick-6/wand/montage.h
+file path=usr/include/ImageMagick-6/wand/pixel-iterator.h
+file path=usr/include/ImageMagick-6/wand/pixel-wand.h
+file path=usr/include/ImageMagick-6/wand/stream.h
+file ImageMagick-$(COMPONENT_VERSION)/config/colors.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/colors.xml
+file build/$(MACH64)/config/configure.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/configure.xml
+file build/$(MACH64)/config/delegates.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/delegates.xml
+file ImageMagick-$(COMPONENT_VERSION)/config/english.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/english.xml
+file ImageMagick-$(COMPONENT_VERSION)/config/locale.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/locale.xml
+file build/$(MACH64)/config/type.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/type.xml
+file build/$(MACH64)/config/type-ghostscript.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/type-ghostscript.xml
+file build/$(MACH64)/config/type-windows.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/type-windows.xml
+file build/$(MACH64)/config/type-dejavu.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/type-dejavu.xml
 file \
-    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config/configure.xml
-file \
-    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config/delegates.xml
-file \
-    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config/english.xml
-file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config/locale.xml
-file \
-    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config/type-ghostscript.xml
-file \
-    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config/type-solaris.xml
-file \
-    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config/type-windows.xml
-file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config/type.xml
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/aai.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/art.so
 file \
-    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/avi.so
-file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/avs.so
 file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/bgr.so
+file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/bmp.so
 file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/braille.so
+file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/cals.so
+file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/caption.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/cin.so
@@ -197,17 +205,25 @@
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/cut.so
 file \
-    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dot.so
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dcm.so
+file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dds.so
+file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/debug.so
 file \
-    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dps.so
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dib.so
+file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dng.so
+file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dot.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dpx.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/ept.so
 file \
-    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/exr.so
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/fax.so
 file \
-    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/fax.so
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/fd.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/fits.so
 file \
@@ -217,18 +233,32 @@
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/gray.so
 file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/hald.so
+file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/hdr.so
+file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/histogram.so
 file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/hrz.so
+file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/html.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/icon.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/info.so
 file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/inline.so
+file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/ipl.so
+file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/jnx.so
+file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/jpeg.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/label.so
 file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/mac.so
+file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/magick.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/map.so
@@ -261,6 +291,8 @@
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/palm.so
 file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pango.so
+file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pattern.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pcd.so
@@ -273,6 +305,8 @@
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pdf.so
 file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pes.so
+file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pict.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pix.so
@@ -345,40 +379,58 @@
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/wbmp.so
 file \
-    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/wmf.so
-file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/wpg.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/x.so
 file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xbm.so
+file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xc.so
 file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xcf.so
+file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xpm.so
 file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xps.so
+file \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xwd.so
+file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/ycbcr.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/yuv.so
 file \
     path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/filters/analyze.so
-file path=usr/lib/$(MACH64)/libMagick++.so.10.0.8
-file path=usr/lib/$(MACH64)/libMagick.so.10.0.8
-file path=usr/lib/$(MACH64)/libWand.so.10.0.8
+file path=usr/lib/$(MACH64)/libMagick++-6.Q16.so.1.0.0
+file path=usr/lib/$(MACH64)/libMagickWand-6.Q16.so.1.0.0
+file path=usr/lib/$(MACH64)/libMagickCore-6.Q16.so.1.0.0
 file path=usr/lib/$(MACH64)/pkgconfig/ImageMagick++.pc
 file path=usr/lib/$(MACH64)/pkgconfig/ImageMagick.pc
 file path=usr/lib/$(MACH64)/pkgconfig/Wand.pc
-file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config/colors.xml
-file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config/configure.xml
-file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config/delegates.xml
-file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config/english.xml
-file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config/locale.xml
-file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config/type-ghostscript.xml
-file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config/type-solaris.xml
-file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config/type-windows.xml
-file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config/type.xml
+file ImageMagick-$(COMPONENT_VERSION)/config/colors.xml \
+    path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config-Q16/colors.xml
+file build/$(MACH32)/config/configure.xml \
+    path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config-Q16/configure.xml
+file build/$(MACH32)/config/delegates.xml \
+    path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config-Q16/delegates.xml
+file ImageMagick-$(COMPONENT_VERSION)/config/english.xml \
+    path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config-Q16/english.xml
+file ImageMagick-$(COMPONENT_VERSION)/config/locale.xml \
+    path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config-Q16/locale.xml
+file build/$(MACH32)/config/type.xml \
+    path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config-Q16/type.xml
+file build/$(MACH32)/config/type-ghostscript.xml \
+    path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config-Q16/type-ghostscript.xml
+file build/$(MACH32)/config/type-windows.xml \
+    path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config-Q16/type-windows.xml
+file build/$(MACH32)/config/type-dejavu.xml \
+    path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config-Q16/type-dejavu.xml
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/aai.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/art.so
-file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/avi.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/avs.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/bgr.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/bmp.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/braille.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/cals.so
 file \
     path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/caption.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/cin.so
@@ -386,24 +438,35 @@
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/clip.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/cmyk.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/cut.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dcm.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dds.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/debug.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dib.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dng.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dot.so
-file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dps.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/dpx.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/ept.so
-file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/exr.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/fax.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/fd.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/fits.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/gif.so
 file \
     path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/gradient.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/gray.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/hald.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/hdr.so
 file \
     path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/histogram.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/hrz.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/html.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/icon.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/info.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/inline.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/ipl.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/jnx.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/jpeg.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/label.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/mac.so
 file \
     path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/magick.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/map.so
@@ -421,6 +484,7 @@
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/null.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/otb.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/palm.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pango.so
 file \
     path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pattern.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pcd.so
@@ -428,6 +492,7 @@
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pcx.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pdb.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pdf.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pes.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pict.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pix.so
 file \
@@ -468,18 +533,20 @@
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/vid.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/viff.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/wbmp.so
-file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/wmf.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/wpg.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/x.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xbm.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xc.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xpm.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xps.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xwd.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/ycbcr.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/yuv.so
 file \
     path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/filters/analyze.so
-file path=usr/lib/libMagick++.so.10.0.8
-file path=usr/lib/libMagick.so.10.0.8
-file path=usr/lib/libWand.so.10.0.8
+file path=usr/lib/libMagick++-6.Q16.so.1.0.0
+file path=usr/lib/libMagickWand-6.Q16.so.1.0.0
+file path=usr/lib/libMagickCore-6.Q16.so.1.0.0
 file path=usr/lib/pkgconfig/ImageMagick++.pc
 file path=usr/lib/pkgconfig/ImageMagick.pc
 file path=usr/lib/pkgconfig/Wand.pc
@@ -490,16 +557,23 @@
 file \
     path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.so
 file \
-    path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/autosplit.ix
-file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/ChangeLog
-file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/LICENSE
-file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/NEWS
-file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config/coder.xml
-file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config/log.xml
-file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config/magic.xml
-file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config/mime.xml
-file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config/sRGB.icm
-file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config/thresholds.xml
+    path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Q16/autosplit.ix
+file ImageMagick-$(COMPONENT_VERSION)/ChangeLog \
+    path=usr/share/ImageMagick-$(COMPONENT_VERSION)/ChangeLog
+file ImageMagick-$(COMPONENT_VERSION)/ChangeLog \
+    path=usr/share/ImageMagick-$(COMPONENT_VERSION)/LICENSE
+file ImageMagick-$(COMPONENT_VERSION)/Magick++/NEWS \
+    path=usr/share/ImageMagick-$(COMPONENT_VERSION)/NEWS
+file ImageMagick-$(COMPONENT_VERSION)/config/coder.xml \
+    path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config/coder.xml
+file ImageMagick-$(COMPONENT_VERSION)/config/log.xml \
+    path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config/log.xml
+file ImageMagick-$(COMPONENT_VERSION)/config/magic.xml \
+    path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config/magic.xml
+file ImageMagick-$(COMPONENT_VERSION)/config/mime.xml \
+    path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config/mime.xml
+file ImageMagick-$(COMPONENT_VERSION)/config/thresholds.xml \
+    path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config/thresholds.xml
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/arc.png
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/background.jpg
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/black.png
@@ -516,7 +590,6 @@
 file \
     path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/definitive-guide.png
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/difference.png
-file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/dogwaffle.jpg
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/donate.png
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/examples.jpg
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/frame.jpg
@@ -526,7 +599,6 @@
     path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/gaussian-blur.png
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/granite.png
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/label.gif
-file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/logo.eps
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/logo.jpg
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/montage.jpg
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/navy.png
@@ -545,7 +617,6 @@
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/smile.gif
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/sponsor.jpg
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/sprite.jpg
-file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/travelsur.gif
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/tricks.png
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/images/wand.ico
 file \
@@ -704,7 +775,6 @@
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/conjure.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/contact.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/convert.html
-file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/cvs.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/display.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/download.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/examples.html
@@ -725,7 +795,6 @@
     path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/magick-vector-graphics.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/magick-wand.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/magick.css
-file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/mailing-list.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/miff.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/mogrify.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_VERSION)/www/montage.html
@@ -761,18 +830,18 @@
     desc="ImageMagick - Image Manipulation Utilities and Libraries" \
     name="ImageMagick - Image Manipulation Utilities and Libraries"
 license imagemagick.license license="Apache 2.0 license"
-link path=usr/lib/$(MACH64)/libMagick++.so target=libMagick++.so.10.0.8
-link path=usr/lib/$(MACH64)/libMagick++.so.10 target=libMagick++.so.10.0.8
-link path=usr/lib/$(MACH64)/libMagick.so target=libMagick.so.10.0.8
-link path=usr/lib/$(MACH64)/libMagick.so.10 target=libMagick.so.10.0.8
-link path=usr/lib/$(MACH64)/libWand.so target=libWand.so.10.0.8
-link path=usr/lib/$(MACH64)/libWand.so.10 target=libWand.so.10.0.8
-link path=usr/lib/libMagick++.so target=libMagick++.so.10.0.8
-link path=usr/lib/libMagick++.so.10 target=libMagick++.so.10.0.8
-link path=usr/lib/libMagick.so target=libMagick.so.10.0.8
-link path=usr/lib/libMagick.so.10 target=libMagick.so.10.0.8
-link path=usr/lib/libWand.so target=libWand.so.10.0.8
-link path=usr/lib/libWand.so.10 target=libWand.so.10.0.8
+link path=usr/lib/$(MACH64)/libMagick++-6.Q16.so target=libMagick++-6.Q16.so.1.0.0
+link path=usr/lib/$(MACH64)/libMagick++-6.Q16.so.1 target=libMagick++-6.Q16.so.1.0.0
+link path=usr/lib/$(MACH64)/libMagickWand-6.Q16.so target=libMagickWand-6.Q16.so.1.0.0
+link path=usr/lib/$(MACH64)/libMagickWand-6.Q16.so.1 target=libMagickWand-6.Q16.so.1.0.0
+link path=usr/lib/$(MACH64)/libMagickCore-6.Q16.so target=libMagickCore-6.Q16.so.1.0.0
+link path=usr/lib/$(MACH64)/libMagickCore-6.Q16.so.1 target=libMagickCore-6.Q16.so.1.0.0
+link path=usr/lib/libMagick++-6.Q16.so target=libMagick++-6.Q16.so.1.0.0
+link path=usr/lib/libMagick++-6.Q16.so.1 target=libMagick++-6.Q16.so.1.0.0
+link path=usr/lib/libMagickWand-6.Q16.so target=libMagickWand-6.Q16.so.1.0.0
+link path=usr/lib/libMagickWand-6.Q16.so.1 target=libMagickWand-6.Q16.so.1.0.0
+link path=usr/lib/libMagickCore-6.Q16.so target=libMagickCore-6.Q16.so.1.0.0
+link path=usr/lib/libMagickCore-6.Q16.so.1 target=libMagickCore-6.Q16.so.1.0.0
 
 # Compatibility links
 #

--- a/components/imagemagick/patches/CVE-2007-4987.patch	Tue Apr 09 15:40:14 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- ImageMagick-6.3.4/magick/blob.c.orig	Thu Aug 25 00:30:13 2011
-+++ ImageMagick-6.3.4/magick/blob.c	Thu Aug 25 00:30:48 2011
-@@ -3089,7 +3089,7 @@
- 
-   assert(image != (Image *) NULL);
-   assert(image->signature == MagickSignature);
--  for (i=0; i < (long) MaxTextExtent; i++)
-+  for (i=0; i < (long) MaxTextExtent - 1; i++)
-   {
-     p=ReadBlobStream(image,1,buffer,&count);
-     if (count != 1)

--- a/components/imagemagick/patches/la.patch	Tue Apr 09 15:40:14 2013 -0700
+++ b/components/imagemagick/patches/la.patch	Tue Apr 09 22:03:20 2013 -0700
@@ -1,53 +1,33 @@
-*** ImageMagick-6.3.4/magick/module.c.orig	Thu Apr 12 20:00:07 2007
---- ImageMagick-6.3.4/magick/module.c	Thu Apr 12 20:00:45 2007
-***************
-*** 71,77 ****
-    Define declarations.
-  */
-  #if defined(HasLTDL)
-! #  define ModuleGlobExpression "*.la"
-  #else
-  #  if defined(_DEBUG)
-  #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
---- 71,77 ----
-    Define declarations.
-  */
-  #if defined(HasLTDL)
-! #  define ModuleGlobExpression "*.so"
-  #else
-  #  if defined(_DEBUG)
-  #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
-***************
-*** 1271,1277 ****
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
-    assert(name != (char *) NULL);
-  #if defined(HasLTDL)
-!   (void) FormatMagickString(name,MaxTextExtent,"%s.la",tag);
-    (void) LocaleLower(name);
-  #else
-  #if defined(__WINDOWS__)
---- 1271,1277 ----
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
-    assert(name != (char *) NULL);
-  #if defined(HasLTDL)
-!   (void) FormatMagickString(name,MaxTextExtent,"%s.so",tag);
-    (void) LocaleLower(name);
-  #else
-  #if defined(__WINDOWS__)
-***************
-*** 1322,1328 ****
-  #if !defined(HasLTDL)
-    (void) FormatMagickString(name,MaxTextExtent,"%s.dll",tag);
-  #else
-!   (void) FormatMagickString(name,MaxTextExtent,"%s.la",tag);
-    (void) LocaleLower(name);
-  #endif
-  }
---- 1322,1328 ----
-  #if !defined(HasLTDL)
-    (void) FormatMagickString(name,MaxTextExtent,"%s.dll",tag);
-  #else
-!   (void) FormatMagickString(name,MaxTextExtent,"%s.so",tag);
-    (void) LocaleLower(name);
-  #endif
-  }
+To avoid dependency on libtool/libltdl, change "*.la" extension
+to "*.so"
+-----------------------------------------------------------------
+
+--- ImageMagick-6.7.8/magick/module.c	Sun Dec 18 17:54:26 2011
++++ ImageMagick-6.7.8/magick/module.c	Thu Oct  4 00:00:46 2012
+@@ -72,7 +72,7 @@
+   Define declarations.
+ */
+ #if defined(MAGICKCORE_LTDL_DELEGATE)
+-#  define ModuleGlobExpression "*.la"
++#  define ModuleGlobExpression "*.so"
+ #else
+ #  if defined(_DEBUG)
+ #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
+@@ -1454,7 +1454,7 @@
+   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
+   assert(name != (char *) NULL);
+ #if defined(MAGICKCORE_LTDL_DELEGATE)
+-  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
++  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);
+   (void) LocaleLower(name);
+ #else
+ #if defined(MAGICKCORE_WINDOWS_SUPPORT)
+@@ -1505,7 +1505,7 @@
+ #if !defined(MAGICKCORE_LTDL_DELEGATE)
+   (void) FormatLocaleString(name,MaxTextExtent,"%s.dll",tag);
+ #else
+-  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
++  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);
+ #endif
+ }
+ 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/imagemagick/patches/no__attribute__.patch	Tue Apr 09 22:03:20 2013 -0700
@@ -0,0 +1,15 @@
+ImageMagick uses many unsupported attributes by Oracle Solaris Studio.
+Supported attributes are here:
+http://docs.oracle.com/cd/E24457_01/html/E21991/gljol.html
+================================================================================
+--- ImageMagick-6.7.8/magick/method-attribute.h.orig	Sun Feb 19 10:15:53 2012
++++ ImageMagick-6.7.8/magick/method-attribute.h	Tue Oct 16 06:58:12 2012
+@@ -110,7 +110,7 @@
+ 
+ #if defined(MAGICKCORE_HAVE___ATTRIBUTE__)
+ #  define magick_aligned(x)  __attribute__((aligned(x)))
+-#  define magick_attribute  __attribute__
++#  define magick_attribute(x)
+ #  define magick_unused(x)  magick_unused_ ## x __attribute__((unused))
+ #else
+ #  define magick_aligned(x)  /* nothing */

--- a/components/imagemagick/patches/perl_LD_RUN_PATH.patch	Tue Apr 09 15:40:14 2013 -0700
+++ b/components/imagemagick/patches/perl_LD_RUN_PATH.patch	Tue Apr 09 22:03:20 2013 -0700
@@ -1,45 +1,44 @@
-diff --git a/PerlMagick/Makefile.am b/PerlMagick/Makefile.am
---- a/PerlMagick/Makefile.am
-+++ b/PerlMagick/Makefile.am
-@@ -46,16 +46,16 @@
- 	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-
+This patch addresses the issue reported in bug 15809845.
+15809845 - SUNBT7191272 imagemagick perl module compiled with wrong RUNPATH 
+--------------------------------------------------------------------------------
+--- ImageMagick-6.7.8/PerlMagick/Makefile.am	Sun Dec 18 17:54:26 2011
++++ ImageMagick-6.7.8/PerlMagick/Makefile.am	Thu Oct  4 00:11:45 2012
+@@ -50,7 +50,7 @@
+ 
  install-exec-perl: $(PERLMAKEFILE)
--	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
-+	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" install
-
- all-perl: $(PERLMAKEFILE)
--	cd $(PERLMAGICK) && $(MAKE) CC='@CC@'
-+	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH=""
-
- uninstall-exec-perl: $(PERLMAKEFILE)
+ 	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
+-	$(MAKE) CC='@CC@' install )
++	$(MAKE) CC='@CC@' LD_RUN_PATH="" install )
+ 
+ all-perl: perl-sources
+ 
+@@ -58,7 +58,8 @@
  	echo "Uninstall not supported for PerlMagick"
-
+ 
  check-perl: $(PERLMAKEFILE)
--	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' test
-+	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" test
-
- else
- if WITH_PERL_STATIC
---- ImageMagick-6.3.4/Makefile.in.old	Tue Aug 14 16:37:42 2012
-+++ ImageMagick-6.3.4/Makefile.in	Tue Aug 14 16:38:28 2012
-@@ -10227,16 +10227,16 @@
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
+-	cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test
++	cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh \
++	$(MAKE) CC='@CC@' LD_RUN_PATH="" test
+ 
+ perl-build: $(PERLMAKEFILE)
+ 	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' )
+--- ImageMagick-6.7.8/Makefile.in	Sun Jul 22 05:35:45 2012
++++ ImageMagick-6.7.8/Makefile.in	Thu Oct  4 00:15:46 2012
+@@ -10584,7 +10584,7 @@
  
  @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
--@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" install
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
+-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' install )
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' LD_RUN_PATH="" install )
  
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: $(PERLMAKEFILE)
--@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@'
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH=""
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: perl-sources
  
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@uninstall-exec-perl: $(PERLMAKEFILE)
+@@ -10592,7 +10592,7 @@
  @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	echo "Uninstall not supported for PerlMagick"
  
  @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@check-perl: $(PERLMAKEFILE)
--@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' test
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" test
+-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' LD_RUN_PATH="" test
  
- @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL MAP_TARGET=$(PERLSTATICNAME) $(PERL_MAKE_OPTIONS)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@perl-build: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' )

--- a/components/imagemagick/patches/remove_dangerous.patch	Tue Apr 09 15:40:14 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-This removes support for DCM, DIB, XBM, XCF and XWD file formats. It saves us
-from CVE-2007-4985, CVE-2007-4986 and CVE-2007-4988.
-
-diff -urN ImageMagick-6.3.4.orig/Makefile.am ImageMagick-6.3.4/Makefile.am
---- ImageMagick-6.3.4.orig/Makefile.am	2007-04-02 18:59:34.000000000 -0700
-+++ ImageMagick-6.3.4/Makefile.am	2011-08-24 09:07:57.831550701 -0700
-@@ -21,7 +21,7 @@
- 
- AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
- 
--ACLOCAL_AMFLAGS = -Iltdl/m4 -I m4
-+ACLOCAL_AMFLAGS = -I m4
- 
- MODULECOMMONFLAGS = -no-undefined -module -avoid-version
- 
-diff -urN ImageMagick-6.3.4.orig/coders/Makefile.am ImageMagick-6.3.4/coders/Makefile.am
---- ImageMagick-6.3.4.orig/coders/Makefile.am	2007-04-27 17:41:46.000000000 -0700
-+++ ImageMagick-6.3.4/coders/Makefile.am	2011-08-24 09:11:10.957499184 -0700
-@@ -58,8 +58,8 @@
- endif
- 
- if HasX11
--MAGICK_X11_MODULES = coders/x.la coders/xwd.la
--MAGICK_X11_SRCS = coders/x.c coders/xwd.c
-+MAGICK_X11_MODULES = coders/x.la
-+MAGICK_X11_SRCS = coders/x.c
- endif
- 
- MAGICK_CODER_SRCS = \
-@@ -73,8 +73,6 @@
- 	coders/clip.c \
- 	coders/cmyk.c \
- 	coders/cut.c \
--	coders/dcm.c \
--	coders/dib.c \
- 	coders/dot.c \
- 	coders/dps.c \
- 	coders/dpx.c \
-@@ -147,9 +145,7 @@
- 	coders/wbmp.c \
- 	coders/wmf.c \
- 	coders/wpg.c \
--	coders/xbm.c \
- 	coders/xc.c \
--	coders/xcf.c \
- 	coders/xpm.c \
- 	coders/ycbcr.c \
- 	coders/yuv.c \
-@@ -175,8 +171,6 @@
- 	coders/clip.la \
- 	coders/cmyk.la \
- 	coders/cut.la \
--	coders/dcm.la \
--	coders/dib.la \
- 	coders/dot.la \
- 	coders/dps.la \
- 	coders/dpx.la \
-@@ -249,9 +243,7 @@
- 	coders/wbmp.la \
- 	coders/wmf.la \
- 	coders/wpg.la \
--	coders/xbm.la \
- 	coders/xc.la \
--	coders/xcf.la \
- 	coders/xpm.la \
- 	coders/ycbcr.la \
- 	coders/yuv.la \
-@@ -334,18 +326,6 @@
- coders_cut_la_LDFLAGS      = $(MODULECOMMONFLAGS)
- coders_cut_la_LIBADD       = $(LIBMAGICK)
- 
--# DCM coder module
--coders_dcm_la_SOURCES      = coders/dcm.c
--coders_dcm_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
--coders_dcm_la_LDFLAGS      = $(MODULECOMMONFLAGS)
--coders_dcm_la_LIBADD       = $(LIBMAGICK)
--
--# DIB coder module
--coders_dib_la_SOURCES      = coders/dib.c
--coders_dib_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
--coders_dib_la_LDFLAGS      = $(MODULECOMMONFLAGS)
--coders_dib_la_LIBADD       = $(LIBMAGICK)
--
- # DJVU coder module
- coders_djvu_la_SOURCES     = coders/djvu.c
- coders_djvu_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
-@@ -839,36 +819,18 @@
- coders_x_la_LDFLAGS        = $(MODULECOMMONFLAGS)
- coders_x_la_LIBADD         = $(LIBMAGICK) $(X11_LIBS)
- 
--# XBM coder module
--coders_xbm_la_SOURCES      = coders/xbm.c
--coders_xbm_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
--coders_xbm_la_LDFLAGS      = $(MODULECOMMONFLAGS)
--coders_xbm_la_LIBADD       = $(LIBMAGICK)
--
- # XC coder module
- coders_xc_la_SOURCES       = coders/xc.c
- coders_xc_la_CPPFLAGS      = $(MODULE_EXTRA_CPPFLAGS)
- coders_xc_la_LDFLAGS       = $(MODULECOMMONFLAGS)
- coders_xc_la_LIBADD        = $(LIBMAGICK)
- 
--# XCF coder module
--coders_xcf_la_SOURCES      = coders/xcf.c
--coders_xcf_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
--coders_xcf_la_LDFLAGS      = $(MODULECOMMONFLAGS)
--coders_xcf_la_LIBADD       = $(LIBMAGICK)
--
- # XPM coder module
- coders_xpm_la_SOURCES      = coders/xpm.c
- coders_xpm_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
- coders_xpm_la_LDFLAGS      = $(MODULECOMMONFLAGS)
- coders_xpm_la_LIBADD       = $(LIBMAGICK)
- 
--# XWD coder module
--coders_xwd_la_SOURCES      = coders/xwd.c
--coders_xwd_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
--coders_xwd_la_LDFLAGS      = $(MODULECOMMONFLAGS)
--coders_xwd_la_LIBADD       = $(LIBMAGICK) $(X11_LIBS)
--
- # YCBCR coder module
- coders_ycbcr_la_SOURCES     = coders/ycbcr.c
- coders_ycbcr_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)

--- a/components/imagemagick/resolve.deps	Tue Apr 09 15:40:14 2013 -0700
+++ b/components/imagemagick/resolve.deps	Tue Apr 09 22:03:20 2013 -0700
@@ -1,17 +1,22 @@
 compress/bzip2
+compress/xz
 image/library/libjpeg
 image/library/libpng
 image/library/libtiff
+library/desktop/cairo
+library/desktop/pango
+library/fftw-3
+library/glib2
 library/lcms
+library/libtool/libltdl
 library/libxml2
-library/openexr
 library/zlib
-print/filter/ghostscript
 shell/ksh93
 system/library
+system/library/c++-runtime
 system/library/fontconfig
 system/library/freetype-2
 system/library/math
-system/linker
+system/library/openmp
 x11/library/libx11
 x11/library/libxext