Am Sonntag, November 24, 2019 09:54 CET, schrieb "Sebastian Reitenbach" <[email protected]>:
> Hi, > > I wanted to get rid of a MODRUBY_BIN_SUFFIX for the installed binaries, on a > couple of ruby ports, so added > GEM_FLAGS = --no-format-executable > > however, then, as I was pointed out by jeremy@, ruby25 and ruby26 flavored > packages > conflict. > So he recommended to additionally add > MODRUBY_HANDLE_FLAVORS =No > > With that, the package name changes from: > ruby2X-hiera-eyaml to > hiera-eyaml. > > > however, this still conflicts. I read up on pkgpath and packages-specs, > however, adding > @pkgpath or @conflict in a diverse set of variations didn't work out. > The package either conflicts the old one. > jermey@ pointed me to the quirks, so I added an entry to: > $stem_extensions > like this: > > 'ruby25-hiera-eyaml' => 'hiera-eyaml', > 'ruby26-hiera-eyaml' => 'hiera-eyaml', > > however, pkg_add doens't seem to pick it up. > > I fear the problem is that the FLAVOR is prepended to the package name,any > idea how to work around it? > > cheers, > Sebastian > instead of explanation above, here's a patch, however, not working. When I du a make update, I get: ===> Updating for hiera-eyaml-3.1.1p0 Upgrading from ruby26-hiera-eyaml-3.1.1 Collision in hiera-eyaml-3.1.1p0: the following files already exist Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.815 diff -u -r1.815 Makefile --- devel/quirks/Makefile 23 Nov 2019 15:45:41 -0000 1.815 +++ devel/quirks/Makefile 26 Nov 2019 07:18:02 -0000 @@ -5,7 +5,7 @@ DISTFILES = # API.rev -PKGNAME = quirks-3.206 +PKGNAME = quirks-3.207 PKG_ARCH = * MAINTAINER = Marc Espie <[email protected]> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.832 diff -u -r1.832 Quirks.pm --- devel/quirks/files/Quirks.pm 23 Nov 2019 15:45:41 -0000 1.832 +++ devel/quirks/files/Quirks.pm 26 Nov 2019 07:18:02 -0000 @@ -339,6 +339,9 @@ 'ilmbase' => 'OpenEXR', 'openexr-viewers' => 'OpenEXR-tools', 'libvirt-python' => 'py-libvirt', +# 6.7 + 'ruby25-hiera-eyaml' => 'hiera-eyaml', + 'ruby26-hiera-eyaml' => 'hiera-eyaml', }; my $obsolete_reason = { Index: databases/ruby-hiera-eyaml/Makefile =================================================================== RCS file: /cvs/ports/databases/ruby-hiera-eyaml/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- databases/ruby-hiera-eyaml/Makefile 21 Nov 2019 09:11:21 -0000 1.11 +++ databases/ruby-hiera-eyaml/Makefile 26 Nov 2019 07:18:02 -0000 @@ -2,6 +2,7 @@ COMMENT = Hiera backend for decrypting encrypted yaml properties +REVISION = 0 DISTNAME = hiera-eyaml-3.1.1 CATEGORIES = databases @@ -11,6 +12,7 @@ PERMIT_PACKAGE = Yes MODULES = lang/ruby +MODRUBY_HANDLE_FLAVORS =No CONFIGURE_STYLE = ruby gem Index: databases/ruby-hiera-eyaml/pkg/PLIST =================================================================== RCS file: /cvs/ports/databases/ruby-hiera-eyaml/pkg/PLIST,v retrieving revision 1.5 diff -u -r1.5 PLIST --- databases/ruby-hiera-eyaml/pkg/PLIST 21 Nov 2019 09:11:21 -0000 1.5 +++ databases/ruby-hiera-eyaml/pkg/PLIST 26 Nov 2019 07:18:02 -0000 @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST,v 1.5 2019/11/21 09:11:21 sebastia Exp $ +@pkgpath databases/ruby-hiera-eyaml,ruby25 +@pkgpath databases/ruby-hiera-eyaml,ruby26 ${GEM_BIN}/eyaml ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/
