From owner-svn-ports-all@freebsd.org Wed Jan 1 07:09:11 2020 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 D69451F6340 for ; Wed, 1 Jan 2020 07:09:11 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47nj2b5MQdz4bsl for ; Wed, 1 Jan 2020 07:09:11 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: sunpoet) by smtp.freebsd.org (Postfix) with ESMTPSA id 7E6602B9D9 for ; Wed, 1 Jan 2020 07:09:11 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: by mail-ed1-f52.google.com with SMTP id l8so36618093edw.1 for ; Tue, 31 Dec 2019 23:09:11 -0800 (PST) X-Gm-Message-State: APjAAAUFvEAwQAKVxuEuqbV9WE01QMwyuXdz0SRJZvboafqPs2aqAbaA fvnh6iPWAAvRaPDIMwupUifqaU+At1OigIXJYI15ig== X-Google-Smtp-Source: APXvYqxadiWkIC6Mv496oUhiEV8HMuoIbFzyXqdDdtP0zX14g6UVi3Niy6MxQ2e+ZXM2z2OBqZc+nIg0YKAY/u8UTN8= X-Received: by 2002:a05:6402:797:: with SMTP id d23mr80323033edy.138.1577862550260; Tue, 31 Dec 2019 23:09:10 -0800 (PST) MIME-Version: 1.0 References: <201912291258.xBTCwLwD010368@repo.freebsd.org> <08c175ed-6e70-b351-0144-b8c3f2ce4c03@FreeBSD.org> <50eda352-0768-2281-c717-d6f857507591@FreeBSD.org> In-Reply-To: <50eda352-0768-2281-c717-d6f857507591@FreeBSD.org> From: Po-Chuan Hsieh Date: Wed, 1 Jan 2020 15:08:33 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r521359 - head/www/gitlab-ce To: Steve Wills Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: Wed, 01 Jan 2020 07:09:11 -0000 On Tue, Dec 31, 2019 at 10:03 PM Steve Wills wrote: > 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. > Of course not rubygem-sidekiq-cron5. It would looks like rubygem-sidekiq-cron 5.x. I just want to say that we do not have something like this before. PORTNAME=sidekiq5-cron DISTNAME=sidekiq-cron-${PORTVERSION} > > 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. > If you're sure that gitlab-ce does not use bin/sidekiq, I'm fine with your patch in the following mail. Thanks! > 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 \ > > > > > > >