CVS commit: pkgsrc/lang/ruby

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue Dec 20 02:53:10 UTC 2022

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

Log Message:
lang/ruby/gem.mk: fix handlingo of RUBYGEM_MANPAGES

Globael setting for RUBYGEM_MANPAGES is also required.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/lang/ruby/gem.mk

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

Modified files:

Index: pkgsrc/lang/ruby/gem.mk
diff -u pkgsrc/lang/ruby/gem.mk:1.50 pkgsrc/lang/ruby/gem.mk:1.51
--- pkgsrc/lang/ruby/gem.mk:1.50        Sun Dec 18 14:52:08 2022
+++ pkgsrc/lang/ruby/gem.mk     Tue Dec 20 02:53:10 2022
@@ -1,4 +1,4 @@
-# $NetBSD: gem.mk,v 1.50 2022/12/18 14:52:08 taca Exp $
+# $NetBSD: gem.mk,v 1.51 2022/12/20 02:53:10 taca Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install Ruby gems.
@@ -10,6 +10,12 @@
 #              Possible values: Yes No
 #              Default: No
 #
+# RUBYGEM_USE_MANPAGES
+#      Enable man pages support to ruby gem.
+#
+#      Possible values: Yes No
+#      Default: Yes
+#
 # === Package-settable variables ===
 #
 # OVERRIDE_GEMSPEC
@@ -110,7 +116,7 @@
 #      Optional parameter to pass to gem on install stage.
 #
 # RUBYGEM_MANPAGES
-#      Add man pages support to ruby gem.  This is user-settable.
+#      Add man pages support to ruby gem.
 #
 #      Possible values: Yes No
 #      Default: No
@@ -164,17 +170,22 @@ DISTFILES?=       ${DISTNAME}${EXTRACT_SUFX}
 #
 # Handling of ruby-manpages plugin.
 #
+RUBYGEM_USE_MANPAGES?= yes
 RUBYGEM_MANPAGES?=     no
 PLIST_VARS+=           rubygem_man
 
-.if ${RUBYGEM_MANPAGES:tl} == "no"
-RUBY_MANPAGES_INSTALLED!= ${PKG_INFO} -e ${RUBY_PKGPREFIX}-manpages || ${TRUE}
-.  if ${RUBY_MANPAGES_INSTALLED}
-PKG_SKIP_REASON+=      "Please uninstall ${RUBY_PKGPREFIX}-manpages or set RUBYGEM_MANPAGES to yes."
-.  endif
-.else
+.if ${RUBYGEM_USE_MANPAGES:tl} == "yes"
+.  if ${RUBYGEM_MANPAGES:tl} == "yes"
 BUILD_DEPENDS+=        ${RUBY_PKGPREFIX}-manpages>=0.6.1:../../misc/ruby-manpages
 PLIST.rubygem_man=     yes
+.  endif
+.else
+.  if ${RUBYGEM_MANPAGES:tl} == "yes"
+RUBY_MANPAGES_INSTALLED!= ${PKG_INFO} -e ${RUBY_PKGPREFIX}-manpages || ${TRUE}
+.    if ${RUBY_MANPAGES_INSTALLED}
+PKG_SKIP_REASON+=      "Please uninstall ${RUBY_PKGPREFIX}-manpages or set RUBYGEM_USE_MANPAGES to yes."
+.    endif
+.  endif
 .endif
 
 # If any of the DISTFILES are gems, then skip the normal do-extract actions