Tue Jun 8 10:12:55 2021 UTC ()
Add a websockets option, defaulting to on.
bump PKGREVISION
ok gdt@


(bouyer)
diff -r1.22 -r1.23 pkgsrc/net/mosquitto/Makefile
diff -r0 -r1.1 pkgsrc/net/mosquitto/options.mk
cvs diff -r1.22 -r1.23 pkgsrc/net/mosquitto/Makefile (expand / switch to unified diff)

--- pkgsrc/net/mosquitto/Makefile 2021/04/06 13:16:22 1.22
+++ pkgsrc/net/mosquitto/Makefile 2021/06/08 10:12:55 1.23
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.22 2021/04/06 13:16:22 gdt Exp $ 1# $NetBSD: Makefile,v 1.23 2021/06/08 10:12:55 bouyer Exp $
2 2
3DISTNAME= mosquitto-2.0.10 3DISTNAME= mosquitto-2.0.10
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= https://mosquitto.org/files/source/ 5MASTER_SITES= https://mosquitto.org/files/source/
 6PKGREVISION= 1
6 7
7MAINTAINER= gdt@NetBSD.org 8MAINTAINER= gdt@NetBSD.org
8HOMEPAGE= https://mosquitto.org/ 9HOMEPAGE= https://mosquitto.org/
9COMMENT= Open Source MQTT broker 10COMMENT= Open Source MQTT broker
10LICENSE= epl-v1.0 11LICENSE= epl-v1.0
11 12
12BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 13BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
13 14
14USE_LANGUAGES+= c c++ 15USE_LANGUAGES+= c c++
15# Upstream documents that "unix" should use make, but Mac cmake. 16# Upstream documents that "unix" should use make, but Mac cmake.
16# After asking and receiving no guidance, choose to always use cmake. 17# After asking and receiving no guidance, choose to always use cmake.
17# https://github.com/eclipse/mosquitto/issues/1041 18# https://github.com/eclipse/mosquitto/issues/1041
18USE_CMAKE= yes 19USE_CMAKE= yes
@@ -43,19 +44,20 @@ FILES_SUBST+= MOSQUITTO_GROUP=${MOSQUITT @@ -43,19 +44,20 @@ FILES_SUBST+= MOSQUITTO_GROUP=${MOSQUITT
43FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 44FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
44FILES_SUBST+= VARBASE=${VARBASE} 45FILES_SUBST+= VARBASE=${VARBASE}
45 46
46# mosquitto's build system is very troubled, and the tests do not 47# mosquitto's build system is very troubled, and the tests do not
47# currently work. 48# currently work.
48# https://github.com/eclipse/mosquitto/issues/1242 49# https://github.com/eclipse/mosquitto/issues/1242
49# https://github.com/eclipse/mosquitto/issues/1330 50# https://github.com/eclipse/mosquitto/issues/1330
50# 51#
51# \todo invoke "gmake test" in tests/ subdir instead of at top level 52# \todo invoke "gmake test" in tests/ subdir instead of at top level
52# \todo pass in CPPFLAGS/LDFLAGS to test invocation 53# \todo pass in CPPFLAGS/LDFLAGS to test invocation
53TEST_TARGET= test 54TEST_TARGET= test
54.include "../../devel/cunit/buildlink3.mk" 55.include "../../devel/cunit/buildlink3.mk"
55 56
 57.include "options.mk"
56.include "../../devel/libuuid/buildlink3.mk" 58.include "../../devel/libuuid/buildlink3.mk"
57.include "../../devel/uthash/buildlink3.mk" 59.include "../../devel/uthash/buildlink3.mk"
58# ?needed 60# ?needed
59.include "../../net/libcares/buildlink3.mk" 61.include "../../net/libcares/buildlink3.mk"
60.include "../../security/openssl/buildlink3.mk" 62.include "../../security/openssl/buildlink3.mk"
61.include "../../mk/bsd.pkg.mk" 63.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/net/mosquitto/options.mk
# $NetBSD: options.mk,v 1.1 2021/06/08 10:12:55 bouyer Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.mosquitto
PKG_SUPPORTED_OPTIONS=	websockets
PKG_SUGGESTED_OPTIONS=	websockets

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Mwebsockets)
CMAKE_ARGS+=	-DWITH_WEBSOCKETS=yes
.include "../../www/libwebsockets/buildlink3.mk"
.else
CMAKE_ARGS+=	-DWITH_WEBSOCKETS=no
.endif