svn commit: r521359 - head/www/gitlab-ce

[Matthias Fechner]

I cannot test it, if it works, feel free to commit it.
Thanks


Am 31. Dezember 2019 18:52:44 schrieb Steve Wills <swills at FreeBSD.org>:

> Any objections to the attached patch?
>
> Steve
>
> On 12/31/19 6:20 AM, Po-Chuan Hsieh wrote:
>> Hi Steve,
>>
>> Thanks for pointing that out.
>> But adding rubygem-sidekiq5-cron breaks current naming rule for rubygem
>> ports.
>>
>> We have other 2 options:
>> - Remove or rename bin/sidekiq executables from rubygem-sidekiq5
>> - Change rubygem-sidekiq-cron to use rubygem-sidekiq5
>>
>> I would choose the latter. What do you think?
>>
>> Regards,
>> sunpoet
>>
>> On Tue, Dec 31, 2019 at 11:05 AM Steve Wills <swills at freebsd.org
>> <mailto:swills at freebsd.org>> wrote:
>>
>>     Hi,
>>
>>     GitLab package now fails to build because rubygem-sidekiq-cron depends
>>     on rubygem-sidekiq-6.0.4, which conflicts with rubygem-sidekiq5-5.2.7
>>     because they both install /usr/local/bin/sidekiq. I guess we need a
>>     rubygem-sidekiq5-cron package.
>>
>>     Steve
>>
>>     On 12/29/19 7:58 AM, Sunpoet Po-Chuan Hsieh wrote:
>>      > Author: sunpoet
>>      > Date: Sun Dec 29 12:58:21 2019
>>      > New Revision: 521359
>>      > URL: https://svnweb.freebsd.org/changeset/ports/521359
>>      >
>>      > Log:
>>      >    Change RUN_DEPENDS from rubygem-sidekiq to rubygem-sidekiq5
>>      >
>>      >    - Bump PORTREVISION for dependency change
>>      >
>>      > Modified:
>>      >    head/www/gitlab-ce/Makefile
>>      >
>>      > Modified: head/www/gitlab-ce/Makefile
>>      >
>>     ==============================================================================
>>      > --- head/www/gitlab-ce/Makefile       Sun Dec 29 12:58:16 2019
>>          (r521358)
>>      > +++ head/www/gitlab-ce/Makefile       Sun Dec 29 12:58:21 2019
>>          (r521359)
>>      > @@ -3,7 +3,7 @@
>>      >
>>      >   PORTNAME=   gitlab-ce
>>      >   PORTVERSION=        12.6.1
>>      > -PORTREVISION=        0
>>      > +PORTREVISION=        1
>>      >   CATEGORIES= www devel
>>      >
>>      >   MAINTAINER= mfechner at FreeBSD.org
>>      > @@ -126,7 +126,7 @@ MY_DEPENDS=       git>=2.22.2:devel/git \
>>      >       rubygem-rack-timeout>=0:www/rubygem-rack-timeout \
>>      >
>>       rubygem-state_machines-activerecord>=0.6.0<0.7.0:databases/rubygem-state_machines-activerecord 
>>       \
>>      >
>>       rubygem-acts-as-taggable-on>=6.0<7.0:www/rubygem-acts-as-taggable-on \
>>      > -     rubygem-sidekiq>=5.2.7<5.3.0:devel/rubygem-sidekiq \
>>      > +     rubygem-sidekiq5>=5.2.7<5.3.0:devel/rubygem-sidekiq5 \
>>      >       rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \
>>      >
>>       rubygem-redis-namespace>=1.6.0<1.7.0:databases/rubygem-redis-namespace \
>>      >
>>       rubygem-gitlab-sidekiq-fetcher=0.5.2:devel/rubygem-gitlab-sidekiq-fetcher \
>>      >
>>