Received: by mail.netbsd.org (Postfix, from userid 605) id B0D7E84D57; Sun, 8 Jan 2023 15:57:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D60D984D4C for ; Sun, 8 Jan 2023 15:57:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id HdTOR7vvO_Pl for ; Sun, 8 Jan 2023 15:57:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 902B884CBC for ; Sun, 8 Jan 2023 15:57:25 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8971AFA90; Sun, 8 Jan 2023 15:57:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1673193445165090" MIME-Version: 1.0 Date: Sun, 8 Jan 2023 15:57:25 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2022Q4] pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20230108155725.8971AFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1673193445165090 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Sun Jan 8 15:57:25 UTC 2023 Modified Files: pkgsrc/devel/ruby-mustache [pkgsrc-2022Q4]: Makefile PLIST pkgsrc/devel/ruby-ronn [pkgsrc-2022Q4]: Makefile PLIST pkgsrc/misc/ruby-lolcat [pkgsrc-2022Q4]: Makefile PLIST pkgsrc/misc/ruby-manpages [pkgsrc-2022Q4]: Makefile distinfo pkgsrc/misc/ruby-manpages/patches [pkgsrc-2022Q4]: patch-lib_rubygems__plugin.rb pkgsrc/sysutils/puppet [pkgsrc-2022Q4]: Makefile PLIST pkgsrc/textproc/ruby-asciidoctor [pkgsrc-2022Q4]: Makefile PLIST pkgsrc/textproc/ruby-bluecloth [pkgsrc-2022Q4]: Makefile PLIST pkgsrc/textproc/ruby-kramdown [pkgsrc-2022Q4]: Makefile PLIST pkgsrc/textproc/ruby-rdiscount [pkgsrc-2022Q4]: Makefile PLIST pkgsrc/www/ruby-unicorn [pkgsrc-2022Q4]: Makefile PLIST Added Files: pkgsrc/misc/ruby-manpages/patches [pkgsrc-2022Q4]: patch-lib_manpages_install.rb patch-lib_manpages_man__files.rb Log Message: Pullup ticket #6716 - requested by taca devel/ruby-manpages: build fix + dependent updates Revisions pulled up: - devel/ruby-mustache/Makefile 1.5-1.6 - devel/ruby-mustache/PLIST 1.3 - devel/ruby-ronn/Makefile 1.6-1.7 - devel/ruby-ronn/PLIST 1.4 - misc/ruby-lolcat/Makefile 1.4-1.5 - misc/ruby-lolcat/PLIST 1.3 - misc/ruby-manpages/Makefile 1.3-1.4 - misc/ruby-manpages/distinfo 1.2-1.3 - misc/ruby-manpages/patches/patch-lib_manpages_install.rb 1.1 - misc/ruby-manpages/patches/patch-lib_manpages_man__files.rb 1.1 - misc/ruby-manpages/patches/patch-lib_rubygems__plugin.rb 1.2 - sysutils/puppet/Makefile 1.60-1.61 - sysutils/puppet/PLIST 1.37 - textproc/ruby-asciidoctor/Makefile 1.11-1.12 - textproc/ruby-asciidoctor/PLIST 1.6 - textproc/ruby-bluecloth/Makefile 1.14-1.15 - textproc/ruby-bluecloth/PLIST 1.12 - textproc/ruby-kramdown/Makefile 1.31-1.32 - textproc/ruby-kramdown/PLIST 1.23 - textproc/ruby-rdiscount/Makefile 1.5-1.6 - textproc/ruby-rdiscount/PLIST 1.3 - www/ruby-unicorn/Makefile 1.22-1.23 - www/ruby-unicorn/PLIST 1.17 --- Module Name: pkgsrc Committed By: taca Date: Thu Dec 29 16:21:36 UTC 2022 Modified Files: pkgsrc/misc/ruby-manpages: Makefile distinfo pkgsrc/misc/ruby-manpages/patches: patch-lib_rubygems__plugin.rb Added Files: pkgsrc/misc/ruby-manpages/patches: patch-lib_manpages_install.rb Log Message: misc/ruby-manpages: support our install-root propery * Fix symblic link(s) of manual pages. * No need to set RUBYGEM_MANPAGES here. Should be fix error message when pkg_alternatives is installed. (Reported by wiz@ via private e-mail.) Bump PKGREVISION. ## require pull-up --- Module Name: pkgsrc Committed By: taca Date: Thu Dec 29 16:23:52 UTC 2022 Modified Files: pkgsrc/devel/ruby-mustache: Makefile pkgsrc/devel/ruby-ronn: Makefile pkgsrc/misc/ruby-lolcat: Makefile pkgsrc/sysutils/puppet: Makefile pkgsrc/textproc/ruby-asciidoctor: Makefile pkgsrc/textproc/ruby-bluecloth: Makefile pkgsrc/textproc/ruby-kramdown: Makefile pkgsrc/textproc/ruby-rdiscount: Makefile pkgsrc/www/ruby-unicorn: Makefile Log Message: Bump PKGREVISION to reflect fix of ruby-manpages package. --- Module Name: pkgsrc Committed By: taca Date: Sat Dec 31 16:20:40 UTC 2022 Modified Files: pkgsrc/misc/ruby-manpages: Makefile distinfo Added Files: pkgsrc/misc/ruby-manpages/patches: patch-lib_manpages_man__files.rb Log Message: misc/ruby-manpages: more better adaptation with pkg_alternatives * Take maintainer ship. * More better adaptation with pkg_alternatices; install manual pages with ${RUBY_VER} as like commands. Bump PKGREVISION. --- Module Name: pkgsrc Committed By: taca Date: Sat Dec 31 16:21:52 UTC 2022 Modified Files: pkgsrc/devel/ruby-mustache: Makefile PLIST pkgsrc/devel/ruby-ronn: Makefile PLIST pkgsrc/misc/ruby-lolcat: Makefile PLIST pkgsrc/sysutils/puppet: Makefile PLIST pkgsrc/textproc/ruby-asciidoctor: Makefile PLIST pkgsrc/textproc/ruby-bluecloth: Makefile PLIST pkgsrc/textproc/ruby-kramdown: Makefile PLIST pkgsrc/textproc/ruby-rdiscount: Makefile PLIST pkgsrc/www/ruby-unicorn: Makefile PLIST Log Message: Update PLIST caused by update of ruby-manpages. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.2.1 pkgsrc/devel/ruby-mustache/Makefile cvs rdiff -u -r1.2 -r1.2.2.1 pkgsrc/devel/ruby-mustache/PLIST cvs rdiff -u -r1.5 -r1.5.2.1 pkgsrc/devel/ruby-ronn/Makefile cvs rdiff -u -r1.3 -r1.3.2.1 pkgsrc/devel/ruby-ronn/PLIST cvs rdiff -u -r1.3 -r1.3.2.1 pkgsrc/misc/ruby-lolcat/Makefile cvs rdiff -u -r1.2 -r1.2.2.1 pkgsrc/misc/ruby-lolcat/PLIST cvs rdiff -u -r1.2 -r1.2.2.1 pkgsrc/misc/ruby-manpages/Makefile cvs rdiff -u -r1.1 -r1.1.2.1 pkgsrc/misc/ruby-manpages/distinfo cvs rdiff -u -r0 -r1.1.2.2 \ pkgsrc/misc/ruby-manpages/patches/patch-lib_manpages_install.rb \ pkgsrc/misc/ruby-manpages/patches/patch-lib_manpages_man__files.rb cvs rdiff -u -r1.1 -r1.1.2.1 \ pkgsrc/misc/ruby-manpages/patches/patch-lib_rubygems__plugin.rb cvs rdiff -u -r1.59 -r1.59.2.1 pkgsrc/sysutils/puppet/Makefile cvs rdiff -u -r1.36 -r1.36.2.1 pkgsrc/sysutils/puppet/PLIST cvs rdiff -u -r1.10 -r1.10.2.1 pkgsrc/textproc/ruby-asciidoctor/Makefile cvs rdiff -u -r1.5 -r1.5.2.1 pkgsrc/textproc/ruby-asciidoctor/PLIST cvs rdiff -u -r1.13 -r1.13.2.1 pkgsrc/textproc/ruby-bluecloth/Makefile cvs rdiff -u -r1.11 -r1.11.2.1 pkgsrc/textproc/ruby-bluecloth/PLIST cvs rdiff -u -r1.30 -r1.30.2.1 pkgsrc/textproc/ruby-kramdown/Makefile cvs rdiff -u -r1.22 -r1.22.2.1 pkgsrc/textproc/ruby-kramdown/PLIST cvs rdiff -u -r1.4 -r1.4.2.1 pkgsrc/textproc/ruby-rdiscount/Makefile cvs rdiff -u -r1.2 -r1.2.2.1 pkgsrc/textproc/ruby-rdiscount/PLIST cvs rdiff -u -r1.21 -r1.21.2.1 pkgsrc/www/ruby-unicorn/Makefile cvs rdiff -u -r1.16 -r1.16.2.1 pkgsrc/www/ruby-unicorn/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1673193445165090 Content-Disposition: inline Content-Length: 20621 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/ruby-mustache/Makefile diff -u pkgsrc/devel/ruby-mustache/Makefile:1.4 pkgsrc/devel/ruby-mustache/Makefile:1.4.2.1 --- pkgsrc/devel/ruby-mustache/Makefile:1.4 Fri Dec 23 13:28:04 2022 +++ pkgsrc/devel/ruby-mustache/Makefile Sun Jan 8 15:57:23 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2022/12/23 13:28:04 taca Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2023/01/08 15:57:23 bsiegert Exp $ DISTNAME= mustache-1.1.1 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 3 CATEGORIES= devel MAINTAINER= nils@NetBSD.org Index: pkgsrc/devel/ruby-mustache/PLIST diff -u pkgsrc/devel/ruby-mustache/PLIST:1.2 pkgsrc/devel/ruby-mustache/PLIST:1.2.2.1 --- pkgsrc/devel/ruby-mustache/PLIST:1.2 Fri Dec 23 13:28:04 2022 +++ pkgsrc/devel/ruby-mustache/PLIST Sun Jan 8 15:57:23 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2022/12/23 13:28:04 taca Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2023/01/08 15:57:23 bsiegert Exp $ bin/mustache${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/LICENSE @@ -73,6 +73,6 @@ ${GEM_LIBDIR}/test/partial_test.rb ${GEM_LIBDIR}/test/spec_test.rb ${GEM_LIBDIR}/test/template_test.rb ${GEM_HOME}/specifications/${GEM_NAME}.gemspec -${PLIST.rubygem_man}man/man1/mustache.1 -${PLIST.rubygem_man}man/man5/mustache.5 +${PLIST.rubygem_man}man/man1/mustache${RUBY_VER}.1 +${PLIST.rubygem_man}man/man5/mustache${RUBY_VER}.5 @pkgdir lib/ruby/gems/2.0.0/build_info Index: pkgsrc/devel/ruby-ronn/Makefile diff -u pkgsrc/devel/ruby-ronn/Makefile:1.5 pkgsrc/devel/ruby-ronn/Makefile:1.5.2.1 --- pkgsrc/devel/ruby-ronn/Makefile:1.5 Fri Dec 23 13:30:41 2022 +++ pkgsrc/devel/ruby-ronn/Makefile Sun Jan 8 15:57:24 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2022/12/23 13:30:41 taca Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2023/01/08 15:57:24 bsiegert Exp $ DISTNAME= ronn-0.7.3 -PKGREVISION= 3 +PKGREVISION= 5 CATEGORIES= devel textproc MAINTAINER= nils@NetBSD.org Index: pkgsrc/devel/ruby-ronn/PLIST diff -u pkgsrc/devel/ruby-ronn/PLIST:1.3 pkgsrc/devel/ruby-ronn/PLIST:1.3.2.1 --- pkgsrc/devel/ruby-ronn/PLIST:1.3 Fri Dec 23 13:30:41 2022 +++ pkgsrc/devel/ruby-ronn/PLIST Sun Jan 8 15:57:24 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2022/12/23 13:30:41 taca Exp $ +@comment $NetBSD: PLIST,v 1.3.2.1 2023/01/08 15:57:24 bsiegert Exp $ bin/ronn${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/AUTHORS @@ -68,5 +68,5 @@ ${GEM_LIBDIR}/test/titleless_document.ro ${GEM_LIBDIR}/test/underline_spacing_test.roff ${GEM_LIBDIR}/test/underline_spacing_test.ronn ${GEM_HOME}/specifications/${GEM_NAME}.gemspec -${PLIST.rubygem_man}man/man1/ronn.1 -${PLIST.rubygem_man}man/man7/ronn-format.7 +${PLIST.rubygem_man}man/man1/ronn${RUBY_VER}.1 +${PLIST.rubygem_man}man/man7/ronn-format${RUBY_VER}.7 Index: pkgsrc/misc/ruby-lolcat/Makefile diff -u pkgsrc/misc/ruby-lolcat/Makefile:1.3 pkgsrc/misc/ruby-lolcat/Makefile:1.3.2.1 --- pkgsrc/misc/ruby-lolcat/Makefile:1.3 Fri Dec 23 13:32:02 2022 +++ pkgsrc/misc/ruby-lolcat/Makefile Sun Jan 8 15:57:24 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2022/12/23 13:32:02 taca Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2023/01/08 15:57:24 bsiegert Exp $ DISTNAME= lolcat-100.0.1 -PKGREVISION= 1 +PKGREVISION= 3 CATEGORIES= misc MAINTAINER= pkgsrc-users@NetBSD.org Index: pkgsrc/misc/ruby-lolcat/PLIST diff -u pkgsrc/misc/ruby-lolcat/PLIST:1.2 pkgsrc/misc/ruby-lolcat/PLIST:1.2.2.1 --- pkgsrc/misc/ruby-lolcat/PLIST:1.2 Sun Dec 18 14:54:28 2022 +++ pkgsrc/misc/ruby-lolcat/PLIST Sun Jan 8 15:57:24 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2022/12/18 14:54:28 taca Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2023/01/08 15:57:24 bsiegert Exp $ bin/lolcat${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.gitignore @@ -16,4 +16,4 @@ ${GEM_LIBDIR}/lib/lolcat/version.rb ${GEM_LIBDIR}/lolcat.gemspec ${GEM_LIBDIR}/man/lolcat.6 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec -${PLIST.rubygem_man}man/man6/lolcat.6 +${PLIST.rubygem_man}man/man6/lolcat${RUBY_VER}.6 Index: pkgsrc/misc/ruby-manpages/Makefile diff -u pkgsrc/misc/ruby-manpages/Makefile:1.2 pkgsrc/misc/ruby-manpages/Makefile:1.2.2.1 --- pkgsrc/misc/ruby-manpages/Makefile:1.2 Sun Dec 18 14:53:07 2022 +++ pkgsrc/misc/ruby-manpages/Makefile Sun Jan 8 15:57:24 2023 @@ -1,17 +1,16 @@ -# $NetBSD: Makefile,v 1.2 2022/12/18 14:53:07 taca Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2023/01/08 15:57:24 bsiegert Exp $ DISTNAME= manpages-0.6.1 +PKGREVISION= 2 CATEGORIES= misc -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= taca@NetBSD.org HOMEPAGE= https://github.com/bitboxer/manpages COMMENT= Adds support for man pages to rubygems LICENSE= mit USE_LANGUAGES= # none -RUBYGEM_MANPAGES= no - SUBST_CLASSES+= path SUBST_MESSAGE.path= Fixing man path. SUBST_STAGE.path= pre-configure Index: pkgsrc/misc/ruby-manpages/distinfo diff -u pkgsrc/misc/ruby-manpages/distinfo:1.1 pkgsrc/misc/ruby-manpages/distinfo:1.1.2.1 --- pkgsrc/misc/ruby-manpages/distinfo:1.1 Fri Nov 11 14:06:24 2022 +++ pkgsrc/misc/ruby-manpages/distinfo Sun Jan 8 15:57:24 2023 @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.1 2022/11/11 14:06:24 taca Exp $ +$NetBSD: distinfo,v 1.1.2.1 2023/01/08 15:57:24 bsiegert Exp $ BLAKE2s (manpages-0.6.1.gem) = f9be6aa72e19fee514ce924206691ff49323ec1c68d1c91160244dc090eaa28b SHA512 (manpages-0.6.1.gem) = 70839c45db9d0eeef94587853db1514842b7a7e9fed7a967c7a1e9fcfe1ae204de93e04a8bdb24c4dfe6641cef5a27d29136bc4ae6e233040d1d2aa71b077378 Size (manpages-0.6.1.gem) = 14848 bytes -SHA1 (patch-lib_rubygems__plugin.rb) = cc70539c9eee2c77b7c7bcb0c245eb21c4476801 +SHA1 (patch-lib_manpages_install.rb) = cb490bc69237aa8d2bbcae1f314c644f2bf09d0e +SHA1 (patch-lib_manpages_man__files.rb) = 55757e60d132a876bcbad0fe94256522867cdafd +SHA1 (patch-lib_rubygems__plugin.rb) = fe8e5bf91c42caf9a19f4f4658f6fa16a6e99f7c SHA1 (patch-lib_rubygems_commands_manpages__command.rb) = a4ab65190a9ef1bab7805d2eb76f39dd97743937 Index: pkgsrc/misc/ruby-manpages/patches/patch-lib_rubygems__plugin.rb diff -u pkgsrc/misc/ruby-manpages/patches/patch-lib_rubygems__plugin.rb:1.1 pkgsrc/misc/ruby-manpages/patches/patch-lib_rubygems__plugin.rb:1.1.2.1 --- pkgsrc/misc/ruby-manpages/patches/patch-lib_rubygems__plugin.rb:1.1 Fri Nov 11 14:06:24 2022 +++ pkgsrc/misc/ruby-manpages/patches/patch-lib_rubygems__plugin.rb Sun Jan 8 15:57:24 2023 @@ -1,19 +1,25 @@ -$NetBSD: patch-lib_rubygems__plugin.rb,v 1.1 2022/11/11 14:06:24 taca Exp $ +$NetBSD: patch-lib_rubygems__plugin.rb,v 1.1.2.1 2023/01/08 15:57:24 bsiegert Exp $ -Fixate manpath. +* Fixate manpath. +* Handle --install-root option. ---- lib/rubygems_plugin.rb.orig 2022-11-08 15:03:34.185367972 +0000 +--- lib/rubygems_plugin.rb.orig 2022-12-29 16:12:22.401050134 +0000 +++ lib/rubygems_plugin.rb -@@ -6,7 +6,7 @@ Gem::CommandManager.instance.register_co +@@ -6,15 +6,18 @@ Gem::CommandManager.instance.register_co Gem.post_install do |installer| source_dir = installer.spec.gem_dir - target_dir = File.expand_path("#{installer.bin_dir}/../share/man") +- +- Manpages::Install.new(installer.spec, source_dir, target_dir).install_manpages + target_dir = File.expand_path("#{installer.bin_dir}/../@PKGMANDIR@") - - Manpages::Install.new(installer.spec, source_dir, target_dir).install_manpages ++ install_root = nil ++ if installer.options[:install_root] ++ install_root = installer.options[:install_root] ++ end ++ Manpages::Install.new(installer.spec, source_dir, target_dir, install_root).install_manpages end -@@ -14,7 +14,7 @@ end + Gem.pre_uninstall do |uninstaller| bin_dir = uninstaller.bin_dir || Gem.bindir(uninstaller.spec.base_dir) source_dir = uninstaller.spec.gem_dir Index: pkgsrc/sysutils/puppet/Makefile diff -u pkgsrc/sysutils/puppet/Makefile:1.59 pkgsrc/sysutils/puppet/Makefile:1.59.2.1 --- pkgsrc/sysutils/puppet/Makefile:1.59 Fri Dec 23 13:32:44 2022 +++ pkgsrc/sysutils/puppet/Makefile Sun Jan 8 15:57:24 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.59 2022/12/23 13:32:44 taca Exp $ +# $NetBSD: Makefile,v 1.59.2.1 2023/01/08 15:57:24 bsiegert Exp $ DISTNAME= puppet-7.21.0 +PKGREVISION= 2 CATEGORIES= sysutils MAINTAINER= pkgsrc-users@NetBSD.org Index: pkgsrc/sysutils/puppet/PLIST diff -u pkgsrc/sysutils/puppet/PLIST:1.36 pkgsrc/sysutils/puppet/PLIST:1.36.2.1 --- pkgsrc/sysutils/puppet/PLIST:1.36 Sun Dec 18 15:00:31 2022 +++ pkgsrc/sysutils/puppet/PLIST Sun Jan 8 15:57:24 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.36 2022/12/18 15:00:31 taca Exp $ +@comment $NetBSD: PLIST,v 1.36.2.1 2023/01/08 15:57:24 bsiegert Exp $ bin/puppet${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/CODEOWNERS @@ -2342,26 +2342,26 @@ ${GEM_LIBDIR}/tasks/parser.rake ${GEM_LIBDIR}/tasks/yard.rake ${GEM_HOME}/specifications/${GEM_NAME}.gemspec ${EGDIR}/puppet.conf -${PLIST.rubygem_man}man/man5/puppet.conf.5 -${PLIST.rubygem_man}man/man8/puppet-agent.8 -${PLIST.rubygem_man}man/man8/puppet-apply.8 -${PLIST.rubygem_man}man/man8/puppet-catalog.8 -${PLIST.rubygem_man}man/man8/puppet-config.8 -${PLIST.rubygem_man}man/man8/puppet-describe.8 -${PLIST.rubygem_man}man/man8/puppet-device.8 -${PLIST.rubygem_man}man/man8/puppet-doc.8 -${PLIST.rubygem_man}man/man8/puppet-epp.8 -${PLIST.rubygem_man}man/man8/puppet-facts.8 -${PLIST.rubygem_man}man/man8/puppet-filebucket.8 -${PLIST.rubygem_man}man/man8/puppet-generate.8 -${PLIST.rubygem_man}man/man8/puppet-help.8 -${PLIST.rubygem_man}man/man8/puppet-lookup.8 -${PLIST.rubygem_man}man/man8/puppet-module.8 -${PLIST.rubygem_man}man/man8/puppet-node.8 -${PLIST.rubygem_man}man/man8/puppet-parser.8 -${PLIST.rubygem_man}man/man8/puppet-plugin.8 -${PLIST.rubygem_man}man/man8/puppet-report.8 -${PLIST.rubygem_man}man/man8/puppet-resource.8 -${PLIST.rubygem_man}man/man8/puppet-script.8 -${PLIST.rubygem_man}man/man8/puppet-ssl.8 -${PLIST.rubygem_man}man/man8/puppet.8 +${PLIST.rubygem_man}man/man5/puppet.conf${RUBY_VER}.5 +${PLIST.rubygem_man}man/man8/puppet-agent${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-apply${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-catalog${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-config${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-describe${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-device${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-doc${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-epp${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-facts${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-filebucket${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-generate${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-help${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-lookup${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-module${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-node${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-parser${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-plugin${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-report${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-resource${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-script${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet-ssl${RUBY_VER}.8 +${PLIST.rubygem_man}man/man8/puppet${RUBY_VER}.8 Index: pkgsrc/textproc/ruby-asciidoctor/Makefile diff -u pkgsrc/textproc/ruby-asciidoctor/Makefile:1.10 pkgsrc/textproc/ruby-asciidoctor/Makefile:1.10.2.1 --- pkgsrc/textproc/ruby-asciidoctor/Makefile:1.10 Fri Dec 23 13:33:20 2022 +++ pkgsrc/textproc/ruby-asciidoctor/Makefile Sun Jan 8 15:57:24 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2022/12/23 13:33:20 taca Exp $ +# $NetBSD: Makefile,v 1.10.2.1 2023/01/08 15:57:24 bsiegert Exp $ DISTNAME= asciidoctor-2.0.18 -PKGREVISION= 1 +PKGREVISION= 3 CATEGORIES= textproc MAINTAINER= pkgsrc-users@NetBSD.org Index: pkgsrc/textproc/ruby-asciidoctor/PLIST diff -u pkgsrc/textproc/ruby-asciidoctor/PLIST:1.5 pkgsrc/textproc/ruby-asciidoctor/PLIST:1.5.2.1 --- pkgsrc/textproc/ruby-asciidoctor/PLIST:1.5 Sun Dec 18 14:55:22 2022 +++ pkgsrc/textproc/ruby-asciidoctor/PLIST Sun Jan 8 15:57:24 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2022/12/18 14:55:22 taca Exp $ +@comment $NetBSD: PLIST,v 1.5.2.1 2023/01/08 15:57:24 bsiegert Exp $ bin/asciidoctor${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.yardopts @@ -100,4 +100,4 @@ ${GEM_LIBDIR}/lib/asciidoctor/writer.rb ${GEM_LIBDIR}/man/asciidoctor.1 ${GEM_LIBDIR}/man/asciidoctor.adoc ${GEM_HOME}/specifications/${GEM_NAME}.gemspec -${PLIST.rubygem_man}man/man1/asciidoctor.1 +${PLIST.rubygem_man}man/man1/asciidoctor${RUBY_VER}.1 Index: pkgsrc/textproc/ruby-bluecloth/Makefile diff -u pkgsrc/textproc/ruby-bluecloth/Makefile:1.13 pkgsrc/textproc/ruby-bluecloth/Makefile:1.13.2.1 --- pkgsrc/textproc/ruby-bluecloth/Makefile:1.13 Fri Dec 23 13:34:52 2022 +++ pkgsrc/textproc/ruby-bluecloth/Makefile Sun Jan 8 15:57:24 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2022/12/23 13:34:52 taca Exp $ +# $NetBSD: Makefile,v 1.13.2.1 2023/01/08 15:57:24 bsiegert Exp $ DISTNAME= bluecloth-2.2.0 -PKGREVISION= 2 +PKGREVISION= 4 CATEGORIES= textproc MAINTAINER= pkgsrc-users@NetBSD.org Index: pkgsrc/textproc/ruby-bluecloth/PLIST diff -u pkgsrc/textproc/ruby-bluecloth/PLIST:1.11 pkgsrc/textproc/ruby-bluecloth/PLIST:1.11.2.1 --- pkgsrc/textproc/ruby-bluecloth/PLIST:1.11 Fri Dec 23 13:34:52 2022 +++ pkgsrc/textproc/ruby-bluecloth/PLIST Sun Jan 8 15:57:24 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2022/12/23 13:34:52 taca Exp $ +@comment $NetBSD: PLIST,v 1.11.2.1 2023/01/08 15:57:24 bsiegert Exp $ bin/bluecloth${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_EXTSDIR}/bluecloth_ext.${RUBY_DLEXT} @@ -111,4 +111,4 @@ ${GEM_LIBDIR}/spec/lib/helpers.rb ${GEM_LIBDIR}/spec/lib/matchers.rb ${GEM_LIBDIR}/spec/markdowntest_spec.rb ${GEM_HOME}/specifications/${GEM_NAME}.gemspec -${PLIST.rubygem_man}man/man1/bluecloth.1 +${PLIST.rubygem_man}man/man1/bluecloth${RUBY_VER}.1 Index: pkgsrc/textproc/ruby-kramdown/Makefile diff -u pkgsrc/textproc/ruby-kramdown/Makefile:1.30 pkgsrc/textproc/ruby-kramdown/Makefile:1.30.2.1 --- pkgsrc/textproc/ruby-kramdown/Makefile:1.30 Fri Dec 23 13:35:52 2022 +++ pkgsrc/textproc/ruby-kramdown/Makefile Sun Jan 8 15:57:24 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2022/12/23 13:35:52 taca Exp $ +# $NetBSD: Makefile,v 1.30.2.1 2023/01/08 15:57:24 bsiegert Exp $ DISTNAME= kramdown-2.4.0 -PKGREVISION= 1 +PKGREVISION= 3 CATEGORIES= textproc MAINTAINER= pkgsrc-users@NetBSD.org Index: pkgsrc/textproc/ruby-kramdown/PLIST diff -u pkgsrc/textproc/ruby-kramdown/PLIST:1.22 pkgsrc/textproc/ruby-kramdown/PLIST:1.22.2.1 --- pkgsrc/textproc/ruby-kramdown/PLIST:1.22 Fri Dec 23 13:35:52 2022 +++ pkgsrc/textproc/ruby-kramdown/PLIST Sun Jan 8 15:57:24 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2022/12/23 13:35:52 taca Exp $ +@comment $NetBSD: PLIST,v 1.22.2.1 2023/01/08 15:57:24 bsiegert Exp $ bin/kramdown${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/AUTHORS @@ -563,4 +563,4 @@ ${GEM_LIBDIR}/test/testcases/span/text_s ${GEM_LIBDIR}/test/testcases/span/text_substitutions/typography_subst.options ${GEM_LIBDIR}/test/testcases/span/text_substitutions/typography_subst.text ${GEM_HOME}/specifications/${GEM_NAME}.gemspec -${PLIST.rubygem_man}man/man1/kramdown.1 +${PLIST.rubygem_man}man/man1/kramdown${RUBY_VER}.1 Index: pkgsrc/textproc/ruby-rdiscount/Makefile diff -u pkgsrc/textproc/ruby-rdiscount/Makefile:1.4 pkgsrc/textproc/ruby-rdiscount/Makefile:1.4.2.1 --- pkgsrc/textproc/ruby-rdiscount/Makefile:1.4 Fri Dec 23 13:38:46 2022 +++ pkgsrc/textproc/ruby-rdiscount/Makefile Sun Jan 8 15:57:25 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2022/12/23 13:38:46 taca Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2023/01/08 15:57:25 bsiegert Exp $ DISTNAME= rdiscount-2.2.7 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} +PKGREVISION= 2 CATEGORIES= textproc MAINTAINER= nils@NetBSD.org Index: pkgsrc/textproc/ruby-rdiscount/PLIST diff -u pkgsrc/textproc/ruby-rdiscount/PLIST:1.2 pkgsrc/textproc/ruby-rdiscount/PLIST:1.2.2.1 --- pkgsrc/textproc/ruby-rdiscount/PLIST:1.2 Fri Dec 23 13:38:46 2022 +++ pkgsrc/textproc/ruby-rdiscount/PLIST Sun Jan 8 15:57:25 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2022/12/23 13:38:46 taca Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2023/01/08 15:57:25 bsiegert Exp $ bin/rdiscount${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_EXTSDIR}/gem.build_complete @@ -57,5 +57,5 @@ ${GEM_LIBDIR}/test/benchmark.txt ${GEM_LIBDIR}/test/markdown_test.rb ${GEM_LIBDIR}/test/rdiscount_test.rb ${GEM_HOME}/specifications/${GEM_NAME}.gemspec -${PLIST.rubygem_man}man/man1/rdiscount.1 -${PLIST.rubygem_man}man/man7/markdown.7 +${PLIST.rubygem_man}man/man1/rdiscount${RUBY_VER}.1 +${PLIST.rubygem_man}man/man7/markdown${RUBY_VER}.7 Index: pkgsrc/www/ruby-unicorn/Makefile diff -u pkgsrc/www/ruby-unicorn/Makefile:1.21 pkgsrc/www/ruby-unicorn/Makefile:1.21.2.1 --- pkgsrc/www/ruby-unicorn/Makefile:1.21 Fri Dec 23 13:39:38 2022 +++ pkgsrc/www/ruby-unicorn/Makefile Sun Jan 8 15:57:25 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2022/12/23 13:39:38 taca Exp $ +# $NetBSD: Makefile,v 1.21.2.1 2023/01/08 15:57:25 bsiegert Exp $ DISTNAME= unicorn-6.1.0 -PKGREVISION= 1 +PKGREVISION= 3 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org Index: pkgsrc/www/ruby-unicorn/PLIST diff -u pkgsrc/www/ruby-unicorn/PLIST:1.16 pkgsrc/www/ruby-unicorn/PLIST:1.16.2.1 --- pkgsrc/www/ruby-unicorn/PLIST:1.16 Fri Dec 23 13:39:38 2022 +++ pkgsrc/www/ruby-unicorn/PLIST Sun Jan 8 15:57:25 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2022/12/23 13:39:38 taca Exp $ +@comment $NetBSD: PLIST,v 1.16.2.1 2023/01/08 15:57:25 bsiegert Exp $ bin/unicorn${RUBY_SUFFIX} bin/unicorn_rails${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem @@ -170,5 +170,5 @@ ${GEM_LIBDIR}/unicorn.gemspec ${GEM_LIBDIR}/unicorn_1 ${GEM_LIBDIR}/unicorn_rails_1 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec -${PLIST.rubygem_man}man/man1/unicorn.1 -${PLIST.rubygem_man}man/man1/unicorn_rails.1 +${PLIST.rubygem_man}man/man1/unicorn${RUBY_VER}.1 +${PLIST.rubygem_man}man/man1/unicorn_rails${RUBY_VER}.1 Added files: Index: pkgsrc/misc/ruby-manpages/patches/patch-lib_manpages_install.rb diff -u /dev/null pkgsrc/misc/ruby-manpages/patches/patch-lib_manpages_install.rb:1.1.2.2 --- /dev/null Sun Jan 8 15:57:25 2023 +++ pkgsrc/misc/ruby-manpages/patches/patch-lib_manpages_install.rb Sun Jan 8 15:57:24 2023 @@ -0,0 +1,27 @@ +$NetBSD: patch-lib_manpages_install.rb,v 1.1.2.2 2023/01/08 15:57:24 bsiegert Exp $ + +Handle --install-root option. + +--- lib/manpages/install.rb.orig 2022-12-29 07:41:29.224449401 +0000 ++++ lib/manpages/install.rb +@@ -2,10 +2,11 @@ require "fileutils" + + module Manpages + class Install +- def initialize(gem_spec, gem_dir, target_dir) ++ def initialize(gem_spec, gem_dir, target_dir, install_root) + @gem_spec = gem_spec + @gem_dir = gem_dir + @target_dir = target_dir ++ @install_root = install_root + end + + def install_manpages +@@ -24,6 +25,7 @@ module Manpages + man_target_file = ManFiles.new(@gem_dir, @target_dir).man_file_path(file) + return if man_target_file.exist? + ++ file = file.to_s.delete_prefix @install_root unless @install_root.nil? + begin + FileUtils.mkdir_p(man_target_file.dirname) + FileUtils.ln_s(file, man_target_file, force: true) Index: pkgsrc/misc/ruby-manpages/patches/patch-lib_manpages_man__files.rb diff -u /dev/null pkgsrc/misc/ruby-manpages/patches/patch-lib_manpages_man__files.rb:1.1.2.2 --- /dev/null Sun Jan 8 15:57:25 2023 +++ pkgsrc/misc/ruby-manpages/patches/patch-lib_manpages_man__files.rb Sun Jan 8 15:57:24 2023 @@ -0,0 +1,27 @@ +$NetBSD: patch-lib_manpages_man__files.rb,v 1.1.2.2 2023/01/08 15:57:24 bsiegert Exp $ + +* Install manual page with RUBY_VER style. + +--- lib/manpages/man_files.rb.orig 2022-12-30 09:50:10.725925400 +0000 ++++ lib/manpages/man_files.rb +@@ -1,7 +1,9 @@ + require "pathname" ++require "rbconfig" + + module Manpages + class ManFiles ++ RUBY_VER = RbConfig::CONFIG["MAJOR"] + RbConfig::CONFIG["MINOR"] + attr_reader :man_dir + + def initialize(gem_dir, target_dir = "") +@@ -23,7 +25,9 @@ module Manpages + + def man_file_path(file) + man_section = file.extname.match(/\.(\d*)/) +- @target_dir.join("man#{man_section[1]}", file.basename) ++ suffix = ".#{man_section[1]}" ++ name = file.basename(suffix).to_s + RUBY_VER + suffix ++ @target_dir.join("man#{man_section[1]}", name) + end + end + end --_----------=_1673193445165090--