Index: head/net/mosquitto/files/patch-lib_mosquitto__internal.h =================================================================== --- head/net/mosquitto/files/patch-lib_mosquitto__internal.h (nonexistent) +++ head/net/mosquitto/files/patch-lib_mosquitto__internal.h (revision 448259) @@ -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; Property changes on: head/net/mosquitto/files/patch-lib_mosquitto__internal.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/mosquitto/files/patch-src_CMakeLists.txt =================================================================== --- head/net/mosquitto/files/patch-src_CMakeLists.txt (revision 448258) +++ head/net/mosquitto/files/patch-src_CMakeLists.txt (revision 448259) @@ -1,18 +1,26 @@ ---- 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) - set (MOSQ_LIBS ${MOSQ_LIBS} rt dl m) + set (MOSQ_LIBS ${MOSQ_LIBS} rt m) 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) - install(CODE "EXEC_PROGRAM(/sbin/ldconfig)") endif (UNIX) Property changes on: head/net/mosquitto/files/patch-src_CMakeLists.txt ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property