zbar: Make it buildable

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

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue Dec 3 13:12:31 2019 +0100
Changeset:	cebfeea599f748cad52c6b7e1c1e1e2d8e41186d

Modified Files:
	zbar/Makefile
	zbar/PLIST
	zbar/TODO
	zbar/distinfo
Removed Files:
	zbar/patches/patch-zbarimg_zbarimg.c

Log Message:
zbar: Make it buildable

- Add a dirty workaround and disable python completely, the configure script
  probably needs adjustment to properly honor --without-python and avoid looking
  at PYTHON
- Remove no longer needed ImageMagick-7 patch and kludge
- Document other issues found in TODO

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

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

diffstat:
 zbar/Makefile                        | 12 +++++-------
 zbar/PLIST                           | 16 ++++++++--------
 zbar/TODO                            |  8 +++++++-
 zbar/distinfo                        |  1 -
 zbar/patches/patch-zbarimg_zbarimg.c | 15 ---------------
 5 files changed, 20 insertions(+), 32 deletions(-)

diffs:
diff --git a/zbar/Makefile b/zbar/Makefile
index 04f7640c32..27c0c040c4 100644
--- a/zbar/Makefile
+++ b/zbar/Makefile
@@ -22,9 +22,6 @@ CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--without-java
 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
 # \todo: JAVAC=${JAVAC/ecj/ecj -1.5} is a bashim: ${parm/?/pat[/str]}
 CONFIG_SHELL=		${TOOLS_PATH.bash}
 
@@ -35,10 +32,11 @@ PKGCONFIG_OVERRIDE+=	zbar.pc.in
 TEST_TARGET=	check
 
 # Examples and tests require python
-REPLACE_PYTHON+=		test/barcodetest.py examples/upcrpc.py
-PYTHON_FOR_BUILD_ONLY=		yes
-PYTHON_VERSIONS_ACCEPTED=	27	# tests not ported to Python 3?
-.include "../../lang/python/application.mk"
+# XXX: use big hammer to forcely disable python
+#REPLACE_PYTHON+=		test/barcodetest.py examples/upcrpc.py
+#PYTHON_FOR_BUILD_ONLY=		test
+#PYTHON_VERSIONS_ACCEPTED=	27	# tests not ported to Python 3?
+#.include "../../lang/python/application.mk"
 
 .include "options.mk"
 
diff --git a/zbar/PLIST b/zbar/PLIST
index 6f08589880..69df70297c 100644
--- a/zbar/PLIST
+++ b/zbar/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/07/07 16:24:57 leot1990 Exp $
+@comment $NetBSD$
 ${PLIST.imagemagick}bin/zbarimg
 include/zbar.h
 include/zbar/Decoder.h
@@ -12,11 +12,11 @@ include/zbar/Video.h
 include/zbar/Window.h
 lib/libzbar.la
 lib/pkgconfig/zbar.pc
-${PLIST.imagemagick}man/man1/zbarimg.1
+man/man1/zbarimg.1
 share/doc/zbar/COPYING
-share/doc/zbar/HACKING
-share/doc/zbar/INSTALL
-share/doc/zbar/LICENSE
-share/doc/zbar/NEWS
-share/doc/zbar/README
-share/doc/zbar/TODO
+share/doc/zbar/HACKING.md
+share/doc/zbar/INSTALL.md
+share/doc/zbar/LICENSE.md
+share/doc/zbar/NEWS.md
+share/doc/zbar/README.md
+share/doc/zbar/TODO.md
diff --git a/zbar/TODO b/zbar/TODO
index 2d76fe30a6..e5a2e66377 100644
--- a/zbar/TODO
+++ b/zbar/TODO
@@ -1,4 +1,10 @@
 * ImageMagick is not properly detected as version 7, as the guard for
   it doesn't pick up version 7 include.
-
 * python3 support must be tested (new in this release)
+* `make test' no longer works, build of tests fail with:
+
+ | test/test_decode.c:24:10: fatal error: argp.h: No such file or directory
+ | #include <argp.h>
+
+   investigate further!
+* python2 is (probably) accidentally picked up
diff --git a/zbar/distinfo b/zbar/distinfo
index 5bd84ced73..54fd8d21aa 100644
--- a/zbar/distinfo
+++ b/zbar/distinfo
@@ -5,4 +5,3 @@ RMD160 (zbar-0.23.tar.bz2) = 59ecd5c78fa91f6951a129377b4fa477307676bb
 SHA512 (zbar-0.23.tar.bz2) = 7eef2ee99760edd693ecc12a36e04b71a156b93b4c1977ca4f6da103a955284cf640b55adb185477e1d4cc65345bb01608ed9528f6518abb514ccbc58e5d350b
 Size (zbar-0.23.tar.bz2) = 1168183 bytes
 SHA1 (patch-configure.ac) = c460ffa7e595b2ea54012191a55c681078bd08e7
-SHA1 (patch-zbarimg_zbarimg.c) = 52011ebc05ab10ac98b39c296c2bed679160a693
diff --git a/zbar/patches/patch-zbarimg_zbarimg.c b/zbar/patches/patch-zbarimg_zbarimg.c
deleted file mode 100644
index 3b24e3855d..0000000000
--- a/zbar/patches/patch-zbarimg_zbarimg.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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...