zbar: fix build with ImageMagick-7

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Fri May 20 19:42:48 2016 +0200
Changeset:	2b1db47d1e06418cdf4783d8005b3905814957de

Modified Files:
	zbar/Makefile
	zbar/distinfo
Added Files:
	zbar/patches/patch-zbarimg_zbarimg.c

Log Message:
zbar: fix build with ImageMagick-7

o Patch zbarimg/zbarimg.c to just check for MagickWand.h in the new location
  used by ImageMagick-7.
o Avoid to (re)look for MagickWand.h header in <wand/MagickWand.h>. In pkgsrc
  graphics/ImageMagick also provides MagickWand and there is no need to check
  for it.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2b1db47d1e06418cdf4783d8005b3905814957de

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zbar/Makefile                        |  5 +++++
 zbar/distinfo                        |  1 +
 zbar/patches/patch-zbarimg_zbarimg.c | 15 +++++++++++++++
 3 files changed, 21 insertions(+)

diffs:
diff --git a/zbar/Makefile b/zbar/Makefile
index 3f5fe1f..3b4f216 100644
--- a/zbar/Makefile
+++ b/zbar/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.5 2015/07/07 18:50:58 leot1990 Exp $
 
 DISTNAME=	zbar-0.10
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zbar/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,6 +22,10 @@ CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--without-qt
 
+# pkgsrc ImageMagick always provide also <MagickWand.h> there is no need
+# to check it also manually (and this breaks with ImageMagick-7)
+CONFIGURE_ENV+=		ac_cv_header_wand_MagickWand_h=yes
+
 PKGCONFIG_OVERRIDE+=	zbar-gtk.pc.in
 PKGCONFIG_OVERRIDE+=	zbar-qt.pc.in
 PKGCONFIG_OVERRIDE+=	zbar.pc.in
diff --git a/zbar/distinfo b/zbar/distinfo
index 7ca80f7..0feb9ec 100644
--- a/zbar/distinfo
+++ b/zbar/distinfo
@@ -4,3 +4,4 @@ SHA1 (zbar-0.10.tar.bz2) = 273b47c26788faba4325baecc34063e27a012963
 RMD160 (zbar-0.10.tar.bz2) = a68db3e81d596a506e50e797c3540a05b8b84a9f
 Size (zbar-0.10.tar.bz2) = 592602 bytes
 SHA1 (patch-include_zbar_Exception.h) = 9addd50c1d7a6041e76b301620329d910a51d10f
+SHA1 (patch-zbarimg_zbarimg.c) = 52011ebc05ab10ac98b39c296c2bed679160a693
diff --git a/zbar/patches/patch-zbarimg_zbarimg.c b/zbar/patches/patch-zbarimg_zbarimg.c
new file mode 100644
index 0000000..3b24e38
--- /dev/null
+++ b/zbar/patches/patch-zbarimg_zbarimg.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Adjust for ImageMagick-7.
+
+--- zbarimg/zbarimg.c.orig	2009-10-23 18:16:44.000000000 +0000
++++ zbarimg/zbarimg.c
+@@ -38,7 +38,7 @@
+ #include <assert.h>
+ 
+ #include <zbar.h>
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ 
+ /* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels.
+  * (still not sure this check is quite right...