Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1571927978285350"
MIME-Version: 1.0
Date: Thu, 24 Oct 2019 14:39:38 +0000
From: "Takahiro Kambe" <taca@netbsd.org>
Subject: CVS commit: pkgsrc/lang/ruby
To: pkgsrc-changes@NetBSD.org
Reply-To: taca@netbsd.org
Message-Id: <20191024143938.17A47FA84@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1571927978285350
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	taca
Date:		Thu Oct 24 14:39:38 UTC 2019

Modified Files:
	pkgsrc/lang/ruby: gem.mk rubyversion.mk

Log Message:
lang/ruby: change for --no-document option

Replace RUBY_BUILD_RDOC and RUBY_BUILD_RI with RUBY_BUILD_DOCUMENT since
rdoc's --no-rdoc and --no-ri options are deprecated almost 8 years ago
and these options are replaced with -no-document option.

No package should be changed.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/lang/ruby/gem.mk
cvs rdiff -u -r1.211 -r1.212 pkgsrc/lang/ruby/rubyversion.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1571927978285350
Content-Disposition: inline
Content-Length: 2268
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/ruby/gem.mk
diff -u pkgsrc/lang/ruby/gem.mk:1.39 pkgsrc/lang/ruby/gem.mk:1.40
--- pkgsrc/lang/ruby/gem.mk:1.39	Sat Feb  9 15:22:46 2019
+++ pkgsrc/lang/ruby/gem.mk	Thu Oct 24 14:39:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: gem.mk,v 1.39 2019/02/09 15:22:46 taca Exp $
+# $NetBSD: gem.mk,v 1.40 2019/10/24 14:39:37 taca Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install Ruby gems.
@@ -258,11 +258,8 @@ _RUBYGEM_OPTIONS+=	--install-dir ${PREFI
 _RUBYGEM_OPTIONS+=	${RUBYGEM_INSTALL_ROOT_OPTION}
 _RUBYGEM_OPTIONS+=	--ignore-dependencies
 _RUBYGEM_OPTIONS+=	--local ${WRKSRC}/${GEM_NAME}.gem
-.if !empty(RUBY_BUILD_RI:M[nN][oO])
-_RUBYGEM_OPTIONS+=	--no-ri
-.endif
-.if !empty(RUBY_BUILD_RDOC:M[nN][oO])
-_RUBYGEM_OPTIONS+=	--no-rdoc
+.if !empty(RUBY_BUILD_DOCUMENT:M[nN][oO])
+_RUBYGEM_OPTIONS+=	--no-document
 .endif
 .if !empty(CONFIGURE_ARGS) || !empty(RUBY_EXTCONF_ARGS)
 _RUBYGEM_OPTIONS+=	--

Index: pkgsrc/lang/ruby/rubyversion.mk
diff -u pkgsrc/lang/ruby/rubyversion.mk:1.211 pkgsrc/lang/ruby/rubyversion.mk:1.212
--- pkgsrc/lang/ruby/rubyversion.mk:1.211	Wed Oct  2 13:44:34 2019
+++ pkgsrc/lang/ruby/rubyversion.mk	Thu Oct 24 14:39:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.211 2019/10/02 13:44:34 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.212 2019/10/24 14:39:37 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -13,20 +13,13 @@
 #		Possible values: 22 24 25 26
 #		Default: 24
 #
-# RUBY_BUILD_RDOC
-#	Build rdoc of this package and so that install formated
+# RUBY_BUILD_DOCUMENT
+#	Build documentation of this package and so that install formated
 #	documentation.  It is also used in each package.
 #
 #		Possible values: Yes No
 #		Default: Yes
 #
-# RUBY_BUILD_RI
-#	Build ri format of this package so that ri command would be
-#	display class/module definitions.  It is also used in each package.
-#
-#		Possible values: Yes No
-#		Default: Yes
-#
 # === Infrastructure variables ===
 #
 # RUBY_VERSION_REQD
@@ -425,8 +418,7 @@ RUBY_SUFFIX=
 RUBY_NAME=		ruby
 .endif
 
-RUBY_BUILD_RDOC?=	Yes
-RUBY_BUILD_RI?=		Yes
+RUBY_BUILD_DOCUMENT?=	Yes
 
 RUBY?=			${PREFIX}/bin/${RUBY_NAME}
 RAKE?=			${PREFIX}/bin/${RAKE_NAME}


--_----------=_1571927978285350--