CVS commit: pkgsrc/lang/ruby33

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue May 19 14:45:52 UTC 2026

Modified Files:
        pkgsrc/lang/ruby33: Makefile distinfo
Added Files:
        pkgsrc/lang/ruby33/patches: patch-lib_rdoc_parser_c.rb

Log Message:
lang/ruby33: improve rdoc

* Fix rdoc problem on C locale, backported from rdoc-7.0.4.
* Remove pkglint warning.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/ruby33/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/ruby33/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/ruby33/patches/patch-lib_rdoc_parser_c.rb

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

Modified files:

Index: pkgsrc/lang/ruby33/Makefile
diff -u pkgsrc/lang/ruby33/Makefile:1.11 pkgsrc/lang/ruby33/Makefile:1.12
--- pkgsrc/lang/ruby33/Makefile:1.11    Wed May  6 05:28:22 2026
+++ pkgsrc/lang/ruby33/Makefile Tue May 19 14:45:52 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2026/05/06 05:28:22 taca Exp $
+# $NetBSD: Makefile,v 1.12 2026/05/19 14:45:52 taca Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-${RUBY_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
@@ -42,11 +42,11 @@ CONFIGURE_ENV.Darwin+=      ac_cv_prog_dsymut
 
 .include "../../mk/compiler.mk"
 
-.if !empty(PKGSRC_COMPILER:Mgcc)
-.if empty(CC_VERSION:Mgcc-10.*) && empty(CC_VERSION:Mgcc-[4-9]*)
+.if ${PKGSRC_COMPILER:Mgcc}
+.  if !${CC_VERSION:Mgcc-10.*} && !${CC_VERSION:Mgcc-[4-9]*}
 # work around miniruby coredump, solution from https://bugs.gentoo.org/965095
 CFLAGS+=       -fno-ipa-modref
-.endif
+.  endif
 .endif
 
 DOCS=          BSDL CONTRIBUTING.md COPYING COPYING.ja ChangeLog GPL \

Index: pkgsrc/lang/ruby33/distinfo
diff -u pkgsrc/lang/ruby33/distinfo:1.17 pkgsrc/lang/ruby33/distinfo:1.18
--- pkgsrc/lang/ruby33/distinfo:1.17    Wed May  6 05:28:22 2026
+++ pkgsrc/lang/ruby33/distinfo Tue May 19 14:45:52 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2026/05/06 05:28:22 taca Exp $
+$NetBSD: distinfo,v 1.18 2026/05/19 14:45:52 taca Exp $
 
 BLAKE2s (ruby-3.3.11.tar.xz) = 2a6996052aae975b7e3aa34849ae11efdb7fdbf8594c9f6cb9e7f0338c361c21
 SHA512 (ruby-3.3.11.tar.xz) = 1f8eb206a90121015b294dada7ea61ebd136e7e7dbb1c4bb7df21b85f359a2e733f438153bf07c57815a963e4ef3f766081fd4226caa6547f4c263b33ed7726e
@@ -11,6 +11,7 @@ SHA1 (patch-lib_erb.rb) = f28a0318017b90
 SHA1 (patch-lib_erb_version.rb) = 6704dceeb27d582c648fdaa3988ae3ea69607ffb
 SHA1 (patch-lib_mkmf.rb) = 4a3cd18548dbdf43a13695d4e76f817c0347e335
 SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a
+SHA1 (patch-lib_rdoc_parser_c.rb) = 063d1edd3f4b9416f759266edf1cf070f2f9faef
 SHA1 (patch-lib_rubygems.rb) = 81af71ae9b0c3fef2ad1de88a542b3ece14b4519
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 66c475a5308deb2ed5096b88cf65549732f87421
 SHA1 (patch-lib_rubygems_config__file.rb) = 584f8cd9ef1d1b9bf25efc7e85c2219166db7ac9

Added files:

Index: pkgsrc/lang/ruby33/patches/patch-lib_rdoc_parser_c.rb
diff -u /dev/null pkgsrc/lang/ruby33/patches/patch-lib_rdoc_parser_c.rb:1.1
--- /dev/null   Tue May 19 14:45:52 2026
+++ pkgsrc/lang/ruby33/patches/patch-lib_rdoc_parser_c.rb       Tue May 19 14:45:52 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_rdoc_parser_c.rb,v 1.1 2026/05/19 14:45:52 taca Exp $
+
+Backport from rdoc-7.0.4.
+
+--- lib/rdoc/parser/c.rb.orig  2026-03-26 00:05:04.000000000 +0000
++++ lib/rdoc/parser/c.rb
+@@ -1011,7 +1011,7 @@ class RDoc::Parser::C < RDoc::Parser
+         file_name = File.join @file_dir, source_file
+ 
+         if File.exist? file_name then
+-          file_content = File.read file_name
++          file_content = RDoc::Encoding.read_file file_name, @options.encoding
+         else
+           @options.warn "unknown source #{source_file} for #{meth_name} in #{@file_name}"
+         end