 @@ -1,27 +1,27 @@
-# $NetBSD: Makefile,v 1.2 2018/08/04 21:56:47 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2019/03/28 17:35:14 leot Exp $
-DISTNAME=	grpcio-1.13.0
+DISTNAME=	grpcio-1.19.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net
-MASTER_SITES=   ${MASTER_SITE_PYPI:=g/grpcio/}
+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
-DEPENDS+=       ${PYPKGPREFIX}-protobuf>=3.5.0:../../devel/py-protobuf
+DEPENDS+=	${PYPKGPREFIX}-protobuf>=3.5.0:../../devel/py-protobuf
-DEPENDS+=       ${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
 .include "../../lang/python/pyversion.mk"
 .if "${PYPKGPREFIX}" == "py27"
 DEPENDS+=       ${PYPKGPREFIX}-enum34>=1.0.4:../../devel/py-enum34
 DEPENDS+=       ${PYPKGPREFIX}-futures>=2.2.0:../../devel/py-futures
 .endif
 USE_LANGUAGES+=	c99 c++11
 USE_TOOLS+=	gmake pkg-config
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../net/grpc/buildlink3.mk"
 .include "../../net/libcares/buildlink3.mk"

 @@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2018/12/31 23:03:02 leot Exp $
+$NetBSD: distinfo,v 1.5 2019/03/28 17:35:14 leot Exp $
-SHA1 (grpcio-1.13.0.tar.gz) = 4ea6933da54b1628c65e3907134c805fa9d2d640
+SHA1 (grpcio-1.19.0.tar.gz) = 983938931832781234193373783d41341b8a7714
-RMD160 (grpcio-1.13.0.tar.gz) = 829e7b0a0004738a90852e7f4c67d617a51df6b7
+RMD160 (grpcio-1.19.0.tar.gz) = d507dd96643d42f9bee3ddf327cb6c7f4e93fbb4
-SHA512 (grpcio-1.13.0.tar.gz) = 4263c027d123332967692df467f01cb3b84acb3721eab7ae421a8ad79850cf00d0abca306ad6ff16acc95f1599c9c219a6c137e934f07f91ef1a11ce66b04545
+SHA512 (grpcio-1.19.0.tar.gz) = 620459dd1a22cf60cb6bccb1b7dd64175f1efdfc098152cfa1889ad0a727b7a92b72f9de28b57e9a45cc8d2c22e2fc36307af8ab52ced454a91aedeaf7158273
-Size (grpcio-1.13.0.tar.gz) = 14320631 bytes
+Size (grpcio-1.19.0.tar.gz) = 14621509 bytes
-SHA1 (patch-setup.py) = 383ea9fc9067b84a6eb08edd99cb9e9062724744
+SHA1 (patch-setup.py) = 297fd7c363998e1e58bd4f24724b84626d419634
 SHA1 (patch-src_core_lib_iomgr_port.h) = 8f088cbf22110c03a684c24c9e17ef5fc64e925a
-SHA1 (patch-src_python_grpcio_commands.py) = e84c0ddb13d9d9a3d2c90fe93c9db72264176512
+SHA1 (patch-src_python_grpcio_commands.py) = 10c9342a0a1e2fa70e85ed107b51e9a011f76a2c

 @@ -1,21 +1,21 @@
-$NetBSD: patch-setup.py,v 1.2 2018/08/04 21:56:47 minskim Exp $
+$NetBSD: patch-setup.py,v 1.3 2019/03/28 17:35:14 leot Exp $
 Use dependencies in pkgsrc.
---- setup.py.orig	2018-06-28 00:44:17.000000000 +0000
+--- setup.py.orig	2019-02-26 17:31:26.000000000 +0000
 +++ setup.py
-@@ -184,18 +184,19 @@ EXTENSION_INCLUDE_DIRECTORIES = (
+@@ -207,18 +207,19 @@ EXTENSION_INCLUDE_DIRECTORIES = (
-     CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
+     NANOPB_INCLUDE + CARES_INCLUDE + ADDRESS_SORTING_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', 'ws2_32',)
 -if BUILD_WITH_SYSTEM_OPENSSL:
 -  EXTENSION_LIBRARIES += ('ssl', 'crypto',)
 -if BUILD_WITH_SYSTEM_ZLIB:
 -  EXTENSION_LIBRARIES += ('z',)
 -if BUILD_WITH_SYSTEM_CARES:
 @@ -24,33 +24,33 @@ Use dependencies in pkgsrc.
 +#  EXTENSION_LIBRARIES += ('rt',)
 +#if not "win32" in sys.platform:
 +#  EXTENSION_LIBRARIES += ('m',)
 +#if "win32" in sys.platform:
 +#  EXTENSION_LIBRARIES += ('advapi32', 'ws2_32',)
 +#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',)
 +EXTENSION_LIBRARIES += ('grpc',)
- DEFINE_MACROS = (
+ DEFINE_MACROS = (('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600))
-     ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),
+ if not DISABLE_LIBC_COMPATIBILITY:
-@@ -242,7 +243,7 @@ def cython_extensions_and_necessity():
+@@ -265,7 +266,7 @@ def cython_extensions_and_necessity():
                    for name in CYTHON_EXTENSION_MODULE_NAMES]
    config = os.environ.get('CONFIG', 'opt')
    prefix = 'libs/' + config + '/'
--  if "darwin" in sys.platform:
+-  if "darwin" in sys.platform or USE_PREBUILT_GRPC_CORE:
-+  if False and "darwin" in sys.platform:
++  if False and "darwin" in sys.platform or USE_PREBUILT_GRPC_CORE:
      extra_objects = [prefix + 'libares.a',
                       prefix + 'libboringssl.a',
                       prefix + 'libgpr.a',
-@@ -254,7 +255,7 @@ def cython_extensions_and_necessity():
+@@ -277,7 +278,7 @@ def cython_extensions_and_necessity():
    extensions = [
        _extension.Extension(
            name=module_name,
 -          sources=[module_file] + list(CYTHON_HELPER_C_FILES) + core_c_files,
 +          sources=[module_file] + list(CYTHON_HELPER_C_FILES),
            include_dirs=list(EXTENSION_INCLUDE_DIRECTORIES),
            libraries=list(EXTENSION_LIBRARIES),
            define_macros=list(DEFINE_MACROS),

 @@ -1,15 +1,15 @@
-$NetBSD: patch-src_python_grpcio_commands.py,v 1.1 2018/04/28 01:16:29 minskim Exp $
+$NetBSD: patch-src_python_grpcio_commands.py,v 1.2 2019/03/28 17:35:14 leot Exp $
 Use dependencies in pkgsrc.
---- src/python/grpcio/commands.py.orig	2018-04-05 20:19:07.000000000 +0000
+--- src/python/grpcio/commands.py.orig	2019-02-26 17:31:26.000000000 +0000
 +++ src/python/grpcio/commands.py
-@@ -253,7 +253,7 @@ class BuildExt(build_ext.build_ext):
+@@ -218,7 +218,7 @@ class BuildExt(build_ext.build_ext):
-     LINK_OPTIONS = {}
+         #   all C or all C++ compilation, the mix of C and C++ will crash.
          #   *By default*, the macOS use clang and Linux use gcc, that's why
-     def build_extensions(self):
+         #   the special condition here is checking platform.
 -        if "darwin" in sys.platform:
 +        if False and "darwin" in sys.platform:
              config = os.environ.get('CONFIG', 'opt')
              target_path = os.path.abspath(
                  os.path.join(