From owner-svn-ports-all@freebsd.org Tue Dec 31 14:03:38 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BE3C91D5DF9; Tue, 31 Dec 2019 14:03:38 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mouf.net", Issuer "mouf.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 47nGHG4f98z4KKj; Tue, 31 Dec 2019 14:03:38 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from lrrr.mouf.net (cpe-174-109-174-192.nc.res.rr.com [174.109.174.192]) (authenticated bits=0) by mouf.net (8.14.9/8.14.9) with ESMTP id xBVE3Jmp013866 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Tue, 31 Dec 2019 14:03:25 GMT (envelope-from swills@FreeBSD.org) Subject: Re: svn commit: r521359 - head/www/gitlab-ce To: Po-Chuan Hsieh References: <201912291258.xBTCwLwD010368@repo.freebsd.org> <08c175ed-6e70-b351-0144-b8c3f2ce4c03@FreeBSD.org> From: Steve Wills Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Message-ID: <50eda352-0768-2281-c717-d6f857507591@FreeBSD.org> Date: Tue, 31 Dec 2019 09:03:15 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.3.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mouf.net [199.48.129.64]); Tue, 31 Dec 2019 14:03:25 +0000 (UTC) X-Spam-Status: No, score=0.3 required=4.5 tests=KHOP_HELO_FCRDNS autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mouf.net X-Virus-Scanned: clamav-milter 0.99.2 at mouf.net X-Virus-Status: Clean X-Rspamd-Queue-Id: 47nGHG4f98z4KKj X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.99 / 15.00]; NEURAL_HAM_MEDIUM(-0.99)[-0.992,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Dec 2019 14:03:38 -0000 Hi, 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. I disagree. "rubygem-sidekiq-cron5" would be a confusing name. Perhaps "rubygem-sidekiq-cron-sidekiq5" but that seems unnecessary. > 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? Again, I disagree. I think it is better to rename sidekiq executable, it makes sense to me that rubygem-sidekiq5 contains "sidekiq5" script. Steve > Regards, > sunpoet > > On Tue, Dec 31, 2019 at 11:05 AM Steve Wills > 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@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 \ > > >