On 2025/12/26 16:24, Klemens Nanni wrote:
> Puppet and openvox already do MODRUBY_HANDLE_FLAVORS=No,
> I propose the same for openfact:
>
> # TRUSTED_PKG_PATH=. pkg_add -u openvox
> quirks-7.169->7.171: ok
> ruby34-openfact-5.2.0->openfact-5.2.1p0 forward dependencies:
> | Dependency of openvox-8.24.1 on ruby34-openfact->=5.0 doesn't match
> Merging openvox-8.24.1->8.24.2p0 (ok)
>
> openvox-8.24.1+ruby34-openfact-5.2.0->openfact-5.2.1p0+openvox-8.24.2p0: ok
> Read shared items: ok
> Couldn't find updates ...
> 0
>
> They're all standalone tools and building multiple ruby-version flavors
> makes no sense; now I tripped over 'pkg_add openfact' not working,
> so I thought it makes sense to fix them.
>
> quirk and @pkgpath marker work, not sure @conflict is needed,
yes @conflict is needed.
> but since 'pkg_add -u' is happy, I left it like that.
>
> Feedback? OK?
>
> Old sysutils/ruby-{puppet,facter} are left untouched.
>
>
> Index: devel/quirks/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> diff -u -p -r1.1763 Makefile
> --- devel/quirks/Makefile 22 Dec 2025 13:32:15 -0000 1.1763
> +++ devel/quirks/Makefile 26 Dec 2025 16:00:31 -0000
> @@ -3,7 +3,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-7.170
> +PKGNAME = quirks-7.171
> PKG_ARCH = *
> MAINTAINER = Marc Espie <[email protected]>
>
> Index: devel/quirks/files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> diff -u -p -r1.1775 Quirks.pm
> --- devel/quirks/files/Quirks.pm 22 Dec 2025 13:32:15 -0000 1.1775
> +++ devel/quirks/files/Quirks.pm 26 Dec 2025 16:01:06 -0000
> @@ -1050,6 +1050,7 @@ my $obsolete_suggestion = {
> 'opensmtpd-extras-redis' => 'opensmtpd-table-redis',
> # 7.9
> 'dovecot-fts-xapian' => 'dovecot-fts-flatcurve',
> + 'ruby34-openfact' => 'openfact',
> };
>
> # reasons for obsolete packages
> Index: sysutils/ruby-openfact/Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/ruby-openfact/Makefile,v
> diff -u -p -r1.5 Makefile
> --- sysutils/ruby-openfact/Makefile 21 Dec 2025 11:59:52 -0000 1.5
> +++ sysutils/ruby-openfact/Makefile 26 Dec 2025 16:02:38 -0000
> @@ -3,6 +3,7 @@
>
> COMMENT = system inventory tool
> DISTNAME = openfact-5.2.1
> +REVISION = 0
> CATEGORIES = sysutils
>
> HOMEPAGE = https://github.com/OpenVoxProject/openfact/
> @@ -13,6 +14,7 @@ MAINTAINER = Klemens Nanni <kn@openbsd.
> PERMIT_PACKAGE = Yes
>
> MODULES = lang/ruby
> +MODRUBY_HANDLE_FLAVORS =No
>
> BUILD_DEPENDS = ${RUN_DEPENDS}
> RUN_DEPENDS = devel/ruby-ffi,${MODRUBY_FLAVOR}>=1.15.5 \
> Index: sysutils/ruby-openfact/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/ruby-openfact/pkg/PLIST,v
> diff -u -p -r1.3 PLIST
> --- sysutils/ruby-openfact/pkg/PLIST 6 Dec 2025 10:50:08 -0000 1.3
> +++ sysutils/ruby-openfact/pkg/PLIST 26 Dec 2025 16:04:14 -0000
> @@ -1,3 +1,5 @@
> +@conflict ruby34-${PKGSTEM}-*
> +@pkgpath ${BASE_PKGPATH},ruby34
it doesn't entirely make sense to use 'live' variables because those
refer to whatever was in the old package, even if the strings are the
same this implies it relates to the current port. also the indirection
means the reader has to refer to Makefile to check it.
with those expanded e.g. @pkgpath sysutils/ruby-openfact,ruby34 and
@conflict ruby34-openfact-*, ok sthen
(I see that sysutils/Makefile only has ruby-openfact without ,ruby34
so that's already ok)
> ${GEM_BIN}/facter
> ${GEM_LIB}/cache/${DISTNAME}.gem
> ${GEM_LIB}/gems/${DISTNAME}/
> Index: sysutils/ruby-openvox/8/Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/ruby-openvox/8/Makefile,v
> diff -u -p -r1.6 Makefile
> --- sysutils/ruby-openvox/8/Makefile 21 Dec 2025 11:52:54 -0000 1.6
> +++ sysutils/ruby-openvox/8/Makefile 26 Dec 2025 16:07:16 -0000
> @@ -1,4 +1,5 @@
> VERSION = 8.24.2
> +REVISION = 0
>
> RUN_DEPENDS =
> converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.13,<2 \
> devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR}>=1,<2 \
> @@ -8,7 +9,7 @@ RUN_DEPENDS = converters/ruby-multi_jso
> devel/ruby-puppet-resource_api,${MODRUBY_FLAVOR}>=1.5 \
> devel/ruby-scanf,${MODRUBY_FLAVOR}>=1,<2 \
> devel/ruby-semantic_puppet,${MODRUBY_FLAVOR}>=1,<2 \
> - sysutils/ruby-openfact,${MODRUBY_FLAVOR}>=5.2.1
> + sysutils/ruby-openfact>=5.2.1p0
>
> pre-configure:
> ${SUBST_CMD} ${WRKSRC}/lib/puppet/provider/package/gem.rb \
>
