Index: editors/emacs/Makefile
===================================================================
--- editors/emacs/Makefile	(revision 444467)
+++ editors/emacs/Makefile	(working copy)
@@ -52,7 +52,7 @@ OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
 OPTIONS_RADIO_SOUND=		ALSA OSS
 OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
 OPTIONS_GROUP=			GRAPHICS NEEDX11
-OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
+OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK MAGICK7 PNG SVG TIFF XPM
 OPTIONS_GROUP_NEEDX11=		GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM     \
 				XWIDGETS
 
@@ -71,6 +71,7 @@ KQUEUE_DESC=	File notification via kqueue
 LLDB_DESC=	LLDB support for GUD
 #LTO_DESC=	Enable link-time optimization
 MAGICK_DESC=	ImageMagick image processing support
+MAGICK7_DESC=	${MAGICK_DESC:S/Magick/& 7.*/}
 M17N_DESC=	M17N for text-shaping                  (implies XFT)
 MODULES_DESC=	Dynamic modules support
 NEEDX11_DESC=	Other X11-dependent (each implies X11)
@@ -135,6 +136,12 @@ M17N_IMPLIES=		XFT X11
 MAGICK_LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick
 MAGICK_CONFIGURE_WITH=	imagemagick
 MAGICK_IMPLIES=		X11
+MAGICK_PREVENTS=	MAGICK7
+MAGICK7_LIB_DEPENDS=	libMagickCore-7.so:graphics/ImageMagick7
+MAGICK7_CONFIGURE_WITH=	${MAGICK_CONFIGURE_WITH}
+MAGICK7_IMPLIES=	${MAGICK_IMPLIES}
+MAGICK7_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-imagick7
+MAGICK7_PREVENTS=	MAGICK
 MODULES_CONFIGURE_WITH=	modules
 MOTIF_USES=		motif
 MOTIF_CONFIGURE_ON=	--with-x-toolkit=motif
@@ -185,6 +192,9 @@ XWIDGETS_CONFIGURE_WITH=xwidgets
 XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 XWIDGETS_IMPLIES=	GTK3
 
+post-patch-MAGICK7-on:
+	@${REINPLACE_CMD} -e 's/Wand/Magick&/g' ${WRKSRC}/configure
+
 # With a desktop entry stage-qa will give a warning about requiring
 # desktop-file-utils and portlint -C will give a warning about INSTALL_ICONS,
 # but don't pull in those dependencies when X11 is off.
Index: editors/emacs/files/extra-patch-imagick7
===================================================================
--- editors/emacs/files/extra-patch-imagick7	(nonexistent)
+++ editors/emacs/files/extra-patch-imagick7	(working copy)
@@ -0,0 +1,47 @@
+--- src/image.c.orig	2017-02-03 10:25:45 UTC
++++ src/image.c
+@@ -8240,14 +8240,14 @@ imagemagick_image_p (Lisp_Object object)
+ /* The GIF library also defines DrawRectangle, but its never used in Emacs.
+    Therefore rename the function so it doesn't collide with ImageMagick.  */
+ #define DrawRectangle DrawRectangleGif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ 
+ /* ImageMagick 6.5.3 through 6.6.5 hid PixelGetMagickColor for some reason.
+    Emacs seems to work fine with the hidden version, so unhide it.  */
+-#include <magick/version.h>
++#include <MagickCore/version.h>
+ #if 0x653 <= MagickLibVersion && MagickLibVersion <= 0x665
+ extern WandExport void PixelGetMagickColor (const PixelWand *,
+-					    MagickPixelPacket *);
++					    PixelInfo *);
+ #endif
+ 
+ /* Log ImageMagick error message.
+@@ -8402,7 +8402,7 @@ imagemagick_compute_animated_image (MagickWand *super_
+       PixelWand **source, **dest;
+       size_t source_width, source_height;
+       ssize_t source_left, source_top;
+-      MagickPixelPacket pixel;
++      PixelInfo pixel;
+       DisposeType dispose;
+       ptrdiff_t lines = 0;
+ 
+@@ -8467,7 +8467,7 @@ imagemagick_compute_animated_image (MagickWand *super_
+ 	      if (dispose == BackgroundDispose || PixelGetAlpha (source[x]))
+ 		{
+ 		  PixelGetMagickColor (source[x], &pixel);
+-		  PixelSetMagickColor (dest[x + source_left], &pixel);
++		  PixelSetPixelColor (dest[x + source_left], &pixel);
+ 		}
+ 	    }
+ 	  PixelSyncIterator (dest_iterator);
+@@ -8512,7 +8512,7 @@ imagemagick_load_image (struct frame *f, struct image 
+   MagickWand *image_wand;
+   PixelIterator *iterator;
+   PixelWand **pixels, *bg_wand = NULL;
+-  MagickPixelPacket  pixel;
++  PixelInfo  pixel;
+   Lisp_Object image;
+   Lisp_Object value;
+   Lisp_Object crop;

Property changes on: editors/emacs/files/extra-patch-imagick7
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property