From owner-svn-ports-all@freebsd.org Fri Aug 18 17:03:13 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 63E72DC79D5; Fri, 18 Aug 2017 17:03:13 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 30D866CED1; Fri, 18 Aug 2017 17:03:13 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7IH3C93032009; Fri, 18 Aug 2017 17:03:12 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7IH3CfZ032007; Fri, 18 Aug 2017 17:03:12 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201708181703.v7IH3CfZ032007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 18 Aug 2017 17:03:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448259 - head/net/mosquitto/files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: head/net/mosquitto/files X-SVN-Commit-Revision: 448259 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2017 17:03:13 -0000 Author: swills Date: Fri Aug 18 17:03:11 2017 New Revision: 448259 URL: https://svnweb.freebsd.org/changeset/ports/448259 Log: net/mosquitto: Fails to build with WS option enabled PR: 220827 Submitted by: stl@koffein.net Approved by: joe@thrallingpenguin.com (maintainer) Added: head/net/mosquitto/files/patch-lib_mosquitto__internal.h (contents, props changed) Modified: head/net/mosquitto/files/patch-src_CMakeLists.txt (contents, props changed) Added: head/net/mosquitto/files/patch-lib_mosquitto__internal.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/mosquitto/files/patch-lib_mosquitto__internal.h Fri Aug 18 17:03:11 2017 (r448259) @@ -0,0 +1,33 @@ +--- lib/mosquitto_internal.h.orig 2017-07-18 16:25:21 UTC ++++ lib/mosquitto_internal.h +@@ -30,11 +30,7 @@ Contributors: + #endif + #include + +-#if defined(WITH_THREADING) && !defined(WITH_BROKER) +-# include +-#else +-# include +-#endif ++#include + + #ifdef WITH_SRV + # include +@@ -184,7 +180,7 @@ struct mosquitto { + #endif + bool want_write; + bool want_connect; +-#if defined(WITH_THREADING) && !defined(WITH_BROKER) ++ + pthread_mutex_t callback_mutex; + pthread_mutex_t log_callback_mutex; + pthread_mutex_t msgtime_mutex; +@@ -195,7 +191,7 @@ struct mosquitto { + pthread_mutex_t out_message_mutex; + pthread_mutex_t mid_mutex; + pthread_t thread_id; +-#endif ++ + bool clean_session; + #ifdef WITH_BROKER + bool is_dropping; Modified: head/net/mosquitto/files/patch-src_CMakeLists.txt ============================================================================== --- head/net/mosquitto/files/patch-src_CMakeLists.txt Fri Aug 18 16:45:56 2017 (r448258) +++ head/net/mosquitto/files/patch-src_CMakeLists.txt Fri Aug 18 17:03:11 2017 (r448259) @@ -1,6 +1,14 @@ ---- src/CMakeLists.txt.orig 2015-05-07 13:21:22 UTC +--- src/CMakeLists.txt.orig 2016-08-17 11:05:14 UTC +++ src/CMakeLists.txt -@@ -86,7 +86,7 @@ if (UNIX) +@@ -77,6 +77,7 @@ if (WIN32 OR CYGWIN) + endif (WIN32 OR CYGWIN) + + add_definitions (-DWITH_BROKER) ++add_definitions (-DWITH_THREADING) + + add_executable(mosquitto ${MOSQ_SRCS}) + +@@ -86,7 +87,7 @@ if (UNIX) if (APPLE) set (MOSQ_LIBS ${MOSQ_LIBS} dl m) else (APPLE) @@ -9,7 +17,7 @@ endif (APPLE) endif (UNIX) -@@ -127,6 +127,5 @@ if (${WITH_TLS} STREQUAL ON) +@@ -127,6 +128,5 @@ if (${WITH_TLS} STREQUAL ON) endif (${WITH_TLS} STREQUAL ON) if (UNIX)