CVS commit: pkgsrc/textproc/ruby-rdtool

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Aug 12 14:41:19 UTC 2026

Modified Files:
        pkgsrc/textproc/ruby-rdtool: Makefile PLIST distinfo
        pkgsrc/textproc/ruby-rdtool/patches: patch-ae

Log Message:
textproc/ruby-rdtool: update to 0.6.39

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.48 -r1.49 pkgsrc/textproc/ruby-rdtool/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/textproc/ruby-rdtool/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/textproc/ruby-rdtool/distinfo
cvs rdiff -u -r1.5 -r1.6 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.48 pkgsrc/textproc/ruby-rdtool/Makefile:1.49
--- pkgsrc/textproc/ruby-rdtool/Makefile:1.48   Tue Mar 31 01:45:26 2026
+++ pkgsrc/textproc/ruby-rdtool/Makefile        Wed Aug 12 14:41:19 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2026/03/31 01:45:26 taca Exp $
+# $NetBSD: Makefile,v 1.49 2026/08/12 14:41:19 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.14 pkgsrc/textproc/ruby-rdtool/PLIST:1.15
--- pkgsrc/textproc/ruby-rdtool/PLIST:1.14      Tue Mar 31 01:45:26 2026
+++ pkgsrc/textproc/ruby-rdtool/PLIST   Wed Aug 12 14:41:19 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2026/03/31 01:45:26 taca Exp $
+@comment $NetBSD: PLIST,v 1.15 2026/08/12 14:41:19 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.27 pkgsrc/textproc/ruby-rdtool/distinfo:1.28
--- pkgsrc/textproc/ruby-rdtool/distinfo:1.27   Tue Mar 31 01:45:26 2026
+++ pkgsrc/textproc/ruby-rdtool/distinfo        Wed Aug 12 14:41:19 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.27 2026/03/31 01:45:26 taca Exp $
+$NetBSD: distinfo,v 1.28 2026/08/12 14:41:19 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) = d50da6553ad4a83f41797cc788ab13300fc4ac3b

Index: pkgsrc/textproc/ruby-rdtool/patches/patch-ae
diff -u pkgsrc/textproc/ruby-rdtool/patches/patch-ae:1.5 pkgsrc/textproc/ruby-rdtool/patches/patch-ae:1.6
--- pkgsrc/textproc/ruby-rdtool/patches/patch-ae:1.5    Tue Mar 31 01:45:26 2026
+++ pkgsrc/textproc/ruby-rdtool/patches/patch-ae        Wed Aug 12 14:41:19 2026
@@ -1,39 +1,59 @@
-$NetBSD: patch-ae,v 1.5 2026/03/31 01:45:26 taca Exp $
+$NetBSD: patch-ae,v 1.6 2026/08/12 14:41:19 taca Exp $
 
 * Try load from PKG_SYSCONFDIR/dot.rd2rc.
-* Depend on $0 strictly.
+* Proper program name parsing in require_implicit_format_lib().
+* Take care for character encodings a bit.
 
---- bin/rd2.orig       2015-06-04 13:21:12.000000000 +0000
+--- bin/rd2.orig       2026-05-27 03:53:01.573432732 +0000
 +++ bin/rd2
-@@ -67,6 +67,7 @@ output_file = nil
- output_index = nil
- out_code = nil
- from_rdo = nil
-+sysconf = "@PKG_SYSCONFDIR@/dot.rd2rc"
+@@ -78,6 +78,7 @@ class RD2Command
+     @output_index = false
+     @out_code = nil
+     @from_rdo = false
++    @sysconf = "@PKG_SYSCONFDIR@/dot.rd2rc"
+   end
+ 
+   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,9 +182,9 @@ class RD2Command
+ 
+   def require_implicit_format_lib
+     base = File.basename(@program_name, ".*").downcase
+-    return unless /rd2.+/ =~ base
++    return unless /rd2[0-9]*([a-z][a-z0-9]+)/ =~ base
  
- # 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"
+-    load_format_library("rd/#{$&}-lib.rb")
++    load_format_library("rd/#{$1}-lib.rb")
    end
--rescue
-+rescue StandardError, LoadError
-   load "rd/dot.rd2rc"
- end
  
-@@ -161,8 +162,8 @@ ARGV.options do |q|
- end # OptionParser.new
+   def load_format_library(lib)
+@@ -241,6 +242,21 @@ class RD2Command
+       src.unshift("=begin\n").push("=end\n")
+     end
  
- # 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
++    # ad hoc encoding check
++    data = src.join('')
++    encoding = [Encoding::UTF_8, Encoding::EUC_JP, Encoding::ISO_8859_1]
++    encoding.each { |e|
++      data.force_encoding e
++      if data.valid_encoding?
++        if e != Encoding::UTF_8
++          src.each { |l|
++            l.encode!(Encoding::UTF_8, e)
++          }
++        end
++        break
++      end
++    }
++
+     tree = RDTree.new(src, @include_path, nil)
+     @with_part.each do |entry|
+       tree.filter[entry.part] = $RC["filter"][entry.filter]