zbar: Avoid gmake dependency

[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 15:14:05 2019 +0100
Changeset:	7454c266298360d3d30456b04bd263925e068450

Modified Files:
	zbar/Makefile
	zbar/distinfo
Added Files:
	zbar/patches/patch-gtk_Makefile.in

Log Message:
zbar: Avoid gmake dependency

The patch is probably a dirty workaround and needs to be discussed upstream.

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

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

diffstat:
 zbar/Makefile                      |  2 +-
 zbar/distinfo                      |  1 +
 zbar/patches/patch-gtk_Makefile.in | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diffs:
diff --git a/zbar/Makefile b/zbar/Makefile
index 27c0c040c4..5867c6eee1 100644
--- a/zbar/Makefile
+++ b/zbar/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config bash gmake
+USE_TOOLS+=	pkg-config bash
 USE_LANGUAGES=	c c++	# c++ needed only for test
 
 CONFIGURE_ARGS+=	--with-jpeg
diff --git a/zbar/distinfo b/zbar/distinfo
index 3b7983921b..92765c4ca6 100644
--- a/zbar/distinfo
+++ b/zbar/distinfo
@@ -5,3 +5,4 @@ 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) = e9ff600a699c271216d11105d716d9eb26a84885
+SHA1 (patch-gtk_Makefile.in) = bf32ac312d0d00ed7ac152ddd849dae0fc681e74
diff --git a/zbar/patches/patch-gtk_Makefile.in b/zbar/patches/patch-gtk_Makefile.in
new file mode 100644
index 0000000000..4d0cd5923a
--- /dev/null
+++ b/zbar/patches/patch-gtk_Makefile.in
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Avoid gmake-isms.
+
+XXX: Probably that's wrong and needs to be discussed with upstream!
+
+--- gtk/Makefile.in.orig	2019-05-23 21:12:07.000000000 +0000
++++ gtk/Makefile.in
+@@ -887,7 +887,7 @@ uninstall-am: uninstall-dist_girDATA uni
+ 
+ # GObject Introspection
+ 
+-include $(INTROSPECTION_MAKEFILE)
++include $(INTROSPECTION_MAKEFILE) # am--include-marker
+ 
+ # This may generate some warnings, but it is needed for "make dist"
+ ZBar-1.0.gir: $(lib_LTLIBRARIES)