gnunet: add openssl dependency back.

diff --git a/gnunet/Makefile b/gnunet/Makefile
index 2aa7aee6c2cd1f1459fdfb408dcfb8112090a9ca..85b16864930d9087824fcbdcf144492743963917 100644 (file)
--- 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 2e59c2c1193bd2b99a8c33f8f063ee95779b2cce..4aadf0abdc1ede6e80d03f6338d809b3e21273fd 100644 (file)
--- 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 e965167a6896818ee5252442e69d32a4e395330f..a6600578fc13619942e434ffe2c4440e010bb38a 100644 (file)
--- 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}