Index: head/www/domoticz/Makefile =================================================================== --- head/www/domoticz/Makefile (revision 463613) +++ head/www/domoticz/Makefile (revision 463614) @@ -1,102 +1,100 @@ # $FreeBSD$ PORTNAME= domoticz PORTVERSION= 3.${DOMOTICZ_REL} PORTREVISION= 3 CATEGORIES= www MAINTAINER= kiwi@oav.net COMMENT= Home Automation System LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/License.txt -BROKEN= fails to build with boost 1.66, see bug 224181 - LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 CONFLICTS_INSTALL?= domoticz-[23]* domoticz-devel-* OPTIONS_SUB= YES OPTIONS_DEFINE= SBOOST SLUA SMQTT SSQLITE PYTHON TELLDUS SBOOST_DESC= Use static Boost instead of dynamic linking SLUA_DESC= Use domoticz provided LUA instead of ports one SMQTT_DESC= Use domoticz mosquitto instead of ports one SSQLITE_DESC= Use domoticz SQLLite instead of ports one PYTHON_DESC= Enable support for Python Plugins TELLDUS_DESC= Enable support for Telldus .include # This hack is to get rid of dependency of git while building # the package. DOMOTICZ_REL= 8153 DOMOTICZ_TS= 1501416191 USE_GITHUB= yes GH_ACCOUNT= domoticz GH_PROJECT= domoticz USES= cmake iconv pkgconfig ssl USE_RC_SUBR= domoticz USERS= domoticz GROUPS= domoticz CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}/domoticz \ -DUSE_BUILTIN_ZLIB="NO" \ -DUSE_STATIC_OPENZWAVE="NO" .if ${PORT_OPTIONS:MSBOOST} CMAKE_ARGS+= -DUSE_STATIC_BOOST="YES" BUILD_DEPENDS+= boost-libs>=0:devel/boost-libs .else CMAKE_ARGS+= -DUSE_STATIC_BOOST="NO" LIB_DEPENDS+= libboost_system.so:devel/boost-libs .endif .if ${PORT_OPTIONS:MSLUA} CMAKE_ARGS+= -DUSE_BUILTIN_LUA="YES" .else CMAKE_ARGS+= -DUSE_BUILTIN_LUA="NO" USES+= lua:52 .endif .if ${PORT_OPTIONS:MSMQTT} CMAKE_ARGS+= -DUSE_BUILTIN_MQTT="YES" .else CMAKE_ARGS+= -DUSE_BUILTIN_MQTT="NO" LIB_DEPENDS+= libmosquitto.so:net/mosquitto .endif .if ${PORT_OPTIONS:MSSQLITE} CMAKE_ARGS+= -DUSE_BUILTIN_SQLITE="YES" .else CMAKE_ARGS+= -DUSE_BUILTIN_SQLITE="NO" USES+= sqlite .endif .if ${PORT_OPTIONS:MPYTHON} CMAKE_ARGS+= -DUSE_PYTHON="YES" USES+= python:3.4 .else CMAKE_ARGS+= -DUSE_PYTHON="NO" .endif .if ${PORT_OPTIONS:MTELLDUS} LIB_DEPENDS+= libtelldus-core.so:comms/telldus-core .endif post-patch: @${REINPLACE_CMD} -e "s,\/opt,${PREFIX},g" ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e "s,XXXPREFIXXXX,${PREFIX}/domoticz,g" ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e "s,XXXDOMOTICZXXX,${DOMOTICZ_REL},g" ${WRKSRC}/appversion.default @${REINPLACE_CMD} -e "s,XXXHASHXXX,${GH_TAGNAME},g" ${WRKSRC}/appversion.default @${REINPLACE_CMD} -e "s,XXXTIMEXXX,${DOMOTICZ_TS},g" ${WRKSRC}/appversion.default @${REINPLACE_CMD} -e "/^ADD_PRECOMPILED_HEADER/ d" ${WRKSRC}/CMakeLists.txt post-install: @${MKDIR} ${STAGEDIR}/var/db/domoticz ${STAGEDIR}/var/run/domoticz .include Index: head/www/domoticz/files/patch-webserver_proxyclient.cpp =================================================================== --- head/www/domoticz/files/patch-webserver_proxyclient.cpp (nonexistent) +++ head/www/domoticz/files/patch-webserver_proxyclient.cpp (revision 463614) @@ -0,0 +1,13 @@ +https://github.com/domoticz/domoticz/commit/388c7b51716c + +--- webserver/proxyclient.cpp.orig 2017-07-30 10:19:41 UTC ++++ webserver/proxyclient.cpp +@@ -639,7 +639,7 @@ namespace http { + void CProxyManager::StartThread() + { + try { +- boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::sslv23); ++ boost::asio::ssl::context ctx(boost::asio::ssl::context::sslv23); + ctx.set_verify_mode(boost::asio::ssl::verify_none); + + proxyclient.reset(new CProxyClient(io_service, ctx, m_pWebEm)); Property changes on: head/www/domoticz/files/patch-webserver_proxyclient.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/domoticz/files/patch-webserver_server.cpp =================================================================== --- head/www/domoticz/files/patch-webserver_server.cpp (nonexistent) +++ head/www/domoticz/files/patch-webserver_server.cpp (revision 463614) @@ -0,0 +1,22 @@ +https://github.com/domoticz/domoticz/commit/388c7b51716c + +--- webserver/server.cpp.orig 2017-07-30 10:19:41 UTC ++++ webserver/server.cpp +@@ -148,7 +148,7 @@ void server::handle_accept(const boost::system::error_ + ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler & user_request_handler) : + server_base(ssl_settings, user_request_handler), + settings_(ssl_settings), +- context_(io_service_, ssl_settings.get_ssl_method()) ++ context_(ssl_settings.get_ssl_method()) + { + #ifdef DEBUG_WWW + _log.Log(LOG_STATUS, "[web:%s] create ssl_server using ssl_server_settings : %s", ssl_settings.listening_port.c_str(), ssl_settings.to_string().c_str()); +@@ -161,7 +161,7 @@ ssl_server::ssl_server(const ssl_server_settings & ssl + ssl_server::ssl_server(const server_settings & settings, request_handler & user_request_handler) : + server_base(settings, user_request_handler), + settings_(dynamic_cast(settings)), +- context_(io_service_, dynamic_cast(settings).get_ssl_method()) { ++ context_(dynamic_cast(settings).get_ssl_method()) { + #ifdef DEBUG_WWW + _log.Log(LOG_STATUS, "[web:%s] create ssl_server using server_settings : %s", settings.listening_port.c_str(), settings.to_string().c_str()); + #endif Property changes on: head/www/domoticz/files/patch-webserver_server.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property