30.08.2025 21:41, Jeremy Evans пишет:
> You can patch the gem metadata file to change the requirements, a number of other Ruby ports do that (cd /usr/ports && ls */ruby-*/patches/patch-_metadata). `make extract` puts the gem metadata file in ${WRKSRC}/.metadata. You can patch that normally during the patch phase. The ruby module rebuilds the gem in the configure phase using the patched metadata and potentially patched source.
Awesome, I patched openfact and it works fine with bundled logger.
No warnings or errors during puppet^Wopenvox runs.

> I don't think ruby-logger should be in textproc, because it does not process text (it emits logs). Maybe sysutils is a better fit? Note that we may have issues with Ruby 3.5 if it includes the same version of logger that we are using in the ports tree. However, I'll deal with that when the time comes.

No need to import ruby-logger anymore.
> ruby-openfact DESCR should probably be improved.
> 
> OK jeremy@ for import of ruby-logger and ruby-openfact with those two changes.
I fixed openfact's DESCR and also set myself as MAINTAINER.

I'll import that with your OK, thanks a lot for your help.


> Can you send a new diff for puppet 8 with the fixed dependencies so I can test that?

I'd only commit the ruby-facter @conflict marker at the end.
Then I can continue toying with a new sysutils/ruby-openvox port.

Feedback? OK?


Index: ruby-puppet/8/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/8/Makefile,v
diff -u -p -r1.7 Makefile
--- ruby-puppet/8/Makefile	29 Aug 2025 09:29:52 -0000	1.7
+++ ruby-puppet/8/Makefile	30 Aug 2025 22:11:51 -0000
@@ -1,7 +1,11 @@
-PORTROACH=		limit:^8
+PORTROACH=		limit:^${VERSION:R:R}
 
-VERSION=		8.10.0
-REVISION=		1
+VERSION=		8.22.0
+DISTNAME=		openvox-${VERSION}
+
+HOMEPAGE=		https://voxpopuli.org/openvox/
+
+MAINTAINER=		Klemens Nanni <kn@openbsd.org>
 
 RUN_DEPENDS+=		converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.13,<2 \
 			devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR}>=1,<2 \
@@ -11,8 +15,7 @@ RUN_DEPENDS+=		converters/ruby-multi_jso
 			devel/ruby-puppet-resource_api,${MODRUBY_FLAVOR}>=1.5,<2 \
 			devel/ruby-scanf,${MODRUBY_FLAVOR}>=1,<2 \
 			devel/ruby-semantic_puppet,${MODRUBY_FLAVOR}>=1,<2 \
-			net/ruby-msgpack,${MODRUBY_FLAVOR} \
-			sysutils/ruby-facter,${MODRUBY_FLAVOR}>=4.3.0,<5
+			sysutils/ruby-openfact,${MODRUBY_FLAVOR}>=5.0
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/lib/puppet/provider/package/gem.rb \
Index: ruby-puppet/8/distinfo
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/8/distinfo,v
diff -u -p -r1.4 distinfo
--- ruby-puppet/8/distinfo	21 Jan 2025 10:40:03 -0000	1.4
+++ ruby-puppet/8/distinfo	30 Aug 2025 22:06:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (puppet-8.10.0.gem) = 8vXej1p5TsSaww9CgGyf+1zULJkIqzAU+djqaKIcKjo=
-SIZE (puppet-8.10.0.gem) = 1533952
+SHA256 (openvox-8.22.0.gem) = 2UPalbziPWSWPAsfmRVZdt8O72K3D4FCrVyXOP86jPc=
+SIZE (openvox-8.22.0.gem) = 1533440
Index: ruby-puppet/8/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/8/pkg/PLIST,v
diff -u -p -r1.4 PLIST
--- ruby-puppet/8/pkg/PLIST	21 Jan 2025 10:40:03 -0000	1.4
+++ ruby-puppet/8/pkg/PLIST	30 Aug 2025 22:06:23 -0000
@@ -7,10 +7,9 @@
 ${GEM_BIN}/puppet
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
-${GEM_LIB}/gems/${DISTNAME}/CODEOWNERS
+${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md
 ${GEM_LIB}/gems/${DISTNAME}/CODE_OF_CONDUCT.md
 ${GEM_LIB}/gems/${DISTNAME}/Gemfile
-${GEM_LIB}/gems/${DISTNAME}/Gemfile.lock
 ${GEM_LIB}/gems/${DISTNAME}/Guardfile.example
 ${GEM_LIB}/gems/${DISTNAME}/LICENSE
 ${GEM_LIB}/gems/${DISTNAME}/README.md
@@ -515,7 +514,6 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/m
 ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/module_tool/applications/unpacker.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/module_tool/applications/upgrader.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/module_tool/checksums.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/puppet/module_tool/contents_description.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/module_tool/dependency.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/module_tool/errors/
 ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/module_tool/errors.rb
@@ -1278,6 +1276,8 @@ ${GEM_LIB}/gems/${DISTNAME}/man/man8/
 @man ${GEM_LIB}/gems/${DISTNAME}/man/man8/puppet-script.8
 @man ${GEM_LIB}/gems/${DISTNAME}/man/man8/puppet-ssl.8
 @man ${GEM_LIB}/gems/${DISTNAME}/man/man8/puppet.8
+${GEM_LIB}/gems/${DISTNAME}/tasks/
+${GEM_LIB}/gems/${DISTNAME}/tasks/vox.rake
 ${GEM_LIB}/specifications/${DISTNAME}.gemspec
 @sample ${LOCALSTATEDIR}/puppetlabs/puppet/
 share/doc/pkg-readmes/${PKGSTEM}
Index: ruby-facter/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-facter/Makefile,v
diff -u -p -r1.102 Makefile
--- ruby-facter/Makefile	16 Jan 2025 19:21:52 -0000	1.102
+++ ruby-facter/Makefile	30 Aug 2025 22:07:36 -0000
@@ -4,6 +4,7 @@ DISTNAME =	facter-4.10.0
 CATEGORIES =	sysutils
 HOMEPAGE =	https://github.com/puppetlabs/facter
 MAINTAINER =	Sebastian Reitenbach <sebastia@openbsd.org>
+REVISION =	0
 
 # Apache 2.0
 PERMIT_PACKAGE =	Yes
Index: ruby-facter/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/ruby-facter/pkg/PLIST,v
diff -u -p -r1.31 PLIST
--- ruby-facter/pkg/PLIST	19 Aug 2024 06:07:26 -0000	1.31
+++ ruby-facter/pkg/PLIST	29 Aug 2025 21:43:07 -0000
@@ -1,3 +1,4 @@
+@conflict ruby${GEM_BIN_SUFFIX}-openfact-*
 ${GEM_BIN}/facter${GEM_BIN_SUFFIX}
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/

• ruby-openfact.tgz (8K)