From owner-svn-ports-head@freebsd.org Fri Feb 1 09:53:22 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46B3F14C94E1; Fri, 1 Feb 2019 09:53:22 +0000 (UTC) (envelope-from danfe@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AD38C84BE4; Fri, 1 Feb 2019 09:53:21 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9EEEC1D4E7; Fri, 1 Feb 2019 09:53:21 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x119rLsj037472; Fri, 1 Feb 2019 09:53:21 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x119rLUZ037471; Fri, 1 Feb 2019 09:53:21 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201902010953.x119rLUZ037471@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 1 Feb 2019 09:53:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491798 - head/net/mosquitto X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/net/mosquitto X-SVN-Commit-Revision: 491798 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AD38C84BE4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.947,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2019 09:53:22 -0000 Author: danfe Date: Fri Feb 1 09:53:21 2019 New Revision: 491798 URL: https://svnweb.freebsd.org/changeset/ports/491798 Log: - Unbreak the build on 11.2-RELEASE when Websockets support is enabled by including required header - Remove banal comments and bogus NOCONFIGURE knob while here RR: 235323 Modified: head/net/mosquitto/Makefile Modified: head/net/mosquitto/Makefile ============================================================================== --- head/net/mosquitto/Makefile Fri Feb 1 09:30:37 2019 (r491797) +++ head/net/mosquitto/Makefile Fri Feb 1 09:53:21 2019 (r491798) @@ -18,28 +18,26 @@ BUILD_DEPENDS= xsltproc:textproc/libxslt USES= cmake ssl USE_RC_SUBR= mosquitto USE_LDCONFIG= yes +CMAKE_ARGS= -DCMAKE_LIBDATADIR:PATH="${PREFIX}/libdata" USERS= nobody -NOCONFIGURE= yes PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= WS -CMAKE_ARGS+= -DCMAKE_LIBDATADIR="${PREFIX}/libdata" - WS_DESC= MQTT over Websockets support WS_LIB_DEPENDS= libwebsockets.so:net/libwebsockets WS_CMAKE_ON= -DWITH_WEBSOCKETS=ON post-patch: -# do not run ldconfig in stage dir + @${REINPLACE_CMD} -e '45s,^,#include ,' \ + ${WRKSRC}/src/websockets.c @${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \ ${WRKSRC}/lib/CMakeLists.txt ${WRKSRC}/lib/cpp/CMakeLists.txt @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/CMakeLists.txt post-install: -# Adjust configuration files ${MV} ${STAGEDIR}${ETCDIR}/mosquitto.conf ${STAGEDIR}${ETCDIR}/mosquitto.conf.sample ${MV} ${STAGEDIR}${ETCDIR}/pwfile.example ${STAGEDIR}${ETCDIR}/pwfile.sample ${MV} ${STAGEDIR}${ETCDIR}/pskfile.example ${STAGEDIR}${ETCDIR}/pskfile.sample