Index: head/x11-wm/libwraster/Makefile
===================================================================
--- head/x11-wm/libwraster/Makefile	(revision 566677)
+++ head/x11-wm/libwraster/Makefile	(revision 566678)
@@ -1,42 +1,56 @@
 # $FreeBSD$
 
 PORTNAME=	libwraster
 PORTVERSION=	0.95.9
+PORTREVISION=	1
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Window Maker raster graphics library
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libpng.so:graphics/png \
 		libjbig.so:graphics/jbigkit \
 		libtiff.so:graphics/tiff \
-		libwebp.so:graphics/webp \
-		libMagickWand-7.so:graphics/ImageMagick7
+		libwebp.so:graphics/webp
 
 USES=		jpeg libtool localbase pathfix pkgconfig xorg
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xext xft xinerama xmu xpm
 BUILD_WRKSRC=	${WRKSRC}/wrlib
 INSTALL_WRKSRC=	${WRKSRC}/wrlib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--with-localedir=${PREFIX}/share/locale \
 		--with-libs-from="-L${LOCALBASE}/lib" \
 		--with-incs-from="-I${LOCALBASE}/include" \
 		--with-gnustepdir="${PREFIX}/GNUstep" \
 		--enable-modelock \
 		--enable-xinerama \
 		--enable-usermenu \
 		--enable-wmreplace \
 		--with-x
 INSTALL_TARGET=	install-strip
+
+OPTIONS_DEFINE=	IMAGEMAGICK
+OPTIONS_DEFAULT=	IMAGEMAGICK
+
+IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+IMAGEMAGICK_CONFIGURE_OFF=	--disable-magick
+
+.include <bsd.port.options.mk>
+
+post-patch-IMAGEMAGICK-on:
+.if ${IMAGEMAGICK_DEFAULT} == 6
+	@${REINPLACE_CMD} -e '/MagickWand\.h/s,MagickWand/,wand/,' \
+		${WRKSRC}/configure ${WRKSRC}/wrlib/load_magick.c
+.endif
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE_CMD} config-paths.h
 
 .include <bsd.port.mk>
Index: head/x11-wm/windowmaker/Makefile
===================================================================
--- head/x11-wm/windowmaker/Makefile	(revision 566677)
+++ head/x11-wm/windowmaker/Makefile	(revision 566678)
@@ -1,69 +1,82 @@
 # Created by: Brian Handy <handy@physics.montana.edu>
 # $FreeBSD$
 
 PORTNAME=	windowmaker
 PORTVERSION=	0.95.9
+PORTREVISION=	1
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	GNUstep-compliant NeXTstep window manager clone
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libpng.so:graphics/png \
 		libjbig.so:graphics/jbigkit \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
-		libMagickWand-7.so:graphics/ImageMagick7 \
 		libwraster.so:x11-wm/libwraster \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libexif.so:graphics/libexif
 RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:graphics/wmicons
 
 USES=		gnome jpeg libtool shebangfix pathfix perl5 pkgconfig xorg
 USE_CSTD=	c99
 USE_GNOME=	pango
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xext xft xinerama xmu xpm
 SHEBANG_FILES=	util/wkdemenu.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=no \
 		wm_cv_func_secure_getenv=no
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--localedir=${PREFIX}/share/locale \
 		--with-libs-from="-L${LOCALBASE}/lib" \
 		--with-incs-from="-I${LOCALBASE}/include" \
 		--with-gnustepdir="${PREFIX}/GNUstep" \
 		--enable-modelock \
 		--enable-pango \
 		--enable-xinerama \
 		--enable-usermenu \
 		--enable-wmreplace \
 		--with-x
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 PORTDOCS=	AUTHORS BUGFORM BUGS ChangeLog FAQ INSTALL \
 		INSTALL-WMAKER NEWS README README.definable-cursor \
 		README.i18n TODO The-perfect-Window-Maker-patch.txt
 
-OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_DEFINE=	IMAGEMAGICK DOCS NLS
+OPTIONS_DEFAULT=	IMAGEMAGICK
 OPTIONS_SUB=	yes
+
+IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+IMAGEMAGICK_CONFIGURE_OFF=	--disable-magick
+
 NLS_USES=	gettext
 NLS_CONFIGURE_ENV=	LINGUAS="*"
 NLS_CONFIGURE_ENABLE=	locale
+
+.include <bsd.port.options.mk>
+
+post-patch-IMAGEMAGICK-on:
+.if ${IMAGEMAGICK_DEFAULT} == 6
+	@${REINPLACE_CMD} -e '/MagickWand\.h/s,MagickWand/,wand/,' \
+		${WRKSRC}/configure ${WRKSRC}/wrlib/load_magick.c
+.endif
 
 post-install:
 	@${MKDIR} \
 	    ${STAGEDIR}${PREFIX}/GNUstep/Applications/WPrefs.app/xpm \
 	    ${STAGEDIR}${PREFIX}/share/WindowMaker/Sounds
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>