Index: head/net/rubygem-grpc/Makefile =================================================================== --- head/net/rubygem-grpc/Makefile (revision 518195) +++ head/net/rubygem-grpc/Makefile (revision 518196) @@ -1,34 +1,34 @@ # $FreeBSD$ PORTNAME= grpc -PORTVERSION= 1.19.0 +PORTVERSION= 1.24.0 CATEGORIES= net rubygems MASTER_SITES= RG MAINTAINER= mfechner@FreeBSD.org COMMENT= Ruby implementation of gRPC LICENSE= BSD3CLAUSE LIB_DEPENDS= libcares.so:dns/c-ares \ libgrpc.so:devel/grpc RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \ - rubygem-google-protobuf>=3.1:devel/rubygem-google-protobuf \ - rubygem-googleapis-common-protos-types>=1.0.0:devel/rubygem-googleapis-common-protos-types + rubygem-googleapis-common-protos-types>=1.0<2.0:devel/rubygem-googleapis-common-protos-types \ + rubygem-google-protobuf>=3.8<4.0:devel/rubygem-google-protobuf MAKE_JOBS_UNSAFE= yes USES= gem gmake pkgconfig USE_RUBY= yes post-extract: @${RM} -r ${WRKSRC}/include ${WRKSRC}/third_party ${WRKSRC}/src/boringssl \ ${WRKSRC}/src/core ${WRKSRC}/Makefile ${WRKSRC}/.yardopts ${WRKSRC}/etc post-patch: @${REINPLACE_CMD} 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/src/ruby/lib/grpc.rb @${REINPLACE_CMD} -E '/s\.files = /s;, "(Makefile|etc|include|third_party|src/boringssl|src/core)[^"]*"\.freeze;;g' \ ${WRKSRC}/grpc.gemspec @${REINPLACE_CMD} -e '/s\.files = /s;"\.yardopts"\.freeze, ;;' ${WRKSRC}/grpc.gemspec .include Index: head/net/rubygem-grpc/distinfo =================================================================== --- head/net/rubygem-grpc/distinfo (revision 518195) +++ head/net/rubygem-grpc/distinfo (revision 518196) @@ -1,3 +1,3 @@ -TIMESTAMP = 1558173766 -SHA256 (rubygem/grpc-1.19.0.gem) = faf11039fe32009ccc270190e33d65b1a5e0d292ddd06a2ffa7d97aae3e7bee5 -SIZE (rubygem/grpc-1.19.0.gem) = 3093504 +TIMESTAMP = 1574430162 +SHA256 (rubygem/grpc-1.24.0.gem) = eed268d73e455ed82df7e9a76a9575d11d3c1c139a95a227254b9286939c91a3 +SIZE (rubygem/grpc-1.24.0.gem) = 3264000 Index: head/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb =================================================================== --- head/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb (revision 518195) +++ head/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb (revision 518196) @@ -1,44 +1,51 @@ ---- src/ruby/ext/grpc/extconf.rb.orig 2017-12-31 07:02:12 UTC +--- src/ruby/ext/grpc/extconf.rb.orig 2019-11-22 13:44:33 UTC +++ src/ruby/ext/grpc/extconf.rb -@@ -56,9 +56,9 @@ ENV['LD'] = ENV['CC'] +@@ -39,9 +39,9 @@ end ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/ -ENV['EMBED_OPENSSL'] = 'true' -ENV['EMBED_ZLIB'] = 'true' -ENV['EMBED_CARES'] = 'true' +ENV['EMBED_OPENSSL'] = 'false' +ENV['EMBED_ZLIB'] = 'false' +ENV['EMBED_CARES'] = 'false' ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG'] ENV['ARCH_FLAGS'] = '-arch i386 -arch x86_64' if RUBY_PLATFORM =~ /darwin/ ENV['CPPFLAGS'] = '-DGPR_BACKWARDS_COMPATIBILITY_MODE' -@@ -67,17 +67,18 @@ output_dir = File.expand_path(RbConfig::CONFIG['topdir +@@ -50,22 +50,23 @@ output_dir = File.expand_path(RbConfig::CONFIG['topdir grpc_lib_dir = File.join(output_dir, 'libs', grpc_config) ENV['BUILDDIR'] = output_dir -unless windows - puts 'Building internal gRPC into ' + grpc_lib_dir - nproc = 4 - nproc = Etc.nprocessors * 2 if Etc.respond_to? :nprocessors - make = bsd ? 'gmake' : 'make' - system("#{make} -j#{nproc} -C #{grpc_root} #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config} Q=") - exit 1 unless $? == 0 -end +#unless windows +# puts 'Building internal gRPC into ' + grpc_lib_dir +# nproc = 4 +# nproc = Etc.nprocessors * 2 if Etc.respond_to? :nprocessors +# make = bsd ? 'gmake' : 'make' +# system("#{make} -j#{nproc} -C #{grpc_root} #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config} Q=") +# exit 1 unless $? == 0 +#end -$CFLAGS << ' -I' + File.join(grpc_root, 'include') --$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows +#$CFLAGS << ' -I' + File.join(grpc_root, 'include') -+#$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows + + ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', 'ext-export') +-$LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if RUBY_PLATFORM =~ /linux/ +-$LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if RUBY_PLATFORM =~ /darwin/ ++#$LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if RUBY_PLATFORM =~ /linux/ ++#$LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if RUBY_PLATFORM =~ /darwin/ +$LDFLAGS << ' -lgrpc' unless windows + +-$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows ++#$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows if grpc_config == 'gcov' $CFLAGS << ' -O0 -fprofile-arcs -ftest-coverage' $LDFLAGS << ' -fprofile-arcs -ftest-coverage -rdynamic'