gnunet: add openssl dependency back.

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

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Tue Mar 22 21:24:01 2022 +0100
Changeset:	429cfb1d79cd48d22a53d2936456d393be3a9a3f

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

Log Message:
gnunet: add openssl dependency back.

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

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

diffstat:
 gnunet/Makefile      |  5 +++++
 gnunet/buildlink3.mk |  9 +++++----
 gnunet/options.mk    | 14 +++++---------
 3 files changed, 15 insertions(+), 13 deletions(-)

diffs:
diff --git a/gnunet/Makefile b/gnunet/Makefile
index 2aa7aee6c2..85b1686493 100644
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -96,6 +96,10 @@ SPECIAL_PERMS+=	${PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-client ${SETUID_R
 SPECIAL_PERMS+=	${PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-server ${SETUID_ROOT_PERMS}
 .endif
 
+# openssl is currently required by:
+# src/transport/gnunet-transport-certificate-creation
+# src/gns/gnunet-gns-proxy-setup-ca
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
@@ -107,6 +111,7 @@ SPECIAL_PERMS+=	${PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-server ${SETUID_R
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libsodium/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/jansson/buildlink3.mk"
 .include "../../textproc/libunistring/buildlink3.mk"
 .include "../../wip/gnurl/buildlink3.mk"
diff --git a/gnunet/buildlink3.mk b/gnunet/buildlink3.mk
index 2e59c2c119..4aadf0abdc 100644
--- a/gnunet/buildlink3.mk
+++ b/gnunet/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	gnunet
 .if !defined(GNUNET_BUILDLINK3_MK)
 GNUNET_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnunet+=	gnunet>=0.11.0
+BUILDLINK_API_DEPENDS.gnunet+=	gnunet>=0.16.0
 BUILDLINK_PKGSRCDIR.gnunet?=	../../wip/gnunet
 
 pkgbase:= gnunet
@@ -58,14 +58,15 @@ pkgbase:= gnunet
 
 .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 "../../devel/nss/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libsodium/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/jansson/buildlink3.mk"
 .include "../../textproc/libunistring/buildlink3.mk"
 .include "../../wip/gnurl/buildlink3.mk"
diff --git a/gnunet/options.mk b/gnunet/options.mk
index e965167a68..a6600578fc 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -3,13 +3,12 @@
 PKG_OPTIONS_VAR=		PKG_OPTIONS.gnunet
 
 PKG_SUPPORTED_OPTIONS+=		doc mdoc idn mysql pgsql tests
-PKG_SUPPORTED_OPTIONS+=		experimental bluez pulseaudio
+PKG_SUPPORTED_OPTIONS+=		experimental pulseaudio
 PKG_SUPPORTED_OPTIONS+=		opus ogg sqlite3 audio
 PKG_SUPPORTED_OPTIONS+=		gstreamer perl verbose-logging
-# Should we name this qrcode instead?
-PKG_SUPPORTED_OPTIONS+=		zbar
-PKG_SUGGESTED_OPTIONS+=		idn gstreamer doc sqlite3 opus ogg
-PKG_SUGGESTED_OPTIONS+=		audio
+
+PKG_SUGGESTED_OPTIONS+=		audio gstreamer opus ogg
+PKG_SUGGESTED_OPTIONS+=		idn doc sqlite3
 
 # bluez is still in pkgsrc-wip, and I should test this
 # before claiming bluez from pkgsrc-wip on Linux works.
@@ -17,6 +16,7 @@ PKG_SUGGESTED_OPTIONS+=		audio
 # gnunet-qr needs zbar with video support. v4l2 only works
 # on Linux.
 .if ${OPSYS} == "Linux"
+PKG_SUPPORTED_OPTIONS+=		bluez zbar
 # outdated package, update the package in wip
 # PKG_SUGGESTED_OPTIONS+=		bluez
 PKG_SUGGESTED_OPTIONS+=		zbar
@@ -27,10 +27,6 @@ PKG_SUGGESTED_OPTIONS+=		zbar
 # option is not easy on the one doing the updates.
 PLIST_SRC=			PLIST
 
-# openssl is currently required by:
-# src/transport/gnunet-transport-certificate-creation
-# src/gns/gnunet-gns-proxy-setup-ca
-
 .include "../../mk/bsd.options.mk"
 
 .if ${PKG_OPTIONS:Mtests}