Index: Mk/bsd.ruby.mk
===================================================================
--- Mk/bsd.ruby.mk
+++ Mk/bsd.ruby.mk
@@ -176,7 +176,7 @@
 # Ruby 2.7
 #
 RUBY_VERSION=		2.7.0
-RUBY_PORTREVISION=	1
+RUBY_PORTREVISION=	2
 RUBY_PORTEPOCH=		1
 RUBY27=			""	# PLIST_SUB helpers
 
Index: devel/rubygem-irb/Makefile
===================================================================
--- devel/rubygem-irb/Makefile
+++ devel/rubygem-irb/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	irb
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -20,12 +21,19 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${RUBY_VER} < 2.6
-IGNORE=		irb is included in lang/${RUBY_NAME}
-.endif
+.if ${RUBY_VER} >= 2.7
+PLIST_FILES=	bin/irb \
+		share/man/man1/irb.1.gz
 
-# irb executable is installed by ruby port
 post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_DATA} ${WRKSRC}/man/irb.1
+.elif ${RUBY_VER} == 2.6
+# WIP: irb wrapper script is installed by ruby port so far, see bug 241554, 237833
+post-install:
 	${RM} ${STAGEDIR}${PREFIX}/bin/irb
+.else
+IGNORE=		${PORTNAME} is included in lang/${RUBY_NAME}
+.endif
 
 .include <bsd.port.post.mk>
Index: devel/rubygem-rdoc/Makefile
===================================================================
--- devel/rubygem-rdoc/Makefile
+++ devel/rubygem-rdoc/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rdoc
 PORTVERSION=	6.1.2
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -17,7 +18,16 @@
 
 NO_ARCH=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${RUBY_VER} >= 2.7
+PLIST_FILES=	bin/rdoc bin/ri
+.elif ${RUBY_VER} == 2.6
+# WIP: rdoc wrapper script is installed by ruby port so far, see bug 241554, 237833
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/bin/rdoc ${STAGEDIR}${PREFIX}/bin/ri
+.else
+IGNORE=         ${PORTNAME} is included in lang/${RUBY_NAME}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: lang/ruby27/Makefile
===================================================================
--- lang/ruby27/Makefile
+++ lang/ruby27/Makefile
@@ -118,8 +118,8 @@
 PLIST_SUB+=	IF_DEFAULT="@comment "
 .endif
 
-INSTALLED_SCRIPTS=	erb irb rdoc ri ruby
-INSTALLED_MANUALS=	erb irb ri ruby
+INSTALLED_SCRIPTS=	erb ruby
+INSTALLED_MANUALS=	erb ruby
 
 EXTSAMPLES=	bigdecimal/sample/*.rb
 
@@ -133,7 +133,9 @@
 
 post-patch:
 # We get these from other ports
-.for d in bin/bundle* bin/*racc* lib/bundler* libexec/bundler* man/bundle* bin/gem man/gemfile* \
+.for d in bin/bundle* bin/gem bin/*racc* bin/irb bin/rdoc bin/ri \
+	  lib/bundler* libexec/bundler* \
+	  man/bundle* man/gemfile* man/irb.1 man/ri.1 \
 	  ext/dbm ext/gdbm ext/win32ole
 	  	@${RM} -r ${BUILD_WRKSRC}/${d}
 .endfor
Index: lang/ruby27/pkg-message
===================================================================
--- lang/ruby27/pkg-message
+++ lang/ruby27/pkg-message
@@ -4,10 +4,11 @@
 Some of the standard commands are provided as separate ports for ease
 of upgrading:
 
-	devel/ruby-gems:	gem - RubyGems package manager
-	devel/rubygem-irb:	irb - Interactive Ruby
-	devel/rubygem-rake:	rake - Ruby Make
-	devel/rubygem-rdoc:	rdoc - Ruby Documentation System
+	devel/ruby-gems:		gem - RubyGems package manager
+	devel/rubygem-irb:		irb - Interactive Ruby
+	devel/rubygem-rake:		rake - Ruby Make
+	devel/rubygem-rdoc:		rdoc - Ruby Documentation System
+	sysutils/rubygem-bundler:	bundler - Tool that manages gem dependencies for ruby applications
 
 And some of the standard libraries are provided as separate ports
 since they require extra dependencies:
Index: lang/ruby27/pkg-plist
===================================================================
--- lang/ruby27/pkg-plist
+++ lang/ruby27/pkg-plist
@@ -1,11 +1,5 @@
 %%IF_DEFAULT%%bin/erb
 bin/erb%%RUBY_SUFFIX%%
-%%IF_DEFAULT%%bin/irb
-bin/irb%%RUBY_SUFFIX%%
-%%IF_DEFAULT%%bin/rdoc
-bin/rdoc%%RUBY_SUFFIX%%
-%%IF_DEFAULT%%bin/ri
-bin/ri%%RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/ruby
 bin/ruby%%RUBY_SUFFIX%%
 include/ruby-%%RUBY_VER%%/%%RUBY_ARCH%%/rb_mjit_min_header-%%RUBY_VERSION%%.h
@@ -960,10 +954,6 @@
 libdata/pkgconfig/ruby-%%RUBY_VER%%.pc
 %%IF_DEFAULT%%man/man1/erb.1.gz
 man/man1/erb%%RUBY_SUFFIX%%.1.gz
-%%IF_DEFAULT%%man/man1/irb.1.gz
-man/man1/irb%%RUBY_SUFFIX%%.1.gz
-%%IF_DEFAULT%%man/man1/ri.1.gz
-man/man1/ri%%RUBY_SUFFIX%%.1.gz
 %%IF_DEFAULT%%man/man1/ruby.1.gz
 man/man1/%%RUBY_NAME%%.1.gz
 %%DOCS%%%%RUBY_DOCDIR%%/COPYING