6 files changed, 36 insertions, 44 deletions

diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index 77907090f3fa..4902a0107d99 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grpc
-PORTVERSION=	1.8.6
+PORTVERSION=	1.9.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/grpc/distinfo b/devel/grpc/distinfo
index daab17e9fd8e..2dfc9a9fc187 100644
--- a/devel/grpc/distinfo
+++ b/devel/grpc/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1517488065
-SHA256 (grpc-grpc-v1.8.6_GH0.tar.gz) = 2a525fa5b0d6486a00f85cf65bb3da60ed25f7cb865628f54b7657d1fd1a8802
-SIZE (grpc-grpc-v1.8.6_GH0.tar.gz) = 4633179
+TIMESTAMP = 1517552032
+SHA256 (grpc-grpc-v1.9.0_GH0.tar.gz) = 849679d38daa54aeb3643c9bc830d6b61dca06bed8c72e8dde2e25eff9ad91d5
+SIZE (grpc-grpc-v1.9.0_GH0.tar.gz) = 4648677
 SHA256 (google-benchmark-v1.3.0_GH0.tar.gz) = f19559475a592cbd5ac48b61f6b9cedf87f0b6775d1443de54cfe8f53940b28d
 SIZE (google-benchmark-v1.3.0_GH0.tar.gz) = 105485
diff --git a/devel/grpc/files/patch-CMakeLists.txt b/devel/grpc/files/patch-CMakeLists.txt
index d5781d250739..b856f6c90bba 100644
--- a/devel/grpc/files/patch-CMakeLists.txt
+++ b/devel/grpc/files/patch-CMakeLists.txt
@@ -1,24 +1,14 @@
---- CMakeLists.txt.orig	2017-12-13 01:39:01 UTC
+--- CMakeLists.txt.orig	2018-02-01 19:36:08 UTC
 +++ CMakeLists.txt
-@@ -144,7 +144,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
-     set(gRPC_INSTALL FALSE)
-   endif()
- elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package")
--  find_package(c-ares REQUIRED CONFIG)
-+  find_package(PkgConfig REQUIRED)
-+  pkg_search_module(CARES REQUIRED libcares)
-   if(TARGET c-ares::cares)
-     set(_gRPC_CARES_LIBRARIES c-ares::cares)
-   endif()
-@@ -829,6 +830,7 @@ add_library(gpr
-   src/core/lib/support/tmpfile_windows.cc
-   src/core/lib/support/wrap_memcpy.cc
+@@ -669,6 +669,7 @@ add_library(gpr
+   src/core/lib/profiling/basic_timers.cc
+   src/core/lib/profiling/stap_timers.cc
  )
 +set_target_properties(gpr PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
  
  if(WIN32 AND MSVC)
    set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr"
-@@ -1209,6 +1211,7 @@ add_library(grpc
+@@ -1044,6 +1045,7 @@ add_library(grpc
    src/core/ext/filters/workarounds/workaround_utils.cc
    src/core/plugin_registry/grpc_plugin_registry.cc
  )
@@ -26,7 +16,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc"
-@@ -1523,6 +1526,7 @@ add_library(grpc_cronet
+@@ -1355,6 +1357,7 @@ add_library(grpc_cronet
    src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc
    src/core/plugin_registry/grpc_cronet_plugin_registry.cc
  )
@@ -34,15 +24,15 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet"
-@@ -2390,6 +2394,7 @@ target_include_directories(grpc_unsecure
-   PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/cares/cares
-   PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include
+@@ -2192,6 +2195,7 @@ add_library(grpc_unsecure
+   src/core/ext/filters/workarounds/workaround_utils.cc
+   src/core/plugin_registry/grpc_unsecure_plugin_registry.cc
  )
 +set_target_properties(grpc_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
  
- target_link_libraries(grpc_unsecure
-   ${_gRPC_BASELIB_LIBRARIES}
-@@ -2580,6 +2585,7 @@ add_library(grpc++
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure"
+@@ -2400,6 +2404,7 @@ add_library(grpc++
    src/cpp/util/time_cc.cc
    src/cpp/codegen/codegen_init.cc
  )
@@ -50,7 +40,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++"
-@@ -3066,6 +3072,7 @@ add_library(grpc++_cronet
+@@ -2880,6 +2885,7 @@ add_library(grpc++_cronet
    third_party/nanopb/pb_decode.c
    third_party/nanopb/pb_encode.c
  )
@@ -58,7 +48,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet"
-@@ -3266,6 +3273,7 @@ add_library(grpc++_error_details
+@@ -3076,6 +3082,7 @@ add_library(grpc++_error_details
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h
    src/cpp/util/error_details.cc
  )
@@ -66,7 +56,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details"
-@@ -3392,6 +3400,7 @@ add_library(grpc++_reflection
+@@ -3198,6 +3205,7 @@ add_library(grpc++_reflection
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.h
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h
  )
@@ -74,7 +64,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection"
-@@ -3815,6 +3824,7 @@ add_library(grpc++_unsecure
+@@ -3611,6 +3619,7 @@ add_library(grpc++_unsecure
    src/cpp/util/time_cc.cc
    src/cpp/codegen/codegen_init.cc
  )
@@ -82,7 +72,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure"
-@@ -4128,6 +4138,7 @@ add_library(grpc_plugin_support
+@@ -3916,6 +3925,7 @@ add_library(grpc_plugin_support
    src/compiler/python_generator.cc
    src/compiler/ruby_generator.cc
  )
@@ -90,7 +80,7 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support"
-@@ -4637,6 +4648,7 @@ endif (gRPC_BUILD_TESTS)
+@@ -4409,6 +4419,7 @@ endif (gRPC_BUILD_TESTS)
  add_library(grpc_csharp_ext SHARED
    src/csharp/ext/grpc_csharp_ext.c
  )
@@ -98,11 +88,3 @@
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext"
-@@ -10696,7 +10708,6 @@ add_executable(grpc_cpp_plugin
-   src/compiler/cpp_plugin.cc
- )
- 
--
- target_include_directories(grpc_cpp_plugin
-   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
diff --git a/devel/grpc/files/patch-cmake_cares.cmake b/devel/grpc/files/patch-cmake_cares.cmake
new file mode 100644
index 000000000000..6f7ff7d952d2
--- /dev/null
+++ b/devel/grpc/files/patch-cmake_cares.cmake
@@ -0,0 +1,12 @@
+--- cmake/cares.cmake.orig	2018-02-01 19:36:08 UTC
++++ cmake/cares.cmake
+@@ -30,7 +30,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
+     set(gRPC_INSTALL FALSE)
+   endif()
+ elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package")
+-  find_package(c-ares REQUIRED CONFIG)
++  find_package(PkgConfig REQUIRED)
++  pkg_search_module(CARES REQUIRED libcares)
+   if(TARGET c-ares::cares)
+     set(_gRPC_CARES_LIBRARIES c-ares::cares)
+     set(_gRPC_CARES_INCLUDE_DIR ${c-ares_INCLUDE_DIR})
diff --git a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc
index e99c3f8f4a7e..c11b8f16364e 100644
--- a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc
+++ b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc
@@ -1,6 +1,6 @@
---- src/core/lib/security/credentials/jwt/jwt_verifier.cc.orig	2017-12-13 01:39:01 UTC
+--- src/core/lib/security/credentials/jwt/jwt_verifier.cc.orig	2018-02-01 19:36:08 UTC
 +++ src/core/lib/security/credentials/jwt/jwt_verifier.cc
-@@ -466,7 +466,7 @@ static BIGNUM* bignum_from_base64(grpc_e
+@@ -463,7 +463,7 @@ static BIGNUM* bignum_from_base64(const 
    return result;
  }
  
diff --git a/devel/grpc/pkg-plist b/devel/grpc/pkg-plist
index a3592081913a..7f6352817bcd 100644
--- a/devel/grpc/pkg-plist
+++ b/devel/grpc/pkg-plist
@@ -112,7 +112,6 @@ include/grpc/impl/codegen/byte_buffer.h
 include/grpc/impl/codegen/byte_buffer_reader.h
 include/grpc/impl/codegen/compression_types.h
 include/grpc/impl/codegen/connectivity_state.h
-include/grpc/impl/codegen/exec_ctx_fwd.h
 include/grpc/impl/codegen/fork.h
 include/grpc/impl/codegen/gpr_slice.h
 include/grpc/impl/codegen/gpr_types.h
@@ -138,7 +137,6 @@ include/grpc/support/atm_windows.h
 include/grpc/support/avl.h
 include/grpc/support/cmdline.h
 include/grpc/support/cpu.h
-include/grpc/support/histogram.h
 include/grpc/support/host_port.h
 include/grpc/support/log.h
 include/grpc/support/log_windows.h