Re: CVS commit: pkgsrc/textproc/ruby-rdtool

[Ryo ONODERA <ryo%tetera.org@localhost>]

Hi,

Thanks for your updates!!!

With ruby40-4.0.2, ruby40-rdtool-0.6.39 does not work for me.
For example, the builds of devel/ruby-bsearch and converters/ruby-romkan fails as follows:

===> Building for ruby40-bsearch-1.5nb2
cd /usr/tmp/pkgsrc/devel/ruby-bsearch/work/ruby-bsearch-1.5; /usr/pkg/bin/rd240 bsearch.en.rd > bsearch.en.html
/usr/pkg/lib/ruby/gems/4.0.0/gems/rdtool-0.6.39/bin/rd2:191:in 'Kernel#require': cannot load such file -- rd/rd240-lib.rb (LoadError)
        from /usr/pkg/lib/ruby/gems/4.0.0/gems/rdtool-0.6.39/bin/rd2:191:in 'RD2Command#load_format_library'
        from /usr/pkg/lib/ruby/gems/4.0.0/gems/rdtool-0.6.39/bin/rd2:187:in 'RD2Command#require_implicit_format_lib'
        from /usr/pkg/lib/ruby/gems/4.0.0/gems/rdtool-0.6.39/bin/rd2:86:in 'RD2Command#run'
        from /usr/pkg/lib/ruby/gems/4.0.0/gems/rdtool-0.6.39/bin/rd2:310:in '<top (required)>'
        from /usr/pkg/lib/ruby/4.0.0/rubygems.rb:304:in 'Kernel#load'
        from /usr/pkg/lib/ruby/4.0.0/rubygems.rb:304:in 'Gem.activate_and_load_bin_path'
        from /usr/pkg/bin/rd240:25:in '<main>'
*** Error code 1


Could you take a look at my problem?

Thank you.


"Takahiro Kambe" <taca%netbsd.org@localhost> writes:

> Module Name:  pkgsrc
> Committed By: taca
> Date:         Sun Mar 29 07:29:05 UTC 2026
>
> Modified Files:
>       pkgsrc/textproc/ruby-rdtool: Makefile PLIST distinfo rdtool.mk
>       pkgsrc/textproc/ruby-rdtool/patches: patch-ae
>
> Log Message:
> textproc/ruby-rdtool: update to 0.6.39
>
> pkgsrc change: remove one pkglint warning.
>
> 0.6.39 (2026-03-17)
>
> * Modernize packaging metadata, CI, and release workflow for current Ruby.
> * Refactor rd2 internals without breaking external formatter compatibility.
> * Add configurable man section support and improve rd2man output quality.
> * Add a simple HTML5 formatter, and document bundled format libraries.
> * Modernize rdswap and document its purpose.
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.46 -r1.47 pkgsrc/textproc/ruby-rdtool/Makefile
> cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/ruby-rdtool/PLIST
> cvs rdiff -u -r1.25 -r1.26 pkgsrc/textproc/ruby-rdtool/distinfo
> cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/ruby-rdtool/rdtool.mk
> cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/ruby-rdtool/patches/patch-ae
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
>
> Modified files:
>
> Index: pkgsrc/textproc/ruby-rdtool/Makefile
> diff -u pkgsrc/textproc/ruby-rdtool/Makefile:1.46 pkgsrc/textproc/ruby-rdtool/Makefile:1.47
> --- pkgsrc/textproc/ruby-rdtool/Makefile:1.46 Thu May 23 19:23:18 2019
> +++ pkgsrc/textproc/ruby-rdtool/Makefile      Sun Mar 29 07:29:05 2026
> @@ -1,7 +1,6 @@
> -# $NetBSD: Makefile,v 1.46 2019/05/23 19:23:18 rillig Exp $
> +# $NetBSD: Makefile,v 1.47 2026/03/29 07:29:05 taca Exp $
>  
> -DISTNAME=    rdtool-0.6.38
> -PKGREVISION= 2
> +DISTNAME=    rdtool-0.6.39
>  CATEGORIES=  textproc ruby
>  
>  MAINTAINER=  taca%NetBSD.org@localhost
>
> Index: pkgsrc/textproc/ruby-rdtool/PLIST
> diff -u pkgsrc/textproc/ruby-rdtool/PLIST:1.12 pkgsrc/textproc/ruby-rdtool/PLIST:1.13
> --- pkgsrc/textproc/ruby-rdtool/PLIST:1.12    Thu Jun  4 13:53:32 2015
> +++ pkgsrc/textproc/ruby-rdtool/PLIST Sun Mar 29 07:29:05 2026
> @@ -1,4 +1,4 @@
> -@comment $NetBSD: PLIST,v 1.12 2015/06/04 13:53:32 taca Exp $
> +@comment $NetBSD: PLIST,v 1.13 2026/03/29 07:29:05 taca Exp $
>  bin/rd2${RUBY_SUFFIX}
>  bin/rdswap.rb${RUBY_SUFFIX}
>  ${GEM_HOME}/cache/${GEM_NAME}.gem
> @@ -44,7 +44,9 @@ ${GEM_LIBDIR}/lib/rd/rd2html-ext-lib.rb
>  ${GEM_LIBDIR}/lib/rd/rd2html-ext-opt.rb
>  ${GEM_LIBDIR}/lib/rd/rd2html-lib.rb
>  ${GEM_LIBDIR}/lib/rd/rd2html-opt.rb
> +${GEM_LIBDIR}/lib/rd/rd2html5-lib.rb
>  ${GEM_LIBDIR}/lib/rd/rd2man-lib.rb
> +${GEM_LIBDIR}/lib/rd/rd2man-opt.rb
>  ${GEM_LIBDIR}/lib/rd/rd2rdo-lib.rb
>  ${GEM_LIBDIR}/lib/rd/rd2rmi-lib.rb
>  ${GEM_LIBDIR}/lib/rd/rdblockparser.ry
> @@ -87,7 +89,11 @@ ${GEM_LIBDIR}/test/test-output-format-vi
>  ${GEM_LIBDIR}/test/test-parser-util.rb
>  ${GEM_LIBDIR}/test/test-rbl-file.rb
>  ${GEM_LIBDIR}/test/test-rbl-suite.rb
> +${GEM_LIBDIR}/test/test-rd2-cli.rb
>  ${GEM_LIBDIR}/test/test-rd2html-lib.rb
> +${GEM_LIBDIR}/test/test-rd2html5-lib.rb
> +${GEM_LIBDIR}/test/test-rd2man-lib.rb
> +${GEM_LIBDIR}/test/test-rdswap-cli.rb
>  ${GEM_LIBDIR}/test/test-rdtree.rb
>  ${GEM_LIBDIR}/test/test-rdvisitor.rb
>  ${GEM_LIBDIR}/test/test-reference-resolver.rb
>
> Index: pkgsrc/textproc/ruby-rdtool/distinfo
> diff -u pkgsrc/textproc/ruby-rdtool/distinfo:1.25 pkgsrc/textproc/ruby-rdtool/distinfo:1.26
> --- pkgsrc/textproc/ruby-rdtool/distinfo:1.25 Tue Oct 26 11:23:26 2021
> +++ pkgsrc/textproc/ruby-rdtool/distinfo      Sun Mar 29 07:29:05 2026
> @@ -1,6 +1,6 @@
> -$NetBSD: distinfo,v 1.25 2021/10/26 11:23:26 nia Exp $
> +$NetBSD: distinfo,v 1.26 2026/03/29 07:29:05 taca Exp $
>  
> -BLAKE2s (rdtool-0.6.38.gem) = eecaccfb611bf2df447f0d717e6768b55ae50616336c8a2aa5141f0484dd9248
> -SHA512 (rdtool-0.6.38.gem) = 958e9066a8b3610eb1a78069e615c5bd672aa56b3b45669604b35cd094bb8ddc549d8f373d1ee53864c27a0aa7ee038101b3256c56b3b8ffe618f75a1a939bcd
> -Size (rdtool-0.6.38.gem) = 115712 bytes
> -SHA1 (patch-ae) = 4bac026ae88f24ab623bc4878a9efe313a8e0aef
> +BLAKE2s (rdtool-0.6.39.gem) = 7028ab5812b67da3a56f92da5d6a9f58898dca802299c8b45e637e87595f9658
> +SHA512 (rdtool-0.6.39.gem) = 8e4a736ba82b5dde1b1171580e6cc222f491881a36ddb1bd7ea3999bb3ccb4638f0bad605842e584dbba0c2b63e5ad4e790c2ea847dfe2e0bdd0ca0049895a8f
> +Size (rdtool-0.6.39.gem) = 120832 bytes
> +SHA1 (patch-ae) = d2beca6abf12a96aa6dbab8fc1a0ba56f4b937b8
>
> Index: pkgsrc/textproc/ruby-rdtool/rdtool.mk
> diff -u pkgsrc/textproc/ruby-rdtool/rdtool.mk:1.3 pkgsrc/textproc/ruby-rdtool/rdtool.mk:1.4
> --- pkgsrc/textproc/ruby-rdtool/rdtool.mk:1.3 Tue Jun  6 12:42:34 2023
> +++ pkgsrc/textproc/ruby-rdtool/rdtool.mk     Sun Mar 29 07:29:05 2026
> @@ -1,8 +1,8 @@
> -# $NetBSD: rdtool.mk,v 1.3 2023/06/06 12:42:34 riastradh Exp $
> +# $NetBSD: rdtool.mk,v 1.4 2026/03/29 07:29:05 taca Exp $
>  
>  .if !defined(RUBY_RDTOOL_MK)
>  
> -RUBY_RDTOOL_MK       :=
> +RUBY_RDTOOL_MK:=
>  
>  RUBY_RD=     ${PREFIX}/bin/rd2${RUBY_SUFFIX}
>  TOOL_DEPENDS+=       ${RUBY_PKGPREFIX}-rdtool>=0.6.14:../../textproc/ruby-rdtool
>
> Index: pkgsrc/textproc/ruby-rdtool/patches/patch-ae
> diff -u pkgsrc/textproc/ruby-rdtool/patches/patch-ae:1.3 pkgsrc/textproc/ruby-rdtool/patches/patch-ae:1.4
> --- pkgsrc/textproc/ruby-rdtool/patches/patch-ae:1.3  Mon Jun  8 16:47:54 2015
> +++ pkgsrc/textproc/ruby-rdtool/patches/patch-ae      Sun Mar 29 07:29:05 2026
> @@ -1,39 +1,33 @@
> -$NetBSD: patch-ae,v 1.3 2015/06/08 16:47:54 taca Exp $
> +$NetBSD: patch-ae,v 1.4 2026/03/29 07:29:05 taca Exp $
>  
>  * Try load from PKG_SYSCONFDIR/dot.rd2rc.
>  * Depend on $0 strictly.
>  
> ---- bin/rd2.orig     2015-06-04 13:21:12.000000000 +0000
> +--- bin/rd2.orig     2026-03-29 07:08:13.265719334 +0000
>  +++ bin/rd2
> -@@ -67,6 +67,7 @@ output_file = nil
> - output_index = nil
> - out_code = nil
> - from_rdo = nil
> -+sysconf = "@PKG_SYSCONFDIR@/dot.rd2rc"
> - 
> - # user option
> - $DEFAULT_FORMAT_LIB = "rd/rd2html-lib"
> -@@ -77,10 +78,10 @@ begin
> -     load "~/.rd2rc"
> -     #  STDERR << "#{$0}: loading ~/.rd2rc\n"
> -   else
> --    load "rd/dot.rd2rc"
> -+    load sysconf
> -     #  STDERR << "#{$0}: loading rd/dot.rd2rc\n"
> +@@ -78,6 +78,7 @@ class RD2Command
> +     @output_index = false
> +     @out_code = nil
> +     @from_rdo = false
> ++    @sysconf = "@PKG_SYSCONFDIR@/dot.rd2rc"
>     end
> --rescue
> -+rescue StandardError, LoadError
> -   load "rd/dot.rd2rc"
> - end
>   
> -@@ -161,8 +162,8 @@ ARGV.options do |q|
> - end # OptionParser.new
> +   def run
> +@@ -173,7 +174,7 @@ class RD2Command
> +     if File.readable?(user_config)
> +       load user_config
> +     else
> +-      load "rd/dot.rd2rc"
> ++      load @sysconf
> +     end
> +   rescue LoadError, StandardError
> +     load "rd/dot.rd2rc"
> +@@ -181,7 +182,7 @@ class RD2Command
> + 
> +   def require_implicit_format_lib
> +     base = File.basename(@program_name, ".*").downcase
> +-    return unless /rd2.+/ =~ base
> ++    return unless /rd2[1-9][0-9]+/ =~ base
>   
> - # require format lib implicitly
> --if /rd2.+/ =~ File.basename($0, ".*").downcase
> --  visitor_lib = "rd/" + $& + "-lib.rb"
> -+if /rd2[0-9]*([a-z-]+).*/ =~ File.basename($0, ".*").downcase
> -+  visitor_lib = "rd/rd2" + $1 + "-lib.rb"
> -   require visitor_lib
> -   require $RD2_Sub_OptionParser  if $RD2_Sub_OptionParser
> -   # make visitor
> +     load_format_library("rd/#{$&}-lib.rb")
> +   end
>

-- 
Ryo ONODERA // ryo%tetera.org@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3