Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Feb 2023 15:11:01 GMT
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 234eddf05679 - main - net/mosquitto: Make websockets option default and minor tweaking of Makefile
Message-ID:  <202302201511.31KFB1ZW061018@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=234eddf0567942e387f74ba97a0cf1382c2e9ff9

commit 234eddf0567942e387f74ba97a0cf1382c2e9ff9
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-02-20 15:08:43 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-02-20 15:10:31 +0000

    net/mosquitto: Make websockets option default and minor tweaking of Makefile
    
    Make websockets default, this is more inline with other distros
    Do some slight changes to better follow Porters Handbook and tree overall
    
    PR:             269614
    Reviewed by:    Joseph Benden <joe@thrallingpenguin.com> (maintainer)
---
 net/mosquitto/Makefile  | 17 +++++++++--------
 net/mosquitto/pkg-plist |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 6fa94457fc64..d410b5e2289d 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mosquitto
-PORTVERSION=	2.0.15
+DISTVERSION=	2.0.15
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://mosquitto.org/files/source/
 
@@ -23,17 +24,17 @@ CPE_VENDOR=	eclipse
 
 USERS=		nobody
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
-OPTIONS_DEFINE=	CARES WS
-OPTIONS_DEFAULT=	CARES
+OPTIONS_DEFINE=	CARES WEBSOCKETS
+OPTIONS_DEFAULT=CARES WEBSOCKETS
 
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
-CARES_CMAKE_ON=	-DWITH_SRV:BOOL=ON
+CARES_CMAKE_ON=		-DWITH_SRV:BOOL=ON
 
-WS_DESC=	MQTT over Websockets support
-WS_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
-WS_CMAKE_ON=	-DWITH_WEBSOCKETS:BOOL=ON
+WEBSOCKETS_DESC=	Websockets support via libwebsockets
+WEBSOCKETS_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
+WEBSOCKETS_CMAKE_ON=	-DWITH_WEBSOCKETS:BOOL=ON
 
 post-patch:
 	@${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \
diff --git a/net/mosquitto/pkg-plist b/net/mosquitto/pkg-plist
index 03e7dac98bbe..8276473a059b 100644
--- a/net/mosquitto/pkg-plist
+++ b/net/mosquitto/pkg-plist
@@ -14,10 +14,10 @@ include/mosquittopp.h
 include/mqtt_protocol.h
 lib/libmosquitto.so
 lib/libmosquitto.so.1
-lib/libmosquitto.so.%%PORTVERSION%%
+lib/libmosquitto.so.%%DISTVERSION%%
 lib/libmosquittopp.so
 lib/libmosquittopp.so.1
-lib/libmosquittopp.so.%%PORTVERSION%%
+lib/libmosquittopp.so.%%DISTVERSION%%
 lib/mosquitto_dynamic_security.so
 libdata/pkgconfig/libmosquitto.pc
 libdata/pkgconfig/libmosquittopp.pc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302201511.31KFB1ZW061018>