 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.87 2024/04/19 04:54:36 adam Exp $
+# $NetBSD: Makefile,v 1.88 2024/05/15 21:13:49 wiz Exp $
-DISTNAME=	grpc-1.62.2
+DISTNAME=	grpc-1.63.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=grpc/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	https://grpc.io/
 COMMENT=	High performance, open-source universal RPC framework
 LICENSE=	apache-2.0
 USE_CXX_FEATURES=	c++14
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config
 FORCE_CXX_STD=		c++14

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.43 2024/02/22 11:55:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.44 2024/05/15 21:13:49 wiz Exp $
 bin/grpc_cpp_plugin
 bin/grpc_csharp_plugin
 bin/grpc_node_plugin
 bin/grpc_objective_c_plugin
 bin/grpc_php_plugin
 bin/grpc_python_plugin
 bin/grpc_ruby_plugin
 include/grpc++/alarm.h
 include/grpc++/channel.h
 include/grpc++/client_context.h
 include/grpc++/completion_queue.h
 include/grpc++/create_channel.h
 include/grpc++/create_channel_posix.h
 @@ -135,26 +135,27 @@ include/grpc/impl/slice_type.h
 include/grpc/load_reporting.h
 include/grpc/slice.h
 include/grpc/slice_buffer.h
 include/grpc/status.h
 include/grpc/support/alloc.h
 include/grpc/support/atm.h
 include/grpc/support/atm_gcc_atomic.h
 include/grpc/support/atm_gcc_sync.h
 include/grpc/support/atm_windows.h
 include/grpc/support/cpu.h
 include/grpc/support/json.h
 include/grpc/support/log.h
 include/grpc/support/log_windows.h
 include/grpc/support/metrics.h
 include/grpc/support/port_platform.h
 include/grpc/support/string_util.h
 include/grpc/support/sync.h
 include/grpc/support/sync_abseil.h
 include/grpc/support/sync_custom.h
 include/grpc/support/sync_generic.h
 include/grpc/support/sync_posix.h
 include/grpc/support/sync_windows.h
 include/grpc/support/thd_id.h
 include/grpc/support/time.h
 include/grpc/support/workaround_list.h
 include/grpcpp/alarm.h
 include/grpcpp/channel.h
 @@ -292,72 +293,72 @@ include/grpcpp/support/time.h
 include/grpcpp/support/validate_service_config.h
 include/grpcpp/version_info.h
 include/grpcpp/xds_server_builder.h
 lib/cmake/grpc/gRPCConfig.cmake
 lib/cmake/grpc/gRPCConfigVersion.cmake
 lib/cmake/grpc/gRPCPluginTargets-noconfig.cmake
 lib/cmake/grpc/gRPCPluginTargets.cmake
 lib/cmake/grpc/gRPCTargets-noconfig.cmake
 lib/cmake/grpc/gRPCTargets.cmake
 lib/cmake/grpc/modules/Findc-ares.cmake
 lib/cmake/grpc/modules/Findre2.cmake
 lib/cmake/grpc/modules/Findsystemd.cmake
 lib/libaddress_sorting.so
-lib/libaddress_sorting.so.39
+lib/libaddress_sorting.so.40
-lib/libaddress_sorting.so.39.0.0
+lib/libaddress_sorting.so.40.0.0
 lib/libgpr.so
-lib/libgpr.so.39
+lib/libgpr.so.40
-lib/libgpr.so.39.0.0
+lib/libgpr.so.40.0.0
 lib/libgrpc++.so
 lib/libgrpc++.so.1.63
 lib/libgrpc++.so.${PKGVERSION}
 lib/libgrpc++.so.1.62
 lib/libgrpc++_alts.so
 lib/libgrpc++_alts.so.1.63
 lib/libgrpc++_alts.so.${PKGVERSION}
 lib/libgrpc++_alts.so.1.62
 lib/libgrpc++_error_details.so
 lib/libgrpc++_error_details.so.1.63
 lib/libgrpc++_error_details.so.${PKGVERSION}
 lib/libgrpc++_error_details.so.1.62
 lib/libgrpc++_reflection.so
 lib/libgrpc++_reflection.so.1.63
 lib/libgrpc++_reflection.so.${PKGVERSION}
 lib/libgrpc++_reflection.so.1.62
 lib/libgrpc++_unsecure.so
 lib/libgrpc++_unsecure.so.1.63
 lib/libgrpc++_unsecure.so.${PKGVERSION}
 lib/libgrpc++_unsecure.so.1.62
 lib/libgrpc.so
-lib/libgrpc.so.39
+lib/libgrpc.so.40
-lib/libgrpc.so.39.0.0
+lib/libgrpc.so.40.0.0
 lib/libgrpc_authorization_provider.so
 lib/libgrpc_authorization_provider.so.1.63
 lib/libgrpc_authorization_provider.so.${PKGVERSION}
 lib/libgrpc_authorization_provider.so.1.62
 lib/libgrpc_plugin_support.so
 lib/libgrpc_plugin_support.so.1.63
 lib/libgrpc_plugin_support.so.${PKGVERSION}
 lib/libgrpc_plugin_support.so.1.62
 lib/libgrpc_unsecure.so
-lib/libgrpc_unsecure.so.39
+lib/libgrpc_unsecure.so.40
-lib/libgrpc_unsecure.so.39.0.0
+lib/libgrpc_unsecure.so.40.0.0
 lib/libgrpcpp_channelz.so
 lib/libgrpcpp_channelz.so.1.63
 lib/libgrpcpp_channelz.so.${PKGVERSION}
 lib/libgrpcpp_channelz.so.1.62
 lib/libupb_base_lib.so
-lib/libupb_base_lib.so.39
+lib/libupb_base_lib.so.40
-lib/libupb_base_lib.so.39.0.0
+lib/libupb_base_lib.so.40.0.0
 lib/libupb_json_lib.so
-lib/libupb_json_lib.so.39
+lib/libupb_json_lib.so.40
-lib/libupb_json_lib.so.39.0.0
+lib/libupb_json_lib.so.40.0.0
 lib/libupb_mem_lib.so
-lib/libupb_mem_lib.so.39
+lib/libupb_mem_lib.so.40
-lib/libupb_mem_lib.so.39.0.0
+lib/libupb_mem_lib.so.40.0.0
 lib/libupb_message_lib.so
-lib/libupb_message_lib.so.39
+lib/libupb_message_lib.so.40
-lib/libupb_message_lib.so.39.0.0
+lib/libupb_message_lib.so.40.0.0
 lib/libupb_textformat_lib.so
-lib/libupb_textformat_lib.so.39
+lib/libupb_textformat_lib.so.40
-lib/libupb_textformat_lib.so.39.0.0
+lib/libupb_textformat_lib.so.40.0.0
 lib/libutf8_range_lib.so
-lib/libutf8_range_lib.so.39
+lib/libutf8_range_lib.so.40
-lib/libutf8_range_lib.so.39.0.0
+lib/libutf8_range_lib.so.40.0.0
 lib/pkgconfig/gpr.pc
 lib/pkgconfig/grpc++.pc
 lib/pkgconfig/grpc++_unsecure.pc
 lib/pkgconfig/grpc.pc
 lib/pkgconfig/grpc_unsecure.pc
 share/grpc/roots.pem

 @@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.81 2024/04/19 04:54:36 adam Exp $
+$NetBSD: distinfo,v 1.82 2024/05/15 21:13:49 wiz Exp $
-BLAKE2s (grpc-1.62.2.tar.gz) = e5b00c7206efcb39f0211fbb49f39c6f40d43f91964162dbce90db87b5e5dba9
+BLAKE2s (grpc-1.63.0.tar.gz) = 335d6dce3755e3ecb32d70f560744198db63d56cc495204e1dfc8e18af489f59
-SHA512 (grpc-1.62.2.tar.gz) = 9a000c8d87ca6dc13c458115394027cfa2982898c617c9c204371eaf7ef20e0fd61b099607fa85e45b4cf77e84201163b5ce09ca86a1ef7aed92cebf44f781b8
+SHA512 (grpc-1.63.0.tar.gz) = 7210131243529d8134c9be18cd09297bc189b7ab633c4037d9096e0f5fdb33c3a93728cfabb0e5b06304cfdc00c33449e8c02b09d0782b6b5de2674a2e2a3c24
-Size (grpc-1.62.2.tar.gz) = 22384704 bytes
+Size (grpc-1.63.0.tar.gz) = 22431725 bytes
 BLAKE2s (opencensus-proto-0.3.0.tar.gz) = be3ce863226f4aa422d9faa997fe29f9bb1743c0e804af3c5fad3c170e60ba42
 SHA512 (opencensus-proto-0.3.0.tar.gz) = 39231a495dfdccfc8267d1e6af2ac624feea611a8691c10ec570de2194b352e4a9c3b0ce1606414fb98e5d77c66873bed4a9e56512efa12b267b8a91e0c5851e
 Size (opencensus-proto-0.3.0.tar.gz) = 163404 bytes
 SHA1 (patch-CMakeLists.txt) = e3ec7dd3fdc01ac7b7afaa8abdac0dfb47bb5317
 SHA1 (patch-include_grpc_event__engine_port.h) = ee0937d5ec59d2f0a462a64145fc63ef68564c17
 SHA1 (patch-src_core_lib_event__engine_cf__engine_cfstream__endpoint.h) = 75c50a6e275de0e47feb0cfa0f0976078025caba
 SHA1 (patch-src_core_lib_iomgr_port.h) = 81e474c608595b5b2defdd04e8c52a63485e7d06

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.70 2024/04/19 04:54:36 adam Exp $
+# $NetBSD: Makefile,v 1.71 2024/05/15 21:13:50 wiz Exp $
-DISTNAME=	grpcio-1.62.2
+DISTNAME=	grpcio-1.63.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/grpcio/}
 MAINTAINER=	kethzer.dr@gmail.com
 HOMEPAGE=	https://grpc.io/
 COMMENT=	HTTP/2-based RPC framework
 LICENSE=	apache-2.0
 TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 USE_CC_FEATURES=	c99

 @@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.60 2024/04/19 04:54:36 adam Exp $
+$NetBSD: distinfo,v 1.61 2024/05/15 21:13:50 wiz Exp $
-BLAKE2s (grpcio-1.62.2.tar.gz) = e0d04fa46699ccd239fa3e95dc83fe37ffee77c1945bdece2ba3bbad6acc81b6
+BLAKE2s (grpcio-1.63.0.tar.gz) = 65052f5069a4b36c8e6e1067995e52d97245505b346b8991a9f53cec3f79c8f9
-SHA512 (grpcio-1.62.2.tar.gz) = cf9356c58c246c34c734e882362cea514420a25f095dca3809a90eba8e38eb71d303e0c33a96e52451c058fd55d37c8afde1cb019bc3a69ac5ce96a8a52c1a7a
+SHA512 (grpcio-1.63.0.tar.gz) = b22f928272577f0bd6728eecfcbcda0c79dc76dd025a78cb0658d580367c43be49c0cb8d9384fa4803bf1ac53d534fce95fd9aec9f51aaf3ef79958f5282ffda
-Size (grpcio-1.62.2.tar.gz) = 26316089 bytes
+Size (grpcio-1.63.0.tar.gz) = 26327099 bytes
-SHA1 (patch-setup.py) = c069957e57dc1bf0f3d09caa518f3b19e6057146
+SHA1 (patch-setup.py) = d8bd1807052c157fc919ac888349320c0594abf1
 SHA1 (patch-src_core_lib_iomgr_port.h) = 8f088cbf22110c03a684c24c9e17ef5fc64e925a

 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.47 2024/04/19 04:54:36 adam Exp $
+# $NetBSD: Makefile,v 1.48 2024/05/15 21:13:50 wiz Exp $
-DISTNAME=	grpcio-testing-1.62.2
+DISTNAME=	grpcio_testing-1.63.0
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/grpcio-testing/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://grpc.io/
 COMMENT=	gRPC Python testing package
 LICENSE=	apache-2.0
 TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=	${PYPKGPREFIX}-grpcio>=${PKGVERSION_NOREV}:../../net/py-grpcio
 DEPENDS+=	${PYPKGPREFIX}-protobuf>=4.21.6:../../devel/py-protobuf

 @@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.47 2024/04/19 04:54:36 adam Exp $
+$NetBSD: distinfo,v 1.48 2024/05/15 21:13:50 wiz Exp $
-BLAKE2s (grpcio-testing-1.62.2.tar.gz) = 0641e38d5f611691080b315a0ecde74730f75a74973813ef559be4771ebd94f8
+BLAKE2s (grpcio_testing-1.63.0.tar.gz) = 23bd9bb5bc4ae524ccfb1fc72293e8bea182c6bed4ac72e00ee5fdb6134e71da
-SHA512 (grpcio-testing-1.62.2.tar.gz) = 4fbc7eac446367c24e963a3b6ab1d7a9f230cc97cf5de24c813f0f8202332e6a4d6af8e80d2621b4d4dd9eaf864d4ff6300525f84921f9e15635d3953e3c6f11
+SHA512 (grpcio_testing-1.63.0.tar.gz) = a96fd482bf43fb5f6fa92c7b97c19bbf21652c467c9bbed853a045b753c498b10b94c5639ec7a4cbd872549b80476d749225112f1bed31c2be385fa10a3c9e5d
-Size (grpcio-testing-1.62.2.tar.gz) = 21708 bytes
+Size (grpcio_testing-1.63.0.tar.gz) = 22564 bytes

 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.64 2024/04/19 04:54:36 adam Exp $
+# $NetBSD: Makefile,v 1.65 2024/05/15 21:13:50 wiz Exp $
-DISTNAME=	grpcio-tools-1.62.2
+DISTNAME=	grpcio_tools-1.63.0
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/grpcio-tools/}
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	https://grpc.io/
 COMMENT=	Protobuf code generator for gRPC
 LICENSE=	apache-2.0
 TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=	${PYPKGPREFIX}-grpcio>=${PKGVERSION_NOREV}:../../net/py-grpcio
 DEPENDS+=	${PYPKGPREFIX}-protobuf>=4.21.6:../../devel/py-protobuf
 DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools

 @@ -1,27 +1,30 @@
-@comment $NetBSD: PLIST,v 1.2 2023/11/02 12:46:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/05/15 21:13:50 wiz Exp $
 ${PYSITELIB}/grpc_tools/__init__.py
 ${PYSITELIB}/grpc_tools/__init__.pyc
 ${PYSITELIB}/grpc_tools/__init__.pyo
 ${PYSITELIB}/grpc_tools/_proto/google/protobuf/any.proto
 ${PYSITELIB}/grpc_tools/_proto/google/protobuf/api.proto
 ${PYSITELIB}/grpc_tools/_proto/google/protobuf/compiler/plugin.proto
 ${PYSITELIB}/grpc_tools/_proto/google/protobuf/descriptor.proto
 ${PYSITELIB}/grpc_tools/_proto/google/protobuf/duration.proto
 ${PYSITELIB}/grpc_tools/_proto/google/protobuf/empty.proto
 ${PYSITELIB}/grpc_tools/_proto/google/protobuf/field_mask.proto
 ${PYSITELIB}/grpc_tools/_proto/google/protobuf/source_context.proto
 ${PYSITELIB}/grpc_tools/_proto/google/protobuf/struct.proto
 ${PYSITELIB}/grpc_tools/_proto/google/protobuf/timestamp.proto
 ${PYSITELIB}/grpc_tools/_proto/google/protobuf/type.proto
 ${PYSITELIB}/grpc_tools/_proto/google/protobuf/wrappers.proto
 ${PYSITELIB}/grpc_tools/_protoc_compiler.so
 ${PYSITELIB}/grpc_tools/command.py
 ${PYSITELIB}/grpc_tools/command.pyc
 ${PYSITELIB}/grpc_tools/command.pyo
 ${PYSITELIB}/grpc_tools/grpc_version.py
 ${PYSITELIB}/grpc_tools/grpc_version.pyc
 ${PYSITELIB}/grpc_tools/grpc_version.pyo
 ${PYSITELIB}/grpc_tools/protoc.py
 ${PYSITELIB}/grpc_tools/protoc.pyc
 ${PYSITELIB}/grpc_tools/protoc.pyo
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
 ${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
 ${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt

 @@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.56 2024/04/19 04:54:36 adam Exp $
+$NetBSD: distinfo,v 1.57 2024/05/15 21:13:50 wiz Exp $
-BLAKE2s (grpcio-tools-1.62.2.tar.gz) = ea4eece92c994e5f5bebf23a7adef6ad2c8766ca37ef7383e37f3fbed5ae608e
+BLAKE2s (grpcio_tools-1.63.0.tar.gz) = 78e83ed4bf41e82e0c3ec188744f4648f128f3b90d517d682416fdd120484d38
-SHA512 (grpcio-tools-1.62.2.tar.gz) = 90905e844b57539d70d8744ec8c7de94e5ba35d1208c3033092af89d9252a684944080f3c2fea3e5d0c5bfd62a89066f2c8cce35a206c3224af73b1a2ca4ad33
+SHA512 (grpcio_tools-1.63.0.tar.gz) = b460659fda2952896f720d92b9a0be7177af9052ffff486267023082a5f58be74c73cb4a5547a82f6f1f6217df8ab428428c51a69adc344eccee8d6692d6c84e
-Size (grpcio-tools-1.62.2.tar.gz) = 4538350 bytes
+Size (grpcio_tools-1.63.0.tar.gz) = 5026765 bytes
-SHA1 (patch-setup.py) = e1a89937a346971a1bba446d11e7a66d4cdded11
+SHA1 (patch-setup.py) = 24025086f2117a429392fb8f1f58169c3cf0d0b0

 @@ -1,58 +1,58 @@
-$NetBSD: patch-setup.py,v 1.7 2023/11/02 12:46:45 wiz Exp $
+$NetBSD: patch-setup.py,v 1.8 2024/05/15 21:13:50 wiz Exp $
 Use pthread on FreeBSD.
 Use external protobuf.
---- setup.py.orig	2023-10-30 18:02:42.000000000 +0000
+--- setup.py.orig	2024-04-26 06:29:22.000000000 +0000
 +++ setup.py
-@@ -185,7 +185,7 @@ if EXTRA_ENV_LINK_ARGS is None:
+@@ -211,7 +211,7 @@ if EXTRA_ENV_LINK_ARGS is None:
          EXTRA_ENV_LINK_ARGS += " -Wl,-exported_symbol,_{}".format(
              _EXT_INIT_SYMBOL
+         )
 -    if "linux" in sys.platform or "darwin" in sys.platform:
 +    if "linux" in sys.platform or "darwin" in sys.platform or "freebsd" in sys.platform:
          EXTRA_ENV_LINK_ARGS += " -lpthread"
          if check_linker_need_libatomic():
              EXTRA_ENV_LINK_ARGS += " -latomic"
-@@ -196,13 +196,9 @@ EXTRA_LINK_ARGS = shlex.split(EXTRA_ENV_
+@@ -227,13 +227,9 @@ EXTRA_LINK_ARGS = shlex.split(EXTRA_ENV_
  if BUILD_WITH_STATIC_LIBSTDCXX:
      EXTRA_LINK_ARGS.append("-static-libstdc++")
 -CC_FILES = [os.path.normpath(cc_file) for cc_file in protoc_lib_deps.CC_FILES]
  PROTO_FILES = [
      os.path.normpath(proto_file) for proto_file in protoc_lib_deps.PROTO_FILES
+ ]
 -CC_INCLUDES = [
 -    os.path.normpath(include_dir) for include_dir in protoc_lib_deps.CC_INCLUDES
 -]
  PROTO_INCLUDE = os.path.normpath(protoc_lib_deps.PROTO_INCLUDE)
  GRPC_PYTHON_TOOLS_PACKAGE = "grpc_tools"
-@@ -217,7 +213,7 @@ if "win32" in sys.platform:
+@@ -248,7 +244,7 @@ if "win32" in sys.platform:
+     )
      if "64bit" in platform.architecture()[0]:
          DEFINE_MACROS += (("MS_WIN64", 1),)
 -elif "linux" in sys.platform or "darwin" in sys.platform:
 +elif "linux" in sys.platform or "darwin" in sys.platform or "freebsd" in sys.platform:
      DEFINE_MACROS += (("HAVE_PTHREAD", 1),)
  # By default, Python3 setuptools(distutils) enforces compatibility of
-@@ -271,7 +267,7 @@ def extension_modules():
+@@ -286,7 +282,7 @@ def extension_modules():
          os.path.join("grpc_tools", "main.cc"),
          os.path.join("grpc_root", "src", "compiler", "python_generator.cc"),
          os.path.join("grpc_root", "src", "compiler", "proto_parser_helper.cc"),
 -    ] + CC_FILES
 +    ]
      plugin_ext = Extension(
          name="grpc_tools._protoc_compiler",
-@@ -280,8 +276,7 @@ def extension_modules():
+@@ -295,8 +291,7 @@ def extension_modules():
              ".",
              "grpc_root",
              os.path.join("grpc_root", "include"),
 -        ]
 -        + CC_INCLUDES,
 +        ],
          language="c++",
          define_macros=list(DEFINE_MACROS),
          extra_compile_args=list(EXTRA_COMPILE_ARGS),
          extra_link_args=list(EXTRA_LINK_ARGS),

 @@ -1,21 +1,21 @@
-$NetBSD: patch-setup.py,v 1.16 2023/11/02 12:46:44 wiz Exp $
+$NetBSD: patch-setup.py,v 1.17 2024/05/15 21:13:50 wiz Exp $
 Fix libatomic detection.
 Use dependencies in pkgsrc.
---- setup.py.orig	2023-10-30 18:02:41.000000000 +0000
+--- setup.py.orig	2024-04-26 06:29:21.000000000 +0000
 +++ setup.py
-@@ -350,33 +350,7 @@ EXTENSION_INCLUDE_DIRECTORIES = (
+@@ -335,34 +335,7 @@ EXTENSION_INCLUDE_DIRECTORIES = (
      + ZLIB_INCLUDE
+ )
 -EXTENSION_LIBRARIES = ()
 -if "linux" in sys.platform:
 -    EXTENSION_LIBRARIES += ("rt",)
 -if not "win32" in sys.platform:
 -    EXTENSION_LIBRARIES += ("m",)
 -if "win32" in sys.platform:
 -    EXTENSION_LIBRARIES += (
 -        "advapi32",
 -        "bcrypt",
 -        "dbghelp",
 @@ -24,37 +24,38 @@ Use dependencies in pkgsrc.
 -if BUILD_WITH_SYSTEM_OPENSSL:
 -    EXTENSION_LIBRARIES += (
 -        "ssl",
 -        "crypto",
 -    )
 -if BUILD_WITH_SYSTEM_ZLIB:
 -    EXTENSION_LIBRARIES += ("z",)
 -if BUILD_WITH_SYSTEM_CARES:
 -    EXTENSION_LIBRARIES += ("cares",)
 -if BUILD_WITH_SYSTEM_RE2:
 -    EXTENSION_LIBRARIES += ("re2",)
 -if BUILD_WITH_SYSTEM_ABSL:
 -    EXTENSION_LIBRARIES += tuple(
--        lib.stem[3:] for lib in pathlib.Path("/usr").glob("lib*/libabsl_*.so")
+-        lib.stem[3:]
 -        for lib in sorted(pathlib.Path("/usr").glob("lib*/libabsl_*.so"))
 -    )
 +EXTENSION_LIBRARIES = ('grpc',)
  DEFINE_MACROS = (("_WIN32_WINNT", 0x600),)
  asm_files = []
-@@ -494,7 +468,7 @@ def cython_extensions_and_necessity():
+@@ -466,7 +439,7 @@ def cython_extensions_and_necessity():
+     ]
      config = os.environ.get("CONFIG", "opt")
      prefix = "libs/" + config + "/"
 -    if USE_PREBUILT_GRPC_CORE:
 +    if False:
          extra_objects = [
              prefix + "libares.a",
              prefix + "libboringssl.a",
-@@ -511,8 +485,6 @@ def cython_extensions_and_necessity():
+@@ -483,8 +456,6 @@ def cython_extensions_and_necessity():
              sources=(
                  [module_file]
                  + list(CYTHON_HELPER_C_FILES)
 -                + core_c_files
 -                + asm_files
              ),
              include_dirs=list(EXTENSION_INCLUDE_DIRECTORIES),
              libraries=list(EXTENSION_LIBRARIES),