From nobody Mon Feb 20 15:11:01 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PL5Td66ZVz3swcY; Mon, 20 Feb 2023 15:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PL5Td3RNKz4132; Mon, 20 Feb 2023 15:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676905861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HaQeEa3YfS6GiHWkN5jqgt5hjUjFGAtj0xnHB/NQiIw=; b=Jah3ae3RDfL+cHCAnF2N5N4DGAzTVuxKTkXm02NtrRTjuMhsbKsf8p3h1ATudIte3Hfej4 kkqqHGrDZtddjuBzeA2BAhimgWPLP+bqIOIEHODCiEET3saljMHWPspbut1fGtH14YaozC zgNgTsh7R+abPlV8omHXBSkorsqyO4iFtpTRz0dwQM4bal/7BPq2gdYR8NrYx9ZqAA3K4b 4JcJhVAvPE7vLp0+LVzs2Umg6bH9wwV3DsjcahKb4GphsoogvWsSGV8O++UEYOpFkR/Kli sudqr51GR6INPWl1T2id/Lg5+6FNT6RPjUBJr1ALMJ5tBkIBYTot16H7P0Q/JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676905861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HaQeEa3YfS6GiHWkN5jqgt5hjUjFGAtj0xnHB/NQiIw=; b=bfgWhDdilKZbnqiQVOdvi+uyRLRBSe5HqCFrc9WJ4tpv6hbW7eEng5wlpk4AD1N84KOD1l 1NwhiWyYm88JTcx+TrGthPLw9y5toAFqU1vfTvJtUKNjqNYQtmktdCNjg/z/tIe1ivie3G 08IKDrc7gHe+cjd1VycQSOvy/UXuIGkjTkBdQ37+v4E2fqDcny22gaDQLdYRGfzccfl0xZ 8G7sDxR4w67AfdgXlbhEF5FNTmfMY/M/P1rmcIjruKm9gU/jJFjPCvhlbvlfk77SX/Z3nB fhme+vLi5rq3b2Uc5oVHfXUFE+9redzl8i6bjaXjzilKtr5iBZYCWDywRLOSBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676905861; a=rsa-sha256; cv=none; b=uvrg5jBXqATsP74Sx6Qsy6pcWaRY/2JcMaYYrZa2sGlXtUQyj0za5YL7NO9HiKOqQ9cNPz MEs5PFTLIN3Vo2sOh1EQ0VLcOcnfn29ldy+R6X2nDZN5urjCoOauJUPpsQJucBoAqhqSFP x4WcvT+uyf4cqm5gbZHlryZ8/0sXkUe2oRhy2nL0Ww3ZBIkTkmTMP/uNemcQuBNJNK7pZh k80I0lU0jgRgGl6Wc5LM5rWwvOTyWUq4hqhxCjh//vypoXRWYPFZYxN6kpIWcW5e/3jsiC VhlJaNaz5KBIvzMqx1XajS0exfgY7mGQAthPoJYrweVgOQXpd87fTisMwqPfUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PL5Td24VTzlHS; Mon, 20 Feb 2023 15:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31KFB1FQ061019; Mon, 20 Feb 2023 15:11:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KFB1ZW061018; Mon, 20 Feb 2023 15:11:01 GMT (envelope-from git) Date: Mon, 20 Feb 2023 15:11:01 GMT Message-Id: <202302201511.31KFB1ZW061018@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 234eddf05679 - main - net/mosquitto: Make websockets option default and minor tweaking of Makefile List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 234eddf0567942e387f74ba97a0cf1382c2e9ff9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=234eddf0567942e387f74ba97a0cf1382c2e9ff9 commit 234eddf0567942e387f74ba97a0cf1382c2e9ff9 Author: Daniel Engberg AuthorDate: 2023-02-20 15:08:43 +0000 Commit: Daniel Engberg 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 (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