wip/gnunet: Update bl3 and add verbose-logging option.

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

Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%NetBSD.org@localhost>
Pushed By:	ng0
Date:		Mon Dec 2 09:34:39 2019 +0000
Changeset:	ee1ca828385306986e935a0c70f59707fb89f543

Modified Files:
	gnunet/buildlink3.mk
	gnunet/options.mk

Log Message:
wip/gnunet: Update bl3 and add verbose-logging option.

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

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

diffstat:
 gnunet/buildlink3.mk | 69 +++++++++++++++++++++++++++++++++++-----------------
 gnunet/options.mk    |  5 +++-
 2 files changed, 51 insertions(+), 23 deletions(-)

diffs:
diff --git a/gnunet/buildlink3.mk b/gnunet/buildlink3.mk
index 05183f0b3a..de9fff55dc 100644
--- a/gnunet/buildlink3.mk
+++ b/gnunet/buildlink3.mk
@@ -11,46 +11,71 @@ BUILDLINK_PKGSRCDIR.gnunet?=	../../wip/gnunet
 pkgbase:= gnunet
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_OPTIONS:Mopus)
-.include "../../audio/libopus/buildlink3.mk"
-.endif
-.if !empty(PKG_OPTIONS:Msqlite3)
-.include "../../databases/sqlite3/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.gnunet:Mtests)
+.include "../../lang/python/tool.mk"
 .endif
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/nss/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/libextractor/buildlink3.mk"
-.include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/libltdl/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Midn)
+
+.if !empty(PKG_BUILD_OPTIONS.gnunet:Midn)
 .include "../../devel/libidn2/buildlink3.mk"
 .else
 .include "../../devel/libidn/buildlink3.mk"
 .endif
-.if !empty(PKG_OPTIONS:Mtests)
-.include "../../lang/python/tool.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.gnunet:Mjson)
+.include "../../textproc/jansson/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.gnunet:Msqlite3)
+.include "../../databases/sqlite3/buildlink3.mk"
 .endif
-.if !empty(PKG_OPTIONS:Mgstreamer)
+
+.if !empty(PKG_BUILD_OPTIONS.gnunet:Mmysql)
+.include "../../mk/mysql.buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.gnunet:Mpgsql)
+.include "../../mk/pgsql.buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.gnunet:Mopus)
+.include "../../audio/libopus/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.gnunet:Mogg)
+.include "../../multimedia/libogg/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.gnunet:Mgstreamer)
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .endif
-.if !empty(PKG_OPTIONS:Mogg)
-.include "../../multimedia/libogg/buildlink3.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.gnunet:Mpulseaudio)
+.include "../../audio/pulseaudio/buildlink3.mk"
 .endif
+
+.if !empty(PKG_BUILD_OPTIONS.gnunet:Mzbar)
+.include "../../wip/zbar/buildlink3.mk"
+.endif
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/nss/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/libextractor/buildlink3.mk"
+.include "../../devel/libgsf/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/libunistring/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mjson)
-.include "../../textproc/jansson/buildlink3.mk"
-.endif
 .include "../../www/gnurl/buildlink3.mk"
 .include "../../www/libmicrohttpd/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.if ${OPSYS} == "Linux" && !empty(PKG_OPTIONS:Mbluez)
+
+.if ${OPSYS} == "Linux" && !empty(PKG_BUILD_OPTIONS.gnunet:Mbluez)
 .include "../../wip/bluez-libs/buildlink3.mk"
 .endif
+
 .endif # GNUNET_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnunet
diff --git a/gnunet/options.mk b/gnunet/options.mk
index f4051d029e..3919dd2728 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -5,7 +5,7 @@ PKG_OPTIONS_VAR=		PKG_OPTIONS.gnunet
 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 perl
+PKG_SUPPORTED_OPTIONS+=		gstreamer perl verbose-logging
 # Should we name this qrcode instead?
 PKG_SUPPORTED_OPTIONS+=		zbar
 
@@ -106,6 +106,9 @@ CONFIGURE_ARGS+=	--without-postgres
 .if !empty(PKG_OPTIONS:Mexperimental)
 CONFIGURE_ARGS+=	--enable-experimental
 PLIST.experimental=	yes
+.  if !empty(PKG_OPTIONS:Mverbose-logging)
+CONFIGURE_ARGS+=	--enable-logging=verbose
+.  endif
 .else
 CONFIGURE_ARGS+=	--disable-experimental
 .endif