From ae8159d47fea6987e50f6fbcb20b43141623c5e8 Mon Sep 17 00:00:00 2001
From: Florian Franzmann
Date: Fri, 10 Jul 2020 20:50:09 +0200
Subject: ftp/curl: break circular dependency

---
 ftp/curl/DEPENDS | 12 ++++++++----
 ftp/curl/HISTORY |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'ftp')

diff --git a/ftp/curl/DEPENDS b/ftp/curl/DEPENDS
index 00b04937b8..ecac5bbd18 100755
--- a/ftp/curl/DEPENDS
+++ b/ftp/curl/DEPENDS
@@ -74,7 +74,11 @@ optional_depends  nghttp2                \
                   "--with-nghttp2"       \
                   "--without-nghttp2"    \
                   "for HTTP/2 support" &&
-optional_depends brotli \
-                 "--with-brotli" \
-                 "--without-brotli" \
-                 "Brotli compression"
+
+if spell_ok brotli; then
+  optional_depends brotli \
+                   "--with-brotli" \
+                   "--without-brotli" \
+                   "Brotli compression"
+fi
+
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index ba42aa924e..dad74856c0 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,7 @@
+2020-07-10 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DEPENDS: only optionally depend on brotli if brotli is already
+	  installed. This prevents a circular dependency.
+
 2020-07-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: version 7.71.1
 
-- 
cgit v1.2.3