1 files changed, 56 insertions, 48 deletions

diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index fcf9bd43fe2e..ad6fc860e7f9 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -1,8 +1,8 @@
 bin/Magick++-config
 bin/Magick-config
-bin/Wand-config
-bin/MagickWand-config
 bin/MagickCore-config
+bin/MagickWand-config
+bin/Wand-config
 bin/animate
 bin/compare
 bin/composite
@@ -52,11 +52,11 @@ include/ImageMagick-6/magick/api.h
 include/ImageMagick-6/magick/artifact.h
 include/ImageMagick-6/magick/attribute.h
 include/ImageMagick-6/magick/blob.h
-include/ImageMagick-6/magick/cache.h
 include/ImageMagick-6/magick/cache-view.h
+include/ImageMagick-6/magick/cache.h
 include/ImageMagick-6/magick/channel.h
-include/ImageMagick-6/magick/client.h
 include/ImageMagick-6/magick/cipher.h
+include/ImageMagick-6/magick/client.h
 include/ImageMagick-6/magick/coder.h
 include/ImageMagick-6/magick/color.h
 include/ImageMagick-6/magick/colormap.h
@@ -71,6 +71,7 @@ include/ImageMagick-6/magick/delegate.h
 include/ImageMagick-6/magick/deprecate.h
 include/ImageMagick-6/magick/display.h
 include/ImageMagick-6/magick/distort.h
+include/ImageMagick-6/magick/distribute-cache.h
 include/ImageMagick-6/magick/draw.h
 include/ImageMagick-6/magick/effect.h
 include/ImageMagick-6/magick/enhance.h
@@ -83,16 +84,17 @@ include/ImageMagick-6/magick/geometry.h
 include/ImageMagick-6/magick/hashmap.h
 include/ImageMagick-6/magick/histogram.h
 include/ImageMagick-6/magick/identify.h
-include/ImageMagick-6/magick/image.h
 include/ImageMagick-6/magick/image-view.h
+include/ImageMagick-6/magick/image.h
 include/ImageMagick-6/magick/layer.h
 include/ImageMagick-6/magick/list.h
 include/ImageMagick-6/magick/locale_.h
 include/ImageMagick-6/magick/log.h
 include/ImageMagick-6/magick/magic.h
-include/ImageMagick-6/magick/magick.h
+include/ImageMagick-6/magick/magick-baseconfig.h
 include/ImageMagick-6/magick/magick-config.h
 include/ImageMagick-6/magick/magick-type.h
+include/ImageMagick-6/magick/magick.h
 include/ImageMagick-6/magick/matrix.h
 include/ImageMagick-6/magick/memory_.h
 include/ImageMagick-6/magick/method-attribute.h
@@ -102,16 +104,17 @@ include/ImageMagick-6/magick/module.h
 include/ImageMagick-6/magick/monitor.h
 include/ImageMagick-6/magick/montage.h
 include/ImageMagick-6/magick/morphology.h
+include/ImageMagick-6/magick/opencl.h
 include/ImageMagick-6/magick/option.h
 include/ImageMagick-6/magick/paint.h
-include/ImageMagick-6/magick/pixel.h
 include/ImageMagick-6/magick/pixel-accessor.h
+include/ImageMagick-6/magick/pixel.h
 include/ImageMagick-6/magick/policy.h
 include/ImageMagick-6/magick/prepress.h
 include/ImageMagick-6/magick/profile.h
 include/ImageMagick-6/magick/property.h
-include/ImageMagick-6/magick/quantum.h
 include/ImageMagick-6/magick/quantize.h
+include/ImageMagick-6/magick/quantum.h
 include/ImageMagick-6/magick/random_.h
 include/ImageMagick-6/magick/registry.h
 include/ImageMagick-6/magick/resample.h
@@ -125,6 +128,7 @@ include/ImageMagick-6/magick/splay-tree.h
 include/ImageMagick-6/magick/statistic.h
 include/ImageMagick-6/magick/stream.h
 include/ImageMagick-6/magick/string_.h
+include/ImageMagick-6/magick/studio.h
 include/ImageMagick-6/magick/threshold.h
 include/ImageMagick-6/magick/timer.h
 include/ImageMagick-6/magick/token.h
@@ -136,25 +140,21 @@ include/ImageMagick-6/magick/vision.h
 include/ImageMagick-6/magick/widget.h
 include/ImageMagick-6/magick/xml-tree.h
 include/ImageMagick-6/magick/xwindow.h
-include/ImageMagick-6/magick/studio.h
-include/ImageMagick-6/magick/opencl.h
-include/ImageMagick-6/magick/distribute-cache.h
-include/ImageMagick-6/magick/magick-baseconfig.h
 include/ImageMagick-6/wand/MagickWand.h
-include/ImageMagick-6/wand/deprecate.h
-include/ImageMagick-6/wand/drawing-wand.h
 include/ImageMagick-6/wand/animate.h
 include/ImageMagick-6/wand/compare.h
 include/ImageMagick-6/wand/composite.h
 include/ImageMagick-6/wand/conjure.h
 include/ImageMagick-6/wand/convert.h
+include/ImageMagick-6/wand/deprecate.h
 include/ImageMagick-6/wand/display.h
+include/ImageMagick-6/wand/drawing-wand.h
 include/ImageMagick-6/wand/identify.h
 include/ImageMagick-6/wand/import.h
 include/ImageMagick-6/wand/magick-image.h
 include/ImageMagick-6/wand/magick-property.h
-include/ImageMagick-6/wand/magick_wand.h
 include/ImageMagick-6/wand/magick-wand.h
+include/ImageMagick-6/wand/magick_wand.h
 include/ImageMagick-6/wand/method-attribute.h
 include/ImageMagick-6/wand/mogrify.h
 include/ImageMagick-6/wand/montage.h
@@ -426,18 +426,6 @@ lib/libMagickWand-6.la
 lib/libMagickWand-6.so
 lib/libMagickWand-6.so.2
 lib/libMagickWand-6.so.2.0.0
-libdata/pkgconfig/ImageMagick++.pc
-libdata/pkgconfig/Magick++.pc
-libdata/pkgconfig/ImageMagick.pc
-libdata/pkgconfig/MagickCore.pc
-libdata/pkgconfig/MagickWand.pc
-libdata/pkgconfig/Wand.pc
-libdata/pkgconfig/ImageMagick++-6.pc
-libdata/pkgconfig/ImageMagick-6.pc
-libdata/pkgconfig/Magick++-6.pc
-libdata/pkgconfig/MagickCore-6.pc
-libdata/pkgconfig/MagickWand-6.pc
-libdata/pkgconfig/Wand-6.pc
 %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick.pm
 %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm
 %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/Magick.so
@@ -446,6 +434,18 @@ libdata/pkgconfig/Wand-6.pc
 %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/autosplit.ix
 %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick.3.gz
 %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick::%%QBIT%%%%HDRI%%.3.gz
+libdata/pkgconfig/ImageMagick++-6.pc
+libdata/pkgconfig/ImageMagick++.pc
+libdata/pkgconfig/ImageMagick-6.pc
+libdata/pkgconfig/ImageMagick.pc
+libdata/pkgconfig/Magick++-6.pc
+libdata/pkgconfig/Magick++.pc
+libdata/pkgconfig/MagickCore-6.pc
+libdata/pkgconfig/MagickCore.pc
+libdata/pkgconfig/MagickWand-6.pc
+libdata/pkgconfig/MagickWand.pc
+libdata/pkgconfig/Wand-6.pc
+libdata/pkgconfig/Wand.pc
 man/man1/ImageMagick.1.gz
 man/man1/Magick++-config.1.gz
 man/man1/Magick-config.1.gz
@@ -466,11 +466,14 @@ man/man1/stream.1.gz
 %%DATADIR%%-6/english.xml
 %%DATADIR%%-6/francais.xml
 %%DATADIR%%-6/locale.xml
-%%PORTDOCS%%%%DOCSDIR%%-6/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%-6/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%-6/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%-6/NEWS.txt
+%%PORTDOCS%%%%DOCSDIR%%-6/images/ImageMagick.ico
 %%PORTDOCS%%%%DOCSDIR%%-6/images/affine.png
+%%PORTDOCS%%%%DOCSDIR%%-6/images/annotate.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/arc.png
+%%PORTDOCS%%%%DOCSDIR%%-6/images/atop.gif
 %%PORTDOCS%%%%DOCSDIR%%-6/images/background.jpg
 %%PORTDOCS%%%%DOCSDIR%%-6/images/black.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/bluebells_clipped.jpg
@@ -481,6 +484,7 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/images/configure.jpg
 %%PORTDOCS%%%%DOCSDIR%%-6/images/cylinder_shaded.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/difference.png
+%%PORTDOCS%%%%DOCSDIR%%-6/images/donate.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/examples.jpg
 %%PORTDOCS%%%%DOCSDIR%%-6/images/frame.jpg
 %%PORTDOCS%%%%DOCSDIR%%-6/images/fuzzy-magick.png
@@ -492,13 +496,15 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/images/logo-sm-flop.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/logo-sm-fx.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/logo-sm.png
-%%PORTDOCS%%%%DOCSDIR%%-6/images/logo.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/logo.jpg
+%%PORTDOCS%%%%DOCSDIR%%-6/images/logo.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/montage.jpg
 %%PORTDOCS%%%%DOCSDIR%%-6/images/navy.png
+%%PORTDOCS%%%%DOCSDIR%%-6/images/networkredux.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/objects.gif
 %%PORTDOCS%%%%DOCSDIR%%-6/images/objects.jpg
 %%PORTDOCS%%%%DOCSDIR%%-6/images/objects.png
+%%PORTDOCS%%%%DOCSDIR%%-6/images/over.gif
 %%PORTDOCS%%%%DOCSDIR%%-6/images/patterns/bricks.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/patterns/checkerboard.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/patterns/circles.png
@@ -569,14 +575,14 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/images/sponsor.jpg
 %%PORTDOCS%%%%DOCSDIR%%-6/images/sprite.jpg
 %%PORTDOCS%%%%DOCSDIR%%-6/images/t-shirt.png
+%%PORTDOCS%%%%DOCSDIR%%-6/images/transloadit.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/wand.ico
 %%PORTDOCS%%%%DOCSDIR%%-6/images/wand.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/white-highlight.png
 %%PORTDOCS%%%%DOCSDIR%%-6/images/wizard.jpg
 %%PORTDOCS%%%%DOCSDIR%%-6/images/wizard.png
-%%PORTDOCS%%%%DOCSDIR%%-6/images/ImageMagick.ico
 %%PORTDOCS%%%%DOCSDIR%%-6/index.html
-%%PORTDOCS%%%%DOCSDIR%%-6/www/ImageMagickObject.html
+%%PORTDOCS%%%%DOCSDIR%%-6/%%WWWDIR%%Object.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/Magick++/Blob.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/Magick++/Cache.fig
 %%PORTDOCS%%%%DOCSDIR%%-6/www/Magick++/Cache.png
@@ -619,20 +625,7 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/advanced-unix-installation.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/advanced-windows-installation.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/animate.html
-%%PORTDOCS%%%%DOCSDIR%%-6/www/css/README.txt
-%%PORTDOCS%%%%DOCSDIR%%-6/www/css/bootstrap.css
-%%PORTDOCS%%%%DOCSDIR%%-6/www/css/magick.css
-%%PORTDOCS%%%%DOCSDIR%%-6/www/js/README.txt
-%%PORTDOCS%%%%DOCSDIR%%-6/www/js/bootstrap.js
-%%PORTDOCS%%%%DOCSDIR%%-6/www/js/magick.js
-%%PORTDOCS%%%%DOCSDIR%%-6/www/opencl.html
-%%PORTDOCS%%%%DOCSDIR%%-6/www/openmp.html
-%%PORTDOCS%%%%DOCSDIR%%-6/www/webp.html
-%%PORTDOCS%%%%DOCSDIR%%-6/www/distribute-pixel-cache.html
-%%PORTDOCS%%%%DOCSDIR%%-6/www/color-management.html
-%%PORTDOCS%%%%DOCSDIR%%-6/www/support.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api.html
-%%PORTDOCS%%%%DOCSDIR%%-6/www/api/mime.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickCore/ImageMagick_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickCore/ImageMagick_8h.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickCore/MagickCore_8h-source.html
@@ -1068,8 +1061,8 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickCore/struct__Ascii85Info.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickCore/struct__BlobInfo.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickCore/struct__CacheInfo.html
-%%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickCore/struct__CacheView.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickCore/struct__CacheMethods.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickCore/struct__CacheView.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickCore/struct__ChannelStatistics.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickCore/struct__ChromaticityInfo.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickCore/struct__Cluster.html
@@ -1348,8 +1341,8 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/blob.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/cache-view.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/cache.html
-%%PORTDOCS%%%%DOCSDIR%%-6/www/api/cipher.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/channel.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/api/cipher.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/color.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/colormap.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/colorspace.html
@@ -1369,8 +1362,8 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/fourier.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/fx.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/histogram.html
-%%PORTDOCS%%%%DOCSDIR%%-6/www/api/image.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/image-view.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/api/image.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/layer.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/list.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick-deprecate.html
@@ -1379,6 +1372,7 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick-wand.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/memory.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/api/mime.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/module.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/mogrify.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/api/monitor.html
@@ -1405,6 +1399,7 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/binary-releases.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/cipher.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/color-management.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/color.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/command-line-options.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/command-line-processing.html
@@ -1416,15 +1411,20 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/connected-components.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/contact.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/convert.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/css/README.txt
+%%PORTDOCS%%%%DOCSDIR%%-6/www/css/bootstrap.css
+%%PORTDOCS%%%%DOCSDIR%%-6/www/css/magick.css
 %%PORTDOCS%%%%DOCSDIR%%-6/www/display.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/distribute-pixel-cache.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/download.html
-%%PORTDOCS%%%%DOCSDIR%%-6/www/export.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/escape.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/examples.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/exception.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/export.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/favicon.ico
 %%PORTDOCS%%%%DOCSDIR%%-6/www/formats.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/fx.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/gradient.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/high-dynamic-range.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/history.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/identify.html
@@ -1432,6 +1432,9 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/index.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/install-source.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/jp2.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/js/README.txt
+%%PORTDOCS%%%%DOCSDIR%%-6/www/js/bootstrap.js
+%%PORTDOCS%%%%DOCSDIR%%-6/www/js/magick.js
 %%PORTDOCS%%%%DOCSDIR%%-6/www/license.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/links.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/magick++.html
@@ -1442,6 +1445,8 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/mogrify.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/montage.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/motion-picture.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/opencl.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/openmp.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/perl-magick.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/porting.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/quantize.html
@@ -1473,4 +1478,7 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/source/wand.c
 %%PORTDOCS%%%%DOCSDIR%%-6/www/sponsors.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/stream.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/subversion.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/support.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/wand.png
+%%PORTDOCS%%%%DOCSDIR%%-6/www/webp.html