2 files changed, 184 insertions, 6 deletions

diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index d02ecab25b66..76dddfe45d86 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -29,9 +29,6 @@ TEST_TARGET=	check
 USE_LDCONFIG=	yes
 USES=		libtool localbase pathfix tar:bzip2
 
-PORTDATA=	*
-PORTDOCS=	*
-
 # Use fonts installed by x11-fonts/webfonts by default
 WINDOWS_FONT_DIR?=	${LOCALBASE}/share/fonts/webfonts
 
@@ -53,7 +50,7 @@ LCMS2_CONFIGURE=	lcms2
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 OPENMP_CONFIGURE_OFF=	--disable-openmp --without-threads
 OPENMP_CONFIGURE_ON=	--disable-openmp-slow --enable-openmp --with-threads
-OPENMP_USE=		CXXSTD=c++03	# See PR/221065 for detail
+OPENMP_USE=		CXXSTD=c++03	# See PR/221065 for details
 OPENMP_USES=		compiler:gcc-c++11-lib
 PNG_CONFIGURE_WITH=	png
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
diff --git a/graphics/GraphicsMagick/pkg-plist b/graphics/GraphicsMagick/pkg-plist
index 98aabd3c8b46..9bf07f2e49ed 100644
--- a/graphics/GraphicsMagick/pkg-plist
+++ b/graphics/GraphicsMagick/pkg-plist
@@ -89,6 +89,8 @@ lib/GraphicsMagick/config/type-ghostscript.mgk
 lib/GraphicsMagick/config/type-solaris.mgk
 lib/GraphicsMagick/config/type-windows.mgk
 lib/GraphicsMagick/config/type.mgk
+@dir lib/GraphicsMagick/modules-Q%%Q%%/coders
+@dir lib/GraphicsMagick/modules-Q%%Q%%/filters
 lib/libGraphicsMagick++.a
 lib/libGraphicsMagick++.so
 lib/libGraphicsMagick++.so.12
@@ -110,5 +112,184 @@ man/man1/GraphicsMagickWand-config.1.gz
 man/man1/gm.1.gz
 man/man4/miff.4.gz
 man/man5/quantize.5.gz
-@dir lib/GraphicsMagick/modules-Q%%Q%%/filters
-@dir lib/GraphicsMagick/modules-Q%%Q%%/coders
+%%DATADIR%%/config/colors.mgk
+%%DATADIR%%/config/log.mgk
+%%DATADIR%%/config/modules.mgk
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2001
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2002
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2003
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2004
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2005
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2006
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2007
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2008
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2009
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2010
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2011
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2012
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2013
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2014
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2015
+%%PORTDOCS%%%%DOCSDIR%%/Copyright.txt
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2001.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2002.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2003.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2004.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2005.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2006.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2007.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2008.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2009.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2010.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2011.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2012.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2013.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2014.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2015.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2016.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Changes.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/www/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/www/GraphicsMagick.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Hg.html
+%%PORTDOCS%%%%DOCSDIR%%/www/INSTALL-unix.html
+%%PORTDOCS%%%%DOCSDIR%%/www/INSTALL-windows.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ImageMagickObject.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Blob.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.png
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/ChangeLog.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/CoderInfo.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Color.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Drawable.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Drawable_example_1.png
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Enumerations.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Exception.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/FormatCharacters.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Geometry.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.png
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/ImageDesign.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Montage.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/PixelPacket.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Pixels.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/STL.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/TypeMetric.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/gm-188x120t.png
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/index.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/montage-sample-framed.jpg
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/right_triangle.png
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-framed.jpg
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-plain.jpg
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-sample-framed.jpg
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-sample-plain.jpg
+%%PORTDOCS%%%%DOCSDIR%%/www/NEWS.html
+%%PORTDOCS%%%%DOCSDIR%%/www/OpenMP.html
+%%PORTDOCS%%%%DOCSDIR%%/www/README.html
+%%PORTDOCS%%%%DOCSDIR%%/www/animate.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/animate.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/annotate.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/api.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/attribute.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/average.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/blob.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/cdl.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/channel.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/color.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/colormap.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/compare.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/composite.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/confirm_access.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/constitute.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/decorate.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/deprecate.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/describe.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/display.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/draw.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/effect.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/enhance.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/error.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/export.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/fx.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/hclut.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/image.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/import.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/list.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/magick.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/memory.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/monitor.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/montage.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/operator.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/paint.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/pixel_cache.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/pixel_iterator.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/plasma.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/profile.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/quantize.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/registry.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/render.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/resize.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/resource.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/segment.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/shear.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/signature.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/statistics.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/texture.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/transform.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/types.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/widget.html
+%%PORTDOCS%%%%DOCSDIR%%/www/authors.html
+%%PORTDOCS%%%%DOCSDIR%%/www/batch.html
+%%PORTDOCS%%%%DOCSDIR%%/www/benchmark.html
+%%PORTDOCS%%%%DOCSDIR%%/www/benchmarks.html
+%%PORTDOCS%%%%DOCSDIR%%/www/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/www/color.html
+%%PORTDOCS%%%%DOCSDIR%%/www/compare.html
+%%PORTDOCS%%%%DOCSDIR%%/www/composite.html
+%%PORTDOCS%%%%DOCSDIR%%/www/configure-target-setup.png
+%%PORTDOCS%%%%DOCSDIR%%/www/conjure.html
+%%PORTDOCS%%%%DOCSDIR%%/www/contribute.html
+%%PORTDOCS%%%%DOCSDIR%%/www/convert.html
+%%PORTDOCS%%%%DOCSDIR%%/www/display.html
+%%PORTDOCS%%%%DOCSDIR%%/www/docutils-api.css
+%%PORTDOCS%%%%DOCSDIR%%/www/docutils-articles.css
+%%PORTDOCS%%%%DOCSDIR%%/www/download.html
+%%PORTDOCS%%%%DOCSDIR%%/www/favicon.ico
+%%PORTDOCS%%%%DOCSDIR%%/www/formats.html
+%%PORTDOCS%%%%DOCSDIR%%/www/gm.html
+%%PORTDOCS%%%%DOCSDIR%%/www/identify.html
+%%PORTDOCS%%%%DOCSDIR%%/www/images/ball.png
+%%PORTDOCS%%%%DOCSDIR%%/www/images/banner_bg.png
+%%PORTDOCS%%%%DOCSDIR%%/www/images/gm-107x76.gif
+%%PORTDOCS%%%%DOCSDIR%%/www/images/gm-107x76.png
+%%PORTDOCS%%%%DOCSDIR%%/www/images/gm-125x80t.png
+%%PORTDOCS%%%%DOCSDIR%%/www/images/right_triangle.png
+%%PORTDOCS%%%%DOCSDIR%%/www/images/right_triangle_option.png
+%%PORTDOCS%%%%DOCSDIR%%/www/import.html
+%%PORTDOCS%%%%DOCSDIR%%/www/index.html
+%%PORTDOCS%%%%DOCSDIR%%/www/links.html
+%%PORTDOCS%%%%DOCSDIR%%/www/magick.css
+%%PORTDOCS%%%%DOCSDIR%%/www/miff.html
+%%PORTDOCS%%%%DOCSDIR%%/www/mission.html
+%%PORTDOCS%%%%DOCSDIR%%/www/mogrify.html
+%%PORTDOCS%%%%DOCSDIR%%/www/montage.html
+%%PORTDOCS%%%%DOCSDIR%%/www/motion-picture.html
+%%PORTDOCS%%%%DOCSDIR%%/www/perl.html
+%%PORTDOCS%%%%DOCSDIR%%/www/process.html
+%%PORTDOCS%%%%DOCSDIR%%/www/programming.html
+%%PORTDOCS%%%%DOCSDIR%%/www/project.html
+%%PORTDOCS%%%%DOCSDIR%%/www/quantize.html
+%%PORTDOCS%%%%DOCSDIR%%/www/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/www/security.html
+%%PORTDOCS%%%%DOCSDIR%%/www/smile.c
+%%PORTDOCS%%%%DOCSDIR%%/www/thanks.html
+%%PORTDOCS%%%%DOCSDIR%%/www/time.html
+%%PORTDOCS%%%%DOCSDIR%%/www/tools.html
+%%PORTDOCS%%%%DOCSDIR%%/www/utilities.html
+%%PORTDOCS%%%%DOCSDIR%%/www/version.html
+%%PORTDOCS%%%%DOCSDIR%%/www/wand/drawing_wand.html
+%%PORTDOCS%%%%DOCSDIR%%/www/wand/magick_wand.html
+%%PORTDOCS%%%%DOCSDIR%%/www/wand/pixel_wand.html
+%%PORTDOCS%%%%DOCSDIR%%/www/wand/wand.html