wip/gnunet: Add zbar dependencies for optional gnunet-qr.

[ng0 <ng0%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%NetBSD.org@localhost>
Pushed By:	ng0
Date:		Wed Oct 30 13:28:37 2019 +0000
Changeset:	716075388c21bb14e04a9db1e8c872d45c59291a

Modified Files:
	gnunet/PLIST
	gnunet/options.mk

Log Message:
wip/gnunet: Add zbar dependencies for optional gnunet-qr.

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

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

diffstat:
 gnunet/PLIST      |  1 +
 gnunet/options.mk | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diffs:
diff --git a/gnunet/PLIST b/gnunet/PLIST
index 846c439402..0c6099c040 100644
--- a/gnunet/PLIST
+++ b/gnunet/PLIST
@@ -34,6 +34,7 @@ bin/gnunet-nse
 bin/gnunet-peerinfo
 bin/gnunet-peerstore
 bin/gnunet-publish
+${PLIST.zbar}bin/gnunet-qr
 bin/gnunet-reclaim
 bin/gnunet-resolver
 bin/gnunet-revocation
diff --git a/gnunet/options.mk b/gnunet/options.mk
index c7f717fc2f..5e0581265f 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -6,10 +6,12 @@ PKG_SUPPORTED_OPTIONS+=		doc mdoc idn mysql pgsql tests
 PKG_SUPPORTED_OPTIONS+=		experimental bluez pulseaudio
 PKG_SUPPORTED_OPTIONS+=		opus ogg sqlite3 json
 PKG_SUPPORTED_OPTIONS+=		gstreamer
+# Should we name this qrcode instead?
+PKG_SUPPORTED_OPTIONS+=		zbar
 
 # in 0.11.7 when fixed, swap doc for mdoc
 # in 0.11.7 when fixed, add back idn
-PKG_SUGGESTED_OPTIONS+=		doc sqlite3 json opus ogg gstreamer
+PKG_SUGGESTED_OPTIONS+=		doc sqlite3 json opus ogg gstreamer zbar
 
 # bluez is still in pkgsrc-wip, and I should test this
 # before claiming bluez from pkgsrc-wip on Linux works.
@@ -136,6 +138,20 @@ PLIST.conversations=	yes
 CONFIGURE_ARGS+=	--without-libpulse
 .endif
 
+.if !empty(PKG_OPTIONS:Mzbar)
+#.include "../../graphics/openjpeg/buildlink3.mk"
+#.include "../../graphics/libjpeg-turbo/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../wip/zbar/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
+PLIST.zbar=		yes
+.else
+CONFIGURE_ARGS+=	--without-zbar
+.endif
+
 # FIXME: It would be good to provide a build of gnunet against
 # 'gnutls build against libdane/unbound' iff unbound is selected,
 # causing consequentially a build of gnutls with this setting.