mosquitto: bump (#6835)

app-misc/mosquitto/mosquitto-2.0.14.recipe

@@ -12,14 +12,13 @@ COPYRIGHT="2020 Eclipse Foundation."
 LICENSE="EDL"
 REVISION="1"
 SOURCE_URI="https://mosquitto.org/files/source/mosquitto-$portVersion.tar.gz"
-CHECKSUM_SHA256="b02d8f1368c40d5779ee125c37daf9003608eb47d7fbb04c5b938c76c1230a1f"
-PATCHES="mosquitto-$portVersion.patchset"
+CHECKSUM_SHA256="d0dde8fdb12caf6e2426b4f28081919a2fce3448773bdb8af0d3cd5fe5776925"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 libVersion="$portVersion"
-libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+libVersionCompat="$libVersion compat >= 1"
 
 GLOBAL_WRITABLE_FILES="
 	settings/mosquitto directory keep-old
@@ -37,6 +36,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libcares$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	"
@@ -52,6 +52,9 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	docbook_xml_dtd
+	docbook_xsl_stylesheets
+	devel:libcares$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	"
@@ -59,6 +62,7 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
+	cmd:xsltproc
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
@@ -67,7 +71,7 @@ BUILD()
 	mkdir -p build && cd build
 	cmake -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs ..
-	make
+	make WITH_SRV=yes
 }
 
 INSTALL()

app-misc/mosquitto/patches/mosquitto-1.6.11.patchset

@@ -1,47 +0,0 @@
-From 00bfb5a5c5ac0c63185dc15b29ed5c73ae1b3583 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sat, 15 Aug 2020 10:34:44 +0000
-Subject: Haiku doesn't use -ldl, add -lnetwork to CMakeList.txt
-
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 053ca1d..fe1a198 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -152,6 +152,8 @@ if (UNIX)
- 		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
-     elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
- 	    set (MOSQ_LIBS ${MOSQ_LIBS} m)
-+    elseif (${CMAKE_SYSTEM_NAME} MATCHES "Haiku")
-+	    set (MOSQ_LIBS ${MOSQ_LIBS} m network)
-     elseif(QNX)
-         set(MOSQ_LIBS ${MOSQ_LIBS} m socket)
-     else(APPLE)
--- 
-2.28.0
-
-
-From 4073677b55e7f4406d7858605d7e08dfa1bf1b21 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sat, 15 Aug 2020 11:02:49 +0000
-Subject: Use <syslog.h> instead of <sys/syslog.h> on Haiku
-
-
-diff --git a/src/conf_includedir.c b/src/conf_includedir.c
-index b602f96..5e9888a 100644
---- a/src/conf_includedir.c
-+++ b/src/conf_includedir.c
-@@ -37,7 +37,9 @@ Contributors:
- #  include <ws2tcpip.h>
- #endif
- 
--#if !defined(WIN32) && !defined(__CYGWIN__) && !defined(__QNX__)
-+#if defined(__HAIKU__)
-+#  include <syslog.h>
-+#elif !defined(WIN32) && !defined(__CYGWIN__) && !defined(__QNX__)
- #  include <sys/syslog.h>
- #endif
- 
--- 
-2.28.0
-