Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Feb 2019 09:53:21 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r491798 - head/net/mosquitto
Message-ID:  <201902010953.x119rLUZ037471@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <sys/socket.h> 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 <sys/socket.h>,' \
+		${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



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