Index: head/graphics/zbar/Makefile
===================================================================
--- head/graphics/zbar/Makefile	(revision 489609)
+++ head/graphics/zbar/Makefile	(revision 489610)
@@ -1,70 +1,73 @@
 # Created by: Oliver Heesakkers <dev2@heesakkers.info>
 # $FreeBSD$
 
 PORTNAME=	zbar
 PORTVERSION=	0.10
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	dev2@heesakkers.info
 COMMENT=	ZBar barcode reader
 
 LICENSE=	LGPL21
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=		iconv jpeg libtool gmake pathfix pkgconfig
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--with-jpeg=yes
 
 OPTIONS_DEFINE=	X11 IMAGEMAGICK V4L PYTHON GTK2 QT4 DOCS
 OPTIONS_DEFAULT=X11 IMAGEMAGICK
 OPTIONS_SUB=	yes
 V4L_DESC=	Build zbarcam video scanner
 
 X11_USE=	XORG=ice,sm,x11,xau,xcb,xdmcp,xext,xv
 X11_CONFIGURE_ON=	--with-x=yes
 X11_CONFIGURE_OFF=	--with-x=no --without-xshm --without-xv
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick6
+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-7.so:graphics/ImageMagick7
 IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick=yes
 IMAGEMAGICK_CONFIGURE_OFF=	--with-imagemagick=no
+
+# To avoid patching configure even more:
+CONFIGURE_ENV+=			ac_cv_header_wand_MagickWand_h=yes
 
 V4L_BUILD_DEPENDS=	v4l_compat>=1.0.20101027:multimedia/v4l_compat
 V4L_CONFIGURE_ON=	--enable-video=yes
 V4L_CONFIGURE_OFF=	--enable-video=no
 
 PYTHON_USE=		GNOME=pygtk2
 PYTHON_USES=		python:2.7
 PYTHON_CONFIGURE_ON=	--with-python=yes
 PYTHON_CONFIGURE_OFF=	--with-python=no
 
 GTK2_USE=	GNOME=gtk20
 GTK2_CONFIGURE_ON=	--with-gtk=yes
 GTK2_CONFIGURE_OFF=	--with-gtk=no
 
 QT4_USES=	qt:4
 QT4_USE=	QT=gui,moc_build
 QT4_CONFIGURE_ON=	--with-qt=yes
 QT4_CONFIGURE_OFF=	--with-qt=no
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MQT4}
 DEPRECATED=		Qt4 has been EOL since december 2015
 EXPIRATION_DATE=	2019-03-15
 .endif
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} '/^install-data-am: /s/install-dist_docDATA//' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	# make check-plist happy
 	${RMDIR} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
Index: head/graphics/zbar/files/patch-configure
===================================================================
--- head/graphics/zbar/files/patch-configure	(revision 489609)
+++ head/graphics/zbar/files/patch-configure	(revision 489610)
@@ -1,10 +1,16 @@
 --- configure.orig	2009-10-23 18:17:24.000000000 +0000
 +++ configure
 @@ -21369,6 +21369,7 @@ if test "x$ac_cv_lib_jpeg_jpeg_read_head
  #define HAVE_LIBJPEG 1
  _ACEOF
  
 +  have_jpeg="yes"
    LIBS="-ljpeg $LIBS"
  
  else
+@@ -21736,4 +21737,5 @@
+ fi
+    MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion`
++   MAGICK_CFLAGS="$MAGICK_CFLAGS -DMAGICK_MAJOR=${MAGICK_VERSION%%.*}"
+    { $as_echo "$as_me:$LINENO: using ImageMagick version $MAGICK_VERSION" >&5
+ $as_echo "$as_me: using ImageMagick version $MAGICK_VERSION" >&6;}
Index: head/graphics/zbar/files/patch-zbarimg.c
===================================================================
--- head/graphics/zbar/files/patch-zbarimg.c	(nonexistent)
+++ head/graphics/zbar/files/patch-zbarimg.c	(revision 489610)
@@ -0,0 +1,12 @@
+--- zbarimg/zbarimg.c	2009-10-23 14:16:44.000000000 -0400
++++ zbarimg/zbarimg.c	2017-08-10 10:22:08.707599000 -0400
+@@ -39,5 +39,9 @@
+ 
+ #include <zbar.h>
++#if MAGICK_MAJOR < 7
+ #include <wand/MagickWand.h>
++#else
++#include <MagickWand/MagickWand.h>
++#endif
+ 
+ /* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels.

Property changes on: head/graphics/zbar/files/patch-zbarimg.c
___________________________________________________________________
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