3 files changed, 166 insertions, 139 deletions

diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 7e5237a47654..54f2bf3b6a85 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GraphicsMagick
 PORTVERSION=	1.1.14
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF \
@@ -16,7 +17,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME:L}
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Fast image processing tools based on ImageMagick
 
-CONFLICTS=	GraphicsMagick-1.2.*
+CONFLICTS=	GraphicsMagick-1.[23].*
 
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2	\
 		fpx.[2-9]:${PORTSDIR}/graphics/libfpx	\
@@ -61,6 +62,12 @@ test check:
 
 .include <bsd.port.pre.mk>
 
+.if defined(NOPORTDOCS)
+# Get rid of the Makefile targets that install the documentation
+# and HTML files into DOCSDIR
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Makefile.in
+.endif
+
 .if defined(WITH_WINDOWS_FONT_DIR)
 CONFIGURE_ARGS+=	--with-windows-font-dir="${WINDOWS_FONT_DIR}"
 .endif
diff --git a/graphics/GraphicsMagick/files/extra-patch-Makefile.in b/graphics/GraphicsMagick/files/extra-patch-Makefile.in
new file mode 100644
index 000000000000..3f9fa86d9756
--- /dev/null
+++ b/graphics/GraphicsMagick/files/extra-patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2008-05-12 12:42:50.000000000 -0400
++++ Makefile.in	2008-11-19 18:44:40.000000000 -0500
+@@ -848,7 +848,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-docDATA
++install-data-am: install-data-local
+ 
+ install-dvi: install-dvi-recursive
+ 
+@@ -1029,7 +1029,7 @@
+ install-exec-local: install-exec-perl
+ 
+ # Install arch-independent package data
+-install-data-local: install-data-html
++install-data-local:
+ 
+ # Uninstall arch-independent package data
+ uninstall-local: uninstall-data-html uninstall-exec-perl
diff --git a/graphics/GraphicsMagick/pkg-plist b/graphics/GraphicsMagick/pkg-plist
index 9cef33372758..1e858680948c 100644
--- a/graphics/GraphicsMagick/pkg-plist
+++ b/graphics/GraphicsMagick/pkg-plist
@@ -90,144 +90,144 @@ libdata/pkgconfig/GraphicsMagickWand.pc
 %%DATADIR%%/config/type-solaris.mgk
 %%DATADIR%%/config/type-windows.mgk
 %%DATADIR%%/config/type.mgk
-%%DOCSDIR%%/Copyright.txt
-%%DOCSDIR%%/images/ball.png
-%%DOCSDIR%%/images/corbis.png
-%%DOCSDIR%%/images/examples.jpg
-%%DOCSDIR%%/images/gm-125x80t.png
-%%DOCSDIR%%/images/gm-188x120t.png
-%%DOCSDIR%%/images/gm-282x180t.png
-%%DOCSDIR%%/images/home.png
-%%DOCSDIR%%/images/mail.png
-%%DOCSDIR%%/images/pdfsages.png
-%%DOCSDIR%%/images/pngnow.png
-%%DOCSDIR%%/images/right_triangle.png
-%%DOCSDIR%%/images/right_triangle_option.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/www/AUTHORS.html
-%%DOCSDIR%%/www/Changelog.html
-%%DOCSDIR%%/www/Copyright.html
-%%DOCSDIR%%/www/FAQ.html
-%%DOCSDIR%%/www/GraphicsMagick.html
-%%DOCSDIR%%/www/INSTALL-unix.html
-%%DOCSDIR%%/www/INSTALL-windows.html
-%%DOCSDIR%%/www/ImageMagickObject.html
-%%DOCSDIR%%/www/Magick++/Blob.html
-%%DOCSDIR%%/www/Magick++/Cache.fig
-%%DOCSDIR%%/www/Magick++/Cache.png
-%%DOCSDIR%%/www/Magick++/Cache.svg
-%%DOCSDIR%%/www/Magick++/ChangeLog.html
-%%DOCSDIR%%/www/Magick++/CoderInfo.html
-%%DOCSDIR%%/www/Magick++/Color.html
-%%DOCSDIR%%/www/Magick++/Documentation.html
-%%DOCSDIR%%/www/Magick++/Drawable.html
-%%DOCSDIR%%/www/Magick++/Drawable_example_1.png
-%%DOCSDIR%%/www/Magick++/Enumerations.html
-%%DOCSDIR%%/www/Magick++/Exception.html
-%%DOCSDIR%%/www/Magick++/FormatCharacters.html
-%%DOCSDIR%%/www/Magick++/Future.html
-%%DOCSDIR%%/www/Magick++/Geometry.html
-%%DOCSDIR%%/www/Magick++/Image.fig
-%%DOCSDIR%%/www/Magick++/Image.html
-%%DOCSDIR%%/www/Magick++/Image.png
-%%DOCSDIR%%/www/Magick++/ImageDesign.html
-%%DOCSDIR%%/www/Magick++/ImageMagick.png
-%%DOCSDIR%%/www/Magick++/Install.html
-%%DOCSDIR%%/www/Magick++/Magick++.png
-%%DOCSDIR%%/www/Magick++/Montage.html
-%%DOCSDIR%%/www/Magick++/NEWS.html
-%%DOCSDIR%%/www/Magick++/PixelPacket.html
-%%DOCSDIR%%/www/Magick++/Pixels.html
-%%DOCSDIR%%/www/Magick++/README.txt
-%%DOCSDIR%%/www/Magick++/STL.html
-%%DOCSDIR%%/www/Magick++/TypeMetric.html
-%%DOCSDIR%%/www/Magick++/gm-188x120t.png
-%%DOCSDIR%%/www/Magick++/index.html
-%%DOCSDIR%%/www/Magick++/montage-sample-framed.jpg
-%%DOCSDIR%%/www/Magick++/right_triangle.png
-%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-framed.fig
-%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-framed.jpg
-%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-plain.fig
-%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-plain.jpg
-%%DOCSDIR%%/www/Magick++/thumbnail-sample-framed.jpg
-%%DOCSDIR%%/www/Magick++/thumbnail-sample-plain.jpg
-%%DOCSDIR%%/www/NEWS.html
-%%DOCSDIR%%/www/README.html
-%%DOCSDIR%%/www/animate.html
-%%DOCSDIR%%/www/api.html
-%%DOCSDIR%%/www/api/animate.html
-%%DOCSDIR%%/www/api/annotate.html
-%%DOCSDIR%%/www/api/attribute.html
-%%DOCSDIR%%/www/api/blob.html
-%%DOCSDIR%%/www/api/cache.html
-%%DOCSDIR%%/www/api/cache_view.html
-%%DOCSDIR%%/www/api/color.html
-%%DOCSDIR%%/www/api/composite.html
-%%DOCSDIR%%/www/api/constitute.html
-%%DOCSDIR%%/www/api/decorate.html
-%%DOCSDIR%%/www/api/deprecate.html
-%%DOCSDIR%%/www/api/display.html
-%%DOCSDIR%%/www/api/draw.html
-%%DOCSDIR%%/www/api/effect.html
-%%DOCSDIR%%/www/api/enhance.html
-%%DOCSDIR%%/www/api/error.html
-%%DOCSDIR%%/www/api/fx.html
-%%DOCSDIR%%/www/api/image.html
-%%DOCSDIR%%/www/api/list.html
-%%DOCSDIR%%/www/api/magick.html
-%%DOCSDIR%%/www/api/memory.html
-%%DOCSDIR%%/www/api/monitor.html
-%%DOCSDIR%%/www/api/montage.html
-%%DOCSDIR%%/www/api/paint.html
-%%DOCSDIR%%/www/api/profile.html
-%%DOCSDIR%%/www/api/quantize.html
-%%DOCSDIR%%/www/api/registry.html
-%%DOCSDIR%%/www/api/render.html
-%%DOCSDIR%%/www/api/resize.html
-%%DOCSDIR%%/www/api/resource.html
-%%DOCSDIR%%/www/api/segment.html
-%%DOCSDIR%%/www/api/shear.html
-%%DOCSDIR%%/www/api/signature.html
-%%DOCSDIR%%/www/api/stream.html
-%%DOCSDIR%%/www/api/transform.html
-%%DOCSDIR%%/www/api/types.html
-%%DOCSDIR%%/www/api/widget.html
-%%DOCSDIR%%/www/body.html
-%%DOCSDIR%%/www/books.html
-%%DOCSDIR%%/www/color.html
-%%DOCSDIR%%/www/composite.html
-%%DOCSDIR%%/www/conjure.html
-%%DOCSDIR%%/www/contribute.html
-%%DOCSDIR%%/www/convert.html
-%%DOCSDIR%%/www/cvs.html
-%%DOCSDIR%%/www/development.html
-%%DOCSDIR%%/www/display.html
-%%DOCSDIR%%/www/download.html
-%%DOCSDIR%%/www/formats.html
-%%DOCSDIR%%/www/gm.html
-%%DOCSDIR%%/www/header.html
-%%DOCSDIR%%/www/identify.html
-%%DOCSDIR%%/www/import.html
-%%DOCSDIR%%/www/index.html
-%%DOCSDIR%%/www/install.html
-%%DOCSDIR%%/www/links.html
-%%DOCSDIR%%/www/magick.css
-%%DOCSDIR%%/www/miff.html
-%%DOCSDIR%%/www/mission.html
-%%DOCSDIR%%/www/mogrify.html
-%%DOCSDIR%%/www/montage.html
-%%DOCSDIR%%/www/perl.html
-%%DOCSDIR%%/www/programming.html
-%%DOCSDIR%%/www/quantize.html
-%%DOCSDIR%%/www/smile.c
-%%DOCSDIR%%/www/tools.html
-%%DOCSDIR%%/www/utilities.html
-%%DOCSDIR%%/www/windows.html
-@dirrm %%DOCSDIR%%/www/api
-@dirrm %%DOCSDIR%%/www/Magick++
-@dirrm %%DOCSDIR%%/www
-@dirrm %%DOCSDIR%%/images
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/Copyright.txt
+%%PORTDOCS%%%%DOCSDIR%%/images/ball.png
+%%PORTDOCS%%%%DOCSDIR%%/images/corbis.png
+%%PORTDOCS%%%%DOCSDIR%%/images/examples.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/gm-125x80t.png
+%%PORTDOCS%%%%DOCSDIR%%/images/gm-188x120t.png
+%%PORTDOCS%%%%DOCSDIR%%/images/gm-282x180t.png
+%%PORTDOCS%%%%DOCSDIR%%/images/home.png
+%%PORTDOCS%%%%DOCSDIR%%/images/mail.png
+%%PORTDOCS%%%%DOCSDIR%%/images/pdfsages.png
+%%PORTDOCS%%%%DOCSDIR%%/images/pngnow.png
+%%PORTDOCS%%%%DOCSDIR%%/images/right_triangle.png
+%%PORTDOCS%%%%DOCSDIR%%/images/right_triangle_option.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/www/AUTHORS.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/www/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/www/GraphicsMagick.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.fig
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.png
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.svg
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/ChangeLog.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/CoderInfo.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Color.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Documentation.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++/Future.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Geometry.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.fig
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.png
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/ImageDesign.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/ImageMagick.png
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Install.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Magick++.png
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Montage.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/NEWS.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/PixelPacket.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Pixels.html
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/README.txt
+%%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.fig
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-framed.jpg
+%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-plain.fig
+%%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/README.html
+%%PORTDOCS%%%%DOCSDIR%%/www/animate.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/animate.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/annotate.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/attribute.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/blob.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/cache.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/cache_view.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/color.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/composite.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/constitute.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/decorate.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/deprecate.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/fx.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/image.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/paint.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/stream.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/transform.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/types.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/widget.html
+%%PORTDOCS%%%%DOCSDIR%%/www/body.html
+%%PORTDOCS%%%%DOCSDIR%%/www/books.html
+%%PORTDOCS%%%%DOCSDIR%%/www/color.html
+%%PORTDOCS%%%%DOCSDIR%%/www/composite.html
+%%PORTDOCS%%%%DOCSDIR%%/www/conjure.html
+%%PORTDOCS%%%%DOCSDIR%%/www/contribute.html
+%%PORTDOCS%%%%DOCSDIR%%/www/convert.html
+%%PORTDOCS%%%%DOCSDIR%%/www/cvs.html
+%%PORTDOCS%%%%DOCSDIR%%/www/development.html
+%%PORTDOCS%%%%DOCSDIR%%/www/display.html
+%%PORTDOCS%%%%DOCSDIR%%/www/download.html
+%%PORTDOCS%%%%DOCSDIR%%/www/formats.html
+%%PORTDOCS%%%%DOCSDIR%%/www/gm.html
+%%PORTDOCS%%%%DOCSDIR%%/www/header.html
+%%PORTDOCS%%%%DOCSDIR%%/www/identify.html
+%%PORTDOCS%%%%DOCSDIR%%/www/import.html
+%%PORTDOCS%%%%DOCSDIR%%/www/index.html
+%%PORTDOCS%%%%DOCSDIR%%/www/install.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/perl.html
+%%PORTDOCS%%%%DOCSDIR%%/www/programming.html
+%%PORTDOCS%%%%DOCSDIR%%/www/quantize.html
+%%PORTDOCS%%%%DOCSDIR%%/www/smile.c
+%%PORTDOCS%%%%DOCSDIR%%/www/tools.html
+%%PORTDOCS%%%%DOCSDIR%%/www/utilities.html
+%%PORTDOCS%%%%DOCSDIR%%/www/windows.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/www/api
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/www/Magick++
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/www
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%
 @dirrm include/GraphicsMagick/wand