From owner-svn-ports-all@freebsd.org Tue Dec 31 03:05: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 5B7541F1CC3; Tue, 31 Dec 2019 03:05: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 47mzh15fvqz3K88; Tue, 31 Dec 2019 03:05:37 +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 xBV35QsY087924 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Tue, 31 Dec 2019 03:05:32 GMT (envelope-from swills@FreeBSD.org) Subject: Re: svn commit: r521359 - head/www/gitlab-ce To: Sunpoet Po-Chuan Hsieh , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org References: <201912291258.xBTCwLwD010368@repo.freebsd.org> From: Steve Wills Message-ID: <08c175ed-6e70-b351-0144-b8c3f2ce4c03@FreeBSD.org> Date: Mon, 30 Dec 2019 22:05:21 -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: <201912291258.xBTCwLwD010368@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mouf.net [199.48.129.64]); Tue, 31 Dec 2019 03:05:33 +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: 47mzh15fvqz3K88 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-1.84 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.87)[-0.867,0]; ASN(0.00)[asn:36236, ipnet:2607:fc50::/36, country:US]; NEURAL_HAM_LONG(-0.97)[-0.971,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 03:05:38 -0000 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 \ >