Index: head/devel/py-grpcio/Makefile =================================================================== --- head/devel/py-grpcio/Makefile (revision 439802) +++ head/devel/py-grpcio/Makefile (revision 439803) @@ -1,18 +1,25 @@ # Created by: vanilla@ # $FreeBSD$ PORTNAME= grpcio -PORTVERSION= 1.2.1 +PORTVERSION= 1.3.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= vanilla@FreeBSD.org COMMENT= HTTP/2-based RPC framework LICENSE= BSD3CLAUSE +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>1:devel/py-six \ + ${PYTHON_PKGNAMEPREFIX}enum34>1:devel/py-enum34 +LIB_DEPENDS= libcares.so:dns/c-ares + USES= python USE_PYTHON= distutils +CFLAGS+= -Ithird_party/boringssl/include \ + -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lcares .include Index: head/devel/py-grpcio/distinfo =================================================================== --- head/devel/py-grpcio/distinfo (revision 439802) +++ head/devel/py-grpcio/distinfo (revision 439803) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491375453 -SHA256 (grpcio-1.2.1.tar.gz) = e1fffa9a5223981b386785dd88ab1d2a491c1207eef1629158050922e8cfa905 -SIZE (grpcio-1.2.1.tar.gz) = 7201893 +TIMESTAMP = 1493468361 +SHA256 (grpcio-1.3.0.tar.gz) = 5be61ebececb350eb79e083d6960bd2302d949ff1077738d0eb6a584757abd2d +SIZE (grpcio-1.3.0.tar.gz) = 8911170 Index: head/devel/py-grpcio/files/patch-src_core_lib_tsi_ssl__transport__security.c =================================================================== --- head/devel/py-grpcio/files/patch-src_core_lib_tsi_ssl__transport__security.c (revision 439802) +++ head/devel/py-grpcio/files/patch-src_core_lib_tsi_ssl__transport__security.c (nonexistent) @@ -1,10 +0,0 @@ ---- src/core/lib/tsi/ssl_transport_security.c.orig 2017-04-05 06:58:29 UTC -+++ src/core/lib/tsi/ssl_transport_security.c -@@ -35,6 +35,7 @@ - - #include - -+#include - #include - #include - Property changes on: head/devel/py-grpcio/files/patch-src_core_lib_tsi_ssl__transport__security.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/py-grpcio/files/patch-setup.py =================================================================== --- head/devel/py-grpcio/files/patch-setup.py (nonexistent) +++ head/devel/py-grpcio/files/patch-setup.py (revision 439803) @@ -0,0 +1,30 @@ +--- setup.py.orig 2017-04-27 21:44:50 UTC ++++ setup.py +@@ -52,13 +52,6 @@ PYTHON_STEM = os.path.join('src', 'pytho + CORE_INCLUDE = ('include', '.',) + BORINGSSL_INCLUDE = (os.path.join('third_party', 'boringssl', 'include'),) + ZLIB_INCLUDE = (os.path.join('third_party', 'zlib'),) +-CARES_INCLUDE = ( +- os.path.join('third_party', 'cares'), +- os.path.join('third_party', 'cares', 'cares'),) +-if 'linux' in sys.platform: +- CARES_INCLUDE += (os.path.join('third_party', 'cares', 'config_linux'),) +-if 'darwin' in sys.platform: +- CARES_INCLUDE += (os.path.join('third_party', 'cares', 'config_darwin'),) + README = os.path.join(PYTHON_STEM, 'README.rst') + + # Ensure we're in the proper directory whether or not we're being used by pip. +@@ -141,12 +134,9 @@ CYTHON_EXTENSION_MODULE_NAMES = ('grpc._ + CYTHON_HELPER_C_FILES = () + + CORE_C_FILES = tuple(grpc_core_dependencies.CORE_SOURCE_FILES) +-if "win32" in sys.platform and "64bit" in platform.architecture()[0]: +- CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES) + + EXTENSION_INCLUDE_DIRECTORIES = ( +- (PYTHON_STEM,) + CORE_INCLUDE + BORINGSSL_INCLUDE + ZLIB_INCLUDE + +- CARES_INCLUDE) ++ (PYTHON_STEM,) + CORE_INCLUDE + BORINGSSL_INCLUDE + ZLIB_INCLUDE) + + EXTENSION_LIBRARIES = () + if "linux" in sys.platform: Property changes on: head/devel/py-grpcio/files/patch-setup.py ___________________________________________________________________ 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/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c =================================================================== --- head/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c (nonexistent) +++ head/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c (revision 439803) @@ -0,0 +1,10 @@ +--- src/core/tsi/ssl_transport_security.c.orig 2017-04-27 21:44:51 UTC ++++ src/core/tsi/ssl_transport_security.c +@@ -35,6 +35,7 @@ + + #include + ++#include + #include + #include + Property changes on: head/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c ___________________________________________________________________ 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/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py =================================================================== --- head/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py (nonexistent) +++ head/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py (revision 439803) @@ -0,0 +1,56 @@ +--- src/python/grpcio/grpc_core_dependencies.py.orig 2017-04-27 21:44:50 UTC ++++ src/python/grpcio/grpc_core_dependencies.py +@@ -630,53 +630,4 @@ CORE_SOURCE_FILES = [ + 'third_party/zlib/trees.c', + 'third_party/zlib/uncompr.c', + 'third_party/zlib/zutil.c', +- 'third_party/cares/cares/ares__close_sockets.c', +- 'third_party/cares/cares/ares__get_hostent.c', +- 'third_party/cares/cares/ares__read_line.c', +- 'third_party/cares/cares/ares__timeval.c', +- 'third_party/cares/cares/ares_cancel.c', +- 'third_party/cares/cares/ares_create_query.c', +- 'third_party/cares/cares/ares_data.c', +- 'third_party/cares/cares/ares_destroy.c', +- 'third_party/cares/cares/ares_expand_name.c', +- 'third_party/cares/cares/ares_expand_string.c', +- 'third_party/cares/cares/ares_fds.c', +- 'third_party/cares/cares/ares_free_hostent.c', +- 'third_party/cares/cares/ares_free_string.c', +- 'third_party/cares/cares/ares_getenv.c', +- 'third_party/cares/cares/ares_gethostbyaddr.c', +- 'third_party/cares/cares/ares_gethostbyname.c', +- 'third_party/cares/cares/ares_getnameinfo.c', +- 'third_party/cares/cares/ares_getopt.c', +- 'third_party/cares/cares/ares_getsock.c', +- 'third_party/cares/cares/ares_init.c', +- 'third_party/cares/cares/ares_library_init.c', +- 'third_party/cares/cares/ares_llist.c', +- 'third_party/cares/cares/ares_mkquery.c', +- 'third_party/cares/cares/ares_nowarn.c', +- 'third_party/cares/cares/ares_options.c', +- 'third_party/cares/cares/ares_parse_a_reply.c', +- 'third_party/cares/cares/ares_parse_aaaa_reply.c', +- 'third_party/cares/cares/ares_parse_mx_reply.c', +- 'third_party/cares/cares/ares_parse_naptr_reply.c', +- 'third_party/cares/cares/ares_parse_ns_reply.c', +- 'third_party/cares/cares/ares_parse_ptr_reply.c', +- 'third_party/cares/cares/ares_parse_soa_reply.c', +- 'third_party/cares/cares/ares_parse_srv_reply.c', +- 'third_party/cares/cares/ares_parse_txt_reply.c', +- 'third_party/cares/cares/ares_platform.c', +- 'third_party/cares/cares/ares_process.c', +- 'third_party/cares/cares/ares_query.c', +- 'third_party/cares/cares/ares_search.c', +- 'third_party/cares/cares/ares_send.c', +- 'third_party/cares/cares/ares_strcasecmp.c', +- 'third_party/cares/cares/ares_strdup.c', +- 'third_party/cares/cares/ares_strerror.c', +- 'third_party/cares/cares/ares_timeout.c', +- 'third_party/cares/cares/ares_version.c', +- 'third_party/cares/cares/ares_writev.c', +- 'third_party/cares/cares/bitncmp.c', +- 'third_party/cares/cares/inet_net_pton.c', +- 'third_party/cares/cares/inet_ntop.c', +- 'third_party/cares/cares/windows_port.c', + ] Property changes on: head/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py ___________________________________________________________________ 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