Re: drop ruby flavor from some Puppet/OpenVox related ports

04.02.2026 15:13, Sebastian Reitenbach пишет:
> Hi,
>
> this drops the ruby flavor of a couple of Puppet/OpenVox related ports, as kn@ started i.e. with openfact.
> Ports included:
>
> databases/ruby-hiera3
> databases/ruby-hiera-eyaml
> databases/ruby-hiera-eyaml-gpg (the only one that needed updated RUN_DEPENDS)
> databases/ruby-hiera-file
> sysutils/ruby-puppet-lint
> sysutils/r10k
>
> hiera3, hiera-eyaml, puppet-lint and r10k have binaries, that's why I started there, the other ruby-hiera-* don't have, but I included them for consistency with the other hiera related ports.
> Nothing depends on them, besides the above mentioned interdependency, so no other RUN_DEPENDS to change.

OK kn for the ports above when done as below, then 'pkg_add -u' will
properly merge them.

>
> I tried with @pkgpath and @conflict but I didn't got it to upgrade or install, when the version with old name was around. Is there a way to get it to work?

Do what's done for openfact:
- bump revision
- @conflict ruby34-PKGNAME-*
- @pkgpath PKGPATH,ruby34
- quirk: ruby34-PKGSTEM -> PKGSTEM

Here's one example (replying offline from a plane, had those sources still around):

Index: databases/ruby-hiera-eyaml/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-hiera-eyaml/Makefile,v
diff -u -p -r1.21 Makefile
--- databases/ruby-hiera-eyaml/Makefile 10 Jan 2025 18:16:49 -0000 1.21
+++ databases/ruby-hiera-eyaml/Makefile 5 Feb 2026 11:17:37 -0000
@@ -2,6 +2,7 @@ COMMENT = Hiera backend for decrypting e

DISTNAME = hiera-eyaml-4.2.0
CATEGORIES = databases
+REVISION = 0

MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>

@@ -9,6 +10,8 @@ MAINTAINER = Sebastian Reitenbach <sebas
PERMIT_PACKAGE = Yes

MODULES = lang/ruby
+MODRUBY_HANDLE_FLAVORS =No
+GEM_FLAGS = --no-format-executable

CONFIGURE_STYLE = ruby gem

Index: databases/ruby-hiera-eyaml/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/ruby-hiera-eyaml/pkg/PLIST,v
diff -u -p -r1.10 PLIST
--- databases/ruby-hiera-eyaml/pkg/PLIST 17 May 2024 10:55:50 -0000 1.10
+++ databases/ruby-hiera-eyaml/pkg/PLIST 5 Feb 2026 11:13:38 -0000
@@ -1,4 +1,6 @@
-${GEM_BIN}/eyaml${GEM_BIN_SUFFIX}
+@conflict ruby34-hiera-eyaml-*
+@pkgpath databases/ruby-hiera-eyaml,ruby34
+${GEM_BIN}/eyaml
${GEM_LIB}/cache/${DISTNAME}.gem
${GEM_LIB}/gems/${DISTNAME}/
${GEM_LIB}/gems/${DISTNAME}/.github/
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
diff -u -p -r1.1774 Makefile
--- devel/quirks/Makefile 4 Feb 2026 15:33:58 -0000 1.1774
+++ devel/quirks/Makefile 5 Feb 2026 11:12:29 -0000
@@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =

# API.rev
-PKGNAME = quirks-7.181
+PKGNAME = quirks-7.182
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
diff -u -p -r1.1786 Quirks.pm
--- devel/quirks/files/Quirks.pm 4 Feb 2026 15:33:58 -0000 1.1786
+++ devel/quirks/files/Quirks.pm 5 Feb 2026 11:11:59 -0000
@@ -505,6 +505,7 @@ my $stem_extensions = {
'kdiagram-qt6' => 'kdiagram',
'wycheproof-testvectors' => 'wycheproof',
'ruby34-openfact' => 'openfact',
+ 'ruby34-hiera-eyaml' => 'hiera-eyaml',
};

my $obsolete_reason = {};


> If not, then probably worth mention manual upgrade needed, in current.html 
>
> Any comments, etc. or even OKs welcome.
>
> thanks,
> Sebastian
>