git: 51a073346574 - main - devel/grpc: Update to 1.41.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Mon, 25 Oct 2021 16:01:28 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=51a07334657452ef5b27bbd76503d73481961c08

commit 51a07334657452ef5b27bbd76503d73481961c08
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2021-10-25 15:05:27 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2021-10-25 15:57:13 +0000

    devel/grpc: Update to 1.41.0
    
    -
    
    Changes:        https://github.com/grpc/grpc/releases
---
 biology/ncbi-blast+/Makefile                |  1 +
 databases/arrow/Makefile                    |  2 +-
 devel/bear/Makefile                         |  1 +
 devel/google-cloud-cpp/Makefile             |  2 +-
 devel/google-cloud-cpp117/Makefile          |  2 +-
 devel/grpc/Makefile                         | 12 +++++++++++-
 devel/grpc/distinfo                         |  6 +++---
 devel/grpc/files/extra-patch-CMakeLists.txt | 10 ++++------
 devel/grpc/pkg-plist                        | 20 ++++++++++----------
 net/rubygem-grpc124/Makefile                |  2 +-
 science/py-tensorflow/Makefile              |  2 +-
 sysutils/apache-mesos/Makefile              |  2 +-
 www/envoy/Makefile                          |  2 +-
 13 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/biology/ncbi-blast+/Makefile b/biology/ncbi-blast+/Makefile
index 0dbc23f38920..06670e24cd29 100644
--- a/biology/ncbi-blast+/Makefile
+++ b/biology/ncbi-blast+/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ncbi-blast+
 DISTVERSION=	2.12.0
+PORTREVISION=	1
 CATEGORIES=	biology perl5 python
 MASTER_SITES=	https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ \
 		https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PORTVERSION}/
diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile
index 69bc1368cc40..f01367bb29f7 100644
--- a/databases/arrow/Makefile
+++ b/databases/arrow/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	arrow
 DISTVERSION=	4.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
 		https://github.com/apache/orc/archive/rel/:orc
diff --git a/devel/bear/Makefile b/devel/bear/Makefile
index c5dfea8d5b7f..bc5fbd45795d 100644
--- a/devel/bear/Makefile
+++ b/devel/bear/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	bear
 DISTVERSION=	3.0.16
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	jrm@FreeBSD.org
diff --git a/devel/google-cloud-cpp/Makefile b/devel/google-cloud-cpp/Makefile
index 6d2e769591af..ed1b9ad798dd 100644
--- a/devel/google-cloud-cpp/Makefile
+++ b/devel/google-cloud-cpp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	google-cloud-cpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.21.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/devel/google-cloud-cpp117/Makefile b/devel/google-cloud-cpp117/Makefile
index 9ccc345c7a71..991a57f420a7 100644
--- a/devel/google-cloud-cpp117/Makefile
+++ b/devel/google-cloud-cpp117/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	google-cloud-cpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.17.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMESUFFIX=	117
 DIST_SUBDIR=	${PORTNAME}
diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index 4e5f3db0c298..c2ca6c47c1da 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -1,7 +1,7 @@
 # Created by: vanilla@
 
 PORTNAME=	grpc
-PORTVERSION=	1.40.0
+PORTVERSION=	1.41.0
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	2
 CATEGORIES=	devel
@@ -45,4 +45,14 @@ PLIST_SUB=	SHLIB_MAJOR=${PORTVERSION:R} \
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-CMakeLists.txt
 .endif
 
+post-patch:
+# Clean up bundled libraries
+	@${RM} -r ${WRKSRC}/third_party/abseil-cpp/
+	@${RM} -r ${WRKSRC}/third_party/benchmark/
+	@${RM} -r ${WRKSRC}/third_party/boringssl-with-bazel/
+	@${RM} -r ${WRKSRC}/third_party/cares/
+	@${RM} -r ${WRKSRC}/third_party/protobuf/
+	@${RM} -r ${WRKSRC}/third_party/re2/
+	@${RM} -r ${WRKSRC}/third_party/zlib/
+
 .include <bsd.port.post.mk>
diff --git a/devel/grpc/distinfo b/devel/grpc/distinfo
index fbece92cabc3..c2900fa61897 100644
--- a/devel/grpc/distinfo
+++ b/devel/grpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632036848
-SHA256 (grpc-grpc-v1.40.0_GH0.tar.gz) = 13e7c6460cd979726e5b3b129bb01c34532f115883ac696a75eb7f1d6a9765ed
-SIZE (grpc-grpc-v1.40.0_GH0.tar.gz) = 8339742
+TIMESTAMP = 1634391102
+SHA256 (grpc-grpc-v1.41.0_GH0.tar.gz) = e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656
+SIZE (grpc-grpc-v1.41.0_GH0.tar.gz) = 8347643
diff --git a/devel/grpc/files/extra-patch-CMakeLists.txt b/devel/grpc/files/extra-patch-CMakeLists.txt
index 283e89ba0ae7..794b40b630cb 100644
--- a/devel/grpc/files/extra-patch-CMakeLists.txt
+++ b/devel/grpc/files/extra-patch-CMakeLists.txt
@@ -1,13 +1,11 @@
-Remove openssl from grpc.pc because we do not ship openssl.pc in base system
-
---- CMakeLists.txt.orig	2021-09-03 23:20:52 UTC
+--- CMakeLists.txt.orig	2021-09-25 02:33:41 UTC
 +++ CMakeLists.txt
-@@ -16064,7 +16064,7 @@ generate_pkgconfig(
+@@ -17664,7 +17664,7 @@ generate_pkgconfig(
    "gRPC"
    "high performance general RPC framework"
    "${gRPC_CORE_VERSION}"
--  "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "gpr absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
+-  "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_variant"
++  "gpr absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_variant"
    "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
    ""
    "grpc.pc")
diff --git a/devel/grpc/pkg-plist b/devel/grpc/pkg-plist
index e353b704e65d..050eb8277703 100644
--- a/devel/grpc/pkg-plist
+++ b/devel/grpc/pkg-plist
@@ -264,11 +264,11 @@ lib/cmake/grpc/gRPCTargets.cmake
 lib/cmake/grpc/modules/Findc-ares.cmake
 lib/cmake/grpc/modules/Findre2.cmake
 lib/libaddress_sorting.so
-lib/libaddress_sorting.so.18
-lib/libaddress_sorting.so.18.0.0
+lib/libaddress_sorting.so.19
+lib/libaddress_sorting.so.19.0.0
 lib/libgpr.so
-lib/libgpr.so.18
-lib/libgpr.so.18.0.0
+lib/libgpr.so.19
+lib/libgpr.so.19.0.0
 lib/libgrpc++.so
 lib/libgrpc++.so.%%SHLIB_MAJOR%%
 lib/libgrpc++.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
@@ -285,20 +285,20 @@ lib/libgrpc++_unsecure.so
 lib/libgrpc++_unsecure.so.%%SHLIB_MAJOR%%
 lib/libgrpc++_unsecure.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 lib/libgrpc.so
-lib/libgrpc.so.18
-lib/libgrpc.so.18.0.0
+lib/libgrpc.so.19
+lib/libgrpc.so.19.0.0
 lib/libgrpc_plugin_support.so
 lib/libgrpc_plugin_support.so.%%SHLIB_MAJOR%%
 lib/libgrpc_plugin_support.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 lib/libgrpc_unsecure.so
-lib/libgrpc_unsecure.so.18
-lib/libgrpc_unsecure.so.18.0.0
+lib/libgrpc_unsecure.so.19
+lib/libgrpc_unsecure.so.19.0.0
 lib/libgrpcpp_channelz.so
 lib/libgrpcpp_channelz.so.%%SHLIB_MAJOR%%
 lib/libgrpcpp_channelz.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 lib/libupb.so
-lib/libupb.so.18
-lib/libupb.so.18.0.0
+lib/libupb.so.19
+lib/libupb.so.19.0.0
 libdata/pkgconfig/gpr.pc
 libdata/pkgconfig/grpc++.pc
 libdata/pkgconfig/grpc++_unsecure.pc
diff --git a/net/rubygem-grpc124/Makefile b/net/rubygem-grpc124/Makefile
index a31dcc2b1977..3a298dbd265e 100644
--- a/net/rubygem-grpc124/Makefile
+++ b/net/rubygem-grpc124/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	grpc
 PORTVERSION=	1.24.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	124
diff --git a/science/py-tensorflow/Makefile b/science/py-tensorflow/Makefile
index d9af8c04c62b..ac1e44d220f4 100644
--- a/science/py-tensorflow/Makefile
+++ b/science/py-tensorflow/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tensorflow
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.15.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	${PORTNAME}
diff --git a/sysutils/apache-mesos/Makefile b/sysutils/apache-mesos/Makefile
index 62856e762dbb..6d7778fe7518 100644
--- a/sysutils/apache-mesos/Makefile
+++ b/sysutils/apache-mesos/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mesos
 PORTVERSION=	1.11.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	APACHE/mesos/${PORTVERSION}:mesos
 PKGNAMEPREFIX=	apache-
diff --git a/www/envoy/Makefile b/www/envoy/Makefile
index 455d821c960e..3af4ae9c67de 100644
--- a/www/envoy/Makefile
+++ b/www/envoy/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	envoy
 PORTVERSION=	1.10.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	23
+PORTREVISION=	24
 CATEGORIES=	www
 
 MAINTAINER=	danfe@FreeBSD.org