Date: Fri, 06 Feb 2026 23:44:25 +0000 From: Craig Leres <leres@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 98188fe2167b - main - net/mosquitto: Fix websockets options Message-ID: <69867cd9.25131.7dd4eec@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=98188fe2167b170182371913479c0d91ecf335e5 commit 98188fe2167b170182371913479c0d91ecf335e5 Author: Craig Leres <leres@FreeBSD.org> AuthorDate: 2026-02-06 23:43:54 +0000 Commit: Craig Leres <leres@FreeBSD.org> CommitDate: 2026-02-06 23:43:54 +0000 net/mosquitto: Fix websockets options Rename WEBSOCKET to WEBSOCKETS to match the cmake options. Add WEBSOCKETS_BUILTIN option. I'd like to have WEBSOCKETS control if websockets is supported at all and WEBSOCKETS_BUILTIN switch between the bundled and ports versions but the latter doesn't build so mark BROKEN and open an upstream issue: https://github.com/eclipse-mosquitto/mosquitto/issues/3478 One effect of these changes is that libwebsockets is no longer a LIB_DEPENDS for the port; this will become a possibility once WEBSOCKETS_BUILTIN OFF works again. PR: 293005 Reported by: alexander@wittig.name --- net/mosquitto/Makefile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile index 2af1134b8444..9abc01449936 100644 --- a/net/mosquitto/Makefile +++ b/net/mosquitto/Makefile @@ -1,6 +1,6 @@ PORTNAME= mosquitto DISTVERSION= 2.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://mosquitto.org/files/source/ @@ -28,14 +28,23 @@ USERS= nobody PLIST_SUB= DISTVERSION=${DISTVERSION} -OPTIONS_DEFINE= CARES WEBSOCKET -OPTIONS_DEFAULT= CARES WEBSOCKET +OPTIONS_DEFINE= CARES WEBSOCKETS WEBSOCKETS_BUILTIN +OPTIONS_DEFAULT= CARES WEBSOCKETS WEBSOCKETS_BUILTIN CARES_LIB_DEPENDS= libcares.so:dns/c-ares CARES_CMAKE_ON= -DWITH_SRV:BOOL=ON -WEBSOCKET_LIB_DEPENDS= libwebsockets.so:net/libwebsockets -WEBSOCKET_CMAKE_ON= -DWITH_WEBSOCKETS:BOOL=ON +WEBSOCKETS_DESC= $(WEBSOCKET_DESC) +WEBSOCKETS_CMAKE_OFF= -DWITH_WEBSOCKETS:BOOL=OFF +WEBSOCKETS_BUILTIN_CMAKE_OFF= -DWITH_WEBSOCKETS_BUILTIN:BOOL=OFF +WEBSOCKETS_BUILTIN_DESC= Use bundled version of websockets +WEBSOCKETS_BUILTIN_LIB_DEPENDS_OFF= libwebsockets.so:net/libwebsockets + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MWEBSOCKETS} && !${PORT_OPTIONS:MWEBSOCKETS_BUILTIN} +BROKEN= building without WEBSOCKETS_BUILTIN fails +.endif post-patch: @${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69867cd9.25131.7dd4eec>