diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 1a35e9983418..29cb96f253fc 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -2,90 +2,102 @@
 # $FreeBSD$
 
 PORTNAME=	GraphicsMagick
-PORTVERSION=	1.1.15
-PORTREVISION=	6
+PORTVERSION=	1.3.19
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF \
-		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.1/
-PORTSCOUT=	limit:^1\.1\.
+		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
+MASTER_SITE_SUBDIR=	${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast image processing tools based on ImageMagick
 
-CONFLICTS=	GraphicsMagick-1.[23].* GraphicsMagick1[23]-*
+LIB_DEPENDS=	libjbig.so:${PORTSDIR}/graphics/jbigkit		\
+		libjasper.so:${PORTSDIR}/graphics/jasper	\
+		libjpeg.so:${PORTSDIR}/graphics/jpeg		\
+		liblcms2.so:${PORTSDIR}/graphics/lcms2		\
+		libpng15.so:${PORTSDIR}/graphics/png		\
+		libtiff.so:${PORTSDIR}/graphics/tiff		\
+		libfreetype.so:${PORTSDIR}/print/freetype2
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfpx.so:${PORTSDIR}/graphics/libfpx \
-		libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		libpng15.so:${PORTSDIR}/graphics/png \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		liblcms.so:${PORTSDIR}/graphics/lcms \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+CONFLICTS=	GraphicsMagick-1.[12].* GraphicsMagick12-*
 
-OPTIONS_DEFINE=	Q8BIT TESTS X11 DOCS
+PORTSCOUT=	limit:^1\.3\.
 
-Q8BIT_DESC=	Use 8-bit pixels (speed) instead of 16 (quality)
-TESTS_DESC=	Run bundled self-tests after build
-
-OPTIONS_DEFAULT=X11 TESTS DOCS
-
-USES=		iconv
-USE_AUTOTOOLS=	libtool
-USE_BZIP2=	yes
+USES=		iconv tar:bzip2
+USE_GNOME=	libxml2
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--without-perl --enable-shared --enable-static \
+		--with-quantum-depth="${QD}" \
+		--with-windows-font-dir="${WINDOWS_FONT_DIR}"
+USE_LDCONFIG=	yes
 
-.ifndef WINDOWS_FONT_DIR
+PLIST_SUB=	Q="${QD}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+OPTIONS_DEFINE=		DOCS FPX OPENMP Q8BIT SSE TESTS WEBP X11
+OPTIONS_SINGLE=		X11
+OPTIONS_SINGLE_X11=	DPS
+OPTIONS_DEFAULT=	DPS OPENMP WEBP X11
+
+DPS_DESC=		Enable Display Ghostscript support
+DPS_LIB_DEPENDS=	libdps.so:${PORTSDIR}/x11/dgs
+DPS_USE=		XORG=xt
+DPS_CONFIGURE_WITH=	dps
+FPX_LIB_DEPENDS+=	libfpx.so.[2-9]:${PORTSDIR}/graphics/libfpx
+FPX_CONFIGURE_WITH=	fpx
+OPENMP_USES=		compiler:openmp
+OPENMP_CONFIGURE_ON=	--with-threads --enable-openmp --disable-openmp-slow
+OPENMP_CONFIGURE_OFF=	--without-threads --disable-openmp
+Q8BIT_DESC=		Use 8-bit pixels (speed) instead of 16 (quality)
+TESTS_DESC=		Run bundled self-tests after build
+TESTS_BUILD_DEPENDS=	webfonts>0:${PORTSDIR}/x11-fonts/webfonts
+TESTS_RUN_DEPENDS=	webfonts>0:${PORTSDIR}/x11-fonts/webfonts
+WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_CONFIGURE_WITH=	webp
+X11_LIB_DEPENDS=	libwmflite.so:${PORTSDIR}/graphics/${LIBWMF_PORT}
+X11_USE=		XORG=xext
+X11_CONFIGURE_WITH=	x
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MQ8BIT}
+QD=		8
+.else
+QD=		16
+.endif
+
+.if ${PORT_OPTIONS:MSSE}
+.if ${MACHINE_CPU:Msse}
+CFLAGS+=	-msse
+.endif
+.if ${MACHINE_CPU:Msse2}
+CFLAGS+=	-msse2
+.endif
+.if ${MACHINE_CPU:Msse3}
+CFLAGS+=	-msse3
+.endif
+.endif
+
+.if ${PORT_OPTIONS:MX11}
+LIBWMF_PORT=	libwmf
+.else
+LIBWMF_PORT=	libwmf-nox11
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WINDOWS_FONT_DIR)
 # Use fonts installed by x11-fonts/webfonts by default
 WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts
 .endif
 
-CONFIGURE_ARGS=	--without-perl --enable-shared --enable-static \
-		--without-threads
-USE_LDCONFIG=	yes
-
-ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
-
-CFLAGS+=	-DPNG_DEPSTRUCT=
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-test check:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS} == ""
-# 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
-
-.if ${PORT_OPTIONS:MX11} == ""
-CONFIGURE_ARGS+=--without-x
-LIB_DEPENDS+=	libwmflite.so:${PORTSDIR}/graphics/libwmf-nox11
-.else
-LIB_DEPENDS+=	libwmflite.so:${PORTSDIR}/graphics/libwmf
-.endif
-
-.if ${PORT_OPTIONS:MQ8BIT}
-CONFIGURE_ARGS+=	--with-quantum-depth=8
-PLIST_SUB+=		Q=8
-.else
-CONFIGURE_ARGS+=	--with-quantum-depth=16
-PLIST_SUB+=		Q=16
-.endif
-
 .if ${PORT_OPTIONS:MTESTS}
-post-build::	test
+post-build:: regression-test
 .else
 post-build::
 	#
@@ -94,4 +106,16 @@ post-build::
 	#
 .endif
 
-.include <bsd.port.mk>
+post-install:
+.for i in coders filters
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q${QD}/${i}
+.endfor
+
+regression-test: do-build
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} check)
+
+.include <bsd.port.post.mk>
+# The OPENMP option may select gcc as compiler but on architectures
+# that have switched to libc++ clang should be used for C++ code.
+CXX=		c++
diff --git a/graphics/GraphicsMagick/distinfo b/graphics/GraphicsMagick/distinfo
index 58acb58a9362..e1089a407065 100644
--- a/graphics/GraphicsMagick/distinfo
+++ b/graphics/GraphicsMagick/distinfo
@@ -1,2 +1,2 @@
-SHA256 (GraphicsMagick-1.1.15.tar.bz2) = a6707ea1358e3cc93242baad79c352fc93d6eeef1027a781d4bb58ddb027611e
-SIZE (GraphicsMagick-1.1.15.tar.bz2) = 4973158
+SHA256 (GraphicsMagick-1.3.19.tar.bz2) = b57cdeb1ab9492b667776bbbc265149eda5601d2c572d65f43b44273e892fff1
+SIZE (GraphicsMagick-1.3.19.tar.bz2) = 7252296
diff --git a/graphics/GraphicsMagick/files/extra-patch-Makefile.in b/graphics/GraphicsMagick/files/extra-patch-Makefile.in
deleted file mode 100644
index 3f9fa86d9756..000000000000
--- a/graphics/GraphicsMagick/files/extra-patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/files/patch-Magick++__lib__Makefile.in b/graphics/GraphicsMagick/files/patch-Magick++__lib__Makefile.in
deleted file mode 100644
index 6f7d40f3fdd8..000000000000
--- a/graphics/GraphicsMagick/files/patch-Magick++__lib__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Magick++/lib/Makefile.in.orig	2008-04-10 11:16:21.000000000 -0400
-+++ ./Magick++/lib/Makefile.in	2008-09-02 08:05:28.000000000 -0400
-@@ -400,7 +400,7 @@
- AM_LDFLAGS = @LDFLAGS@ $(LIBSTDCLDFLAGS)
- 
- # Pkgconfig directory
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- 
- # Files to install in Pkgconfig directory
- pkgconfig_DATA = GraphicsMagick++.pc
diff --git a/graphics/GraphicsMagick/files/patch-Makefile.in b/graphics/GraphicsMagick/files/patch-Makefile.in
new file mode 100644
index 000000000000..7c5d272c8bd3
--- /dev/null
+++ b/graphics/GraphicsMagick/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2008-05-18 17:22:51.000000000 -0400
++++ Makefile.in	2008-06-06 18:41:23.620488084 -0400
+@@ -1775,7 +1775,7 @@
+ MagickLibConfigPath = @MagickLibConfigPath@
+ MagickLibPath = @MagickLibPath@
+ MagickShareConfigPath = @MagickShareConfigPath@
+-MagickSharePath = @MagickSharePath@
++MagickSharePath = ${DATADIR}
+ MogrifyDelegate = @MogrifyDelegate@
+ NM = @NM@
+ NMEDIT = @NMEDIT@
+@@ -4382,7 +4382,7 @@
+ @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATICNAME = PerlMagick
+ 
+ # Pkgconfig directory
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ 
+ # Files to install in Pkgconfig directory
+ pkgconfig_DATA = \
diff --git a/graphics/GraphicsMagick/files/patch-coders__Makefile.in b/graphics/GraphicsMagick/files/patch-coders__Makefile.in
deleted file mode 100644
index e703b93259a7..000000000000
--- a/graphics/GraphicsMagick/files/patch-coders__Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./coders/Makefile.in.orig	2008-04-10 11:16:23.000000000 -0400
-+++ ./coders/Makefile.in	2008-09-02 08:05:28.000000000 -0400
-@@ -1696,7 +1696,7 @@
- 	done
- install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)" -o -z "$(pkg_LTLIBRARIES)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- 	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -2038,7 +2038,7 @@
- 	-rm -rf .libs _libs
- install-pkgDATA: $(pkg_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- 	@list='$(pkg_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -2055,7 +2055,7 @@
- 	done
- install-pkgdataDATA: $(pkgdata_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-+	test -z "$(pkgdatadir)" -o -z '$(pkgdata_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- 	@list='$(pkgdata_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
diff --git a/graphics/GraphicsMagick/files/patch-coders__fpx.c b/graphics/GraphicsMagick/files/patch-coders__fpx.c
deleted file mode 100644
index 36f49dadeec8..000000000000
--- a/graphics/GraphicsMagick/files/patch-coders__fpx.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./coders/fpx.c.orig	2007-11-05 22:03:47.000000000 -0500
-+++ ./coders/fpx.c	2008-09-02 08:05:29.000000000 -0400
-@@ -181,15 +181,15 @@
- 
-   unsigned int
-     status,
--    subimage;
--
--  unsigned long
-+    subimage,
-     height,
--    memory_limit,
-     tile_width,
-     tile_height,
-     width;
- 
-+  size_t
-+    memory_limit;
-+
-   /*
-     Open image.
-   */
diff --git a/graphics/GraphicsMagick/files/patch-coders__png.c b/graphics/GraphicsMagick/files/patch-coders__png.c
deleted file mode 100644
index ff6d44b05c8c..000000000000
--- a/graphics/GraphicsMagick/files/patch-coders__png.c
+++ /dev/null
@@ -1,241 +0,0 @@
---- coders/png.c.orig	2008-01-18 00:34:17.000000000 +0100
-+++ coders/png.c	2012-04-29 07:23:05.000000000 +0200
-@@ -73,6 +73,7 @@
- #if defined(HasPNG)
- #include "png.h"
- #include "zlib.h"
-+#include "pngpriv.h"
- 
- #if PNG_LIBPNG_VER > 95
- /*
-@@ -1365,7 +1366,7 @@
-       "  libpng-%.1024s error: %.1024s", PNG_LIBPNG_VER_STRING,
-       message);
-   (void) ThrowException2(&image->exception,CoderError,message,image->filename);
--  longjmp(ping->jmpbuf,1);
-+  longjmp(png_jmpbuf(ping),1);
- }
- 
- static void PNGWarningHandler(png_struct *ping,png_const_charp message)
-@@ -1660,7 +1661,7 @@
-       ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image)
-     }
-   png_pixels=(unsigned char *) NULL;
--  if (setjmp(ping->jmpbuf))
-+  if (setjmp(png_jmpbuf(ping)))
-     {
-       /*
-         PNG image is corrupt.
-@@ -2038,10 +2039,10 @@
-       /*
-         Image has a transparent background.
-       */
--      transparent_color.red=(int) (ping_info->trans_values.red*scale);
--      transparent_color.green=(int) (ping_info->trans_values.green*scale);
--      transparent_color.blue=(int) (ping_info->trans_values.blue*scale);
--      transparent_color.opacity=(int) (ping_info->trans_values.gray*scale);
-+      transparent_color.red=(int) (ping_info->trans_color.red*scale);
-+      transparent_color.green=(int) (ping_info->trans_color.green*scale);
-+      transparent_color.blue=(int) (ping_info->trans_color.blue*scale);
-+      transparent_color.opacity=(int) (ping_info->trans_color.gray*scale);
-       if (ping_info->color_type == PNG_COLOR_TYPE_GRAY)
-         {
-           transparent_color.red=transparent_color.opacity;
-@@ -2547,7 +2548,7 @@
-                 index=indexes[x];
-                 if (index < ping_info->num_trans)
-                   q->opacity=
--                    ScaleCharToQuantum(255-ping_info->trans[index]);
-+                    ScaleCharToQuantum(255-ping_info->trans_alpha[index]);
-                 q++;
-               }
-             else if (ping_info->color_type == PNG_COLOR_TYPE_GRAY)
-@@ -6030,7 +6031,7 @@
-   png_set_write_fn(ping,image,png_put_data,png_flush_data);
-   png_pixels=(unsigned char *) NULL;
- 
--  if (setjmp(ping->jmpbuf))
-+  if (setjmp(png_jmpbuf(ping)))
-     {
-       /*
-         PNG write failed.
-@@ -6229,12 +6230,12 @@
-           /*
-             Identify which colormap entry is transparent.
-           */
--          ping_info->trans=MagickAllocateMemory(unsigned char *,number_colors);
--          if (ping_info->trans == (unsigned char *) NULL)
-+          ping_info->trans_alpha=MagickAllocateMemory(unsigned char *,number_colors);
-+          if (ping_info->trans_alpha == (unsigned char *) NULL)
-             ThrowWriterException(ResourceLimitError,MemoryAllocationFailed,image);
-           assert(number_colors <= 256);
-           for (i=0; i < (long) number_colors; i++)
--             ping_info->trans[i]=255;
-+             ping_info->trans_alpha[i]=255;
-           for (y=0; y < (long) image->rows; y++)
-           {
-             register const PixelPacket
-@@ -6254,7 +6255,7 @@
- 
-                   index=indexes[x];
-                   assert((unsigned long) index < number_colors);
--                  ping_info->trans[index]=(png_byte) (255-
-+                  ping_info->trans_alpha[index]=(png_byte) (255-
-                     ScaleQuantumToChar(p->opacity));
-                 }
-               p++;
-@@ -6262,14 +6263,14 @@
-           }
-           ping_info->num_trans=0;
-           for (i=0; i < (long) number_colors; i++)
--            if (ping_info->trans[i] != 255)
-+            if (ping_info->trans_alpha[i] != 255)
-               ping_info->num_trans=(unsigned short) (i+1);
-           if (ping_info->num_trans == 0)
-             ping_info->valid&=(~PNG_INFO_tRNS);
-           if (!(ping_info->valid & PNG_INFO_tRNS))
-             ping_info->num_trans=0;
-           if (ping_info->num_trans == 0)
--            MagickFreeMemory(ping_info->trans);
-+            MagickFreeMemory(ping_info->trans_alpha);
-           /*
-             Identify which colormap entry is the background color.
-           */
-@@ -6388,12 +6389,12 @@
-               if (ping_info->bit_depth == 1)
-                  mask=0x0001;
-               ping_info->valid|=PNG_INFO_tRNS;
--              ping_info->trans_values.red=ScaleQuantumToShort(p->red)&mask;
--              ping_info->trans_values.green=ScaleQuantumToShort(p->green)&mask;
--              ping_info->trans_values.blue=ScaleQuantumToShort(p->blue)&mask;
--              ping_info->trans_values.gray=
-+              ping_info->trans_color.red=ScaleQuantumToShort(p->red)&mask;
-+              ping_info->trans_color.green=ScaleQuantumToShort(p->green)&mask;
-+              ping_info->trans_color.blue=ScaleQuantumToShort(p->blue)&mask;
-+              ping_info->trans_color.gray=
-                  (png_uint_16) ScaleQuantumToShort(PixelIntensity(p))&mask;
--              ping_info->trans_values.index=(unsigned char)
-+              ping_info->trans_color.index=(unsigned char)
-                  (ScaleQuantumToChar(MaxRGB-p->opacity));
-             }
-           if (ping_info->valid & PNG_INFO_tRNS)
-@@ -6413,7 +6414,7 @@
-                 {
-                   if (p->opacity != OpaqueOpacity)
-                     {
--                      if (!RGBColorMatchExact(ping_info->trans_values,*p))
-+                      if (!RGBColorMatchExact(ping_info->trans_color,*p))
-                       {
-                          break;  /* Can't use RGB + tRNS for multiple
-                                     transparent colors.  */
-@@ -6426,7 +6427,7 @@
-                     }
-                    else
-                     {
--                      if (RGBColorMatchExact(ping_info->trans_values,*p))
-+                      if (RGBColorMatchExact(ping_info->trans_color,*p))
-                           break; /* Can't use RGB + tRNS when another pixel
-                                     having the same RGB samples is
-                                     transparent. */
-@@ -6444,10 +6445,10 @@
-               ping_info->color_type &= 0x03;  /* changes 4 or 6 to 0 or 2 */
-               if (image->depth == 8)
-                 {
--                  ping_info->trans_values.red&=0xff;
--                  ping_info->trans_values.green&=0xff;
--                  ping_info->trans_values.blue&=0xff;
--                  ping_info->trans_values.gray&=0xff;
-+                  ping_info->trans_color.red&=0xff;
-+                  ping_info->trans_color.green&=0xff;
-+                  ping_info->trans_color.blue&=0xff;
-+                  ping_info->trans_color.gray&=0xff;
-                 }
-             }
-         }
-@@ -6463,7 +6464,7 @@
-           {
-             ping_info->color_type=PNG_COLOR_TYPE_GRAY;
-             if (save_image_depth == 16 && image->depth == 8)
--              ping_info->trans_values.gray*=0x0101;
-+              ping_info->trans_color.gray*=0x0101;
-           }
-         if (image->depth > QuantumDepth)
-           image->depth=QuantumDepth;
-@@ -6577,14 +6578,14 @@
-               /*
-                 Identify which colormap entry is transparent.
-               */
--              ping_info->trans=MagickAllocateMemory(unsigned char *,
-+              ping_info->trans_alpha=MagickAllocateMemory(unsigned char *,
-                   number_colors);
--              if (ping_info->trans == (unsigned char *) NULL)
-+              if (ping_info->trans_alpha == (unsigned char *) NULL)
-                 ThrowWriterException(ResourceLimitError,
-                     MemoryAllocationFailed,image);
-               assert(number_colors <= 256);
-               for (i=0; i < (long) number_colors; i++)
--                 ping_info->trans[i]=255;
-+                 ping_info->trans_alpha[i]=255;
-               for (y=0; y < (long) image->rows; y++)
-               {
-                 register const PixelPacket
-@@ -6604,21 +6605,21 @@
- 
-                       index=indexes[x];
-                       assert((unsigned long) index < number_colors);
--                      ping_info->trans[index]=(png_byte) (255-
-+                      ping_info->trans_alpha[index]=(png_byte) (255-
-                         ScaleQuantumToChar(p->opacity));
-                     }
-                   p++;
-                 }
-               }
-               for (i=0; i < (long) number_colors; i++)
--                if (ping_info->trans[i] != 255)
-+                if (ping_info->trans_alpha[i] != 255)
-                   ping_info->num_trans=(unsigned short) (i+1);
-               if (ping_info->num_trans == 0)
-                 ping_info->valid&=(~PNG_INFO_tRNS);
-               if (!(ping_info->valid & PNG_INFO_tRNS))
-                 ping_info->num_trans=0;
-               if (ping_info->num_trans == 0)
--                MagickFreeMemory(ping_info->trans);
-+                MagickFreeMemory(ping_info->trans_alpha);
-             }
- 
-             /*
-@@ -6636,10 +6637,10 @@
-           image->depth=8;
-         if ((save_image_depth == 16) && (image->depth == 8))
-           {
--            ping_info->trans_values.red*=0x0101;
--            ping_info->trans_values.green*=0x0101;
--            ping_info->trans_values.blue*=0x0101;
--            ping_info->trans_values.gray*=0x0101;
-+            ping_info->trans_color.red*=0x0101;
-+            ping_info->trans_color.green*=0x0101;
-+            ping_info->trans_color.blue*=0x0101;
-+            ping_info->trans_color.gray*=0x0101;
-           }
-       }
- 
-@@ -6666,8 +6667,8 @@
-                "  Setting up bKGD chunk");
-          png_set_bKGD(ping,ping_info,&background);
- 
--         ping_info->trans_values.gray=(png_uint_16)(maxval*
--           ping_info->trans_values.gray/MaxRGB);
-+         ping_info->trans_color.gray=(png_uint_16)(maxval*
-+           ping_info->trans_color.gray/MaxRGB);
-       }
-     }
-   if (logging)
-@@ -7174,7 +7175,7 @@
- #endif
-   if (ping_info->valid & PNG_INFO_tRNS)
-     {
--      MagickFreeMemory(ping_info->trans);
-+      MagickFreeMemory(ping_info->trans_alpha);
-       ping_info->valid&=(~PNG_INFO_tRNS);
-     }
-   png_destroy_write_struct(&ping,&ping_info);
diff --git a/graphics/GraphicsMagick/files/patch-configure b/graphics/GraphicsMagick/files/patch-configure
index 18c490659397..1680e29eafa8 100644
--- a/graphics/GraphicsMagick/files/patch-configure
+++ b/graphics/GraphicsMagick/files/patch-configure
@@ -1,58 +1,108 @@
---- configure.orig	2008-11-20 04:31:11.000000000 +0100
-+++ configure	2013-12-13 12:12:27.000000000 +0100
-@@ -32116,7 +32116,7 @@
-     fi
+--- configure.orig	2013-12-31 20:58:17.000000000 +0100
++++ configure	2014-04-26 15:53:04.000000000 +0200
+@@ -12919,7 +12919,6 @@
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+     freebsd* | dragonfly*)
+       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-      hardcode_libdir_flag_spec='-R$libdir'
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
+       ;;
+@@ -23889,60 +23888,6 @@
+     X_CFLAGS="$X_CFLAGS -I$x_includes"
+   fi
  
-     # Some Freetype installs appear to require that <ft2build.h> be
--    # included prior to including <freetype/freetype.h>.  Oops!
-+    # included prior to including <freetype.h>.  Oops!
-     if test "${ac_cv_header_ft2build_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for ft2build.h" >&5
- echo $ECHO_N "checking for ft2build.h... $ECHO_C" >&6; }
-@@ -32249,8 +32249,8 @@
- fi
+-  # It would also be nice to do this for all -L options, not just this one.
+-  if test -n "$x_libraries"; then
+-    X_LIBS="$X_LIBS -L$x_libraries"
+-    # For Solaris; some versions of Sun CC require a space after -R and
+-    # others require no space.  Words are not sufficient . . . .
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
+-$as_echo_n "checking whether -R must be followed by a space... " >&6; }
+-    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+-    ac_xsave_c_werror_flag=$ac_c_werror_flag
+-    ac_c_werror_flag=yes
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-       X_LIBS="$X_LIBS -R$x_libraries"
+-else
+-  LIBS="$ac_xsave_LIBS -R $x_libraries"
+-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	  X_LIBS="$X_LIBS -R $x_libraries"
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+-$as_echo "neither works" >&6; }
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-    ac_c_werror_flag=$ac_xsave_c_werror_flag
+-    LIBS=$ac_xsave_LIBS
+-  fi
  
- 
--    { echo "$as_me:$LINENO: checking for freetype/freetype.h" >&5
--echo $ECHO_N "checking for freetype/freetype.h... $ECHO_C" >&6; }
-+    { echo "$as_me:$LINENO: checking for freetype.h" >&5
-+echo $ECHO_N "checking for freetype.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_freetype_freetype_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   # Check for system-dependent libraries X programs must link with.
+   # Do this before checking for the system-independent R6 libraries
+@@ -24637,15 +24582,16 @@
+     # Cygwin doesn't deliver -lXt as a DLL, which prevents a DLL build.
+     # Adobe DPS (as delivered on Solaris) doesn't require -lXt.
+     # GraphicsMagick itself doesn't use -lXt.
++    # in FreeBSD < 10, libXt is added by the linker, bot on >= 10
+     have_libdps='no'
+-    LIBDPS_XT=''
++    LIBDPS_XT='-lXt'
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPSInitialize in -ldps" >&5
+ $as_echo_n "checking for DPSInitialize in -ldps... " >&6; }
+ if ${ac_cv_lib_dps_DPSInitialize+:} false; then :
+   $as_echo_n "(cached) " >&6
  else
-@@ -32262,7 +32262,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldps  $LIBS"
++LIBS="-ldps $LIBDPS_XT $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- $FT2BUILD_H
  
--#include <freetype/freetype.h>
-+#include <freetype.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
-@@ -34050,7 +34050,7 @@
- #define MagickLibConfigSubDir "$MagickLibConfigSubDir"
- _ACEOF
+@@ -27095,7 +27041,7 @@
+ #
+ 
+ # Subdirectory under lib to place GraphicsMagick lib files
+-MagickLibSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
++MagickLibSubdir="${PACKAGE_NAME}"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define MagickLibSubdir "$MagickLibSubdir"
+@@ -27199,7 +27145,7 @@
  
--MagickLibConfigPath="${LIB_DIR}/${MagickLibConfigSubDir}"
-+MagickLibConfigPath="${DATA_DIR}/GraphicsMagick/config"
- MagickLibConfigPathDefine="${MagickLibConfigPath}/"
- if test "$native_win32_build" = 'yes'
- then
-@@ -34108,7 +34108,7 @@
  #
  # Path to GraphicsMagick share files
- MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
--MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
-+MagickSharePath="${DATA_DIR}/GraphicsMagick/"
+-MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
++MagickShareSubdir="${PACKAGE_NAME}"
+ MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
  MagickSharePathDefine="${MagickSharePath}/"
- if test "$native_win32_build" = 'yes'
- then
-@@ -34128,7 +34128,7 @@
- #define MagickShareConfigSubDir "$MagickShareConfigSubDir"
- _ACEOF
- 
--MagickShareConfigPath="${DATA_DIR}/${MagickShareConfigSubDir}"
-+MagickShareConfigPath="${MagickLibConfigPath}"
- MagickShareConfigPathDefine="${MagickShareConfigPath}/"
- if test "$native_win32_build" = 'yes'
- then
+ case "${build_os}" in
diff --git a/graphics/GraphicsMagick/files/patch-filters__Makefile.in b/graphics/GraphicsMagick/files/patch-filters__Makefile.in
deleted file mode 100644
index b91a8af3bf1e..000000000000
--- a/graphics/GraphicsMagick/files/patch-filters__Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./filters/Makefile.in.orig	2008-04-10 11:16:24.000000000 -0400
-+++ ./filters/Makefile.in	2008-09-02 08:05:29.000000000 -0400
-@@ -464,7 +464,7 @@
- 	done
- install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)"  -o -z '$(pkg_LTLIBRARIES)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- 	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -530,7 +530,7 @@
- 	-rm -rf .libs _libs
- install-pkgDATA: $(pkg_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- 	@list='$(pkg_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
diff --git a/graphics/GraphicsMagick/files/patch-magick__Makefile.in b/graphics/GraphicsMagick/files/patch-magick__Makefile.in
deleted file mode 100644
index aca343ca9e31..000000000000
--- a/graphics/GraphicsMagick/files/patch-magick__Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./magick/Makefile.in.orig	2008-04-10 11:16:24.000000000 -0400
-+++ ./magick/Makefile.in	2008-09-02 08:05:29.000000000 -0400
-@@ -612,7 +612,7 @@
- pkgdata_DATA = 
- 
- # Pkgconfig directory
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- 
- # Files to install in Pkgconfig directory
- pkgconfig_DATA = GraphicsMagick.pc
-@@ -876,7 +876,7 @@
- 	done
- install-pkgDATA: $(pkg_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- 	@list='$(pkg_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
diff --git a/graphics/GraphicsMagick/files/patch-magick__locale_c.h b/graphics/GraphicsMagick/files/patch-magick__locale_c.h
deleted file mode 100644
index 20e8e213b1b7..000000000000
--- a/graphics/GraphicsMagick/files/patch-magick__locale_c.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- magick/locale_c.h.orig	2004-07-06 02:06:31.000000000 +0200
-+++ magick/locale_c.h	2010-03-28 20:13:08.000000000 +0200
-@@ -251,7 +251,7 @@
- #define MGK_OptionErrorStereoImageRequired 244
- #define MGK_OptionErrorSubimageSpecificationReturnsNoImages 245
- #define MGK_OptionErrorUnableToAddOrRemoveProfile 246
--#define MGK_OptionErrorUnableToAllocateICCProfile 247
-+#define MGK_ResourceLimitErrorUnableToAllocateICCProfile 247
- #define MGK_OptionErrorUnableToAverageImageSequence 248
- #define MGK_OptionErrorUnableToBlurImage 249
- #define MGK_OptionErrorUnableToChopImage 250
diff --git a/graphics/GraphicsMagick/files/patch-magick__symbols.h b/graphics/GraphicsMagick/files/patch-magick__symbols.h
deleted file mode 100644
index 4021e7c561b0..000000000000
--- a/graphics/GraphicsMagick/files/patch-magick__symbols.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./magick/symbols.h.orig	2004-04-14 18:45:07.000000000 -0400
-+++ ./magick/symbols.h	2008-09-02 08:05:29.000000000 -0400
-@@ -17,6 +17,8 @@
- #if !defined(_MAGICK_SYMBOLS_H)
- #define _MAGICK_SYMBOLS_H
- 
-+#define GetToken GmGetToken
-+
- #if defined(PREFIX_MAGICK_SYMBOLS)
- #define AccessDefinition GmAccessDefinition
- #define AcquireCacheNexus GmAcquireCacheNexus
-@@ -386,7 +388,6 @@
- #define GetQuantizeInfo GmGetQuantizeInfo
- #define GetSignatureInfo GmGetSignatureInfo
- #define GetTimerInfo GmGetTimerInfo
--#define GetToken GmGetToken
- #define GetTypeInfo GmGetTypeInfo
- #define GetTypeInfoByFamily GmGetTypeInfoByFamily
- #define GetTypeList GmGetTypeList
diff --git a/graphics/GraphicsMagick/files/patch-wand__Makefile.in b/graphics/GraphicsMagick/files/patch-wand__Makefile.in
deleted file mode 100644
index 443ed9f5fa99..000000000000
--- a/graphics/GraphicsMagick/files/patch-wand__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./wand/Makefile.in.orig	2008-04-10 11:16:25.000000000 -0400
-+++ ./wand/Makefile.in	2008-09-02 08:05:29.000000000 -0400
-@@ -427,7 +427,7 @@
- noinst_HEADERS = magick_compat.h
- 
- # Pkgconfig directory
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- 
- # Files to install in Pkgconfig directory
- pkgconfig_DATA = GraphicsMagickWand.pc
diff --git a/graphics/GraphicsMagick/pkg-descr b/graphics/GraphicsMagick/pkg-descr
index 674c242b52b5..b3898f1d5b47 100644
--- a/graphics/GraphicsMagick/pkg-descr
+++ b/graphics/GraphicsMagick/pkg-descr
@@ -7,4 +7,4 @@ JPEG-2000, PNG, PDF, SVG and TIFF.
 The program is the fork of a better-known ImageMagick (5.5.2), which
 emphasizes end-user and API-stabilities.
 
-WWW:    http://www.graphicsmagick.org/
+WWW: http://www.graphicsmagick.org/
diff --git a/graphics/GraphicsMagick/pkg-plist b/graphics/GraphicsMagick/pkg-plist
index 9abaa736d42e..b7eccb451055 100644
--- a/graphics/GraphicsMagick/pkg-plist
+++ b/graphics/GraphicsMagick/pkg-plist
@@ -15,26 +15,37 @@ include/GraphicsMagick/Magick++/Montage.h
 include/GraphicsMagick/Magick++/Pixels.h
 include/GraphicsMagick/Magick++/STL.h
 include/GraphicsMagick/Magick++/TypeMetric.h
-include/GraphicsMagick/magick/PreRvIcccm.h
+include/GraphicsMagick/magick/analyze.h
 include/GraphicsMagick/magick/api.h
 include/GraphicsMagick/magick/attribute.h
+include/GraphicsMagick/magick/average.h
 include/GraphicsMagick/magick/blob.h
-include/GraphicsMagick/magick/cache.h
-include/GraphicsMagick/magick/cache_view.h
+include/GraphicsMagick/magick/cdl.h
+include/GraphicsMagick/magick/channel.h
 include/GraphicsMagick/magick/color.h
+include/GraphicsMagick/magick/color_lookup.h
+include/GraphicsMagick/magick/colormap.h
+include/GraphicsMagick/magick/colorspace.h
 include/GraphicsMagick/magick/command.h
+include/GraphicsMagick/magick/common.h
+include/GraphicsMagick/magick/compare.h
 include/GraphicsMagick/magick/composite.h
 include/GraphicsMagick/magick/compress.h
+include/GraphicsMagick/magick/confirm_access.h
 include/GraphicsMagick/magick/constitute.h
 include/GraphicsMagick/magick/decorate.h
 include/GraphicsMagick/magick/delegate.h
 include/GraphicsMagick/magick/deprecate.h
+include/GraphicsMagick/magick/describe.h
 include/GraphicsMagick/magick/draw.h
 include/GraphicsMagick/magick/effect.h
 include/GraphicsMagick/magick/enhance.h
 include/GraphicsMagick/magick/error.h
+include/GraphicsMagick/magick/forward.h
 include/GraphicsMagick/magick/fx.h
 include/GraphicsMagick/magick/gem.h
+include/GraphicsMagick/magick/gradient.h
+include/GraphicsMagick/magick/hclut.h
 include/GraphicsMagick/magick/image.h
 include/GraphicsMagick/magick/list.h
 include/GraphicsMagick/magick/log.h
@@ -42,42 +53,57 @@ include/GraphicsMagick/magick/magic.h
 include/GraphicsMagick/magick/magick.h
 include/GraphicsMagick/magick/magick_config.h
 include/GraphicsMagick/magick/magick_types.h
+include/GraphicsMagick/magick/memory.h
 include/GraphicsMagick/magick/module.h
 include/GraphicsMagick/magick/monitor.h
 include/GraphicsMagick/magick/montage.h
+include/GraphicsMagick/magick/operator.h
 include/GraphicsMagick/magick/paint.h
+include/GraphicsMagick/magick/pixel_cache.h
+include/GraphicsMagick/magick/pixel_iterator.h
+include/GraphicsMagick/magick/plasma.h
 include/GraphicsMagick/magick/profile.h
 include/GraphicsMagick/magick/quantize.h
+include/GraphicsMagick/magick/random.h
 include/GraphicsMagick/magick/registry.h
 include/GraphicsMagick/magick/render.h
 include/GraphicsMagick/magick/resize.h
 include/GraphicsMagick/magick/resource.h
 include/GraphicsMagick/magick/shear.h
 include/GraphicsMagick/magick/signature.h
-include/GraphicsMagick/magick/stream.h
+include/GraphicsMagick/magick/statistics.h
 include/GraphicsMagick/magick/symbols.h
+include/GraphicsMagick/magick/texture.h
 include/GraphicsMagick/magick/timer.h
 include/GraphicsMagick/magick/transform.h
+include/GraphicsMagick/magick/type.h
 include/GraphicsMagick/magick/utility.h
 include/GraphicsMagick/magick/version.h
-include/GraphicsMagick/magick/widget.h
-include/GraphicsMagick/magick/xwindow.h
 include/GraphicsMagick/wand/drawing_wand.h
 include/GraphicsMagick/wand/magick_wand.h
 include/GraphicsMagick/wand/pixel_wand.h
 include/GraphicsMagick/wand/wand_api.h
+include/GraphicsMagick/wand/wand_symbols.h
+lib/GraphicsMagick/config/delegates.mgk
+lib/GraphicsMagick/config/type-ghostscript.mgk
+lib/GraphicsMagick/config/type-solaris.mgk
+lib/GraphicsMagick/config/type-windows.mgk
+lib/GraphicsMagick/config/type.mgk
+@exec mkdir -p %D/lib/GraphicsMagick/modules-Q%%Q%%
+@exec mkdir -p %D/lib/GraphicsMagick/modules-Q%%Q%%/coders
+@exec mkdir -p %D/lib/GraphicsMagick/modules-Q%%Q%%/filters
 lib/libGraphicsMagick++.a
 lib/libGraphicsMagick++.la
 lib/libGraphicsMagick++.so
-lib/libGraphicsMagick++.so.1
+lib/libGraphicsMagick++.so.9
 lib/libGraphicsMagick.a
 lib/libGraphicsMagick.la
 lib/libGraphicsMagick.so
-lib/libGraphicsMagick.so.1
+lib/libGraphicsMagick.so.14
 lib/libGraphicsMagickWand.a
 lib/libGraphicsMagickWand.la
 lib/libGraphicsMagickWand.so
-lib/libGraphicsMagickWand.so.0
+lib/libGraphicsMagickWand.so.8
 libdata/pkgconfig/GraphicsMagick++.pc
 libdata/pkgconfig/GraphicsMagick.pc
 libdata/pkgconfig/GraphicsMagickWand.pc
@@ -88,103 +114,112 @@ man/man1/gm.1.gz
 man/man4/miff.4.gz
 man/man5/quantize.5.gz
 %%DATADIR%%/config/colors.mgk
-%%DATADIR%%/config/delegates.mgk
 %%DATADIR%%/config/log.mgk
-%%DATADIR%%/config/magic.mgk
 %%DATADIR%%/config/modules.mgk
-%%DATADIR%%/config/type-ghostscript.mgk
-%%DATADIR%%/config/type-solaris.mgk
-%%DATADIR%%/config/type-windows.mgk
-%%DATADIR%%/config/type.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%%/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%%/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.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.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/OpenMP.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/api.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/attribute.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/average.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/blob.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/cache.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/cache_view.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
@@ -194,48 +229,74 @@ man/man5/quantize.5.gz
 %%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/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/body.html
-%%PORTDOCS%%%%DOCSDIR%%/www/books.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/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/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/header.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/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/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/smile.c
+%%PORTDOCS%%%%DOCSDIR%%/www/time.html
 %%PORTDOCS%%%%DOCSDIR%%/www/tools.html
 %%PORTDOCS%%%%DOCSDIR%%/www/utilities.html
-%%PORTDOCS%%%%DOCSDIR%%/www/windows.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
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/www/wand
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/www/images
 %%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 lib/GraphicsMagick/modules-Q%%Q%%/filters
+@dirrm lib/GraphicsMagick/modules-Q%%Q%%/coders
+@dirrm lib/GraphicsMagick/modules-Q%%Q%%
+@dirrm lib/GraphicsMagick/config
+@dirrm lib/GraphicsMagick
 @dirrm include/GraphicsMagick/wand
 @dirrm include/GraphicsMagick/magick
 @dirrm include/GraphicsMagick/Magick++
diff --git a/graphics/pecl-gmagick/Makefile b/graphics/pecl-gmagick/Makefile
index 3c3b10db47df..21774f066459 100644
--- a/graphics/pecl-gmagick/Makefile
+++ b/graphics/pecl-gmagick/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gmagick
 PORTVERSION=	1.1.7RC2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@@ -12,7 +13,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	bsdports@wayfair.com
 COMMENT=	Provides a wrapper to the GraphicsMagick library
 
-LIB_DEPENDS=	GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick
+LIB_DEPENDS=	libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index ec3bef1acd5c..02605b57ce10 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vips
 PORTVERSION=	7.26.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
 
@@ -16,29 +16,27 @@ LIBOIL_DESC=	Use liboil for CPU-optimized primitives
 PYTHON_DESC=	Create Python bindings
 
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		exif:${PORTSDIR}/graphics/libexif	\
-		tiff:${PORTSDIR}/graphics/tiff \
-		GraphicsMagick:${PORTSDIR}/graphics/GraphicsMagick \
-		IlmImf:${PORTSDIR}/graphics/OpenEXR \
-		orc-0:${PORTSDIR}/devel/orc	\
-		png15:${PORTSDIR}/graphics/png \
-		matio:${PORTSDIR}/math/matio	\
-		lcms:${PORTSDIR}/graphics/lcms
+LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libexif.so:${PORTSDIR}/graphics/libexif	\
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick \
+		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
+		liborc-0.4.so:${PORTSDIR}/devel/orc	\
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libmatio.so:${PORTSDIR}/math/matio	\
+		liblcms.so:${PORTSDIR}/graphics/lcms
 
 PYPRESENT!=	which python > /dev/null && echo on || echo off
 .if ${PYPRESENT} == on
 OPTIONS_DEFAULT+=	PYTHON
 .endif
-USES=		gettext gmake perl5 pkgconfig
+USES=		gettext gmake libtool pathfix perl5 pkgconfig
 USE_PERL5=	build
-USE_GNOME=	gnomehack glib20 pango libxml2
-USE_AUTOTOOLS=	libtool
+USE_GNOME=	glib20 pango libxml2
 USE_LDCONFIG=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
-NO_STAGE=	yes
 post-configure:
 	${REINPLACE_CMD} -Ee 's,^(G?MSGFMT = *)$$,\1${LOCALBASE}/bin/msgfmt,g' \
 		${WRKSRC}/po/Makefile
@@ -52,15 +50,13 @@ EXTRA_PATCHES=	${FILESDIR}/nodoc-patch
 PLIST_SUB+=	VERSION=${PORTVERSION:R}
 
 CONFIGURE_ENV+=	MAGICK_CFLAGS="-I${LOCALBASE}/include/GraphicsMagick"
-CONFIGURE_ARGS+=--without-x --mandir=${PREFIX}/man --with-magickpackage=GraphicsMagick
+CONFIGURE_ARGS+=--without-x --mandir=${STAGEDIR}${PREFIX}/man --with-magickpackage=GraphicsMagick
 CONFIGURE_ARGS+=--without-v4l
 .for p in tiff jpeg zip png
 CONFIGURE_ARGS+=--with-$p-includes=${LOCALBASE}/include
 CONFIGURE_ARGS+=--with-$p-libraries=${LOCALBASE}/lib
 .endfor
 
-.include "Makefile.man"
-
 .if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 PLIST_SUB+=	PY=""
@@ -76,7 +72,7 @@ BROKEN=		Does not compile on sparc64-9
 .endif
 
 .if ${PORT_OPTIONS:MLIBOIL}
-LIB_DEPENDS+=	oil:${PORTSDIR}/devel/liboil
+LIB_DEPENDS+=	liboil-0.3.so:${PORTSDIR}/devel/liboil
 .else
 CONFIGURE_ARGS+=	--without-liboil
 .endif
diff --git a/graphics/vips/Makefile.man b/graphics/vips/Makefile.man
deleted file mode 100644
index c1194f309b72..000000000000
--- a/graphics/vips/Makefile.man
+++ /dev/null
@@ -1,8 +0,0 @@
-MAN1+=	batch_crop.1
-MAN1+=	batch_image_convert.1
-MAN1+=	batch_rubber_sheet.1
-MAN1+=	edvips.1
-MAN1+=	header.1
-MAN1+=	light_correct.1
-MAN1+=	vips.1
-MAN1+=	vipsthumbnail.1
diff --git a/graphics/vips/pkg-plist b/graphics/vips/pkg-plist
index 9f4b387d2a94..e737d6ccea22 100644
--- a/graphics/vips/pkg-plist
+++ b/graphics/vips/pkg-plist
@@ -74,6 +74,14 @@ lib/libvipsCC.la
 lib/libvipsCC.a
 libdata/pkgconfig/vips-%%VERSION%%.pc
 libdata/pkgconfig/vipsCC-%%VERSION%%.pc
+man/man1/batch_crop.1.gz
+man/man1/batch_image_convert.1.gz
+man/man1/batch_rubber_sheet.1.gz
+man/man1/edvips.1.gz
+man/man1/header.1.gz
+man/man1/light_correct.1.gz
+man/man1/vips.1.gz
+man/man1/vipsthumbnail.1.gz
 share/locale/de/LC_MESSAGES/vips7.mo
 share/locale/en_GB/LC_MESSAGES/vips7.mo
 %%PORTDOCS%%share/doc/vips/pdf/vipsmanual.pdf
diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile
index 6fda738cb31f..cfdd2b87b8d7 100644
--- a/multimedia/bombono/Makefile
+++ b/multimedia/bombono/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bombono
 PORTVERSION=	1.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-dvd/${PORTVERSION:R}
 DISTNAME=	${PORTNAME}-dvd-${PORTVERSION}
@@ -11,14 +11,14 @@ DISTNAME=	${PORTNAME}-dvd-${PORTVERSION}
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	DVD authoring program
 
-BUILD_DEPENDS=	GraphicsMagick>=1.1.7:${PORTSDIR}/graphics/GraphicsMagick
+BUILD_DEPENDS=	gm:${PORTSDIR}/graphics/GraphicsMagick
 LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
 		liblavfile.so:${PORTSDIR}/multimedia/mjpegtools \
 		libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	GraphicsMagick>=1.1.7:${PORTSDIR}/graphics/GraphicsMagick \
+RUN_DEPENDS=	gm:${PORTSDIR}/graphics/GraphicsMagick \
 		dvda-author:${PORTSDIR}/audio/dvda-author \
 		enca:${PORTSDIR}/converters/enca \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile
index dfc31a337fbe..4588a10df471 100644
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	htmltolatex
 PORTVERSION=	1
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	textproc
 MASTER_SITES=	http://people.FreeBSD.org/~foxfair/distfiles/
 DISTNAME=	${PORTNAME}
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	HTML to LaTeX to PDF Converter
 
-LIB_DEPENDS=	GraphicsMagick++:${PORTSDIR}/graphics/GraphicsMagick
+LIB_DEPENDS=	libGraphicsMagick++.so:${PORTSDIR}/graphics/GraphicsMagick
 
 USES=		bison gmake
 MAKEFILE=	GNUmakefile
diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index 0dc8a6199f78..ec69de681c72 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gallery2
 PORTVERSION=	2.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/gallery/${PORTNAME}/${PORTVERSION}
 DISTNAME=	gallery-${PORTVERSION}-full
diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index 9d992a9c2417..b0bca51767ba 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gallery3
 PORTVERSION=	3.0.9
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/gallery/${PORTNAME}/${PORTVERSION}
 DISTNAME=	gallery-${PORTVERSION}