From ff3529f333908557cb1bfb7ca32f226422b9a03a Mon Sep 17 00:00:00 2001 From: sebastia Date: Mon, 9 Feb 2026 08:09:46 +0000 Subject: [PATCH] drop Ruby flavor from a number of Puppet/OpenVox related ports, namely: 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 accompanied with quirks update. valuable feedback (I missed the quirks part, and for some reason revision bumps) as well as final OK kn@ --- databases/ruby-hiera-eyaml-gpg/Makefile | 5 ++++- databases/ruby-hiera-eyaml-gpg/pkg/PLIST | 2 ++ databases/ruby-hiera-eyaml/Makefile | 3 +++ databases/ruby-hiera-eyaml/pkg/PLIST | 4 +++- databases/ruby-hiera-file/Makefile | 4 +++- databases/ruby-hiera-file/pkg/PLIST | 2 ++ databases/ruby-hiera3/Makefile | 3 +++ databases/ruby-hiera3/pkg/PLIST | 5 +++-- devel/quirks/Makefile | 2 +- devel/quirks/files/Quirks.pm | 8 +++++++- sysutils/ruby-puppet-lint/Makefile | 3 +++ sysutils/ruby-puppet-lint/pkg/PLIST | 4 +++- sysutils/ruby-r10k/Makefile | 3 +++ sysutils/ruby-r10k/pkg/PLIST | 4 +++- 14 files changed, 43 insertions(+), 9 deletions(-) diff --git a/databases/ruby-hiera-eyaml-gpg/Makefile b/databases/ruby-hiera-eyaml-gpg/Makefile index 444f37d160f..dccc5a348e4 100644 --- a/databases/ruby-hiera-eyaml-gpg/Makefile +++ b/databases/ruby-hiera-eyaml-gpg/Makefile @@ -1,5 +1,6 @@ COMMENT = gpg encryptor for the hiera eyaml backend +REVISION = 0 DISTNAME = hiera-eyaml-gpg-0.7.4 CATEGORIES = databases @@ -10,11 +11,13 @@ MAINTAINER = Sebastian Reitenbach PERMIT_PACKAGE = Yes MODULES = lang/ruby +MODRUBY_HANDLE_FLAVORS =No +GEM_FLAGS = --no-format-executable CONFIGURE_STYLE = ruby gem BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = databases/ruby-hiera-eyaml,${MODRUBY_FLAVOR} \ +RUN_DEPENDS = databases/ruby-hiera-eyaml \ security/ruby-gpgme,${MODRUBY_FLAVOR} .include diff --git a/databases/ruby-hiera-eyaml-gpg/pkg/PLIST b/databases/ruby-hiera-eyaml-gpg/pkg/PLIST index 600c77817bf..fc1010aded4 100644 --- a/databases/ruby-hiera-eyaml-gpg/pkg/PLIST +++ b/databases/ruby-hiera-eyaml-gpg/pkg/PLIST @@ -1,3 +1,5 @@ +@conflict ruby34-hiera-eyaml-gpg-* +@pkgpath databases/ruby-hiera-eyaml-gpg,ruby34 ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ ${GEM_LIB}/gems/${DISTNAME}/.gitignore diff --git a/databases/ruby-hiera-eyaml/Makefile b/databases/ruby-hiera-eyaml/Makefile index 6ba2ad4887d..9bec948f82c 100644 --- a/databases/ruby-hiera-eyaml/Makefile +++ b/databases/ruby-hiera-eyaml/Makefile @@ -1,5 +1,6 @@ COMMENT = Hiera backend for decrypting encrypted yaml properties +REVISION = 0 DISTNAME = hiera-eyaml-4.2.0 CATEGORIES = databases @@ -9,6 +10,8 @@ MAINTAINER = Sebastian Reitenbach PERMIT_PACKAGE = Yes MODULES = lang/ruby +MODRUBY_HANDLE_FLAVORS =No +GEM_FLAGS = --no-format-executable CONFIGURE_STYLE = ruby gem diff --git a/databases/ruby-hiera-eyaml/pkg/PLIST b/databases/ruby-hiera-eyaml/pkg/PLIST index 4314160b702..2ed6bcd261f 100644 --- a/databases/ruby-hiera-eyaml/pkg/PLIST +++ b/databases/ruby-hiera-eyaml/pkg/PLIST @@ -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/ diff --git a/databases/ruby-hiera-file/Makefile b/databases/ruby-hiera-file/Makefile index 81c29d117c8..de4f32326ae 100644 --- a/databases/ruby-hiera-file/Makefile +++ b/databases/ruby-hiera-file/Makefile @@ -1,13 +1,15 @@ COMMENT = data backend for Hiera to return whole files +REVISION = 3 DISTNAME = hiera-file-1.1.1 -REVISION = 2 CATEGORIES = databases MAINTAINER = Sebastian Reitenbach # Apache2 PERMIT_PACKAGE = Yes +MODRUBY_HANDLE_FLAVORS =No +GEM_FLAGS = --no-format-executable MODULES = lang/ruby diff --git a/databases/ruby-hiera-file/pkg/PLIST b/databases/ruby-hiera-file/pkg/PLIST index b41fdde6c18..b35b51933ff 100644 --- a/databases/ruby-hiera-file/pkg/PLIST +++ b/databases/ruby-hiera-file/pkg/PLIST @@ -1,3 +1,5 @@ +@conflict ruby34-hiera-eyaml-file-* +@pkgpath databases/ruby-hiera-eyaml-file,ruby34 ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ ${GEM_LIB}/gems/${DISTNAME}/lib/ diff --git a/databases/ruby-hiera3/Makefile b/databases/ruby-hiera3/Makefile index 64ce1f5dc8b..41edadc3843 100644 --- a/databases/ruby-hiera3/Makefile +++ b/databases/ruby-hiera3/Makefile @@ -1,5 +1,6 @@ COMMENT= simple pluggable hierarchical database +REVISION = 0 V= 3.12.0 DISTNAME= hiera-${V} PKGNAME= hiera3-${V} @@ -14,6 +15,8 @@ MAINTAINER= Sebastian Reitenbach PERMIT_PACKAGE= Yes MODULES= lang/ruby +MODRUBY_HANDLE_FLAVORS =No +GEM_FLAGS = --no-format-executable CONFIGURE_STYLE= ruby gem diff --git a/databases/ruby-hiera3/pkg/PLIST b/databases/ruby-hiera3/pkg/PLIST index 14a8400a4b9..14374918eee 100644 --- a/databases/ruby-hiera3/pkg/PLIST +++ b/databases/ruby-hiera3/pkg/PLIST @@ -1,5 +1,6 @@ -@conflict ruby22-hiera-<3.0.0 -${GEM_BIN}/hiera${GEM_BIN_SUFFIX} +@conflict ruby34-hiera3-* +@pkgpath databases/ruby-hiera3,ruby34 +${GEM_BIN}/hiera ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ ${GEM_LIB}/gems/${DISTNAME}/COPYING diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index d4abae80b19..9b986ecc2f3 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -3,7 +3,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-7.182 +PKGNAME = quirks-7.183 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index 4036ea9b94f..9b97acb9ff7 100644 --- a/devel/quirks/files/Quirks.pm +++ b/devel/quirks/files/Quirks.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: Quirks.pm,v 1.1787 2026/02/06 16:10:48 sthen Exp $ +# $OpenBSD: Quirks.pm,v 1.1788 2026/02/09 08:09:46 sebastia Exp $ # # Copyright (c) 2009 Marc Espie # @@ -505,6 +505,12 @@ my $stem_extensions = { 'kdiagram-qt6' => 'kdiagram', 'wycheproof-testvectors' => 'wycheproof', 'ruby34-openfact' => 'openfact', + 'ruby34-hiera3' => 'hiera3', + 'ruby34-hiera-eyaml' => 'hiera-eyaml', + 'ruby34-hiera-eyaml-gpg' => 'hiera-eyaml-gpg', + 'ruby34-hiera-file' => 'hiera-file', + 'ruby34-puppet-lint' => 'puppet-lint', + 'ruby34-r10k' => 'r10k', }; my $obsolete_reason = {}; diff --git a/sysutils/ruby-puppet-lint/Makefile b/sysutils/ruby-puppet-lint/Makefile index da6ebb8ee4f..6ad03f0e6c1 100644 --- a/sysutils/ruby-puppet-lint/Makefile +++ b/sysutils/ruby-puppet-lint/Makefile @@ -1,5 +1,6 @@ COMMENT= ensure your Puppet manifests conform with the style guide +REVISION = 0 DISTNAME= puppet-lint-5.1.1 CATEGORIES= sysutils @@ -11,6 +12,8 @@ MAINTAINER= Sebastian Reitenbach PERMIT_PACKAGE= Yes MODULES= lang/ruby +MODRUBY_HANDLE_FLAVORS =No +GEM_FLAGS = --no-format-executable CONFIGURE_STYLE=ruby gem diff --git a/sysutils/ruby-puppet-lint/pkg/PLIST b/sysutils/ruby-puppet-lint/pkg/PLIST index 62f39c2c59d..6b2929c2807 100644 --- a/sysutils/ruby-puppet-lint/pkg/PLIST +++ b/sysutils/ruby-puppet-lint/pkg/PLIST @@ -1,4 +1,6 @@ -${GEM_BIN}/puppet-lint${GEM_BIN_SUFFIX} +@conflict ruby34-puppet-lint-* +@pkgpath sysutils/ruby-puppet-lint,ruby34 +${GEM_BIN}/puppet-lint ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ ${GEM_LIB}/gems/${DISTNAME}/LICENSE diff --git a/sysutils/ruby-r10k/Makefile b/sysutils/ruby-r10k/Makefile index e0d5e31fc1a..6d13690c639 100644 --- a/sysutils/ruby-r10k/Makefile +++ b/sysutils/ruby-r10k/Makefile @@ -1,5 +1,6 @@ COMMENT = Puppet module management +REVISION = 0 DISTNAME = r10k-5.0.2 CATEGORIES = sysutils HOMEPAGE = https://github.com/puppetlabs/r10k @@ -9,6 +10,8 @@ MAINTAINER = Sebastian Reitenbach PERMIT_PACKAGE = Yes MODULES = lang/ruby +MODRUBY_HANDLE_FLAVORS =No +GEM_FLAGS = --no-format-executable BUILD_DEPENDS += ${RUN_DEPENDS} RUN_DEPENDS += archivers/ruby-minitar,${MODRUBY_FLAVOR}>=0.9,<2 \ diff --git a/sysutils/ruby-r10k/pkg/PLIST b/sysutils/ruby-r10k/pkg/PLIST index e9e7dc551f1..5474a4d570c 100644 --- a/sysutils/ruby-r10k/pkg/PLIST +++ b/sysutils/ruby-r10k/pkg/PLIST @@ -1,4 +1,6 @@ -${GEM_BIN}/r10k${GEM_BIN_SUFFIX} +@conflict ruby34-r10k-* +@pkgpath sysutils/ruby-r10k,ruby34 +${GEM_BIN}/r10k ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ ${GEM_LIB}/gems/${DISTNAME}/.gitattributes