On Fri, Jan 15, 2021 at 12:49:00PM +0100, Klemens Nanni wrote:
> On Fri, Jan 15, 2021 at 12:18:21AM -0500, George Koehler wrote:
> > On Thu, 14 Jan 2021 18:39:13 +0100
> > Giovanni Bechis <[email protected]> wrote:
> >
> > > Attached is a wip port of ruby-sync (created with portgen in few minutes),
> > > puppet 5.5 now works even if with a lot of deprecated warnings...
> >
> > My attachment is the port of ruby-sync with these changes:
> > - shorter "COMMENT = two-phase lock with a counter"
> > - "CATEGORIES = devel"
> > - "PERMIT_PACKAGE = Yes"
> > - "MODRUBY_TEST = rake" so "make test" runs the test target in the
> > Rakefile, but it runs all zero tests.
> >
> > I don't know if we should also restrict the port to ruby>=2.7 only?
> OK kn for your tarball.
>
> We only need it for 2.7 and 2.6 ought to go, so just add
> "devel/ruby-sync" to devel/Makefile for hooking up the default ruby
> version (2.7) only, do not add "devel/ruby-sync,ruby27" or
> "devel/ruby-sync,ruby26".
>
> > Or we might not import ruby-sync if we move puppet 5 on ruby 2.6.
> That sounds like a step backwards.
>
> > I have not yet built sysutils/ruby-puppet/5. One should at least add
> > the dependency on devel/ruby-sync and fix the typo ${SYSCONFIDR} in
> > patch-ext_rack_config_ru
> I have no actual Puppet 5 nodes anymore, but the diff below seems to fix
> old puppet with your port in:
>
> Giovanni, could you try this with your setup?
> If that works: Feedback? OK?
Updated diff after I fixed the SYSCONFIDR typo, thanks gkoehler!
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/5/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 15 Jan 2021 11:54:00 -0000 1.31
+++ Makefile 15 Jan 2021 11:54:36 -0000
@@ -3,12 +3,13 @@
PORTROACH= limit:^5
VERSION= 5.5.22
-REVISION= 1
+REVISION= 2
RUN_DEPENDS+= databases/ruby-hiera3,${MODRUBY_FLAVOR} \
devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.28,<1 \
devel/ruby-locale,${MODRUBY_FLAVOR}>=2.1,<3 \
devel/ruby-rgen,${MODRUBY_FLAVOR} \
+ devel/ruby-sync,${MODRUBY_FLAVOR} \
converters/ruby-multi_json,${MODRUBY_FLAVOR} \
sysutils/facter
