From owner-svn-ports-head@freebsd.org Sat Oct 26 14:30:36 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E81C0174E57; Sat, 26 Oct 2019 14:30:36 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 470k0r5kZPz4FK7; Sat, 26 Oct 2019 14:30:36 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 87951939E; Sat, 26 Oct 2019 14:30:36 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9QEUasC043481; Sat, 26 Oct 2019 14:30:36 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9QEUZKD043475; Sat, 26 Oct 2019 14:30:35 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201910261430.x9QEUZKD043475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 26 Oct 2019 14:30:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r515696 - in head/net: . rubygem-grpc124 rubygem-grpc124/files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/net: . rubygem-grpc124 rubygem-grpc124/files X-SVN-Commit-Revision: 515696 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Oct 2019 14:30:37 -0000 Author: sunpoet Date: Sat Oct 26 14:30:35 2019 New Revision: 515696 URL: https://svnweb.freebsd.org/changeset/ports/515696 Log: Add rubygem-grpc124 1.24.0 (copied from rubygem-grpc) - Update version requirement of RUN_DEPENDS Added: head/net/rubygem-grpc124/ - copied from r514818, head/net/rubygem-grpc/ Modified: head/net/Makefile head/net/rubygem-grpc124/Makefile head/net/rubygem-grpc124/distinfo head/net/rubygem-grpc124/files/patch-src_ruby_ext_grpc_extconf.rb head/net/rubygem-grpc124/files/patch-src_ruby_lib_grpc.rb Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Sat Oct 26 14:30:29 2019 (r515695) +++ head/net/Makefile Sat Oct 26 14:30:35 2019 (r515696) @@ -1261,6 +1261,7 @@ SUBDIR += rubygem-google-cloud-logging SUBDIR += rubygem-google-cloud-storage SUBDIR += rubygem-grpc + SUBDIR += rubygem-grpc124 SUBDIR += rubygem-hangouts-chat SUBDIR += rubygem-http-parser SUBDIR += rubygem-http_parser.rb Modified: head/net/rubygem-grpc124/Makefile ============================================================================== --- head/net/rubygem-grpc/Makefile Sat Oct 19 15:00:33 2019 (r514818) +++ head/net/rubygem-grpc124/Makefile Sat Oct 26 14:30:35 2019 (r515696) @@ -1,11 +1,12 @@ # $FreeBSD$ PORTNAME= grpc -PORTVERSION= 1.19.0 +PORTVERSION= 1.24.0 CATEGORIES= net rubygems MASTER_SITES= RG +PKGNAMESUFFIX= 124 -MAINTAINER= mfechner@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Ruby implementation of gRPC LICENSE= BSD3CLAUSE @@ -13,22 +14,21 @@ 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-google-protobuf>=3.8<4:devel/rubygem-google-protobuf \ + rubygem-googleapis-common-protos-types>=1.0<2:devel/rubygem-googleapis-common-protos-types -MAKE_JOBS_UNSAFE= yes - USES= gem gmake pkgconfig USE_RUBY= yes +MAKE_JOBS_UNSAFE= yes + post-extract: - @${RM} -r ${WRKSRC}/include ${WRKSRC}/third_party ${WRKSRC}/src/boringssl \ - ${WRKSRC}/src/core ${WRKSRC}/Makefile ${WRKSRC}/.yardopts ${WRKSRC}/etc + @${RM} ${WRKSRC}/Makefile ${WRKSRC}/.yardopts + @${RM} -r ${WRKSRC}/etc ${WRKSRC}/include ${WRKSRC}/third_party ${WRKSRC}/src/boringssl ${WRKSRC}/src/core 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 + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/ruby/lib/grpc.rb + @${REINPLACE_CMD} -Ee '/s\.files = /s;, "(Makefile|etc|include|third_party|src/boringssl|src/core)[^"]*"\.freeze;;g' ${WRKSRC}/${GEMSPEC} + @${REINPLACE_CMD} -e '/s\.files = /s|"\.yardopts"\.freeze, ||' ${WRKSRC}/${GEMSPEC} .include Modified: head/net/rubygem-grpc124/distinfo ============================================================================== --- head/net/rubygem-grpc/distinfo Sat Oct 19 15:00:33 2019 (r514818) +++ head/net/rubygem-grpc124/distinfo Sat Oct 26 14:30:35 2019 (r515696) @@ -1,3 +1,3 @@ -TIMESTAMP = 1558173766 -SHA256 (rubygem/grpc-1.19.0.gem) = faf11039fe32009ccc270190e33d65b1a5e0d292ddd06a2ffa7d97aae3e7bee5 -SIZE (rubygem/grpc-1.19.0.gem) = 3093504 +TIMESTAMP = 1571503064 +SHA256 (rubygem/grpc-1.24.0.gem) = eed268d73e455ed82df7e9a76a9575d11d3c1c139a95a227254b9286939c91a3 +SIZE (rubygem/grpc-1.24.0.gem) = 3264000 Modified: head/net/rubygem-grpc124/files/patch-src_ruby_ext_grpc_extconf.rb ============================================================================== --- head/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb Sat Oct 19 15:00:33 2019 (r514818) +++ head/net/rubygem-grpc124/files/patch-src_ruby_ext_grpc_extconf.rb Sat Oct 26 14:30:35 2019 (r515696) @@ -1,6 +1,6 @@ ---- src/ruby/ext/grpc/extconf.rb.orig 2017-12-31 07:02:12 UTC +--- src/ruby/ext/grpc/extconf.rb.orig 2019-10-19 19:28:47 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/ @@ -13,7 +13,7 @@ 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,22 @@ output_dir = File.expand_path(RbConfig:: grpc_lib_dir = File.join(output_dir, 'libs', grpc_config) ENV['BUILDDIR'] = output_dir @@ -35,10 +35,14 @@ +#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') + + 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 << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows +#$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows -+$LDFLAGS << ' -lgrpc' unless windows if grpc_config == 'gcov' $CFLAGS << ' -O0 -fprofile-arcs -ftest-coverage' $LDFLAGS << ' -fprofile-arcs -ftest-coverage -rdynamic' Modified: head/net/rubygem-grpc124/files/patch-src_ruby_lib_grpc.rb ============================================================================== --- head/net/rubygem-grpc/files/patch-src_ruby_lib_grpc.rb Sat Oct 19 15:00:33 2019 (r514818) +++ head/net/rubygem-grpc124/files/patch-src_ruby_lib_grpc.rb Sat Oct 26 14:30:35 2019 (r515696) @@ -1,4 +1,4 @@ ---- src/ruby/lib/grpc.rb.orig 2017-12-31 07:02:12 UTC +--- src/ruby/lib/grpc.rb.orig 2019-10-19 19:28:47 UTC +++ src/ruby/lib/grpc.rb @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and @@ -8,4 +8,4 @@ +ssl_roots_path = '%%LOCALBASE%%/etc/ssl/cert.pem' require_relative 'grpc/errors' - require_relative 'grpc/grpc' + require_relative 'grpc/structs'