7 files changed, 1 insertions, 98 deletions

diff --git a/MOVED b/MOVED
index 89bf084b6d0a..85b7cefdb87d 100644
--- a/MOVED
+++ b/MOVED
@@ -7561,3 +7561,4 @@ net-im/qxmpp-qt5|net-im/qxmpp|2023-05-26|Port flavorized for Qt 5 and 6
 devel/rubygem-aws-sdk-core3170|devel/rubygem-aws-sdk-core|2023-05-27|Remove obsoleted port. Use devel/rubygem-aws-sdk-core instead
 devel/rubygem-aws-sdk-s31119|devel/rubygem-aws-sdk-s3|2023-05-27|Remove obsoleted port. Use devel/rubygem-aws-sdk-s3 instead
 devel/rubygem-clamp11|devel/rubygem-clamp|2023-05-27|Remove obsoleted port. Use devel/rubygem-clamp instead
+net/rubygem-grpc142|net/rubygem-grpc|2023-05-27|Remove obsoleted port. Use net/rubygem-grpc instead
diff --git a/net/Makefile b/net/Makefile
index b172def0d2b7..44494b89279d 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1308,7 +1308,6 @@
     SUBDIR += rubygem-google-cloud-spanner-v1
     SUBDIR += rubygem-google-cloud-storage
     SUBDIR += rubygem-grpc
-    SUBDIR += rubygem-grpc142
     SUBDIR += rubygem-hangouts-chat
     SUBDIR += rubygem-http-parser
     SUBDIR += rubygem-http_parser.rb
diff --git a/net/rubygem-grpc142/Makefile b/net/rubygem-grpc142/Makefile
deleted file mode 100644
index 7ec96d06b6d1..000000000000
--- a/net/rubygem-grpc142/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-PORTNAME=	grpc
-PORTVERSION=	1.42.0
-PORTREVISION=	1
-CATEGORIES=	net rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	142
-
-MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	Ruby implementation of gRPC
-WWW=		https://github.com/grpc/grpc/tree/master/src/ruby
-
-LICENSE=	BSD3CLAUSE
-
-LIB_DEPENDS=	libcares.so:dns/c-ares \
-		libgrpc.so:devel/grpc142
-RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
-		rubygem-google-protobuf>=3.19<4:devel/rubygem-google-protobuf \
-		rubygem-googleapis-common-protos-types>=1.0<2:devel/rubygem-googleapis-common-protos-types
-
-USES=		cpe gem gmake pkgconfig
-
-MAKE_JOBS_UNSAFE=	yes
-
-post-patch:
-	@${RM} ${WRKSRC}/Makefile ${WRKSRC}/.yardopts
-	@${RM} -r ${WRKSRC}/etc ${WRKSRC}/include ${WRKSRC}/third_party ${WRKSRC}/src/boringssl ${WRKSRC}/src/core
-	@${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 <bsd.port.mk>
diff --git a/net/rubygem-grpc142/distinfo b/net/rubygem-grpc142/distinfo
deleted file mode 100644
index 6e238dbc8217..000000000000
--- a/net/rubygem-grpc142/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1640162448
-SHA256 (rubygem/grpc-1.42.0.gem) = b3d2649e67c6a636544996843d9ec191699c54c1aca797dbfea4dff36c14584a
-SIZE (rubygem/grpc-1.42.0.gem) = 4975104
diff --git a/net/rubygem-grpc142/files/patch-src_ruby_ext_grpc_extconf.rb b/net/rubygem-grpc142/files/patch-src_ruby_ext_grpc_extconf.rb
deleted file mode 100644
index 8c64eda42a7e..000000000000
--- a/net/rubygem-grpc142/files/patch-src_ruby_ext_grpc_extconf.rb
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/ruby/ext/grpc/extconf.rb.orig	2021-11-20 10:39:15 UTC
-+++ src/ruby/ext/grpc/extconf.rb
-@@ -45,9 +45,9 @@ if darwin && !cross_compiling
-   ENV['ARFLAGS'] = '-o'
- end
- 
--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']
- if darwin && !cross_compiling
-@@ -66,22 +66,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')
-+# $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 linux
--$LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if darwin
-+# $LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if linux
-+# $LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if 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'
diff --git a/net/rubygem-grpc142/files/patch-src_ruby_lib_grpc.rb b/net/rubygem-grpc142/files/patch-src_ruby_lib_grpc.rb
deleted file mode 100644
index 2671a57a57f4..000000000000
--- a/net/rubygem-grpc142/files/patch-src_ruby_lib_grpc.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ruby/lib/grpc.rb.orig	2020-09-23 17:48:57 UTC
-+++ src/ruby/lib/grpc.rb
-@@ -12,7 +12,7 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--ssl_roots_path = File.expand_path('../../../../etc/roots.pem', __FILE__)
-+ssl_roots_path = '%%LOCALBASE%%/etc/ssl/cert.pem'
- 
- require_relative 'grpc/errors'
- require_relative 'grpc/structs'
diff --git a/net/rubygem-grpc142/pkg-descr b/net/rubygem-grpc142/pkg-descr
deleted file mode 100644
index f60aa1ca888f..000000000000
--- a/net/rubygem-grpc142/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-A Ruby implementation of gRPC.