git: e4a56e48d471 - main - Mk/bsd.ruby.mk: Remove RUBY_RDOC

From: Yasuhiro Kimura <yasu_at_FreeBSD.org>
Date: Mon, 02 May 2022 11:15:17 UTC
The branch main has been updated by yasu:

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

commit e4a56e48d471fef7f8a2c20fb7e4463af4e892d6
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2022-04-18 06:52:16 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2022-05-02 11:14:06 +0000

    Mk/bsd.ruby.mk: Remove RUBY_RDOC
    
    After lang/ruby26 is removed the value of it is same with all
    supported ruby versions. So ports need not use it to specify full
    patch of rdoc executable.
    
    PR:             263386
    Approved by:    maintainer timeout
---
 Mk/bsd.ruby.mk                            |  5 -----
 databases/ruby-bdb/Makefile               |  1 -
 databases/ruby-bdb/files/patch-extconf.rb | 13 ++-----------
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 406f127ed967..6264258469a0 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -71,8 +71,6 @@ Ruby_Include_MAINTAINER=	ruby@FreeBSD.org
 #
 # RUBY_MODNAME		- Set to the module name (default: ${PORTNAME}).
 #
-# RUBY_RDOC		- Full path of rdoc executable.
-#
 # RUBY_BASE_PORT	- Port path of base ruby without PORTSDIR, without
 #			  suffix except version.
 # RUBY_PORT		- Port path of ruby without PORTSDIR.
@@ -242,9 +240,6 @@ RUBY_CONFIGURE_ARGS+=	--program-suffix="${RUBY_SUFFIX}"
 
 RUBY_MODNAME?=		${PORTNAME}
 
-# Commands
-RUBY_RDOC?=		${LOCALBASE}/bin/rdoc
-
 # Ports
 RUBY_BASE_PORT?=	lang/ruby${RUBY_VER:S/.//}
 RUBY_PORT?=		${RUBY_BASE_PORT}
diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile
index 3a299072e31d..e32605b7182d 100644
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@@ -33,7 +33,6 @@ SHEBANG_FILES=	examples/basic.rb examples/cats.rb examples/cursor.rb \
 
 CONFIGURE_ARGS=	--with-db-include=${BDB_INCLUDE_DIR} \
 		--with-db-lib=${BDB_LIB_DIR}
-MAKE_ENV=	RUBY_RDOC=${LOCALBASE}/bin/rdoc
 ALL_TARGET=	all rdoc
 INSTALL_TARGET=	site-install
 
diff --git a/databases/ruby-bdb/files/patch-extconf.rb b/databases/ruby-bdb/files/patch-extconf.rb
index 4edd71af924f..c229cc51056e 100644
--- a/databases/ruby-bdb/files/patch-extconf.rb
+++ b/databases/ruby-bdb/files/patch-extconf.rb
@@ -1,15 +1,6 @@
 --- extconf.rb.orig	2011-04-06 19:35:39 UTC
 +++ extconf.rb
-@@ -50,7 +50,7 @@
- rdoc: docs/doc/index.html
- 
- docs/doc/index.html: $(RDOC)
--\t@-(cd docs; rdoc .)
-+\t@-(cd docs; ${RUBY_RDOC} .)
- 
- ri:
- \t@-(rdoc -r docs/*rb)
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ test: $(DLLIB)
     Dir.foreach('tests') do |x|
        next if /^\./ =~ x || /(_\.rb|~)$/ =~ x
        next if FileTest.directory?(x)
@@ -18,7 +9,7 @@
     end
  ensure
     make.close
-@@ -76,7 +76,7 @@
+@@ -76,7 +76,7 @@ end
  subdirs.each do |subdir|
     STDERR.puts("#{$0}: Entering directory `#{subdir}'")
     Dir.chdir(subdir)