diff --git a/devel/cpprestsdk/Makefile b/devel/cpprestsdk/Makefile index efc2eac01ada..a12fe03e1548 100644 --- a/devel/cpprestsdk/Makefile +++ b/devel/cpprestsdk/Makefile @@ -1,33 +1,33 @@ # $FreeBSD$ PORTNAME= cpprestsdk -PORTVERSION= 2.9.1 +PORTVERSION= 2.10.16 DISTVERSIONPREFIX= v -PORTREVISION= 13 CATEGORIES= devel MAINTAINER= projects@phess.net COMMENT= Microsoft C++ REST SDK LICENSE= MIT LICENSE_FILE= ${WRKSRC}/../license.txt BROKEN_powerpc64= fails to compile: threadpool.h:59:25: conversion to 'int' from 'size_t {aka long unsigned int}' may alter its value +BUILD_DEPENDS= ${LOCALBASE}/include/websocketpp/client.hpp:devel/websocketpp LIB_DEPENDS= libboost_system.so:devel/boost-libs -USES= cmake compiler:c++11-lib ssl +USES= cmake compiler:c++11-lang pkgconfig ssl USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= Microsoft WRKSRC_SUBDIR= Release CMAKE_OFF= BUILD_SAMPLES BUILD_TESTS -.include +CXXFLAGS+= -Wno-c11-extensions -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= use of undeclared identifier 'SSL_R_SHORT_READ' -BROKEN_FreeBSD_13= use of undeclared identifier 'SSL_R_SHORT_READ' -.endif +OPTIONS_DEFINE= BROTLI -.include +BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli +BROTLI_CMAKE_ON= -DCPPREST_EXCLUDE_BROTLI:BOOL=OFF + +.include diff --git a/devel/cpprestsdk/distinfo b/devel/cpprestsdk/distinfo index 821c4440d9d8..ae2db5db25b9 100644 --- a/devel/cpprestsdk/distinfo +++ b/devel/cpprestsdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484223440 -SHA256 (Microsoft-cpprestsdk-v2.9.1_GH0.tar.gz) = 7097889965df48ec5799d6ed3b4f95f16ca82ee3512eb31db844d9df600bc899 -SIZE (Microsoft-cpprestsdk-v2.9.1_GH0.tar.gz) = 1601475 +TIMESTAMP = 1587775456 +SHA256 (Microsoft-cpprestsdk-v2.10.16_GH0.tar.gz) = 3d75e17c7d79131320438f2a15331f7ca6281c38c0e2daa27f051e290eeb8681 +SIZE (Microsoft-cpprestsdk-v2.10.16_GH0.tar.gz) = 1768423 diff --git a/devel/cpprestsdk/files/patch-git_6b2e048001 b/devel/cpprestsdk/files/patch-git_6b2e048001 deleted file mode 100644 index b4add9d42c8a..000000000000 --- a/devel/cpprestsdk/files/patch-git_6b2e048001 +++ /dev/null @@ -1,34 +0,0 @@ -This fixes the build against Boost 1.66 - -In file included from src/websockets/client/ws_client_wspp.cpp:28: -In file included from libs/websocketpp/websocketpp/config/asio_client.hpp:32: -In file included from libs/websocketpp/websocketpp/transport/asio/endpoint.hpp:32: -libs/websocketpp/websocketpp/transport/asio/connection.hpp:425:24: error: no matching function for call to 'make_shared' - m_strand = lib::make_shared( - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -/usr/include/c++/v1/memory:4642:1: note: candidate template ignored: invalid explicitly-specified argument for template parameter '_Tp' -make_shared(_Args&& ...__args) -^ - -From 6b2e0480018530b616f61d5cdc786c92ba148bb7 Mon Sep 17 00:00:00 2001 -From: John Hruby -Date: Tue, 26 Dec 2017 16:52:13 +0100 -Subject: [PATCH] fixed strand - ---- - Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp b/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp -index 0be40f6b..395632c3 100644 ---- libs/websocketpp/websocketpp/transport/asio/connection.hpp -+++ libs/websocketpp/websocketpp/transport/asio/connection.hpp -@@ -422,7 +422,7 @@ class connection : public config::socket_type::socket_con_type { - m_io_service = io_service; - - if (config::enable_multithreading) { -- m_strand = lib::make_shared( -+ m_strand = lib::make_shared( - lib::ref(*io_service)); - - m_async_read_handler = m_strand->wrap(lib::bind( diff --git a/devel/cpprestsdk/files/patch-git_70c1b14f39 b/devel/cpprestsdk/files/patch-git_70c1b14f39 deleted file mode 100644 index e14bc23e77cf..000000000000 --- a/devel/cpprestsdk/files/patch-git_70c1b14f39 +++ /dev/null @@ -1,36 +0,0 @@ -This fixes the build on FreeBSD 12+ (with clang 5). - -src/uri/uri.cpp:25:73: error: lambda capture 'this' is not used [-Werror,-Wunused-lambda-capture] - std::transform(m_scheme.begin(), m_scheme.end(), m_scheme.begin(), [this](utility::char_t c) { -src/uri/uri.cpp:30:67: error: lambda capture 'this' is not used [-Werror,-Wunused-lambda-capture] - std::transform(m_host.begin(), m_host.end(), m_host.begin(), [this](utility::char_t c) { - -From 70c1b14f39f5d47984fdd8a31fc357ebb5a37851 Mon Sep 17 00:00:00 2001 -From: Force Charlie -Date: Thu, 20 Jul 2017 14:39:21 +0800 -Subject: [PATCH] fix lambda capture 'this' is not used, clang 5.0 on ubuntu - 16.04 - ---- - Release/src/uri/uri.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Release/src/uri/uri.cpp b/Release/src/uri/uri.cpp -index fb395edf..3157b96a 100644 ---- src/uri/uri.cpp -+++ src/uri/uri.cpp -@@ -22,12 +22,12 @@ utility::string_t uri_components::join() - // canonicalize components first - - // convert scheme to lowercase -- std::transform(m_scheme.begin(), m_scheme.end(), m_scheme.begin(), [this](utility::char_t c) { -+ std::transform(m_scheme.begin(), m_scheme.end(), m_scheme.begin(), [](utility::char_t c) { - return (utility::char_t)tolower(c); - }); - - // convert host to lowercase -- std::transform(m_host.begin(), m_host.end(), m_host.begin(), [this](utility::char_t c) { -+ std::transform(m_host.begin(), m_host.end(), m_host.begin(), [](utility::char_t c) { - return (utility::char_t)tolower(c); - }); - diff --git a/devel/cpprestsdk/files/patch-include_pplx_pplxlinux.h b/devel/cpprestsdk/files/patch-include_pplx_pplxlinux.h deleted file mode 100644 index cfe1b36ad9c7..000000000000 --- a/devel/cpprestsdk/files/patch-include_pplx_pplxlinux.h +++ /dev/null @@ -1,12 +0,0 @@ -https://github.com/Microsoft/cpprestsdk/issues/747 - ---- include/pplx/pplxlinux.h.orig 2016-10-28 19:20:12 UTC -+++ include/pplx/pplxlinux.h -@@ -240,6 +240,7 @@ namespace platform - { - public: - _PPLXIMP virtual void schedule( TaskProc_t proc, _In_ void* param); -+ virtual ~linux_scheduler() {} - }; - - } // namespace details diff --git a/devel/cpprestsdk/files/patch-z-boost-1.70 b/devel/cpprestsdk/files/patch-z-boost-1.70 deleted file mode 100644 index 66d0c497442e..000000000000 --- a/devel/cpprestsdk/files/patch-z-boost-1.70 +++ /dev/null @@ -1,62 +0,0 @@ -https://github.com/zaphoyd/websocketpp/issues/794 - ---- libs/websocketpp/websocketpp/transport/asio/connection.hpp.orig 2016-10-28 19:20:12 UTC -+++ libs/websocketpp/websocketpp/transport/asio/connection.hpp -@@ -296,7 +296,7 @@ class connection : public config::socket_type::socket_ - */ - timer_ptr set_timer(long duration, timer_handler callback) { - timer_ptr new_timer = lib::make_shared( -- lib::ref(*m_io_service), -+ *m_io_service, - boost::posix_time::milliseconds(duration) - ); - -@@ -423,7 +423,7 @@ class connection : public config::socket_type::socket_ - - if (config::enable_multithreading) { - m_strand = lib::make_shared( -- lib::ref(*io_service)); -+ *io_service); - - m_async_read_handler = m_strand->wrap(lib::bind( - &type::handle_async_read, get_shared(),lib::placeholders::_1, ---- libs/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig 2016-10-28 19:20:12 UTC -+++ libs/websocketpp/websocketpp/transport/asio/endpoint.hpp -@@ -184,7 +184,7 @@ class endpoint : public config::socket_type { (public) - m_io_service = ptr; - m_external_io_service = true; - m_acceptor = lib::make_shared( -- lib::ref(*m_io_service)); -+ *m_io_service); - - m_state = READY; - ec = lib::error_code(); -@@ -610,7 +610,7 @@ class endpoint : public config::socket_type { (public) - */ - void start_perpetual() { - m_work = lib::make_shared( -- lib::ref(*m_io_service) -+ *m_io_service - ); - } - -@@ -776,7 +776,7 @@ class endpoint : public config::socket_type { (public) - // Create a resolver - if (!m_resolver) { - m_resolver = lib::make_shared( -- lib::ref(*m_io_service)); -+ *m_io_service); - } - - std::string proxy = tcon->get_proxy(); ---- libs/websocketpp/websocketpp/transport/asio/security/none.hpp.orig 2016-10-28 19:20:12 UTC -+++ libs/websocketpp/websocketpp/transport/asio/security/none.hpp -@@ -167,7 +167,7 @@ class connection : public lib::enable_shared_from_this - } - - m_socket = lib::make_shared( -- lib::ref(*service)); -+ *service); - - m_state = READY; - diff --git a/devel/cpprestsdk/pkg-plist b/devel/cpprestsdk/pkg-plist index c455371e72a8..7a229daaec3f 100644 --- a/devel/cpprestsdk/pkg-plist +++ b/devel/cpprestsdk/pkg-plist @@ -1,46 +1,47 @@ include/cpprest/astreambuf.h include/cpprest/asyncrt_utils.h include/cpprest/base_uri.h include/cpprest/containerstream.h include/cpprest/details/SafeInt3.hpp include/cpprest/details/basic_types.h include/cpprest/details/cpprest_compat.h include/cpprest/details/fileio.h include/cpprest/details/http_constants.dat include/cpprest/details/http_helpers.h include/cpprest/details/http_server.h include/cpprest/details/http_server_api.h -include/cpprest/details/http_server_asio.h -include/cpprest/details/http_server_httpsys.h include/cpprest/details/nosal.h include/cpprest/details/resource.h -include/cpprest/details/uri_parser.h include/cpprest/details/web_utilities.h -include/cpprest/details/x509_cert_utilities.h include/cpprest/filestream.h include/cpprest/http_client.h +include/cpprest/http_compression.h include/cpprest/http_headers.h include/cpprest/http_listener.h include/cpprest/http_msg.h include/cpprest/interopstream.h include/cpprest/json.h include/cpprest/oauth1.h include/cpprest/oauth2.h include/cpprest/producerconsumerstream.h include/cpprest/rawptrstream.h include/cpprest/streams.h include/cpprest/uri.h include/cpprest/uri_builder.h include/cpprest/version.h include/cpprest/ws_client.h include/cpprest/ws_msg.h include/pplx/pplx.h include/pplx/pplxcancellation_token.h include/pplx/pplxconv.h include/pplx/pplxinterface.h include/pplx/pplxlinux.h include/pplx/pplxtasks.h include/pplx/pplxwin.h include/pplx/threadpool.h +lib/cmake/cpprestsdk/cpprestsdk-config-version.cmake +lib/cmake/cpprestsdk/cpprestsdk-config.cmake +lib/cmake/cpprestsdk/cpprestsdk-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/cpprestsdk/cpprestsdk-targets.cmake lib/libcpprest.so -lib/libcpprest.so.2.9 +lib/libcpprest.so.2.10